python-openstackclient 6.6.0__py3-none-any.whl → 7.0.0__py3-none-any.whl

openstackclient/tests/functional/common/test_quota.py

@@ -39,40 +39,6 @@ class QuotaTests(base.TestCase):
         cls.openstack(f'project delete {cls.PROJECT_NAME}')
         super().tearDownClass()
 
-    def test_quota_list_details_compute(self):
-        expected_headers = ["Resource", "In Use", "Reserved", "Limit"]
-        cmd_output = self.openstack(
-            'quota list --detail --compute',
-            parse_output=True,
-        )
-        self.assertIsNotNone(cmd_output)
-        resources = []
-        for row in cmd_output:
-            row_headers = [str(r) for r in row.keys()]
-            self.assertEqual(sorted(expected_headers), sorted(row_headers))
-            resources.append(row['Resource'])
-        # Ensure that returned quota is compute quota
-        self.assertIn("instances", resources)
-        # and that there is no network quota here
-        self.assertNotIn("networks", resources)
-
-    def test_quota_list_details_network(self):
-        expected_headers = ["Resource", "In Use", "Reserved", "Limit"]
-        cmd_output = self.openstack(
-            'quota list --detail --network',
-            parse_output=True,
-        )
-        self.assertIsNotNone(cmd_output)
-        resources = []
-        for row in cmd_output:
-            row_headers = [str(r) for r in row.keys()]
-            self.assertEqual(sorted(expected_headers), sorted(row_headers))
-            resources.append(row['Resource'])
-        # Ensure that returned quota is network quota
-        self.assertIn("networks", resources)
-        # and that there is no compute quota here
-        self.assertNotIn("instances", resources)
-
     def test_quota_list_network_option(self):
         if not self.haz_network:
             self.skipTest("No Network service present")
@@ -155,41 +121,23 @@ class QuotaTests(base.TestCase):
         if self.haz_network:
             self.assertTrue(cmd_output["routers"] >= 0)
 
-    def test_quota_set_class(self):
+    def test_quota_set_default(self):
         self.openstack(
-            'quota set --key-pairs 33 --snapshots 43 ' + '--class default'
+            'quota set --key-pairs 33 --snapshots 43 --class default'
         )
         cmd_output = self.openstack(
-            'quota show --class default',
-            parse_output=True,
-        )
-        self.assertIsNotNone(cmd_output)
-        cmd_output = {x['Resource']: x['Limit'] for x in cmd_output}
-        self.assertEqual(
-            33,
-            cmd_output["key-pairs"],
-        )
-        self.assertEqual(
-            43,
-            cmd_output["snapshots"],
-        )
-
-        # Check default quota class
-        cmd_output = self.openstack(
-            'quota show --class',
+            'quota show --default',
             parse_output=True,
         )
         self.assertIsNotNone(cmd_output)
-        # We don't necessarily know the default quotas, we're checking the
-        # returned attributes
         cmd_output = {x['Resource']: x['Limit'] for x in cmd_output}
-        self.assertTrue(cmd_output["key-pairs"] >= 0)
-        self.assertTrue(cmd_output["snapshots"] >= 0)
+        self.assertEqual(33, cmd_output["key-pairs"])
+        self.assertEqual(43, cmd_output["snapshots"])
 
     def _restore_quota_limit(self, resource, limit, project):
-        self.openstack('quota set --%s %s %s' % (resource, limit, project))
+        self.openstack(f'quota set --{resource} {limit} {project}')
 
-    def test_quota_network_set_with_no_force(self):
+    def test_quota_set_network(self):
         if not self.haz_network:
             self.skipTest('No Network service present')
         if not self.is_extension_enabled('quota-check-limit'):
@@ -224,10 +172,10 @@ class QuotaTests(base.TestCase):
         self.assertRaises(
             exceptions.CommandFailed,
             self.openstack,
-            'quota set --networks 1 --no-force ' + self.PROJECT_NAME,
+            'quota set --networks 1 ' + self.PROJECT_NAME,
         )
 
-    def test_quota_network_set_with_force(self):
+    def test_quota_set_network_with_force(self):
         self.skipTest('story 2010110')
         if not self.haz_network:
             self.skipTest('No Network service present')
@@ -274,3 +222,37 @@ class QuotaTests(base.TestCase):
         )
         self.assertIsNotNone(cmd_output)
         self.assertEqual(1, cmd_output[0]['Networks'])
+
+    def test_quota_show(self):
+        expected_headers = ["Resource", "Limit"]
+        cmd_output = self.openstack(
+            'quota show',
+            parse_output=True,
+        )
+        self.assertIsNotNone(cmd_output)
+        resources = []
+        for row in cmd_output:
+            row_headers = [str(r) for r in row.keys()]
+            self.assertEqual(sorted(expected_headers), sorted(row_headers))
+            resources.append(row['Resource'])
+        # Ensure that returned quota has network quota...
+        self.assertIn("networks", resources)
+        # ...and compute quota
+        self.assertIn("instances", resources)
+
+    def test_quota_show_usage_option(self):
+        expected_headers = ["Resource", "Limit", "In Use", "Reserved"]
+        cmd_output = self.openstack(
+            'quota show --usage',
+            parse_output=True,
+        )
+        self.assertIsNotNone(cmd_output)
+        resources = []
+        for row in cmd_output:
+            row_headers = [str(r) for r in row.keys()]
+            self.assertEqual(sorted(expected_headers), sorted(row_headers))
+            resources.append(row['Resource'])
+        # Ensure that returned quota has network quota...
+        self.assertIn("networks", resources)
+        # ...and compute quota
+        self.assertIn("instances", resources)

openstackclient/tests/functional/compute/v2/common.py

@@ -28,7 +28,7 @@ class ComputeTestCase(base.TestCase):
 
     def setUp(self):
         """Select common resources"""
-        super(ComputeTestCase, self).setUp()
+        super().setUp()
         self.flavor_name = self.get_flavor()
         self.image_name = self.get_image()
         self.network_arg = self.get_network()
@@ -129,7 +129,7 @@ class ComputeTestCase(base.TestCase):
             )
             status = cmd_output['status']
             if status == expected_status:
