openstack
/
tempest
Code Issues Proposed changes

Add extra_msg and server parameter to check_vm_connectivity 

Now manager.check_public_network_connectivity just adds log ex_msg
and log console output based on check_vm_connectivity, and the same
helper name also exists in TestNetworkBasicOps, so this is to:
1. add extra_msg and server parameter to manager.check_vm_connectivity, so
   it can log extra_msg and log console output.
2. add server parameter to manager.ping_ip_address, so it can log console
   output for the specific server while not self.servers, because in its
   use cases only the server owning the ip address is needed for console output.
3. add underscore before TestNetworkBasicOps.check_public_network_connectivity
   because it is an internal helper, and replace its calling super's
   check_public_network_connectivity with calling self.check_vm_connectivity
4. remove manager.check_public_network_connectivity

Change-Id: Ibe8966cabbb2c9264640ba3f559a0146be588aa0
This commit is contained in:
zhufl 2017-11-15 14:02:28 +08:00 committed by Felipe Monteiro
parent f5b034da57
commit 0ec74c4017
3 changed files with 57 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tempest/scenario/manager.py
View File

@ -543,7 +543,7 @@ class ScenarioTest(tempest.test.BaseTestCase):
volume['id'], 'available')
def ping_ip_address(self, ip_address, should_succeed=True,
ping_timeout=None, mtu=None):
ping_timeout=None, mtu=None, server=None):
timeout = ping_timeout or CONF.validation.ping_timeout
cmd = ['ping', '-c1', '-w1']
@ -577,12 +577,16 @@ class ScenarioTest(tempest.test.BaseTestCase):
'caller': caller, 'ip': ip_address, 'timeout': timeout,
'result': 'expected' if result else 'unexpected'
})
if server:
self._log_console_output([server])
return result
def check_vm_connectivity(self, ip_address,
username=None,
private_key=None,
should_connect=True,
extra_msg="",
server=None,
mtu=None):
"""Check server connectivity
@ -592,43 +596,36 @@ class ScenarioTest(tempest.test.BaseTestCase):
:param should_connect: True/False indicates positive/negative test
positive - attempt ping and ssh
negative - attempt ping and fail if succeed
:param extra_msg: Message to help with debugging if ``ping_ip_address``
fails
:param server: The server whose console to log for debugging
:param mtu: network MTU to use for connectivity validation
:raises: AssertError if the result of the connectivity check does
not match the value of the should_connect param
"""
LOG.debug('checking network connections to IP %s with user: %s',
ip_address, username)
if should_connect:
msg = "Timed out waiting for %s to become reachable" % ip_address
else:
msg = "ip address %s is reachable" % ip_address
if extra_msg:
msg = "%s\n%s" % (extra_msg, msg)
self.assertTrue(self.ping_ip_address(ip_address,
should_succeed=should_connect,
mtu=mtu),
mtu=mtu, server=server),
msg=msg)
if should_connect:
# no need to check ssh for negative connectivity
self.get_remote_client(ip_address, username, private_key)
def check_public_network_connectivity(self, ip_address, username,
private_key, should_connect=True,
msg=None, servers=None, mtu=None):
# The target login is assumed to have been configured for
# key-based authentication by cloud-init.
LOG.debug('checking network connections to IP %s with user: %s',
ip_address, username)
try:
self.check_vm_connectivity(ip_address,
username,
private_key,
should_connect=should_connect,
mtu=mtu)
except Exception:
ex_msg = 'Public network connectivity check failed'
if msg:
ex_msg += ": " + msg
LOG.exception(ex_msg)
self._log_console_output(servers)
raise
try:
self.get_remote_client(ip_address, username, private_key,
server=server)
except Exception:
if not extra_msg:
extra_msg = 'Failed to ssh to %s' % ip_address
LOG.exception(extra_msg)
raise
def create_floating_ip(self, thing, pool_name=None):
"""Create a floating IP and associates to a server on Nova"""

7
tempest/scenario/test_network_advanced_server_ops.py
View File

