Merge pull request #38 from bingyanh/2.6.1_local

update 2.6.1
Huawei · Jul 9, 2023 · 17482ae · 17482ae
2 parents dd868a6 + 27f70cb
commit 17482ae
Show file tree

Hide file tree

Showing 68 changed files with 8,516 additions and 404 deletions.
diff --git a/Cinder/Mitaka/dsware.py b/Cinder/Mitaka/dsware.py
@@ -148,7 +148,7 @@
 
 class DSWAREDriver(driver.VolumeDriver):
     """Huawei FusionStorage Driver."""
-    VERSION = '1.0'
+    VERSION = "2.6.1"
 
     # ThirdPartySystems wiki page
     CI_WIKI_NAME = "Huawei_FusionStorage_CI"

diff --git a/Cinder/Newton/constants.py b/Cinder/Newton/constants.py
@@ -45,6 +45,14 @@
 CONF_STORAGE_CERT_FILEPATH = "storage_cert_filepath"
 CONF_STORAGE_SSL_TWO_WAY_AUTH = "storage_ssl_two_way_auth"
 
+DEFAULT_WAIT_INTERVAL = 5
+MIGRATION_COMPLETE = 76
+MIGRATION_FAULT = 74
+STATUS_HEALTH = 1
+STATUS_VOLUME_READY = 27
+MIGRATION_WAIT_INTERVAL = 5
+DEFAULT_WAIT_TIMEOUT = 3600 * 24 * 30
+
 QOS_MUST_SET = ["maxIOPS", "maxMBPS"]
 QOS_KEYS = ["maxIOPS", "maxMBPS", "total_iops_sec", "total_bytes_sec"]
 QOS_SCHEDULER_KEYS = ["scheduleType", "startDate", "startTime",
@@ -53,6 +61,7 @@
 QOS_SCHEDULER_DEFAULT_TYPE = "0"
 QOS_SCHEDULER_WEEK_TYPE = "3"
 QOS_SUPPORT_SCHEDULE_VERSION = "8.0"
+QOS_MAX_INTERCEPT_LENGTH = 36
 SECONDS_OF_DAY = 24 * 60 * 60
 SECONDS_OF_HOUR = 60 * 60
 SNAPSHOT_HEALTH_STATUS = (
@@ -80,3 +89,9 @@
 HOSTGROUP_ALREADY_EXIST = 50157044
 INITIATOR_ALREADY_EXIST = 50155102
 INITIATOR_IN_HOST = 50157021
+
+CHECK_CLONED_INTERVAL = 2
+REST_VOLUME_CREATING_STATUS = 15
+REST_VOLUME_DUPLICATE_VOLUME = 6
+REST_VOLUME_CREATE_SUCCESS_STATUS = 0
+CLONE_VOLUME_TIMEOUT = 3600 * 24 * 30