Merge pull request #77 from huangpeng5/25_2_0

25.2.0 release

Author: huangpeng5

Cinder/Antelope/__init__.py

@@ -1 +1 @@
-"""Version: 2.7.4"""
+"""Version: 25.2.0"""

Cinder/Antelope/huawei_base_driver.py

@@ -54,7 +54,7 @@
 
 
 class HuaweiBaseDriver(object):
-    VERSION = "2.7.4"
+    VERSION = "25.2.0"
 
     def __init__(self, *args, **kwargs):
         super(HuaweiBaseDriver, self).__init__(*args, **kwargs)

Cinder/Antelope/huawei_utils.py

@@ -134,8 +134,11 @@ def mask_initiator_array_sensitive_info(data, sensitive_keys):
 def mask_initiator_string_sensitive_info(data):
     """Mask iscsi/fc/nvme ini sensitive info with a string type data"""
     secret_str = "******"
-    if len(data) <= 6:
-        return secret_str
+    try:
+        if not data or len(str(data)) <= 6:
+            return secret_str
+    except Exception as err:
+        LOG.warning("Mask string sensitive info failed, reason is %s", err)
 
     out_str = data[0:3] + secret_str + data[-3::]
     return out_str

Cinder/Bobcat/__init__.py

@@ -1 +1 @@
-"""Version: 2.7.4"""
+"""Version: 25.2.0"""

Cinder/Bobcat/huawei_base_driver.py

@@ -54,7 +54,7 @@
 
 
 class HuaweiBaseDriver(object):
-    VERSION = "2.7.4"
+    VERSION = "25.2.0"
 
     def __init__(self, *args, **kwargs):
         super(HuaweiBaseDriver, self).__init__(*args, **kwargs)

Cinder/Bobcat/huawei_utils.py

@@ -134,8 +134,11 @@ def mask_initiator_array_sensitive_info(data, sensitive_keys):
 def mask_initiator_string_sensitive_info(data):
     """Mask iscsi/fc/nvme ini sensitive info with a string type data"""
     secret_str = "******"
-    if len(data) <= 6:
-        return secret_str
+    try:
+        if not data or len(str(data)) <= 6:
+            return secret_str
+    except Exception as err:
+        LOG.warning("Mask string sensitive info failed, reason is %s", err)
 
     out_str = data[0:3] + secret_str + data[-3::]
     return out_str

Cinder/Caracal/__init__.py

@@ -1 +1 @@
-"""Version: 2.7.4"""
+"""Version: 25.2.0"""

Cinder/Caracal/huawei_base_driver.py

@@ -54,7 +54,7 @@
 
 
 class HuaweiBaseDriver(object):
-    VERSION = "2.7.4"
+    VERSION = "25.2.0"
 
     def __init__(self, *args, **kwargs):
         super(HuaweiBaseDriver, self).__init__(*args, **kwargs)

Cinder/Caracal/huawei_utils.py

@@ -134,8 +134,11 @@ def mask_initiator_array_sensitive_info(data, sensitive_keys):
 def mask_initiator_string_sensitive_info(data):
     """Mask iscsi/fc/nvme ini sensitive info with a string type data"""
     secret_str = "******"
-    if len(data) <= 6:
-        return secret_str
+    try:
+        if not data or len(str(data)) <= 6:
+            return secret_str
+    except Exception as err:
+        LOG.warning("Mask string sensitive info failed, reason is %s", err)
 
     out_str = data[0:3] + secret_str + data[-3::]
     return out_str

Cinder/Dalmatian/__init__.py

@@ -1 +1 @@
-"""Version: 2.7.4"""
+"""Version: 25.2.0"""