@ -90,9 +90,10 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest):
floating_ip_addr = floating_ip['floating_ip_address']
# Check FloatingIP status before checking the connectivity
self.check_floating_ip_status(floating_ip, 'ACTIVE')
self.check_public_network_connectivity(floating_ip_addr, username,
private_key, should_connect,
servers=[server])
self.check_vm_connectivity(floating_ip_addr, username,
private_key, should_connect,
'Public network connectivity check failed',
server)
def _wait_server_status_and_check_network_connectivity(self, server,
keypair,

59
tempest/scenario/test_network_basic_ops.py
View File

@ -175,7 +175,7 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
def _get_server_key(self, server):
return self.keypairs[server['key_name']]['private_key']
def check_public_network_connectivity(
def _check_public_network_connectivity(
self, should_connect=True, msg=None,
should_check_floating_ip_status=True, mtu=None):
"""Verifies connectivty to a VM via public network and floating IP
@ -199,13 +199,18 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
if should_connect:
private_key = self._get_server_key(server)
floatingip_status = 'ACTIVE'
# Check FloatingIP Status before initiating a connection
if should_check_floating_ip_status:
self.check_floating_ip_status(floating_ip, floatingip_status)
# call the common method in the parent class
super(TestNetworkBasicOps, self).check_public_network_connectivity(
ip_address, ssh_login, private_key, should_connect, msg,
self.servers, mtu=mtu)
message = 'Public network connectivity check failed'
if msg:
message += '. Reason: %s' % msg
self.check_vm_connectivity(
ip_address, ssh_login, private_key, should_connect,
message, server, mtu=mtu)
def _disassociate_floating_ips(self):
floating_ip, _ = self.floating_ip_tuple
@ -404,17 +409,17 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
"""
self._setup_network_and_servers()
self.check_public_network_connectivity(should_connect=True)
self._check_public_network_connectivity(should_connect=True)
self._check_network_internal_connectivity(network=self.network)
self._check_network_external_connectivity()
self._disassociate_floating_ips()
self.check_public_network_connectivity(should_connect=False,
msg="after disassociate "
"floating ip")
self._check_public_network_connectivity(should_connect=False,
msg="after disassociate "
"floating ip")
self._reassociate_floating_ips()
self.check_public_network_connectivity(should_connect=True,
msg="after re-associate "
"floating ip")
self._check_public_network_connectivity(should_connect=True,
msg="after re-associate "
"floating ip")
@decorators.idempotent_id('b158ea55-472e-4086-8fa9-c64ac0c6c1d0')
@testtools.skipUnless(utils.is_extension_enabled('net-mtu', 'network'),
@ -425,10 +430,10 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
"""Validate that network MTU sized frames fit through."""
self._setup_network_and_servers()
# first check that connectivity works in general for the instance
self.check_public_network_connectivity(should_connect=True)
self._check_public_network_connectivity(should_connect=True)
# now that we checked general connectivity, test that full size frames
# can also pass between nodes
self.check_public_network_connectivity(
self._check_public_network_connectivity(
should_connect=True, mtu=self.network['mtu'])
@decorators.idempotent_id('1546850e-fbaa-42f5-8b5f-03d8a6a95f15')
@ -468,7 +473,7 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
"""
self._setup_network_and_servers()
self.check_public_network_connectivity(should_connect=True)
self._check_public_network_connectivity(should_connect=True)
self._check_network_internal_connectivity(network=self.network)
self._check_network_external_connectivity()
self._create_new_network(create_gateway=True)
@ -503,7 +508,7 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
"""
self._setup_network_and_servers()
self.check_public_network_connectivity(should_connect=True)
self._check_public_network_connectivity(should_connect=True)
self._create_new_network()
self._hotplug_server()
self._check_network_internal_connectivity(network=self.new_net)
@ -525,19 +530,19 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
admin_state_up attribute of router to True
"""
self._setup_network_and_servers()
self.check_public_network_connectivity(
self._check_public_network_connectivity(
should_connect=True, msg="before updating "
"admin_state_up of router to False")
self._update_router_admin_state(self.router, False)
# TODO(alokmaurya): Remove should_check_floating_ip_status=False check
# once bug 1396310 is fixed
self.check_public_network_connectivity(
self._check_public_network_connectivity(
should_connect=False, msg="after updating "
"admin_state_up of router to False",
should_check_floating_ip_status=False)
self._update_router_admin_state(self.router, True)
self.check_public_network_connectivity(
self._check_public_network_connectivity(
should_connect=True, msg="after updating "
"admin_state_up of router to True")
@ -582,7 +587,7 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
renew_timeout = CONF.network.build_timeout
self._setup_network_and_servers(dns_nameservers=[initial_dns_server])
self.check_public_network_connectivity(should_connect=True)
self._check_public_network_connectivity(should_connect=True)
floating_ip, server = self.floating_ip_tuple
ip_address = floating_ip['floating_ip_address']
@ -657,20 +662,20 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
private_key=private_key,
server=server2)
self.check_public_network_connectivity(
self._check_public_network_connectivity(
should_connect=True, msg="before updating "
"admin_state_up of instance port to False")
self.check_remote_connectivity(ssh_client, dest=server_pip,
should_succeed=True)
self.ports_client.update_port(port_id, admin_state_up=False)
self.check_public_network_connectivity(
self._check_public_network_connectivity(
should_connect=False, msg="after updating "
"admin_state_up of instance port to False",
should_check_floating_ip_status=False)
self.check_remote_connectivity(ssh_client, dest=server_pip,
should_succeed=False)
self.ports_client.update_port(port_id, admin_state_up=True)
self.check_public_network_connectivity(
self._check_public_network_connectivity(
should_connect=True, msg="after updating "
"admin_state_up of instance port to True")
self.check_remote_connectivity(ssh_client, dest=server_pip,
@ -767,7 +772,7 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
msg = "Rescheduling test does not apply to distributed routers."
raise self.skipException(msg)
self.check_public_network_connectivity(should_connect=True)
self._check_public_network_connectivity(should_connect=True)
# remove resource from agents
hosting_agents = set(a["id"] for a in
@ -784,7 +789,7 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
'unscheduling router failed')
# verify resource is un-functional
self.check_public_network_connectivity(
self._check_public_network_connectivity(
should_connect=False,
msg='after router unscheduling',
)
@ -801,7 +806,7 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
"target agent")
# verify resource is functional
self.check_public_network_connectivity(
self._check_public_network_connectivity(
should_connect=True,
msg='After router rescheduling')
@ -835,7 +840,7 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
# Create server
self._setup_network_and_servers()
self.check_public_network_connectivity(should_connect=True)
self._check_public_network_connectivity(should_connect=True)
self._create_new_network()
self._hotplug_server()
fip, server = self.floating_ip_tuple