python-openstackclient 6.6.1__py3-none-any.whl → 7.1.0__py3-none-any.whl

openstackclient/tests/unit/api/test_image_v1.py

@@ -26,7 +26,7 @@ FAKE_URL = 'http://gopher.dev10.com'
 
 class TestImageAPIv1(utils.TestCase):
     def setUp(self):
-        super(TestImageAPIv1, self).setUp()
+        super().setUp()
 
         sess = session.Session()
         self.api = image_v1.APIv1(session=sess, endpoint=FAKE_URL)

openstackclient/tests/unit/api/test_image_v2.py

@@ -26,7 +26,7 @@ FAKE_URL = 'http://gopher.dev20.com'
 
 class TestImageAPIv2(utils.TestCase):
     def setUp(self):
-        super(TestImageAPIv2, self).setUp()
+        super().setUp()
 
         sess = session.Session()
         self.api = image_v2.APIv2(session=sess, endpoint=FAKE_URL)

openstackclient/tests/unit/api/test_object_store_v1.py

@@ -52,7 +52,7 @@ LIST_OBJECT_RESP = [
 
 class TestObjectAPIv1(utils.TestCase):
     def setUp(self):
-        super(TestObjectAPIv1, self).setUp()
+        super().setUp()
         sess = session.Session()
         self.api = object_store.APIv1(session=sess, endpoint=FAKE_URL)
         self.requests_mock = self.useFixture(fixture.Fixture())
@@ -60,7 +60,7 @@ class TestObjectAPIv1(utils.TestCase):
 
 class TestContainer(TestObjectAPIv1):
     def setUp(self):
-        super(TestContainer, self).setUp()
+        super().setUp()
 
     def test_container_create(self):
         headers = {
@@ -181,9 +181,9 @@ class TestContainer(TestObjectAPIv1):
 
 class TestObject(TestObjectAPIv1):
     def setUp(self):
-        super(TestObject, self).setUp()
+        super().setUp()
 
-    @mock.patch('openstackclient.api.object_store_v1.io.open')
+    @mock.patch('openstackclient.api.object_store_v1.open')
     def base_object_create(self, file_contents, mock_open):
         mock_open.read.return_value = file_contents
 

openstackclient/tests/unit/common/test_limits.py

@@ -13,23 +13,62 @@
 
 from openstackclient.common import limits
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
-from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes
+from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
 
 
 class TestComputeLimits(compute_fakes.TestComputev2):
-    absolute_columns = [
-        'Name',
-        'Value',
-    ]
-
+    absolute_columns = ['Name', 'Value']
     rate_columns = ["Verb", "URI", "Value", "Remain", "Unit", "Next Available"]
 
     def setUp(self):
         super().setUp()
         self.app.client_manager.volume_endpoint_enabled = False
 
-        self.fake_limits = compute_fakes.FakeLimits()
-        self.compute_client.limits.get.return_value = self.fake_limits
+        self.fake_limits = compute_fakes.create_limits()
+
+        self.absolute_data = [
+            ('floating_ips', 10),
+            ('floating_ips_used', 0),
+            ('image_meta', 128),
+            ('instances', 10),
+            ('instances_used', 0),
+            ('keypairs', 100),
+            ('max_image_meta', 128),
+            ('max_security_group_rules', 20),
+            ('max_security_groups', 10),
+            ('max_server_group_members', 10),
+            ('max_server_groups', 10),
+            ('max_server_meta', 128),
+            ('max_total_cores', 20),
+            ('max_total_floating_ips', 10),
+            ('max_total_instances', 10),
+            ('max_total_keypairs', 100),
+            ('max_total_ram_size', 51200),
+            ('personality', 5),
+            ('personality_size', 10240),
+            ('security_group_rules', 20),
+            ('security_groups', 10),
+            ('security_groups_used', 0),
+            ('server_group_members', 10),
+            ('server_groups', 10),
+            ('server_groups_used', 0),
+            ('server_meta', 128),
+            ('total_cores', 20),
+            ('total_cores_used', 0),
+            ('total_floating_ips_used', 0),
+            ('total_instances_used', 0),
+            ('total_ram', 51200),
+            ('total_ram_used', 0),
+            ('total_security_groups_used', 0),
+            ('total_server_groups_used', 0),
+        ]
+        self.rate_data = [
+            ('POST', '*', 10, 2, 'MINUTE', '2011-12-15T22:42:45Z'),
+            ('PUT', '*', 10, 2, 'MINUTE', '2011-12-15T22:42:45Z'),
+            ('DELETE', '*', 100, 100, 'MINUTE', '2011-12-15T22:42:45Z'),
+        ]
+
+        self.compute_sdk_client.get_limits.return_value = self.fake_limits
 
     def test_compute_show_absolute(self):
         arglist = ['--absolute']
@@ -39,12 +78,8 @@ class TestComputeLimits(compute_fakes.TestComputev2):
 
         columns, data = cmd.take_action(parsed_args)
 
-        ret_limits = list(data)
-        compute_reference_limits = self.fake_limits.absolute_limits()
-
         self.assertEqual(self.absolute_columns, columns)
-        self.assertEqual(compute_reference_limits, ret_limits)
-        self.assertEqual(19, len(ret_limits))
+        self.assertEqual(self.absolute_data, data)
 
     def test_compute_show_rate(self):
         arglist = ['--rate']
@@ -54,28 +89,39 @@ class TestComputeLimits(compute_fakes.TestComputev2):
 
         columns, data = cmd.take_action(parsed_args)
 
-        ret_limits = list(data)
-        compute_reference_limits = self.fake_limits.rate_limits()
-
         self.assertEqual(self.rate_columns, columns)
-        self.assertEqual(compute_reference_limits, ret_limits)
-        self.assertEqual(3, len(ret_limits))
+        self.assertEqual(self.rate_data, data)
 
 
 class TestVolumeLimits(volume_fakes.TestVolume):
-    absolute_columns = [
-        'Name',
-        'Value',
-    ]
-
+    absolute_columns = ['Name', 'Value']
     rate_columns = ["Verb", "URI", "Value", "Remain", "Unit", "Next Available"]
 
     def setUp(self):
         super().setUp()
         self.app.client_manager.compute_endpoint_enabled = False
 
-        self.fake_limits = volume_fakes.FakeLimits()
-        self.volume_client.limits.get.return_value = self.fake_limits
+        self.fake_limits = volume_fakes.create_limits()
+
+        self.absolute_data = [
+            ('max_total_backup_gigabytes', 1000),
+            ('max_total_backups', 10),
+            ('max_total_snapshots', 10),
+            ('max_total_volume_gigabytes', 1000),
+            ('max_total_volumes', 10),
+            ('total_backup_gigabytes_used', 0),
+            ('total_backups_used', 0),
+            ('total_gigabytes_used', 35),
+            ('total_snapshots_used', 1),
+            ('total_volumes_used', 4),
+        ]
+        self.rate_data = [
+            ('POST', '*', 10, 2, 'MINUTE', '2011-12-15T22:42:45Z'),
+            ('PUT', '*', 10, 2, 'MINUTE', '2011-12-15T22:42:45Z'),
+            ('DELETE', '*', 100, 100, 'MINUTE', '2011-12-15T22:42:45Z'),
+        ]
+
+        self.volume_sdk_client.get_limits.return_value = self.fake_limits
 
     def test_volume_show_absolute(self):
         arglist = ['--absolute']
@@ -85,12 +131,8 @@ class TestVolumeLimits(volume_fakes.TestVolume):
 
         columns, data = cmd.take_action(parsed_args)
 
-        ret_limits = list(data)
-        compute_reference_limits = self.fake_limits.absolute_limits()
-
         self.assertEqual(self.absolute_columns, columns)
-        self.assertEqual(compute_reference_limits, ret_limits)
-        self.assertEqual(10, len(ret_limits))
+        self.assertEqual(self.absolute_data, data)
 
     def test_volume_show_rate(self):
         arglist = ['--rate']
@@ -100,9 +142,5 @@ class TestVolumeLimits(volume_fakes.TestVolume):
 
         columns, data = cmd.take_action(parsed_args)
 
-        ret_limits = list(data)
-        compute_reference_limits = self.fake_limits.rate_limits()
-
         self.assertEqual(self.rate_columns, columns)
-        self.assertEqual(compute_reference_limits, ret_limits)
-        self.assertEqual(3, len(ret_limits))
+        self.assertEqual(self.rate_data, data)

openstackclient/tests/unit/common/test_logs.py

@@ -80,7 +80,7 @@ class TestFileFormatter(utils.TestCase):
         )
 
     def test_options(self):
-        class Opts(object):
+        class Opts:
             cloud = 'cloudy'
             os_project_name = 'projecty'
             username = 'usernamey'
@@ -111,7 +111,7 @@ class TestFileFormatter(utils.TestCase):
 
 class TestLogConfigurator(utils.TestCase):
     def setUp(self):
-        super(TestLogConfigurator, self).setUp()
+        super().setUp()
         self.options = mock.Mock()
         self.options.verbose_level = 1
         self.options.log_file = None

openstackclient/tests/unit/common/test_module.py

@@ -15,6 +15,7 @@
 
 """Test module module"""
 
+import sys
 from unittest import mock
 
 from openstackclient.common import module as osc_module
@@ -43,6 +44,7 @@ module_name_5 = '_private_module.lib'
 module_version_5 = '0.0.1'
 
 MODULES = {
+    'sys': sys,
     module_name_1: fakes.FakeModule(module_name_1, module_version_1),
     module_name_2: fakes.FakeModule(module_name_2, module_version_2),
     module_name_3: fakes.FakeModule(module_name_3, module_version_3),
@@ -53,7 +55,7 @@ MODULES = {
 
 class TestCommandList(utils.TestCommand):
     def setUp(self):
-        super(TestCommandList, self).setUp()
+        super().setUp()
 
         self.app.command_manager = mock.Mock()
         self.app.command_manager.get_command_groups.return_value = [
@@ -126,7 +128,7 @@ class TestCommandList(utils.TestCommand):
 )
 class TestModuleList(utils.TestCommand):
     def setUp(self):
-        super(TestModuleList, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = osc_module.ListModule(self.app, None)

openstackclient/tests/unit/common/test_project_cleanup.py

@@ -22,7 +22,7 @@ class TestProjectCleanup(test_utils.TestCommand):
     project = identity_fakes.FakeProject.create_one_project()
 
     def setUp(self):
-        super(TestProjectCleanup, self).setUp()
+        super().setUp()
         self.cmd = project_cleanup.ProjectCleanup(self.app, None)
 
         self.project_cleanup_mock = mock.Mock()
@@ -83,7 +83,12 @@ class TestProjectCleanup(test_utils.TestCommand):
                 filters=filters,
                 skip_resources=None,
             ),
-            mock.call(dry_run=False, status_queue=mock.ANY, filters=filters),
+            mock.call(
+                dry_run=False,
+                status_queue=mock.ANY,
+                filters=filters,
+                skip_resources=None,
+            ),
         ]
         self.project_cleanup_mock.assert_has_calls(calls)
 
@@ -114,7 +119,12 @@ class TestProjectCleanup(test_utils.TestCommand):
                 filters={},
                 skip_resources=None,
             ),
-            mock.call(dry_run=False, status_queue=mock.ANY, filters={}),
+            mock.call(
+                dry_run=False,
+                status_queue=mock.ANY,
+                filters={},
+                skip_resources=None,
+            ),
         ]
         self.project_cleanup_mock.assert_has_calls(calls)
 
