From bc56699705a0320a700157e30a1ede7cedb55598 Mon Sep 17 00:00:00 2001
From: Jeff Lane <jeffrey.lane@canonical.com>
Date: Thu, 23 Feb 2017 16:06:47 -0500
Subject: bin/network: fix traceback when device to be tested has no IP address
 LP: #1662724

---
 bin/network | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/bin/network b/bin/network
index ae9cd38..dda64da 100755
--- a/bin/network
+++ b/bin/network
@@ -260,7 +260,7 @@ class Interface(socket.socket):
             nic_data = fcntl.ioctl(self.fileno(), 0x8915, freq)
         except IOError:
             logging.error("No IP address for %s", self.interface)
-            return 1
+            return None
         return socket.inet_ntoa(nic_data[20:24])
 
     @property
@@ -271,7 +271,7 @@ class Interface(socket.socket):
             mask_data = fcntl.ioctl(self.fileno(), 0x891b, freq)
         except IOError:
             logging.error("No netmask for %s", self.interface)
-            return 1
+            return None
         return socket.inet_ntoa(mask_data[20:24])
 
     @property
@@ -416,9 +416,15 @@ def make_target_list(iface, test_targets, log_warnings):
         List form of input string, minus invalid values
     """
     test_targets_list = test_targets.split(",")
-    net = ipaddress.IPv4Network("{}/{}".format(Interface(iface).ipaddress,
-                                               Interface(iface).netmask),
-                                False)
+    try:
+        net = ipaddress.IPv4Network("{}/{}".format(Interface(iface).ipaddress,
+                                                   Interface(iface).netmask),
+                                    False)
+    except ipaddress.AddressValueError as e:
+        logging.error("Device {}: Invalid IP Address".format(iface))
+        logging.error("  {}".format(e))
+        logging.error("Aborting test now")
+        sys.exit(1)
     first_addr = net.network_address + 1
     last_addr = first_addr + net.num_addresses - 2
     return_list = list(test_targets_list)
-- 
cgit v1.2.3


From ebb1f2b354f1ea4124e62a037fa7cfaa489111b0 Mon Sep 17 00:00:00 2001
From: Jeff Lane <jeffrey.lane@canonical.com>
Date: Thu, 23 Feb 2017 16:08:03 -0500
Subject: bin/network: pep8 fixes

---
 bin/network | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/network b/bin/network
index dda64da..19c2ac3 100755
--- a/bin/network
+++ b/bin/network
@@ -460,7 +460,8 @@ def interface_test(args):
     if (args.test_type.lower() == "iperf" or
             args.test_type.lower() == "stress"):
         test_targets = test_parameters["test_target_iperf"]
-        test_targets_list = make_target_list(args.interface, test_targets, True)
+        test_targets_list = make_target_list(args.interface, test_targets,
+                                             True)
 
     # Validate that we got reasonable values
     if not test_targets_list or "example.com" in test_targets:
@@ -524,7 +525,9 @@ def interface_test(args):
             if not test_targets_list:
                 logging.info(" Exhausted test target list; trying again "
                              .center(60, "="))
-                test_targets_list = make_target_list(args.interface, test_targets, False)
+                test_targets_list = make_target_list(args.interface,
+                                                     test_targets,
+                                                     False)
                 time.sleep(30)
                 first_loop = False
 
-- 
cgit v1.2.3