openstack/python-openstackclient
Code Issues Proposed changes

tests: Avoid more unnecessary mocks

Browse Source 
Change-Id: I04672d46595e93b19f873a54d5be9363d262370b
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane
2025-11-07 13:40:36 +00:00
parent 44dfa157e4
commit 7116449190
39 changed files with 651 additions and 893 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
openstackclient/tests/unit/common/test_extension.py
View File

@@ -10,7 +10,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from unittest import mock
from openstackclient.common import extension
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
@@ -295,8 +294,8 @@ class TestExtensionShow(TestExtension):
self.cmd = extension.ShowExtension(self.app, None)
self.app.client_manager.network.find_extension = mock.Mock(
return_value=self.extension_details
self.app.client_manager.network.find_extension.return_value = (
self.extension_details
)
def test_show_no_options(self):

8
openstackclient/tests/unit/compute/v2/test_aggregate.py
View File

@@ -165,9 +165,11 @@ class TestAggregateDelete(TestAggregate):
sdk_fakes.generate_fake_resources(_aggregate.Aggregate, 2)
)
self.compute_client.find_aggregate = mock.Mock(
side_effect=[self.fake_ags[0], self.fake_ags[1]]
)
self.compute_client.find_aggregate.side_effect = [
self.fake_ags[0],
self.fake_ags[1],
]
self.cmd = aggregate.DeleteAggregate(self.app, None)
def test_aggregate_delete(self):

5
openstackclient/tests/unit/compute/v2/test_console.py
View File

@@ -13,7 +13,6 @@
# under the License.
#
from unittest import mock
from openstack.compute.v2 import server as _server
from openstack.test import fakes as sdk_fakes
@@ -90,9 +89,7 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2):
'protocol': 'fake_protocol',
'type': 'fake_type',
}
self.compute_client.create_console = mock.Mock(
return_value=fake_console_data
)
self.compute_client.create_console.return_value = fake_console_data
self.columns = (
'protocol',

4
openstackclient/tests/unit/compute/v2/test_flavor.py
View File

@@ -680,9 +680,7 @@ class TestFlavorList(TestFlavor):
)
self.compute_client.flavors.side_effect = [[flavor], []]
self.compute_client.fetch_flavor_extra_specs = mock.Mock(
return_value=None
)
self.compute_client.fetch_flavor_extra_specs.return_value = None
arglist = [
'--long',

10
openstackclient/tests/unit/compute/v2/test_hypervisor_stats.py
View File

@@ -12,20 +12,12 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
from openstackclient.compute.v2 import hypervisor_stats
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit import fakes
class TestHypervisorStats(compute_fakes.TestComputev2):
def setUp(self):
super().setUp()
self.compute_client.get = mock.Mock()
# Not in fakes.py because hypervisor stats has been deprecated
@@ -61,7 +53,7 @@ def create_one_hypervisor_stats(attrs=None):
return stats_info
class TestHypervisorStatsShow(TestHypervisorStats):
class TestHypervisorStatsShow(compute_fakes.TestComputev2):
_stats = create_one_hypervisor_stats()
def setUp(self):

4
openstackclient/tests/unit/compute/v2/test_server_backup.py
View File

@@ -161,9 +161,7 @@ class TestServerBackupCreate(compute_fakes.TestComputev2):
@mock.patch.object(common_utils, 'wait_for_status', return_value=True)
def test_server_backup_wait_ok(self, mock_wait_for_status):
self.image_client.get_image = mock.Mock(
side_effect=self.image,
)
self.image_client.get_image.side_effect = (self.image,)
arglist = [
'--name',

4
openstackclient/tests/unit/compute/v2/test_service.py
View File

@@ -77,9 +77,7 @@ class TestServiceDelete(compute_fakes.TestComputev2):
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
delete_mock_result = [None, exceptions.CommandError]
self.compute_client.delete_service = mock.Mock(
side_effect=delete_mock_result
)
self.compute_client.delete_service.side_effect = delete_mock_result
try:
self.cmd.take_action(parsed_args)

8
openstackclient/tests/unit/network/test_common.py
View File

@@ -128,15 +128,11 @@ class TestNetworkAndCompute(utils.TestCommand):
self.app.client_manager.network = mock.Mock()
self.network_client = self.app.client_manager.network
self.network_client.network_action = mock.Mock(
return_value='take_action_network'
)
self.network_client.network_action.return_value = 'take_action_network'
self.app.client_manager.compute = mock.Mock()
self.compute_client = self.app.client_manager.compute
self.compute_client.compute_action = mock.Mock(
return_value='take_action_compute'
)
self.compute_client.compute_action.return_value = 'take_action_compute'
self.cmd = FakeNetworkAndComputeCommand(self.app, None)

41
openstackclient/tests/unit/network/v2/test_address_group.py
View File

@@ -11,7 +11,6 @@
# under the License.
#
from unittest import mock
from unittest.mock import call
from osc_lib import exceptions
@@ -58,8 +57,8 @@ class TestCreateAddressGroup(TestAddressGroup):
def setUp(self):
super().setUp()
self.network_client.create_address_group = mock.Mock(
return_value=self.new_address_group
self.network_client.create_address_group.return_value = (
self.new_address_group
)
# Get the command object to test
@@ -145,7 +144,7 @@ class TestDeleteAddressGroup(TestAddressGroup):
def setUp(self):
super().setUp()
self.network_client.delete_address_group = mock.Mock(return_value=None)
self.network_client.delete_address_group.return_value = None
self.network_client.find_address_group = (
network_fakes.get_address_groups(
address_groups=self._address_groups
@@ -206,9 +205,7 @@ class TestDeleteAddressGroup(TestAddressGroup):
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
find_mock_result = [self._address_groups[0], exceptions.CommandError]
self.network_client.find_address_group = mock.Mock(
side_effect=find_mock_result
)
self.network_client.find_address_group.side_effect = find_mock_result
try:
self.cmd.take_action(parsed_args)
@@ -251,9 +248,7 @@ class TestListAddressGroup(TestAddressGroup):
def setUp(self):
super().setUp()
self.network_client.address_groups = mock.Mock(
return_value=self.address_groups
)
self.network_client.address_groups.return_value = self.address_groups
# Get the command object to test
self.cmd = address_group.ListAddressGroup(self.app, None)
@@ -333,13 +328,15 @@ class TestSetAddressGroup(TestAddressGroup):
def setUp(self):
super().setUp()
self.network_client.update_address_group = mock.Mock(return_value=None)
self.network_client.find_address_group = mock.Mock(
return_value=self._address_group
self.network_client.update_address_group.return_value = None
self.network_client.find_address_group.return_value = (
self._address_group
)
self.network_client.add_addresses_to_address_group = mock.Mock(
return_value=self._address_group
self.network_client.add_addresses_to_address_group.return_value = (
self._address_group
)
# Get the command object to test
self.cmd = address_group.SetAddressGroup(self.app, None)
@@ -442,8 +439,8 @@ class TestShowAddressGroup(TestAddressGroup):
def setUp(self):
super().setUp()
self.network_client.find_address_group = mock.Mock(
return_value=self._address_group
self.network_client.find_address_group.return_value = (
self._address_group
)
# Get the command object to test
@@ -486,12 +483,12 @@ class TestUnsetAddressGroup(TestAddressGroup):
def setUp(self):
super().setUp()
self.network_client.find_address_group = mock.Mock(
return_value=self._address_group
)
self.network_client.remove_addresses_from_address_group = mock.Mock(
return_value=self._address_group
self.network_client.find_address_group.return_value = (
self._address_group
)
self.network_client.remove_addresses_from_address_group.return_value = self._address_group
# Get the command object to test
self.cmd = address_group.UnsetAddressGroup(self.app, None)

25
openstackclient/tests/unit/network/v2/test_address_scope.py
View File

@@ -11,7 +11,6 @@
# under the License.
#
from unittest import mock
from unittest.mock import call
from osc_lib import exceptions
@@ -52,8 +51,8 @@ class TestCreateAddressScope(TestAddressScope):
def setUp(self):
super().setUp()
self.network_client.create_address_scope = mock.Mock(
return_value=self.new_address_scope
self.network_client.create_address_scope.return_value = (
self.new_address_scope
)
# Get the command object to test
@@ -160,7 +159,7 @@ class TestDeleteAddressScope(TestAddressScope):
def setUp(self):
super().setUp()
self.network_client.delete_address_scope = mock.Mock(return_value=None)
self.network_client.delete_address_scope.return_value = None
self.network_client.find_address_scope = (
network_fakes.get_address_scopes(
address_scopes=self._address_scopes
@@ -222,9 +221,7 @@ class TestDeleteAddressScope(TestAddressScope):
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
find_mock_result = [self._address_scopes[0], exceptions.CommandError]
self.network_client.find_address_scope = mock.Mock(
side_effect=find_mock_result
)
self.network_client.find_address_scope.side_effect = find_mock_result
try:
self.cmd.take_action(parsed_args)
@@ -267,9 +264,7 @@ class TestListAddressScope(TestAddressScope):
def setUp(self):
super().setUp()
self.network_client.address_scopes = mock.Mock(
return_value=self.address_scopes
)
self.network_client.address_scopes.return_value = self.address_scopes
# Get the command object to test
self.cmd = address_scope.ListAddressScope(self.app, None)
@@ -398,9 +393,9 @@ class TestSetAddressScope(TestAddressScope):
def setUp(self):
super().setUp()
self.network_client.update_address_scope = mock.Mock(return_value=None)
self.network_client.find_address_scope = mock.Mock(
return_value=self._address_scope
self.network_client.update_address_scope.return_value = None
self.network_client.find_address_scope.return_value = (
self._address_scope
)
# Get the command object to test
@@ -488,8 +483,8 @@ class TestShowAddressScope(TestAddressScope):
def setUp(self):
super().setUp()
self.network_client.find_address_scope = mock.Mock(
return_value=self._address_scope
self.network_client.find_address_scope.return_value = (
self._address_scope
)
# Get the command object to test

5
openstackclient/tests/unit/network/v2/test_default_security_group_rule.py
View File

@@ -11,7 +11,6 @@
# under the License.
#
from unittest import mock
from unittest.mock import call
import uuid
@@ -921,8 +920,8 @@ class TestDeleteDefaultSecurityGroupRule(network_fakes.TestNetworkV2):
self._default_sg_rules[0],
exceptions.CommandError,
]
self.network_client.find_default_security_group_rule = mock.Mock(
side_effect=find_mock_result
self.network_client.find_default_security_group_rule.side_effect = (
find_mock_result
)
try:

48
openstackclient/tests/unit/network/v2/test_floating_ip_network.py
View File

@@ -11,7 +11,6 @@
# under the License.
#
from unittest import mock
from unittest.mock import call
from openstack.network.v2 import floating_ip as _floating_ip
@@ -86,16 +85,14 @@ class TestCreateFloatingIPNetwork(TestFloatingIPNetwork):
def setUp(self):
super().setUp()
self.network_client.create_ip = mock.Mock(
return_value=self.floating_ip
)
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.create_ip.return_value = self.floating_ip
self.network_client.find_network = mock.Mock(
return_value=self.floating_network
)
self.network_client.find_subnet = mock.Mock(return_value=self.subnet)
self.network_client.find_port = mock.Mock(return_value=self.port)
self.network_client.set_tags.return_value = None
self.network_client.find_network.return_value = self.floating_network
self.network_client.find_subnet.return_value = self.subnet
self.network_client.find_port.return_value = self.port
# Get the command object to test
self.cmd = fip.CreateFloatingIP(self.app, None)
@@ -304,7 +301,7 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork):
def setUp(self):
super().setUp()
self.network_client.delete_ip = mock.Mock(return_value=None)
self.network_client.delete_ip.return_value = None
# Get the command object to test
self.cmd = fip.DeleteFloatingIP(self.app, None)
@@ -470,14 +467,11 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
def setUp(self):
super().setUp()
self.network_client.ips = mock.Mock(return_value=self.floating_ips)
self.network_client.find_network = mock.Mock(
return_value=self.fake_network
)
self.network_client.find_port = mock.Mock(return_value=self.fake_port)
self.network_client.find_router = mock.Mock(
return_value=self.fake_router
)
self.network_client.ips.return_value = self.floating_ips
self.network_client.find_network.return_value = self.fake_network
self.network_client.find_port.return_value = self.fake_port
self.network_client.find_router.return_value = self.fake_router
# Get the command object to test
self.cmd = fip.ListFloatingIP(self.app, None)
@@ -713,7 +707,7 @@ class TestShowFloatingIPNetwork(TestFloatingIPNetwork):
self.floating_ip = sdk_fakes.generate_fake_resource(
_floating_ip.FloatingIP
)
self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
self.network_client.find_ip.return_value = self.floating_ip
self.columns = (
'created_at',
@@ -797,10 +791,10 @@ class TestSetFloatingIP(TestFloatingIPNetwork):
def setUp(self):
super().setUp()
self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
self.network_client.find_port = mock.Mock(return_value=self.port)
self.network_client.update_ip = mock.Mock(return_value=None)
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.find_ip.return_value = self.floating_ip
self.network_client.find_port.return_value = self.port
self.network_client.update_ip.return_value = None
self.network_client.set_tags.return_value = None
# Get the command object to test
self.cmd = fip.SetFloatingIP(self.app, None)
@@ -1044,9 +1038,9 @@ class TestUnsetFloatingIP(TestFloatingIPNetwork):
def setUp(self):
super().setUp()
self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
self.network_client.update_ip = mock.Mock(return_value=None)
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.find_ip.return_value = self.floating_ip
self.network_client.update_ip.return_value = None
self.network_client.set_tags.return_value = None
# Get the command object to test
self.cmd = fip.UnsetFloatingIP(self.app, None)

39
openstackclient/tests/unit/network/v2/test_floating_ip_port_forwarding.py
View File

@@ -33,7 +33,7 @@ class TestFloatingIPPortForwarding(network_fakes.TestNetworkV2):
)
self.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.port)
self.network_client.find_port.return_value = self.port
class TestCreateFloatingIPPortForwarding(TestFloatingIPPortForwarding):
@@ -54,11 +54,11 @@ class TestCreateFloatingIPPortForwarding(TestFloatingIPPortForwarding):
},
)
self.network_client.create_floating_ip_port_forwarding = mock.Mock(
return_value=self.new_port_forwarding
self.network_client.create_floating_ip_port_forwarding.return_value = (
self.new_port_forwarding
)
self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
self.network_client.find_ip.return_value = self.floating_ip
# Get the command object to test
self.cmd = floating_ip_port_forwarding.CreateFloatingIPPortForwarding(
@@ -351,11 +351,11 @@ class TestDeleteFloatingIPPortForwarding(TestFloatingIPPortForwarding):
},
)
)
self.network_client.delete_floating_ip_port_forwarding = mock.Mock(
return_value=None
self.network_client.delete_floating_ip_port_forwarding.return_value = (
None
)
self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
self.network_client.find_ip.return_value = self.floating_ip
# Get the command object to test
self.cmd = floating_ip_port_forwarding.DeleteFloatingIPPortForwarding(
self.app, None
@@ -490,10 +490,11 @@ class TestListFloatingIPPortForwarding(TestFloatingIPPortForwarding):
port_forwarding.description,
)
)
self.network_client.floating_ip_port_forwardings = mock.Mock(
return_value=self.port_forwardings
self.network_client.floating_ip_port_forwardings.return_value = (
self.port_forwardings
)
self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
self.network_client.find_ip.return_value = self.floating_ip
# Get the command object to test
self.cmd = floating_ip_port_forwarding.ListFloatingIPPortForwarding(
self.app, None
@@ -557,14 +558,15 @@ class TestSetFloatingIPPortForwarding(TestFloatingIPPortForwarding):
'floatingip_id': self.floating_ip.id,
}
)
self.network_client.update_floating_ip_port_forwarding = mock.Mock(
return_value=None
self.network_client.update_floating_ip_port_forwarding.return_value = (
None
)
self.network_client.find_floating_ip_port_forwarding = mock.Mock(
return_value=self._port_forwarding
self.network_client.find_floating_ip_port_forwarding.return_value = (
self._port_forwarding
)
self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
self.network_client.find_ip.return_value = self.floating_ip
# Get the command object to test
self.cmd = floating_ip_port_forwarding.SetFloatingIPPortForwarding(
self.app, None
@@ -690,10 +692,11 @@ class TestShowFloatingIPPortForwarding(TestFloatingIPPortForwarding):
self._port_forwarding.internal_port_range,
self._port_forwarding.protocol,
)
self.network_client.find_floating_ip_port_forwarding = mock.Mock(
return_value=self._port_forwarding
self.network_client.find_floating_ip_port_forwarding.return_value = (
self._port_forwarding
)
self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
self.network_client.find_ip.return_value = self.floating_ip
# Get the command object to test
self.cmd = floating_ip_port_forwarding.ShowFloatingIPPortForwarding(
self.app, None

14
openstackclient/tests/unit/network/v2/test_ip_availability.py
View File

@@ -11,7 +11,6 @@
# under the License.
#
from unittest import mock
from osc_lib.cli import format_columns
@@ -55,8 +54,8 @@ class TestListIPAvailability(TestIPAvailability):
super().setUp()
self.cmd = ip_availability.ListIPAvailability(self.app, None)
self.network_client.network_ip_availabilities = mock.Mock(
return_value=self._ip_availability
self.network_client.network_ip_availabilities.return_value = (
self._ip_availability
)
def test_list_no_options(self):
@@ -134,13 +133,12 @@ class TestShowIPAvailability(TestIPAvailability):
def setUp(self):
super().setUp()
self.network_client.find_network_ip_availability = mock.Mock(
return_value=self._ip_availability
)
self.network_client.find_network = mock.Mock(
return_value=self._network
self.network_client.find_network_ip_availability.return_value = (
self._ip_availability
)
self.network_client.find_network.return_value = self._network
# Get the command object to test
self.cmd = ip_availability.ShowIPAvailability(self.app, None)

21
openstackclient/tests/unit/network/v2/test_l3_conntrack_helper.py
View File

@@ -11,7 +11,6 @@
# under the License.
#
from unittest import mock
from osc_lib import exceptions
@@ -46,8 +45,8 @@ class TestCreateL3ConntrackHelper(TestConntrackHelper):
self.ct_helper.protocol,
self.ct_helper.router_id,
)
self.network_client.create_conntrack_helper = mock.Mock(
return_value=self.ct_helper
self.network_client.create_conntrack_helper.return_value = (
self.ct_helper
)
# Get the command object to test
@@ -119,9 +118,7 @@ class TestDeleteL3ConntrackHelper(TestConntrackHelper):
attrs
)
)
self.network_client.delete_conntrack_helper = mock.Mock(
return_value=None
)
self.network_client.delete_conntrack_helper.return_value = None
# Get the command object to test
self.cmd = l3_conntrack_helper.DeleteConntrackHelper(self.app, None)
@@ -181,9 +178,7 @@ class TestListL3ConntrackHelper(TestConntrackHelper):
ct_helper.port,
)
)
self.network_client.conntrack_helpers = mock.Mock(
return_value=ct_helpers
)
self.network_client.conntrack_helpers.return_value = ct_helpers
# Get the command object to test
self.cmd = l3_conntrack_helper.ListConntrackHelper(self.app, None)
@@ -216,9 +211,7 @@ class TestSetL3ConntrackHelper(TestConntrackHelper):
attrs
)
)
self.network_client.update_conntrack_helper = mock.Mock(
return_value=None
)
self.network_client.update_conntrack_helper.return_value = None
# Get the command object to test
self.cmd = l3_conntrack_helper.SetConntrackHelper(self.app, None)
@@ -281,9 +274,7 @@ class TestShowL3ConntrackHelper(TestConntrackHelper):
self.ct_helper.protocol,
self.ct_helper.router_id,
)
self.network_client.get_conntrack_helper = mock.Mock(
return_value=self.ct_helper
)
self.network_client.get_conntrack_helper.return_value = self.ct_helper
# Get the command object to test
self.cmd = l3_conntrack_helper.ShowConntrackHelper(self.app, None)

35
openstackclient/tests/unit/network/v2/test_local_ip.py
View File

@@ -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)

31
openstackclient/tests/unit/network/v2/test_local_ip_association.py
View File

@@ -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)

32
openstackclient/tests/unit/network/v2/test_ndp_proxy.py
View File

@@ -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)

61
openstackclient/tests/unit/network/v2/test_network.py
View File

@@ -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 = []
@@ -423,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)
@@ -498,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
@@ -557,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
@@ -636,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
@@ -991,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)
@@ -1242,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)
@@ -1290,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)

33
openstackclient/tests/unit/network/v2/test_network_agent.py
View File

@@ -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)

