svc 3par vnx controller add cpu count #940
Closed
Conversation
This file contains 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
vnx block add cpu count
hpe 3par and vnx block add cpu count
svc add controller cpu count
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #940 +/- ##
==========================================
- Coverage 71.36% 71.33% -0.03%
==========================================
Files 187 187
Lines 23067 23079 +12
Branches 3508 3510 +2
==========================================
+ Hits 16462 16464 +2
- Misses 5490 5495 +5
- Partials 1115 1120 +5
|
JiuyunZhao
reviewed
Nov 17, 2022
| @@ -306,18 +306,20 @@ def list_controllers(self, storage_id): | |||
| memory_size = int(controller.get('memory_size_for_the_sp', | |||
| '0')) * units.Mi | |||
| cpu_info = '' | |||
| cpu_count = None | |||
| if cpus: | |||
| cpu_info = cpus.get( | |||
| controller.get('serial_number_for_the_sp', ''), '') | |||
There was a problem hiding this comment.
When cpus.get() returns an empty string, cpu_info is an empty string, so cpu_count should be None.
| if 'Cores' in titles: | ||
| node_id = str_info[0] | ||
| cpu_info = ' '.join(str_info[5:]) | ||
| if obj_map.get(node_id): |
There was a problem hiding this comment.
It's recommended to use dict.setdefault() instead of if ... else ... .
cpu_map = obj_map.setdefault(node_id, {})
cpu_map[cpu_info] = int(str_info[2])| else: | ||
| cpu_info_map = {} | ||
| cpu_info_map[cpu_info] = 1 | ||
| obj_map[node_id] = cpu_info_map |
There was a problem hiding this comment.
It's recommended to type like obj_map[node_id] = {cpu_info: 1} .
add fujitsu cpu_count
JiuyunZhao
reviewed
Nov 17, 2022
| @@ -306,18 +306,21 @@ def list_controllers(self, storage_id): | |||
| memory_size = int(controller.get('memory_size_for_the_sp', | |||
| '0')) * units.Mi | |||
| cpu_info = '' | |||
| cpu_count = 1 | |||
There was a problem hiding this comment.
When if cpus in the next line returns False, cpu_count should be None.
| obj_map[node_id] = cpu_info_map | ||
| node_id = str_info[0] | ||
| cpu_info = str_info[4] | ||
| if obj_map.get(node_id): |
There was a problem hiding this comment.
We should always try to avoid using if ... esle ... , it's recommended to develop like:
cpu_map = obj_map.get(node_id, {})
cpu_map[cpu_info] = cpu_map.get(cpu_info, 0) + 1update MSA CPU number to default value
|
Another PR with same commits #960 is merged. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What this PR does / why we need it:
Which issue this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close that issue when PR gets merged): fixes #Special notes for your reviewer:
Release note: