BugFix: fix Storperf CI bug

Change-Id: I508762b4fc37620dc01f0e166cef92fe1864eac5
Signed-off-by: JingLu5 <lvjing5@huawei.com>

diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify
index b3cae11..bdb9100 100755 (executable)
--- a/tests/ci/yardstick-verify
+++ b/tests/ci/yardstick-verify
@@ -128,10 +128,13 @@ install_storperf()
         echo
         echo "========== Installing storperf =========="
 
-        if ! yardstick plugin install plugin/CI/storperf.yaml; then
+        if ! yardstick -d plugin install plugin/CI/storperf.yaml; then
             echo "Install storperf plugin FAILED";
             exit 1
         fi
+
+        echo
+        echo "========== Installed storperf container =========="
     fi
 }
 

diff --git a/yardstick/cmd/commands/plugin.py b/yardstick/cmd/commands/plugin.py
index 0ab24fc..9936942 100644 (file)
--- a/yardstick/cmd/commands/plugin.py
+++ b/yardstick/cmd/commands/plugin.py
@@ -41,8 +41,10 @@ class PluginCommands(object):
         plugin_name = plugins.get("name")
         print("Installing plugin: %s" % plugin_name)
 
+        LOG.info("Executing _install_setup()")
         self._install_setup(plugin_name, deployment)
 
+        LOG.info("Executing _run()")
         self._run(plugin_name)
 
         total_end_time = time.time()
@@ -61,10 +63,12 @@ class PluginCommands(object):
 
         plugins, deployment = parser.parse_plugin()
         plugin_name = plugins.get("name")
-        print("Remove plugin: %s" % plugin_name)
+        print("Removing plugin: %s" % plugin_name)
 
+        LOG.info("Executing _remove_setup()")
         self._remove_setup(plugin_name, deployment)
 
+        LOG.info("Executing _run()")
         self._run(plugin_name)
 
         total_end_time = time.time()
@@ -86,18 +90,20 @@ class PluginCommands(object):
         if deployment_ip == "local":
             installer_ip = os.environ.get("INSTALLER_IP", None)
 
-            LOG.debug("user:%s, host:%s", deployment_user, installer_ip)
+            LOG.info("user:%s, host:%s", deployment_user, installer_ip)
             self.client = ssh.SSH(deployment_user, installer_ip,
                                   password=deployment_password)
             self.client.wait(timeout=600)
         else:
-            LOG.debug("user:%s, host:%s", deployment_user, deployment_ip)
+            LOG.info("user:%s, host:%s", deployment_user, deployment_ip)
             self.client = ssh.SSH(deployment_user, deployment_ip,
                                   password=deployment_password)
             self.client.wait(timeout=600)
 
         # copy script to host
         cmd = "cat > ~/%s.sh" % plugin_name
+
+        LOG.info("copying script to host: %s", cmd)
         self.client.run(cmd, stdin=open(self.script, 'rb'))
 
     def _remove_setup(self, plugin_name, deployment):
@@ -113,25 +119,27 @@ class PluginCommands(object):
         if deployment_ip == "local":
             installer_ip = os.environ.get("INSTALLER_IP", None)
 
-            LOG.debug("user:%s, host:%s", deployment_user, installer_ip)
+            LOG.info("user:%s, host:%s", deployment_user, installer_ip)
             self.client = ssh.SSH(deployment_user, installer_ip,
                                   password=deployment_password)
             self.client.wait(timeout=600)
         else:
-            LOG.debug("user:%s, host:%s", deployment_user, deployment_ip)
+            LOG.info("user:%s, host:%s", deployment_user, deployment_ip)
             self.client = ssh.SSH(deployment_user, deployment_ip,
                                   password=deployment_password)
             self.client.wait(timeout=600)
 
         # copy script to host
         cmd = "cat > ~/%s.sh" % plugin_name
+
+        LOG.info("copying script to host: %s", cmd)
         self.client.run(cmd, stdin=open(self.script, 'rb'))
 
     def _run(self, plugin_name):
         '''Run installation script '''
         cmd = "sudo bash %s" % plugin_name + ".sh"
 
-        LOG.debug("Executing command: %s", cmd)
+        LOG.info("Executing command: %s", cmd)
         status, stdout, stderr = self.client.execute(cmd)