13
openstackclient/tests/unit/network/v2/test_network_auto_allocated_topology.py
View File

@@ -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 = []

40
openstackclient/tests/unit/network/v2/test_network_flavor.py
View File

@@ -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)

31
openstackclient/tests/unit/network/v2/test_network_flavor_profile.py
View File

@@ -49,9 +49,10 @@ class TestCreateFlavorProfile(TestFlavorProfile):
def setUp(self):
super().setUp()
self.network_client.create_service_profile = mock.Mock(
return_value=self.new_flavor_profile
self.network_client.create_service_profile.return_value = (
self.new_flavor_profile
)
# Get the command object to test
self.cmd = network_flavor_profile.CreateNetworkFlavorProfile(
self.app, None
@@ -195,9 +196,8 @@ class TestDeleteFlavorProfile(TestFlavorProfile):
def setUp(self):
super().setUp()
self.network_client.delete_service_profile = mock.Mock(
return_value=None
)
self.network_client.delete_service_profile.return_value = None
self.network_client.find_service_profile = (
network_fakes.get_service_profile(
flavor_profile=self._network_flavor_profiles
@@ -266,9 +266,7 @@ class TestDeleteFlavorProfile(TestFlavorProfile):
self._network_flavor_profiles[0],
exceptions.CommandError,
]
self.network_client.find_service_profile = mock.Mock(
side_effect=find_mock_result
)
self.network_client.find_service_profile.side_effect = find_mock_result
try:
self.cmd.take_action(parsed_args)
@@ -314,8 +312,8 @@ class TestListFlavorProfile(TestFlavorProfile):
def setUp(self):
super().setUp()
self.network_client.service_profiles = mock.Mock(
return_value=self._network_flavor_profiles
self.network_client.service_profiles.return_value = (
self._network_flavor_profiles
)
# Get the command object to test
@@ -355,8 +353,8 @@ class TestShowFlavorProfile(TestFlavorProfile):
def setUp(self):
super().setUp()
self.network_client.find_service_profile = mock.Mock(
return_value=self.network_flavor_profile
self.network_client.find_service_profile.return_value = (
self.network_flavor_profile
)
# Get the command object to test
@@ -388,11 +386,10 @@ class TestSetFlavorProfile(TestFlavorProfile):
def setUp(self):
super().setUp()
self.network_client.update_service_profile = mock.Mock(
return_value=None
)
self.network_client.find_service_profile = mock.Mock(
return_value=self.network_flavor_profile
self.network_client.update_service_profile.return_value = None
self.network_client.find_service_profile.return_value = (
self.network_flavor_profile
)
# Get the command object to test

24
openstackclient/tests/unit/network/v2/test_network_meter.py
View File

@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from unittest import mock
from unittest.mock import call
from osc_lib import exceptions
@@ -55,9 +54,8 @@ class TestCreateMeter(TestMeter):
def setUp(self):
super().setUp()
self.network_client.create_metering_label = mock.Mock(
return_value=self.new_meter
)
self.network_client.create_metering_label.return_value = self.new_meter
self.projects_mock.get.return_value = self.project
self.cmd = network_meter.CreateMeter(self.app, None)
@@ -132,9 +130,7 @@ class TestDeleteMeter(TestMeter):
self.meter_list = network_fakes.FakeNetworkMeter.create_meter(count=2)
self.network_client.delete_metering_label = mock.Mock(
return_value=None
)
self.network_client.delete_metering_label.return_value = None
self.network_client.find_metering_label = (
network_fakes.FakeNetworkMeter.get_meter(meter=self.meter_list)
@@ -194,15 +190,13 @@ class TestDeleteMeter(TestMeter):
exceptions.NotFound('404'),
self.meter_list[1],
]
self.network_client.find_meter = mock.Mock(side_effect=return_find)
self.network_client.find_metering_label.side_effect = return_find
ret_delete = [
None,
exceptions.NotFound('404'),
]
self.network_client.delete_metering_label = mock.Mock(
side_effect=ret_delete
)
self.network_client.delete_metering_label.side_effect = ret_delete
self.assertRaises(
exceptions.CommandError, self.cmd.take_action, parsed_args
@@ -240,9 +234,7 @@ class TestListMeter(TestMeter):
def setUp(self):
super().setUp()
self.network_client.metering_labels = mock.Mock(
return_value=self.meter_list
)
self.network_client.metering_labels.return_value = self.meter_list
self.cmd = network_meter.ListMeter(self.app, None)
@@ -282,9 +274,7 @@ class TestShowMeter(TestMeter):
self.cmd = network_meter.ShowMeter(self.app, None)
self.network_client.find_metering_label = mock.Mock(
return_value=self.new_meter
)
self.network_client.find_metering_label.return_value = self.new_meter
def test_show_no_options(self):
arglist = []

30
openstackclient/tests/unit/network/v2/test_network_meter_rule.py
View File

@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from unittest import mock
from unittest.mock import call
from osc_lib import exceptions
@@ -65,14 +64,13 @@ class TestCreateMeterRule(TestMeterRule):
{'id': self.new_rule.metering_label_id}
)
self.network_client.create_metering_label_rule = mock.Mock(
return_value=self.new_rule
self.network_client.create_metering_label_rule.return_value = (
self.new_rule
)
self.projects_mock.get.return_value = self.project
self.cmd = network_meter_rule.CreateMeterRule(self.app, None)
self.network_client.find_metering_label = mock.Mock(
return_value=fake_meter
)
self.network_client.find_metering_label.return_value = fake_meter
def test_create_no_options(self):
arglist = []
@@ -146,9 +144,7 @@ class TestDeleteMeterRule(TestMeterRule):
self.rule_list = network_fakes.FakeNetworkMeterRule.create_meter_rule(
count=2
)
self.network_client.delete_metering_label_rule = mock.Mock(
return_value=None
)
self.network_client.delete_metering_label_rule.return_value = None
self.network_client.find_metering_label_rule = (
network_fakes.FakeNetworkMeterRule.get_meter_rule(
@@ -210,17 +206,13 @@ class TestDeleteMeterRule(TestMeterRule):
exceptions.NotFound('404'),
self.rule_list[1],
]
self.network_client.find_metering_label_rule = mock.Mock(
side_effect=return_find
)
self.network_client.find_metering_label_rule.side_effect = return_find
ret_delete = [
None,
exceptions.NotFound('404'),
]
self.network_client.delete_metering_label_rule = mock.Mock(
side_effect=ret_delete
)
self.network_client.delete_metering_label_rule.side_effect = ret_delete
self.assertRaises(
exceptions.CommandError, self.cmd.take_action, parsed_args
@@ -262,9 +254,7 @@ class TestListMeterRule(TestMeterRule):
def setUp(self):
super().setUp()
self.network_client.metering_label_rules = mock.Mock(
return_value=self.rule_list
)
self.network_client.metering_label_rules.return_value = self.rule_list
self.cmd = network_meter_rule.ListMeterRule(self.app, None)
@@ -311,8 +301,8 @@ class TestShowMeterRule(TestMeterRule):
self.cmd = network_meter_rule.ShowMeterRule(self.app, None)
self.network_client.find_metering_label_rule = mock.Mock(
return_value=self.new_rule
self.network_client.find_metering_label_rule.return_value = (
self.new_rule
)
def test_show_no_options(self):

20
openstackclient/tests/unit/network/v2/test_network_qos_policy.py
View File

@@ -63,8 +63,8 @@ class TestCreateNetworkQosPolicy(TestQosPolicy):
def setUp(self):
super().setUp()
self.network_client.create_qos_policy = mock.Mock(
return_value=self.new_qos_policy
self.network_client.create_qos_policy.return_value = (
self.new_qos_policy
)
# Get the command object to test
@@ -163,7 +163,7 @@ class TestDeleteNetworkQosPolicy(TestQosPolicy):
def setUp(self):
super().setUp()
self.network_client.delete_qos_policy = mock.Mock(return_value=None)
self.network_client.delete_qos_policy.return_value = None
self.network_client.find_qos_policy = network_fakes.get_qos_policies(
qos_policies=self._qos_policies
)
@@ -264,9 +264,7 @@ class TestListNetworkQosPolicy(TestQosPolicy):
def setUp(self):
super().setUp()
self.network_client.qos_policies = mock.Mock(
return_value=self.qos_policies
)
self.network_client.qos_policies.return_value = self.qos_policies
# Get the command object to test
self.cmd = network_qos_policy.ListNetworkQosPolicy(self.app, None)
@@ -344,10 +342,8 @@ class TestSetNetworkQosPolicy(TestQosPolicy):
def setUp(self):
super().setUp()
self.network_client.update_qos_policy = mock.Mock(return_value=None)
self.network_client.find_qos_policy = mock.Mock(
return_value=self._qos_policy
)
self.network_client.update_qos_policy.return_value = None
self.network_client.find_qos_policy.return_value = self._qos_policy
# Get the command object to test
self.cmd = network_qos_policy.SetNetworkQosPolicy(self.app, None)
@@ -447,9 +443,7 @@ class TestShowNetworkQosPolicy(TestQosPolicy):
def setUp(self):
super().setUp()
self.network_client.find_qos_policy = mock.Mock(
return_value=self._qos_policy
)
self.network_client.find_qos_policy.return_value = self._qos_policy
# Get the command object to test
self.cmd = network_qos_policy.ShowNetworkQosPolicy(self.app, None)

98
openstackclient/tests/unit/network/v2/test_network_qos_rule.py
View File

@@ -56,9 +56,7 @@ class TestNetworkQosRule(network_fakes.TestNetworkV2):
def setUp(self):
super().setUp()
self.qos_policy = network_fakes.create_one_qos_policy()
self.network_client.find_qos_policy = mock.Mock(
return_value=self.qos_policy
)
self.network_client.find_qos_policy.return_value = self.qos_policy
class TestCreateNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
@@ -87,8 +85,8 @@ class TestCreateNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
self.new_rule.project_id,
self.new_rule.type,
)
self.network_client.create_qos_minimum_bandwidth_rule = mock.Mock(
return_value=self.new_rule
self.network_client.create_qos_minimum_bandwidth_rule.return_value = (
self.new_rule
)
# Get the command object to test
@@ -190,9 +188,7 @@ class TestCreateNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
self.new_rule.project_id,
self.new_rule.type,
)
self.network_client.create_qos_minimum_packet_rate_rule = mock.Mock(
return_value=self.new_rule
)
self.network_client.create_qos_minimum_packet_rate_rule.return_value = self.new_rule
# Get the command object to test
self.cmd = network_qos_rule.CreateNetworkQosRule(self.app, None)
@@ -291,8 +287,8 @@ class TestCreateNetworkQosRuleDSCPMarking(TestNetworkQosRule):
self.new_rule.project_id,
self.new_rule.type,
)
self.network_client.create_qos_dscp_marking_rule = mock.Mock(
return_value=self.new_rule
self.network_client.create_qos_dscp_marking_rule.return_value = (
self.new_rule
)
# Get the command object to test
@@ -389,8 +385,8 @@ class TestCreateNetworkQosRuleBandwidtLimit(TestNetworkQosRule):
self.new_rule.project_id,
self.new_rule.type,
)
self.network_client.create_qos_bandwidth_limit_rule = mock.Mock(
return_value=self.new_rule
self.network_client.create_qos_bandwidth_limit_rule.return_value = (
self.new_rule
)
# Get the command object to test
@@ -529,9 +525,10 @@ class TestDeleteNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
}
self.new_rule = network_fakes.create_one_qos_rule(attrs)
self.qos_policy.rules = [self.new_rule]
self.network_client.delete_qos_minimum_bandwidth_rule = mock.Mock(
return_value=None
self.network_client.delete_qos_minimum_bandwidth_rule.return_value = (
None
)
self.network_client.find_qos_minimum_bandwidth_rule = (
network_fakes.get_qos_rules(qos_rules=self.new_rule)
)
@@ -592,9 +589,8 @@ class TestDeleteNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
}
self.new_rule = network_fakes.create_one_qos_rule(attrs)
self.qos_policy.rules = [self.new_rule]
self.network_client.delete_qos_minimum_packet_rate_rule = mock.Mock(
return_value=None
)
self.network_client.delete_qos_minimum_packet_rate_rule.return_value = None
self.network_client.find_qos_minimum_packet_rate_rule = (
network_fakes.get_qos_rules(qos_rules=self.new_rule)
)
@@ -655,9 +651,8 @@ class TestDeleteNetworkQosRuleDSCPMarking(TestNetworkQosRule):
}
self.new_rule = network_fakes.create_one_qos_rule(attrs)
self.qos_policy.rules = [self.new_rule]
self.network_client.delete_qos_dscp_marking_rule = mock.Mock(
return_value=None
)
self.network_client.delete_qos_dscp_marking_rule.return_value = None
self.network_client.find_qos_dscp_marking_rule = (
network_fakes.get_qos_rules(qos_rules=self.new_rule)
)
@@ -718,9 +713,8 @@ class TestDeleteNetworkQosRuleBandwidthLimit(TestNetworkQosRule):
}
self.new_rule = network_fakes.create_one_qos_rule(attrs)
self.qos_policy.rules = [self.new_rule]
self.network_client.delete_qos_bandwidth_limit_rule = mock.Mock(
return_value=None
)
self.network_client.delete_qos_bandwidth_limit_rule.return_value = None
self.network_client.find_qos_bandwidth_limit_rule = (
network_fakes.get_qos_rules(qos_rules=self.new_rule)
)
@@ -781,16 +775,16 @@ class TestSetNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
}
self.new_rule = network_fakes.create_one_qos_rule(attrs)
self.qos_policy.rules = [self.new_rule]
self.network_client.update_qos_minimum_bandwidth_rule = mock.Mock(
return_value=None
self.network_client.update_qos_minimum_bandwidth_rule.return_value = (
None
)
self.network_client.find_qos_minimum_bandwidth_rule = mock.Mock(
return_value=self.new_rule
)
self.network_client.find_qos_policy = mock.Mock(
return_value=self.qos_policy
self.network_client.find_qos_minimum_bandwidth_rule.return_value = (
self.new_rule
)
self.network_client.find_qos_policy.return_value = self.qos_policy
# Get the command object to test
self.cmd = network_qos_rule.SetNetworkQosRule(self.app, None)
@@ -883,16 +877,14 @@ class TestSetNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
}
self.new_rule = network_fakes.create_one_qos_rule(attrs)
self.qos_policy.rules = [self.new_rule]
self.network_client.update_qos_minimum_packet_rate_rule = mock.Mock(
return_value=None
)
self.network_client.find_qos_minimum_packet_rate_rule = mock.Mock(
return_value=self.new_rule
)
self.network_client.find_qos_policy = mock.Mock(
return_value=self.qos_policy
self.network_client.update_qos_minimum_packet_rate_rule.return_value = None
self.network_client.find_qos_minimum_packet_rate_rule.return_value = (
self.new_rule
)
self.network_client.find_qos_policy.return_value = self.qos_policy
# Get the command object to test
self.cmd = network_qos_rule.SetNetworkQosRule(self.app, None)
@@ -985,16 +977,14 @@ class TestSetNetworkQosRuleDSCPMarking(TestNetworkQosRule):
}
self.new_rule = network_fakes.create_one_qos_rule(attrs)
self.qos_policy.rules = [self.new_rule]
self.network_client.update_qos_dscp_marking_rule = mock.Mock(
return_value=None
)
self.network_client.find_qos_dscp_marking_rule = mock.Mock(
return_value=self.new_rule
)
self.network_client.find_qos_policy = mock.Mock(
return_value=self.qos_policy
self.network_client.update_qos_dscp_marking_rule.return_value = None
self.network_client.find_qos_dscp_marking_rule.return_value = (
self.new_rule
)
self.network_client.find_qos_policy.return_value = self.qos_policy
# Get the command object to test
self.cmd = network_qos_rule.SetNetworkQosRule(self.app, None)
@@ -1351,8 +1341,8 @@ class TestShowNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
self.new_rule.type,
)
self.network_client.get_qos_minimum_bandwidth_rule = mock.Mock(
return_value=self.new_rule
self.network_client.get_qos_minimum_bandwidth_rule.return_value = (
self.new_rule
)
# Get the command object to test
@@ -1415,8 +1405,8 @@ class TestShowNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
self.new_rule.type,
)
self.network_client.get_qos_minimum_packet_rate_rule = mock.Mock(
return_value=self.new_rule
self.network_client.get_qos_minimum_packet_rate_rule.return_value = (
self.new_rule
)
# Get the command object to test
@@ -1477,8 +1467,8 @@ class TestShowNetworkQosDSCPMarking(TestNetworkQosRule):
self.new_rule.type,
)
self.network_client.get_qos_dscp_marking_rule = mock.Mock(
return_value=self.new_rule
self.network_client.get_qos_dscp_marking_rule.return_value = (
self.new_rule
)
# Get the command object to test
@@ -1543,8 +1533,8 @@ class TestShowNetworkQosBandwidthLimit(TestNetworkQosRule):
self.new_rule.type,
)
self.network_client.get_qos_bandwidth_limit_rule = mock.Mock(
return_value=self.new_rule
self.network_client.get_qos_bandwidth_limit_rule.return_value = (
self.new_rule
)
# Get the command object to test

9
openstackclient/tests/unit/network/v2/test_network_qos_rule_type.py
View File

@@ -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_qos_rule_type as _qos_rule_type
from openstackclient.tests.unit.network.v2 import fakes as network_fakes
@@ -35,9 +34,7 @@ class TestShowNetworkQosRuleType(TestNetworkQosRuleType):
def setUp(self):
super().setUp()
self.network_client.get_qos_rule_type = mock.Mock(
return_value=self.qos_rule_type
)
self.network_client.get_qos_rule_type.return_value = self.qos_rule_type
# Get the command object to test
self.cmd = _qos_rule_type.ShowNetworkQosRuleType(self.app, None)
@@ -84,9 +81,7 @@ class TestListNetworkQosRuleType(TestNetworkQosRuleType):
def setUp(self):
super().setUp()
self.network_client.qos_rule_types = mock.Mock(
return_value=self.qos_rule_types
)
self.network_client.qos_rule_types.return_value = self.qos_rule_types
# Get the command object to test
self.cmd = _qos_rule_type.ListNetworkQosRuleType(self.app, None)

57
openstackclient/tests/unit/network/v2/test_network_rbac.py
View File

@@ -11,7 +11,6 @@
# under the License.
#
from unittest import mock
from unittest.mock import call
import ddt
@@ -72,27 +71,20 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
# Get the command object to test
self.cmd = network_rbac.CreateNetworkRBAC(self.app, None)
self.network_client.create_rbac_policy = mock.Mock(
return_value=self.rbac_policy
)
self.network_client.find_network = mock.Mock(
return_value=self.network_object
)
self.network_client.find_qos_policy = mock.Mock(
return_value=self.qos_object
)
self.network_client.find_security_group = mock.Mock(
return_value=self.sg_object
)
self.network_client.find_address_scope = mock.Mock(
return_value=self.as_object
)
self.network_client.find_subnet_pool = mock.Mock(
return_value=self.snp_object
)
self.network_client.find_address_group = mock.Mock(
return_value=self.ag_object
)
self.network_client.create_rbac_policy.return_value = self.rbac_policy
self.network_client.find_network.return_value = self.network_object
self.network_client.find_qos_policy.return_value = self.qos_object
self.network_client.find_security_group.return_value = self.sg_object
self.network_client.find_address_scope.return_value = self.as_object
self.network_client.find_subnet_pool.return_value = self.snp_object
self.network_client.find_address_group.return_value = self.ag_object
self.projects_mock.get.return_value = self.project
def test_network_rbac_create_no_type(self):
@@ -343,7 +335,7 @@ class TestDeleteNetworkRBAC(TestNetworkRBAC):
def setUp(self):
super().setUp()
self.network_client.delete_rbac_policy = mock.Mock(return_value=None)
self.network_client.delete_rbac_policy.return_value = None
self.network_client.find_rbac_policy = network_fakes.get_network_rbacs(
rbac_policies=self.rbac_policies
)
@@ -400,9 +392,7 @@ class TestDeleteNetworkRBAC(TestNetworkRBAC):
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
find_mock_result = [self.rbac_policies[0], exceptions.CommandError]
self.network_client.find_rbac_policy = mock.Mock(
side_effect=find_mock_result
)
self.network_client.find_rbac_policy.side_effect = find_mock_result
try:
self.cmd.take_action(parsed_args)
@@ -462,9 +452,7 @@ class TestListNetworkRABC(TestNetworkRBAC):
# Get the command object to test
self.cmd = network_rbac.ListNetworkRBAC(self.app, None)
self.network_client.rbac_policies = mock.Mock(
return_value=self.rbac_policies
)
self.network_client.rbac_policies.return_value = self.rbac_policies
self.project = identity_fakes_v3.FakeProject.create_one_project()
self.projects_mock.get.return_value = self.project
@@ -564,10 +552,9 @@ class TestSetNetworkRBAC(TestNetworkRBAC):
# Get the command object to test
self.cmd = network_rbac.SetNetworkRBAC(self.app, None)
self.network_client.find_rbac_policy = mock.Mock(
return_value=self.rbac_policy
)
self.network_client.update_rbac_policy = mock.Mock(return_value=None)
self.network_client.find_rbac_policy.return_value = self.rbac_policy
self.network_client.update_rbac_policy.return_value = None
self.projects_mock.get.return_value = self.project
def test_network_rbac_set_nothing(self):
@@ -639,9 +626,7 @@ class TestShowNetworkRBAC(TestNetworkRBAC):
# Get the command object to test
self.cmd = network_rbac.ShowNetworkRBAC(self.app, None)
self.network_client.find_rbac_policy = mock.Mock(
return_value=self.rbac_policy
)
self.network_client.find_rbac_policy.return_value = self.rbac_policy
def test_show_no_options(self):
arglist = []

42
openstackclient/tests/unit/network/v2/test_network_segment.py
View File

@@ -11,7 +11,6 @@
# under the License.
#
from unittest import mock
from unittest.mock import call
from osc_lib import exceptions
@@ -58,12 +57,9 @@ class TestCreateNetworkSegment(TestNetworkSegment):
def setUp(self):
super().setUp()
self.network_client.create_segment = mock.Mock(
return_value=self._network_segment
)
self.network_client.find_network = mock.Mock(
return_value=self._network
)
self.network_client.create_segment.return_value = self._network_segment
self.network_client.find_network.return_value = self._network
# Get the command object to test
self.cmd = network_segment.CreateNetworkSegment(self.app, None)
@@ -172,10 +168,8 @@ class TestDeleteNetworkSegment(TestNetworkSegment):
def setUp(self):
super().setUp()
self.network_client.delete_segment = mock.Mock(return_value=None)
self.network_client.find_segment = mock.Mock(
side_effect=self._network_segments
)
self.network_client.delete_segment.return_value = None
self.network_client.find_segment.side_effect = self._network_segments
# Get the command object to test
self.cmd = network_segment.DeleteNetworkSegment(self.app, None)
@@ -224,9 +218,7 @@ class TestDeleteNetworkSegment(TestNetworkSegment):
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
find_mock_result = [self._network_segments[0], exceptions.CommandError]
self.network_client.find_segment = mock.Mock(
side_effect=find_mock_result
)
self.network_client.find_segment.side_effect = find_mock_result
try:
self.cmd.take_action(parsed_args)
@@ -291,12 +283,9 @@ class TestListNetworkSegment(TestNetworkSegment):
# Get the command object to test
self.cmd = network_segment.ListNetworkSegment(self.app, None)
self.network_client.find_network = mock.Mock(
return_value=self._network
)
self.network_client.segments = mock.Mock(
return_value=self._network_segments
)
self.network_client.find_network.return_value = self._network
self.network_client.segments.return_value = self._network_segments
def test_list_no_option(self):
arglist = []
@@ -352,12 +341,9 @@ class TestSetNetworkSegment(TestNetworkSegment):
def setUp(self):
super().setUp()
self.network_client.find_segment = mock.Mock(
return_value=self._network_segment
)
self.network_client.update_segment = mock.Mock(
return_value=self._network_segment
)
self.network_client.find_segment.return_value = self._network_segment
self.network_client.update_segment.return_value = self._network_segment
# Get the command object to test
self.cmd = network_segment.SetNetworkSegment(self.app, None)
@@ -432,9 +418,7 @@ class TestShowNetworkSegment(TestNetworkSegment):
def setUp(self):
super().setUp()
self.network_client.find_segment = mock.Mock(
return_value=self._network_segment
)
self.network_client.find_segment.return_value = self._network_segment
# Get the command object to test
self.cmd = network_segment.ShowNetworkSegment(self.app, None)

39
openstackclient/tests/unit/network/v2/test_network_segment_range.py
View File

@@ -78,8 +78,8 @@ class TestCreateNetworkSegmentRange(TestNetworkSegmentRange):
def setUp(self):
super().setUp()
self.network_client.create_network_segment_range = mock.Mock(
return_value=self._network_segment_range
self.network_client.create_network_segment_range.return_value = (
self._network_segment_range
)
# Get the command object to test
@@ -351,11 +351,10 @@ class TestDeleteNetworkSegmentRange(TestNetworkSegmentRange):
def setUp(self):
super().setUp()
self.network_client.delete_network_segment_range = mock.Mock(
return_value=None
)
self.network_client.find_network_segment_range = mock.Mock(
side_effect=self._network_segment_ranges
self.network_client.delete_network_segment_range.return_value = None
self.network_client.find_network_segment_range.side_effect = (
self._network_segment_ranges
)
# Get the command object to test
@@ -412,8 +411,8 @@ class TestDeleteNetworkSegmentRange(TestNetworkSegmentRange):
self._network_segment_ranges[0],
exceptions.CommandError,
]
self.network_client.find_network_segment_range = mock.Mock(
side_effect=find_mock_result
self.network_client.find_network_segment_range.side_effect = (
find_mock_result
)
try:
@@ -493,8 +492,8 @@ class TestListNetworkSegmentRange(TestNetworkSegmentRange):
def setUp(self):
super().setUp()
self.network_client.network_segment_ranges = mock.Mock(
return_value=self._network_segment_ranges
self.network_client.network_segment_ranges.return_value = (
self._network_segment_ranges
)
# Get the command object to test
@@ -567,8 +566,8 @@ class TestSetNetworkSegmentRange(TestNetworkSegmentRange):
def setUp(self):
super().setUp()
self.network_client.find_network_segment_range = mock.Mock(
return_value=self._network_segment_range
self.network_client.find_network_segment_range.return_value = (
self._network_segment_range
)
# Get the command object to test
@@ -583,9 +582,10 @@ class TestSetNetworkSegmentRange(TestNetworkSegmentRange):
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.network_client.update_network_segment_range = mock.Mock(
return_value=self._network_segment_range
self.network_client.update_network_segment_range.return_value = (
self._network_segment_range
)
result = self.cmd.take_action(parsed_args)
self.network_client.update_network_segment_range.assert_called_once_with(
@@ -611,9 +611,10 @@ class TestSetNetworkSegmentRange(TestNetworkSegmentRange):
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.network_client.update_network_segment_range = mock.Mock(
return_value=self._network_segment_range_updated
self.network_client.update_network_segment_range.return_value = (
self._network_segment_range_updated
)
result = self.cmd.take_action(parsed_args)
attrs = {
@@ -662,8 +663,8 @@ class TestShowNetworkSegmentRange(TestNetworkSegmentRange):
def setUp(self):
super().setUp()
self.network_client.find_network_segment_range = mock.Mock(
return_value=self._network_segment_range
self.network_client.find_network_segment_range.return_value = (
self._network_segment_range
)
# Get the command object to test

5
openstackclient/tests/unit/network/v2/test_network_service_provider.py
View File

@@ -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_service_provider as service_provider,
@@ -52,9 +51,7 @@ class TestListNetworkServiceProvider(TestNetworkServiceProvider):
def setUp(self):
super().setUp()
self.network_client.service_providers = mock.Mock(
return_value=self.provider_list
)
self.network_client.service_providers.return_value = self.provider_list
self.cmd = service_provider.ListNetworkServiceProvider(self.app, None)

97
openstackclient/tests/unit/network/v2/test_network_trunk.py
View File

@@ -11,7 +11,6 @@
# under the License.
import copy
from unittest import mock
from unittest.mock import call
from osc_lib.cli import format_columns
@@ -84,12 +83,12 @@ class TestCreateNetworkTrunk(TestNetworkTrunk):
def setUp(self):
super().setUp()
self.network_client.create_trunk = mock.Mock(
return_value=self.new_trunk
)
self.network_client.find_port = mock.Mock(
side_effect=[self.parent_port, self.sub_port]
)
self.network_client.create_trunk.return_value = self.new_trunk
self.network_client.find_port.side_effect = [
self.parent_port,
self.sub_port,
]
# Get the command object to test
self.cmd = network_trunk.CreateNetworkTrunk(self.app, None)
@@ -313,13 +312,16 @@ class TestDeleteNetworkTrunk(TestNetworkTrunk):
def setUp(self):
super().setUp()
self.network_client.find_trunk = mock.Mock(
side_effect=[self.new_trunks[0], self.new_trunks[1]]
)
self.network_client.delete_trunk = mock.Mock(return_value=None)
self.network_client.find_port = mock.Mock(
side_effect=[self.parent_port, self.sub_port]
)
self.network_client.find_trunk.side_effect = [
self.new_trunks[0],
self.new_trunks[1],
]
self.network_client.delete_trunk.return_value = None
self.network_client.find_port.side_effect = [
self.parent_port,
self.sub_port,
]
self.projects_mock.get.return_value = self.project
self.domains_mock.get.return_value = self.domain
@@ -371,9 +373,11 @@ class TestDeleteNetworkTrunk(TestNetworkTrunk):
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.network_client.find_trunk = mock.Mock(
side_effect=[self.new_trunks[0], exceptions.CommandError]
)
self.network_client.find_trunk.side_effect = [
self.new_trunks[0],
exceptions.CommandError,
]
with testtools.ExpectedException(exceptions.CommandError) as e:
self.cmd.take_action(parsed_args)
self.assertEqual('1 of 2 trunks failed to delete.', str(e))
@@ -412,8 +416,8 @@ class TestShowNetworkTrunk(TestNetworkTrunk):
def setUp(self):
super().setUp()
self.network_client.find_trunk = mock.Mock(return_value=self.new_trunk)
self.network_client.get_trunk = mock.Mock(return_value=self.new_trunk)
self.network_client.find_trunk.return_value = self.new_trunk
self.network_client.get_trunk.return_value = self.new_trunk
self.projects_mock.get.return_value = self.project
self.domains_mock.get.return_value = self.domain
@@ -485,7 +489,7 @@ class TestListNetworkTrunk(TestNetworkTrunk):
def setUp(self):
super().setUp()
self.network_client.trunks = mock.Mock(return_value=self.new_trunks)
self.network_client.trunks.return_value = self.new_trunks
self.projects_mock.get.return_value = self.project
self.domains_mock.get.return_value = self.domain
@@ -564,14 +568,14 @@ class TestSetNetworkTrunk(TestNetworkTrunk):
def setUp(self):
super().setUp()
self.network_client.update_trunk = mock.Mock(return_value=self._trunk)
self.network_client.add_trunk_subports = mock.Mock(
return_value=self._trunk
)
self.network_client.find_trunk = mock.Mock(return_value=self._trunk)
self.network_client.find_port = mock.Mock(
side_effect=[self.sub_port, self.sub_port]
)
self.network_client.update_trunk.return_value = self._trunk
self.network_client.add_trunk_subports.return_value = self._trunk
self.network_client.find_trunk.return_value = self._trunk
self.network_client.find_port.side_effect = [
self.sub_port,
self.sub_port,
]
self.projects_mock.get.return_value = self.project
self.domains_mock.get.return_value = self.domain
@@ -763,9 +767,8 @@ class TestSetNetworkTrunk(TestNetworkTrunk):
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.network_client.update_trunk = mock.Mock(
side_effect=exceptions.CommandError
)
self.network_client.update_trunk.side_effect = exceptions.CommandError
with testtools.ExpectedException(exceptions.CommandError) as e:
self.cmd.take_action(parsed_args)
self.assertEqual(
@@ -790,12 +793,12 @@ class TestSetNetworkTrunk(TestNetworkTrunk):
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.network_client.add_trunk_subports = mock.Mock(
side_effect=exceptions.CommandError
)
self.network_client.find_port = mock.Mock(
return_value={'id': 'invalid_subport'}
self.network_client.add_trunk_subports.side_effect = (
exceptions.CommandError
)
self.network_client.find_port.side_effect = [{'id': 'invalid_subport'}]
with testtools.ExpectedException(exceptions.CommandError) as e:
self.cmd.take_action(parsed_args)
self.assertEqual(
@@ -832,10 +835,10 @@ class TestListNetworkSubport(TestNetworkTrunk):
def setUp(self):
super().setUp()
self.network_client.find_trunk = mock.Mock(return_value=self._trunk)
self.network_client.get_trunk_subports = mock.Mock(
return_value={network_trunk.SUB_PORTS: self._subports}
)
self.network_client.find_trunk.return_value = self._trunk
self.network_client.get_trunk_subports.return_value = {
network_trunk.SUB_PORTS: self._subports
}
# Get the command object to test
self.cmd = network_trunk.ListNetworkSubport(self.app, None)
@@ -902,13 +905,13 @@ class TestUnsetNetworkTrunk(TestNetworkTrunk):
def setUp(self):
super().setUp()
self.network_client.find_trunk = mock.Mock(return_value=self._trunk)
self.network_client.find_port = mock.Mock(
side_effect=[self.sub_port, self.sub_port]
)
self.network_client.delete_trunk_subports = mock.Mock(
return_value=None
)
self.network_client.find_trunk.return_value = self._trunk
self.network_client.find_port.side_effect = [
self.sub_port,
self.sub_port,
]
self.network_client.delete_trunk_subports.return_value = None
# Get the command object to test
self.cmd = network_trunk.UnsetNetworkTrunk(self.app, None)

161
openstackclient/tests/unit/network/v2/test_port.py
View File

@@ -136,19 +136,18 @@ class TestCreatePort(TestPort):
def setUp(self):
super().setUp()
self.network_client.create_port = mock.Mock(return_value=self._port)
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.create_port.return_value = self._port
self.network_client.set_tags.return_value = None
fake_net = network_fakes.create_one_network(
{
'id': self._port.network_id,
}
)
self.network_client.find_network = mock.Mock(return_value=fake_net)
self.network_client.find_network.return_value = fake_net
self.fake_subnet = network_fakes.FakeSubnet.create_one_subnet()
self.network_client.find_subnet = mock.Mock(
return_value=self.fake_subnet
)
self.network_client.find_extension = mock.Mock(return_value=[])
self.network_client.find_subnet.return_value = self.fake_subnet
self.network_client.find_extension.return_value = []
# Get the command object to test
self.cmd = port.CreatePort(self.app, None)
@@ -321,9 +320,8 @@ class TestCreatePort(TestPort):
def test_create_with_security_group(self):
secgroup = network_fakes.create_one_security_group()
self.network_client.find_security_group = mock.Mock(
return_value=secgroup
)
self.network_client.find_security_group.return_value = secgroup
arglist = [
'--network',
self._port.network_id,
@@ -393,9 +391,8 @@ class TestCreatePort(TestPort):
def test_create_with_security_groups(self):
sg_1 = network_fakes.create_one_security_group()
sg_2 = network_fakes.create_one_security_group()
self.network_client.find_security_group = mock.Mock(
side_effect=[sg_1, sg_2]
)
self.network_client.find_security_group.side_effect = [sg_1, sg_2]
arglist = [
'--network',
self._port.network_id,
@@ -583,9 +580,8 @@ class TestCreatePort(TestPort):
def test_create_port_with_qos(self):
qos_policy = network_fakes.create_one_qos_policy()
self.network_client.find_qos_policy = mock.Mock(
return_value=qos_policy
)
self.network_client.find_qos_policy.return_value = qos_policy
arglist = [
'--network',
self._port.network_id,
@@ -701,9 +697,7 @@ class TestCreatePort(TestPort):
else:
verifylist.append(('no_tag', True))
self.network_client.find_extension = mock.Mock(
return_value=add_tags_in_post
)
self.network_client.find_extension.return_value = add_tags_in_post
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args)
@@ -1170,7 +1164,7 @@ class TestDeletePort(TestPort):
def setUp(self):
super().setUp()
self.network_client.delete_port = mock.Mock(return_value=None)
self.network_client.delete_port.return_value = None
self.network_client.find_port = network_fakes.get_ports(
ports=self._ports
)
@@ -1223,7 +1217,7 @@ class TestDeletePort(TestPort):
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
find_mock_result = [self._ports[0], exceptions.CommandError]
self.network_client.find_port = mock.Mock(side_effect=find_mock_result)
self.network_client.find_port.side_effect = find_mock_result
try:
self.cmd.take_action(parsed_args)
@@ -1324,7 +1318,7 @@ class TestListPort(compute_fakes.FakeClientMixin, TestPort):
def setUp(self):
super().setUp()
self.network_client.ports = mock.Mock(return_value=self._ports)
self.network_client.ports.return_value = self._ports
fake_router = network_fakes.create_one_router(
{
'id': 'fake-router-id',
@@ -1335,8 +1329,8 @@ class TestListPort(compute_fakes.FakeClientMixin, TestPort):
'id': 'fake-network-id',
}
)
self.network_client.find_router = mock.Mock(return_value=fake_router)
self.network_client.find_network = mock.Mock(return_value=fake_network)
self.network_client.find_router.return_value = fake_router
self.network_client.find_network.return_value = fake_network
# Get the command object to test
self.cmd = port.ListPort(self.app, None)
@@ -1550,9 +1544,8 @@ class TestListPort(compute_fakes.FakeClientMixin, TestPort):
self.fake_subnet = network_fakes.FakeSubnet.create_one_subnet(
{'id': subnet_id}
)
self.network_client.find_subnet = mock.Mock(
return_value=self.fake_subnet
)
self.network_client.find_subnet.return_value = self.fake_subnet
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args)
@@ -1579,9 +1572,8 @@ class TestListPort(compute_fakes.FakeClientMixin, TestPort):
self.fake_subnet = network_fakes.FakeSubnet.create_one_subnet(
{'id': subnet_id}
)
self.network_client.find_subnet = mock.Mock(
return_value=self.fake_subnet
)
self.network_client.find_subnet.return_value = self.fake_subnet
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args)
@@ -1616,9 +1608,8 @@ class TestListPort(compute_fakes.FakeClientMixin, TestPort):
'fields': LIST_FIELDS_TO_RETRIEVE,
}
)
self.network_client.find_subnet = mock.Mock(
return_value=self.fake_subnet
)
self.network_client.find_subnet.return_value = self.fake_subnet
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args)
@@ -1825,12 +1816,11 @@ class TestSetPort(TestPort):
def setUp(self):
super().setUp()
self.fake_subnet = network_fakes.FakeSubnet.create_one_subnet()
self.network_client.find_subnet = mock.Mock(
return_value=self.fake_subnet
)
self.network_client.find_port = mock.Mock(return_value=self._port)
self.network_client.update_port = mock.Mock(return_value=None)
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.find_subnet.return_value = self.fake_subnet
self.network_client.find_port.return_value = self._port
self.network_client.update_port.return_value = None
self.network_client.set_tags.return_value = None
# Get the command object to test
self.cmd = port.SetPort(self.app, None)
@@ -1853,7 +1843,7 @@ class TestSetPort(TestPort):
_testport = network_fakes.create_one_port(
{'fixed_ips': [{'ip_address': '0.0.0.1'}]}
)
self.network_client.find_port = mock.Mock(return_value=_testport)
self.network_client.find_port.return_value = _testport
arglist = [
'--fixed-ip',
'ip-address=10.0.0.12',
@@ -1881,7 +1871,7 @@ class TestSetPort(TestPort):
_testport = network_fakes.create_one_port(
{'fixed_ips': [{'ip_address': '0.0.0.1'}]}
)
self.network_client.find_port = mock.Mock(return_value=_testport)
self.network_client.find_port.return_value = _testport
arglist = [
'--fixed-ip',
'ip-address=10.0.0.12',
@@ -1931,7 +1921,7 @@ class TestSetPort(TestPort):
_testport = network_fakes.create_one_port(
{'binding_profile': {'lok_i': 'visi_on'}}
)
self.network_client.find_port = mock.Mock(return_value=_testport)
self.network_client.find_port.return_value = _testport
arglist = [
'--binding-profile',
'lok_i=than_os',
@@ -1956,7 +1946,7 @@ class TestSetPort(TestPort):
_testport = network_fakes.create_one_port(
{'mac_address': '11:22:33:44:55:66'}
)
self.network_client.find_port = mock.Mock(return_value=_testport)
self.network_client.find_port.return_value = _testport
arglist = [
'--mac-address',
'66:55:44:33:22:11',
@@ -2097,7 +2087,7 @@ class TestSetPort(TestPort):
def test_set_port_security_group(self):
sg = network_fakes.create_one_security_group()
self.network_client.find_security_group = mock.Mock(return_value=sg)
self.network_client.find_security_group.return_value = sg
arglist = [
'--security-group',
sg.id,
@@ -2122,13 +2112,12 @@ class TestSetPort(TestPort):
sg_1 = network_fakes.create_one_security_group()
sg_2 = network_fakes.create_one_security_group()
sg_3 = network_fakes.create_one_security_group()
self.network_client.find_security_group = mock.Mock(
side_effect=[sg_2, sg_3]
)
self.network_client.find_security_group.side_effect = [sg_2, sg_3]
_testport = network_fakes.create_one_port(
{'security_group_ids': [sg_1.id]}
)
self.network_client.find_port = mock.Mock(return_value=_testport)
self.network_client.find_port.return_value = _testport
arglist = [
'--security-group',
sg_2.id,
@@ -2177,8 +2166,8 @@ class TestSetPort(TestPort):
_testport = network_fakes.create_one_port(
{'security_group_ids': [sg1.id]}
)
self.network_client.find_port = mock.Mock(return_value=_testport)
self.network_client.find_security_group = mock.Mock(return_value=sg2)
self.network_client.find_port.return_value = _testport
self.network_client.find_security_group.return_value = sg2
arglist = [
'--security-group',
sg2.id,
@@ -2226,7 +2215,7 @@ class TestSetPort(TestPort):
_testport = network_fakes.create_one_port(
{'allowed_address_pairs': [{'ip_address': '192.168.1.123'}]}
)
self.network_client.find_port = mock.Mock(return_value=_testport)
self.network_client.find_port.return_value = _testport
arglist = [
'--allowed-address',
'ip-address=192.168.1.45',
@@ -2255,7 +2244,7 @@ class TestSetPort(TestPort):
_testport = network_fakes.create_one_port(
{'allowed_address_pairs': [{'ip_address': '192.168.1.123'}]}
)
self.network_client.find_port = mock.Mock(return_value=_testport)
self.network_client.find_port.return_value = _testport
arglist = [
'--allowed-address',
'ip-address=192.168.1.45',
@@ -2372,11 +2361,10 @@ class TestSetPort(TestPort):
def test_set_port_with_qos(self):
qos_policy = network_fakes.create_one_qos_policy()
self.network_client.find_qos_policy = mock.Mock(
return_value=qos_policy
)
self.network_client.find_qos_policy.return_value = qos_policy
_testport = network_fakes.create_one_port({'qos_policy_id': None})
self.network_client.find_port = mock.Mock(return_value=_testport)
self.network_client.find_port.return_value = _testport
arglist = [
'--qos-policy',
qos_policy.id,
@@ -2400,7 +2388,7 @@ class TestSetPort(TestPort):
def test_set_port_data_plane_status(self):
_testport = network_fakes.create_one_port({'data_plane_status': None})
self.network_client.find_port = mock.Mock(return_value=_testport)
self.network_client.find_port.return_value = _testport
arglist = [
'--data-plane-status',
'ACTIVE',
@@ -2546,10 +2534,12 @@ class TestSetPort(TestPort):
def test_set_hints_valid_alias_value(self):
testport = network_fakes.create_one_port()
self.network_client.find_port = mock.Mock(return_value=testport)
self.network_client.find_extension = mock.Mock(
return_value=['port-hints', 'port-hint-ovs-tx-steering']
)
self.network_client.find_port.return_value = testport
self.network_client.find_extension.return_value = [
'port-hints',
'port-hint-ovs-tx-steering',
]
arglist = [
'--hint',
'ovs-tx-steering=hash',
@@ -2574,10 +2564,12 @@ class TestSetPort(TestPort):
def test_set_hints_valid_json(self):
testport = network_fakes.create_one_port()
self.network_client.find_port = mock.Mock(return_value=testport)
self.network_client.find_extension = mock.Mock(
return_value=['port-hints', 'port-hint-ovs-tx-steering']
)
self.network_client.find_port.return_value = testport
self.network_client.find_extension.return_value = [
'port-hints',
'port-hint-ovs-tx-steering',
]
arglist = [
'--hint',
'{"openvswitch": {"other_config": {"tx-steering": "hash"}}}',
@@ -2670,7 +2662,7 @@ class TestShowPort(TestPort):
def setUp(self):
super().setUp()
self.network_client.find_port = mock.Mock(return_value=self._port)
self.network_client.find_port.return_value = self._port
# Get the command object to test
self.cmd = port.ShowPort(self.app, None)
@@ -2731,12 +2723,11 @@ class TestUnsetPort(TestPort):
self.fake_subnet = network_fakes.FakeSubnet.create_one_subnet(
{'id': '042eb10a-3a18-4658-ab-cf47c8d03152'}
)
self.network_client.find_subnet = mock.Mock(
return_value=self.fake_subnet
)
self.network_client.find_port = mock.Mock(return_value=self._testport)
self.network_client.update_port = mock.Mock(return_value=None)
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.find_subnet.return_value = self.fake_subnet
self.network_client.find_port.return_value = self._testport
self.network_client.update_port.return_value = None
self.network_client.set_tags.return_value = None
# Get the command object to test
self.cmd = port.UnsetPort(self.app, None)
@@ -2826,10 +2817,9 @@ class TestUnsetPort(TestPort):
_fake_port = network_fakes.create_one_port(
{'security_group_ids': [_fake_sg1.id, _fake_sg2.id]}
)
self.network_client.find_port = mock.Mock(return_value=_fake_port)
self.network_client.find_security_group = mock.Mock(
return_value=_fake_sg2
)
self.network_client.find_port.return_value = _fake_port
self.network_client.find_security_group.return_value = _fake_sg2
arglist = [
'--security-group',
_fake_sg2.id,
@@ -2854,9 +2844,8 @@ class TestUnsetPort(TestPort):
_fake_port = network_fakes.create_one_port(
{'security_group_ids': [_fake_sg1.id]}
)
self.network_client.find_security_group = mock.Mock(
return_value=_fake_sg2
)
self.network_client.find_security_group.return_value = _fake_sg2
arglist = [
'--security-group',
_fake_sg2.id,
@@ -2875,7 +2864,7 @@ class TestUnsetPort(TestPort):
_fake_port = network_fakes.create_one_port(
{'allowed_address_pairs': [{'ip_address': '192.168.1.123'}]}
)
self.network_client.find_port = mock.Mock(return_value=_fake_port)
self.network_client.find_port.return_value = _fake_port
arglist = [
'--allowed-address',
'ip-address=192.168.1.123',
@@ -2901,7 +2890,7 @@ class TestUnsetPort(TestPort):
_fake_port = network_fakes.create_one_port(
{'allowed_address_pairs': [{'ip_address': '192.168.1.123'}]}
)
self.network_client.find_port = mock.Mock(return_value=_fake_port)
self.network_client.find_port.return_value = _fake_port
arglist = [
'--allowed-address',
'ip-address=192.168.1.45',
@@ -2920,7 +2909,7 @@ class TestUnsetPort(TestPort):
_fake_port = network_fakes.create_one_port(
{'data_plane_status': 'ACTIVE'}
)
self.network_client.find_port = mock.Mock(return_value=_fake_port)
self.network_client.find_port.return_value = _fake_port
arglist = [
'--data-plane-status',
_fake_port.name,
@@ -2973,7 +2962,7 @@ class TestUnsetPort(TestPort):
_fake_port = network_fakes.create_one_port(
{'numa_affinity_policy': 'required'}
)
self.network_client.find_port = mock.Mock(return_value=_fake_port)
self.network_client.find_port.return_value = _fake_port
arglist = [
'--numa-policy',
_fake_port.name,
@@ -2997,7 +2986,7 @@ class TestUnsetPort(TestPort):
def test_unset_hints(self):
testport = network_fakes.create_one_port()
self.network_client.find_port = mock.Mock(return_value=testport)
self.network_client.find_port.return_value = testport
arglist = [
'--hints',
testport.name,
@@ -3017,7 +3006,7 @@ class TestUnsetPort(TestPort):
def test_unset_device(self):
testport = network_fakes.create_one_port()
self.network_client.find_port = mock.Mock(return_value=testport)
self.network_client.find_port.return_value = testport
arglist = [
'--device',
testport.name,
@@ -3037,7 +3026,7 @@ class TestUnsetPort(TestPort):
def test_unset_device_owner(self):
testport = network_fakes.create_one_port()
self.network_client.find_port = mock.Mock(return_value=testport)
self.network_client.find_port.return_value = testport
arglist = [
'--device-owner',
testport.name,

230
openstackclient/tests/unit/network/v2/test_router.py
View File

@@ -39,8 +39,8 @@ class TestAddPortToRouter(TestRouter):
def setUp(self):
super().setUp()
self.network_client.find_router = mock.Mock(return_value=self._router)
self.network_client.find_port = mock.Mock(return_value=self._port)
self.network_client.find_router.return_value = self._router
self.network_client.find_port.return_value = self._port
self.cmd = router.AddPortToRouter(self.app, None)
@@ -87,8 +87,8 @@ class TestAddSubnetToRouter(TestRouter):
def setUp(self):
super().setUp()
self.network_client.find_router = mock.Mock(return_value=self._router)
self.network_client.find_subnet = mock.Mock(return_value=self._subnet)
self.network_client.find_router.return_value = self._router
self.network_client.find_subnet.return_value = self._subnet
self.cmd = router.AddSubnetToRouter(self.app, None)
@@ -172,12 +172,11 @@ class TestCreateRouter(TestRouter):
def setUp(self):
super().setUp()
self.network_client.create_router = mock.Mock(
return_value=self.new_router
)
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.find_extension = mock.Mock(
side_effect=lambda name: self._extensions.get(name)
self.network_client.create_router.return_value = self.new_router
self.network_client.set_tags.return_value = None
self.network_client.find_extension.side_effect = (
lambda name: self._extensions.get(name)
)
# Get the command object to test
self.cmd = router.CreateRouter(self.app, None)
@@ -222,8 +221,8 @@ class TestCreateRouter(TestRouter):
def test_create_with_gateway(self):
_network = network_fakes.create_one_network()
_subnet = network_fakes.FakeSubnet.create_one_subnet()
self.network_client.find_network = mock.Mock(return_value=_network)
self.network_client.find_subnet = mock.Mock(return_value=_subnet)
self.network_client.find_network.return_value = _network
self.network_client.find_subnet.return_value = _subnet
arglist = [
self.new_router.name,
'--external-gateway',
@@ -392,7 +391,7 @@ class TestCreateRouter(TestRouter):
def test_create_with_flavor_id_id(self):
_flavor = network_fakes.create_one_network_flavor()
self.network_client.find_flavor = mock.Mock(return_value=_flavor)
self.network_client.find_flavor.return_value = _flavor
arglist = [
self.new_router.name,
'--flavor-id',
@@ -419,7 +418,7 @@ class TestCreateRouter(TestRouter):
def test_create_with_flavor_id_name(self):
_flavor = network_fakes.create_one_network_flavor()
self.network_client.find_flavor = mock.Mock(return_value=_flavor)
self.network_client.find_flavor.return_value = _flavor
arglist = [self.new_router.name, '--flavor-id', _flavor.name]
verifylist = [
('name', self.new_router.name),
@@ -442,7 +441,7 @@ class TestCreateRouter(TestRouter):
def test_create_with_flavor_id(self):
_flavor = network_fakes.create_one_network_flavor()
self.network_client.find_flavor = mock.Mock(return_value=_flavor)
self.network_client.find_flavor.return_value = _flavor
arglist = [
self.new_router.name,
'--flavor',
@@ -469,7 +468,7 @@ class TestCreateRouter(TestRouter):
def test_create_with_flavor_name(self):
_flavor = network_fakes.create_one_network_flavor()
self.network_client.find_flavor = mock.Mock(return_value=_flavor)
self.network_client.find_flavor.return_value = _flavor
arglist = [self.new_router.name, '--flavor', _flavor.name]
verifylist = [
('name', self.new_router.name),
@@ -491,11 +490,12 @@ class TestCreateRouter(TestRouter):
self.assertCountEqual(self.data, data)
def test_create_with_enable_default_route_bfd(self):
self.network_client.find_extension = mock.Mock(
return_value=network_fakes.create_one_extension(
self._extensions = {
'external-gateway-multihoming': network_fakes.create_one_extension(
attrs={'name': 'external-gateway-multihoming'}
)
)
),
}
arglist = [self.new_router.name, '--enable-default-route-bfd']
verifylist = [
('name', self.new_router.name),
@@ -525,11 +525,12 @@ class TestCreateRouter(TestRouter):
)
def test_create_with_enable_default_route_ecmp(self):
self.network_client.find_extension = mock.Mock(
return_value=network_fakes.create_one_extension(
self._extensions = {
'external-gateway-multihoming': network_fakes.create_one_extension(
attrs={'name': 'external-gateway-multihoming'}
)
)
),
}
arglist = [self.new_router.name, '--enable-default-route-ecmp']
verifylist = [
('name', self.new_router.name),
@@ -560,11 +561,10 @@ class TestCreateRouter(TestRouter):
def test_create_with_qos_policy(self):
_network = network_fakes.create_one_network()
self.network_client.find_network = mock.Mock(return_value=_network)
self.network_client.find_network.return_value = _network
_qos_policy = network_fakes.create_one_qos_policy()
self.network_client.find_qos_policy = mock.Mock(
return_value=_qos_policy
)
self.network_client.find_qos_policy.return_value = _qos_policy
arglist = [
self.new_router.name,
'--external-gateway',
@@ -595,9 +595,8 @@ class TestCreateRouter(TestRouter):
def test_create_with_qos_policy_no_external_gateway(self):
_qos_policy = network_fakes.create_one_qos_policy()
self.network_client.find_qos_policy = mock.Mock(
return_value=_qos_policy
)
self.network_client.find_qos_policy.return_value = _qos_policy
arglist = [
self.new_router.name,
'--qos-policy',
@@ -625,7 +624,7 @@ class TestDeleteRouter(TestRouter):
def setUp(self):
super().setUp()
self.network_client.delete_router = mock.Mock(return_value=None)
self.network_client.delete_router.return_value = None
self.network_client.find_router = network_fakes.get_routers(
self._routers
@@ -679,9 +678,7 @@ class TestDeleteRouter(TestRouter):
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
find_mock_result = [self._routers[0], exceptions.CommandError]
self.network_client.find_router = mock.Mock(
side_effect=find_mock_result
)
self.network_client.find_router.side_effect = find_mock_result
try:
self.cmd.take_action(parsed_args)
@@ -786,21 +783,16 @@ class TestListRouter(TestRouter):
# Get the command object to test
self.cmd = router.ListRouter(self.app, None)
self.network_client.agent_hosted_routers = mock.Mock(
return_value=self.routers
)
self.network_client.routers = mock.Mock(return_value=self.routers)
self.network_client.find_extension = mock.Mock(
return_value=self.extensions
)
self.network_client.find_router = mock.Mock(
return_value=self.routers[0]
)
self.network_client.agent_hosted_routers.return_value = self.routers
self.network_client.routers.return_value = self.routers
self.network_client.find_extension.return_value = self.extensions
self.network_client.find_router.return_value = self.routers[0]
self._testagent = network_fakes.create_one_network_agent()
self.network_client.get_agent = mock.Mock(return_value=self._testagent)
self.network_client.get_router = mock.Mock(
return_value=self.routers[0]
)
self.network_client.get_agent.return_value = self._testagent
self.network_client.get_router.return_value = self.routers[0]
def test_router_list_no_options(self):
arglist = []
@@ -865,7 +857,7 @@ class TestListRouter(TestRouter):
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# to mock, that no availability zone
self.network_client.find_extension = mock.Mock(return_value=None)
self.network_client.find_extension.return_value = None
# In base command class Lister in cliff, abstract method take_action()
# returns a tuple containing the column names and an iterable
@@ -1044,8 +1036,8 @@ class TestRemovePortFromRouter(TestRouter):
def setUp(self):
super().setUp()
self.network_client.find_router = mock.Mock(return_value=self._router)
self.network_client.find_port = mock.Mock(return_value=self._port)
self.network_client.find_router.return_value = self._router
self.network_client.find_port.return_value = self._port
self.cmd = router.RemovePortFromRouter(self.app, None)
@@ -1089,8 +1081,8 @@ class TestRemoveSubnetFromRouter(TestRouter):
def setUp(self):
super().setUp()
self.network_client.find_router = mock.Mock(return_value=self._router)
self.network_client.find_subnet = mock.Mock(return_value=self._subnet)
self.network_client.find_router.return_value = self._router
self.network_client.find_subnet.return_value = self._subnet
self.cmd = router.RemoveSubnetFromRouter(self.app, None)
@@ -1129,11 +1121,12 @@ class TestAddExtraRoutesToRouter(TestRouter):
def setUp(self):
super().setUp()
self.network_client.add_extra_routes_to_router = mock.Mock(
return_value=self._router
self.network_client.add_extra_routes_to_router.return_value = (
self._router
)
self.cmd = router.AddExtraRoutesToRouter(self.app, None)
self.network_client.find_router = mock.Mock(return_value=self._router)
self.network_client.find_router.return_value = self._router
def test_add_no_extra_route(self):
arglist = [
@@ -1218,11 +1211,12 @@ class TestRemoveExtraRoutesFromRouter(TestRouter):
def setUp(self):
super().setUp()
self.network_client.remove_extra_routes_from_router = mock.Mock(
return_value=self._router
self.network_client.remove_extra_routes_from_router.return_value = (
self._router
)
self.cmd = router.RemoveExtraRoutesFromRouter(self.app, None)
self.network_client.find_router = mock.Mock(return_value=self._router)
self.network_client.find_router.return_value = self._router
def test_remove_no_extra_route(self):
arglist = [
@@ -1316,15 +1310,14 @@ class TestSetRouter(TestRouter):
def setUp(self):
super().setUp()
self.network_client.update_router = mock.Mock(return_value=None)
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.find_router = mock.Mock(return_value=self._router)
self.network_client.find_network = mock.Mock(
return_value=self._network
)
self.network_client.find_subnet = mock.Mock(return_value=self._subnet)
self.network_client.find_extension = mock.Mock(
side_effect=lambda name: self._extensions.get(name)
self.network_client.update_router.return_value = None
self.network_client.set_tags.return_value = None
self.network_client.find_router.return_value = self._router
self.network_client.find_network.return_value = self._network
self.network_client.find_subnet.return_value = self._subnet
self.network_client.find_extension.side_effect = (
lambda name: self._extensions.get(name)
)
# Get the command object to test
self.cmd = router.SetRouter(self.app, None)
@@ -1459,7 +1452,7 @@ class TestSetRouter(TestRouter):
_testrouter = network_fakes.create_one_router(
{'routes': [{"destination": "10.0.0.2", "nexthop": "1.1.1.1"}]}
)
self.network_client.find_router = mock.Mock(return_value=_testrouter)
self.network_client.find_router.return_value = _testrouter
arglist = [
_testrouter.name,
'--route',
@@ -1667,9 +1660,8 @@ class TestSetRouter(TestRouter):
def test_set_gateway_ip_qos(self):
qos_policy = network_fakes.create_one_qos_policy()
self.network_client.find_qos_policy = mock.Mock(
return_value=qos_policy
)
self.network_client.find_qos_policy.return_value = qos_policy
arglist = [
"--external-gateway",
self._network.id,
@@ -1724,9 +1716,8 @@ class TestSetRouter(TestRouter):
def test_set_unset_gateway_ip_qos(self):
qos_policy = network_fakes.create_one_qos_policy()
self.network_client.find_qos_policy = mock.Mock(
return_value=qos_policy
)
self.network_client.find_qos_policy.return_value = qos_policy
arglist = [
"--external-gateway",
self._network.id,
@@ -1752,11 +1743,10 @@ class TestSetRouter(TestRouter):
def test_set_gateway_ip_qos_no_gateway(self):
qos_policy = network_fakes.create_one_qos_policy()
self.network_client.find_qos_policy = mock.Mock(
return_value=qos_policy
)
self.network_client.find_qos_policy.return_value = qos_policy
router = network_fakes.create_one_router()
self.network_client.find_router = mock.Mock(return_value=router)
self.network_client.find_router.return_value = router
arglist = [
"--qos-policy",
qos_policy.id,
@@ -1774,11 +1764,10 @@ class TestSetRouter(TestRouter):
def test_unset_gateway_ip_qos_no_gateway(self):
qos_policy = network_fakes.create_one_qos_policy()
self.network_client.find_qos_policy = mock.Mock(
return_value=qos_policy
)
self.network_client.find_qos_policy.return_value = qos_policy
router = network_fakes.create_one_router()
self.network_client.find_router = mock.Mock(return_value=router)
self.network_client.find_router.return_value = router
arglist = [
"--no-qos-policy",
router.id,
@@ -1857,8 +1846,8 @@ class TestShowRouter(TestRouter):
def setUp(self):
super().setUp()
self.network_client.find_router = mock.Mock(return_value=self._router)
self.network_client.ports = mock.Mock(return_value=[self._port])
self.network_client.find_router.return_value = self._router
self.network_client.ports.return_value = [self._port]
# Get the command object to test
self.cmd = router.ShowRouter(self.app, None)
@@ -1961,18 +1950,16 @@ class TestUnsetRouter(TestRouter):
}
)
self.fake_subnet = network_fakes.FakeSubnet.create_one_subnet()
self.network_client.find_router = mock.Mock(
return_value=self._testrouter
)
self.network_client.update_router = mock.Mock(return_value=None)
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.find_router.return_value = self._testrouter
self.network_client.update_router.return_value = None
self.network_client.set_tags.return_value = None
self._extensions = {'fake': network_fakes.create_one_extension()}
self.network_client.find_extension = mock.Mock(
side_effect=lambda name: self._extensions.get(name)
)
self.network_client.remove_external_gateways = mock.Mock(
return_value=None
self.network_client.find_extension.side_effect = (
lambda name: self._extensions.get(name)
)
self.network_client.remove_external_gateways.return_value = None
# Get the command object to test
self.cmd = router.UnsetRouter(self.app, None)
@@ -2109,11 +2096,10 @@ class TestUnsetRouter(TestRouter):
def test_unset_gateway_ip_qos_no_network(self):
qos_policy = network_fakes.create_one_qos_policy()
self.network_client.find_qos_policy = mock.Mock(
return_value=qos_policy
)
self.network_client.find_qos_policy.return_value = qos_policy
router = network_fakes.create_one_router()
self.network_client.find_router = mock.Mock(return_value=router)
self.network_client.find_router.return_value = router
arglist = [
"--qos-policy",
router.id,
@@ -2129,13 +2115,12 @@ class TestUnsetRouter(TestRouter):
def test_unset_gateway_ip_qos_no_qos(self):
qos_policy = network_fakes.create_one_qos_policy()
self.network_client.find_qos_policy = mock.Mock(
return_value=qos_policy
)
self.network_client.find_qos_policy.return_value = qos_policy
router = network_fakes.create_one_router(
{"external_gateway_info": {"network_id": "fake-id"}}
)
self.network_client.find_router = mock.Mock(return_value=router)
self.network_client.find_router.return_value = router
arglist = [
"--qos-policy",
router.id,
@@ -2172,10 +2157,10 @@ class TestGatewayOps(TestRouter):
attrs={'name': 'external-gateway-multihoming'}
)
}
self.network_client.find_extension = mock.Mock(
side_effect=lambda name: self._extensions.get(name)
self.network_client.find_extension.side_effect = (
lambda name: self._extensions.get(name)
)
self.network_client.find_router = mock.Mock(return_value=self._router)
self.network_client.find_router.return_value = self._router
def _find_network(name_or_id, ignore_missing):
for network in self._networks:
@@ -2185,15 +2170,12 @@ class TestGatewayOps(TestRouter):
return None
raise Exception('Test resource not found')
self.network_client.find_network = mock.Mock(side_effect=_find_network)
self.network_client.find_network.side_effect = _find_network
self.network_client.find_subnet = mock.Mock(return_value=self._subnet)
self.network_client.add_external_gateways = mock.Mock(
return_value=None
)
self.network_client.remove_external_gateways = mock.Mock(
return_value=None
)
self.network_client.find_subnet.return_value = self._subnet
self.network_client.add_external_gateways.return_value = None
self.network_client.remove_external_gateways.return_value = None
class TestCreateMultipleGateways(TestGatewayOps):
@@ -2223,13 +2205,10 @@ class TestCreateMultipleGateways(TestGatewayOps):
self._second_network = network_fakes.create_one_network()
self._networks.append(self._second_network)
self.network_client.create_router = mock.Mock(
return_value=self._router
)
self.network_client.update_router = mock.Mock(return_value=None)
self.network_client.update_external_gateways = mock.Mock(
return_value=None
)
self.network_client.create_router.return_value = self._router
self.network_client.update_router.return_value = None
self.network_client.update_external_gateways.return_value = None
self._data = (
router.AdminStateColumn(self._router.is_admin_state_up),
@@ -2353,10 +2332,9 @@ class TestUpdateMultipleGateways(TestGatewayOps):
self._second_network = network_fakes.create_one_network()
self._networks.append(self._second_network)
self.network_client.update_router = mock.Mock(return_value=None)
self.network_client.update_external_gateways = mock.Mock(
return_value=None
)
self.network_client.update_router.return_value = None
self.network_client.update_external_gateways.return_value = None
self.cmd = router.SetRouter(self.app, None)
def test_update_one_gateway(self):

45
openstackclient/tests/unit/network/v2/test_security_group_network.py
View File

@@ -11,7 +11,6 @@
# under the License.
#
from unittest import mock
from unittest.mock import call
from osc_lib import exceptions
@@ -69,13 +68,13 @@ class TestCreateSecurityGroupNetwork(TestSecurityGroupNetwork):
def setUp(self):
super().setUp()
self.network_client.create_security_group = mock.Mock(
return_value=self._security_group
self.network_client.create_security_group.return_value = (
self._security_group
)
self.projects_mock.get.return_value = self.project
self.domains_mock.get.return_value = self.domain
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.set_tags.return_value = None
# Get the command object to test
self.cmd = security_group.CreateSecurityGroup(self.app, None)
@@ -185,9 +184,7 @@ class TestDeleteSecurityGroupNetwork(TestSecurityGroupNetwork):
def setUp(self):
super().setUp()
self.network_client.delete_security_group = mock.Mock(
return_value=None
)
self.network_client.delete_security_group.return_value = None
self.network_client.find_security_group = (
network_fakes.get_security_groups(self._security_groups)
@@ -245,9 +242,7 @@ class TestDeleteSecurityGroupNetwork(TestSecurityGroupNetwork):
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
find_mock_result = [self._security_groups[0], exceptions.CommandError]
self.network_client.find_security_group = mock.Mock(
side_effect=find_mock_result
)
self.network_client.find_security_group.side_effect = find_mock_result
try:
self.cmd.take_action(parsed_args)
@@ -295,8 +290,8 @@ class TestListSecurityGroupNetwork(TestSecurityGroupNetwork):
def setUp(self):
super().setUp()
self.network_client.security_groups = mock.Mock(
return_value=self._security_groups
self.network_client.security_groups.return_value = (
self._security_groups
)
# Get the command object to test
@@ -423,14 +418,13 @@ class TestSetSecurityGroupNetwork(TestSecurityGroupNetwork):
def setUp(self):
super().setUp()
self.network_client.update_security_group = mock.Mock(
return_value=None
self.network_client.update_security_group.return_value = None
self.network_client.find_security_group.return_value = (
self._security_group
)
self.network_client.find_security_group = mock.Mock(
return_value=self._security_group
)
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.set_tags.return_value = None
# Get the command object to test
self.cmd = security_group.SetSecurityGroup(self.app, None)
@@ -557,8 +551,8 @@ class TestShowSecurityGroupNetwork(TestSecurityGroupNetwork):
def setUp(self):
super().setUp()
self.network_client.find_security_group = mock.Mock(
return_value=self._security_group
self.network_client.find_security_group.return_value = (
self._security_group
)
# Get the command object to test
@@ -596,14 +590,13 @@ class TestUnsetSecurityGroupNetwork(TestSecurityGroupNetwork):
def setUp(self):
super().setUp()
self.network_client.update_security_group = mock.Mock(
return_value=None
self.network_client.update_security_group.return_value = None
self.network_client.find_security_group.return_value = (
self._security_group
)
self.network_client.find_security_group = mock.Mock(
return_value=self._security_group
)
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.set_tags.return_value = None
# Get the command object to test
self.cmd = security_group.UnsetSecurityGroup(self.app, None)

35
openstackclient/tests/unit/network/v2/test_security_group_rule_network.py
View File

@@ -11,7 +11,6 @@
# under the License.
#
from unittest import mock
from unittest.mock import call
from osc_lib import exceptions
@@ -69,9 +68,10 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
self._security_group_rule = (
network_fakes.create_one_security_group_rule(attrs)
)
self.network_client.create_security_group_rule = mock.Mock(
return_value=self._security_group_rule
self.network_client.create_security_group_rule.return_value = (
self._security_group_rule
)
self.expected_data = (
self._security_group_rule.created_at,
self._security_group_rule.description,
@@ -93,12 +93,12 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
def setUp(self):
super().setUp()
self.network_client.find_security_group = mock.Mock(
return_value=self._security_group
self.network_client.find_security_group.return_value = (
self._security_group
)
self.network_client.find_address_group = mock.Mock(
return_value=self._address_group
self.network_client.find_address_group.return_value = (
self._address_group
)
self.projects_mock.get.return_value = self.project
@@ -970,9 +970,7 @@ class TestDeleteSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
def setUp(self):
super().setUp()
self.network_client.delete_security_group_rule = mock.Mock(
return_value=None
)
self.network_client.delete_security_group_rule.return_value = None
self.network_client.find_security_group_rule = (
network_fakes.get_security_group_rules(self._security_group_rules)
@@ -1030,8 +1028,8 @@ class TestDeleteSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
self._security_group_rules[0],
exceptions.CommandError,
]
self.network_client.find_security_group_rule = mock.Mock(
side_effect=find_mock_result
self.network_client.find_security_group_rule.side_effect = (
find_mock_result
)
try:
@@ -1134,11 +1132,12 @@ class TestListSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
def setUp(self):
super().setUp()
self.network_client.find_security_group = mock.Mock(
return_value=self._security_group
self.network_client.find_security_group.return_value = (
self._security_group
)
self.network_client.security_group_rules = mock.Mock(
return_value=self._security_group_rules
self.network_client.security_group_rules.return_value = (
self._security_group_rules
)
# Get the command object to test
@@ -1344,8 +1343,8 @@ class TestShowSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
def setUp(self):
super().setUp()
self.network_client.find_security_group_rule = mock.Mock(
return_value=self._security_group_rule
self.network_client.find_security_group_rule.return_value = (
self._security_group_rule
)
# Get the command object to test

81
openstackclient/tests/unit/network/v2/test_subnet.py
View File

@@ -11,7 +11,6 @@
# under the License.
#
from unittest import mock
from unittest.mock import call
from osc_lib.cli import format_columns
@@ -266,19 +265,14 @@ class TestCreateSubnet(TestSubnet):
self.domains_mock.get.return_value = self.domain
# Mock SDK calls for all tests.
self.network_client.create_subnet = mock.Mock(
return_value=self._subnet
)
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.find_network = mock.Mock(
return_value=self._network
)
self.network_client.find_segment = mock.Mock(
return_value=self._network_segment
)
self.network_client.find_subnet_pool = mock.Mock(
return_value=self._subnet_pool
)
self.network_client.create_subnet.return_value = self._subnet
self.network_client.set_tags.return_value = None
self.network_client.find_network.return_value = self._network
self.network_client.find_segment.return_value = self._network_segment
self.network_client.find_subnet_pool.return_value = self._subnet_pool
def test_create_no_options(self):
arglist = []
@@ -333,7 +327,7 @@ class TestCreateSubnet(TestSubnet):
def test_create_from_subnet_pool_options(self):
# Mock SDK calls for this test.
self.network_client.create_subnet.return_value = self._subnet_from_pool
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.set_tags.return_value = None
self._network.id = self._subnet_from_pool.network_id
arglist = [
@@ -721,7 +715,7 @@ class TestDeleteSubnet(TestSubnet):
def setUp(self):
super().setUp()
self.network_client.delete_subnet = mock.Mock(return_value=None)
self.network_client.delete_subnet.return_value = None
self.network_client.find_subnet = network_fakes.FakeSubnet.get_subnets(
self._subnets
@@ -775,9 +769,7 @@ class TestDeleteSubnet(TestSubnet):
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
find_mock_result = [self._subnets[0], exceptions.CommandError]
self.network_client.find_subnet = mock.Mock(
side_effect=find_mock_result
)
self.network_client.find_subnet.side_effect = find_mock_result
try:
self.cmd.take_action(parsed_args)
@@ -855,7 +847,7 @@ class TestListSubnet(TestSubnet):
# Get the command object to test
self.cmd = subnet_v2.ListSubnet(self.app, None)
self.network_client.subnets = mock.Mock(return_value=self._subnet)
self.network_client.subnets.return_value = self._subnet
def test_subnet_list_no_options(self):
arglist = []
@@ -1019,7 +1011,7 @@ class TestListSubnet(TestSubnet):
def test_subnet_list_network(self):
network = network_fakes.create_one_network()
self.network_client.find_network = mock.Mock(return_value=network)
self.network_client.find_network.return_value = network
arglist = [
'--network',
network.id,
@@ -1038,7 +1030,7 @@ class TestListSubnet(TestSubnet):
def test_subnet_list_gateway(self):
subnet = network_fakes.FakeSubnet.create_one_subnet()
self.network_client.find_network = mock.Mock(return_value=subnet)
self.network_client.find_network.return_value = subnet
arglist = [
'--gateway',
subnet.gateway_ip,
@@ -1057,7 +1049,7 @@ class TestListSubnet(TestSubnet):
def test_subnet_list_name(self):
subnet = network_fakes.FakeSubnet.create_one_subnet()
self.network_client.find_network = mock.Mock(return_value=subnet)
self.network_client.find_network.return_value = subnet
arglist = [
'--name',
subnet.name,
@@ -1076,7 +1068,7 @@ class TestListSubnet(TestSubnet):
def test_subnet_list_subnet_range(self):
subnet = network_fakes.FakeSubnet.create_one_subnet()
self.network_client.find_network = mock.Mock(return_value=subnet)
self.network_client.find_network.return_value = subnet
arglist = [
'--subnet-range',
subnet.cidr,
@@ -1098,10 +1090,9 @@ class TestListSubnet(TestSubnet):
subnet = network_fakes.FakeSubnet.create_one_subnet(
{'subnetpool_id': subnet_pool.id}
)
self.network_client.find_network = mock.Mock(return_value=subnet)
self.network_client.find_subnet_pool = mock.Mock(
return_value=subnet_pool
)
self.network_client.find_network.return_value = subnet
self.network_client.find_subnet_pool.return_value = subnet_pool
arglist = [
'--subnet-pool',
subnet_pool.name,
@@ -1123,10 +1114,9 @@ class TestListSubnet(TestSubnet):
subnet = network_fakes.FakeSubnet.create_one_subnet(
{'subnetpool_id': subnet_pool.id}
)
self.network_client.find_network = mock.Mock(return_value=subnet)
self.network_client.find_subnet_pool = mock.Mock(
return_value=subnet_pool
)
self.network_client.find_network.return_value = subnet
self.network_client.find_subnet_pool.return_value = subnet_pool
arglist = [
'--subnet-pool',
subnet_pool.id,
@@ -1182,9 +1172,9 @@ class TestSetSubnet(TestSubnet):
def setUp(self):
super().setUp()
self.network_client.update_subnet = mock.Mock(return_value=None)
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.find_subnet = mock.Mock(return_value=self._subnet)
self.network_client.update_subnet.return_value = None
self.network_client.set_tags.return_value = None
self.network_client.find_subnet.return_value = self._subnet
self.cmd = subnet_v2.SetSubnet(self.app, None)
def test_set_this(self):
@@ -1263,7 +1253,7 @@ class TestSetSubnet(TestSubnet):
'service_types': ["network:router_gateway"],
}
)
self.network_client.find_subnet = mock.Mock(return_value=_testsubnet)
self.network_client.find_subnet.return_value = _testsubnet
arglist = [
'--dns-nameserver',
'10.0.0.2',
@@ -1329,7 +1319,7 @@ class TestSetSubnet(TestSubnet):
'dns_nameservers': ["10.0.0.1"],
}
)
self.network_client.find_subnet = mock.Mock(return_value=_testsubnet)
self.network_client.find_subnet.return_value = _testsubnet
arglist = [
'--host-route',
'destination=10.30.30.30/24,gateway=10.30.30.1',
@@ -1379,7 +1369,7 @@ class TestSetSubnet(TestSubnet):
'dns_nameservers': ['10.0.0.1'],
}
)
self.network_client.find_subnet = mock.Mock(return_value=_testsubnet)
self.network_client.find_subnet.return_value = _testsubnet
arglist = [
'--no-host-route',
'--no-allocation-pool',
@@ -1448,8 +1438,8 @@ class TestSetSubnet(TestSubnet):
'segment_id': None,
}
)
self.network_client.find_subnet = mock.Mock(return_value=_subnet)
self.network_client.find_segment = mock.Mock(return_value=_segment)
self.network_client.find_subnet.return_value = _subnet
self.network_client.find_segment.return_value = _segment
arglist = ['--network-segment', _segment.id, _subnet.name]
verifylist = [('network_segment', _segment.id)]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1514,7 +1504,7 @@ class TestShowSubnet(TestSubnet):
# Get the command object to test
self.cmd = subnet_v2.ShowSubnet(self.app, None)
self.network_client.find_subnet = mock.Mock(return_value=self._subnet)
self.network_client.find_subnet.return_value = self._subnet
def test_show_no_options(self):
arglist = []
@@ -1572,11 +1562,10 @@ class TestUnsetSubnet(TestSubnet):
'tags': ['green', 'red'],
}
)
self.network_client.find_subnet = mock.Mock(
return_value=self._testsubnet
)
self.network_client.update_subnet = mock.Mock(return_value=None)
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.find_subnet.return_value = self._testsubnet
self.network_client.update_subnet.return_value = None
self.network_client.set_tags.return_value = None
# Get the command object to test
self.cmd = subnet_v2.UnsetSubnet(self.app, None)

54
openstackclient/tests/unit/network/v2/test_subnet_pool.py
View File

@@ -10,7 +10,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from unittest import mock
from unittest.mock import call
from osc_lib.cli import format_columns
@@ -76,16 +75,15 @@ class TestCreateSubnetPool(TestSubnetPool):
def setUp(self):
super().setUp()
self.network_client.create_subnet_pool = mock.Mock(
return_value=self._subnet_pool
)
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.create_subnet_pool.return_value = self._subnet_pool
self.network_client.set_tags.return_value = None
# Get the command object to test
self.cmd = subnet_pool.CreateSubnetPool(self.app, None)
self.network_client.find_address_scope = mock.Mock(
return_value=self._address_scope
self.network_client.find_address_scope.return_value = (
self._address_scope
)
self.projects_mock.get.return_value = self.project
@@ -387,7 +385,7 @@ class TestDeleteSubnetPool(TestSubnetPool):
def setUp(self):
super().setUp()
self.network_client.delete_subnet_pool = mock.Mock(return_value=None)
self.network_client.delete_subnet_pool.return_value = None
self.network_client.find_subnet_pool = (
network_fakes.FakeSubnetPool.get_subnet_pools(self._subnet_pools)
@@ -445,9 +443,7 @@ class TestDeleteSubnetPool(TestSubnetPool):
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
find_mock_result = [self._subnet_pools[0], exceptions.CommandError]
self.network_client.find_subnet_pool = mock.Mock(
side_effect=find_mock_result
)
self.network_client.find_subnet_pool.side_effect = find_mock_result
try:
self.cmd.take_action(parsed_args)
@@ -514,9 +510,7 @@ class TestListSubnetPool(TestSubnetPool):
# Get the command object to test
self.cmd = subnet_pool.ListSubnetPool(self.app, None)
self.network_client.subnet_pools = mock.Mock(
return_value=self._subnet_pools
)
self.network_client.subnet_pools.return_value = self._subnet_pools
def test_subnet_pool_list_no_option(self):
arglist = []
@@ -653,7 +647,7 @@ class TestListSubnetPool(TestSubnetPool):
def test_subnet_pool_list_name(self):
subnet_pool = network_fakes.FakeSubnetPool.create_one_subnet_pool()
self.network_client.find_network = mock.Mock(return_value=subnet_pool)
self.network_client.find_network.return_value = subnet_pool
arglist = [
'--name',
subnet_pool.name,
@@ -672,9 +666,8 @@ class TestListSubnetPool(TestSubnetPool):
def test_subnet_pool_list_address_scope(self):
addr_scope = network_fakes.create_one_address_scope()
self.network_client.find_address_scope = mock.Mock(
return_value=addr_scope
)
self.network_client.find_address_scope.return_value = addr_scope
arglist = [
'--address-scope',
addr_scope.id,
@@ -734,15 +727,13 @@ class TestSetSubnetPool(TestSubnetPool):
def setUp(self):
super().setUp()
self.network_client.update_subnet_pool = mock.Mock(return_value=None)
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.update_subnet_pool.return_value = None
self.network_client.set_tags.return_value = None
self.network_client.find_subnet_pool = mock.Mock(
return_value=self._subnet_pool
)
self.network_client.find_subnet_pool.return_value = self._subnet_pool
self.network_client.find_address_scope = mock.Mock(
return_value=self._address_scope
self.network_client.find_address_scope.return_value = (
self._address_scope
)
# Get the command object to test
@@ -1079,9 +1070,7 @@ class TestShowSubnetPool(TestSubnetPool):
def setUp(self):
super().setUp()
self.network_client.find_subnet_pool = mock.Mock(
return_value=self._subnet_pool
)
self.network_client.find_subnet_pool.return_value = self._subnet_pool
# Get the command object to test
self.cmd = subnet_pool.ShowSubnetPool(self.app, None)
@@ -1122,11 +1111,10 @@ class TestUnsetSubnetPool(TestSubnetPool):
self._subnetpool = network_fakes.FakeSubnetPool.create_one_subnet_pool(
{'tags': ['green', 'red']}
)
self.network_client.find_subnet_pool = mock.Mock(
return_value=self._subnetpool
)
self.network_client.update_subnet_pool = mock.Mock(return_value=None)
self.network_client.set_tags = mock.Mock(return_value=None)
self.network_client.find_subnet_pool.return_value = self._subnetpool
self.network_client.update_subnet_pool.return_value = None
self.network_client.set_tags.return_value = None
# Get the command object to test
self.cmd = subnet_pool.UnsetSubnetPool(self.app, None)