Enable vnf/tg instantiate as blocking call.

[yardstick.git] / yardstick / benchmark / scenarios / networking / vnf_generic.py

diff --git a/yardstick/benchmark/scenarios/networking/vnf_generic.py b/yardstick/benchmark/scenarios/networking/vnf_generic.py
index af17a31..092e9a0 100644 (file)
--- a/yardstick/benchmark/scenarios/networking/vnf_generic.py
+++ b/yardstick/benchmark/scenarios/networking/vnf_generic.py
@@ -284,8 +284,6 @@ class NetworkServiceTestCase(base.Scenario):
         """ This method should verify if the available resources defined in pod.yaml
         match the topology.yaml file.
 
-        :param context_cfg:
-        :param topology:
         :return: None. Side effect: context_cfg is updated
         """
         for node, node_dict in self.context_cfg["nodes"].items():
@@ -442,7 +440,6 @@ printf "%s/driver:" $1 ; basename $(readlink -s $1/device/driver); } \
             for vnf in chain(traffic_runners, non_traffic_runners):
                 LOG.info("Instantiating %s", vnf.name)
                 vnf.instantiate(self.scenario_cfg, self.context_cfg)
-            for vnf in chain(traffic_runners, non_traffic_runners):
                 LOG.info("Waiting for %s to instantiate", vnf.name)
                 vnf.wait_for_instantiate()
         except RuntimeError: