Huawei: Fixed url range

There is a large number of URL range fields
in the code that need to be rectified with
specifications referenced to the array .

Change-Id: Iad40907995aa4f1c651fcd3f7d4f3a58bfb00c11
Closes-Bug: #1548167

diff --git a/cinder/tests/unit/test_huawei_drivers.py b/cinder/tests/unit/test_huawei_drivers.py
index 6f2bef9fe450e5068c00947656e99c1a4a4a82a7..bd4a29d19ee3f9cb8c99f993c3219beb119b82e8 100644 (file)
--- a/cinder/tests/unit/test_huawei_drivers.py
+++ b/cinder/tests/unit/test_huawei_drivers.py
@@ -1133,7 +1133,7 @@ MAP_COMMAND_TO_FAKE_RESPONSE['/sessions'] = (
 MAP_COMMAND_TO_FAKE_RESPONSE['/LUN_MIGRATION/POST'] = (
     FAKE_COMMON_SUCCESS_RESPONSE)
 
-MAP_COMMAND_TO_FAKE_RESPONSE['/LUN_MIGRATION?range=[0-100]/GET'] = (
+MAP_COMMAND_TO_FAKE_RESPONSE['/LUN_MIGRATION?range=[0-256]/GET'] = (
     FAKE_GET_LUN_MIGRATION_RESPONSE)
 
 MAP_COMMAND_TO_FAKE_RESPONSE['/LUN_MIGRATION/11/DELETE'] = (
@@ -1421,7 +1421,7 @@ MAP_COMMAND_TO_FAKE_RESPONSE['/fc_port/GET'] = (
 MAP_COMMAND_TO_FAKE_RESPONSE['/fc_initiator/GET'] = (
     FAKE_GET_FC_PORT_RESPONSE)
 
-MAP_COMMAND_TO_FAKE_RESPONSE['fc_initiator?range=[0-100]/GET'] = (
+MAP_COMMAND_TO_FAKE_RESPONSE['fc_initiator?range=[0-256]/GET'] = (
     FAKE_GET_FC_PORT_RESPONSE)
 
 MAP_COMMAND_TO_FAKE_RESPONSE['/fc_initiator?PARENTTYPE=21&PARENTID=1/GET'] = (
@@ -1430,7 +1430,7 @@ MAP_COMMAND_TO_FAKE_RESPONSE['/fc_initiator?PARENTTYPE=21&PARENTID=1/GET'] = (
 MAP_COMMAND_TO_FAKE_RESPONSE['/lun/associate/cachepartition/POST'] = (
     FAKE_SYSTEM_VERSION_RESPONSE)
 
-MAP_COMMAND_TO_FAKE_RESPONSE['/fc_initiator?range=[0-100]&PARENTID=1/GET'] = (
+MAP_COMMAND_TO_FAKE_RESPONSE['/fc_initiator?range=[0-256]&PARENTID=1/GET'] = (
     FAKE_GET_FC_PORT_RESPONSE)
 
 MAP_COMMAND_TO_FAKE_RESPONSE['/fc_initiator?PARENTTYPE=21&PARENTID=1/GET'] = (
@@ -1445,7 +1445,7 @@ MAP_COMMAND_TO_FAKE_RESPONSE['/SMARTCACHEPARTITION/REMOVE_ASSOCIATE/PUT'] = (
 MAP_COMMAND_TO_FAKE_RESPONSE['/cachepartition/0/GET'] = (
     FAKE_SMARTCACHEPARTITION_RESPONSE)
 
-MAP_COMMAND_TO_FAKE_RESPONSE['/HyperMetroDomain?range=[0-100]/GET'] = (
+MAP_COMMAND_TO_FAKE_RESPONSE['/HyperMetroDomain?range=[0-32]/GET'] = (
     FAKE_HYPERMETRODOMAIN_RESPONSE)
 
 MAP_COMMAND_TO_FAKE_RESPONSE['/HyperMetroPair/POST'] = (
@@ -1463,10 +1463,10 @@ MAP_COMMAND_TO_FAKE_RESPONSE['/HyperMetroPair/11/DELETE'] = (
 MAP_COMMAND_TO_FAKE_RESPONSE['/HyperMetroPair/1/GET'] = (
     FAKE_HYPERMETRO_RESPONSE)
 
-MAP_COMMAND_TO_FAKE_RESPONSE['/HyperMetroPair?range=[0-100]/GET'] = (
+MAP_COMMAND_TO_FAKE_RESPONSE['/HyperMetroPair?range=[0-65535]/GET'] = (
     FAKE_COMMON_SUCCESS_RESPONSE)
 
-MAP_COMMAND_TO_FAKE_RESPONSE['/splitmirror?range=[0-100]/GET'] = (
+MAP_COMMAND_TO_FAKE_RESPONSE['/splitmirror?range=[0-512]/GET'] = (
     FAKE_COMMON_SUCCESS_RESPONSE)
 
 FACK_GET_PORTG_BY_VIEW = """

diff --git a/cinder/volume/drivers/huawei/rest_client.py b/cinder/volume/drivers/huawei/rest_client.py
index 64d3189e2802629d3dc27097490fd61deb766e0e..e919161dfb22a24947e4948e233bccf7db227ffd 100644 (file)
--- a/cinder/volume/drivers/huawei/rest_client.py
+++ b/cinder/volume/drivers/huawei/rest_client.py
@@ -451,7 +451,7 @@ class RestClient(object):
         return map_info
 
     def check_iscsi_initiators_exist_in_host(self, host_id):
-        url = "/iscsi_initiator?range=[0-100]&PARENTID=%s" % host_id
+        url = "/iscsi_initiator?range=[0-256]&PARENTID=%s" % host_id
         result = self.call(url, None, "GET")
         self._assert_rest_result(result, 'Get host initiators info failed.')
         if "data" in result:
@@ -1429,7 +1429,7 @@ class RestClient(object):
         self._assert_data_in_result(result, msg)
 
     def get_lun_migration_task(self):
-        url = '/LUN_MIGRATION?range=[0-100]'
+        url = '/LUN_MIGRATION?range=[0-256]'
         result = self.call(url, None, "GET")
         self._assert_rest_result(result, _('Get lun migration task error.'))
         return result
@@ -1673,7 +1673,7 @@ class RestClient(object):
         self._assert_rest_result(result, _('Remove fc from host error.'))
 
     def check_fc_initiators_exist_in_host(self, host_id):
-        url = "/fc_initiator?range=[0-100]&PARENTID=%s" % host_id
+        url = "/fc_initiator?range=[0-256]&PARENTID=%s" % host_id
         result = self.call(url, None, "GET")
         self._assert_rest_result(result, _('Get host initiators info failed.'))
         if 'data' in result:
@@ -1726,7 +1726,7 @@ class RestClient(object):
         return port_list_from_contr
 
     def get_hyper_domain_id(self, domain_name):
-        url = "/HyperMetroDomain?range=[0-100]"
+        url = "/HyperMetroDomain?range=[0-32]"
         result = self.call(url, None, "GET")
         domain_id = None
         if "data" in result:
@@ -1833,7 +1833,7 @@ class RestClient(object):
             return result["data"]["AVAILABLEHOSTLUNIDLIST"]
 
     def get_hypermetro_pairs(self):
-        url = "/HyperMetroPair?range=[0-100]"
+        url = "/HyperMetroPair?range=[0-65535]"
         result = self.call(url, None, "GET")
         msg = _('Get HyperMetroPair error.')
         self._assert_rest_result(result, msg)
@@ -1841,7 +1841,7 @@ class RestClient(object):
         return result.get('data', [])
 
     def get_split_mirrors(self):
-        url = "/splitmirror?range=[0-100]"
+        url = "/splitmirror?range=[0-512]"
         result = self.call(url, None, "GET")
         if result['error']['code'] == constants.NO_SPLITMIRROR_LICENSE:
             msg = _('License is unavailable.')
@@ -1864,7 +1864,7 @@ class RestClient(object):
         return target_luns
 
     def get_migration_task(self):
-        url = "/LUN_MIGRATION?range=[0-100]"
+        url = "/LUN_MIGRATION?range=[0-256]"
         result = self.call(url, None, "GET")
         if result['error']['code'] == constants.NO_MIGRATION_LICENSE:
             msg = _('License is unavailable.')