bin/network: fix traceback when device to be tested has no IP address LP: #1662724

1 files 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)