python-openstackclient 8.2.0__py3-none-any.whl → 8.3.0__py3-none-any.whl

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

@@ -13,7 +13,6 @@
 #   under the License.
 #
 
-from unittest import mock
 from unittest.mock import call
 
 from osc_lib import exceptions
@@ -77,13 +76,11 @@ class TestCreateLocalIP(TestLocalIP):
 
     def setUp(self):
         super().setUp()
-        self.network_client.create_local_ip = mock.Mock(
-            return_value=self.new_local_ip
-        )
-        self.network_client.find_network = mock.Mock(
-            return_value=self.local_ip_network
-        )
-        self.network_client.find_port = mock.Mock(return_value=self.port)
+        self.network_client.create_local_ip.return_value = self.new_local_ip
+
+        self.network_client.find_network.return_value = self.local_ip_network
+
+        self.network_client.find_port.return_value = self.port
 
         # Get the command object to test
         self.cmd = local_ip.CreateLocalIP(self.app, None)
@@ -149,7 +146,7 @@ class TestDeleteLocalIP(TestLocalIP):
 
     def setUp(self):
         super().setUp()
-        self.network_client.delete_local_ip = mock.Mock(return_value=None)
+        self.network_client.delete_local_ip.return_value = None
         self.network_client.find_local_ip = network_fakes.get_local_ips(
             local_ips=self._local_ips
         )
@@ -205,9 +202,7 @@ class TestDeleteLocalIP(TestLocalIP):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         find_mock_result = [self._local_ips[0], exceptions.CommandError]
-        self.network_client.find_local_ip = mock.Mock(
-            side_effect=find_mock_result
-        )
+        self.network_client.find_local_ip.side_effect = find_mock_result
 
         try:
             self.cmd.take_action(parsed_args)
@@ -258,10 +253,8 @@ class TestListLocalIP(TestLocalIP):
 
     def setUp(self):
         super().setUp()
-        self.network_client.local_ips = mock.Mock(return_value=self.local_ips)
-        self.network_client.find_network = mock.Mock(
-            return_value=self.fake_network
-        )
+        self.network_client.local_ips.return_value = self.local_ips
+        self.network_client.find_network.return_value = self.fake_network
 
         # Get the command object to test
         self.cmd = local_ip.ListLocalIP(self.app, None)
@@ -402,10 +395,8 @@ class TestSetLocalIP(TestLocalIP):
 
     def setUp(self):
         super().setUp()
-        self.network_client.update_local_ip = mock.Mock(return_value=None)
-        self.network_client.find_local_ip = mock.Mock(
-            return_value=self._local_ip
-        )
+        self.network_client.update_local_ip.return_value = None
+        self.network_client.find_local_ip.return_value = self._local_ip
 
         # Get the command object to test
         self.cmd = local_ip.SetLocalIP(self.app, None)
@@ -482,9 +473,7 @@ class TestShowLocalIP(TestLocalIP):
 
     def setUp(self):
         super().setUp()
-        self.network_client.find_local_ip = mock.Mock(
-            return_value=self._local_ip
-        )
+        self.network_client.find_local_ip.return_value = self._local_ip
 
         # Get the command object to test
         self.cmd = local_ip.ShowLocalIP(self.app, None)

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

@@ -29,7 +29,7 @@ class TestLocalIPAssociation(network_fakes.TestNetworkV2):
         self.local_ip = network_fakes.create_one_local_ip()
         self.fixed_port = network_fakes.create_one_port()
         self.project = identity_fakes_v2.FakeProject.create_one_project()
-        self.network_client.find_port = mock.Mock(return_value=self.fixed_port)
+        self.network_client.find_port.return_value = self.fixed_port
 
 
 class TestCreateLocalIPAssociation(TestLocalIPAssociation):
@@ -43,13 +43,11 @@ class TestCreateLocalIPAssociation(TestLocalIPAssociation):
                 }
             )
         )
