From: Ross Brattain <ross.b.brattain@intel.com>
Date: Wed, 9 Aug 2017 00:56:42 +0000 (-0700)
Subject: samplevnf: fix make_ip_addr
X-Git-Tag: opnfv-5.0.RC1~262
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e07484ef707af89c12ebf3e9ed4490d9ff588750;p=yardstick.git

samplevnf: fix make_ip_addr

we get TypeError sometimes, so
we need to catch them

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

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