Func tests for Rds v3

otcextensions/tests/functional/osclient/rds/v3/test_configuration.py

@@ -11,133 +11,96 @@
 #    under the License.
 
 import json
-import uuid
+import random
 
 from openstackclient.tests.functional import base
 
 
 class TestRdsConfiguration(base.TestCase):
     """Functional tests for RDS Configurations. """
 
-    NAME = uuid.uuid4().hex
-
     def test_list(self):
-        json_output = json.loads(
-            self.openstack('rds configuration list -f json '))
+        json_output = json.loads(self.openstack(
+            'rds configuration list -f json '
+        ))
         self.assertIsNotNone(json_output)
 
     def test_show(self):
-        json_output = json.loads(
-            self.openstack('rds configuration list -f json'))
-
-        json_output = json.loads(
-            self.openstack(
-                'rds configuration show {cfg} '
-                '-f json'.format(
-                    cfg=json_output[0]['ID']
-                )
-            )
-        )
+        json_output = json.loads(self.openstack(
+            'rds configuration list -f json'
+        ))
 
-        self.assertIsNotNone(json_output['id'])
+        json_output = json.loads(self.openstack(
+            'rds configuration show {cfg} -f json'.format(
+                cfg=json_output[0]['ID'])
+        ))
 
-    def test_long(self):
-        json_output = json.loads(
-            self.openstack(
-                'rds configuration create '
-                '--datastore-type postgresql '
-                '--datastore-version 9.6 '
-                '--value max_connections=10 '
-                '{name} -f json'.format(name=self.NAME)
-            )
-        )
-        id = json_output['id']
-        self.addCleanup(self.openstack, 'rds configuration delete ' + id)
-
-        json_output = json.loads(
-            self.openstack(
-                'rds configuration show {id} '
-                '-f json'.format(id=id)
-            )
-        )
-        self.assertTrue(self.NAME, json_output['name'])
+        self.assertIsNotNone(json_output['id'])
 
-        json_output = json.loads(
-            self.openstack(
-                'rds configuration show {id} '
-                '-f json'.format(id=self.NAME)
-            )
-        )
-        self.assertTrue(id, json_output['id'])
+    def test_create(self):
+        name = 'osc-test-config-' + format(random.randint(1, 2**16), '04x')
+        json_output = json.loads(self.openstack(
+            'rds configuration create '
+            '{name} '
+            '--datastore-type MySQL '
+            '--datastore-version 5.7 '
+            '-f json'.format(
+                name=name)
+        ))
+        self.assertIsNotNone(json_output)
 
         self.openstack(
-            'rds configuration set '
-            '--value max_connections=15 '
-            '{name}'.format(name=self.NAME)
+            'rds configuration delete '
+            '{name} '.format(
+                name=name)
         )
+        self.assertTrue(True)
 
-    def test_create(self):
-        name = uuid.uuid4().hex
-        json_output = json.loads(
-            self.openstack(
-                'rds configuration create '
-                '{name} '
-                '--datastore-type MySQL '
-                '--datastore-version 5.7 '
-                '-f json'.format(name=name)
-            )
-        )
+    def test_create_with_value(self):
+        name = 'osc-test-config-' + format(random.randint(1, 2**16), '04x')
+        json_output = json.loads(self.openstack(
+            'rds configuration create '
+            '{name} '
+            '--datastore-type MySQL '
+            '--datastore-version 5.7 '
+            '--value max_connections=10 '
+            '--value autocommit=OFF '
+            '-f json'.format(
+                name=name)
+        ))
         self.assertIsNotNone(json_output)
-        id = json_output['id']
-        self.addCleanup(self.openstack, 'rds configuration delete ' + id)
 
