X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FL2Util.py;h=6b8bc042e317ab0418377721e78e4283fdb1638c;hp=af4735fdf8187bdf815144dac936583e3c6d2a7e;hb=bdfca054d8425a57496cca8308da36c118b5340f;hpb=f7feaf7804f267c9d7880917f6baf9d1bdb21584

diff --git a/resources/libraries/python/L2Util.py b/resources/libraries/python/L2Util.py
index af4735fdf8..6b8bc042e3 100644
--- a/resources/libraries/python/L2Util.py
+++ b/resources/libraries/python/L2Util.py
@@ -13,6 +13,8 @@
 
 """L2 Utilities Library."""
 
+from textwrap import wrap
+
 from robot.api.deco import keyword
 
 from resources.libraries.python.topology import Topology
@@ -23,6 +25,30 @@ from resources.libraries.python.ssh import exec_cmd_no_error
 class L2Util(object):
     """Utilities for l2 configuration."""
 
+    @staticmethod
+    def mac_to_int(mac_str):
+        """Convert MAC address from string format (e.g. 01:02:03:04:05:06) to
+        integer representation (1108152157446).
+
+        :param mac_str: MAC address in string representation.
+        :type mac_str: str
+        :returns: Integer representation of MAC address.
+        :rtype: int
+        """
+        return int(mac_str.replace(':', ''), 16)
+
+    @staticmethod
+    def int_to_mac(mac_int):
+        """Convert MAC address from integer representation (e.g. 1108152157446)
+        to string format (01:02:03:04:05:06).
+
+        :param mac_int: MAC address in integer representation.
+        :type mac_int: str
+        :returns: String representation of MAC address.
+        :rtype: int
+        """
+        return ':'.join(wrap("{:012x}".format(mac_int), width=2))
+
     @staticmethod
     def vpp_add_l2fib_entry(node, mac, interface, bd_id):
         """ Create a static L2FIB entry on a vpp node.
@@ -192,18 +218,20 @@ class L2Util(object):
                                                     interface2=sw_iface1)
 
     @staticmethod
-    def linux_add_bridge(node, br_name, if_1, if_2):
+    def linux_add_bridge(node, br_name, if_1, if_2, set_up=True):
         """Bridge two interfaces on linux node.
 
         :param node: Node to add bridge on.
         :param br_name: Bridge name.
         :param if_1: First interface to be added to the bridge.
         :param if_2: Second interface to be added to the bridge.
+        :param set_up: Change bridge interface state to up after create bridge.
+        Optional. Default: True.
         :type node: dict
         :type br_name: str
         :type if_1: str
         :type if_2: str
-
+        :type set_up: bool
         """
         cmd = 'brctl addbr {0}'.format(br_name)
         exec_cmd_no_error(node, cmd, sudo=True)
@@ -211,45 +239,27 @@ class L2Util(object):
         exec_cmd_no_error(node, cmd, sudo=True)
         cmd = 'brctl addif {0} {1}'.format(br_name, if_2)
         exec_cmd_no_error(node, cmd, sudo=True)
+        if set_up:
+            cmd = 'ip link set dev {0} up'.format(br_name)
+            exec_cmd_no_error(node, cmd, sudo=True)
 
     @staticmethod
-    def setup_network_namespace(node, namespace_name, interface_name,
-                                ip_address, prefix):
-        """Setup namespace on given node and attach interface and IP to
-        this namespace. Applicable also on TG node.
-
-        :param node: Node to set namespace on.
-        :param namespace_name: Namespace name.
-        :param interface_name: Interface name.
-        :param ip_address: IP address of namespace's interface.
-        :param prefix: IP address prefix length.
-        :type node: dict
-        :type namespace_name: str
-        :type vhost_if: str
-        :type ip_address: str
-        :type prefix: int
-
-        """
-        cmd = ('ip netns add {0}'.format(namespace_name))
-        exec_cmd_no_error(node, cmd, sudo=True)
-
-        cmd = ('ip link set dev {0} up netns {1}'.format(interface_name,
-                                                         namespace_name))
-        exec_cmd_no_error(node, cmd, sudo=True)
-
-        cmd = ('ip netns exec {0} ip addr add {1}/{2} dev {3}'.format(
-            namespace_name, ip_address, prefix, interface_name))
-        exec_cmd_no_error(node, cmd, sudo=True)
-
-    @staticmethod
-    def linux_del_bridge(node, br_name):
+    def linux_del_bridge(node, br_name, set_down=True):
         """Delete bridge from linux node.
 
         :param node: Node to delete bridge from.
         :param br_name: Bridge name.
+        :param set_down: Change bridge interface state to down before delbr
+        command. Optional. Default: True.
+        :type node: str
+        :type br_name: str
+        :type set_down: bool
         ..note:: The network interface corresponding to the bridge must be
         down before it can be deleted!
         """
+        if set_down:
+            cmd = 'ip link set dev {0} down'.format(br_name)
+            exec_cmd_no_error(node, cmd, sudo=True)
         cmd = 'brctl delbr {0}'.format(br_name)
         exec_cmd_no_error(node, cmd, sudo=True)