python-openstackclient 7.2.1__py3-none-any.whl → 7.3.1__py3-none-any.whl

openstackclient/tests/unit/compute/v2/test_server_group.py

@@ -13,6 +13,8 @@
 #   under the License.
 #
 
+from openstack.compute.v2 import server_group as _server_group
+from openstack.test import fakes as sdk_fakes
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 
@@ -22,27 +24,31 @@ from openstackclient.tests.unit import utils as tests_utils
 
 
 class TestServerGroup(compute_fakes.TestComputev2):
-    fake_server_group = compute_fakes.create_one_server_group()
-
-    columns = (
-        'id',
-        'members',
-        'name',
-        'policy',
-        'project_id',
-        'rules',
-        'user_id',
-    )
-
-    data = (
-        fake_server_group.id,
-        format_columns.ListColumn(fake_server_group.member_ids),
-        fake_server_group.name,
-        fake_server_group.policy,
-        fake_server_group.project_id,
-        format_columns.DictColumn(fake_server_group.rules),
-        fake_server_group.user_id,
-    )
+    def setUp(self):
+        super().setUp()
+
+        self.fake_server_group = sdk_fakes.generate_fake_resource(
+            _server_group.ServerGroup
+        )
+
+        self.columns = (
+            'id',
+            'members',
+            'name',
+            'policy',
+            'project_id',
+            'rules',
+            'user_id',
+        )
+        self.data = (
+            self.fake_server_group.id,
+            format_columns.ListColumn(self.fake_server_group.member_ids),
+            self.fake_server_group.name,
+            self.fake_server_group.policy,
+            self.fake_server_group.project_id,
+            format_columns.DictColumn(self.fake_server_group.rules),
+            self.fake_server_group.user_id,
+        )
 
 
 class TestServerGroupCreate(TestServerGroup):
@@ -262,82 +268,6 @@ class TestServerGroupDelete(TestServerGroup):
 
 
 class TestServerGroupList(TestServerGroup):
-    list_columns = (
-        'ID',
-        'Name',
-        'Policies',
-    )
-
-    list_columns_long = (
-        'ID',
-        'Name',
-        'Policies',
-        'Members',
-        'Project Id',
-        'User Id',
-    )
-
-    list_columns_v264 = (
-        'ID',
-        'Name',
-        'Policy',
-    )
-
-    list_columns_v264_long = (
-        'ID',
-        'Name',
-        'Policy',
-        'Members',
-        'Project Id',
-        'User Id',
-    )
-
-    list_data = (
-        (
-            TestServerGroup.fake_server_group.id,
-            TestServerGroup.fake_server_group.name,
-            format_columns.ListColumn(
-                TestServerGroup.fake_server_group.policies
-            ),
-        ),
-    )
-
-    list_data_long = (
-        (
-            TestServerGroup.fake_server_group.id,
-            TestServerGroup.fake_server_group.name,
-            format_columns.ListColumn(
-                TestServerGroup.fake_server_group.policies
-            ),
-            format_columns.ListColumn(
-                TestServerGroup.fake_server_group.member_ids
-            ),
-            TestServerGroup.fake_server_group.project_id,
-            TestServerGroup.fake_server_group.user_id,
-        ),
-    )
-
-    list_data_v264 = (
-        (
-            TestServerGroup.fake_server_group.id,
-            TestServerGroup.fake_server_group.name,
-            TestServerGroup.fake_server_group.policy,
-        ),
-    )
-
-    list_data_v264_long = (
-        (
-            TestServerGroup.fake_server_group.id,
-            TestServerGroup.fake_server_group.name,
-            TestServerGroup.fake_server_group.policy,
-            format_columns.ListColumn(
-                TestServerGroup.fake_server_group.member_ids
-            ),
-            TestServerGroup.fake_server_group.project_id,
-            TestServerGroup.fake_server_group.user_id,
-        ),
-    )
-
     def setUp(self):
         super().setUp()
 
@@ -359,8 +289,21 @@ class TestServerGroupList(TestServerGroup):
 
         self.compute_sdk_client.server_groups.assert_called_once_with()
 
