python-openstackclient 7.4.0__py3-none-any.whl → 8.1.0__py3-none-any.whl

openstackclient/tests/unit/network/v2/test_floating_ip_compute.py

@@ -73,7 +73,7 @@ class TestCreateFloatingIPCompute(compute_fakes.TestComputev2):
         columns, data = self.cmd.take_action(parsed_args)
 
         fip_mock.assert_called_once_with(
-            self.compute_sdk_client, self._floating_ip['pool']
+            self.compute_client, self._floating_ip['pool']
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
@@ -103,7 +103,7 @@ class TestDeleteFloatingIPCompute(compute_fakes.TestComputev2):
         result = self.cmd.take_action(parsed_args)
 
         fip_mock.assert_called_once_with(
-            self.compute_sdk_client, self._floating_ips[0]['id']
+            self.compute_client, self._floating_ips[0]['id']
         )
         self.assertIsNone(result)
 
@@ -122,12 +122,8 @@ class TestDeleteFloatingIPCompute(compute_fakes.TestComputev2):
 
         fip_mock.assert_has_calls(
             [
-                mock.call(
-                    self.compute_sdk_client, self._floating_ips[0]['id']
-                ),
-                mock.call(
-                    self.compute_sdk_client, self._floating_ips[1]['id']
-                ),
+                mock.call(self.compute_client, self._floating_ips[0]['id']),
+                mock.call(self.compute_client, self._floating_ips[1]['id']),
             ]
         )
         self.assertIsNone(result)
@@ -157,11 +153,9 @@ class TestDeleteFloatingIPCompute(compute_fakes.TestComputev2):
             self.assertEqual('1 of 2 floating_ips failed to delete.', str(e))
 
         fip_mock.assert_any_call(
-            self.compute_sdk_client, self._floating_ips[0]['id']
-        )
-        fip_mock.assert_any_call(
-            self.compute_sdk_client, 'unexist_floating_ip'
+            self.compute_client, self._floating_ips[0]['id']
         )
+        fip_mock.assert_any_call(self.compute_client, 'unexist_floating_ip')
 
 
 @mock.patch.object(compute_v2, 'list_floating_ips')
@@ -203,7 +197,7 @@ class TestListFloatingIPCompute(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        fip_mock.assert_called_once_with(self.compute_sdk_client)
+        fip_mock.assert_called_once_with(self.compute_client)
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
@@ -248,7 +242,7 @@ class TestShowFloatingIPCompute(compute_fakes.TestComputev2):
         columns, data = self.cmd.take_action(parsed_args)
 
         fip_mock.assert_called_once_with(
-            self.compute_sdk_client, self._floating_ip['id']
+            self.compute_client, self._floating_ip['id']
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)

openstackclient/tests/unit/network/v2/test_floating_ip_network.py

@@ -14,6 +14,9 @@
 from unittest import mock
 from unittest.mock import call
 
+from openstack.network.v2 import floating_ip as _floating_ip
+from openstack.test import fakes as sdk_fakes
+from osc_lib.cli import format_columns
 from osc_lib import exceptions
 
 from openstackclient.network.v2 import floating_ip as fip
@@ -231,10 +234,8 @@ class TestCreateFloatingIPNetwork(TestFloatingIPNetwork):
         self.assertEqual(self.data, data)
 
     def test_create_floating_ip_with_qos(self):
-        qos_policy = network_fakes.FakeNetworkQosPolicy.create_one_qos_policy()
-        self.network_client.find_qos_policy = mock.Mock(
-            return_value=qos_policy
-        )
+        qos_policy = network_fakes.create_one_qos_policy()
+        self.network_client.find_qos_policy.return_value = qos_policy
         arglist = [
             '--qos-policy',
             qos_policy.id,
@@ -413,7 +414,7 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
             'id': 'fake_port_id',
         }
     )
-    fake_router = network_fakes.FakeRouter.create_one_router(
+    fake_router = network_fakes.create_one_router(
         {
             'id': 'fake_router_id',
         }
@@ -498,7 +499,7 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
             'fake_network_id',
         ]
         verifylist = [
-            ('network', 'fake_network_id'),
+            ('networks', ['fake_network_id']),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -506,7 +507,7 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
 
         self.network_client.ips.assert_called_once_with(
             **{
-                'floating_network_id': 'fake_network_id',
+                'floating_network_id': ['fake_network_id'],
             }
         )
         self.assertEqual(self.columns, columns)
@@ -518,7 +519,7 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
             'fake_port_id',
         ]
         verifylist = [
-            ('port', 'fake_port_id'),
+            ('ports', ['fake_port_id']),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -526,7 +527,7 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
 
         self.network_client.ips.assert_called_once_with(
             **{
-                'port_id': 'fake_port_id',
+                'port_id': ['fake_port_id'],
             }
         )
         self.assertEqual(self.columns, columns)
@@ -659,7 +660,7 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
             '--long',
         ]
         verifylist = [
-            ('router', 'fake_router_id'),
+            ('routers', ['fake_router_id']),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -667,7 +668,7 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
 
         self.network_client.ips.assert_called_once_with(
             **{
-                'router_id': 'fake_router_id',
+                'router_id': ['fake_router_id'],
             }
         )
         self.assertEqual(self.columns_long, columns)
@@ -706,46 +707,57 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
 
 
 class TestShowFloatingIPNetwork(TestFloatingIPNetwork):
-    # The floating ip to display.
-    floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
-
-    columns = (
-        'description',
-        'dns_domain',
-        'dns_name',
-        'fixed_ip_address',
-        'floating_ip_address',
-        'floating_network_id',
-        'id',
-        'port_id',
-        'project_id',
-        'qos_policy_id',
-        'router_id',
-        'status',
-        'tags',
-    )
-
-    data = (
-        floating_ip.description,
-        floating_ip.dns_domain,
-        floating_ip.dns_name,
-        floating_ip.fixed_ip_address,
-        floating_ip.floating_ip_address,
-        floating_ip.floating_network_id,
-        floating_ip.id,
-        floating_ip.port_id,
-        floating_ip.project_id,
-        floating_ip.qos_policy_id,
-        floating_ip.router_id,
-        floating_ip.status,
-        floating_ip.tags,
-    )
-
     def setUp(self):
         super().setUp()
 
+        self.floating_ip = sdk_fakes.generate_fake_resource(
+            _floating_ip.FloatingIP
+        )
         self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
 
+        self.columns = (
+            'created_at',
+            'description',
+            'dns_domain',
+            'dns_name',
+            'fixed_ip_address',
+            'floating_ip_address',
+            'floating_network_id',
+            'id',
+            'name',
+            'port_details',
+            'port_id',
+            'project_id',
+            'qos_policy_id',
+            'revision_number',
+            'router_id',
+            'status',
+            'subnet_id',
+            'tags',
+            'updated_at',
+        )
+        self.data = (
+            self.floating_ip.created_at,
+            self.floating_ip.description,
+            self.floating_ip.dns_domain,
+            self.floating_ip.dns_name,
+            self.floating_ip.fixed_ip_address,
+            self.floating_ip.floating_ip_address,
+            self.floating_ip.floating_network_id,
+            self.floating_ip.id,
+            self.floating_ip.name,
+            format_columns.DictColumn(self.floating_ip.port_details),
+            self.floating_ip.port_id,
+            self.floating_ip.project_id,
+            self.floating_ip.qos_policy_id,
+            self.floating_ip.revision_number,
+            self.floating_ip.router_id,
+            self.floating_ip.status,
+            self.floating_ip.subnet_id,
+            self.floating_ip.tags,
+            self.floating_ip.updated_at,
+        )
+
         # Get the command object to test
         self.cmd = fip.ShowFloatingIP(self.app, None)
 
@@ -879,10 +891,8 @@ class TestSetFloatingIP(TestFloatingIPNetwork):
         )
 
     def test_qos_policy_option(self):
-        qos_policy = network_fakes.FakeNetworkQosPolicy.create_one_qos_policy()
-        self.network_client.find_qos_policy = mock.Mock(
-            return_value=qos_policy
-        )
+        qos_policy = network_fakes.create_one_qos_policy()
+        self.network_client.find_qos_policy.return_value = qos_policy
         arglist = [
             "--qos-policy",
             qos_policy.id,
@@ -908,10 +918,8 @@ class TestSetFloatingIP(TestFloatingIPNetwork):
         )
 
     def test_port_and_qos_policy_option(self):
-        qos_policy = network_fakes.FakeNetworkQosPolicy.create_one_qos_policy()
-        self.network_client.find_qos_policy = mock.Mock(
-            return_value=qos_policy
-        )
+        qos_policy = network_fakes.create_one_qos_policy()
+        self.network_client.find_qos_policy.return_value = qos_policy
         arglist = [
             "--qos-policy",
             qos_policy.id,

openstackclient/tests/unit/network/v2/test_floating_ip_pool_compute.py

@@ -44,6 +44,6 @@ class TestListFloatingIPPoolCompute(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        fipp_mock.assert_called_once_with(self.compute_sdk_client)
+        fipp_mock.assert_called_once_with(self.compute_client)
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))

openstackclient/tests/unit/network/v2/test_l3_conntrack_helper.py

@@ -24,8 +24,8 @@ class TestConntrackHelper(network_fakes.TestNetworkV2):
     def setUp(self):
         super().setUp()
 
-        self.router = network_fakes.FakeRouter.create_one_router()
-        self.network_client.find_router = mock.Mock(return_value=self.router)
+        self.router = network_fakes.create_one_router()
+        self.network_client.find_router.return_value = self.router
 
 
 class TestCreateL3ConntrackHelper(TestConntrackHelper):

openstackclient/tests/unit/network/v2/test_ndp_proxy.py

@@ -30,9 +30,7 @@ class TestNDPProxy(network_fakes.TestNetworkV2):
         # Get a shortcut to the DomainManager Mock
         self.domains_mock = self.identity_client.domains
 
-        self.router = network_fakes.FakeRouter.create_one_router(
-            {'id': 'fake-router-id'}
-        )
+        self.router = network_fakes.create_one_router({'id': 'fake-router-id'})
         self.network_client.find_router = mock.Mock(return_value=self.router)
         self.port = network_fakes.create_one_port()
         self.network_client.find_port = mock.Mock(return_value=self.port)

openstackclient/tests/unit/network/v2/test_network.py

@@ -47,7 +47,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
             'availability_zone_hints': ["nova"],
         }
     )
