Merge pull request #49 from bingyanh/2.6.1_master

update 2.6.1

Cinder/Mitaka/__init__.py

@@ -1 +1 @@
-"""Version: 2.5.RC4"""
+"""Version: 2.6.1"""

Cinder/Mitaka/constants.py

@@ -34,6 +34,8 @@
 MAPPING_VIEW_PREFIX = 'OpenStack_Mapping_View_'
 PORTGROUP_PREFIX = 'OpenStack_PortGroup_'
 QOS_NAME_PREFIX = 'OpenStack_'
+SENSITIVE_KEYS = ['auth_password']
+
 PORTGROUP_DESCRIP_PREFIX = "Please do NOT modify this. Engine ID: "
 FC_PORT_CONNECTED = '10'
 FC_INIT_ONLINE = '27'

Cinder/Mitaka/huawei_driver.py

@@ -81,6 +81,7 @@
 
 
 class HuaweiBaseDriver(driver.VolumeDriver):
+    VERSION = "2.6.1"
 
     def __init__(self, *args, **kwargs):
         super(HuaweiBaseDriver, self).__init__(*args, **kwargs)
@@ -2967,7 +2968,6 @@ class HuaweiISCSIDriver(HuaweiBaseDriver, driver.ISCSIDriver):
         2.2.RC1 - Add force delete volume
     """
 
-    VERSION = "2.5.RC4"
 
     def __init__(self, *args, **kwargs):
         super(HuaweiISCSIDriver, self).__init__(*args, **kwargs)
@@ -3012,7 +3012,8 @@ def _initialize_connection_lock(self, volume, connector):
                 connector, iscsi_info, rmt_iscsi_info)
 
         LOG.info('initialize_common_connection_iscsi, '
-                 'return data is: %s.', iscsi_info)
+                 'return data is: %s.',
+                 huawei_utils.mask_dict_sensitive_info(iscsi_info))
         return iscsi_info
 
     def _initialize_connection(self, volume, connector, local=True):
@@ -3292,7 +3293,6 @@ class HuaweiFCDriver(HuaweiBaseDriver, driver.FibreChannelDriver):
         2.2.RC1 - Add force delete volume
     """
 
-    VERSION = "2.5.RC4"
 
     def __init__(self, *args, **kwargs):
         super(HuaweiFCDriver, self).__init__(*args, **kwargs)

Cinder/Mitaka/huawei_utils.py

@@ -21,6 +21,7 @@
 from oslo_log import log as logging
 from oslo_service import loopingcall
 from oslo_utils import units
+from oslo_utils import strutils
 
 from cinder import exception
 from cinder.i18n import _
@@ -348,3 +349,20 @@ def check_group_volume_type_valid(opt):
                 "specified at the same volume_type.")
         LOG.error(msg)
         raise exception.VolumeBackendAPIException(data=msg)
+
+
+def mask_dict_sensitive_info(data, secret="***"):
+    # mask sensitive data in the dictionary
+    if not isinstance(data, dict):
+        return data
+
+    out = {}
+    for key, value in data.items():
+        if isinstance(value, dict):
+            value = mask_dict_sensitive_info(value, secret=secret)
+        elif key in constants.SENSITIVE_KEYS:
+            value = secret
+        out[key] = value
+
+    return strutils.mask_dict_password(out)
+

Cinder/Mitaka/rest_client.py

@@ -2216,19 +2216,19 @@ def get_fc_initiator_on_array(self):
 
         return fc_initiators
 
-    def get_hyper_domain_id(self, domain_name):
-        url = "/HyperMetroDomain?range=[0-32]"
+    def _get_hypermetro_domain(self, start, end, params):
+        url = ("/HyperMetroDomain?range=[%(start)s-%(end)s]"
+               % {"start": str(start), "end": str(end)})
         result = self.call(url, None, "GET")
-        domain_id = None
-        if "data" in result:
-            for item in result['data']:
-                if domain_name == item['NAME']:
-                    domain_id = item['ID']
-                    break
+        self._assert_rest_result(result, "Get hyper domain info error.")
+        return result.get('data', [])
 
