openstack
/
python-openstackclient
Code Issues Proposed changes

tests: Add network v2 FakeClientMixin 

This ensures we are speccing the network proxy API. Future changes will
do the same for the image proxy API and eventually the compute proxy API
(once everything has been converted).

Change-Id: Ic203964c7dede7dd80ae2d93b8fa1b7e6634a758
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane 2023-06-07 11:09:09 +01:00
parent b25742499a
commit a39bde5c3a
38 changed files with 56 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstackclient/tests/unit/common/test_availability_zone.py
View File

@ -9,7 +9,6 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
@ -79,7 +78,7 @@ def _build_network_az_datalist(network_az, long_datalist=False):
return (datalist,)
class TestAvailabilityZone(utils.TestCommand):
class TestAvailabilityZone(network_fakes.FakeClientMixin, utils.TestCommand):
def setUp(self):
super().setUp()
@ -93,11 +92,6 @@ class TestAvailabilityZone(utils.TestCommand):
self.volume_client = self.app.client_manager.sdk_connection.volume
self.volume_client.availability_zones = mock.Mock()
self.app.client_manager.network = mock.Mock()
self.network_client = self.app.client_manager.network
self.network_client.availability_zones = mock.Mock()
self.network_client.find_extension = mock.Mock()
class TestAvailabilityZoneList(TestAvailabilityZone):
compute_azs = compute_fakes.create_availability_zones()

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

@ -9,7 +9,6 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
@ -23,7 +22,7 @@ from openstackclient.tests.unit import utils as tests_utils
from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
class TestExtension(utils.TestCommand):
class TestExtension(network_fakes.FakeClientMixin, utils.TestCommand):
def setUp(self):
super().setUp()
@ -44,9 +43,6 @@ class TestExtension(utils.TestCommand):
self.volume_extensions_mock = sdk_connection.volume.extensions
self.volume_extensions_mock.reset_mock()
self.app.client_manager.network = mock.Mock()
self.network_client = self.app.client_manager.network
class TestExtensionList(TestExtension):
columns = ('Name', 'Alias', 'Description')

7
openstackclient/tests/unit/common/test_quota.py
View File

@ -62,9 +62,6 @@ class TestQuota(compute_fakes.TestComputev2):
)
self.volume_quotas_class_mock.reset_mock()
self.app.client_manager.network = mock.Mock()
self.network_client = self.app.client_manager.network
self.app.client_manager.auth_ref = mock.Mock()
self.app.client_manager.auth_ref.service_catalog = mock.Mock()
self.service_catalog_mock = (
@ -662,8 +659,6 @@ class TestQuotaSet(TestQuota):
loaded=True,
)
self.network_client.update_quota = mock.Mock()
self.cmd = quota.SetQuota(self.app, None)
def test_quota_set(self):
@ -1321,8 +1316,6 @@ class TestQuotaDelete(TestQuota):
def setUp(self):
super().setUp()
self.network_client.delete_quota = mock.Mock()
self.cmd = quota.DeleteQuota(self.app, None)
def test_delete(self):

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