-        self.network_client.create_local_ip_association = mock.Mock(
-            return_value=self.new_local_ip_association
+        self.network_client.create_local_ip_association.return_value = (
+            self.new_local_ip_association
         )
 
-        self.network_client.find_local_ip = mock.Mock(
-            return_value=self.local_ip
-        )
+        self.network_client.find_local_ip.return_value = self.local_ip
 
         # Get the command object to test
         self.cmd = local_ip_association.CreateLocalIPAssociation(
@@ -128,13 +126,10 @@ class TestDeleteLocalIPAssociation(TestLocalIPAssociation):
                 },
             )
         )
-        self.network_client.delete_local_ip_association = mock.Mock(
-            return_value=None
-        )
+        self.network_client.delete_local_ip_association.return_value = None
+
+        self.network_client.find_local_ip.return_value = self.local_ip
 
-        self.network_client.find_local_ip = mock.Mock(
-            return_value=self.local_ip
-        )
         # Get the command object to test
         self.cmd = local_ip_association.DeleteLocalIPAssociation(
             self.app, None
@@ -262,13 +257,13 @@ class TestListLocalIPAssociation(TestLocalIPAssociation):
                     lip_assoc.host,
                 )
             )
-        self.network_client.local_ip_associations = mock.Mock(
-            return_value=self.local_ip_associations
+        self.network_client.local_ip_associations.return_value = (
+            self.local_ip_associations
         )
-        self.network_client.find_local_ip = mock.Mock(
-            return_value=self.local_ip
-        )
-        self.network_client.find_port = mock.Mock(return_value=self.fixed_port)
+
+        self.network_client.find_local_ip.return_value = self.local_ip
+
+        self.network_client.find_port.return_value = self.fixed_port
         # Get the command object to test
         self.cmd = local_ip_association.ListLocalIPAssociation(self.app, None)
 

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

@@ -11,7 +11,6 @@
 #   under the License.
 #
 
-from unittest import mock
 from unittest.mock import call
 
 from osc_lib import exceptions
@@ -31,9 +30,9 @@ class TestNDPProxy(network_fakes.TestNetworkV2):
         self.domains_mock = self.identity_client.domains
 
         self.router = network_fakes.create_one_router({'id': 'fake-router-id'})
-        self.network_client.find_router = mock.Mock(return_value=self.router)
+        self.network_client.find_router.return_value = self.router
         self.port = network_fakes.create_one_port()
-        self.network_client.find_port = mock.Mock(return_value=self.port)
+        self.network_client.find_port.return_value = self.port
 
 
 class TestCreateNDPProxy(TestNDPProxy):
@@ -66,9 +65,7 @@ class TestCreateNDPProxy(TestNDPProxy):
             self.ndp_proxy.router_id,
             self.ndp_proxy.updated_at,
         )
-        self.network_client.create_ndp_proxy = mock.Mock(
-            return_value=self.ndp_proxy
-        )
+        self.network_client.create_ndp_proxy.return_value = self.ndp_proxy
 
         # Get the command object to test
         self.cmd = ndp_proxy.CreateNDPProxy(self.app, None)
@@ -127,10 +124,8 @@ class TestDeleteNDPProxy(TestNDPProxy):
         attrs = {'router_id': self.router.id, 'port_id': self.port.id}
         self.ndp_proxies = network_fakes.create_ndp_proxies(attrs)
         self.ndp_proxy = self.ndp_proxies[0]
-        self.network_client.delete_ndp_proxy = mock.Mock(return_value=None)
-        self.network_client.find_ndp_proxy = mock.Mock(
-            return_value=self.ndp_proxy
-        )
+        self.network_client.delete_ndp_proxy.return_value = None
+        self.network_client.find_ndp_proxy.return_value = self.ndp_proxy
 
         # Get the command object to test
         self.cmd = ndp_proxy.DeleteNDPProxy(self.app, None)
@@ -203,7 +198,7 @@ class TestListNDPProxy(TestNDPProxy):
                 )
             )
 
-        self.network_client.ndp_proxies = mock.Mock(return_value=ndp_proxies)
+        self.network_client.ndp_proxies.return_value = ndp_proxies
 
         # Get the command object to test
         self.cmd = ndp_proxy.ListNDPProxy(self.app, None)