-        msg = _('get_hyper_domain_id error.')
-        self._assert_rest_result(result, msg)
-        return domain_id
+    def get_hyper_domain_id(self, domain_name):
+        domain_list = self._get_info_by_range(self._get_hypermetro_domain)
+        for item in domain_list:
+            if domain_name == item.get('NAME'):
+                return item.get("ID")
+        return None
 
     def create_hypermetro(self, hcp_param):
         url = "/HyperMetroPair"

Cinder/Newton/__init__.py

@@ -1 +1 @@
-"""Version: 2.5.RC4"""
+"""Version: 2.6.1"""

Cinder/Newton/constants.py

@@ -34,6 +34,8 @@
 MAPPING_VIEW_PREFIX = 'OpenStack_Mapping_View_'
 PORTGROUP_PREFIX = 'OpenStack_PortGroup_'
 QOS_NAME_PREFIX = 'OpenStack_'
+SENSITIVE_KEYS = ['auth_password']
+
 PORTGROUP_DESCRIP_PREFIX = "Please do NOT modify this. Engine ID: "
 FC_PORT_CONNECTED = '10'
 FC_INIT_ONLINE = '27'

Cinder/Newton/huawei_driver.py

@@ -81,6 +81,7 @@
 
 
 class HuaweiBaseDriver(driver.VolumeDriver):
+    VERSION = "2.6.1"
 
     def __init__(self, *args, **kwargs):
         super(HuaweiBaseDriver, self).__init__(*args, **kwargs)
@@ -2967,7 +2968,6 @@ class HuaweiISCSIDriver(HuaweiBaseDriver, driver.ISCSIDriver):
         2.2.RC1 - Add force delete volume
     """
 
-    VERSION = "2.5.RC4"
 
     def __init__(self, *args, **kwargs):
         super(HuaweiISCSIDriver, self).__init__(*args, **kwargs)
@@ -3012,7 +3012,8 @@ def _initialize_connection_lock(self, volume, connector):
                 connector, iscsi_info, rmt_iscsi_info)
 
         LOG.info('initialize_common_connection_iscsi, '
-                 'return data is: %s.', iscsi_info)
+                 'return data is: %s.',
+                 huawei_utils.mask_dict_sensitive_info(iscsi_info))
         return iscsi_info
 
     def _initialize_connection(self, volume, connector, local=True):
@@ -3292,7 +3293,6 @@ class HuaweiFCDriver(HuaweiBaseDriver, driver.FibreChannelDriver):
         2.2.RC1 - Add force delete volume
     """
 
-    VERSION = "2.5.RC4"
 
     def __init__(self, *args, **kwargs):
         super(HuaweiFCDriver, self).__init__(*args, **kwargs)

Cinder/Newton/huawei_utils.py

@@ -21,6 +21,7 @@
 from oslo_log import log as logging
 from oslo_service import loopingcall
 from oslo_utils import units
+from oslo_utils import strutils
 
 from cinder import exception
 from cinder.i18n import _
@@ -348,3 +349,20 @@ def check_group_volume_type_valid(opt):
                 "specified at the same volume_type.")
         LOG.error(msg)
         raise exception.VolumeBackendAPIException(data=msg)
+
+
+def mask_dict_sensitive_info(data, secret="***"):
+    # mask sensitive data in the dictionary
+    if not isinstance(data, dict):
+        return data
+
+    out = {}
+    for key, value in data.items():
+        if isinstance(value, dict):
+            value = mask_dict_sensitive_info(value, secret=secret)
+        elif key in constants.SENSITIVE_KEYS:
+            value = secret
+        out[key] = value
+
+    return strutils.mask_dict_password(out)
+

Cinder/Newton/rest_client.py

@@ -2216,19 +2216,19 @@ def get_fc_initiator_on_array(self):
 
         return fc_initiators
 
-    def get_hyper_domain_id(self, domain_name):
-        url = "/HyperMetroDomain?range=[0-32]"
+    def _get_hypermetro_domain(self, start, end, params):
+        url = ("/HyperMetroDomain?range=[%(start)s-%(end)s]"
+               % {"start": str(start), "end": str(end)})
         result = self.call(url, None, "GET")
