openstack
/
fuel-ostf
Code Issues Proposed changes

Merge "Revert "Increase the count of ping probes"" into stable/5.0

This commit is contained in:
Jenkins 2014-05-26 23:29:23 +00:00 committed by Gerrit Code Review
parent 89bbddb781 ae0e731b5d
commit a8b7660082
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuel_health/nmanager.py
View File

@ -540,7 +540,8 @@ class NovaNetworkScenarioTest(OfficialClientTest):
def _ping_ip_address(self, ip_address, timeout, retries):
def ping():
cmd = "ping -q -c3 -w10 %s" % ip_address
cmd = "ping -q -c3 -w3 %s | grep 'received' |" \
" grep -v '0 packets received'" % ip_address
if self.host:
try:
@ -581,7 +582,8 @@ class NovaNetworkScenarioTest(OfficialClientTest):
except Exception as exc:
LOG.debug(traceback.format_exc())
command = "ping -q -c3 -w10 8.8.8.8"
command = "ping -q -c3 -w3 8.8.8.8 | grep 'received' |" \
" grep -v '0 packets received'"
return self.retry_command(retries[0], retries[1],
ssh.exec_command_on_vm,

3
fuel_health/tests/sanity/test_sanity_infrastructure.py
View File

@ -92,7 +92,8 @@ class SanityInfrastructureTest(nmanager.SanityChecksTest):
if not self.computes:
self.fail('There are no compute nodes')
cmd = "ping -q -c3 -w10 8.8.8.8"
cmd = "ping -q -c3 -w3 8.8.8.8 | grep 'received' |" \
" grep -v '0 received'"
ssh_client = SSHClient(self.computes[0],
self.usr,

8
fuel_health/tests/smoke/test_nova_create_instance_with_connectivity.py
View File

@ -224,16 +224,16 @@ class TestNovaNetwork(nmanager.NovaNetworkScenarioTest):
LOG.info('is address is {0}'.format(ip_address))
LOG.debug(ip_address)
self.verify(400, self._check_vm_connectivity, 5,
self.verify(250, self._check_vm_connectivity, 5,
"VM connectivity doesn`t function properly.",
'VM connectivity checking', ip_address,
30, (6, 60))
30, (6, 30))
self.verify(400, self._check_connectivity_from_vm,
self.verify(250, self._check_connectivity_from_vm,
6, ("Connectivity to 8.8.8.8 from the VM doesn`t "
"function properly."),
'public connectivity checking from VM', ip_address,
30, (6, 60))
30, (6, 30))
self.verify(10, self.compute_client.servers.remove_floating_ip,
7, "Floating IP cannot be removed.",