Merge pull request #58 from huangpeng5/suyan_326

Resolve the Pacific storage compatibility issue.
Huawei · Mar 26, 2024 · bf7b095 · bf7b095
2 parents d4a8bcb + 046a54d
commit bf7b095
Showing 1 changed file with 9 additions and 21 deletions.
diff --git a/Manila/file_driver_dir/huawei/oceanstorPacific/helper/helper.py b/Manila/file_driver_dir/huawei/oceanstorPacific/helper/helper.py
@@ -412,13 +412,9 @@ def query_nfs_share_information(self, account_id, fs_id, dtree_id=0):
 
         url = "nas_protocol/nfs_share_list"
         nfs_para = {
-            'account_id': account_id,
-            'filter': [
-                {
-                    'fs_id': fs_id,
-                    'dtree_id': dtree_id,
-                }
-            ]
+            "account_id": account_id,
+            "filter": "[{\"fs_id\": %d, \"dtree_id\": \"%s\"}]" %
+                      (fs_id, str(fs_id) + '@' + str(dtree_id))
         }
         data = jsonutils.dumps(nfs_para)
         result = self.call(url, data, "GET")
@@ -437,12 +433,8 @@ def query_cifs_share_information(self, account_id, share_name):
         url = "file_service/cifs_share_list"
 
         cifs_para = {
-            'account_id': account_id,
-            'filter': [
-                {
-                    'name': share_name
-                }
-            ]
+            "account_id": account_id,
+            "filter": "[{\"name\":\"%s\"}]" % share_name
         }
 
         data = jsonutils.dumps(cifs_para)
@@ -598,14 +590,12 @@ def _query_nfs_share_clients_information(self, offset, extra_param):
 
         url = "nas_protocol/nfs_share_auth_client_list"
         filter_para = {
-            'filter': [{
-                "share_id": extra_param[0]
-            }],
+            "filter": "[{\"share_id\": \"%s\"}]" % str(extra_param[0]),
             "range": {
                 "offset": offset,
                 "limit": constants.MAX_QUERY_COUNT
             },
-            'account_id': extra_param[1]
+            "account_id": extra_param[1]
         }
 
         data = jsonutils.dumps(filter_para)
@@ -629,14 +619,12 @@ def _query_cifs_share_user_information(self, offset, extra_param):
 
         url = "file_service/cifs_share_auth_client_list"
         filter_para = {
-            'filter': [{
-                    "share_id": extra_param[0]
-                }],
+            "filter": "[{\"share_id\": \"%s\"}]" % str(extra_param[0]),
             "range": {
                 "offset": offset,
                 "limit": constants.MAX_QUERY_COUNT
             },
-            'account_id': extra_param[1],
+            "account_id": extra_param[1],
         }
 
         data = jsonutils.dumps(filter_para)