Update the API of get_fcp_template_details to return physical wwpns #800
Conversation
renpei123
force-pushed
the
16418
branch
2 times, most recently
from
bd82c12 to
7d984a6
Compare
zvmsdk/database.py
Outdated
| raw = result.fetchall() | ||
| for item in raw: | ||
| wwpn_phy.append(item['wwpn_phy']) | ||
| return wwpn_phy[0] |
There was a problem hiding this comment.
The SQL only return one row, so replace fetchall() to fetchone(). You can search existing example of fetchone()
change to something below
wwpn_phy = ''
...
raw = result.fetchone()
wwpn_phy = raw['wwpn_phy'])
return wwpn_phyPlease test after change
There was a problem hiding this comment.
@jackydalong Thanks a lot for your comment. Util method updated to support get wwpns of pchids, so still use fetchall().
zvmsdk/volumeop.py
Outdated
| @@ -1916,11 +1916,17 @@ def get_fcp_templates_details(self, template_id_list=None, raw=False, | |||
| pchids = list(set(pchids)) | |||
| pchids.sort() | |||
| base_info.update({"pchids": pchids}) | |||
| wwpn_phy_dict = {} | |||
There was a problem hiding this comment.
Add a comment here to introduce your code, like line 1911
zvmsdk/database.py
Outdated
| @@ -2271,6 +2271,26 @@ def delete_fcp_template(self, template_id): | |||
| "template, template_sp_mapping and " | |||
| "template_fcp_mapping tables" % template_id) | |||
|
|
|||
| def get_wwpn_phy_from_pchid(self, pchid): | |||
There was a problem hiding this comment.
Change it support get wwpn_phys of multiple pchids
zvmsdk/volumeop.py
Outdated
| @@ -1916,11 +1916,17 @@ def get_fcp_templates_details(self, template_id_list=None, raw=False, | |||
| pchids = list(set(pchids)) | |||
| pchids.sort() | |||
| base_info.update({"pchids": pchids}) | |||
| wwpn_phy_dict = {} | |||
| for pchid in pchids: | |||
There was a problem hiding this comment.
Update the util method to support get wwpns of pchids, rather than make one sql query for each pchid.
renpei123
force-pushed
the
16418
branch
2 times, most recently
from
50989db to
3ff1aad
Compare
zvmsdk/database.py
Outdated
| @@ -2271,6 +2271,32 @@ def delete_fcp_template(self, template_id): | |||
| "template, template_sp_mapping and " | |||
| "template_fcp_mapping tables" % template_id) | |||
|
|
|||
| def get_wwpn_phys_from_pchids(self, pchids): | |||
There was a problem hiding this comment.
change to wwpn_phys to wwpn_phy in the name, because it is wwpn_phy in sqlite DB table fcp
zvmsdk/volumeop.py
Outdated
| @@ -1916,11 +1916,16 @@ def get_fcp_templates_details(self, template_id_list=None, raw=False, | |||
| pchids = list(set(pchids)) | |||
| pchids.sort() | |||
| base_info.update({"pchids": pchids}) | |||
| # Add pchid_to_phy_wwpn info | |||
| pchid_to_phy_wwpn_dict = {} | |||
There was a problem hiding this comment.
The logic should be moved outside 'if statistics' block. pchid_to_phy_wwpn_dict should be set no matter statistics is True or False.
zvmsdk/volumeop.py
Outdated
| @@ -1916,11 +1916,16 @@ def get_fcp_templates_details(self, template_id_list=None, raw=False, | |||
| pchids = list(set(pchids)) | |||
| pchids.sort() | |||
| base_info.update({"pchids": pchids}) | |||
There was a problem hiding this comment.
Set 'pchids' should be moved outside 'if statistics' block.
renpei123
force-pushed
the
16418
branch
2 times, most recently
from
84d937e to
39970fc
Compare
zvmsdk/volumeop.py
Outdated
| pchids.sort() | ||
| item["pchids"] = pchids | ||
| # Add pchid_to_phy_wwpn info | ||
| pchid_to_phy_wwpn_dict = self.db.get_wwpn_phy_from_pchids(pchids) |
There was a problem hiding this comment.
item["pchid_to_phy_wwpn"] = self.db.get_wwpn_phy_from_pchids(pchids)
Signed-off-by: Pei Ren <[email protected]>
Update the API of get_fcp_template_details to return physical wwpns