Merge branch 'master' into goodbye-six

Author: tbreeds

hardware/detect.py

@@ -20,6 +20,7 @@
 
 import argparse
 import fcntl
+import ipaddress
 import json
 import os
 import pprint
@@ -32,8 +33,6 @@
 import uuid
 import xml.etree.ElementTree as ET
 
-from netaddr import IPNetwork
-
 from hardware import areca
 from hardware.benchmark import cpu as bm_cpu
 from hardware.benchmark import disk as bm_disk
@@ -573,9 +572,10 @@ def find_element(xml, xml_spec, sys_subtype,
                         cidr = get_cidr(netmask)
                         hw_lst.append(
                             ('network', name.text, 'ipv4-cidr', cidr))
+                        net = (ipaddress.IPv4Interface('%s/%s' % (ipv4, cidr))
+                               .network.network_address)
                         hw_lst.append(
-                            ('network', name.text, 'ipv4-network',
-                             "%s" % IPNetwork('%s/%s' % (ipv4, cidr)).network))
+                            ('network', name.text, 'ipv4-network', str(net)))
                     except Exception as excpt:
                         sys.stderr.write('unable to get info for %s: %s\n'
                                          % (name.text, str(excpt)))

requirements.txt

@@ -3,8 +3,6 @@
 # process, which may cause wedges in the gate later.
 
 pbr>=1.0 # Apache-2.0
-ipaddress # PSF
-netaddr # BSD
 pexpect # ISC
 numpy # BSD
 pandas # BSD