@ -39,6 +39,7 @@ from openstackclient.api import compute_v2
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.unit.image.v2 import fakes as image_fakes
from openstackclient.tests.unit.network.v2 import fakes as network_fakes
from openstackclient.tests.unit import utils
from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes
@ -147,7 +148,7 @@ class FakeComputev2Client(object):
self.api_version = api_versions.APIVersion('2.1')
class TestComputev2(utils.TestCommand):
class TestComputev2(network_fakes.FakeClientMixin, utils.TestCommand):
def setUp(self):
super().setUp()
@ -171,8 +172,6 @@ class TestComputev2(utils.TestCommand):
token=fakes.AUTH_TOKEN,
)
self.app.client_manager.network = mock.Mock()
self.app.client_manager.volume = volume_fakes.FakeVolumeClient(
endpoint=fakes.AUTH_URL,
token=fakes.AUTH_TOKEN,

9
openstackclient/tests/unit/compute/v2/test_server.py
View File

@ -113,9 +113,6 @@ class TestServer(compute_fakes.TestComputev2):
self.snapshots_mock = self.app.client_manager.volume.volume_snapshots
self.snapshots_mock.reset_mock()
self.app.client_manager.network = mock.Mock()
self.network_client = self.app.client_manager.network
# Set object attributes to be tested. Could be overwritten in subclass.
self.attrs = {}
@ -523,7 +520,7 @@ class TestServerAddFloatingIPNetwork(
network_fakes.TestNetworkV2,
):
def setUp(self):
super(TestServerAddFloatingIPNetwork, self).setUp()
super().setUp()
self.network_client.update_ip = mock.Mock(return_value=None)
@ -7253,10 +7250,8 @@ class TestServerRemoveFloatingIPCompute(compute_fakes.TestComputev2):
class TestServerRemoveFloatingIPNetwork(network_fakes.TestNetworkV2):
def setUp(self):
super(TestServerRemoveFloatingIPNetwork, self).setUp()
super().setUp()
self.app.client_manager.network = mock.Mock()
self.network_client = self.app.client_manager.network
self.network_client.update_ip = mock.Mock(return_value=None)
# Get the command object to test

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

@ -124,25 +124,25 @@ class FakeCreateNeutronCommandWithExtraArgs(
class TestNetworkAndCompute(utils.TestCommand):
def setUp(self):
super(TestNetworkAndCompute, self).setUp()
super().setUp()
self.namespace = argparse.Namespace()
# Create network client mocks.
# Create client mocks. Note that we intentionally do not use specced
# mocks since we want to test fake methods.
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'
)
# Create compute client mocks.
self.app.client_manager.compute = mock.Mock()
self.compute = self.app.client_manager.compute
self.compute.compute_action = mock.Mock(
return_value='take_action_compute'
)
# Subclasses can override the command object to test.
self.cmd = FakeNetworkAndComputeCommand(self.app, self.namespace)
def test_take_action_network(self):
@ -209,6 +209,9 @@ class TestNeutronCommandWithExtraArgs(utils.TestCommand):
self.namespace = argparse.Namespace()
# Create client mocks. Note that we intentionally do not use specced
# mocks since we want to test fake methods.
self.app.client_manager.network = mock.Mock()
self.network_client = self.app.client_manager.network
self.network_client.test_create_action = mock.Mock()

15
openstackclient/tests/unit/network/v2/fakes.py
View File

@ -9,7 +9,6 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
import argparse
import copy
@ -18,6 +17,7 @@ from random import randint
from unittest import mock
import uuid
from openstack.network.v2 import _proxy
from openstack.network.v2 import address_group as _address_group
from openstack.network.v2 import address_scope as _address_scope
from openstack.network.v2 import agent as network_agent
@ -93,15 +93,20 @@ VALID_DSCP_MARKS = [
]
class TestNetworkV2(utils.TestCommand):
class FakeClientMixin:
def setUp(self):
super().setUp()
self.app.client_manager.network = mock.Mock(spec=_proxy.Proxy)
self.network_client = self.app.client_manager.network
class TestNetworkV2(FakeClientMixin, utils.TestCommand):
def setUp(self):
super().setUp()
self.namespace = argparse.Namespace()
self.app.client_manager.session = mock.Mock()
self.app.client_manager.network = mock.Mock()
self.app.client_manager.identity = (
identity_fakes_v3.FakeIdentityv3Client(
endpoint=fakes.AUTH_URL,

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

@ -26,8 +26,6 @@ class TestAddressGroup(network_fakes.TestNetworkV2):
def setUp(self):
super(TestAddressGroup, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
# Get a shortcut to the ProjectManager Mock
self.projects_mock = self.app.client_manager.identity.projects
# Get a shortcut to the DomainManager Mock

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

@ -26,8 +26,6 @@ class TestAddressScope(network_fakes.TestNetworkV2):
def setUp(self):
super(TestAddressScope, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
# Get a shortcut to the ProjectManager Mock
self.projects_mock = self.app.client_manager.identity.projects
# Get a shortcut to the DomainManager Mock

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

@ -22,15 +22,10 @@ from openstackclient.tests.unit.network.v2 import fakes as network_fakes
from openstackclient.tests.unit import utils as tests_utils
# Tests for Neutron network
class TestFloatingIPNetwork(network_fakes.TestNetworkV2):
def setUp(self):
super(TestFloatingIPNetwork, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
# Get a shortcut to the ProjectManager Mock
self.projects_mock = self.app.client_manager.identity.projects
# Get a shortcut to the DomainManager Mock
@ -308,7 +303,6 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork):
def setUp(self):
super(TestDeleteFloatingIPNetwork, self).setUp()
self.network_client.find_ip = mock.Mock()
self.network_client.delete_ip = mock.Mock(return_value=None)
# Get the command object to test

6
openstackclient/tests/unit/network/v2/test_floating_ip_pool_network.py
View File

@ -17,16 +17,10 @@ from openstackclient.network.v2 import floating_ip_pool
from openstackclient.tests.unit.network.v2 import fakes as network_fakes
# Tests for Network API v2
class TestFloatingIPPoolNetwork(network_fakes.TestNetworkV2):
def setUp(self):
super(TestFloatingIPPoolNetwork, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
class TestListFloatingIPPoolNetwork(TestFloatingIPPoolNetwork):
def setUp(self):

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

@ -27,7 +27,7 @@ from openstackclient.tests.unit import utils as tests_utils
class TestFloatingIPPortForwarding(network_fakes.TestNetworkV2):
def setUp(self):
super(TestFloatingIPPortForwarding, self).setUp()
self.network_client = self.app.client_manager.network
self.floating_ip = (
network_fakes.FakeFloatingIP.create_one_floating_ip()
)

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

@ -25,9 +25,6 @@ class TestIPAvailability(network_fakes.TestNetworkV2):
def setUp(self):
super(TestIPAvailability, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
# Get a shortcut to the ProjectManager Mock
self.projects_mock = self.app.client_manager.identity.projects

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

@ -23,8 +23,7 @@ from openstackclient.tests.unit import utils as tests_utils
class TestConntrackHelper(network_fakes.TestNetworkV2):
def setUp(self):
super(TestConntrackHelper, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
self.router = network_fakes.FakeRouter.create_one_router()
self.network_client.find_router = mock.Mock(return_value=self.router)

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

@ -28,8 +28,6 @@ class TestLocalIP(network_fakes.TestNetworkV2):
def setUp(self):
super().setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
# Get a shortcut to the ProjectManager Mock
self.projects_mock = self.app.client_manager.identity.projects
# Get a shortcut to the DomainManager Mock

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

@ -26,7 +26,6 @@ from openstackclient.tests.unit.network.v2 import fakes as network_fakes
class TestLocalIPAssociation(network_fakes.TestNetworkV2):
def setUp(self):
super().setUp()
self.network_client = self.app.client_manager.network
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()

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

@ -29,8 +29,7 @@ class TestNDPProxy(network_fakes.TestNetworkV2):
self.projects_mock = self.app.client_manager.identity.projects
# Get a shortcut to the DomainManager Mock
self.domains_mock = self.app.client_manager.identity.domains
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
self.router = network_fakes.FakeRouter.create_one_router(
{'id': 'fake-router-id'}
)

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

@ -32,8 +32,6 @@ class TestNetwork(network_fakes.TestNetworkV2):
def setUp(self):
super(TestNetwork, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
# Get a shortcut to the ProjectManager Mock
self.projects_mock = self.app.client_manager.identity.projects
# Get a shortcut to the DomainManager Mock

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

@ -26,9 +26,6 @@ class TestNetworkAgent(network_fakes.TestNetworkV2):
def setUp(self):
super(TestNetworkAgent, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
class TestAddNetworkToAgent(TestNetworkAgent):
net = network_fakes.create_one_network()
@ -40,7 +37,7 @@ class TestAddNetworkToAgent(TestNetworkAgent):
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.name = self.network_client.find_network.name
self.network_client.add_dhcp_agent_to_network = mock.Mock()
self.cmd = network_agent.AddNetworkToAgent(self.app, self.namespace)
def test_show_no_options(self):
@ -78,11 +75,12 @@ class TestAddRouterAgent(TestNetworkAgent):
def setUp(self):
super(TestAddRouterAgent, self).setUp()
self.network_client.add_router_to_agent = mock.Mock()
self.cmd = network_agent.AddRouterToAgent(self.app, self.namespace)
self.network_client.get_agent = mock.Mock(return_value=self._agent)
self.network_client.find_router = mock.Mock(return_value=self._router)
self.cmd = network_agent.AddRouterToAgent(self.app, self.namespace)
def test_add_no_options(self):
arglist = []
verifylist = []
@ -376,7 +374,7 @@ class TestRemoveNetworkFromAgent(TestNetworkAgent):
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.name = self.network_client.find_network.name
self.network_client.remove_dhcp_agent_from_network = mock.Mock()
self.cmd = network_agent.RemoveNetworkFromAgent(
self.app, self.namespace
)
@ -431,12 +429,13 @@ class TestRemoveRouterAgent(TestNetworkAgent):
def setUp(self):
super(TestRemoveRouterAgent, self).setUp()
self.network_client.remove_router_from_agent = mock.Mock()
self.network_client.get_agent = mock.Mock(return_value=self._agent)
self.network_client.find_router = mock.Mock(return_value=self._router)
self.cmd = network_agent.RemoveRouterFromAgent(
self.app, self.namespace
)
self.network_client.get_agent = mock.Mock(return_value=self._agent)
self.network_client.find_router = mock.Mock(return_value=self._router)
def test_remove_no_options(self):
arglist = []

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

@ -23,7 +23,6 @@ from openstackclient.tests.unit.network.v2 import fakes as network_fakes
class TestAutoAllocatedTopology(network_fakes.TestNetworkV2):
def setUp(self):
super(TestAutoAllocatedTopology, self).setUp()
self.network_client = self.app.client_manager.network
self.projects_mock = self.app.client_manager.identity.projects

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

@ -28,8 +28,6 @@ class TestNetworkFlavor(network_fakes.TestNetworkV2):
def setUp(self):
super(TestNetworkFlavor, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
# Get a shortcut to the ProjectManager Mock
self.projects_mock = self.app.client_manager.identity.projects
# Get a shortcut to the DomainManager Mock
@ -42,13 +40,13 @@ class TestAddNetworkFlavorToProfile(TestNetworkFlavor):
def setUp(self):
super(TestAddNetworkFlavorToProfile, self).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.associate_flavor_with_service_profile = mock.Mock()
self.cmd = network_flavor.AddNetworkFlavorToProfile(
self.app, self.namespace

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

@ -22,8 +22,7 @@ from openstackclient.tests.unit.network.v2 import fakes as network_fakes
class TestFlavorProfile(network_fakes.TestNetworkV2):
def setUp(self):
super(TestFlavorProfile, self).setUp()
# Get the network client
self.network_client = self.app.client_manager.network
# Get the ProjectManager Mock
self.projects_mock = self.app.client_manager.identity.projects
# Get the DomainManager Mock

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

@ -27,7 +27,7 @@ from openstackclient.tests.unit import utils as tests_utils
class TestMeter(network_fakes.TestNetworkV2):
def setUp(self):
super(TestMeter, self).setUp()
self.network_client = self.app.client_manager.network
self.projects_mock = self.app.client_manager.identity.projects
self.domains_mock = self.app.client_manager.identity.domains

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

@ -27,7 +27,7 @@ from openstackclient.tests.unit import utils as tests_utils
class TestMeterRule(network_fakes.TestNetworkV2):
def setUp(self):
super(TestMeterRule, self).setUp()
self.network_client = self.app.client_manager.network
self.projects_mock = self.app.client_manager.identity.projects
self.domains_mock = self.app.client_manager.identity.domains

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

@ -27,8 +27,6 @@ from openstackclient.tests.unit import utils as tests_utils
class TestQosPolicy(network_fakes.TestNetworkV2):
def setUp(self):
super(TestQosPolicy, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
# Get a shortcut to the ProjectManager Mock
self.projects_mock = self.app.client_manager.identity.projects

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

@ -54,8 +54,6 @@ DSCP_VALID_MARKS = [
class TestNetworkQosRule(network_fakes.TestNetworkV2):
def setUp(self):
super(TestNetworkQosRule, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
self.qos_policy = (
network_fakes.FakeNetworkQosPolicy.create_one_qos_policy()
)

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

@ -23,8 +23,6 @@ from openstackclient.tests.unit import utils as tests_utils
class TestNetworkQosRuleType(network_fakes.TestNetworkV2):
def setUp(self):
super(TestNetworkQosRuleType, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
class TestShowNetworkQosRuleType(TestNetworkQosRuleType):

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

@ -27,8 +27,6 @@ class TestNetworkRBAC(network_fakes.TestNetworkV2):
def setUp(self):
super(TestNetworkRBAC, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
# Get a shortcut to the ProjectManager Mock
self.projects_mock = self.app.client_manager.identity.projects

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

@ -25,9 +25,6 @@ class TestNetworkSegment(network_fakes.TestNetworkV2):
def setUp(self):
super(TestNetworkSegment, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
class TestCreateNetworkSegment(TestNetworkSegment):
# The network segment to create along with associated network.

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

@ -42,9 +42,6 @@ class TestNetworkSegmentRange(network_fakes.TestNetworkV2):
def setUp(self):
super(TestNetworkSegmentRange, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
class TestCreateNetworkSegmentRange(TestNetworkSegmentRange):
# The network segment range to create.
@ -81,7 +78,6 @@ class TestCreateNetworkSegmentRange(TestNetworkSegmentRange):
def setUp(self):
super(TestCreateNetworkSegmentRange, self).setUp()
self.network_client.find_extension = mock.Mock()
self.network_client.create_network_segment_range = mock.Mock(
return_value=self._network_segment_range
)
@ -355,7 +351,6 @@ class TestDeleteNetworkSegmentRange(TestNetworkSegmentRange):
def setUp(self):
super(TestDeleteNetworkSegmentRange, self).setUp()
self.network_client.find_extension = mock.Mock()
self.network_client.delete_network_segment_range = mock.Mock(
return_value=None
)
@ -498,16 +493,15 @@ class TestListNetworkSegmentRange(TestNetworkSegmentRange):
def setUp(self):
super(TestListNetworkSegmentRange, self).setUp()
self.network_client.network_segment_ranges = mock.Mock(
return_value=self._network_segment_ranges
)
# Get the command object to test
self.cmd = network_segment_range.ListNetworkSegmentRange(
self.app, self.namespace
)
self.network_client.find_extension = mock.Mock()
self.network_client.network_segment_ranges = mock.Mock(
return_value=self._network_segment_ranges
)
def test_list_no_option(self):
arglist = []
verifylist = [
@ -573,7 +567,6 @@ class TestSetNetworkSegmentRange(TestNetworkSegmentRange):
def setUp(self):
super(TestSetNetworkSegmentRange, self).setUp()
self.network_client.find_extension = mock.Mock()
self.network_client.find_network_segment_range = mock.Mock(
return_value=self._network_segment_range
)
@ -671,7 +664,6 @@ class TestShowNetworkSegmentRange(TestNetworkSegmentRange):
def setUp(self):
super(TestShowNetworkSegmentRange, self).setUp()
self.network_client.find_extension = mock.Mock()
self.network_client.find_network_segment_range = mock.Mock(
return_value=self._network_segment_range
)

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

@ -24,7 +24,6 @@ from openstackclient.tests.unit.network.v2 import fakes
class TestNetworkServiceProvider(fakes.TestNetworkV2):
def setUp(self):
super(TestNetworkServiceProvider, self).setUp()
self.network_client = self.app.client_manager.network
class TestListNetworkServiceProvider(TestNetworkServiceProvider):

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

@ -32,8 +32,6 @@ class TestNetworkTrunk(network_fakes.TestNetworkV2):
def setUp(self):
super().setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
# Get a shortcut to the ProjectManager Mock
self.projects_mock = self.app.client_manager.identity.projects
# Get a shortcut to the DomainManager Mock

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

@ -34,8 +34,6 @@ class TestPort(network_fakes.TestNetworkV2):
def setUp(self):
super(TestPort, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
# Get a shortcut to the ProjectManager Mock
self.projects_mock = self.app.client_manager.identity.projects

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

@ -27,8 +27,6 @@ class TestRouter(network_fakes.TestNetworkV2):
def setUp(self):
super(TestRouter, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
self.projects_mock = self.app.client_manager.identity.projects
@ -42,11 +40,12 @@ class TestAddPortToRouter(TestRouter):
def setUp(self):
super(TestAddPortToRouter, self).setUp()
self.network_client.add_interface_to_router = mock.Mock()
self.cmd = router.AddPortToRouter(self.app, self.namespace)
self.network_client.find_router = mock.Mock(return_value=self._router)
self.network_client.find_port = mock.Mock(return_value=self._port)
self.cmd = router.AddPortToRouter(self.app, self.namespace)
def test_add_port_no_option(self):
arglist = []
verifylist = []
@ -91,11 +90,12 @@ class TestAddSubnetToRouter(TestRouter):
def setUp(self):
super(TestAddSubnetToRouter, self).setUp()
self.network_client.add_interface_to_router = mock.Mock()
self.cmd = router.AddSubnetToRouter(self.app, self.namespace)
self.network_client.find_router = mock.Mock(return_value=self._router)
self.network_client.find_subnet = mock.Mock(return_value=self._subnet)
self.cmd = router.AddSubnetToRouter(self.app, self.namespace)
def test_add_subnet_no_option(self):
arglist = []
verifylist = []
@ -835,11 +835,12 @@ class TestRemovePortFromRouter(TestRouter):
def setUp(self):
super(TestRemovePortFromRouter, self).setUp()
self.network_client.remove_interface_from_router = mock.Mock()
self.cmd = router.RemovePortFromRouter(self.app, self.namespace)
self.network_client.find_router = mock.Mock(return_value=self._router)
self.network_client.find_port = mock.Mock(return_value=self._port)
self.cmd = router.RemovePortFromRouter(self.app, self.namespace)
def test_remove_port_no_option(self):
arglist = []
verifylist = []
@ -881,11 +882,12 @@ class TestRemoveSubnetFromRouter(TestRouter):
def setUp(self):
super(TestRemoveSubnetFromRouter, self).setUp()
self.network_client.remove_interface_from_router = mock.Mock()
self.cmd = router.RemoveSubnetFromRouter(self.app, self.namespace)
self.network_client.find_router = mock.Mock(return_value=self._router)
self.network_client.find_subnet = mock.Mock(return_value=self._subnet)
self.cmd = router.RemoveSubnetFromRouter(self.app, self.namespace)
def test_remove_subnet_no_option(self):
arglist = []
verifylist = []
@ -1105,7 +1107,6 @@ class TestSetRouter(TestRouter):
def setUp(self):
super(TestSetRouter, self).setUp()
self.network_client.router_add_gateway = mock.Mock()
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)
@ -1113,6 +1114,7 @@ class TestSetRouter(TestRouter):
return_value=self._network
)
self.network_client.find_subnet = mock.Mock(return_value=self._subnet)
# Get the command object to test
self.cmd = router.SetRouter(self.app, self.namespace)

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

@ -26,8 +26,6 @@ class TestSecurityGroupNetwork(network_fakes.TestNetworkV2):
def setUp(self):
super(TestSecurityGroupNetwork, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
# Get a shortcut to the ProjectManager Mock
self.projects_mock = self.app.client_manager.identity.projects
# Get a shortcut to the DomainManager Mock

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

@ -26,8 +26,6 @@ class TestSecurityGroupRuleNetwork(network_fakes.TestNetworkV2):
def setUp(self):
super(TestSecurityGroupRuleNetwork, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
# Get a shortcut to the ProjectManager Mock
self.projects_mock = self.app.client_manager.identity.projects
# Get a shortcut to the DomainManager Mock

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

@ -27,8 +27,6 @@ class TestSubnet(network_fakes.TestNetworkV2):
def setUp(self):
super(TestSubnet, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
# Get a shortcut to the ProjectManager Mock
self.projects_mock = self.app.client_manager.identity.projects
# Get a shortcut to the DomainManager Mock

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

@ -28,8 +28,6 @@ class TestSubnetPool(network_fakes.TestNetworkV2):
def setUp(self):
super(TestSubnetPool, self).setUp()
# Get a shortcut to the network client
self.network_client = self.app.client_manager.network
# Get a shortcut to the ProjectManager Mock
self.projects_mock = self.app.client_manager.identity.projects
# Get a shortcut to the DomainManager Mock