diff options
Diffstat (limited to 'yardstick/network_services/helpers/samplevnf_helper.py')
| -rw-r--r-- | yardstick/network_services/helpers/samplevnf_helper.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/yardstick/network_services/helpers/samplevnf_helper.py b/yardstick/network_services/helpers/samplevnf_helper.py index 1eefc5ffa..dbaa47c19 100644 --- a/yardstick/network_services/helpers/samplevnf_helper.py +++ b/yardstick/network_services/helpers/samplevnf_helper.py @@ -90,7 +90,7 @@ class MultiPortConfig(object): def make_ip_addr(ip, mask_len): try: return ipaddress.ip_interface(six.text_type('/'.join([ip, mask_len]))) - except ValueError: + except (TypeError, ValueError): # None so we can skip later return None @@ -499,7 +499,10 @@ class MultiPortConfig(object): def get_route_data(self, src_key, data_key, port): route_list = self.vnfd['vdu'][0].get(src_key, []) - return next((route[data_key] for route in route_list if route['if'] == port), None) + try: + return next((route[data_key] for route in route_list if route['if'] == port), None) + except (TypeError, StopIteration, KeyError): + return None def get_ports_gateway(self, port): return self.get_route_data('routing_table', 'gateway', port) |