-        self.assertCountEqual(self.list_columns, columns)
-        self.assertCountEqual(self.list_data, tuple(data))
+        expected_columns = (
+            'ID',
+            'Name',
+            'Policies',
+        )
+        expected_data = (
+            (
+                self.fake_server_group.id,
+                self.fake_server_group.name,
+                format_columns.ListColumn(self.fake_server_group.policies),
+            ),
+        )
+
+        self.assertCountEqual(expected_columns, columns)
+        self.assertCountEqual(expected_data, tuple(data))
 
     def test_server_group_list_with_all_projects_and_long(self):
         arglist = [
@@ -379,8 +322,27 @@ class TestServerGroupList(TestServerGroup):
             all_projects=True
         )
 
-        self.assertCountEqual(self.list_columns_long, columns)
-        self.assertCountEqual(self.list_data_long, tuple(data))
+        expected_columns = (
+            'ID',
+            'Name',
+            'Policies',
+            'Members',
+            'Project Id',
+            'User Id',
+        )
+        expected_data = (
+            (
+                self.fake_server_group.id,
+                self.fake_server_group.name,
+                format_columns.ListColumn(self.fake_server_group.policies),
+                format_columns.ListColumn(self.fake_server_group.member_ids),
+                self.fake_server_group.project_id,
+                self.fake_server_group.user_id,
+            ),
+        )
+
+        self.assertCountEqual(expected_columns, columns)
+        self.assertCountEqual(expected_data, tuple(data))
 
     def test_server_group_list_with_limit(self):
         arglist = [
@@ -428,8 +390,21 @@ class TestServerGroupList(TestServerGroup):
         columns, data = self.cmd.take_action(parsed_args)
         self.compute_sdk_client.server_groups.assert_called_once_with()
 
-        self.assertCountEqual(self.list_columns_v264, columns)
-        self.assertCountEqual(self.list_data_v264, tuple(data))
+        expected_columns = (
+            'ID',
+            'Name',
+            'Policy',
+        )
+        expected_data = (
+            (
+                self.fake_server_group.id,
+                self.fake_server_group.name,
+                self.fake_server_group.policy,
+            ),
+        )
+
+        self.assertCountEqual(expected_columns, columns)
+        self.assertCountEqual(expected_data, tuple(data))
 
     def test_server_group_list_with_all_projects_and_long_v264(self):
         self.set_compute_api_version('2.64')
@@ -448,8 +423,27 @@ class TestServerGroupList(TestServerGroup):
             all_projects=True
         )
 
-        self.assertCountEqual(self.list_columns_v264_long, columns)
-        self.assertCountEqual(self.list_data_v264_long, tuple(data))
+        expected_columns = (
+            'ID',
+            'Name',
+            'Policy',
+            'Members',
+            'Project Id',
+            'User Id',
+        )
+        expected_data = (
+            (
+                self.fake_server_group.id,
+                self.fake_server_group.name,
+                self.fake_server_group.policy,
+                format_columns.ListColumn(self.fake_server_group.member_ids),
+                self.fake_server_group.project_id,
+                self.fake_server_group.user_id,
+            ),
+        )
+
+        self.assertCountEqual(expected_columns, columns)
+        self.assertCountEqual(expected_data, tuple(data))
 
 
 class TestServerGroupShow(TestServerGroup):

openstackclient/tests/unit/compute/v2/test_server_volume.py

