adding missing rds parameters and fixing some old bugs (#471)

adding missing rds parameters and fixing some old bugs

Reviewed-by: Anton Sidelnikov

Author: vladimirhasko

otcextensions/sdk/rds/v3/_proxy.py

@@ -62,17 +62,18 @@ def datastores(self, database_name):
 
     # ======= Flavors =======
 
-    def flavors(self, datastore_name, version_name):
-        """List flavors of given datastore_name and datastore_version
+    def flavors(self, datastore_name, **params):
+        """List flavors of given datastore_name and other optional parameters
 
         :param datastore_name: datastore_name
         :param version_name: version_name
+        :param spec_code: spec_code
 
         :returns: A generator of flavor objects.
         """
         return self._list(_flavor.Flavor,
                           datastore_name=datastore_name,
-                          version_name=version_name)
+                          **params)
 
     # ======= Instance =======
 

otcextensions/sdk/rds/v3/flavor.py

@@ -19,7 +19,8 @@ class Flavor(resource.Resource):
 
     # capabilities
     allow_list = True
-    _query_mapping = resource.QueryParameters('version_name')
+    _query_mapping = resource.QueryParameters(
+        'version_name', 'spec_code')
 
     datastore_name = resource.URI('datastore_name')
     #: Instance Mode (single/ha/replica)
@@ -37,3 +38,15 @@ class Flavor(resource.Resource):
     #: Amount of VCPU's
     #: *Type: str*
     vcpus = resource.Body('vcpus')
+    #: Group type
+    #: *Type: str*
+    group_type = resource.Body('group_type')
+    #: Supported Versions
+    #: *Type:list*
+    version_name = resource.Body('version_name', type=list)
+    #: Availability Zone Status
+    #: *Type: dict*
+    az_status = resource.Body('az_status', type=dict)
+    #: Availability Zone Description
+    #: *Type: dict*
+    az_desc = resource.Body('az_desc', type=dict)

otcextensions/tests/functional/sdk/auto_scaling/v1/base.py

@@ -30,7 +30,7 @@ class TestAs(base.BaseFunctionalTest):
     AS_CONFIG = None
     AS_INSTANCE = None
     MAX_INST_NUMBER = 1
-    IMAGE_NAME = "Standard_Debian_10_latest"
+    IMAGE_NAME = "Standard_Debian_11_latest"
     DISK_SIZE = 4
     KP_NAME = None
     AS_GROUP_NAME = None

otcextensions/tests/unit/sdk/rds/v3/test_flavor.py

@@ -17,7 +17,21 @@
     "vcpus": "1",
     "ram": 2,
     "spec_code": "rds.mysql.c2.medium.ha",
-    "instance_mode": "ha"
+    "instance_mode": "ha",
+    "group_type": "normal",
+    "version_name": [
+        "8.0"
+    ],
+    "az_status": {
+        "eu-de-02": "normal",
+        "eu-de-01": "normal",
+        "eu-de-03": "normal"
+    },
+    "az_desc": {
+        "eu-de-02": "eu-de-02",
+        "eu-de-01": "eu-de-01",
+        "eu-de-03": "eu-de-03"
+    }
 }
 
 
@@ -37,7 +51,8 @@ def test_basic(self):
         self.assertFalse(sot.allow_commit)
         self.assertDictEqual({'limit': 'limit',
                               'marker': 'marker',
-                              'version_name': 'version_name'},
+                              'version_name': 'version_name',
+                              'spec_code': 'spec_code'},
                              sot._query_mapping._mapping)
 
     def test_make_it(self):
@@ -48,3 +63,7 @@ def test_make_it(self):
         self.assertEqual(EXAMPLE['vcpus'], sot.vcpus)
         self.assertEqual(EXAMPLE['ram'], sot.ram)
         self.assertEqual(EXAMPLE['instance_mode'], sot.instance_mode)
+        self.assertEqual(EXAMPLE['group_type'], sot.group_type)
+        self.assertEqual(EXAMPLE['version_name'], sot.version_name)
+        self.assertEqual(EXAMPLE['az_status'], sot.az_status)
+        self.assertEqual(EXAMPLE['az_desc'], sot.az_desc)