openstack
/
tempest
Code Issues Proposed changes

Merge "Refactor of _check_tenant_network_connectivity"

This commit is contained in:
Zuul 2017-10-26 02:41:12 +00:00 committed by Gerrit Code Review
parent 1d8dfec13d 420a019037
commit ac0c19d39c
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tempest/scenario/manager.py
View File

@ -859,11 +859,11 @@ class NetworkScenarioTest(ScenarioTest):
LOG.info("FloatingIP: {fp} is at status: {st}"
.format(fp=floating_ip, st=status))
def _check_tenant_network_connectivity(self, server,
username,
private_key,
should_connect=True,
servers_for_debug=None):
def check_tenant_network_connectivity(self, server,
username,
private_key,
should_connect=True,
servers_for_debug=None):
if not CONF.network.project_networks_reachable:
msg = 'Tenant networks not configured to be reachable.'
LOG.info(msg)

2
tempest/scenario/test_network_advanced_server_ops.py
View File

@ -83,7 +83,7 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest):
should_connect=True):
username = CONF.validation.image_ssh_user
private_key = keypair['private_key']
self._check_tenant_network_connectivity(
self.check_tenant_network_connectivity(
server, username, private_key,
should_connect=should_connect,
servers_for_debug=[server])

16
tempest/scenario/test_network_basic_ops.py
View File

@ -117,7 +117,12 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
self.ports.append({'port': port_id})
server = self._create_server(self.network, port_id)
self._check_tenant_network_connectivity()
ssh_login = CONF.validation.image_ssh_user
for server in self.servers:
# call the common method in the parent class
self.check_tenant_network_connectivity(
server, ssh_login, self._get_server_key(server),
servers_for_debug=self.servers)
floating_ip = self.create_floating_ip(server)
self.floating_ip_tuple = Floating_IP_tuple(floating_ip, server)
@ -170,15 +175,6 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
def _get_server_key(self, server):
return self.keypairs[server['key_name']]['private_key']
def _check_tenant_network_connectivity(self):
ssh_login = CONF.validation.image_ssh_user
for server in self.servers:
# call the common method in the parent class
super(TestNetworkBasicOps, self).\
_check_tenant_network_connectivity(
server, ssh_login, self._get_server_key(server),
servers_for_debug=self.servers)
def check_public_network_connectivity(
self, should_connect=True, msg=None,
should_check_floating_ip_status=True, mtu=None):