Merge "Pass the path of ssh public key to scenario method"

[yardstick.git] / yardstick / network_services / vnf_generic / vnf / router_vnf.py

diff --git a/yardstick/network_services/vnf_generic/vnf/router_vnf.py b/yardstick/network_services/vnf_generic/vnf/router_vnf.py
index aea27ff..e99de9c 100644 (file)
--- a/yardstick/network_services/vnf_generic/vnf/router_vnf.py
+++ b/yardstick/network_services/vnf_generic/vnf/router_vnf.py
@@ -34,7 +34,8 @@ class RouterVNF(SampleVNF):
 
     WAIT_TIME = 1
 
-    def __init__(self, name, vnfd, setup_env_helper_type=None, resource_helper_type=None):
+    def __init__(self, name, vnfd, task_id, setup_env_helper_type=None,
+                 resource_helper_type=None):
         if setup_env_helper_type is None:
             setup_env_helper_type = DpdkVnfSetupEnvHelper
 
@@ -42,12 +43,12 @@ class RouterVNF(SampleVNF):
         vnfd['mgmt-interface'].pop("pkey", "")
         vnfd['mgmt-interface']['password'] = 'password'
 
-        super(RouterVNF, self).__init__(name, vnfd, setup_env_helper_type, resource_helper_type)
+        super(RouterVNF, self).__init__(
+            name, vnfd, task_id, setup_env_helper_type, resource_helper_type)
 
     def instantiate(self, scenario_cfg, context_cfg):
         self.scenario_helper.scenario_cfg = scenario_cfg
         self.context_cfg = context_cfg
-        self.nfvi_context = Context.get_context_from_server(self.scenario_helper.nodes[self.name])
         self.configure_routes(self.name, scenario_cfg, context_cfg)
 
     def wait_for_instantiate(self):
@@ -107,8 +108,11 @@ class RouterVNF(SampleVNF):
         stdout = self.ssh_helper.execute(ip_link_stats)[1]
         link_stats = self.get_stats(stdout)
         # get RX/TX from link_stats and assign to results
+        physical_node = Context.get_physical_node_from_server(
+            self.scenario_helper.nodes[self.name])
 
         result = {
+            "physical_node": physical_node,
             "packets_in": 0,
             "packets_dropped": 0,
             "packets_fwd": 0,