From: Ross Brattain <ross.b.brattain@intel.com>
Date: Sat, 19 Aug 2017 01:38:07 +0000 (-0700)
Subject: vnf_generic: fixup topology probe logic
X-Git-Tag: opnfv-5.0.RC1~254
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F15%2F39715%2F1;p=yardstick.git

vnf_generic: fixup topology probe logic

fix exception handling

Change-Id: I46fd0dbf21f3d3308e4f38fcfae5df2716ad7190
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 e6dca929c..9f8efa6dc 100644
--- a/yardstick/benchmark/scenarios/networking/vnf_generic.py
+++ b/yardstick/benchmark/scenarios/networking/vnf_generic.py
@@ -312,16 +312,16 @@ class NetworkServiceTestCase(base.Scenario):
 
                 # only ssh probe if there are missing values
                 # ssh probe won't work on Ixia, so we had better define all our values
-
                 try:
                     netdevs = self._probe_netdevs(node, node_dict)
-                    self._probe_missing_values(netdevs, network)
-                except KeyError:
-                    pass
                 except (SSHError, SSHTimeout):
                     raise IncorrectConfig(
                         "Unable to probe missing interface fields '%s', on node %s "
                         "SSH Error" % (', '.join(missing), node))
+                try:
+                    self._probe_missing_values(netdevs, network)
+                except KeyError:
+                    pass
                 else:
                     missing = self.TOPOLOGY_REQUIRED_KEYS.difference(
                         network)