summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-09-29 22:45:30 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-29 22:45:30 +0000
commit263a946240819fe37b19271251c288450490c58a (patch)
treecd9e04b904430780865bdda2b47f6693061cf4b3
parent9cefa935afa908cede3ab1bd8b6ca91f1e36ad2d (diff)
parent36ae6419c24a2a6baa359fd6a2aa9606c553bba9 (diff)
Merge "NSB: ignore VNF node if there is no VNF model"
-rw-r--r--yardstick/benchmark/scenarios/networking/vnf_generic.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/yardstick/benchmark/scenarios/networking/vnf_generic.py b/yardstick/benchmark/scenarios/networking/vnf_generic.py
index 355b69862..3f61116bc 100644
--- a/yardstick/benchmark/scenarios/networking/vnf_generic.py
+++ b/yardstick/benchmark/scenarios/networking/vnf_generic.py
@@ -546,7 +546,11 @@ printf "%s/driver:" $1 ; basename $(readlink -s $1/device/driver); } \
# we assume OrderedDict for consistenct in instantiation
for node_name, node in context_cfg["nodes"].items():
LOG.debug(node)
- file_name = node["VNF model"]
+ try:
+ file_name = node["VNF model"]
+ except KeyError:
+ LOG.debug("no model for %s, skipping", node_name)
+ continue
file_path = scenario_cfg['task_path']
with open_relative_file(file_name, file_path) as stream:
vnf_model = stream.read()