Merge #374923 from ~bladernr/plainbox-provider-checkbox:lp1850652

bin/network_device_info.py: fix traceback when IPv4 is not set on an interface. 

1 files changed, 12 insertions, 5 deletions

diff --git a/bin/network_device_info.py b/bin/network_device_info.py
index 4a827def..925b3f5e 100755
--- a/bin/network_device_info.py
+++ b/bin/network_device_info.py
@@ -49,11 +49,18 @@ class Utils():
 @staticmethod
 def get_ipv4_address(interface):
 s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
- return socket.inet_ntoa(fcntl.ioctl(
- s.fileno(),
- 0x8915, # SIOCGIFADDR
- struct.pack('256s', interface[:15].encode())
- )[20:24])
+ try:
+ ipv4_addr = socket.inet_ntoa(fcntl.ioctl(
+ s.fileno(),
+ 0x8915, # SIOCGIFADDR
+ struct.pack('256s', interface[:15].encode())
+ )[20:24])
+ except Exception as e:
+ print("ERROR: getting the IPv4 address for %s: %s" %
+ (interface, repr(e)))
+ ipv4_addr = "***NOT CONFIGURED***"
+ finally:
+ return ipv4_addr
 
 @staticmethod
 def get_ipv6_address(interface):