CSIT-229: ip4-lispgpe-ip4

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

diff --git a/resources/libraries/python/L2Util.py b/resources/libraries/python/L2Util.py
index db550f0..a909e86 100644 (file)
--- a/resources/libraries/python/L2Util.py
+++ b/resources/libraries/python/L2Util.py
@@ -192,18 +192,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 +213,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)
 
@@ -280,33 +264,43 @@ class L2Util(object):
         return data
 
     @staticmethod
-    def l2_tag_rewrite(node, interface, tag_rewrite_method, tag1_id=None):
-        """Rewrite tags in frame.
+    def l2_vlan_tag_rewrite(node, interface, tag_rewrite_method,
+                            push_dot1q=True, tag1_id=None, tag2_id=None):
+        """Rewrite tags in ethernet frame.
 
         :param node: Node to rewrite tags.
         :param interface: Interface on which rewrite tags.
         :param tag_rewrite_method: Method of tag rewrite.
+        :param push_dot1q: Optional parameter to disable to push dot1q tag
+         instead of dot1ad.
         :param tag1_id: Optional tag1 ID for VLAN.
+        :param tag2_id: Optional tag2 ID for VLAN.
         :type node: dict
         :type interface: str or int
-        :type tag_rewrite_method : str
+        :type tag_rewrite_method: str
+        :type push_dot1q: bool
         :type tag1_id: int
+        :type tag2_id: int
         """
-        if tag1_id is None:
-            tag1_id = ''
-        else:
-            tag1_id = 'tag1 {0}'.format(tag1_id)
+        push_dot1q = 'push_dot1q 0' if not push_dot1q else ''
+
+        tag1_id = 'tag1 {0}'.format(tag1_id) if tag1_id else ''
+        tag2_id = 'tag2 {0}'.format(tag2_id) if tag2_id else ''
+
         if isinstance(interface, basestring):
-            sw_if_index = Topology.get_interface_sw_index(node, interface)
+            iface_key = Topology.get_interface_by_name(node, interface)
+            sw_if_index = Topology.get_interface_sw_index(node, iface_key)
         else:
             sw_if_index = interface
 
         with VatTerminal(node) as vat:
-            vat.vat_terminal_exec_cmd_from_template("l2_tag_rewrite.vat",
+            vat.vat_terminal_exec_cmd_from_template("l2_vlan_tag_rewrite.vat",
                                                     sw_if_index=sw_if_index,
                                                     tag_rewrite_method=
                                                     tag_rewrite_method,
-                                                    tag1_optional=tag1_id)
+                                                    push_dot1q=push_dot1q,
+                                                    tag1_optional=tag1_id,
+                                                    tag2_optional=tag2_id)
 
     @staticmethod
     def delete_bridge_domain_vat(node, bd_id):