diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-09-27 19:08:06 -0700 |
|---|---|---|
| committer | Ross Brattain <ross.b.brattain@intel.com> | 2017-09-28 07:46:58 -0700 |
| commit | 36ae6419c24a2a6baa359fd6a2aa9606c553bba9 (patch) | |
| tree | ff068da3509fae9ac502293eb227b016e45ebc8f | |
| parent | bb581e5213ec07bd34a749d20adce1d9b9e6666e (diff) | |
NSB: ignore VNF node if there is no VNF model
Change-Id: I571289c744441a6114c6d45ac6cbd7cfc0dafef2
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
| -rw-r--r-- | yardstick/benchmark/scenarios/networking/vnf_generic.py | 6 |
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 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() |