Precise vyos_vrouter logs

Aborting was written even if it worked after rebooting the vm [1].

[1] https://build.opnfv.org/ci/view/functest/job/functest-daisy-baremetal-daily-master/41/console

Change-Id: Idb29624b8793df5d77d401b375aa3b3176778ddf
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 99b72c34e92c567a47ebc3b977c7aaa290fef6de)

diff --git a/functest/opnfv_tests/vnf/router/vnf_controller/ssh_client.py b/functest/opnfv_tests/vnf/router/vnf_controller/ssh_client.py
index 628afd3..c5f554c 100644 (file)
--- a/functest/opnfv_tests/vnf/router/vnf_controller/ssh_client.py
+++ b/functest/opnfv_tests/vnf/router/vnf_controller/ssh_client.py
@@ -80,9 +80,8 @@ class SshClient(object):  # pylint: disable=too-many-instance-attributes
                 retrycount -= 1
 
         if retrycount == 0:
-            self.logger.error("Cannot establish connection to IP '%s'. " +
-                              "Aborting",
-                              self.ip_address)
+            self.logger.warn(
+                "Cannot establish connection to IP '%s'", self.ip_address)
             self.connected = False
             return self.connected
 

diff --git a/functest/opnfv_tests/vnf/router/vnf_controller/vm_controller.py b/functest/opnfv_tests/vnf/router/vnf_controller/vm_controller.py
index 10e4864..56dc1e2 100644 (file)
--- a/functest/opnfv_tests/vnf/router/vnf_controller/vm_controller.py
+++ b/functest/opnfv_tests/vnf/router/vnf_controller/vm_controller.py
@@ -85,12 +85,15 @@ class VmController(object):
         result = ssh.connect(self.ssh_connect_timeout,
                              self.ssh_connect_retry_count)
         if not result:
-            self.logger.debug("try to vm reboot.")
+            self.logger.warn("Reboot %s", vm_info["vnf_name"])
             self.util.reboot_vm(vm_info["vnf_name"])
             time.sleep(self.reboot_wait)
             result = ssh.connect(self.ssh_connect_timeout,
                                  self.ssh_connect_retry_count)
             if not result:
+                self.logger.error(
+                    "Cannot establish connection to IP '%s'. Aborting!",
+                    ssh.ip_address)
                 return None
 
         (result, _) = self.command_create_and_execute(