X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fbenchmark%2Fcontexts%2Fstandalone.py;h=2bc1f3755bc44714ed353dd71653c7a5c2df9ff9;hb=refs%2Fchanges%2F21%2F35521%2F3;hp=8614f0cace73868616cb1339db9ed600858b4180;hpb=3a1749fb524ec38e2981c89dc3e032bb6c57719e;p=yardstick.git

diff --git a/yardstick/benchmark/contexts/standalone.py b/yardstick/benchmark/contexts/standalone.py
index 8614f0cac..2bc1f3755 100644
--- a/yardstick/benchmark/contexts/standalone.py
+++ b/yardstick/benchmark/contexts/standalone.py
@@ -18,9 +18,11 @@ import logging
 import errno
 import collections
 import yaml
+import time
 
 from yardstick.benchmark.contexts.base import Context
 from yardstick.common.constants import YARDSTICK_ROOT_PATH
+from yardstick.common.utils import import_modules_from_package, itersubclasses
 
 LOG = logging.getLogger(__name__)
 
@@ -38,7 +40,8 @@ class StandaloneContext(Context):
         self.nodes = []
         self.networks = {}
         self.nfvi_node = []
-        super(StandaloneContext, self).__init__()
+        self.nfvi_obj = None
+        super(self.__class__, self).__init__()
 
     def read_config_file(self):
         """Read from config file"""
@@ -48,6 +51,14 @@ class StandaloneContext(Context):
             cfg = yaml.load(stream)
         return cfg
 
+    def get_nfvi_obj(self):
+        print("{0}".format(self.nfvi_node[0]['role']))
+        context_type = self.get_context_impl(self.nfvi_node[0]['role'])
+        nfvi_obj = context_type()
+        nfvi_obj.__init__()
+        nfvi_obj.parse_pod_and_get_data(self.file_path)
+        return nfvi_obj
+
     def init(self, attrs):
         """initializes itself from the supplied arguments"""
 
@@ -64,11 +75,24 @@ class StandaloneContext(Context):
             else:
                 raise
 
-        self.nodes.extend(cfg["nodes"])
-        self.nfvi_node.extend([node for node in cfg["nodes"]
-                               if node["role"] == "nfvi_node"])
+        self.vm_deploy = attrs.get("vm_deploy", True)
+        self.nodes.extend([node for node in cfg["nodes"]
+                           if str(node["role"]) != "Sriov" and
+                           str(node["role"]) != "Ovsdpdk"])
+        for node in cfg["nodes"]:
+            if str(node["role"]) == "Sriov":
+                self.nfvi_node.extend([node for node in cfg["nodes"]
+                                       if str(node["role"]) == "Sriov"])
+            if str(node["role"]) == "Ovsdpdk":
+                self.nfvi_node.extend([node for node in cfg["nodes"]
+                                       if str(node["role"]) == "Ovsdpdk"])
+                LOG.info("{0}".format(node["role"]))
+            else:
+                LOG.debug("Node role is other than SRIOV and OVS")
+        self.nfvi_obj = self.get_nfvi_obj()
         # add optional static network definition
         self.networks.update(cfg.get("networks", {}))
+        self.nfvi_obj = self.get_nfvi_obj()
         LOG.debug("Nodes: %r", self.nodes)
         LOG.debug("NFVi Node: %r", self.nfvi_node)
         LOG.debug("Networks: %r", self.networks)
@@ -77,13 +101,44 @@ class StandaloneContext(Context):
         """don't need to deploy"""
 
         # Todo: NFVi deploy (sriov, vswitch, ovs etc) based on the config.
-        pass
+        if not self.vm_deploy:
+            return
+
+        #    Todo: NFVi deploy (sriov, vswitch, ovs etc) based on the config.
+        self.nfvi_obj.ssh_remote_machine()
+        if self.nfvi_obj.first_run is True:
+            self.nfvi_obj.install_req_libs()
+
+        nic_details = self.nfvi_obj.get_nic_details()
+        print("{0}".format(nic_details))
+
+        if self.nfvi_node[0]["role"] == "Sriov":
+            self.nfvi_obj.setup_sriov_context(
+                self.nfvi_obj.sriov[0]['phy_ports'],
+                nic_details,
+                self.nfvi_obj.sriov[0]['phy_driver'])
+        if self.nfvi_node[0]["role"] == "Ovsdpdk":
+            self.nfvi_obj.setup_ovs(self.nfvi_obj.ovs[0]["phy_ports"])
+            self.nfvi_obj.start_ovs_serverswitch()
+            time.sleep(5)
+            self.nfvi_obj.setup_ovs_bridge()
+            self.nfvi_obj.add_oflows()
+            self.nfvi_obj.setup_ovs_context(
+                self.nfvi_obj.ovs[0]['phy_ports'],
+                nic_details,
+                self.nfvi_obj.ovs[0]['phy_driver'])
+            pass
 
     def undeploy(self):
         """don't need to undeploy"""
 
+        if not self.vm_deploy:
+            return
         # Todo: NFVi undeploy (sriov, vswitch, ovs etc) based on the config.
-        super(StandaloneContext, self).undeploy()
+        # self.nfvi_obj = self.get_nfvi_obj()
+        self.nfvi_obj.ssh_remote_machine()
+        self.nfvi_obj.destroy_vm()
+        pass
 
     def _get_server(self, attr_name):
         """lookup server info by name from context
@@ -91,16 +146,12 @@ class StandaloneContext(Context):
         Keyword arguments:
         attr_name -- A name for a server listed in nodes config file
         """
-
         if isinstance(attr_name, collections.Mapping):
             return None
-
-        if self.name.split("-")[0] != attr_name.split(".")[1]:
+        if self.name != attr_name.split(".")[1]:
             return None
-
         node_name = attr_name.split(".")[0]
         matching_nodes = (n for n in self.nodes if n["name"] == node_name)
-
         try:
             # A clone is created in order to avoid affecting the
             # original one.
@@ -115,7 +166,6 @@ class StandaloneContext(Context):
         else:
             raise ValueError("Duplicate nodes!!! Nodes: %s %s",
                              (matching_nodes, duplicate))
-
         node["name"] = attr_name
         return node
 
@@ -146,3 +196,19 @@ class StandaloneContext(Context):
             "physical_network": network.get("physical_network"),
         }
         return result
+
+    def get_context_impl(self, nfvi_type):
+        """ Find the implementing class from vnf_model["vnf"]["name"] field
+
+        :param vnf_model: dictionary containing a parsed vnfd
+        :return: subclass of GenericVNF
+        """
+        import_modules_from_package(
+            "yardstick.benchmark.contexts")
+        expected_name = nfvi_type
+        impl = [c for c in itersubclasses(StandaloneContext)
+                if c.__name__ == expected_name]
+        try:
+            return next(iter(impl))
+        except StopIteration:
+            raise ValueError("No implementation for %s", expected_name)