-                print('Server {} now has status {}'.format(name, status))
+                print(f'Server {name} now has status {status}')
                 break
             print(
                 'Server {}: Waiting for {}, current status: {}'.format(

openstackclient/tests/functional/compute/v2/test_flavor.py

@@ -22,7 +22,7 @@ class FlavorTests(base.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        super(FlavorTests, cls).setUpClass()
+        super().setUpClass()
         # Make a project
         cmd_output = cls.openstack(
             "project create --enable " + cls.PROJECT_NAME,
@@ -36,7 +36,7 @@ class FlavorTests(base.TestCase):
             raw_output = cls.openstack("project delete " + cls.PROJECT_NAME)
             cls.assertOutput('', raw_output)
         finally:
-            super(FlavorTests, cls).tearDownClass()
+            super().tearDownClass()
 
     def test_flavor_delete(self):
         """Test create w/project, delete multiple"""

openstackclient/tests/functional/compute/v2/test_keypair.py

@@ -57,7 +57,7 @@ class KeypairTests(KeypairBase):
 
     def setUp(self):
         """Create keypair with randomized name for tests."""
-        super(KeypairTests, self).setUp()
+        super().setUp()
         self.KPName = data_utils.rand_name('TestKeyPair')
         self.keypair = self.keypair_create(self.KPName)
 

openstackclient/tests/functional/compute/v2/test_server.py

@@ -210,10 +210,10 @@ class ServerTests(common.ComputeTestCase):
             self.flavor_name,
             flavor['name'],
         )
-        self.assertEqual(
-            '%s (%s)' % (flavor['name'], flavor['id']),
-            cmd_output["flavor"],
-        )
+        # assume the v2.47+ output format
+        self.assertIsInstance(cmd_output['flavor'], dict)
+        self.assertIn('name', cmd_output['flavor'])
+        self.assertEqual(flavor['name'], cmd_output['flavor']['name'])
         image = self.openstack(
             'image show ' + self.image_name,
             parse_output=True,
@@ -223,7 +223,7 @@ class ServerTests(common.ComputeTestCase):
             image['name'],
         )
         self.assertEqual(
-            '%s (%s)' % (image['name'], image['id']),
+            '{} ({})'.format(image['name'], image['id']),
             cmd_output["image"],
         )
 

openstackclient/tests/functional/compute/v2/test_server_event.py

@@ -20,7 +20,7 @@ class ServerEventTests(common.ComputeTestCase):
     """Functional tests for server event"""
 
     def setUp(self):
-        super(ServerEventTests, self).setUp()
+        super().setUp()
 
         # NOTE(dtroyer): As long as these tests are read-only we can get away
         #                with using the same server instance for all of them.

openstackclient/tests/functional/identity/v2/common.py

@@ -59,7 +59,7 @@ class IdentityTests(base.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        super(IdentityTests, cls).setUpClass()
+        super().setUpClass()
         # create dummy project
         cls.project_name = data_utils.rand_name('TestProject')
         cls.project_description = data_utils.rand_name('description')
@@ -90,10 +90,10 @@ class IdentityTests(base.TestCase):
                 'project delete %s' % cls.project_name
             )
         finally:
-            super(IdentityTests, cls).tearDownClass()
+            super().tearDownClass()
 
     def setUp(self):
-        super(IdentityTests, self).setUp()
+        super().setUp()
         # prepare v2 env
         ver_fixture = fixtures.EnvironmentVariable(
             'OS_IDENTITY_API_VERSION', '2.0'

openstackclient/tests/functional/identity/v3/common.py

@@ -33,7 +33,6 @@ class IdentityTests(base.TestCase):
         'enabled',
         'id',
         'name',
-        'name',
         'domain_id',
         'default_project_id',
         'description',
@@ -49,7 +48,7 @@ class IdentityTests(base.TestCase):
         'parent_id',
     ]
     ROLE_FIELDS = ['id', 'name', 'domain_id', 'description']
-    SERVICE_FIELDS = ['id', 'enabled', 'name', 'type', 'description']
+    SERVICE_FIELDS = ['ID', 'Enabled', 'Name', 'Type', 'Description']
     REGION_FIELDS = ['description', 'enabled', 'parent_region', 'region']
     ENDPOINT_FIELDS = [
         'id',
@@ -104,6 +103,15 @@ class IdentityTests(base.TestCase):
         'Implied Role ID',
         'Implied Role Name',
     ]
+    ROLE_ASSIGNMENT_LIST_HEADERS = [
+        'Role',
+        'User',
+        'Group',
+        'Project',
+        'Domain',
+        'System',
+        'Inherited',
+    ]
     REGISTERED_LIMIT_FIELDS = [
         'id',
         'service_id',
@@ -141,7 +149,7 @@ class IdentityTests(base.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        super(IdentityTests, cls).setUpClass()
+        super().setUpClass()
         # create dummy domain
         cls.domain_name = data_utils.rand_name('TestDomain')
         cls.domain_description = data_utils.rand_name('description')
@@ -189,10 +197,10 @@ class IdentityTests(base.TestCase):
                 'domain delete %s' % cls.domain_name
             )
         finally:
-            super(IdentityTests, cls).tearDownClass()
+            super().tearDownClass()
 
     def setUp(self):
-        super(IdentityTests, self).setUp()
+        super().setUp()
         # prepare v3 env
         ver_fixture = fixtures.EnvironmentVariable(
             'OS_IDENTITY_API_VERSION', '3'
@@ -368,7 +376,7 @@ class IdentityTests(base.TestCase):
         if add_clean_up:
             service = self.parse_show_as_object(raw_output)
             self.addCleanup(
-                self.openstack, 'service delete %s' % service['id']
+                self.openstack, 'service delete %s' % service['ID']
             )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.SERVICE_FIELDS)

openstackclient/tests/functional/identity/v3/test_application_credential.py

@@ -21,13 +21,13 @@ from openstackclient.tests.functional.identity.v3 import common
 
 class ApplicationCredentialTests(common.IdentityTests):
     APPLICATION_CREDENTIAL_FIELDS = [
-        'id',
-        'name',
-        'project_id',
-        'description',
-        'roles',
-        'expires_at',
-        'unrestricted',
+        'ID',
+        'Name',
+        'Project ID',
+        'Description',
+        'Roles',
+        'Expires At',
+        'Unrestricted',
     ]
     APPLICATION_CREDENTIAL_LIST_HEADERS = [
         'ID',
@@ -39,12 +39,10 @@ class ApplicationCredentialTests(common.IdentityTests):
 
     def test_application_credential_create(self):
         name = data_utils.rand_name('name')
-        raw_output = self.openstack(
-            'application credential create %(name)s' % {'name': name}
-        )
+        raw_output = self.openstack(f'application credential create {name}')
         self.addCleanup(
             self.openstack,
-            'application credential delete %(name)s' % {'name': name},
+            f'application credential delete {name}',
         )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.APPLICATION_CREDENTIAL_FIELDS)
@@ -145,16 +143,14 @@ class ApplicationCredentialTests(common.IdentityTests):
         )
         self.addCleanup(
             self.openstack,
-            'application credential delete %(name)s' % {'name': name},
+            f'application credential delete {name}',
         )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.APPLICATION_CREDENTIAL_FIELDS)
 
     def test_application_credential_delete(self):
         name = data_utils.rand_name('name')
-        self.openstack(
-            'application credential create %(name)s' % {'name': name}
-        )
+        self.openstack(f'application credential create {name}')
         raw_output = self.openstack(
             'application credential delete ' '%(name)s' % {'name': name}
         )
@@ -169,12 +165,10 @@ class ApplicationCredentialTests(common.IdentityTests):
 
     def test_application_credential_show(self):
         name = data_utils.rand_name('name')
-        raw_output = self.openstack(
-            'application credential create %(name)s' % {'name': name}
-        )
+        raw_output = self.openstack(f'application credential create {name}')
         self.addCleanup(
             self.openstack,
-            'application credential delete %(name)s' % {'name': name},
+            f'application credential delete {name}',
         )
         raw_output = self.openstack(
             'application credential show ' '%(name)s' % {'name': name}

openstackclient/tests/functional/identity/v3/test_domain.py

@@ -50,9 +50,7 @@ class DomainTests(common.IdentityTests):
         self.assertEqual(0, len(raw_output))
         raw_output = self.openstack('domain set --disable %s' % domain_2)
         self.assertEqual(0, len(raw_output))
-        raw_output = self.openstack(
-            'domain delete %s %s' % (domain_1, domain_2)
-        )
+        raw_output = self.openstack(f'domain delete {domain_1} {domain_2}')
         self.assertEqual(0, len(raw_output))
 
     def test_domain_delete_failure(self):

openstackclient/tests/functional/identity/v3/test_endpoint.py

@@ -30,7 +30,7 @@ class EndpointTests(common.IdentityTests):
         endpoint_1 = self._create_dummy_endpoint(add_clean_up=False)
         endpoint_2 = self._create_dummy_endpoint(add_clean_up=False)
         raw_output = self.openstack(
-            'endpoint delete %s %s' % (endpoint_1, endpoint_2)
+            f'endpoint delete {endpoint_1} {endpoint_2}'
         )
         self.assertEqual(0, len(raw_output))
 

openstackclient/tests/functional/identity/v3/test_idp.py

@@ -32,7 +32,7 @@ class IdentityProviderTests(common.IdentityTests):
         idp_1 = self._create_dummy_idp(add_clean_up=False)
         idp_2 = self._create_dummy_idp(add_clean_up=False)
         raw_output = self.openstack(
-            'identity provider delete %s %s' % (idp_1, idp_2)
+            f'identity provider delete {idp_1} {idp_2}'
         )
         self.assertEqual(0, len(raw_output))
 

openstackclient/tests/functional/identity/v3/test_limit.py

@@ -32,7 +32,7 @@ class LimitTestCase(common.IdentityTests):
 
         raw_output = self.openstack('service show %s' % service_id)
         items = self.parse_show(raw_output)
-        service_name = self._extract_value_from_items('name', items)
+        service_name = self._extract_value_from_items('Name', items)
 
         project_name = self._create_dummy_project()
         raw_output = self.openstack('project show %s' % project_name)
@@ -73,7 +73,7 @@ class LimitTestCase(common.IdentityTests):
 
         raw_output = self.openstack('service show %s' % service_id)
         items = self.parse_show(raw_output)
-        service_name = self._extract_value_from_items('name', items)
+        service_name = self._extract_value_from_items('Name', items)
 
         project_name = self._create_dummy_project()
 

openstackclient/tests/functional/identity/v3/test_region.py

@@ -29,9 +29,7 @@ class RegionTests(common.IdentityTests):
     def test_region_multi_delete(self):
         region_1 = self._create_dummy_region(add_clean_up=False)
         region_2 = self._create_dummy_region(add_clean_up=False)
-        raw_output = self.openstack(
-            'region delete %s %s' % (region_1, region_2)
-        )
+        raw_output = self.openstack(f'region delete {region_1} {region_2}')
         self.assertEqual(0, len(raw_output))
 
     def test_region_list(self):

openstackclient/tests/functional/identity/v3/test_registered_limit.py

@@ -29,7 +29,7 @@ class RegisteredLimitTestCase(common.IdentityTests):
             'service show' ' %(service_name)s' % {'service_name': service_name}
         )
         service_items = self.parse_show(raw_output)
-        service_id = self._extract_value_from_items('id', service_items)
+        service_id = self._extract_value_from_items('ID', service_items)
 
         raw_output = self.openstack(
             'registered limit create'

openstackclient/tests/functional/identity/v3/test_role.py

@@ -55,7 +55,7 @@ class RoleTests(common.IdentityTests):
         role_name = self._create_dummy_role()
         new_role_name = data_utils.rand_name('NewTestRole')
         raw_output = self.openstack(
-            'role set --name %s %s' % (new_role_name, role_name)
+            f'role set --name {new_role_name} {role_name}'
         )
         self.assertEqual(0, len(raw_output))
         raw_output = self.openstack('role show %s' % new_role_name)
@@ -66,7 +66,7 @@ class RoleTests(common.IdentityTests):
         role_name = self._create_dummy_role()
         description = data_utils.rand_name("NewDescription")
         raw_output = self.openstack(
-            'role set --description %s %s' % (description, role_name)
+            f'role set --description {description} {role_name}'
         )
         self.assertEqual(0, len(raw_output))
         raw_output = self.openstack('role show %s' % role_name)