-        domain_id = None
-        if "data" in result:
-            for item in result['data']:
-                if domain_name == item['NAME']:
-                    domain_id = item['ID']
-                    break
+        self._assert_rest_result(result, "Get hyper domain info error.")
+        return result.get('data', [])
 
-        msg = _('get_hyper_domain_id error.')
-        self._assert_rest_result(result, msg)
-        return domain_id
+    def get_hyper_domain_id(self, domain_name):
+        domain_list = self._get_info_by_range(self._get_hypermetro_domain)
+        for item in domain_list:
+            if domain_name == item.get('NAME'):
+                return item.get("ID")
+        return None
 
     def create_hypermetro(self, hcp_param):
         url = "/HyperMetroPair"

Cinder/Ocata/__init__.py

@@ -1 +1 @@
-"""Version: 2.5.RC4"""
+"""Version: 2.6.1"""

Cinder/Ocata/constants.py

@@ -34,6 +34,8 @@
 MAPPING_VIEW_PREFIX = 'OpenStack_Mapping_View_'
 PORTGROUP_PREFIX = 'OpenStack_PortGroup_'
 QOS_NAME_PREFIX = 'OpenStack_'
+SENSITIVE_KEYS = ['auth_password']
+
 PORTGROUP_DESCRIP_PREFIX = "Please do NOT modify this. Engine ID: "
 FC_PORT_CONNECTED = '10'
 FC_INIT_ONLINE = '27'

Cinder/Ocata/huawei_driver.py

@@ -81,6 +81,7 @@
 
 
 class HuaweiBaseDriver(driver.VolumeDriver):
+    VERSION = "2.6.1"
 
     def __init__(self, *args, **kwargs):
         super(HuaweiBaseDriver, self).__init__(*args, **kwargs)
@@ -2967,7 +2968,6 @@ class HuaweiISCSIDriver(HuaweiBaseDriver, driver.ISCSIDriver):
         2.2.RC1 - Add force delete volume
     """
 
-    VERSION = "2.5.RC4"
 
     def __init__(self, *args, **kwargs):
         super(HuaweiISCSIDriver, self).__init__(*args, **kwargs)
@@ -3012,7 +3012,8 @@ def _initialize_connection_lock(self, volume, connector):
                 connector, iscsi_info, rmt_iscsi_info)
 
         LOG.info('initialize_common_connection_iscsi, '
-                 'return data is: %s.', iscsi_info)
+                 'return data is: %s.',
+                 huawei_utils.mask_dict_sensitive_info(iscsi_info))
         return iscsi_info
 
     def _initialize_connection(self, volume, connector, local=True):
@@ -3292,7 +3293,6 @@ class HuaweiFCDriver(HuaweiBaseDriver, driver.FibreChannelDriver):
         2.2.RC1 - Add force delete volume
     """
 
-    VERSION = "2.5.RC4"
 
     def __init__(self, *args, **kwargs):
         super(HuaweiFCDriver, self).__init__(*args, **kwargs)

Cinder/Ocata/huawei_utils.py

@@ -21,6 +21,7 @@
 from oslo_log import log as logging
 from oslo_service import loopingcall
 from oslo_utils import units
+from oslo_utils import strutils
 
 from cinder import exception
 from cinder.i18n import _
@@ -348,3 +349,20 @@ def check_group_volume_type_valid(opt):
                 "specified at the same volume_type.")
         LOG.error(msg)
         raise exception.VolumeBackendAPIException(data=msg)
+
+
+def mask_dict_sensitive_info(data, secret="***"):
+    # mask sensitive data in the dictionary
+    if not isinstance(data, dict):
+        return data
+
+    out = {}
+    for key, value in data.items():
+        if isinstance(value, dict):
+            value = mask_dict_sensitive_info(value, secret=secret)
+        elif key in constants.SENSITIVE_KEYS:
+            value = secret
+        out[key] = value
+
+    return strutils.mask_dict_password(out)
+

Cinder/Ocata/rest_client.py

@@ -2216,19 +2216,19 @@ def get_fc_initiator_on_array(self):
 
         return fc_initiators
 