@@ -144,7 +154,12 @@ class TestProjectCleanup(test_utils.TestCommand):
                 filters={},
                 skip_resources=None,
             ),
-            mock.call(dry_run=False, status_queue=mock.ANY, filters={}),
+            mock.call(
+                dry_run=False,
+                status_queue=mock.ANY,
+                filters={},
+                skip_resources=None,
+            ),
         ]
         self.project_cleanup_mock.assert_has_calls(calls)
 
@@ -230,7 +245,12 @@ class TestProjectCleanup(test_utils.TestCommand):
                 filters={},
                 skip_resources=None,
             ),
-            mock.call(dry_run=False, status_queue=mock.ANY, filters={}),
+            mock.call(
+                dry_run=False,
+                status_queue=mock.ANY,
+                filters={},
+                skip_resources=None,
+            ),
         ]
         self.project_cleanup_mock.assert_has_calls(calls)
 
@@ -260,7 +280,12 @@ class TestProjectCleanup(test_utils.TestCommand):
                 filters={},
                 skip_resources=[skip_resource],
             ),
-            mock.call(dry_run=False, status_queue=mock.ANY, filters={}),
+            mock.call(
+                dry_run=False,
+                status_queue=mock.ANY,
+                filters={},
+                skip_resources=[skip_resource],
+            ),
         ]
         self.project_cleanup_mock.assert_has_calls(calls)