From e07484ef707af89c12ebf3e9ed4490d9ff588750 Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Tue, 8 Aug 2017 17:56:42 -0700 Subject: samplevnf: fix make_ip_addr we get TypeError sometimes, so we need to catch them Change-Id: I5fc58006f18acf84f62d8f4a21077d71b2fb0ed8 Signed-off-by: Ross Brattain --- yardstick/network_services/helpers/samplevnf_helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yardstick/network_services/helpers/samplevnf_helper.py b/yardstick/network_services/helpers/samplevnf_helper.py index 543d814df..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 -- cgit 1.2.3-korg