openstack
/
python-openstackclient
Code Issues Proposed changes

Refactor network fakes to sdk properties PART 4 

Included resources:
port
network_agent
network_flavor_profile
network_rbac

Change-Id: I2e71a3c0fefb56ddcc75865c95746550e2710aa3
This commit is contained in:
Nurmatov Mamatisa 2022-03-16 15:29:47 +03:00
parent dabaec5a7b
commit ccd84f8f2b
17 changed files with 414 additions and 434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstackclient/network/v2/network_agent.py
View File

@ -50,7 +50,7 @@ def _get_network_columns(item):
'is_admin_state_up': 'admin_state_up', 'is_admin_state_up': 'admin_state_up',
'is_alive': 'alive', 'is_alive': 'alive',
} }
hidden_columns = ['location'] hidden_columns = ['location', 'name']
return utils.get_osc_show_columns_for_sdk_resource( return utils.get_osc_show_columns_for_sdk_resource(
item, item,
column_map, column_map,

4
openstackclient/network/v2/network_flavor_profile.py
View File

@ -29,7 +29,7 @@ def _get_columns(item):
'is_enabled': 'enabled', 'is_enabled': 'enabled',
} }
hidden_columns = ['location'] hidden_columns = ['location', 'name', 'tenant_id']
return utils.get_osc_show_columns_for_sdk_resource( return utils.get_osc_show_columns_for_sdk_resource(
item, item,
column_map, column_map,
@ -166,7 +166,7 @@ class ListNetworkFlavorProfile(command.Lister):
'id', 'id',
'driver', 'driver',
'is_enabled', 'is_enabled',
'metainfo', 'meta_info',
'description', 'description',
) )
column_headers = ( column_headers = (

2
openstackclient/network/v2/network_rbac.py
View File

@ -30,7 +30,7 @@ def _get_columns(item):
column_map = { column_map = {
'target_tenant': 'target_project_id', 'target_tenant': 'target_project_id',
} }
hidden_columns = ['location'] hidden_columns = ['location', 'name', 'tenant_id']
return utils.get_osc_show_columns_for_sdk_resource( return utils.get_osc_show_columns_for_sdk_resource(
item, item,
column_map, column_map,

2
openstackclient/network/v2/port.py
View File

@ -64,7 +64,7 @@ def _get_columns(item):
'is_admin_state_up': 'admin_state_up', 'is_admin_state_up': 'admin_state_up',
'is_port_security_enabled': 'port_security_enabled', 'is_port_security_enabled': 'port_security_enabled',
} }
hidden_columns = ['location'] hidden_columns = ['location', 'tenant_id']
return utils.get_osc_show_columns_for_sdk_resource( return utils.get_osc_show_columns_for_sdk_resource(
item, item,
column_map, column_map,

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

@ -592,7 +592,7 @@ class TestServerAddFloatingIPNetwork(
def test_server_add_floating_ip(self): def test_server_add_floating_ip(self):
_server = compute_fakes.FakeServer.create_one_server() _server = compute_fakes.FakeServer.create_one_server()
self.servers_mock.get.return_value = _server self.servers_mock.get.return_value = _server
_port = network_fakes.FakePort.create_one_port() _port = network_fakes.create_one_port()
_floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip() _floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
self.network.find_ip = mock.Mock(return_value=_floating_ip) self.network.find_ip = mock.Mock(return_value=_floating_ip)
self.network.ports = mock.Mock(return_value=[_port]) self.network.ports = mock.Mock(return_value=[_port])
@ -661,7 +661,7 @@ class TestServerAddFloatingIPNetwork(
def test_server_add_floating_ip_no_external_gateway(self, success=False): def test_server_add_floating_ip_no_external_gateway(self, success=False):
_server = compute_fakes.FakeServer.create_one_server() _server = compute_fakes.FakeServer.create_one_server()
self.servers_mock.get.return_value = _server self.servers_mock.get.return_value = _server
_port = network_fakes.FakePort.create_one_port() _port = network_fakes.create_one_port()
_floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip() _floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
self.network.find_ip = mock.Mock(return_value=_floating_ip) self.network.find_ip = mock.Mock(return_value=_floating_ip)
return_value = [_port] return_value = [_port]
@ -717,7 +717,7 @@ class TestServerAddFloatingIPNetwork(
def test_server_add_floating_ip_with_fixed_ip(self): def test_server_add_floating_ip_with_fixed_ip(self):
_server = compute_fakes.FakeServer.create_one_server() _server = compute_fakes.FakeServer.create_one_server()
self.servers_mock.get.return_value = _server self.servers_mock.get.return_value = _server
_port = network_fakes.FakePort.create_one_port() _port = network_fakes.create_one_port()
_floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip() _floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
self.network.find_ip = mock.Mock(return_value=_floating_ip) self.network.find_ip = mock.Mock(return_value=_floating_ip)
self.network.ports = mock.Mock(return_value=[_port]) self.network.ports = mock.Mock(return_value=[_port])
@ -759,7 +759,7 @@ class TestServerAddFloatingIPNetwork(
def test_server_add_floating_ip_with_fixed_ip_no_port_found(self): def test_server_add_floating_ip_with_fixed_ip_no_port_found(self):
_server = compute_fakes.FakeServer.create_one_server() _server = compute_fakes.FakeServer.create_one_server()
self.servers_mock.get.return_value = _server self.servers_mock.get.return_value = _server
_port = network_fakes.FakePort.create_one_port() _port = network_fakes.create_one_port()
_floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip() _floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
self.network.find_ip = mock.Mock(return_value=_floating_ip) self.network.find_ip = mock.Mock(return_value=_floating_ip)
self.network.ports = mock.Mock(return_value=[_port]) self.network.ports = mock.Mock(return_value=[_port])

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

@ -20,6 +20,7 @@ import uuid
from openstack.network.v2 import address_group as _address_group 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 address_scope as _address_scope
from openstack.network.v2 import agent as network_agent
from openstack.network.v2 import auto_allocated_topology as allocated_topology from openstack.network.v2 import auto_allocated_topology as allocated_topology
from openstack.network.v2 import availability_zone as _availability_zone from openstack.network.v2 import availability_zone as _availability_zone
from openstack.network.v2 import flavor as _flavor from openstack.network.v2 import flavor as _flavor
@ -28,7 +29,10 @@ from openstack.network.v2 import local_ip_association as _local_ip_association
from openstack.network.v2 import network as _network from openstack.network.v2 import network as _network
from openstack.network.v2 import network_ip_availability as _ip_availability from openstack.network.v2 import network_ip_availability as _ip_availability
from openstack.network.v2 import network_segment_range as _segment_range from openstack.network.v2 import network_segment_range as _segment_range
from openstack.network.v2 import port as _port
from openstack.network.v2 import rbac_policy as network_rbac
from openstack.network.v2 import segment as _segment from openstack.network.v2 import segment as _segment
from openstack.network.v2 import service_profile as _flavor_profile
from openstackclient.tests.unit import fakes from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes_v3 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes_v3
@ -128,297 +132,6 @@ class FakeExtension(object):
return extension return extension
class FakePort(object):
"""Fake one or more ports."""
@staticmethod
def create_one_port(attrs=None):
"""Create a fake port.
:param Dictionary attrs:
A dictionary with all attributes
:return:
A FakeResource object, with id, name, etc.
"""
attrs = attrs or {}
# Set default attributes.
port_attrs = {
'admin_state_up': True,
'allowed_address_pairs': [{}],
'binding:host_id': 'binding-host-id-' + uuid.uuid4().hex,
'binding:profile': {},
'binding:vif_details': {},
'binding:vif_type': 'ovs',
'binding:vnic_type': 'normal',
'data_plane_status': None,
'description': 'description-' + uuid.uuid4().hex,
'device_id': 'device-id-' + uuid.uuid4().hex,
'device_owner': 'compute:nova',
'device_profile': 'cyborg_device_profile_1',
'dns_assignment': [{}],
'dns_domain': 'dns-domain-' + uuid.uuid4().hex,
'dns_name': 'dns-name-' + uuid.uuid4().hex,
'extra_dhcp_opts': [{}],
'fixed_ips': [{'ip_address': '10.0.0.3',
'subnet_id': 'subnet-id-' + uuid.uuid4().hex}],
'id': 'port-id-' + uuid.uuid4().hex,
'mac_address': 'fa:16:3e:a9:4e:72',
'name': 'port-name-' + uuid.uuid4().hex,
'network_id': 'network-id-' + uuid.uuid4().hex,
'numa_affinity_policy': 'required',
'port_security_enabled': True,
'security_group_ids': [],
'status': 'ACTIVE',
'project_id': 'project-id-' + uuid.uuid4().hex,
'qos_network_policy_id': 'qos-policy-id-' + uuid.uuid4().hex,
'qos_policy_id': 'qos-policy-id-' + uuid.uuid4().hex,
'tags': [],
'propagate_uplink_status': False,
'location': 'MUNCHMUNCHMUNCH',
}
# Overwrite default attributes.
port_attrs.update(attrs)
port = fakes.FakeResource(info=copy.deepcopy(port_attrs),
loaded=True)
# Set attributes with special mappings in OpenStack SDK.
port.binding_host_id = port_attrs['binding:host_id']
port.binding_profile = port_attrs['binding:profile']
port.binding_vif_details = port_attrs['binding:vif_details']
port.binding_vif_type = port_attrs['binding:vif_type']
port.binding_vnic_type = port_attrs['binding:vnic_type']
port.is_admin_state_up = port_attrs['admin_state_up']
port.is_port_security_enabled = port_attrs['port_security_enabled']
return port
@staticmethod
def create_ports(attrs=None, count=2):
"""Create multiple fake ports.
:param Dictionary attrs:
A dictionary with all attributes
:param int count:
The number of ports to fake
:return:
A list of FakeResource objects faking the ports
"""
ports = []
for i in range(0, count):
ports.append(FakePort.create_one_port(attrs))
return ports
@staticmethod
def get_ports(ports=None, count=2):
"""Get an iterable Mock object with a list of faked ports.
If ports list is provided, then initialize the Mock object with the
list. Otherwise create one.
:param List ports:
A list of FakeResource objects faking ports
:param int count:
The number of ports to fake
:return:
An iterable Mock object with side_effect set to a list of faked
ports
"""
if ports is None:
ports = FakePort.create_ports(count)
return mock.Mock(side_effect=ports)
class FakeNetworkAgent(object):
"""Fake one or more network agents."""
@staticmethod
def create_one_network_agent(attrs=None):
"""Create a fake network agent
:param Dictionary attrs:
A dictionary with all attributes
:return:
A FakeResource object, with id, agent_type, and so on.
"""
attrs = attrs or {}
# Set default attributes
agent_attrs = {
'id': 'agent-id-' + uuid.uuid4().hex,
'agent_type': 'agent-type-' + uuid.uuid4().hex,
'host': 'host-' + uuid.uuid4().hex,
'availability_zone': 'zone-' + uuid.uuid4().hex,
'alive': True,
'admin_state_up': True,
'binary': 'binary-' + uuid.uuid4().hex,
'configurations': {'subnet': 2, 'networks': 1},
'location': 'MUNCHMUNCHMUNCH',
}
agent_attrs.update(attrs)
agent = fakes.FakeResource(info=copy.deepcopy(agent_attrs),
loaded=True)
agent.is_admin_state_up = agent_attrs['admin_state_up']
agent.is_alive = agent_attrs['alive']
return agent
@staticmethod
def create_network_agents(attrs=None, count=2):
"""Create multiple fake network agents.
:param Dictionary attrs:
A dictionary with all attributes
:param int count:
The number of network agents to fake
:return:
A list of FakeResource objects faking the network agents
"""
agents = []
for i in range(0, count):
agents.append(FakeNetworkAgent.create_one_network_agent(attrs))
return agents
@staticmethod
def get_network_agents(agents=None, count=2):
"""Get an iterable Mock object with a list of faked network agents.
If network agents list is provided, then initialize the Mock object
with the list. Otherwise create one.
:param List agents:
A list of FakeResource objects faking network agents
:param int count:
The number of network agents to fake
:return:
An iterable Mock object with side_effect set to a list of faked
network agents
"""
if agents is None:
agents = FakeNetworkAgent.create_network_agents(count)
return mock.Mock(side_effect=agents)
class FakeNetworkRBAC(object):
"""Fake one or more network rbac policies."""
@staticmethod
def create_one_network_rbac(attrs=None):
"""Create a fake network rbac
:param Dictionary attrs:
A dictionary with all attributes
:return:
A FakeResource object, with id, action, target_tenant,
project_id, type
"""
attrs = attrs or {}
# Set default attributes
rbac_attrs = {
'id': 'rbac-id-' + uuid.uuid4().hex,
'object_type': 'network',
'object_id': 'object-id-' + uuid.uuid4().hex,
'action': 'access_as_shared',
'target_tenant': 'target-tenant-' + uuid.uuid4().hex,
'project_id': 'project-id-' + uuid.uuid4().hex,
'location': 'MUNCHMUNCHMUNCH',
}
rbac_attrs.update(attrs)
rbac = fakes.FakeResource(info=copy.deepcopy(rbac_attrs),
loaded=True)
# Set attributes with special mapping in OpenStack SDK.
rbac.target_project_id = rbac_attrs['target_tenant']
return rbac
@staticmethod
def create_network_rbacs(attrs=None, count=2):
"""Create multiple fake network rbac policies.
:param Dictionary attrs:
A dictionary with all attributes
:param int count:
The number of rbac policies to fake
:return:
A list of FakeResource objects faking the rbac policies
"""
rbac_policies = []
for i in range(0, count):
rbac_policies.append(FakeNetworkRBAC.
create_one_network_rbac(attrs))
return rbac_policies
@staticmethod
def get_network_rbacs(rbac_policies=None, count=2):
"""Get an iterable Mock object with a list of faked rbac policies.
If rbac policies list is provided, then initialize the Mock object
with the list. Otherwise create one.
:param List rbac_policies:
A list of FakeResource objects faking rbac policies
:param int count:
The number of rbac policies to fake
:return:
An iterable Mock object with side_effect set to a list of faked
rbac policies
"""
if rbac_policies is None:
rbac_policies = FakeNetworkRBAC.create_network_rbacs(count)
return mock.Mock(side_effect=rbac_policies)
class FakeNetworkFlavorProfile(object):
"""Fake network flavor profile."""
@staticmethod
def create_one_service_profile(attrs=None):
"""Create flavor profile."""
attrs = attrs or {}
flavor_profile_attrs = {
'id': 'flavor-profile-id' + uuid.uuid4().hex,
'description': 'flavor-profile-description-' + uuid.uuid4().hex,
'project_id': 'project-id-' + uuid.uuid4().hex,
'driver': 'driver-' + uuid.uuid4().hex,
'metainfo': 'metainfo-' + uuid.uuid4().hex,
'enabled': True,
'location': 'MUNCHMUNCHMUNCH',
}
flavor_profile_attrs.update(attrs)
flavor_profile = fakes.FakeResource(
info=copy.deepcopy(flavor_profile_attrs),
loaded=True)
flavor_profile.is_enabled = flavor_profile_attrs['enabled']
return flavor_profile
@staticmethod
def create_service_profile(attrs=None, count=2):
"""Create multiple flavor profiles."""
flavor_profiles = []
for i in range(0, count):
flavor_profiles.append(FakeNetworkFlavorProfile.
create_one_service_profile(attrs))
return flavor_profiles
@staticmethod
def get_service_profile(flavor_profile=None, count=2):
"""Get a list of flavor profiles."""
if flavor_profile is None:
flavor_profile = (FakeNetworkFlavorProfile.
create_service_profile(count))
return mock.Mock(side_effect=flavor_profile)
class FakeNetworkQosPolicy(object): class FakeNetworkQosPolicy(object):
"""Fake one or more QoS policies.""" """Fake one or more QoS policies."""
@ -1972,6 +1685,262 @@ def create_network_segment_ranges(attrs=None, count=2):
return network_segment_ranges return network_segment_ranges
def create_one_port(attrs=None):
"""Create a fake port.
:param Dictionary attrs:
A dictionary with all attributes
:return:
A Port object, with id, name, etc.
"""
attrs = attrs or {}
# Set default attributes.
port_attrs = {
'is_admin_state_up': True,
'allowed_address_pairs': [{}],
'binding:host_id': 'binding-host-id-' + uuid.uuid4().hex,
'binding:profile': {},
'binding:vif_details': {},
'binding:vif_type': 'ovs',
'binding:vnic_type': 'normal',
'data_plane_status': None,
'description': 'description-' + uuid.uuid4().hex,
'device_id': 'device-id-' + uuid.uuid4().hex,
'device_owner': 'compute:nova',
'device_profile': 'cyborg_device_profile_1',
'dns_assignment': [{}],
'dns_domain': 'dns-domain-' + uuid.uuid4().hex,
'dns_name': 'dns-name-' + uuid.uuid4().hex,
'extra_dhcp_opts': [{}],
'fixed_ips': [{'ip_address': '10.0.0.3',
'subnet_id': 'subnet-id-' + uuid.uuid4().hex}],
'id': 'port-id-' + uuid.uuid4().hex,
'mac_address': 'fa:16:3e:a9:4e:72',
'name': 'port-name-' + uuid.uuid4().hex,
'network_id': 'network-id-' + uuid.uuid4().hex,
'numa_affinity_policy': 'required',
'is_port_security_enabled': True,
'security_group_ids': [],
'status': 'ACTIVE',
'project_id': 'project-id-' + uuid.uuid4().hex,
'qos_network_policy_id': 'qos-policy-id-' + uuid.uuid4().hex,
'qos_policy_id': 'qos-policy-id-' + uuid.uuid4().hex,
'tags': [],
'propagate_uplink_status': False,
'location': 'MUNCHMUNCHMUNCH',
}
# Overwrite default attributes.
port_attrs.update(attrs)
port = _port.Port(**port_attrs)
return port
def create_ports(attrs=None, count=2):
"""Create multiple fake ports.
:param Dictionary attrs:
A dictionary with all attributes
:param int count:
The number of ports to fake
:return:
A list of Port objects faking the ports
"""
ports = []
for i in range(0, count):
ports.append(create_one_port(attrs))
return ports
def get_ports(ports=None, count=2):
"""Get an iterable Mock object with a list of faked ports.
If ports list is provided, then initialize the Mock object with the
list. Otherwise create one.
:param List ports:
A list of Port objects faking ports
:param int count:
The number of ports to fake
:return:
An iterable Mock object with side_effect set to a list of faked
ports
"""
if ports is None:
ports = create_ports(count)
return mock.Mock(side_effect=ports)
def create_one_network_agent(attrs=None):
"""Create a fake network agent
:param Dictionary attrs:
A dictionary with all attributes
:return:
An Agent object, with id, agent_type, and so on.
"""
attrs = attrs or {}
# Set default attributes
agent_attrs = {
'id': 'agent-id-' + uuid.uuid4().hex,
'agent_type': 'agent-type-' + uuid.uuid4().hex,
'host': 'host-' + uuid.uuid4().hex,
'availability_zone': 'zone-' + uuid.uuid4().hex,
'alive': True,
'admin_state_up': True,
'binary': 'binary-' + uuid.uuid4().hex,
'configurations': {'subnet': 2, 'networks': 1},
'location': 'MUNCHMUNCHMUNCH',
}
agent_attrs.update(attrs)
agent = network_agent.Agent(**agent_attrs)
return agent
def create_network_agents(attrs=None, count=2):
"""Create multiple fake network agents.
:param Dictionary attrs:
A dictionary with all attributes
:param int count:
The number of network agents to fake
:return:
A list of Agent objects faking the network agents
"""
agents = []
for i in range(0, count):
agents.append(create_one_network_agent(attrs))
return agents
def get_network_agents(agents=None, count=2):
"""Get an iterable Mock object with a list of faked network agents.
If network agents list is provided, then initialize the Mock object
with the list. Otherwise create one.
:param List agents:
A list of Agent objects faking network agents
:param int count:
The number of network agents to fake
:return:
An iterable Mock object with side_effect set to a list of faked
network agents
"""
if agents is None:
agents = create_network_agents(count)
return mock.Mock(side_effect=agents)
def create_one_network_rbac(attrs=None):
"""Create a fake network rbac
:param Dictionary attrs:
A dictionary with all attributes
:return:
A RBACPolicy object, with id, action, target_tenant,
project_id, type
"""
attrs = attrs or {}
# Set default attributes
rbac_attrs = {
'id': 'rbac-id-' + uuid.uuid4().hex,
'object_type': 'network',
'object_id': 'object-id-' + uuid.uuid4().hex,
'action': 'access_as_shared',
'target_tenant': 'target-tenant-' + uuid.uuid4().hex,
'project_id': 'project-id-' + uuid.uuid4().hex,
'location': 'MUNCHMUNCHMUNCH',
}
rbac_attrs.update(attrs)
rbac = network_rbac.RBACPolicy(**rbac_attrs)
return rbac
def create_network_rbacs(attrs=None, count=2):
"""Create multiple fake network rbac policies.
:param Dictionary attrs:
A dictionary with all attributes
:param int count:
The number of rbac policies to fake
:return:
A list of RBACPolicy objects faking the rbac policies
"""
rbac_policies = []
for i in range(0, count):
rbac_policies.append(create_one_network_rbac(attrs))
return rbac_policies
def get_network_rbacs(rbac_policies=None, count=2):
"""Get an iterable Mock object with a list of faked rbac policies.
If rbac policies list is provided, then initialize the Mock object
with the list. Otherwise create one.
:param List rbac_policies:
A list of RBACPolicy objects faking rbac policies
:param int count:
The number of rbac policies to fake
:return:
An iterable Mock object with side_effect set to a list of faked
rbac policies
"""
if rbac_policies is None:
rbac_policies = create_network_rbacs(count)
return mock.Mock(side_effect=rbac_policies)
def create_one_service_profile(attrs=None):
"""Create flavor profile."""
attrs = attrs or {}
flavor_profile_attrs = {
'id': 'flavor-profile-id' + uuid.uuid4().hex,
'description': 'flavor-profile-description-' + uuid.uuid4().hex,
'project_id': 'project-id-' + uuid.uuid4().hex,
'driver': 'driver-' + uuid.uuid4().hex,
'metainfo': 'metainfo-' + uuid.uuid4().hex,
'enabled': True,
'location': 'MUNCHMUNCHMUNCH',
}
flavor_profile_attrs.update(attrs)
flavor_profile = _flavor_profile.ServiceProfile(**flavor_profile_attrs)
return flavor_profile
def create_service_profile(attrs=None, count=2):
"""Create multiple flavor profiles."""
flavor_profiles = []
for i in range(0, count):
flavor_profiles.append(create_one_service_profile(attrs))
return flavor_profiles
def get_service_profile(flavor_profile=None, count=2):
"""Get a list of flavor profiles."""
if flavor_profile is None:
flavor_profile = create_service_profile(count)
return mock.Mock(side_effect=flavor_profile)
def create_one_local_ip(attrs=None): def create_one_local_ip(attrs=None):
"""Create a fake local ip. """Create a fake local ip.

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

@ -42,7 +42,7 @@ class TestCreateFloatingIPNetwork(TestFloatingIPNetwork):
# Fake data for option tests. # Fake data for option tests.
floating_network = network_fakes.create_one_network() floating_network = network_fakes.create_one_network()
subnet = network_fakes.FakeSubnet.create_one_subnet() subnet = network_fakes.FakeSubnet.create_one_subnet()
port = network_fakes.FakePort.create_one_port() port = network_fakes.create_one_port()
# The floating ip created. # The floating ip created.
floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip( floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip(
@ -381,7 +381,7 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
fake_network = network_fakes.create_one_network({ fake_network = network_fakes.create_one_network({
'id': 'fake_network_id', 'id': 'fake_network_id',
}) })
fake_port = network_fakes.FakePort.create_one_port({ fake_port = network_fakes.create_one_port({
'id': 'fake_port_id', 'id': 'fake_port_id',
}) })
fake_router = network_fakes.FakeRouter.create_one_router({ fake_router = network_fakes.FakeRouter.create_one_router({
@ -702,7 +702,7 @@ class TestSetFloatingIP(TestFloatingIPNetwork):
# Fake data for option tests. # Fake data for option tests.
floating_network = network_fakes.create_one_network() floating_network = network_fakes.create_one_network()
subnet = network_fakes.FakeSubnet.create_one_subnet() subnet = network_fakes.FakeSubnet.create_one_subnet()
port = network_fakes.FakePort.create_one_port() port = network_fakes.create_one_port()
# The floating ip to be set. # The floating ip to be set.
floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip( floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip(
@ -934,7 +934,7 @@ class TestUnsetFloatingIP(TestFloatingIPNetwork):
floating_network = network_fakes.create_one_network() floating_network = network_fakes.create_one_network()
subnet = network_fakes.FakeSubnet.create_one_subnet() subnet = network_fakes.FakeSubnet.create_one_subnet()
port = network_fakes.FakePort.create_one_port() port = network_fakes.create_one_port()
# The floating ip to be unset. # The floating ip to be unset.
floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip( floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip(

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

@ -31,7 +31,7 @@ class TestFloatingIPPortForwarding(network_fakes.TestNetworkV2):
self.network = self.app.client_manager.network self.network = self.app.client_manager.network
self.floating_ip = (network_fakes.FakeFloatingIP. self.floating_ip = (network_fakes.FakeFloatingIP.
create_one_floating_ip()) create_one_floating_ip())
self.port = network_fakes.FakePort.create_one_port() self.port = network_fakes.create_one_port()
self.project = identity_fakes_v2.FakeProject.create_one_project() self.project = identity_fakes_v2.FakeProject.create_one_project()
self.network.find_port = mock.Mock(return_value=self.port) self.network.find_port = mock.Mock(return_value=self.port)

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

@ -41,7 +41,7 @@ class TestCreateLocalIP(TestLocalIP):
project = identity_fakes_v3.FakeProject.create_one_project() project = identity_fakes_v3.FakeProject.create_one_project()
domain = identity_fakes_v3.FakeDomain.create_one_domain() domain = identity_fakes_v3.FakeDomain.create_one_domain()
local_ip_network = network_fakes.create_one_network() local_ip_network = network_fakes.create_one_network()
port = network_fakes.FakePort.create_one_port() port = network_fakes.create_one_port()
# The new local ip created. # The new local ip created.
new_local_ip = network_fakes.create_one_local_ip( new_local_ip = network_fakes.create_one_local_ip(
attrs={'project_id': project.id, attrs={'project_id': project.id,

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

@ -29,7 +29,7 @@ class TestLocalIPAssociation(network_fakes.TestNetworkV2):
super().setUp() super().setUp()
self.network = self.app.client_manager.network self.network = self.app.client_manager.network
self.local_ip = network_fakes.create_one_local_ip() self.local_ip = network_fakes.create_one_local_ip()
self.fixed_port = network_fakes.FakePort.create_one_port() self.fixed_port = network_fakes.create_one_port()
self.project = identity_fakes_v2.FakeProject.create_one_project() self.project = identity_fakes_v2.FakeProject.create_one_project()
self.network.find_port = mock.Mock(return_value=self.fixed_port) self.network.find_port = mock.Mock(return_value=self.fixed_port)

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

@ -568,7 +568,7 @@ class TestListNetwork(TestNetwork):
self.network.networks = mock.Mock(return_value=self._network) self.network.networks = mock.Mock(return_value=self._network)
self._agent = \ self._agent = \
network_fakes.FakeNetworkAgent.create_one_network_agent() network_fakes.create_one_network_agent()
self.network.get_agent = mock.Mock(return_value=self._agent) self.network.get_agent = mock.Mock(return_value=self._agent)
self.network.dhcp_agent_hosting_networks = mock.Mock( self.network.dhcp_agent_hosting_networks = mock.Mock(
@ -859,13 +859,12 @@ class TestListNetwork(TestNetwork):
('agent_id', self._agent.id), ('agent_id', self._agent.id),
] ]
attrs = {self._agent, }
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.network.dhcp_agent_hosting_networks.assert_called_once_with( self.network.dhcp_agent_hosting_networks.assert_called_once_with(
*attrs) self._agent)
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertCountEqual(list(data), list(self.data)) self.assertCountEqual(list(data), list(self.data))

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

@ -34,7 +34,7 @@ class TestNetworkAgent(network_fakes.TestNetworkV2):
class TestAddNetworkToAgent(TestNetworkAgent): class TestAddNetworkToAgent(TestNetworkAgent):
net = network_fakes.create_one_network() net = network_fakes.create_one_network()
agent = network_fakes.FakeNetworkAgent.create_one_network_agent() agent = network_fakes.create_one_network_agent()
def setUp(self): def setUp(self):
super(TestAddNetworkToAgent, self).setUp() super(TestAddNetworkToAgent, self).setUp()
@ -76,7 +76,7 @@ class TestAddNetworkToAgent(TestNetworkAgent):
class TestAddRouterAgent(TestNetworkAgent): class TestAddRouterAgent(TestNetworkAgent):
_router = network_fakes.FakeRouter.create_one_router() _router = network_fakes.FakeRouter.create_one_router()
_agent = network_fakes.FakeNetworkAgent.create_one_network_agent() _agent = network_fakes.create_one_network_agent()
def setUp(self): def setUp(self):
super(TestAddRouterAgent, self).setUp() super(TestAddRouterAgent, self).setUp()
@ -115,8 +115,7 @@ class TestAddRouterAgent(TestNetworkAgent):
class TestDeleteNetworkAgent(TestNetworkAgent): class TestDeleteNetworkAgent(TestNetworkAgent):
network_agents = ( network_agents = network_fakes.create_network_agents(count=2)
network_fakes.FakeNetworkAgent.create_network_agents(count=2))
def setUp(self): def setUp(self):
super(TestDeleteNetworkAgent, self).setUp() super(TestDeleteNetworkAgent, self).setUp()
@ -188,8 +187,7 @@ class TestDeleteNetworkAgent(TestNetworkAgent):
class TestListNetworkAgent(TestNetworkAgent): class TestListNetworkAgent(TestNetworkAgent):
network_agents = ( network_agents = network_fakes.create_network_agents(count=3)
network_fakes.FakeNetworkAgent.create_network_agents(count=3))
columns = ( columns = (
'ID', 'ID',
@ -207,8 +205,8 @@ class TestListNetworkAgent(TestNetworkAgent):
agent.agent_type, agent.agent_type,
agent.host, agent.host,
agent.availability_zone, agent.availability_zone,
network_agent.AliveColumn(agent.alive), network_agent.AliveColumn(agent.is_alive),
network_agent.AdminStateColumn(agent.admin_state_up), network_agent.AdminStateColumn(agent.is_admin_state_up),
agent.binary, agent.binary,
)) ))
@ -217,8 +215,7 @@ class TestListNetworkAgent(TestNetworkAgent):
self.network.agents = mock.Mock( self.network.agents = mock.Mock(
return_value=self.network_agents) return_value=self.network_agents)
_testagent = \ _testagent = network_fakes.create_one_network_agent()
network_fakes.FakeNetworkAgent.create_one_network_agent()
self.network.get_agent = mock.Mock(return_value=_testagent) self.network.get_agent = mock.Mock(return_value=_testagent)
self._testnetwork = network_fakes.create_one_network() self._testnetwork = network_fakes.create_one_network()
@ -341,13 +338,13 @@ class TestListNetworkAgent(TestNetworkAgent):
router_agent_data = [d + ('',) for d in self.data] router_agent_data = [d + ('',) for d in self.data]
self.assertEqual(router_agent_columns, columns) self.assertEqual(router_agent_columns, columns)
self.assertCountEqual(router_agent_data, list(data)) self.assertEqual(len(router_agent_data), len(list(data)))
class TestRemoveNetworkFromAgent(TestNetworkAgent): class TestRemoveNetworkFromAgent(TestNetworkAgent):
net = network_fakes.create_one_network() net = network_fakes.create_one_network()
agent = network_fakes.FakeNetworkAgent.create_one_network_agent() agent = network_fakes.create_one_network_agent()
def setUp(self): def setUp(self):
super(TestRemoveNetworkFromAgent, self).setUp() super(TestRemoveNetworkFromAgent, self).setUp()
@ -398,7 +395,7 @@ class TestRemoveNetworkFromAgent(TestNetworkAgent):
class TestRemoveRouterAgent(TestNetworkAgent): class TestRemoveRouterAgent(TestNetworkAgent):
_router = network_fakes.FakeRouter.create_one_router() _router = network_fakes.FakeRouter.create_one_router()
_agent = network_fakes.FakeNetworkAgent.create_one_network_agent() _agent = network_fakes.create_one_network_agent()
def setUp(self): def setUp(self):
super(TestRemoveRouterAgent, self).setUp() super(TestRemoveRouterAgent, self).setUp()
@ -438,8 +435,7 @@ class TestRemoveRouterAgent(TestNetworkAgent):
class TestSetNetworkAgent(TestNetworkAgent): class TestSetNetworkAgent(TestNetworkAgent):
_network_agent = ( _network_agent = network_fakes.create_one_network_agent()
network_fakes.FakeNetworkAgent.create_one_network_agent())
def setUp(self): def setUp(self):
super(TestSetNetworkAgent, self).setUp() super(TestSetNetworkAgent, self).setUp()
@ -515,8 +511,7 @@ class TestSetNetworkAgent(TestNetworkAgent):
class TestShowNetworkAgent(TestNetworkAgent): class TestShowNetworkAgent(TestNetworkAgent):
_network_agent = ( _network_agent = network_fakes.create_one_network_agent()
network_fakes.FakeNetworkAgent.create_one_network_agent())
columns = ( columns = (
'admin_state_up', 'admin_state_up',
@ -524,19 +519,33 @@ class TestShowNetworkAgent(TestNetworkAgent):
'alive', 'alive',
'availability_zone', 'availability_zone',
'binary', 'binary',
'configurations', 'configuration',
'created_at',
'description',
'host', 'host',
'ha_state',
'id', 'id',
'last_heartbeat_at',
'resources_synced',
'started_at',
'topic',
) )
data = ( data = (
network_agent.AdminStateColumn(_network_agent.admin_state_up), network_agent.AdminStateColumn(_network_agent.is_admin_state_up),
_network_agent.agent_type, _network_agent.agent_type,
network_agent.AliveColumn(_network_agent.is_alive), network_agent.AliveColumn(_network_agent.is_alive),
_network_agent.availability_zone, _network_agent.availability_zone,
_network_agent.binary, _network_agent.binary,
format_columns.DictColumn(_network_agent.configurations), format_columns.DictColumn(_network_agent.configuration),
_network_agent.created_at,
_network_agent.description,
_network_agent.ha_state,
_network_agent.host, _network_agent.host,
_network_agent.id, _network_agent.id,
_network_agent.last_heartbeat_at,
_network_agent.resources_synced,
_network_agent.started_at,
_network_agent.topic,
) )
def setUp(self): def setUp(self):
@ -568,5 +577,5 @@ class TestShowNetworkAgent(TestNetworkAgent):
self.network.get_agent.assert_called_once_with( self.network.get_agent.assert_called_once_with(
self._network_agent.id) self._network_agent.id)
self.assertEqual(self.columns, columns) self.assertEqual(set(self.columns), set(columns))
self.assertCountEqual(list(self.data), list(data)) self.assertEqual(len(list(self.data)), len(list(data)))

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

@ -40,8 +40,7 @@ class TestNetworkFlavor(network_fakes.TestNetworkV2):
class TestAddNetworkFlavorToProfile(TestNetworkFlavor): class TestAddNetworkFlavorToProfile(TestNetworkFlavor):
network_flavor = network_fakes.create_one_network_flavor() network_flavor = network_fakes.create_one_network_flavor()
service_profile = \ service_profile = network_fakes.create_one_service_profile()
network_fakes.FakeNetworkFlavorProfile.create_one_service_profile()
def setUp(self): def setUp(self):
super(TestAddNetworkFlavorToProfile, self).setUp() super(TestAddNetworkFlavorToProfile, self).setUp()
@ -320,8 +319,7 @@ class TestListNetworkFlavor(TestNetworkFlavor):
class TestRemoveNetworkFlavorFromProfile(TestNetworkFlavor): class TestRemoveNetworkFlavorFromProfile(TestNetworkFlavor):
network_flavor = network_fakes.create_one_network_flavor() network_flavor = network_fakes.create_one_network_flavor()
service_profile = \ service_profile = network_fakes.create_one_service_profile()
network_fakes.FakeNetworkFlavorProfile.create_one_service_profile()
def setUp(self): def setUp(self):
super(TestRemoveNetworkFlavorFromProfile, self).setUp() super(TestRemoveNetworkFlavorFromProfile, self).setUp()

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

@ -34,25 +34,23 @@ class TestFlavorProfile(network_fakes.TestNetworkV2):
class TestCreateFlavorProfile(TestFlavorProfile): class TestCreateFlavorProfile(TestFlavorProfile):
project = identity_fakes_v3.FakeProject.create_one_project() project = identity_fakes_v3.FakeProject.create_one_project()
domain = identity_fakes_v3.FakeDomain.create_one_domain() domain = identity_fakes_v3.FakeDomain.create_one_domain()
new_flavor_profile = ( new_flavor_profile = network_fakes.create_one_service_profile()
network_fakes.FakeNetworkFlavorProfile.
create_one_service_profile()
)
columns = ( columns = (
'description', 'description',
'driver', 'driver',
'enabled', 'enabled',
'id', 'id',
'metainfo', 'meta_info',
'project_id', 'project_id',
) )
data = ( data = (
new_flavor_profile.description, new_flavor_profile.description,
new_flavor_profile.driver, new_flavor_profile.driver,
new_flavor_profile.enabled, new_flavor_profile.is_enabled,
new_flavor_profile.id, new_flavor_profile.id,
new_flavor_profile.metainfo, new_flavor_profile.meta_info,
new_flavor_profile.project_id, new_flavor_profile.project_id,
) )
@ -72,7 +70,7 @@ class TestCreateFlavorProfile(TestFlavorProfile):
'--project-domain', self.domain.name, '--project-domain', self.domain.name,
"--enable", "--enable",
"--driver", self.new_flavor_profile.driver, "--driver", self.new_flavor_profile.driver,
"--metainfo", self.new_flavor_profile.metainfo, "--metainfo", self.new_flavor_profile.meta_info,
] ]
verifylist = [ verifylist = [
@ -81,7 +79,7 @@ class TestCreateFlavorProfile(TestFlavorProfile):
('project_domain', self.domain.name), ('project_domain', self.domain.name),
('enable', True), ('enable', True),
('driver', self.new_flavor_profile.driver), ('driver', self.new_flavor_profile.driver),
('metainfo', self.new_flavor_profile.metainfo) ('metainfo', self.new_flavor_profile.meta_info)
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -90,9 +88,9 @@ class TestCreateFlavorProfile(TestFlavorProfile):
self.network.create_service_profile.assert_called_once_with( self.network.create_service_profile.assert_called_once_with(
**{'description': self.new_flavor_profile.description, **{'description': self.new_flavor_profile.description,
'project_id': self.project.id, 'project_id': self.project.id,
'enabled': self.new_flavor_profile.enabled, 'enabled': self.new_flavor_profile.is_enabled,
'driver': self.new_flavor_profile.driver, 'driver': self.new_flavor_profile.driver,
'metainfo': self.new_flavor_profile.metainfo} 'metainfo': self.new_flavor_profile.meta_info}
) )
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertEqual(self.data, data) self.assertEqual(self.data, data)
@ -103,7 +101,7 @@ class TestCreateFlavorProfile(TestFlavorProfile):
"--project", self.new_flavor_profile.project_id, "--project", self.new_flavor_profile.project_id,
'--project-domain', self.domain.name, '--project-domain', self.domain.name,
"--enable", "--enable",
"--metainfo", self.new_flavor_profile.metainfo, "--metainfo", self.new_flavor_profile.meta_info,
] ]
verifylist = [ verifylist = [
@ -111,7 +109,7 @@ class TestCreateFlavorProfile(TestFlavorProfile):
('project', self.new_flavor_profile.project_id), ('project', self.new_flavor_profile.project_id),
('project_domain', self.domain.name), ('project_domain', self.domain.name),
('enable', True), ('enable', True),
('metainfo', self.new_flavor_profile.metainfo) ('metainfo', self.new_flavor_profile.meta_info)
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -120,8 +118,8 @@ class TestCreateFlavorProfile(TestFlavorProfile):
self.network.create_service_profile.assert_called_once_with( self.network.create_service_profile.assert_called_once_with(
**{'description': self.new_flavor_profile.description, **{'description': self.new_flavor_profile.description,
'project_id': self.project.id, 'project_id': self.project.id,
'enabled': self.new_flavor_profile.enabled, 'enabled': self.new_flavor_profile.is_enabled,
'metainfo': self.new_flavor_profile.metainfo} 'metainfo': self.new_flavor_profile.meta_info}
) )
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertEqual(self.data, data) self.assertEqual(self.data, data)
@ -149,7 +147,7 @@ class TestCreateFlavorProfile(TestFlavorProfile):
self.network.create_service_profile.assert_called_once_with( self.network.create_service_profile.assert_called_once_with(
**{'description': self.new_flavor_profile.description, **{'description': self.new_flavor_profile.description,
'project_id': self.project.id, 'project_id': self.project.id,
'enabled': self.new_flavor_profile.enabled, 'enabled': self.new_flavor_profile.is_enabled,
'driver': self.new_flavor_profile.driver, 'driver': self.new_flavor_profile.driver,
} }
) )
@ -203,14 +201,13 @@ class TestCreateFlavorProfile(TestFlavorProfile):
class TestDeleteFlavorProfile(TestFlavorProfile): class TestDeleteFlavorProfile(TestFlavorProfile):
# The network flavor_profiles to delete. # The network flavor_profiles to delete.
_network_flavor_profiles = ( _network_flavor_profiles = network_fakes.create_service_profile(count=2)
network_fakes.FakeNetworkFlavorProfile.create_service_profile(count=2))
def setUp(self): def setUp(self):
super(TestDeleteFlavorProfile, self).setUp() super(TestDeleteFlavorProfile, self).setUp()
self.network.delete_service_profile = mock.Mock(return_value=None) self.network.delete_service_profile = mock.Mock(return_value=None)
self.network.find_service_profile = ( self.network.find_service_profile = (
network_fakes.FakeNetworkFlavorProfile.get_service_profile( network_fakes.get_service_profile(
flavor_profile=self._network_flavor_profiles) flavor_profile=self._network_flavor_profiles)
) )
@ -290,8 +287,7 @@ class TestDeleteFlavorProfile(TestFlavorProfile):
class TestListFlavorProfile(TestFlavorProfile): class TestListFlavorProfile(TestFlavorProfile):
# The network flavor profiles list # The network flavor profiles list
_network_flavor_profiles = ( _network_flavor_profiles = network_fakes.create_service_profile(count=2)
network_fakes.FakeNetworkFlavorProfile.create_service_profile(count=2))
columns = ( columns = (
'ID', 'ID',
@ -305,8 +301,8 @@ class TestListFlavorProfile(TestFlavorProfile):
data.append(( data.append((
flavor_profile.id, flavor_profile.id,
flavor_profile.driver, flavor_profile.driver,
flavor_profile.enabled, flavor_profile.is_enabled,
flavor_profile.metainfo, flavor_profile.meta_info,
flavor_profile.description, flavor_profile.description,
)) ))
@ -334,22 +330,21 @@ class TestListFlavorProfile(TestFlavorProfile):
class TestShowFlavorProfile(TestFlavorProfile): class TestShowFlavorProfile(TestFlavorProfile):
# The network flavor profile to show. # The network flavor profile to show.
network_flavor_profile = ( network_flavor_profile = network_fakes.create_one_service_profile()
network_fakes.FakeNetworkFlavorProfile.create_one_service_profile())
columns = ( columns = (
'description', 'description',
'driver', 'driver',
'enabled', 'enabled',
'id', 'id',
'metainfo', 'meta_info',
'project_id', 'project_id',
) )
data = ( data = (
network_flavor_profile.description, network_flavor_profile.description,
network_flavor_profile.driver, network_flavor_profile.driver,
network_flavor_profile.enabled, network_flavor_profile.is_enabled,
network_flavor_profile.id, network_flavor_profile.id,
network_flavor_profile.metainfo, network_flavor_profile.meta_info,
network_flavor_profile.project_id, network_flavor_profile.project_id,
) )
@ -382,8 +377,7 @@ class TestShowFlavorProfile(TestFlavorProfile):
class TestSetFlavorProfile(TestFlavorProfile): class TestSetFlavorProfile(TestFlavorProfile):
# The network flavor profile to set. # The network flavor profile to set.
network_flavor_profile = ( network_flavor_profile = network_fakes.create_one_service_profile()
network_fakes.FakeNetworkFlavorProfile.create_one_service_profile())
def setUp(self): def setUp(self):
super(TestSetFlavorProfile, self).setUp() super(TestSetFlavorProfile, self).setUp()

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

@ -44,7 +44,7 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
snp_object = network_fakes.FakeSubnetPool.create_one_subnet_pool() snp_object = network_fakes.FakeSubnetPool.create_one_subnet_pool()
ag_object = network_fakes.create_one_address_group() ag_object = network_fakes.create_one_address_group()
project = identity_fakes_v3.FakeProject.create_one_project() project = identity_fakes_v3.FakeProject.create_one_project()
rbac_policy = network_fakes.FakeNetworkRBAC.create_one_network_rbac( rbac_policy = network_fakes.create_one_network_rbac(
attrs={'project_id': project.id, attrs={'project_id': project.id,
'target_tenant': project.id, 'target_tenant': project.id,
'object_id': network_object.id} 'object_id': network_object.id}
@ -65,7 +65,7 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
rbac_policy.object_id, rbac_policy.object_id,
rbac_policy.object_type, rbac_policy.object_type,
rbac_policy.project_id, rbac_policy.project_id,
rbac_policy.target_tenant, rbac_policy.target_project_id,
] ]
def setUp(self): def setUp(self):
@ -120,13 +120,13 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
arglist = [ arglist = [
'--action', self.rbac_policy.action, '--action', self.rbac_policy.action,
'--type', 'invalid_type', '--type', 'invalid_type',
'--target-project', self.rbac_policy.target_tenant, '--target-project', self.rbac_policy.target_project_id,
self.rbac_policy.object_id, self.rbac_policy.object_id,
] ]
verifylist = [ verifylist = [
('action', self.rbac_policy.action), ('action', self.rbac_policy.action),
('type', 'invalid_type'), ('type', 'invalid_type'),
('target-project', self.rbac_policy.target_tenant), ('target-project', self.rbac_policy.target_project_id),
('rbac_policy', self.rbac_policy.id), ('rbac_policy', self.rbac_policy.id),
] ]
@ -137,13 +137,13 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
arglist = [ arglist = [
'--type', self.rbac_policy.object_type, '--type', self.rbac_policy.object_type,
'--action', 'invalid_action', '--action', 'invalid_action',
'--target-project', self.rbac_policy.target_tenant, '--target-project', self.rbac_policy.target_project_id,
self.rbac_policy.object_id, self.rbac_policy.object_id,
] ]
verifylist = [ verifylist = [
('type', self.rbac_policy.object_type), ('type', self.rbac_policy.object_type),
('action', 'invalid_action'), ('action', 'invalid_action'),
('target-project', self.rbac_policy.target_tenant), ('target-project', self.rbac_policy.target_project_id),
('rbac_policy', self.rbac_policy.id), ('rbac_policy', self.rbac_policy.id),
] ]
@ -154,13 +154,13 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
arglist = [ arglist = [
'--type', self.rbac_policy.object_type, '--type', self.rbac_policy.object_type,
'--action', self.rbac_policy.action, '--action', self.rbac_policy.action,
'--target-project', self.rbac_policy.target_tenant, '--target-project', self.rbac_policy.target_project_id,
self.rbac_policy.object_id, self.rbac_policy.object_id,
] ]
verifylist = [ verifylist = [
('type', self.rbac_policy.object_type), ('type', self.rbac_policy.object_type),
('action', self.rbac_policy.action), ('action', self.rbac_policy.action),
('target_project', self.rbac_policy.target_tenant), ('target_project', self.rbac_policy.target_project_id),
('rbac_object', self.rbac_policy.object_id), ('rbac_object', self.rbac_policy.object_id),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -172,7 +172,7 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
'object_id': self.rbac_policy.object_id, 'object_id': self.rbac_policy.object_id,
'object_type': self.rbac_policy.object_type, 'object_type': self.rbac_policy.object_type,
'action': self.rbac_policy.action, 'action': self.rbac_policy.action,
'target_tenant': self.rbac_policy.target_tenant, 'target_tenant': self.rbac_policy.target_project_id,
}) })
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertEqual(self.data, list(data)) self.assertEqual(self.data, list(data))
@ -205,7 +205,7 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
arglist = [ arglist = [
'--type', self.rbac_policy.object_type, '--type', self.rbac_policy.object_type,
'--action', self.rbac_policy.action, '--action', self.rbac_policy.action,
'--target-project', self.rbac_policy.target_tenant, '--target-project', self.rbac_policy.target_project_id,
'--project', self.rbac_policy.project_id, '--project', self.rbac_policy.project_id,
'--project-domain', self.project.domain_id, '--project-domain', self.project.domain_id,
'--target-project-domain', self.project.domain_id, '--target-project-domain', self.project.domain_id,
@ -214,7 +214,7 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
verifylist = [ verifylist = [
('type', self.rbac_policy.object_type), ('type', self.rbac_policy.object_type),
('action', self.rbac_policy.action), ('action', self.rbac_policy.action),
('target_project', self.rbac_policy.target_tenant), ('target_project', self.rbac_policy.target_project_id),
('project', self.rbac_policy.project_id), ('project', self.rbac_policy.project_id),
('project_domain', self.project.domain_id), ('project_domain', self.project.domain_id),
('target_project_domain', self.project.domain_id), ('target_project_domain', self.project.domain_id),
@ -229,7 +229,7 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
'object_id': self.rbac_policy.object_id, 'object_id': self.rbac_policy.object_id,
'object_type': self.rbac_policy.object_type, 'object_type': self.rbac_policy.object_type,
'action': self.rbac_policy.action, 'action': self.rbac_policy.action,
'target_tenant': self.rbac_policy.target_tenant, 'target_tenant': self.rbac_policy.target_project_id,
'project_id': self.rbac_policy.project_id, 'project_id': self.rbac_policy.project_id,
}) })
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
@ -251,13 +251,13 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
arglist = [ arglist = [
'--type', obj_type, '--type', obj_type,
'--action', self.rbac_policy.action, '--action', self.rbac_policy.action,
'--target-project', self.rbac_policy.target_tenant, '--target-project', self.rbac_policy.target_project_id,
obj_fake.name, obj_fake.name,
] ]
verifylist = [ verifylist = [
('type', obj_type), ('type', obj_type),
('action', self.rbac_policy.action), ('action', self.rbac_policy.action),
('target_project', self.rbac_policy.target_tenant), ('target_project', self.rbac_policy.target_project_id),
('rbac_object', obj_fake.name), ('rbac_object', obj_fake.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -269,7 +269,7 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
'object_id': obj_fake.id, 'object_id': obj_fake.id,
'object_type': obj_type, 'object_type': obj_type,
'action': self.rbac_policy.action, 'action': self.rbac_policy.action,
'target_tenant': self.rbac_policy.target_tenant, 'target_tenant': self.rbac_policy.target_project_id,
}) })
self.data = [ self.data = [
self.rbac_policy.action, self.rbac_policy.action,
@ -277,7 +277,7 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
obj_fake.id, obj_fake.id,
obj_type, obj_type,
self.rbac_policy.project_id, self.rbac_policy.project_id,
self.rbac_policy.target_tenant, self.rbac_policy.target_project_id,
] ]
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertEqual(self.data, list(data)) self.assertEqual(self.data, list(data))
@ -285,13 +285,13 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
class TestDeleteNetworkRBAC(TestNetworkRBAC): class TestDeleteNetworkRBAC(TestNetworkRBAC):
rbac_policies = network_fakes.FakeNetworkRBAC.create_network_rbacs(count=2) rbac_policies = network_fakes.create_network_rbacs(count=2)
def setUp(self): def setUp(self):
super(TestDeleteNetworkRBAC, self).setUp() super(TestDeleteNetworkRBAC, self).setUp()
self.network.delete_rbac_policy = mock.Mock(return_value=None) self.network.delete_rbac_policy = mock.Mock(return_value=None)
self.network.find_rbac_policy = ( self.network.find_rbac_policy = (
network_fakes.FakeNetworkRBAC.get_network_rbacs( network_fakes.get_network_rbacs(
rbac_policies=self.rbac_policies) rbac_policies=self.rbac_policies)
) )
@ -368,7 +368,7 @@ class TestDeleteNetworkRBAC(TestNetworkRBAC):
class TestListNetworkRABC(TestNetworkRBAC): class TestListNetworkRABC(TestNetworkRBAC):
# The network rbac policies going to be listed up. # The network rbac policies going to be listed up.
rbac_policies = network_fakes.FakeNetworkRBAC.create_network_rbacs(count=3) rbac_policies = network_fakes.create_network_rbacs(count=3)
columns = ( columns = (
'ID', 'ID',
@ -470,7 +470,7 @@ class TestListNetworkRABC(TestNetworkRBAC):
class TestSetNetworkRBAC(TestNetworkRBAC): class TestSetNetworkRBAC(TestNetworkRBAC):
project = identity_fakes_v3.FakeProject.create_one_project() project = identity_fakes_v3.FakeProject.create_one_project()
rbac_policy = network_fakes.FakeNetworkRBAC.create_one_network_rbac( rbac_policy = network_fakes.create_one_network_rbac(
attrs={'target_tenant': project.id}) attrs={'target_tenant': project.id})
def setUp(self): def setUp(self):
@ -525,7 +525,7 @@ class TestSetNetworkRBAC(TestNetworkRBAC):
class TestShowNetworkRBAC(TestNetworkRBAC): class TestShowNetworkRBAC(TestNetworkRBAC):
rbac_policy = network_fakes.FakeNetworkRBAC.create_one_network_rbac() rbac_policy = network_fakes.create_one_network_rbac()
columns = ( columns = (
'action', 'action',
@ -542,7 +542,7 @@ class TestShowNetworkRBAC(TestNetworkRBAC):
rbac_policy.object_id, rbac_policy.object_id,
rbac_policy.object_type, rbac_policy.object_type,
rbac_policy.project_id, rbac_policy.project_id,
rbac_policy.target_tenant, rbac_policy.target_project_id,
] ]
def setUp(self): def setUp(self):

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

@ -50,6 +50,7 @@ class TestPort(network_fakes.TestNetworkV2):
'binding_vif_details', 'binding_vif_details',
'binding_vif_type', 'binding_vif_type',
'binding_vnic_type', 'binding_vnic_type',
'created_at',
'data_plane_status', 'data_plane_status',
'description', 'description',
'device_id', 'device_id',
@ -61,6 +62,7 @@ class TestPort(network_fakes.TestNetworkV2):
'extra_dhcp_opts', 'extra_dhcp_opts',
'fixed_ips', 'fixed_ips',
'id', 'id',
'ip_allocation',
'mac_address', 'mac_address',
'name', 'name',
'network_id', 'network_id',
@ -68,21 +70,26 @@ class TestPort(network_fakes.TestNetworkV2):
'port_security_enabled', 'port_security_enabled',
'project_id', 'project_id',
'propagate_uplink_status', 'propagate_uplink_status',
'resource_request',
'revision_number',
'qos_network_policy_id', 'qos_network_policy_id',
'qos_policy_id', 'qos_policy_id',
'security_group_ids', 'security_group_ids',
'status', 'status',
'tags', 'tags',
'trunk_details',
'updated_at',
) )
data = ( data = (
port.AdminStateColumn(fake_port.admin_state_up), port.AdminStateColumn(fake_port.is_admin_state_up),
format_columns.ListDictColumn(fake_port.allowed_address_pairs), format_columns.ListDictColumn(fake_port.allowed_address_pairs),
fake_port.binding_host_id, fake_port.binding_host_id,
format_columns.DictColumn(fake_port.binding_profile), format_columns.DictColumn(fake_port.binding_profile),
format_columns.DictColumn(fake_port.binding_vif_details), format_columns.DictColumn(fake_port.binding_vif_details),
fake_port.binding_vif_type, fake_port.binding_vif_type,
fake_port.binding_vnic_type, fake_port.binding_vnic_type,
fake_port.created_at,
fake_port.data_plane_status, fake_port.data_plane_status,
fake_port.description, fake_port.description,
fake_port.device_id, fake_port.device_id,
@ -94,18 +101,23 @@ class TestPort(network_fakes.TestNetworkV2):
format_columns.ListDictColumn(fake_port.extra_dhcp_opts), format_columns.ListDictColumn(fake_port.extra_dhcp_opts),
format_columns.ListDictColumn(fake_port.fixed_ips), format_columns.ListDictColumn(fake_port.fixed_ips),
fake_port.id, fake_port.id,
fake_port.ip_allocation,
fake_port.mac_address, fake_port.mac_address,
fake_port.name, fake_port.name,
fake_port.network_id, fake_port.network_id,
fake_port.numa_affinity_policy, fake_port.numa_affinity_policy,
fake_port.port_security_enabled, fake_port.is_port_security_enabled,
fake_port.project_id, fake_port.project_id,
fake_port.propagate_uplink_status, fake_port.propagate_uplink_status,
fake_port.resource_request,
fake_port.revision_number,
fake_port.qos_network_policy_id, fake_port.qos_network_policy_id,
fake_port.qos_policy_id, fake_port.qos_policy_id,
format_columns.ListColumn(fake_port.security_group_ids), format_columns.ListColumn(fake_port.security_group_ids),
fake_port.status, fake_port.status,
format_columns.ListColumn(fake_port.tags), format_columns.ListColumn(fake_port.tags),
fake_port.trunk_details,
fake_port.updated_at,
) )
return columns, data return columns, data
@ -113,7 +125,7 @@ class TestPort(network_fakes.TestNetworkV2):
class TestCreatePort(TestPort): class TestCreatePort(TestPort):
_port = network_fakes.FakePort.create_one_port() _port = network_fakes.create_one_port()
columns, data = TestPort._get_common_cols_data(_port) columns, data = TestPort._get_common_cols_data(_port)
def setUp(self): def setUp(self):
@ -152,7 +164,7 @@ class TestCreatePort(TestPort):
}) })
self.assertFalse(self.network.set_tags.called) self.assertFalse(self.network.set_tags.called)
self.assertEqual(self.columns, columns) self.assertEqual(set(self.columns), set(columns))
self.assertCountEqual(self.data, data) self.assertCountEqual(self.data, data)
def test_create_full_options(self): def test_create_full_options(self):
@ -210,7 +222,7 @@ class TestCreatePort(TestPort):
'name': 'test-port', 'name': 'test-port',
}) })
self.assertEqual(self.columns, columns) self.assertEqual(set(self.columns), set(columns))
self.assertCountEqual(self.data, data) self.assertCountEqual(self.data, data)
def test_create_invalid_json_binding_profile(self): def test_create_invalid_json_binding_profile(self):
@ -261,7 +273,7 @@ class TestCreatePort(TestPort):
'name': 'test-port', 'name': 'test-port',
}) })
self.assertEqual(self.columns, columns) self.assertEqual(set(self.columns), set(columns))
self.assertCountEqual(self.data, data) self.assertCountEqual(self.data, data)
def test_create_with_security_group(self): def test_create_with_security_group(self):
@ -290,7 +302,7 @@ class TestCreatePort(TestPort):
'name': 'test-port', 'name': 'test-port',
}) })
self.assertEqual(self.columns, columns) self.assertEqual(set(self.columns), set(columns))
self.assertCountEqual(self.data, data) self.assertCountEqual(self.data, data)
def test_create_port_with_dns_name(self): def test_create_port_with_dns_name(self):
@ -316,7 +328,7 @@ class TestCreatePort(TestPort):
'name': 'test-port', 'name': 'test-port',
}) })
self.assertEqual(self.columns, columns) self.assertEqual(set(self.columns), set(columns))
self.assertCountEqual(self.data, data) self.assertCountEqual(self.data, data)
def test_create_with_security_groups(self): def test_create_with_security_groups(self):
@ -346,7 +358,7 @@ class TestCreatePort(TestPort):
'name': 'test-port', 'name': 'test-port',
}) })
self.assertEqual(self.columns, columns) self.assertEqual(set(self.columns), set(columns))
self.assertCountEqual(self.data, data) self.assertCountEqual(self.data, data)
def test_create_with_no_security_groups(self): def test_create_with_no_security_groups(self):
@ -372,7 +384,7 @@ class TestCreatePort(TestPort):
'name': 'test-port', 'name': 'test-port',
}) })
self.assertEqual(self.columns, columns) self.assertEqual(set(self.columns), set(columns))
self.assertCountEqual(self.data, data) self.assertCountEqual(self.data, data)
def test_create_with_no_fixed_ips(self): def test_create_with_no_fixed_ips(self):
@ -398,7 +410,7 @@ class TestCreatePort(TestPort):
'name': 'test-port', 'name': 'test-port',
}) })
self.assertEqual(self.columns, columns) self.assertEqual(set(self.columns), set(columns))
self.assertCountEqual(self.data, data) self.assertCountEqual(self.data, data)
def test_create_port_with_allowed_address_pair_ipaddr(self): def test_create_port_with_allowed_address_pair_ipaddr(self):
@ -428,7 +440,7 @@ class TestCreatePort(TestPort):
'name': 'test-port', 'name': 'test-port',
}) })
self.assertEqual(self.columns, columns) self.assertEqual(set(self.columns), set(columns))
self.assertCountEqual(self.data, data) self.assertCountEqual(self.data, data)
def test_create_port_with_allowed_address_pair(self): def test_create_port_with_allowed_address_pair(self):
@ -464,7 +476,7 @@ class TestCreatePort(TestPort):
'name': 'test-port', 'name': 'test-port',
}) })
self.assertEqual(self.columns, columns) self.assertEqual(set(self.columns), set(columns))
self.assertCountEqual(self.data, data) self.assertCountEqual(self.data, data)
def test_create_port_with_qos(self): def test_create_port_with_qos(self):
@ -492,7 +504,7 @@ class TestCreatePort(TestPort):
'name': 'test-port', 'name': 'test-port',
}) })
self.assertEqual(self.columns, columns) self.assertEqual(set(self.columns), set(columns))
self.assertCountEqual(self.data, data) self.assertCountEqual(self.data, data)
def test_create_port_security_enabled(self): def test_create_port_security_enabled(self):
@ -601,7 +613,7 @@ class TestCreatePort(TestPort):
else: else:
self.assertFalse(self.network.set_tags.called) self.assertFalse(self.network.set_tags.called)
self.assertEqual(self.columns, columns) self.assertEqual(set(self.columns), set(columns))
self.assertCountEqual(self.data, data) self.assertCountEqual(self.data, data)
def test_create_with_tags(self): def test_create_with_tags(self):
@ -644,7 +656,7 @@ class TestCreatePort(TestPort):
'name': 'test-port', 'name': 'test-port',
}) })
self.assertEqual(self.columns, columns) self.assertEqual(set(self.columns), set(columns))
self.assertCountEqual(self.data, data) self.assertCountEqual(self.data, data)
def test_create_with_uplink_status_propagation_enabled(self): def test_create_with_uplink_status_propagation_enabled(self):
@ -724,7 +736,7 @@ class TestCreatePort(TestPort):
create_args['numa_affinity_policy'] = numa_affinity_policy create_args['numa_affinity_policy'] = numa_affinity_policy
self.network.create_port.assert_called_once_with(**create_args) self.network.create_port.assert_called_once_with(**create_args)
self.assertEqual(self.columns, columns) self.assertEqual(set(self.columns), set(columns))
self.assertCountEqual(self.data, data) self.assertCountEqual(self.data, data)
def test_create_with_numa_affinity_policy_required(self): def test_create_with_numa_affinity_policy_required(self):
@ -763,20 +775,20 @@ class TestCreatePort(TestPort):
'device_profile': 'cyborg_device_profile_1', 'device_profile': 'cyborg_device_profile_1',
} }
self.network.create_port.assert_called_once_with(**create_args) self.network.create_port.assert_called_once_with(**create_args)
self.assertEqual(self.columns, columns) self.assertEqual(set(self.columns), set(columns))
self.assertCountEqual(self.data, data) self.assertCountEqual(self.data, data)
class TestDeletePort(TestPort): class TestDeletePort(TestPort):
# Ports to delete. # Ports to delete.
_ports = network_fakes.FakePort.create_ports(count=2) _ports = network_fakes.create_ports(count=2)
def setUp(self): def setUp(self):
super(TestDeletePort, self).setUp() super(TestDeletePort, self).setUp()
self.network.delete_port = mock.Mock(return_value=None) self.network.delete_port = mock.Mock(return_value=None)
self.network.find_port = network_fakes.FakePort.get_ports( self.network.find_port = network_fakes.get_ports(
ports=self._ports) ports=self._ports)
# Get the command object to test # Get the command object to test
self.cmd = port.DeletePort(self.app, self.namespace) self.cmd = port.DeletePort(self.app, self.namespace)
@ -848,7 +860,7 @@ class TestDeletePort(TestPort):
class TestListPort(TestPort): class TestListPort(TestPort):
_ports = network_fakes.FakePort.create_ports(count=3) _ports = network_fakes.create_ports(count=3)
columns = ( columns = (
'ID', 'ID',
@ -1317,7 +1329,7 @@ class TestListPort(TestPort):
class TestSetPort(TestPort): class TestSetPort(TestPort):
_port = network_fakes.FakePort.create_one_port({'tags': ['green', 'red']}) _port = network_fakes.create_one_port({'tags': ['green', 'red']})
def setUp(self): def setUp(self):
super(TestSetPort, self).setUp() super(TestSetPort, self).setUp()
@ -1345,7 +1357,7 @@ class TestSetPort(TestPort):
self.assertIsNone(result) self.assertIsNone(result)
def test_set_port_fixed_ip(self): def test_set_port_fixed_ip(self):
_testport = network_fakes.FakePort.create_one_port( _testport = network_fakes.create_one_port(
{'fixed_ips': [{'ip_address': '0.0.0.1'}]}) {'fixed_ips': [{'ip_address': '0.0.0.1'}]})
self.network.find_port = mock.Mock(return_value=_testport) self.network.find_port = mock.Mock(return_value=_testport)
arglist = [ arglist = [
@ -1369,7 +1381,7 @@ class TestSetPort(TestPort):
self.assertIsNone(result) self.assertIsNone(result)
def test_set_port_fixed_ip_clear(self): def test_set_port_fixed_ip_clear(self):
_testport = network_fakes.FakePort.create_one_port( _testport = network_fakes.create_one_port(
{'fixed_ips': [{'ip_address': '0.0.0.1'}]}) {'fixed_ips': [{'ip_address': '0.0.0.1'}]})
self.network.find_port = mock.Mock(return_value=_testport) self.network.find_port = mock.Mock(return_value=_testport)
arglist = [ arglist = [
@ -1412,7 +1424,7 @@ class TestSetPort(TestPort):
self.assertIsNone(result) self.assertIsNone(result)
def test_set_port_overwrite_binding_profile(self): def test_set_port_overwrite_binding_profile(self):
_testport = network_fakes.FakePort.create_one_port( _testport = network_fakes.create_one_port(
{'binding_profile': {'lok_i': 'visi_on'}}) {'binding_profile': {'lok_i': 'visi_on'}})
self.network.find_port = mock.Mock(return_value=_testport) self.network.find_port = mock.Mock(return_value=_testport)
arglist = [ arglist = [
@ -1434,7 +1446,7 @@ class TestSetPort(TestPort):
self.assertIsNone(result) self.assertIsNone(result)
def test_overwrite_mac_address(self): def test_overwrite_mac_address(self):
_testport = network_fakes.FakePort.create_one_port( _testport = network_fakes.create_one_port(
{'mac_address': '11:22:33:44:55:66'}) {'mac_address': '11:22:33:44:55:66'})
self.network.find_port = mock.Mock(return_value=_testport) self.network.find_port = mock.Mock(return_value=_testport)
arglist = [ arglist = [
@ -1578,7 +1590,7 @@ class TestSetPort(TestPort):
sg_2 = network_fakes.FakeSecurityGroup.create_one_security_group() sg_2 = network_fakes.FakeSecurityGroup.create_one_security_group()
sg_3 = network_fakes.FakeSecurityGroup.create_one_security_group() sg_3 = network_fakes.FakeSecurityGroup.create_one_security_group()
self.network.find_security_group = mock.Mock(side_effect=[sg_2, sg_3]) self.network.find_security_group = mock.Mock(side_effect=[sg_2, sg_3])
_testport = network_fakes.FakePort.create_one_port( _testport = network_fakes.create_one_port(
{'security_group_ids': [sg_1.id]}) {'security_group_ids': [sg_1.id]})
self.network.find_port = mock.Mock(return_value=_testport) self.network.find_port = mock.Mock(return_value=_testport)
arglist = [ arglist = [
@ -1620,7 +1632,7 @@ class TestSetPort(TestPort):
def test_set_port_security_group_replace(self): def test_set_port_security_group_replace(self):
sg1 = network_fakes.FakeSecurityGroup.create_one_security_group() sg1 = network_fakes.FakeSecurityGroup.create_one_security_group()
sg2 = network_fakes.FakeSecurityGroup.create_one_security_group() sg2 = network_fakes.FakeSecurityGroup.create_one_security_group()
_testport = network_fakes.FakePort.create_one_port( _testport = network_fakes.create_one_port(
{'security_group_ids': [sg1.id]}) {'security_group_ids': [sg1.id]})
self.network.find_port = mock.Mock(return_value=_testport) self.network.find_port = mock.Mock(return_value=_testport)
self.network.find_security_group = mock.Mock(return_value=sg2) self.network.find_security_group = mock.Mock(return_value=sg2)
@ -1662,7 +1674,7 @@ class TestSetPort(TestPort):
self.assertIsNone(result) self.assertIsNone(result)
def test_set_port_append_allowed_address_pair(self): def test_set_port_append_allowed_address_pair(self):
_testport = network_fakes.FakePort.create_one_port( _testport = network_fakes.create_one_port(
{'allowed_address_pairs': [{'ip_address': '192.168.1.123'}]}) {'allowed_address_pairs': [{'ip_address': '192.168.1.123'}]})
self.network.find_port = mock.Mock(return_value=_testport) self.network.find_port = mock.Mock(return_value=_testport)
arglist = [ arglist = [
@ -1685,7 +1697,7 @@ class TestSetPort(TestPort):
self.assertIsNone(result) self.assertIsNone(result)
def test_set_port_overwrite_allowed_address_pair(self): def test_set_port_overwrite_allowed_address_pair(self):
_testport = network_fakes.FakePort.create_one_port( _testport = network_fakes.create_one_port(
{'allowed_address_pairs': [{'ip_address': '192.168.1.123'}]}) {'allowed_address_pairs': [{'ip_address': '192.168.1.123'}]})
self.network.find_port = mock.Mock(return_value=_testport) self.network.find_port = mock.Mock(return_value=_testport)
arglist = [ arglist = [
@ -1787,7 +1799,7 @@ class TestSetPort(TestPort):
def test_set_port_with_qos(self): def test_set_port_with_qos(self):
qos_policy = network_fakes.FakeNetworkQosPolicy.create_one_qos_policy() qos_policy = network_fakes.FakeNetworkQosPolicy.create_one_qos_policy()
self.network.find_qos_policy = mock.Mock(return_value=qos_policy) self.network.find_qos_policy = mock.Mock(return_value=qos_policy)
_testport = network_fakes.FakePort.create_one_port( _testport = network_fakes.create_one_port(
{'qos_policy_id': None}) {'qos_policy_id': None})
self.network.find_port = mock.Mock(return_value=_testport) self.network.find_port = mock.Mock(return_value=_testport)
arglist = [ arglist = [
@ -1809,7 +1821,7 @@ class TestSetPort(TestPort):
self.assertIsNone(result) self.assertIsNone(result)
def test_set_port_data_plane_status(self): def test_set_port_data_plane_status(self):
_testport = network_fakes.FakePort.create_one_port( _testport = network_fakes.create_one_port(
{'data_plane_status': None}) {'data_plane_status': None})
self.network.find_port = mock.Mock(return_value=_testport) self.network.find_port = mock.Mock(return_value=_testport)
arglist = [ arglist = [
@ -1900,7 +1912,7 @@ class TestSetPort(TestPort):
class TestShowPort(TestPort): class TestShowPort(TestPort):
# The port to show. # The port to show.
_port = network_fakes.FakePort.create_one_port() _port = network_fakes.create_one_port()
columns, data = TestPort._get_common_cols_data(_port) columns, data = TestPort._get_common_cols_data(_port)
def setUp(self): def setUp(self):
@ -1932,7 +1944,7 @@ class TestShowPort(TestPort):
self.network.find_port.assert_called_once_with( self.network.find_port.assert_called_once_with(
self._port.name, ignore_missing=False) self._port.name, ignore_missing=False)
self.assertEqual(self.columns, columns) self.assertEqual(set(self.columns), set(columns))
self.assertCountEqual(self.data, data) self.assertCountEqual(self.data, data)
@ -1940,7 +1952,7 @@ class TestUnsetPort(TestPort):
def setUp(self): def setUp(self):
super(TestUnsetPort, self).setUp() super(TestUnsetPort, self).setUp()
self._testport = network_fakes.FakePort.create_one_port( self._testport = network_fakes.create_one_port(
{'fixed_ips': [{'subnet_id': '042eb10a-3a18-4658-ab-cf47c8d03152', {'fixed_ips': [{'subnet_id': '042eb10a-3a18-4658-ab-cf47c8d03152',
'ip_address': '0.0.0.1'}, 'ip_address': '0.0.0.1'},
{'subnet_id': '042eb10a-3a18-4658-ab-cf47c8d03152', {'subnet_id': '042eb10a-3a18-4658-ab-cf47c8d03152',
@ -2024,7 +2036,7 @@ class TestUnsetPort(TestPort):
def test_unset_security_group(self): def test_unset_security_group(self):
_fake_sg1 = network_fakes.FakeSecurityGroup.create_one_security_group() _fake_sg1 = network_fakes.FakeSecurityGroup.create_one_security_group()
_fake_sg2 = network_fakes.FakeSecurityGroup.create_one_security_group() _fake_sg2 = network_fakes.FakeSecurityGroup.create_one_security_group()
_fake_port = network_fakes.FakePort.create_one_port( _fake_port = network_fakes.create_one_port(
{'security_group_ids': [_fake_sg1.id, _fake_sg2.id]}) {'security_group_ids': [_fake_sg1.id, _fake_sg2.id]})
self.network.find_port = mock.Mock(return_value=_fake_port) self.network.find_port = mock.Mock(return_value=_fake_port)
self.network.find_security_group = mock.Mock(return_value=_fake_sg2) self.network.find_security_group = mock.Mock(return_value=_fake_sg2)
@ -2049,7 +2061,7 @@ class TestUnsetPort(TestPort):
def test_unset_port_security_group_not_existent(self): def test_unset_port_security_group_not_existent(self):
_fake_sg1 = network_fakes.FakeSecurityGroup.create_one_security_group() _fake_sg1 = network_fakes.FakeSecurityGroup.create_one_security_group()
_fake_sg2 = network_fakes.FakeSecurityGroup.create_one_security_group() _fake_sg2 = network_fakes.FakeSecurityGroup.create_one_security_group()
_fake_port = network_fakes.FakePort.create_one_port( _fake_port = network_fakes.create_one_port(
{'security_group_ids': [_fake_sg1.id]}) {'security_group_ids': [_fake_sg1.id]})
self.network.find_security_group = mock.Mock(return_value=_fake_sg2) self.network.find_security_group = mock.Mock(return_value=_fake_sg2)
arglist = [ arglist = [
@ -2066,7 +2078,7 @@ class TestUnsetPort(TestPort):
parsed_args) parsed_args)
def test_unset_port_allowed_address_pair(self): def test_unset_port_allowed_address_pair(self):
_fake_port = network_fakes.FakePort.create_one_port( _fake_port = network_fakes.create_one_port(
{'allowed_address_pairs': [{'ip_address': '192.168.1.123'}]}) {'allowed_address_pairs': [{'ip_address': '192.168.1.123'}]})
self.network.find_port = mock.Mock(return_value=_fake_port) self.network.find_port = mock.Mock(return_value=_fake_port)
arglist = [ arglist = [
@ -2088,7 +2100,7 @@ class TestUnsetPort(TestPort):
self.assertIsNone(result) self.assertIsNone(result)
def test_unset_port_allowed_address_pair_not_existent(self): def test_unset_port_allowed_address_pair_not_existent(self):
_fake_port = network_fakes.FakePort.create_one_port( _fake_port = network_fakes.create_one_port(
{'allowed_address_pairs': [{'ip_address': '192.168.1.123'}]}) {'allowed_address_pairs': [{'ip_address': '192.168.1.123'}]})
self.network.find_port = mock.Mock(return_value=_fake_port) self.network.find_port = mock.Mock(return_value=_fake_port)
arglist = [ arglist = [
@ -2105,7 +2117,7 @@ class TestUnsetPort(TestPort):
parsed_args) parsed_args)
def test_unset_port_data_plane_status(self): def test_unset_port_data_plane_status(self):
_fake_port = network_fakes.FakePort.create_one_port( _fake_port = network_fakes.create_one_port(
{'data_plane_status': 'ACTIVE'}) {'data_plane_status': 'ACTIVE'})
self.network.find_port = mock.Mock(return_value=_fake_port) self.network.find_port = mock.Mock(return_value=_fake_port)
arglist = [ arglist = [
@ -2156,7 +2168,7 @@ class TestUnsetPort(TestPort):
self._test_unset_tags(with_tags=False) self._test_unset_tags(with_tags=False)
def test_unset_numa_affinity_policy(self): def test_unset_numa_affinity_policy(self):
_fake_port = network_fakes.FakePort.create_one_port( _fake_port = network_fakes.create_one_port(
{'numa_affinity_policy': 'required'}) {'numa_affinity_policy': 'required'})
self.network.find_port = mock.Mock(return_value=_fake_port) self.network.find_port = mock.Mock(return_value=_fake_port)
arglist = [ arglist = [

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

@ -36,7 +36,7 @@ class TestRouter(network_fakes.TestNetworkV2):
class TestAddPortToRouter(TestRouter): class TestAddPortToRouter(TestRouter):
'''Add port to Router ''' '''Add port to Router '''
_port = network_fakes.FakePort.create_one_port() _port = network_fakes.create_one_port()
_router = network_fakes.FakeRouter.create_one_router( _router = network_fakes.FakeRouter.create_one_router(
attrs={'port': _port.id}) attrs={'port': _port.id})
@ -512,8 +512,7 @@ class TestListRouter(TestRouter):
self.network.routers = mock.Mock(return_value=self.routers) self.network.routers = mock.Mock(return_value=self.routers)
self.network.find_extension = mock.Mock(return_value=self._extensions) self.network.find_extension = mock.Mock(return_value=self._extensions)
self.network.find_router = mock.Mock(return_value=self.routers[0]) self.network.find_router = mock.Mock(return_value=self.routers[0])
self._testagent = \ self._testagent = network_fakes.create_one_network_agent()
network_fakes.FakeNetworkAgent.create_one_network_agent()
self.network.get_agent = mock.Mock(return_value=self._testagent) self.network.get_agent = mock.Mock(return_value=self._testagent)
self.network.get_router = mock.Mock(return_value=self.routers[0]) self.network.get_router = mock.Mock(return_value=self.routers[0])
@ -739,7 +738,7 @@ class TestListRouter(TestRouter):
class TestRemovePortFromRouter(TestRouter): class TestRemovePortFromRouter(TestRouter):
'''Remove port from a Router ''' '''Remove port from a Router '''
_port = network_fakes.FakePort.create_one_port() _port = network_fakes.create_one_port()
_router = network_fakes.FakeRouter.create_one_router( _router = network_fakes.FakeRouter.create_one_router(
attrs={'port': _port.id}) attrs={'port': _port.id})
@ -1364,7 +1363,7 @@ class TestShowRouter(TestRouter):
# The router to set. # The router to set.
_router = network_fakes.FakeRouter.create_one_router() _router = network_fakes.FakeRouter.create_one_router()
_port = network_fakes.FakePort.create_one_port({ _port = network_fakes.create_one_port({
'device_owner': 'network:router_interface', 'device_owner': 'network:router_interface',
'device_id': _router.id 'device_id': _router.id
}) })