@@ -10,19 +10,26 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
+from openstack.block_storage.v3 import volume as _volume
+from openstack.compute.v2 import server as _server
+from openstack.compute.v2 import volume_attachment as _volume_attachment
+from openstack.test import fakes as sdk_fakes
 from osc_lib import exceptions
 
 from openstackclient.compute.v2 import server_volume
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
-from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes
 
 
 class TestServerVolumeList(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
-        self.server = compute_fakes.create_one_sdk_server()
-        self.volume_attachments = compute_fakes.create_volume_attachments()
+        self.server = sdk_fakes.generate_fake_resource(_server.Server)
+        self.volume_attachments = list(
+            sdk_fakes.generate_fake_resources(
+                _volume_attachment.VolumeAttachment, count=2
+            )
+        )
 
         self.compute_sdk_client.find_server.return_value = self.server
         self.compute_sdk_client.volume_attachments.return_value = (
@@ -217,10 +224,10 @@ class TestServerVolumeUpdate(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
-        self.server = compute_fakes.create_one_sdk_server()
+        self.server = sdk_fakes.generate_fake_resource(_server.Server)
         self.compute_sdk_client.find_server.return_value = self.server
 
-        self.volume = volume_fakes.create_one_sdk_volume()
+        self.volume = sdk_fakes.generate_fake_resource(_volume.Volume)
         self.volume_sdk_client.find_volume.return_value = self.volume
 
         # Get the command object to test

openstackclient/tests/unit/compute/v2/test_service.py

@@ -14,6 +14,8 @@
 
 from unittest import mock
 
+from openstack.compute.v2 import service as _service
+from openstack.test import fakes as sdk_fakes
 from osc_lib import exceptions
 
 from openstackclient.compute.v2 import service
@@ -21,11 +23,13 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 
 
 class TestServiceDelete(compute_fakes.TestComputev2):
-    services = compute_fakes.create_services(count=2)
-
     def setUp(self):
         super().setUp()
 
+        self.services = list(
+            sdk_fakes.generate_fake_resources(_service.Service, count=2)
+        )
+
         self.compute_sdk_client.delete_service.return_value = None
 
         # Get the command object to test
@@ -94,35 +98,11 @@ class TestServiceDelete(compute_fakes.TestComputev2):
 
 
 class TestServiceList(compute_fakes.TestComputev2):
-    service = compute_fakes.create_one_service()
-
-    columns = (
-        'ID',
-        'Binary',
-        'Host',
-        'Zone',
-        'Status',
-        'State',
-        'Updated At',
-    )
-    columns_long = columns + ('Disabled Reason',)
-
-    data = [
-        (
-            service.id,
-            service.binary,
-            service.host,
-            service.availability_zone,
-            service.status,
-            service.state,
-            service.updated_at,
-        )
-    ]
-    data_long = [data[0] + (service.disabled_reason,)]
-
     def setUp(self):
         super().setUp()
 
+        self.service = sdk_fakes.generate_fake_resource(_service.Service)
+
         self.compute_sdk_client.services.return_value = [self.service]
 
         # Get the command object to test
@@ -151,8 +131,29 @@ class TestServiceList(compute_fakes.TestComputev2):
             binary=self.service.binary,
         )
 
-        self.assertEqual(self.columns, columns)
-        self.assertEqual(self.data, list(data))
+        expected_columns = (
+            'ID',
+            'Binary',
+            'Host',
+            'Zone',
+            'Status',
+            'State',
+            'Updated At',
+        )
+        expected_data = [
+            (
+                self.service.id,
+                self.service.binary,
+                self.service.host,
+                self.service.availability_zone,
+                self.service.status,
+                self.service.state,
+                self.service.updated_at,
+            )
+        ]
+
+        self.assertEqual(expected_columns, columns)
+        self.assertEqual(expected_data, list(data))
 
     def test_service_list_with_long_option(self):
         arglist = [
@@ -179,8 +180,31 @@ class TestServiceList(compute_fakes.TestComputev2):
             binary=self.service.binary,
         )
 
-        self.assertEqual(self.columns_long, columns)
-        self.assertEqual(self.data_long, list(data))
+        expected_columns = (
+            'ID',
+            'Binary',
+            'Host',
+            'Zone',
+            'Status',
+            'State',
+            'Updated At',
+            'Disabled Reason',
+        )
+        expected_data = [
+            (
+                self.service.id,
+                self.service.binary,
+                self.service.host,
+                self.service.availability_zone,
+                self.service.status,
+                self.service.state,
+                self.service.updated_at,
+                self.service.disabled_reason,
+            )
+        ]
+
+        self.assertEqual(expected_columns, columns)
+        self.assertEqual(expected_data, list(data))
 
     def test_service_list_with_long_option_2_11(self):
         self.set_compute_api_version('2.11')
@@ -210,18 +234,40 @@ class TestServiceList(compute_fakes.TestComputev2):
         )
 
         # In 2.11 there is also a forced_down column.
-        columns_long = self.columns_long + ('Forced Down',)
-        data_long = [self.data_long[0] + (self.service.is_forced_down,)]
+        expected_columns = (
+            'ID',
+            'Binary',
+            'Host',
+            'Zone',
+            'Status',
+            'State',
+            'Updated At',
+            'Disabled Reason',
+            'Forced Down',
+        )
+        expected_data = [
+            (
+                self.service.id,
+                self.service.binary,
+                self.service.host,
+                self.service.availability_zone,
+                self.service.status,
+                self.service.state,
+                self.service.updated_at,
+                self.service.disabled_reason,
+                self.service.is_forced_down,
+            )
+        ]
 
-        self.assertEqual(columns_long, columns)
-        self.assertEqual(data_long, list(data))
+        self.assertEqual(expected_columns, columns)
+        self.assertEqual(expected_data, list(data))
 
 
 class TestServiceSet(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
-        self.service = compute_fakes.create_one_service()
+        self.service = sdk_fakes.generate_fake_resource(_service.Service)
 
         self.compute_sdk_client.enable_service.return_value = self.service
         self.compute_sdk_client.disable_service.return_value = self.service

openstackclient/tests/unit/compute/v2/test_usage.py

@@ -14,9 +14,12 @@
 import datetime
 from unittest import mock
 
+from openstack.compute.v2 import usage as _usage
+from openstack.identity.v3 import project as _project
+from openstack.test import fakes as sdk_fakes
+
 from openstackclient.compute.v2 import usage as usage_cmds
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
-from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 
 class TestUsage(compute_fakes.TestComputev2):
@@ -28,11 +31,11 @@ class TestUsage(compute_fakes.TestComputev2):
 
 
 class TestUsageList(TestUsage):
-    project = identity_fakes.FakeProject.create_one_project()
+    project = sdk_fakes.generate_fake_resource(_project.Project)
     # Return value of self.usage_mock.list().
-    usages = compute_fakes.create_usages(
-        attrs={'project_id': project.name}, count=1
-    )
+    usages = [
+        sdk_fakes.generate_fake_resource(_usage.Usage, project_id=project.name)
+    ]
 
     columns = (
         "Project",
@@ -123,9 +126,11 @@ class TestUsageList(TestUsage):
 
 
 class TestUsageShow(TestUsage):
-    project = identity_fakes.FakeProject.create_one_project()
+    project = sdk_fakes.generate_fake_resource(_project.Project)
     # Return value of self.usage_mock.list().
-    usage = compute_fakes.create_one_usage(attrs={'project_id': project.name})
+    usage = sdk_fakes.generate_fake_resource(
+        _usage.Usage, project_id=project.name
+    )
 
     columns = (
         'Project',

openstackclient/tests/unit/identity/v2_0/test_catalog.py

@@ -53,8 +53,7 @@ class TestCatalogList(TestCatalog):
             identity_fakes.TOKEN,
             fake_service=self.service_catalog,
         )
-        self.ar_mock = mock.PropertyMock(return_value=auth_ref)
-        type(self.app.client_manager).auth_ref = self.ar_mock
+        self.app.client_manager.auth_ref = auth_ref
 
         arglist = []
         verifylist = []
@@ -99,8 +98,7 @@ class TestCatalogList(TestCatalog):
             identity_fakes.TOKEN,
             fake_service=service_catalog,
         )
-        self.ar_mock = mock.PropertyMock(return_value=auth_ref)
-        type(self.app.client_manager).auth_ref = self.ar_mock
+        self.app.client_manager.auth_ref = auth_ref
 
         arglist = []
         verifylist = []
@@ -136,8 +134,7 @@ class TestCatalogShow(TestCatalog):
             identity_fakes.UNSCOPED_TOKEN,
             fake_service=self.service_catalog,
         )
-        self.ar_mock = mock.PropertyMock(return_value=auth_ref)
-        type(self.app.client_manager).auth_ref = self.ar_mock
+        self.app.client_manager.auth_ref = auth_ref
 
         arglist = [
             'compute',

openstackclient/tests/unit/identity/v2_0/test_role.py

@@ -58,8 +58,7 @@ class TestRole(identity_fakes.TestIdentityv2):
             identity_fakes.TOKEN,
             fake_service=self.fake_service,
         )
-        self.ar_mock = mock.PropertyMock(return_value=auth_ref)
-        type(self.app.client_manager).auth_ref = self.ar_mock
+        self.app.client_manager.auth_ref = auth_ref
 
 
 class TestRoleAdd(TestRole):

openstackclient/tests/unit/identity/v2_0/test_role_assignment.py

@@ -169,7 +169,8 @@ class TestRoleAssignmentList(TestRoleAssignment):
         self.assertEqual(datalist, tuple(data))
 
     def test_role_assignment_list_def_creds(self):
-        auth_ref = self.app.client_manager.auth_ref = mock.Mock()
+        self.app.client_manager.auth_ref = mock.Mock()
+        auth_ref = self.app.client_manager.auth_ref
         auth_ref.project_id.return_value = identity_fakes.project_id
         auth_ref.user_id.return_value = identity_fakes.user_id
 

openstackclient/tests/unit/identity/v2_0/test_token.py

@@ -11,29 +11,17 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
-
-from unittest import mock
 
 from openstackclient.identity.v2_0 import token
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 
 
-class TestToken(identity_fakes.TestIdentityv2):
-    fake_user = identity_fakes.FakeUser.create_one_user()
-    fake_project = identity_fakes.FakeProject.create_one_project()
-
+class TestTokenIssue(identity_fakes.TestIdentityv2):
     def setUp(self):
         super().setUp()
 
-        # Get a shortcut to the Auth Ref Mock
-        self.ar_mock = mock.PropertyMock()
-        type(self.app.client_manager).auth_ref = self.ar_mock
-
-
-class TestTokenIssue(TestToken):
-    def setUp(self):
-        super().setUp()
+        self.fake_user = identity_fakes.FakeUser.create_one_user()
+        self.fake_project = identity_fakes.FakeProject.create_one_project()
 
         self.cmd = token.IssueToken(self.app, None)
 
@@ -41,8 +29,7 @@ class TestTokenIssue(TestToken):
         auth_ref = identity_fakes.fake_auth_ref(
             identity_fakes.TOKEN,
         )
-        self.ar_mock = mock.PropertyMock(return_value=auth_ref)
-        type(self.app.client_manager).auth_ref = self.ar_mock
+        self.app.client_manager.auth_ref = auth_ref
 
         arglist = []
         verifylist = []
@@ -67,8 +54,7 @@ class TestTokenIssue(TestToken):
         auth_ref = identity_fakes.fake_auth_ref(
             identity_fakes.UNSCOPED_TOKEN,
         )
-        self.ar_mock = mock.PropertyMock(return_value=auth_ref)
-        type(self.app.client_manager).auth_ref = self.ar_mock
+        self.app.client_manager.auth_ref = auth_ref
 
         arglist = []
         verifylist = []
@@ -91,7 +77,7 @@ class TestTokenIssue(TestToken):
         self.assertEqual(datalist, data)
 
 
-class TestTokenRevoke(TestToken):
+class TestTokenRevoke(identity_fakes.TestIdentityv2):
     TOKEN = 'fob'
 
     def setUp(self):

openstackclient/tests/unit/identity/v3/test_catalog.py

@@ -9,7 +9,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 from unittest import mock
 
@@ -72,8 +71,7 @@ class TestCatalogList(TestCatalog):
             identity_fakes.TOKEN_WITH_PROJECT_ID,
             fake_service=self.fake_service,
         )
-        self.ar_mock = mock.PropertyMock(return_value=auth_ref)
-        type(self.app.client_manager).auth_ref = self.ar_mock
+        self.app.client_manager.auth_ref = auth_ref
 
         arglist = []
         verifylist = []
@@ -110,8 +108,7 @@ class TestCatalogShow(TestCatalog):
             identity_fakes.TOKEN_WITH_PROJECT_ID,
             fake_service=self.fake_service,
         )
-        self.ar_mock = mock.PropertyMock(return_value=auth_ref)
-        type(self.app.client_manager).auth_ref = self.ar_mock
+        self.app.client_manager.auth_ref = auth_ref
 
         arglist = [
             'compute',