-    qos_policy = network_fakes.FakeNetworkQosPolicy.create_one_qos_policy(
+    qos_policy = network_fakes.create_one_qos_policy(
         attrs={'id': _network.qos_policy_id}
     )
 
@@ -622,7 +622,7 @@ class TestListNetwork(TestNetwork):
         self.network_client.networks = mock.Mock(return_value=self._network)
 
         self._agent = network_fakes.create_one_network_agent()
-        self.network_client.get_agent = mock.Mock(return_value=self._agent)
+        self.network_client.get_agent.return_value = self._agent
 
         self.network_client.dhcp_agent_hosting_networks = mock.Mock(
             return_value=self._network
@@ -967,7 +967,7 @@ class TestListNetwork(TestNetwork):
 class TestSetNetwork(TestNetwork):
     # The network to set.
     _network = network_fakes.create_one_network({'tags': ['green', 'red']})
-    qos_policy = network_fakes.FakeNetworkQosPolicy.create_one_qos_policy(
+    qos_policy = network_fakes.create_one_qos_policy(
         attrs={'id': _network.qos_policy_id}
     )
 
@@ -1266,7 +1266,7 @@ class TestShowNetwork(TestNetwork):
 class TestUnsetNetwork(TestNetwork):
     # The network to set.
     _network = network_fakes.create_one_network({'tags': ['green', 'red']})
-    qos_policy = network_fakes.FakeNetworkQosPolicy.create_one_qos_policy(
+    qos_policy = network_fakes.create_one_qos_policy(
         attrs={'id': _network.qos_policy_id}
     )
 

openstackclient/tests/unit/network/v2/test_network_agent.py

@@ -70,7 +70,7 @@ class TestAddNetworkToAgent(TestNetworkAgent):
 
 
 class TestAddRouterAgent(TestNetworkAgent):
-    _router = network_fakes.FakeRouter.create_one_router()
+    _router = network_fakes.create_one_router()
     _agent = network_fakes.create_one_network_agent()
 
     def setUp(self):
@@ -219,30 +219,24 @@ class TestListNetworkAgent(TestNetworkAgent):
 
     def setUp(self):
         super().setUp()
-        self.network_client.agents = mock.Mock(
-            return_value=self.network_agents
+
+        self.network_client.agents.return_value = self.network_agents
+        self.network_client.routers_hosting_l3_agents.return_value = (
+            self.network_agents
         )
 
         _testagent = network_fakes.create_one_network_agent()
-        self.network_client.get_agent = mock.Mock(return_value=_testagent)
+        self.network_client.get_agent.return_value = _testagent
+        self.network_client.get_agent.return_value = _testagent
 
         self._testnetwork = network_fakes.create_one_network()
-        self.network_client.find_network = mock.Mock(
-            return_value=self._testnetwork
-        )
-        self.network_client.network_hosting_dhcp_agents = mock.Mock(
-            return_value=self.network_agents
+        self.network_client.find_network.return_value = self._testnetwork
+        self.network_client.network_hosting_dhcp_agents.return_value = (
+            self.network_agents
         )
 
-        self.network_client.get_agent = mock.Mock(return_value=_testagent)
-
-        self._testrouter = network_fakes.FakeRouter.create_one_router()
-        self.network_client.find_router = mock.Mock(
-            return_value=self._testrouter
-        )
-        self.network_client.routers_hosting_l3_agents = mock.Mock(
-            return_value=self.network_agents
-        )
+        self._testrouter = network_fakes.create_one_router()
+        self.network_client.find_router.return_value = self._testrouter
 
         # Get the command object to test
         self.cmd = network_agent.ListNetworkAgent(self.app, None)
@@ -323,15 +317,11 @@ class TestListNetworkAgent(TestNetworkAgent):
         ]
         verifylist = [('router', self._testrouter.id), ('long', False)]
 
-        attrs = {
-            self._testrouter,
-        }
-
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network_client.routers_hosting_l3_agents.assert_called_once_with(
-            *attrs
+            self._testrouter
         )
 
         self.assertEqual(self.columns, columns)
@@ -345,15 +335,11 @@ class TestListNetworkAgent(TestNetworkAgent):
         ]
         verifylist = [('router', self._testrouter.id), ('long', True)]
 
-        attrs = {
-            self._testrouter,
-        }
-
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network_client.routers_hosting_l3_agents.assert_called_once_with(
-            *attrs
+            self._testrouter
         )
 
         # Add a column 'HA State' and corresponding data.
@@ -422,7 +408,7 @@ class TestRemoveNetworkFromAgent(TestNetworkAgent):
 
 
 class TestRemoveRouterAgent(TestNetworkAgent):
-    _router = network_fakes.FakeRouter.create_one_router()
+    _router = network_fakes.create_one_router()
     _agent = network_fakes.create_one_network_agent()
 
     def setUp(self):

openstackclient/tests/unit/network/v2/test_network_compute.py

@@ -148,7 +148,7 @@ class TestCreateNetworkCompute(compute_fakes.TestComputev2):
         columns, data = self.cmd.take_action(parsed_args)
 
         net_mock.assert_called_once_with(
-            self.compute_sdk_client,
+            self.compute_client,
             subnet=self._network['cidr'],
             name=self._network['label'],
         )
@@ -182,7 +182,7 @@ class TestDeleteNetworkCompute(compute_fakes.TestComputev2):
         result = self.cmd.take_action(parsed_args)
 
         delete_net_mock.assert_called_once_with(
-            self.compute_sdk_client,
+            self.compute_client,
             self._networks[0]['id'],
         )
         self.assertIsNone(result)
@@ -203,8 +203,8 @@ class TestDeleteNetworkCompute(compute_fakes.TestComputev2):
 
         delete_net_mock.assert_has_calls(
             [
-                mock.call(self.compute_sdk_client, self._networks[0]['id']),
-                mock.call(self.compute_sdk_client, self._networks[1]['id']),
+                mock.call(self.compute_client, self._networks[0]['id']),
+                mock.call(self.compute_client, self._networks[1]['id']),
             ]
         )
         self.assertIsNone(result)
@@ -238,15 +238,15 @@ class TestDeleteNetworkCompute(compute_fakes.TestComputev2):
 
         find_net_mock.assert_has_calls(
             [
-                mock.call(self.compute_sdk_client, self._networks[0]['id']),
-                mock.call(self.compute_sdk_client, 'xxxx-yyyy-zzzz'),
-                mock.call(self.compute_sdk_client, self._networks[1]['id']),
+                mock.call(self.compute_client, self._networks[0]['id']),
+                mock.call(self.compute_client, 'xxxx-yyyy-zzzz'),
+                mock.call(self.compute_client, self._networks[1]['id']),
             ]
         )
         delete_net_mock.assert_has_calls(
             [
-                mock.call(self.compute_sdk_client, self._networks[0]['id']),
-                mock.call(self.compute_sdk_client, self._networks[1]['id']),
+                mock.call(self.compute_client, self._networks[0]['id']),
+                mock.call(self.compute_client, self._networks[1]['id']),
             ]
         )
 
@@ -286,7 +286,7 @@ class TestListNetworkCompute(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        net_mock.assert_called_once_with(self.compute_sdk_client)
+        net_mock.assert_called_once_with(self.compute_client)
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
@@ -398,7 +398,7 @@ class TestShowNetworkCompute(compute_fakes.TestComputev2):
         columns, data = self.cmd.take_action(parsed_args)
 
         net_mock.assert_called_once_with(
-            self.compute_sdk_client, self._network['label']
+            self.compute_client, self._network['label']
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)

openstackclient/tests/unit/network/v2/test_network_qos_policy.py

@@ -35,11 +35,10 @@ class TestCreateNetworkQosPolicy(TestQosPolicy):
     project = identity_fakes_v3.FakeProject.create_one_project()
 
     # The new qos policy created.
-    new_qos_policy = network_fakes.FakeNetworkQosPolicy.create_one_qos_policy(
-        attrs={
-            'project_id': project.id,
-        }
+    new_qos_policy = network_fakes.create_one_qos_policy(
+        attrs={'project_id': project.id}
     )
+
     columns = (
         'description',
         'id',
@@ -48,6 +47,7 @@ class TestCreateNetworkQosPolicy(TestQosPolicy):
         'project_id',
         'rules',
         'shared',
+        'tags',
     )
 
     data = (
@@ -57,7 +57,8 @@ class TestCreateNetworkQosPolicy(TestQosPolicy):
         new_qos_policy.name,
         new_qos_policy.project_id,
         new_qos_policy.rules,
-        new_qos_policy.shared,
+        new_qos_policy.is_shared,
+        new_qos_policy.tags,
     )
 
     def setUp(self):
@@ -158,17 +159,13 @@ class TestCreateNetworkQosPolicy(TestQosPolicy):
 
 class TestDeleteNetworkQosPolicy(TestQosPolicy):
     # The address scope to delete.
-    _qos_policies = network_fakes.FakeNetworkQosPolicy.create_qos_policies(
-        count=2
-    )
+    _qos_policies = network_fakes.create_qos_policies(count=2)
 
     def setUp(self):
         super().setUp()
         self.network_client.delete_qos_policy = mock.Mock(return_value=None)
-        self.network_client.find_qos_policy = (
-            network_fakes.FakeNetworkQosPolicy.get_qos_policies(
-                qos_policies=self._qos_policies
-            )
+        self.network_client.find_qos_policy = network_fakes.get_qos_policies(
+            qos_policies=self._qos_policies
         )
 
         # Get the command object to test
@@ -245,9 +242,7 @@ class TestDeleteNetworkQosPolicy(TestQosPolicy):
 
 class TestListNetworkQosPolicy(TestQosPolicy):
     # The QoS policies to list up.
-    qos_policies = network_fakes.FakeNetworkQosPolicy.create_qos_policies(
-        count=3
-    )
+    qos_policies = network_fakes.create_qos_policies(count=3)
     columns = (
         'ID',
         'Name',
@@ -261,7 +256,7 @@ class TestListNetworkQosPolicy(TestQosPolicy):
             (
                 qos_policy.id,
                 qos_policy.name,
-                qos_policy.shared,
+                qos_policy.is_shared,
                 qos_policy.is_default,
                 qos_policy.project_id,
             )
@@ -345,7 +340,7 @@ class TestListNetworkQosPolicy(TestQosPolicy):
 
 class TestSetNetworkQosPolicy(TestQosPolicy):
     # The QoS policy to set.
-    _qos_policy = network_fakes.FakeNetworkQosPolicy.create_one_qos_policy()
+    _qos_policy = network_fakes.create_one_qos_policy()
 
     def setUp(self):
         super().setUp()
@@ -428,7 +423,7 @@ class TestSetNetworkQosPolicy(TestQosPolicy):
 
 class TestShowNetworkQosPolicy(TestQosPolicy):
     # The QoS policy to show.
-    _qos_policy = network_fakes.FakeNetworkQosPolicy.create_one_qos_policy()
+    _qos_policy = network_fakes.create_one_qos_policy()
     columns = (
         'description',
         'id',
@@ -437,6 +432,7 @@ class TestShowNetworkQosPolicy(TestQosPolicy):
         'project_id',
         'rules',
         'shared',
+        'tags',
     )
     data = (
         _qos_policy.description,
@@ -445,7 +441,8 @@ class TestShowNetworkQosPolicy(TestQosPolicy):
         _qos_policy.name,
         _qos_policy.project_id,
         network_qos_policy.RulesColumn(_qos_policy.rules),
-        _qos_policy.shared,
+        _qos_policy.is_shared,
+        _qos_policy.tags,
     )
 
     def setUp(self):