Fix for CSS default volume type (#608)

Fix for CSS default volume type

Reviewed-by: Anton Sidelnikov

Author: vineet-pruthi

examples/css/create_cluster.py

@@ -30,7 +30,7 @@
     'instance': {
         'availability_zone': 'eu-de-01',
         'flavorRef': 'css.xlarge.2',
-        'volume': {'volume_type': 'COMMON', 'size': 100},
+        'volume': {'volume_type': 'HIGH', 'size': 100},
         'nics': {
             'vpcId': 'router-id',
             'netId': 'network-id',

examples/css/create_cluster_opensearch.py

@@ -31,7 +31,7 @@
         'availability_zone': 'eu-de-01',
         'flavorRef': 'css.xlarge.2',
         'volume': {
-            'volume_type': 'COMMON',
+            'volume_type': 'HIGH',
             'size': 100,
         },
         'nics': {

otcextensions/osclient/css/v1/cluster.py

@@ -27,9 +27,9 @@
 LOG = logging.getLogger(__name__)
 
 
-DISK_TYPE_CHOICES = ['common', 'high', 'ultrahigh']
+DISK_TYPE_CHOICES = ['high', 'ultrahigh']
 NODE_TYPE_CHOICES = ['ess', 'ess-cold', 'ess-client', 'ess-master']
-VOLUME_TYPE_CHOICES = ['ULTRAHIGH', 'COMMON', 'HIGH']
+VOLUME_TYPE_CHOICES = ['ULTRAHIGH', 'HIGH']
 UPGRADE_TYPE_CHOICES = ['same', 'cross', 'cross-engine']
 
 
@@ -103,7 +103,7 @@ def get_parser(self, prog_name):
                 'If datastore_type is `elasticsearch` supported versions: '
                 '(7.6.2, 7.9.3, 7.10.2)\n'
                 'If datastore_type is `opensearch` supported versions: '
-                '(1.3.6)\n'
+                '(1.3.6, 2.11.0)\n'
                 '(default datastore_version: 7.10.2).'
             ),
         )
@@ -147,12 +147,12 @@ def get_parser(self, prog_name):
             '--volume-type',
             metavar='{' + ','.join(DISK_TYPE_CHOICES) + '}',
             type=lambda s: s.upper(),
-            default='COMMON',
+            default='HIGH',
             dest='volume_type',
             choices=[s.upper() for s in DISK_TYPE_CHOICES],
             help=_(
-                'Volume type. Supported types: COMMON, HIGH, ULTRAHIGH. '
-                '(default value: COMMON)'
+                'Volume type. Supported types: HIGH, ULTRAHIGH. '
+                '(default value: HIGH)'
             ),
         )
         network_group = parser.add_argument_group('Network Parameters')

otcextensions/tests/unit/osclient/css/v1/test_cluster.py

@@ -142,7 +142,7 @@ def test_create(self):
             '--volume-size',
             '100',
             '--volume-type',
-            'COMMON',
+            'HIGH',
             '--cmk-id',
             'cmk-uuid',
             '--https-enable',
@@ -170,7 +170,7 @@ def test_create(self):
             ('security_group_id', 'sg-uuid'),
             ('num_nodes', 2),
             ('volume_size', 100),
-            ('volume_type', 'COMMON'),
+            ('volume_type', 'HIGH'),
             ('cmk_id', 'cmk-uuid'),
             ('https_enable', True),
             ('admin_pwd', 'testtest'),
@@ -208,7 +208,7 @@ def test_create(self):
             'instance': {
                 'availability_zone': 'eu-de-01,eu-de-02',
                 'flavorRef': 'css-flavor',
-                'volume': {'volume_type': 'COMMON', 'size': 100},
+                'volume': {'volume_type': 'HIGH', 'size': 100},
                 'nics': {
                     'vpcId': 'router-uuid',
                     'netId': 'network-uuid',
@@ -1177,7 +1177,7 @@ def test_add_nodes(self):
             '--node-size',
             '3',
             '--volume-type',
-            'COMMON',
+            'HIGH',
             '--wait',
         ]
 
@@ -1186,15 +1186,15 @@ def test_add_nodes(self):
             ('node_type', 'ess'),
             ('flavor', 'node_flavor'),
             ('node_size', 3),
-            ('volume_type', 'COMMON'),
+            ('volume_type', 'HIGH'),
             ('wait', True),
         ]
 
         expected_data = {
             'node_type': 'ess',
             'flavor': 'node_flavor',
             'node_size': 3,
-            'volume_type': 'COMMON',
+            'volume_type': 'HIGH',
         }
 
         # Verify cm is triggered with default parameters

releasenotes/notes/css_fix_vol_type-a6c5375a941389eb.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Fix for CSS default volume type.