Update Honeycomb tests

[csit.git] / resources / libraries / python / IPUtil.py

diff --git a/resources/libraries/python/IPUtil.py b/resources/libraries/python/IPUtil.py
index 8ad01c4..e364e60 100644 (file)
--- a/resources/libraries/python/IPUtil.py
+++ b/resources/libraries/python/IPUtil.py
@@ -12,6 +12,7 @@
 # limitations under the License.
 
 """Common IP utilities library."""
+from ipaddress import IPv4Network
 
 from resources.libraries.python.ssh import SSH
 from resources.libraries.python.constants import Constants
@@ -40,3 +41,24 @@ class IPUtil(object):
         if int(ret_code) != 0:
             raise Exception('VPP ip probe {dev} {ip} failed on {h}'.format(
                 dev=interface, ip=addr, h=node['host']))
+
+
+def convert_ipv4_netmask_prefix(network):
+    """Convert network mask to equivalent network prefix length or vice versa.
+
+    Example: mask 255.255.0.0 -> prefix length 16
+    :param network: Network mask or network prefix length.
+    :type network: str or int
+    :return: Network mask or network prefix length.
+    :rtype: str or int
+    """
+    temp_address = "0.0.0.0"
+    net = IPv4Network(u"{0}/{1}".format(temp_address, network), False)
+
+    if isinstance(network, int) and (0 < network < 33):
+        return str(net.netmask)
+    elif isinstance(network, basestring):
+        return int(net.prefixlen)
+    else:
+        raise Exception("Value {0} is not a valid ipv4 netmask or network"
+                        " prefix length".format(network))