From: Ross Brattain <ross.b.brattain@intel.com>
Date: Thu, 28 Sep 2017 02:08:06 +0000 (-0700)
Subject: NSB: ignore VNF node if there is no VNF model
X-Git-Tag: opnfv-6.0.0~409^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F43481%2F1;p=yardstick.git

NSB: ignore VNF node if there is no VNF model

Change-Id: I571289c744441a6114c6d45ac6cbd7cfc0dafef2
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
---

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()