From c478afc5aec0161cc66e837c1ab919542b68ebbc Mon Sep 17 00:00:00 2001 From: selias Date: Fri, 29 Apr 2016 12:50:33 +0200 Subject: Add Honeycomb interface management tests (ipv4, ipv6, ethernet, routing) - add test cases for managing ipv4, ipv6, ethernet and routing configuration on VPP interface - add keywords used in these tests to set and verify configuration - add method and vat template for dumping an interface's configured IP addresses - add method for converting between ipv4 netmasks and network prefixes - clean up documentation of older Honeycomb keywords Note: Test cases are tagged with a placeholder tag to allow manual test runs locally. It should be replaced with the appropriate environment tags once Honeycomb service is deployed on virl. Change-Id: I99ce1e72c8550f520f8c35ef4a93eaebb530db78 Signed-off-by: selias Signed-off-by: Matej Klotton --- resources/libraries/python/IPUtil.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'resources/libraries/python/IPUtil.py') diff --git a/resources/libraries/python/IPUtil.py b/resources/libraries/python/IPUtil.py index 8ad01c491b..00a7000c65 100644 --- 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,21 @@ 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(netmask): + """Convert network mask to equivalent network prefix length or vice versa. + + Example: mask 255.255.0.0 -> prefix length 16 + :param netmask: network mask or network prefix length. + :type netmask: 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, netmask), False) + + if isinstance(netmask, int): + return net.netmask + elif isinstance(netmask, basestring): + return net.prefixlen -- cgit 1.2.3-korg