-    def test_create_with_value(self):
-        name = uuid.uuid4().hex
-        json_output = json.loads(
-            self.openstack(
-                'rds configuration create '
-                '{name} '
-                '--datastore-type MySQL '
-                '--datastore-version 5.7 '
-                '--value max_connections=10 '
-                '--value autocommit=OFF '
-                '-f json'.format(name=name)
-            )
+        self.openstack(
+            'rds configuration delete '
+            '{name} '.format(
+                name=name)
         )
-        self.assertIsNotNone(json_output)
-        self.assertEqual(name, json_output['name'])
-        id = json_output['id']
-        self.addCleanup(self.openstack, 'rds configuration delete ' + id)
+        self.assertTrue(True)
 
     def test_config_param_list(self):
-        json_output = json.loads(
-            self.openstack(
-                'rds configuration list -f json'
-            )
-        )
-        json_output = json.loads(
-            self.openstack(
-                'rds configuration parameter list '
-                '{cfg} '
-                '-f json'.format(cfg=json_output[0]['ID'])
-            )
-        )
+        json_output = json.loads(self.openstack(
+            'rds configuration list -f json'
+        ))
+
+        json_output = json.loads(self.openstack(
+            'rds configuration parameter list '
+            '{cfg} '
+            '-f json'.format(
+                cfg=json_output[0]['ID'])
+        ))
         self.assertIsNotNone(json_output)
 
     def test_config_set(self):
-        name = uuid.uuid4().hex
-        json_output = json.loads(
-            self.openstack(
-                'rds configuration create '
-                '{name} '
-                '--datastore-type MySQL '
-                '--datastore-version 5.7 '
-                '-f json'.format(name=name)
-            )
-        )
+        name = 'osc-test-config-' + format(random.randint(1, 2**16), '04x')
+        json_output = json.loads(self.openstack(
+            'rds configuration create '
+            '{name} '
+            '--datastore-type MySQL '
+            '--datastore-version 5.7 '
+            '-f json'.format(
+                name=name)
+        ))
         self.assertIsNotNone(json_output)
-        id = json_output['id']
-        self.addCleanup(self.openstack, 'rds configuration delete ' + id)
 
         self.openstack(
             'rds configuration set '
@@ -146,3 +109,10 @@ def test_config_set(self):
             '--value autocommit=OFF'.format(name=name)
         )
         self.assertTrue(True)
+
+        self.openstack(
+            'rds configuration delete '
+            '{name} '.format(
+                name=name)
+        )
+        self.assertTrue(True)

otcextensions/tests/functional/osclient/rds/v3/test_datastore.py

@@ -13,6 +13,7 @@
 import json
 
 from openstackclient.tests.functional import base
+from tempest.lib import exceptions
 
 
 class TestRdsDatastore(base.TestCase):
@@ -22,14 +23,30 @@ def test_datastore_list(self):
         json_output = json.loads(self.openstack(
             'rds datastore type list -f json '
         ))
-        self.assertIn(
-            'PostgreSQL',
-            [ds['Name'] for ds in json_output]
+
+        self.assertItemsEqual(
+            ['postgresql', 'mysql', 'sqlserver'],
+            [ds.get('Name', None).lower() for ds in json_output]
         )
 
     def test_datastore_version_list(self):
-        json_output = json.loads(self.openstack(
-            'rds datastore version list PostgreSQL -f json'
+        datastores = json.loads(self.openstack(
+            'rds datastore type list -f json'
         ))
+        for datastore in datastores:
+            json_output = json.loads(self.openstack(
+                'rds datastore version list {ds} '
+                '-f json'.format(ds=datastore['Name'])
+            ))
+            self.assertIsNotNone(json_output)
+            self.assertEqual(
+                ['ID', 'Name'],
+                list(json_output[0].keys())
+            )
 
-        self.assertIsNotNone(json_output)
+    def test_invalid_datastore_version_list(self):
+        self.assertRaises(
+            exceptions.CommandFailed,
+            self.openstack,
+            'rds datastore version list invalid_ds'
+        )

otcextensions/tests/functional/osclient/rds/v3/test_flavor.py

@@ -14,6 +14,7 @@
 import uuid
 
 from openstackclient.tests.functional import base
+from tempest.lib import exceptions
 
 
 class TestRdsFlavor(base.TestCase):
@@ -23,14 +24,50 @@ class TestRdsFlavor(base.TestCase):
     OTHER_NAME = uuid.uuid4().hex
 
     def test_flavor_list(self):
-        json_output = json.loads(self.openstack(
-            'rds datastore version list postgresql -f json '
+        datastores = json.loads(self.openstack(
+            'rds datastore type list -f json'
         ))
-        ver = json_output[0]['Name']
+        for datastore in datastores:
+            datastore = datastore['Name']
+            json_output = json.loads(self.openstack(
+                'rds datastore version list ' + datastore + ' -f json '
+            ))
 
-        json_output = json.loads(self.openstack(
-            'rds flavor list postgresql {ver} -f json '.format(
-                ver=ver)
-        ))
+            for ds_ver in json_output:
+                json_output = json.loads(self.openstack(
+                    'rds flavor list {ds} {ver} -f json'.format(
+                        ds=datastore,
+                        ver=ds_ver['Name'])
+                ))
+
+                self.assertIsNotNone(json_output)
+                self.assertEqual(
+                    ['name', 'instance_mode', 'vcpus', 'ram'],
+                    list(json_output[0].keys())
+                )
+
+    def test_invalid_datastore_flavor_list(self):
+        self.assertRaises(
+            exceptions.CommandFailed,
+            self.openstack,
+            'rds flavor list'
+        )
 
-        self.assertIsNotNone(json_output)
+        self.assertRaises(
+            exceptions.CommandFailed,
+            self.openstack,
+            'rds flavor list invalid_ds 5.6'
+        )
+
+        datastores = json.loads(self.openstack(
+            'rds datastore type list -f json'
+        ))
+        for datastore in datastores:
+            datastore = datastore['Name']
+            self.assertRaises(
+                exceptions.CommandFailed,
+                self.openstack,
+                'rds flavor list {ds} {ver}'.format(
+                    ds=datastore,
+                    ver=0.0)
+            )