-    def get_hyper_domain_id(self, domain_name):
-        url = "/HyperMetroDomain?range=[0-32]"
+    def _get_hypermetro_domain(self, start, end, params):
+        url = ("/HyperMetroDomain?range=[%(start)s-%(end)s]"
+               % {"start": str(start), "end": str(end)})
         result = self.call(url, None, "GET")
-        domain_id = None
-        if "data" in result:
-            for item in result['data']:
-                if domain_name == item['NAME']:
-                    domain_id = item['ID']
-                    break
+        self._assert_rest_result(result, "Get hyper domain info error.")
+        return result.get('data', [])
 
-        msg = _('get_hyper_domain_id error.')
-        self._assert_rest_result(result, msg)
-        return domain_id
+    def get_hyper_domain_id(self, domain_name):
+        domain_list = self._get_info_by_range(self._get_hypermetro_domain)
+        for item in domain_list:
+            if domain_name == item.get('NAME'):
+                return item.get("ID")
+        return None
 
     def create_hypermetro(self, hcp_param):
         url = "/HyperMetroPair"

Cinder/Pike/__init__.py

@@ -1 +1 @@
-"""Version: 2.5.RC4"""
+"""Version: 2.6.1"""

Cinder/Pike/constants.py

@@ -34,6 +34,8 @@
 MAPPING_VIEW_PREFIX = 'OpenStack_Mapping_View_'
 PORTGROUP_PREFIX = 'OpenStack_PortGroup_'
 QOS_NAME_PREFIX = 'OpenStack_'
+SENSITIVE_KEYS = ['auth_password']
+
 PORTGROUP_DESCRIP_PREFIX = "Please do NOT modify this. Engine ID: "
 FC_PORT_CONNECTED = '10'
 FC_INIT_ONLINE = '27'

Cinder/Pike/huawei_driver.py

@@ -81,6 +81,7 @@
 
 
 class HuaweiBaseDriver(driver.VolumeDriver):
+    VERSION = "2.6.1"
 
     def __init__(self, *args, **kwargs):
         super(HuaweiBaseDriver, self).__init__(*args, **kwargs)
@@ -2967,7 +2968,6 @@ class HuaweiISCSIDriver(HuaweiBaseDriver, driver.ISCSIDriver):
         2.2.RC1 - Add force delete volume
     """
 
-    VERSION = "2.5.RC4"
 
     def __init__(self, *args, **kwargs):
         super(HuaweiISCSIDriver, self).__init__(*args, **kwargs)
@@ -3012,7 +3012,8 @@ def _initialize_connection_lock(self, volume, connector):
                 connector, iscsi_info, rmt_iscsi_info)
 
         LOG.info('initialize_common_connection_iscsi, '
-                 'return data is: %s.', iscsi_info)
+                 'return data is: %s.',
+                 huawei_utils.mask_dict_sensitive_info(iscsi_info))
         return iscsi_info
 
     def _initialize_connection(self, volume, connector, local=True):
@@ -3292,7 +3293,6 @@ class HuaweiFCDriver(HuaweiBaseDriver, driver.FibreChannelDriver):
         2.2.RC1 - Add force delete volume
     """
 
-    VERSION = "2.5.RC4"
 
     def __init__(self, *args, **kwargs):
         super(HuaweiFCDriver, self).__init__(*args, **kwargs)

Cinder/Pike/huawei_utils.py

@@ -21,6 +21,7 @@
 from oslo_log import log as logging
 from oslo_service import loopingcall
 from oslo_utils import units
+from oslo_utils import strutils
 
 from cinder import exception
 from cinder.i18n import _
@@ -348,3 +349,20 @@ def check_group_volume_type_valid(opt):
                 "specified at the same volume_type.")
         LOG.error(msg)
         raise exception.VolumeBackendAPIException(data=msg)
+
+
+def mask_dict_sensitive_info(data, secret="***"):
+    # mask sensitive data in the dictionary
+    if not isinstance(data, dict):
+        return data
+
+    out = {}
+    for key, value in data.items():
+        if isinstance(value, dict):
+            value = mask_dict_sensitive_info(value, secret=secret)
+        elif key in constants.SENSITIVE_KEYS:
+            value = secret
+        out[key] = value
+
+    return strutils.mask_dict_password(out)
+