openstack/tempest
Code Issues Proposed changes

Network scenarios: remove some instance variables

Browse Source 
In the patch, I removed some instance variables in some network
scenarios: self.security_group, self.network_v6, self.network.

We still have a lot of instance variables, which is a major reason
why reviewing network scenarios is an absolute pain. But this
is a small step in the right direction.

Change-Id: I482a06a6592bf1b402d1faf5e78c1be17f05b6b1
This commit is contained in:
Jordan Pittier 2017-02-21 18:11:55 +01:00
parent 6b3d13555f
commit 37b94a05a1
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tempest/scenario/test_network_basic_ops.py
View File

@ -104,7 +104,6 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
def _setup_network_and_servers(self, **kwargs): def _setup_network_and_servers(self, **kwargs):
boot_with_port = kwargs.pop('boot_with_port', False) boot_with_port = kwargs.pop('boot_with_port', False)
self.security_group = self._create_security_group()
self.network, self.subnet, self.router = self.create_networks(**kwargs) self.network, self.subnet, self.router = self.create_networks(**kwargs)
self.check_networks() self.check_networks()
@ -152,7 +151,9 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
def _create_server(self, network, port_id=None): def _create_server(self, network, port_id=None):
keypair = self.create_keypair() keypair = self.create_keypair()
self.keypairs[keypair['name']] = keypair self.keypairs[keypair['name']] = keypair
security_groups = [{'name': self.security_group['name']}] security_groups = [
{'name': self._create_security_group()['name']}
]
network = {'uuid': network['id']} network = {'uuid': network['id']}
if port_id is not None: if port_id is not None:
network['port'] = port_id network['port'] = port_id

25
tempest/scenario/test_network_v6.py
View File

@ -72,11 +72,11 @@ class TestGettingAddress(manager.NetworkScenarioTest):
if dualnet - create IPv6 subnets on a different network if dualnet - create IPv6 subnets on a different network
:return: list of created networks :return: list of created networks
""" """
self.network = self._create_network() network = self._create_network()
if dualnet: if dualnet:
self.network_v6 = self._create_network() network_v6 = self._create_network()
sub4 = self._create_subnet(network=self.network, sub4 = self._create_subnet(network=network,
namestart='sub4', namestart='sub4',
ip_version=4) ip_version=4)
@ -90,7 +90,7 @@ class TestGettingAddress(manager.NetworkScenarioTest):
self.subnets_v6 = [] self.subnets_v6 = []
for _ in range(n_subnets6): for _ in range(n_subnets6):
net6 = self.network_v6 if dualnet else self.network net6 = network_v6 if dualnet else network
sub6 = self._create_subnet(network=net6, sub6 = self._create_subnet(network=net6,
namestart='sub6', namestart='sub6',
ip_version=6, ip_version=6,
@ -105,7 +105,7 @@ class TestGettingAddress(manager.NetworkScenarioTest):
router['id'], subnet_id=sub6['id']) router['id'], subnet_id=sub6['id'])
self.subnets_v6.append(sub6) self.subnets_v6.append(sub6)
return [self.network, self.network_v6] if dualnet else [self.network] return [network, network_v6] if dualnet else [network]
@staticmethod @staticmethod
def define_server_ips(srv): def define_server_ips(srv):
@ -121,8 +121,6 @@ class TestGettingAddress(manager.NetworkScenarioTest):
def prepare_server(self, networks=None): def prepare_server(self, networks=None):
username = CONF.validation.image_ssh_user username = CONF.validation.image_ssh_user
networks = networks or [self.network]
srv = self.create_server( srv = self.create_server(
key_name=self.keypair['name'], key_name=self.keypair['name'],
security_groups=[{'name': self.sec_grp['name']}], security_groups=[{'name': self.sec_grp['name']}],
@ -134,7 +132,7 @@ class TestGettingAddress(manager.NetworkScenarioTest):
username=username) username=username)
return ssh, ips, srv["id"] return ssh, ips, srv["id"]
def turn_nic6_on(self, ssh, sid): def turn_nic6_on(self, ssh, sid, network_id):
"""Turns the IPv6 vNIC on """Turns the IPv6 vNIC on
Required because guest images usually set only the first vNIC on boot. Required because guest images usually set only the first vNIC on boot.
@ -142,16 +140,18 @@ class TestGettingAddress(manager.NetworkScenarioTest):
@param ssh: RemoteClient ssh instance to server @param ssh: RemoteClient ssh instance to server
@param sid: server uuid @param sid: server uuid
@param network_id: the network id the NIC is connected to
""" """
ports = [ ports = [
p["mac_address"] for p in p["mac_address"] for p in
self.admin_manager.ports_client.list_ports( self.admin_manager.ports_client.list_ports(
device_id=sid, network_id=self.network_v6['id'])['ports'] device_id=sid, network_id=network_id)['ports']
] ]
self.assertEqual(1, len(ports), self.assertEqual(1, len(ports),
message=("Multiple IPv6 ports found on network %s. " message=("Multiple IPv6 ports found on network %s. "
"ports: %s") "ports: %s")
% (self.network_v6, ports)) % (network_id, ports))
mac6 = ports[0] mac6 = ports[0]
ssh.set_nic_state(ssh.get_nic_name_by_mac(mac6)) ssh.set_nic_state(ssh.get_nic_name_by_mac(mac6))
@ -168,8 +168,9 @@ class TestGettingAddress(manager.NetworkScenarioTest):
# Turn on 2nd NIC for Cirros when dualnet # Turn on 2nd NIC for Cirros when dualnet
if dualnet: if dualnet:
self.turn_nic6_on(sshv4_1, sid1) network, network_v6 = net_list
self.turn_nic6_on(sshv4_2, sid2) self.turn_nic6_on(sshv4_1, sid1, network_v6['id'])
self.turn_nic6_on(sshv4_2, sid2, network_v6['id'])
# get addresses assigned to vNIC as reported by 'ip address' utility # get addresses assigned to vNIC as reported by 'ip address' utility
ips_from_ip_1 = sshv4_1.exec_command("ip address") ips_from_ip_1 = sshv4_1.exec_command("ip address")