-
Notifications
You must be signed in to change notification settings - Fork 812
Rename sonic_ssd to sonic_storage matching corresponding sonic-platform-common change #3334
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
40caeb1
Renamed sonic_ssd to sonic_storage matching corresponding sonic-platf…
caa6373
Added ssdutil UT
2381630
Flake8 test recommendations fixed
83e843f
Workaround for circular dependency
c56718f
Made ssdutil UT backwards compatible
7d478dc
Flake8 test fixes
2746edc
More flake8 fixes
c597272
Test failure fix
9466df9
Filled out init files in mocked libs to prevent unintentional module …
9ba421e
Revert "Filled out init files in mocked libs to prevent unintentional…
34d3b7c
Forced mock of sonic_storage
aa61c27
Removed unused files and code
b68da3e
Dialed back the aggressive mocking of argparse module
58fa22d
Fixed flake8 test issues
400bb1b
Cleaned up ssdutil code and UT
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| import sys | ||
| import argparse | ||
| from unittest.mock import patch, MagicMock | ||
| import sonic_platform_base # noqa: F401 | ||
|
|
||
| sys.modules['sonic_platform'] = MagicMock() | ||
| sys.modules['sonic_platform_base.sonic_ssd.ssd_generic'] = MagicMock() | ||
|
|
||
| import ssdutil.main as ssdutil # noqa: E402 | ||
|
|
||
|
|
||
| class Ssd(): | ||
|
|
||
| def get_model(self): | ||
| return 'SkyNet' | ||
|
|
||
| def get_firmware(self): | ||
| return 'ABC' | ||
|
|
||
| def get_serial(self): | ||
| return 'T1000' | ||
|
|
||
| def get_health(self): | ||
| return 5 | ||
|
|
||
| def get_temperature(self): | ||
| return 3000 | ||
|
|
||
| def get_vendor_output(self): | ||
| return 'SONiC Test' | ||
|
|
||
|
|
||
| class TestSsdutil: | ||
|
|
||
| @patch('sonic_py_common.device_info.get_paths_to_platform_and_hwsku_dirs', MagicMock(return_value=("test_path", ""))) # noqa: E501 | ||
| @patch('os.geteuid', MagicMock(return_value=0)) | ||
| def test_sonic_storage_path(self): | ||
|
|
||
| with patch('argparse.ArgumentParser.parse_args', MagicMock()) as mock_args: # noqa: E501 | ||
| sys.modules['sonic_platform_base.sonic_storage.ssd'] = MagicMock(return_value=Ssd()) # noqa: E501 | ||
| mock_args.return_value = argparse.Namespace(device='/dev/sda', verbose=True, vendor=True) # noqa: E501 | ||
| ssdutil.ssdutil() |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.