Merge "Context improvement: add support for configing node environment"

2 files changed, 78 insertions, 8 deletions

diff --git a/yardstick/benchmark/contexts/node.py b/yardstick/benchmark/contexts/node.py
index c7ed3b3f1..6fa9aa99a 100644
--- a/yardstick/benchmark/contexts/node.py
+++ b/yardstick/benchmark/contexts/node.py
@@ -8,14 +8,18 @@
 ##############################################################################
 
 from __future__ import absolute_import
-import logging
 import errno
+import subprocess
 import os
 import collections
+import logging
+
 import yaml
+import pkg_resources
 
+from yardstick import ssh
 from yardstick.benchmark.contexts.base import Context
-from yardstick.definitions import YARDSTICK_ROOT_PATH
+from yardstick.common.constants import YARDSTICK_ROOT_PATH
 
 LOG = logging.getLogger(__name__)
 
@@ -32,6 +36,7 @@ class NodeContext(Context):
         self.controllers = []
         self.computes = []
         self.baremetals = []
+        self.env = {}
         super(NodeContext, self).__init__()
 
     def read_config_file(self):
@@ -69,13 +74,20 @@ class NodeContext(Context):
         LOG.debug("Computes: %r", self.computes)
         LOG.debug("BareMetals: %r", self.baremetals)
 
+        self.env = attrs.get('env', {})
+        LOG.debug("Env: %r", self.env)
+
     def deploy(self):
-        """don't need to deploy"""
-        pass
+        setups = self.env.get('setup', [])
+        for setup in setups:
+            for host, info in setup.items():
+                self._execute_script(host, info)
 
     def undeploy(self):
-        """don't need to undeploy"""
-        pass
+        teardowns = self.env.get('teardown', [])
+        for teardown in teardowns:
+            for host, info in teardown.items():
+                self._execute_script(host, info)
 
     def _get_server(self, attr_name):
         """lookup server info by name from context
@@ -106,3 +118,61 @@ class NodeContext(Context):
 
         node["name"] = attr_name
         return node
+
+    def _execute_script(self, node_name, info):
+        if node_name == 'local':
+            self._execute_local_script(info)
+        else:
+            self._execute_remote_script(node_name, info)
+
+    def _execute_remote_script(self, node_name, info):
+        prefix = self.env.get('prefix', '')
+        script, options = self._get_script(info)
+
+        script_file = pkg_resources.resource_filename(prefix, script)
+
+        self._get_client(node_name)
+        self.client._put_file_shell(script_file, '~/{}'.format(script))
+
+        cmd = 'sudo bash {} {}'.format(script, options)
+        status, stdout, stderr = self.client.execute(cmd)
+        if status:
+            raise RuntimeError(stderr)
+
+    def _execute_local_script(self, info):
+        script, options = self._get_script(info)
+        script = os.path.join(YARDSTICK_ROOT_PATH, script)
+        cmd = ['bash', script, options]
+
+        p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+        LOG.debug('\n%s', p.communicate()[0])
+
+    def _get_script(self, info):
+        return info.get('script'), info.get('options', '')
+
+    def _get_client(self, node_name):
+        node = self._get_node_info(node_name.strip())
+
+        if node is None:
+            raise SystemExit('No such node')
+
+        user = node.get('user', 'ubuntu')
+        ssh_port = node.get("ssh_port", ssh.DEFAULT_PORT)
+        ip = node.get('ip')
+        pwd = node.get('password')
+        key_fname = node.get('key_filename', '/root/.ssh/id_rsa')
+
+        if pwd is not None:
+            LOG.debug("Log in via pw, user:%s, host:%s, password:%s",
+                      user, ip, pwd)
+            self.client = ssh.SSH(user, ip, password=pwd, port=ssh_port)
+        else:
+            LOG.debug("Log in via key, user:%s, host:%s, key_filename:%s",
+                      user, ip, key_fname)
+            self.client = ssh.SSH(user, ip, key_filename=key_fname,
+                                  port=ssh_port)
+
+        self.client.wait(timeout=600)
+
+    def _get_node_info(self, name):
+        return next((n for n in self.nodes if n['name'].strip() == name))
diff --git a/yardstick/benchmark/core/task.py b/yardstick/benchmark/core/task.py
index 5a52cdb11..522ad4d23 100644
--- a/yardstick/benchmark/core/task.py
+++ b/yardstick/benchmark/core/task.py
@@ -85,7 +85,7 @@ class Task(object):     # pragma: no cover
                 # (hide it for exit handler)
                 Context.list = []
             else:
-                for context in Context.list:
+                for context in Context.list[::-1]:
                     context.undeploy()
                 Context.list = []
             one_task_end_time = time.time()
@@ -348,7 +348,7 @@ def atexit_handler():
 
     if len(Context.list) > 0:
         print("Undeploying all contexts")
-        for context in Context.list:
+        for context in Context.list[::-1]:
             context.undeploy()