@@ -340,10 +335,8 @@ class TestSetNDPProxy(TestNDPProxy):
         super().setUp()
         attrs = {'router_id': self.router.id, 'port_id': self.port.id}
         self.ndp_proxy = network_fakes.create_one_ndp_proxy(attrs)
-        self.network_client.update_ndp_proxy = mock.Mock(return_value=None)
-        self.network_client.find_ndp_proxy = mock.Mock(
-            return_value=self.ndp_proxy
-        )
+        self.network_client.update_ndp_proxy.return_value = None
+        self.network_client.find_ndp_proxy.return_value = self.ndp_proxy
 
         # Get the command object to test
         self.cmd = ndp_proxy.SetNDPProxy(self.app, None)
@@ -434,12 +427,9 @@ class TestShowNDPProxy(TestNDPProxy):
             self.ndp_proxy.router_id,
             self.ndp_proxy.updated_at,
         )
-        self.network_client.get_ndp_proxy = mock.Mock(
-            return_value=self.ndp_proxy
-        )
-        self.network_client.find_ndp_proxy = mock.Mock(
-            return_value=self.ndp_proxy
-        )
+        self.network_client.get_ndp_proxy.return_value = self.ndp_proxy
+
+        self.network_client.find_ndp_proxy.return_value = self.ndp_proxy
 
         # Get the command object to test
         self.cmd = ndp_proxy.ShowNDPProxy(self.app, None)

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

@@ -12,7 +12,6 @@
 #
 
 import random
-from unittest import mock
 from unittest.mock import call
 
 from osc_lib.cli import format_columns
@@ -116,19 +115,16 @@ class TestCreateNetworkIdentityV3(TestNetwork):
     def setUp(self):
         super().setUp()
 
-        self.network_client.create_network = mock.Mock(
-            return_value=self._network
-        )
-        self.network_client.set_tags = mock.Mock(return_value=None)
+        self.network_client.create_network.return_value = self._network
+
+        self.network_client.set_tags.return_value = None
 
         # Get the command object to test
         self.cmd = network.CreateNetwork(self.app, None)
 
         self.projects_mock.get.return_value = self.project
         self.domains_mock.get.return_value = self.domain
-        self.network_client.find_qos_policy = mock.Mock(
-            return_value=self.qos_policy
-        )
+        self.network_client.find_qos_policy.return_value = self.qos_policy
 
     def test_create_no_options(self):
         arglist = []
@@ -330,6 +326,23 @@ class TestCreateNetworkIdentityV3(TestNetwork):
             exceptions.CommandError, self.cmd.take_action, parsed_args
         )
 
