Boot a VM to run juju

[functest.git] / functest / opnfv_tests / openstack / vping / vping_ssh.py

diff --git a/functest/opnfv_tests/openstack/vping/vping_ssh.py b/functest/opnfv_tests/openstack/vping/vping_ssh.py
index 1fd2d97..a7bbfc2 100644 (file)
--- a/functest/opnfv_tests/openstack/vping/vping_ssh.py
+++ b/functest/opnfv_tests/openstack/vping/vping_ssh.py
@@ -44,14 +44,20 @@ class VPingSSH(singlevm.SingleVm2):
         Returns: ping exit codes
         """
         assert self.ssh
-        (_, stdout, _) = self.ssh.exec_command(
-            'ping -c 1 ' + self.vm2.private_v4)
-        self.__logger.debug("output:\n%s", stdout.read())
+        if not self.check_regex_in_console(self.vm2.name):
+            return 1
+        (_, stdout, stderr) = self.ssh.exec_command(
+            'ping -c 1 {}'.format(
+                self.vm2.private_v4 or self.vm2.addresses[
+                    self.network.name][0].addr))
+        self.__logger.info("output:\n%s", stdout.read().decode("utf-8"))
+        self.__logger.info("error:\n%s", stderr.read().decode("utf-8"))
         return stdout.channel.recv_exit_status()
 
     def clean(self):
         assert self.cloud
-        self.cloud.delete_server(
-            self.vm2, wait=True,
-            timeout=getattr(config.CONF, 'vping_vm_delete_timeout'))
+        if self.vm2:
+            self.cloud.delete_server(
+                self.vm2, wait=True,
+                timeout=getattr(config.CONF, 'vping_vm_delete_timeout'))
         super(VPingSSH, self).clean()