From 5d35ee70c26bb5d3a4ce150b874982966360db11 Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Fri, 18 Aug 2017 18:38:07 -0700 Subject: [PATCH] vnf_generic: fixup topology probe logic fix exception handling Change-Id: I46fd0dbf21f3d3308e4f38fcfae5df2716ad7190 Signed-off-by: Ross Brattain --- yardstick/benchmark/scenarios/networking/vnf_generic.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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) -- 2.16.6