+    def test_create_with_provider_segment_without_provider_type(self):
+        arglist = [
+            "--provider-segment",
+            "123",
+            self._network.name,
+        ]
+        verifylist = [
+            ('provider_network_type', None),
+            ('segmentation_id', "123"),
+            ('name', self._network.name),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
+
 
 class TestCreateNetworkIdentityV2(
     identity_fakes_v2.FakeClientMixin,
@@ -406,10 +419,9 @@ class TestCreateNetworkIdentityV2(
     def setUp(self):
         super().setUp()
 
-        self.network_client.create_network = mock.Mock(
-            return_value=self._network
-        )
-        self.network_client.set_tags = mock.Mock(return_value=None)
+        self.network_client.create_network.return_value = self._network
+
+        self.network_client.set_tags.return_value = None
 
         # Get the command object to test
         self.cmd = network.CreateNetwork(self.app, None)
@@ -481,7 +493,7 @@ class TestDeleteNetwork(TestNetwork):
         # The networks to delete
         self._networks = network_fakes.create_networks(count=3)
 
-        self.network_client.delete_network = mock.Mock(return_value=None)
+        self.network_client.delete_network.return_value = None
 
         self.network_client.find_network = network_fakes.get_networks(
             networks=self._networks
@@ -540,14 +552,14 @@ class TestDeleteNetwork(TestNetwork):
             exceptions.NotFound('404'),
             self._networks[1],
         ]
-        self.network_client.find_network = mock.Mock(side_effect=ret_find)
+        self.network_client.find_network.side_effect = ret_find
 
         # Fake exception in delete_network()
         ret_delete = [
             None,
             exceptions.NotFound('404'),
         ]
-        self.network_client.delete_network = mock.Mock(side_effect=ret_delete)
+        self.network_client.delete_network.side_effect = ret_delete
 
         self.assertRaises(
             exceptions.CommandError, self.cmd.take_action, parsed_args
@@ -619,13 +631,13 @@ class TestListNetwork(TestNetwork):
         # Get the command object to test
         self.cmd = network.ListNetwork(self.app, None)
 
-        self.network_client.networks = mock.Mock(return_value=self._network)
+        self.network_client.networks.return_value = self._network
 
         self._agent = network_fakes.create_one_network_agent()
         self.network_client.get_agent.return_value = self._agent
 
-        self.network_client.dhcp_agent_hosting_networks = mock.Mock(
-            return_value=self._network
+        self.network_client.dhcp_agent_hosting_networks.return_value = (
+            self._network
         )
 
         # TestListTagMixin
@@ -974,15 +986,12 @@ class TestSetNetwork(TestNetwork):
     def setUp(self):
         super().setUp()
 
-        self.network_client.update_network = mock.Mock(return_value=None)
-        self.network_client.set_tags = mock.Mock(return_value=None)
+        self.network_client.update_network.return_value = None
+        self.network_client.set_tags.return_value = None
 
-        self.network_client.find_network = mock.Mock(
-            return_value=self._network
-        )
-        self.network_client.find_qos_policy = mock.Mock(
-            return_value=self.qos_policy
-        )
+        self.network_client.find_network.return_value = self._network
+
+        self.network_client.find_qos_policy.return_value = self.qos_policy
 
         # Get the command object to test
         self.cmd = network.SetNetwork(self.app, None)
@@ -1225,9 +1234,7 @@ class TestShowNetwork(TestNetwork):
     def setUp(self):
         super().setUp()
 
-        self.network_client.find_network = mock.Mock(
-            return_value=self._network
-        )
+        self.network_client.find_network.return_value = self._network
 
         # Get the command object to test
         self.cmd = network.ShowNetwork(self.app, None)
@@ -1273,15 +1280,12 @@ class TestUnsetNetwork(TestNetwork):
     def setUp(self):
         super().setUp()
 
-        self.network_client.update_network = mock.Mock(return_value=None)
-        self.network_client.set_tags = mock.Mock(return_value=None)
+        self.network_client.update_network.return_value = None
+        self.network_client.set_tags.return_value = None
 
-        self.network_client.find_network = mock.Mock(
-            return_value=self._network
-        )
-        self.network_client.find_qos_policy = mock.Mock(
-            return_value=self.qos_policy
-        )
+        self.network_client.find_network.return_value = self._network
+
+        self.network_client.find_qos_policy.return_value = self.qos_policy
 
         # Get the command object to test
         self.cmd = network.UnsetNetwork(self.app, None)

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

@@ -11,7 +11,6 @@
 #   under the License.
 #
 
-from unittest import mock
 from unittest.mock import call
 
 from osc_lib.cli import format_columns
@@ -34,8 +33,8 @@ class TestAddNetworkToAgent(TestNetworkAgent):
     def setUp(self):
         super().setUp()
 
-        self.network_client.get_agent = mock.Mock(return_value=self.agent)
-        self.network_client.find_network = mock.Mock(return_value=self.net)
+        self.network_client.get_agent.return_value = self.agent
+        self.network_client.find_network.return_value = self.net
         self.network_client.name = self.network_client.find_network.name
 
         self.cmd = network_agent.AddNetworkToAgent(self.app, None)
@@ -76,8 +75,8 @@ class TestAddRouterAgent(TestNetworkAgent):
     def setUp(self):
         super().setUp()
 
-        self.network_client.get_agent = mock.Mock(return_value=self._agent)
-        self.network_client.find_router = mock.Mock(return_value=self._router)
+        self.network_client.get_agent.return_value = self._agent
+        self.network_client.find_router.return_value = self._router
 
         self.cmd = network_agent.AddRouterToAgent(self.app, None)
 
@@ -120,7 +119,7 @@ class TestDeleteNetworkAgent(TestNetworkAgent):
 
     def setUp(self):
         super().setUp()
-        self.network_client.delete_agent = mock.Mock(return_value=None)
+        self.network_client.delete_agent.return_value = None
 
         # Get the command object to test
         self.cmd = network_agent.DeleteNetworkAgent(self.app, None)
@@ -173,9 +172,7 @@ class TestDeleteNetworkAgent(TestNetworkAgent):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         delete_mock_result = [True, exceptions.CommandError]
-        self.network_client.delete_agent = mock.Mock(
-            side_effect=delete_mock_result
-        )
+        self.network_client.delete_agent.side_effect = delete_mock_result
 
         try:
             self.cmd.take_action(parsed_args)
@@ -357,8 +354,8 @@ class TestRemoveNetworkFromAgent(TestNetworkAgent):
     def setUp(self):
         super().setUp()
 
-        self.network_client.get_agent = mock.Mock(return_value=self.agent)
-        self.network_client.find_network = mock.Mock(return_value=self.net)
+        self.network_client.get_agent.return_value = self.agent
+        self.network_client.find_network.return_value = self.net
         self.network_client.name = self.network_client.find_network.name
 
         self.cmd = network_agent.RemoveNetworkFromAgent(self.app, None)
@@ -414,8 +411,8 @@ class TestRemoveRouterAgent(TestNetworkAgent):
     def setUp(self):
         super().setUp()
 
-        self.network_client.get_agent = mock.Mock(return_value=self._agent)
-        self.network_client.find_router = mock.Mock(return_value=self._router)
+        self.network_client.get_agent.return_value = self._agent
+        self.network_client.find_router.return_value = self._router
 
         self.cmd = network_agent.RemoveRouterFromAgent(self.app, None)
 
@@ -458,10 +455,8 @@ class TestSetNetworkAgent(TestNetworkAgent):
 
     def setUp(self):
         super().setUp()
-        self.network_client.update_agent = mock.Mock(return_value=None)
-        self.network_client.get_agent = mock.Mock(
-            return_value=self._network_agent
-        )
+        self.network_client.update_agent.return_value = None
+        self.network_client.get_agent.return_value = self._network_agent
 
         # Get the command object to test
         self.cmd = network_agent.SetNetworkAgent(self.app, None)
@@ -574,9 +569,7 @@ class TestShowNetworkAgent(TestNetworkAgent):
 
     def setUp(self):
         super().setUp()
-        self.network_client.get_agent = mock.Mock(
-            return_value=self._network_agent
-        )
+        self.network_client.get_agent.return_value = self._network_agent
 
         # Get the command object to test
         self.cmd = network_agent.ShowNetworkAgent(self.app, None)

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

@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from unittest import mock
 
 from openstackclient.network.v2 import network_auto_allocated_topology
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
@@ -50,8 +49,8 @@ class TestCreateAutoAllocatedTopology(TestAutoAllocatedTopology):
         self.cmd = network_auto_allocated_topology.CreateAutoAllocatedTopology(
             self.app, None
         )
-        self.network_client.get_auto_allocated_topology = mock.Mock(
-            return_value=self.topology
+        self.network_client.get_auto_allocated_topology.return_value = (
+            self.topology
         )
 
     def test_create_no_options(self):
@@ -155,8 +154,8 @@ class TestValidateAutoAllocatedTopology(TestAutoAllocatedTopology):
         self.cmd = network_auto_allocated_topology.CreateAutoAllocatedTopology(
             self.app, None
         )
-        self.network_client.validate_auto_allocated_topology = mock.Mock(
-            return_value=self.topology
+        self.network_client.validate_auto_allocated_topology.return_value = (
+            self.topology
         )
 
     def test_show_dry_run_no_project(self):
@@ -228,9 +227,7 @@ class TestDeleteAutoAllocatedTopology(TestAutoAllocatedTopology):
         self.cmd = network_auto_allocated_topology.DeleteAutoAllocatedTopology(
             self.app, None
         )
-        self.network_client.delete_auto_allocated_topology = mock.Mock(
-            return_value=None
-        )
+        self.network_client.delete_auto_allocated_topology.return_value = None
 
     def test_delete_no_project(self):
         arglist = []

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

@@ -41,11 +41,9 @@ class TestAddNetworkFlavorToProfile(TestNetworkFlavor):
     def setUp(self):
         super().setUp()
 
-        self.network_client.find_flavor = mock.Mock(
-            return_value=self.network_flavor
-        )
-        self.network_client.find_service_profile = mock.Mock(
-            return_value=self.service_profile
+        self.network_client.find_flavor.return_value = self.network_flavor
+        self.network_client.find_service_profile.return_value = (
+            self.service_profile
         )
 
         self.cmd = network_flavor.AddNetworkFlavorToProfile(self.app, None)
@@ -102,8 +100,8 @@ class TestCreateNetworkFlavor(TestNetworkFlavor):
 
     def setUp(self):
         super().setUp()
-        self.network_client.create_flavor = mock.Mock(
-            return_value=self.new_network_flavor
+        self.network_client.create_flavor.return_value = (
+            self.new_network_flavor
         )
 
         # Get the command object to test
@@ -218,7 +216,7 @@ class TestDeleteNetworkFlavor(TestNetworkFlavor):
 
     def setUp(self):
         super().setUp()
-        self.network_client.delete_flavor = mock.Mock(return_value=None)
+        self.network_client.delete_flavor.return_value = None
         self.network_client.find_flavor = network_fakes.get_flavor(
             network_flavors=self._network_flavors
         )
@@ -278,9 +276,7 @@ class TestDeleteNetworkFlavor(TestNetworkFlavor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         find_mock_result = [self._network_flavors[0], exceptions.CommandError]
-        self.network_client.find_flavor = mock.Mock(
-            side_effect=find_mock_result
-        )
+        self.network_client.find_flavor.side_effect = find_mock_result
 
         try:
             self.cmd.take_action(parsed_args)
@@ -323,9 +319,7 @@ class TestListNetworkFlavor(TestNetworkFlavor):
 
     def setUp(self):
         super().setUp()
-        self.network_client.flavors = mock.Mock(
-            return_value=self._network_flavors
-        )
+        self.network_client.flavors.return_value = self._network_flavors
 
         # Get the command object to test
         self.cmd = network_flavor.ListNetworkFlavor(self.app, None)
@@ -348,11 +342,9 @@ class TestRemoveNetworkFlavorFromProfile(TestNetworkFlavor):
 
     def setUp(self):
         super().setUp()
-        self.network_client.find_flavor = mock.Mock(
-            return_value=self.network_flavor
-        )
-        self.network_client.find_service_profile = mock.Mock(
-            return_value=self.service_profile
+        self.network_client.find_flavor.return_value = self.network_flavor
+        self.network_client.find_service_profile.return_value = (
+            self.service_profile
         )
         self.network_client.disassociate_flavor_from_service_profile = (
             mock.Mock()
@@ -412,9 +404,7 @@ class TestShowNetworkFlavor(TestNetworkFlavor):
 
     def setUp(self):
         super().setUp()
-        self.network_client.find_flavor = mock.Mock(
-            return_value=self.new_network_flavor
-        )
+        self.network_client.find_flavor.return_value = self.new_network_flavor
 
         # Get the command object to test
         self.cmd = network_flavor.ShowNetworkFlavor(self.app, None)
@@ -456,10 +446,8 @@ class TestSetNetworkFlavor(TestNetworkFlavor):
 
     def setUp(self):
         super().setUp()
-        self.network_client.update_flavor = mock.Mock(return_value=None)
-        self.network_client.find_flavor = mock.Mock(
-            return_value=self.new_network_flavor
-        )
+        self.network_client.update_flavor.return_value = None
+        self.network_client.find_flavor.return_value = self.new_network_flavor
 
         # Get the command object to test
         self.cmd = network_flavor.SetNetworkFlavor(self.app, None)