From 36ae6419c24a2a6baa359fd6a2aa9606c553bba9 Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Wed, 27 Sep 2017 19:08:06 -0700 Subject: NSB: ignore VNF node if there is no VNF model Change-Id: I571289c744441a6114c6d45ac6cbd7cfc0dafef2 Signed-off-by: Ross Brattain --- yardstick/benchmark/scenarios/networking/vnf_generic.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yardstick/benchmark/scenarios/networking/vnf_generic.py b/yardstick/benchmark/scenarios/networking/vnf_generic.py index 450f83f6a..6cea51b63 100644 --- a/yardstick/benchmark/scenarios/networking/vnf_generic.py +++ b/yardstick/benchmark/scenarios/networking/vnf_generic.py @@ -542,7 +542,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() -- cgit 1.2.3-korg