X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fbenchmark%2Fcontexts%2Fnode.py;h=ffc82c8edefeb264f42e4ecfdff59082780c5b27;hb=f9d4d0eda531fffe679904f373140943818358c8;hp=78a2d1f46bb0bf4c20043048509b5207b18df6e9;hpb=5ce3b6f8c8b3217091e51a6041455738603d90b8;p=yardstick.git

diff --git a/yardstick/benchmark/contexts/node.py b/yardstick/benchmark/contexts/node.py
index 78a2d1f46..ffc82c8ed 100644
--- a/yardstick/benchmark/contexts/node.py
+++ b/yardstick/benchmark/contexts/node.py
@@ -13,16 +13,21 @@ import subprocess
 import os
 import collections
 import logging
+import tempfile
 
-import yaml
+import six
 import pkg_resources
 
 from yardstick import ssh
 from yardstick.benchmark.contexts.base import Context
 from yardstick.common.constants import ANSIBLE_DIR, YARDSTICK_ROOT_PATH
+from yardstick.common.ansible_common import AnsibleCommon
+from yardstick.common.yaml_loader import yaml_load
 
 LOG = logging.getLogger(__name__)
 
+DEFAULT_DISPATCH = 'script'
+
 
 class NodeContext(Context):
     """Class that handle nodes info"""
@@ -39,6 +44,10 @@ class NodeContext(Context):
         self.baremetals = []
         self.env = {}
         self.attrs = {}
+        self.DISPATCH_TYPES = {
+            "ansible": self._dispatch_ansible,
+            "script": self._dispatch_script,
+        }
         super(NodeContext, self).__init__()
 
     def read_config_file(self):
@@ -46,7 +55,7 @@ class NodeContext(Context):
 
         with open(self.file_path) as stream:
             LOG.info("Parsing pod file: %s", self.file_path)
-            cfg = yaml.safe_load(stream)
+            cfg = yaml_load(stream)
         return cfg
 
     def init(self, attrs):
@@ -65,11 +74,11 @@ class NodeContext(Context):
 
         self.nodes.extend(cfg["nodes"])
         self.controllers.extend([node for node in cfg["nodes"]
-                                 if node["role"] == "Controller"])
+                                 if node.get("role") == "Controller"])
         self.computes.extend([node for node in cfg["nodes"]
-                              if node["role"] == "Compute"])
+                              if node.get("role") == "Compute"])
         self.baremetals.extend([node for node in cfg["nodes"]
-                                if node["role"] == "Baremetal"])
+                                if node.get("role") == "Baremetal"])
         LOG.debug("Nodes: %r", self.nodes)
         LOG.debug("Controllers: %r", self.controllers)
         LOG.debug("Computes: %r", self.computes)
@@ -83,18 +92,12 @@ class NodeContext(Context):
         self.networks.update(cfg.get("networks", {}))
 
     def deploy(self):
-        config_type = self.env.get('type', '')
-        if config_type == 'ansible':
-            self._dispatch_ansible('setup')
-        elif config_type == 'script':
-            self._dispatch_script('setup')
+        config_type = self.env.get('type', DEFAULT_DISPATCH)
+        self.DISPATCH_TYPES[config_type]("setup")
 
     def undeploy(self):
-        config_type = self.env.get('type', '')
-        if config_type == 'ansible':
-            self._dispatch_ansible('teardown')
-        elif config_type == 'script':
-            self._dispatch_script('teardown')
+        config_type = self.env.get('type', DEFAULT_DISPATCH)
+        self.DISPATCH_TYPES[config_type]("teardown")
         super(NodeContext, self).undeploy()
 
     def _dispatch_script(self, key):
@@ -105,16 +108,32 @@ class NodeContext(Context):
 
     def _dispatch_ansible(self, key):
         try:
-            step = self.env[key]
+            playbooks = self.env[key]
         except KeyError:
             pass
         else:
-            self._do_ansible_job(step)
-
-    def _do_ansible_job(self, path):
-        cmd = 'ansible-playbook -i inventory.ini %s' % path
-        p = subprocess.Popen(cmd, shell=True, cwd=ANSIBLE_DIR)
-        p.communicate()
+            self._do_ansible_job(playbooks)
+
+    def _do_ansible_job(self, playbooks):
+        self.ansible_exec = AnsibleCommon(nodes=self.nodes,
+                                          test_vars=self.env)
+        # playbooks relative to ansible dir
+        # playbooks can also be a list of playbooks
+        self.ansible_exec.gen_inventory_ini_dict()
+        if isinstance(playbooks, six.string_types):
+            playbooks = [playbooks]
+        playbooks = [self.fix_ansible_path(playbook) for playbook in playbooks]
+
+        tmpdir = tempfile.mkdtemp(prefix='ansible-')
+        self.ansible_exec.execute_ansible(playbooks, tmpdir,
+                                          verbose=self.env.get("verbose",
+                                                               False))
+
+    def fix_ansible_path(self, playbook):
+        if not os.path.isabs(playbook):
+            #  make relative paths absolute in ANSIBLE_DIR
+            playbook = os.path.join(ANSIBLE_DIR, playbook)
+        return playbook
 
     def _get_server(self, attr_name):
         """lookup server info by name from context