Revert "vpp-device: GENEVE tunnel test, l3 mode"

This reverts commit a9f54ca5080aeef17686f300a6807bf9b46b7c90.

Reason for revert: DO NOT MERGE BROKEN TESTS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

https://logs.fd.io/production/vex-yul-rot-jenkins-1/csit-vpp-device-master-ubuntu1804-1n-skx/9918/archives/log.html.gz


Change-Id: I2ce2970a43e5dd7487eeb54d1ccbb149e06cf8fa
Signed-off-by: pmikus <pmikus@cisco.com>

8 files changed, 90 insertions, 374 deletions

diff --git a/resources/api/vpp/supported_crcs.yaml b/resources/api/vpp/supported_crcs.yaml
index 7b5a718c29..2d25a42dfa 100644
--- a/resources/api/vpp/supported_crcs.yaml
+++ b/resources/api/vpp/supported_crcs.yaml
@@ -43,8 +43,6 @@
     # 6x^ tc01-64B-1c-ethip4udp-ip4base-iacl1sf-10kflows-mrr
     #     tc01-64B-1c-ethip4udp-ip4base-iacl1sl-10kflows-mrr
     # ^^ ip4fwdANDiaclANDacl10AND100_flows
-    add_node_next: '0x2457116d'  # dev
-    add_node_next_reply: '0x2ed75f32'  # dev
     avf_create: '0xdaab8ae2'  # dev
     avf_create_reply: '0x5383d31f'  # dev
     bond_create: '0x48883c7e'  # perf
@@ -92,10 +90,6 @@
     det44_session_dump: '0xe45a3af7'  # perf teardown
     # TODO: Which test to run to verify det44_* messages?
     # dhcp_proxy_dump / details # honeycomb
-    geneve_add_del_tunnel2: '0x8c2a9999'  # dev
-    geneve_add_del_tunnel2_reply: '0x5383d31f'  # dev
-    geneve_tunnel_details: '0xe27e2748'  # dev
-    geneve_tunnel_dump: '0xf9e6675e'  # dev
     gpe_enable_disable: '0xc264d7bf'  # dev
     gpe_enable_disable_reply: '0xe8d4e804'  # dev
     # gre_tunnel_add_del / reply # unused L1 keyword: create_gre_tunnel_interface
@@ -255,8 +249,6 @@
     # ^ dot1qANDl2bdmaclrnANDbaseANDmemif
     sw_interface_set_flags: '0x6a2b491a'  # dev
     sw_interface_set_flags_reply: '0xe8d4e804'  # dev
-    sw_interface_set_geneve_bypass: '0x65247409'  # dev
-    sw_interface_set_geneve_bypass_reply: '0xe8d4e804'  # dev
     sw_interface_set_l2_bridge: '0x2e483cd0'  # dev
     sw_interface_set_l2_bridge_reply: '0xe8d4e804'  # dev
     sw_interface_set_l2_xconnect: '0x1aaa2dbb'  # dev
diff --git a/resources/libraries/python/GeneveUtil.py b/resources/libraries/python/GeneveUtil.py
deleted file mode 100644
index 3c8ebeebb3..0000000000
--- a/resources/libraries/python/GeneveUtil.py
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""VPP GENEVE Plugin utilities library."""
-
-from ipaddress import ip_address
-
-from resources.libraries.python.Constants import Constants
-from resources.libraries.python.InterfaceUtil import InterfaceUtil
-from resources.libraries.python.IPAddress import IPAddress
-from resources.libraries.python.PapiExecutor import PapiSocketExecutor
-from resources.libraries.python.topology import Topology
-
-
-class GeneveUtil:
-    """VPP GENEVE Plugin Keywords."""
-
-    @staticmethod
-    def add_geneve_tunnel(
-            node, local_address, remote_address, vni, multicast_if=None,
-            encap_vrf=0, l3_mode=False, next_index=None):
-        """Add GENEVE tunnel on the specified VPP node.
-
-        :param node: Topology node.
-        :param local_address: Local IP address.
-        :param remote_address: Remote IP address.
-        :param vni: Virtual network ID.
-        :param multicast_if: Interface key of multicast interface; used only if
-            remote is multicast. (Default value = None)
-        :param encap_vrf: The FIB ID for sending unicast GENEVE encap packets or
-            receiving multicast packets. (Default value = 0)
-        :param l3_mode: Use geneve tunnel in L3 mode (ip routing) if Tue else in
-            L2 mode (L2 switching). (Default value = False)
-        :param next_index: The index of the next node.
-        :type node: dict
-        :type local_address: str
-        :type remote_address: str
-        :type vni: int
-        :type multicast_if: str
-        :type encap_vrf: int
-        :type l3_mode: bool
-        :type next_index: int
-        :returns: SW interface index of created geneve tunnel.
-        :rtype: int
-        """
-        cmd = u"geneve_add_del_tunnel2"
-        args = dict(
-            is_add=True,
-            local_address=IPAddress.create_ip_address_object(
-                ip_address(local_address)
-            ),
-            remote_address=IPAddress.create_ip_address_object(
-                ip_address(remote_address)
-            ),
-            mcast_sw_if_index=Topology.get_interface_sw_index(
-                node, multicast_if
-            ) if multicast_if else Constants.BITWISE_NON_ZERO,
-            encap_vrf_id=int(encap_vrf),
-            decap_next_index=next_index if l3_mode
-            else Constants.BITWISE_NON_ZERO,
-            vni=int(vni),
-            l3_mode=l3_mode
-        )
-        err_msg = f"Failed to configure GENEVE tunnel on host {node[u'host']}!"
-        with PapiSocketExecutor(node) as papi_exec:
-            sw_if_index = papi_exec.add(cmd, **args).get_sw_if_index(err_msg)
-
-        if_key = Topology.add_new_port(node, u"geneve_tunnel")
-        Topology.update_interface_sw_if_index(node, if_key, sw_if_index)
-
-        ifc_name = InterfaceUtil.vpp_get_interface_name(node, sw_if_index)
-        Topology.update_interface_name(node, if_key, ifc_name)
-
-        ifc_mac = InterfaceUtil.vpp_get_interface_mac(node, sw_if_index)
-        Topology.update_interface_mac_address(node, if_key, ifc_mac)
-
-        return sw_if_index
-
-    @staticmethod
-    def enable_interface_geneve_bypass(node, interface, is_ipv6=False):
-        """Add ipv4/ipv6-geneve-bypass graph node for a given interface on
-        the specified VPP node.
-
-        :param node: Topology node.
-        :param interface: Interface key from topology file of interface
-            to add geneve bypass node for.
-        :param is_ipv6: Enable ipv6-geneve-bypass graph node if True else enable
-            ipv4-geneve-bypass graph node.
-        :type node: dict
-        :type interface: str
-        :type is_ipv6: bool
-        """
-        cmd = u"sw_interface_set_geneve_bypass"
-        args = dict(
-            is_ipv6=is_ipv6,
-            enable=True,
-            sw_if_index=Topology.get_interface_sw_index(node, interface)
-        )
-        err_msg = (
-            f"Failed to enable {u'ipv6' if is_ipv6 else u'ipv4'}-geneve-bypass "
-            f"on interface {interface} on host {node[u'host']}!"
-        )
-        with PapiSocketExecutor(node) as papi_exec:
-            papi_exec.add(cmd, **args).get_reply(err_msg)
-
-    @staticmethod
-    def show_geneve_tunnel_data(node):
-        """Show the GENEVE tunnels data.
-
-        :param node: DUT node.
-        :type node: dict
-        """
-        cmds = [
-            u"geneve_tunnel_dump",
-        ]
-        PapiSocketExecutor.dump_and_log(node, cmds)
diff --git a/resources/libraries/python/LispSetup.py b/resources/libraries/python/LispSetup.py
index 6579764596..59cb1a808d 100644
--- a/resources/libraries/python/LispSetup.py
+++ b/resources/libraries/python/LispSetup.py
@@ -40,8 +40,8 @@ class LispEid:
         :type eid: str
         :type prefix_len: int
         """
-        eid_addr = dict(
-            prefix=IPUtil.create_prefix_object(ip_address(eid), prefix_len)
+        eid_addr = dict(prefix=IPUtil.create_prefix_object(
+            ip_address(eid), prefix_len)
         ) if prefix_len else dict(mac=str(eid))
 
         return dict(
diff --git a/resources/libraries/python/VPPUtil.py b/resources/libraries/python/VPPUtil.py
index a7ec44c974..c735494282 100644
--- a/resources/libraries/python/VPPUtil.py
+++ b/resources/libraries/python/VPPUtil.py
@@ -361,26 +361,3 @@ class VPPUtil:
         logger.trace(f"show threads:\n{threads_data}")
 
         return threads_data
-
-    @staticmethod
-    def vpp_add_graph_node_next(node, graph_node_name, graph_next_name):
-        """Set the next node for a given node.
-
-        :param node: Node to run command on.
-        :param graph_node_name: Graph node to add the next node on.
-        :param graph_next_name: Graph node to add as the next node.
-        :type node: dict
-        :type graph_node_name: str
-        :type graph_next_name: str
-        :returns: The index of the next node.
-        :rtype: int
-        """
-        cmd = u"add_node_next"
-        args = dict(
-            node_name=graph_node_name,
-            next_name=graph_next_name
-        )
-        with PapiSocketExecutor(node) as papi_exec:
-            reply = papi_exec.add(cmd, **args).get_reply()
-
-        return reply[u"next_index"]
diff --git a/resources/libraries/python/topology.py b/resources/libraries/python/topology.py
index 2b930c08dc..338ccb6b57 100644
--- a/resources/libraries/python/topology.py
+++ b/resources/libraries/python/topology.py
@@ -174,7 +174,7 @@ class Topology:
         port_types = (
             u"subinterface", u"vlan_subif", u"memif", u"tap", u"vhost",
             u"loopback", u"gre_tunnel", u"vxlan_tunnel", u"eth_bond",
-            u"eth_avf", u"eth_rdma", u"geneve_tunnel"
+            u"eth_avf", u"eth_rdma"
         )
 
         for node_data in nodes.values():
diff --git a/resources/libraries/robot/ip/geneve.robot b/resources/libraries/robot/ip/geneve.robot
deleted file mode 100644
index c9de91d708..0000000000
--- a/resources/libraries/robot/ip/geneve.robot
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Library | resources.libraries.python.GeneveUtil
-|
-| Documentation | Keywords for GENEVE tunnels in VPP.
-
-*** Keywords ***
-| Initialize GENEVE L3 mode in circular topology
-| | [Documentation] | Initialization of GENEVE L3 mode on DUT1.
-| |
-| | [Arguments] | ${with_bypass}=${False}
-| |
-| | Set interfaces in path up
-| |
-| | VPP Interface Set IP Address
-| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${dut1_if1_ip4} | 24
-| | VPP Add IP Neighbor
-| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${tg_if1_ip4} | ${TG_pf1_mac}[0]
-| | VPP Interface Set IP Address
-| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${dut1_if2_ip4} | 24
-| | VPP Add IP Neighbor
-| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${tg_if2_ip4} | ${TG_pf2_mac}[0]
-| | ${next_index}= | VPP Add Graph Node Next
-| | ... | ${dut1} | geneve4-input | ethernet-input
-| |
-| | ${src_ip_int} = | IP To Int | ${gen_tunnel.src_ip}
-| | ${dst_ip_int} = | IP To Int | ${gen_tunnel.dst_ip}
-| | ${if_ip_int} = | IP To Int | ${gen_tunnel.if_ip}
-| |
-| | FOR | ${nr} | IN RANGE | 0 | ${n_tunnels}
-| | | ${src_ip} = | Int To IP | ${${src_ip_int} + ${nr} * 256}
-| | | ${dst_ip} = | Int To IP | ${${dst_ip_int} + ${nr} * 256}
-| | | ${if_ip} = | Int To IP | ${${if_ip_int} + ${nr} * 256}
-| | | Vpp Route Add
-| | | ... | ${dut1} | ${src_ip} | ${gen_tunnel.ip_mask}
-| | | ... | gateway=${tg_if1_ip4} | interface=${DUT1_${int}1}[0]
-| | | ${tunnel_sw_index}= | Add Geneve Tunnel
-| | | ... | ${dut1} | ${gen_tunnel.local} | ${gen_tunnel.remote}
-| | | ... | ${${gen_tunnel.vni} + ${nr}} | l3_mode=${True}
-| | | ... | next_index=${next_index}
-| | | ${tunnel_if_key}= | Get Interface By SW Index
-| | | ... | ${dut1} | ${tunnel_sw_index}
-| | | ${tunnel_if_mac}= | Get Interface MAC
-| | | ... | ${dut1} | ${tunnel_if_key}
-| | | VPP Interface Set IP Address
-| | | ... | ${dut1} | ${tunnel_if_key} | ${if_ip} | 24
-| | | VPP Add IP Neighbor
-| | | ... | ${dut1} | ${tunnel_if_key} | ${dut1_if2_ip4} | ${DUT1_vf2_mac}[0]
-| | | Vpp Route Add
-| | | ... | ${dut1} | ${dst_ip} | ${gen_tunnel.ip_mask}
-| | | ... | gateway=${dut1_if2_ip4} | interface=${tunnel_if_key}
-| | | Vpp Route Add
-| | | ... | ${dut1} | ${gen_tunnel.remote} | 32
-| | | ... | gateway=${tg_if2_ip4} | interface=${DUT1_${int}2}[0]
-| | | VPP Add IP Neighbor
-| | | ... | ${dut1} | ${tunnel_if_key} | ${gen_tunnel.local} | ${tunnel_if_mac}
-| | | Vpp Route Add
-| | | ... | ${dut1} | ${gen_tunnel.local} | 32 | gateway=${if_ip}
-| | | Set Interface State
-| | | ... | ${dut1} | ${tunnel_if_key} | up
-| | END
-| | All VPP Interfaces Ready Wait | ${nodes} | retries=${60}
diff --git a/resources/libraries/robot/shared/test_teardown.robot b/resources/libraries/robot/shared/test_teardown.robot
index d6df417db1..c3d1e8a5ca 100644
--- a/resources/libraries/robot/shared/test_teardown.robot
+++ b/resources/libraries/robot/shared/test_teardown.robot
@@ -61,22 +61,30 @@
 | | END
 | | Clean Sockets On All Nodes | ${nodes}
 
-# Additional Test Tear Down Actions in alphabetical order
-| Additional Test Tear Down Action For acl
+| Additional Test Tear Down Action For performance
 | | [Documentation]
-| | ... | Additional teardown for tests which uses ACL feature.
+| | ... | Additional teardown for tests which uses performance measurement.
+| | ... | Optionally, call \${resetter} (if defined) to reset DUT state.
 | |
-| | Run Keyword If Test Failed
-| | ... | Vpp Log Plugin Acl Settings | ${dut1}
-| | Run Keyword If Test Failed
-| | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| | ... | TODO: Document what test variables are required or optional.
+| |
+| | Run Keyword If Test Passed | Return From Keyword
+| | ${use_latency} = | Get Use Latency
+| | ${rate_for_teardown} = | Get Rate For Teardown
+| | Call Resetter
+| | Set Test Variable | \${extended_debug} | ${True}
+| | Send traffic at specified rate
+| | ... | trial_duration=${1.0}
+| | ... | rate=${rate_for_teardown}
+| | ... | trial_multiplicity=${1}
+| | ... | use_latency=${use_latency}
+| | ... | duration_limit=${1.0}
 
-| Additional Test Tear Down Action For classify
+| Additional Test Tear Down Action For packet_trace
 | | [Documentation]
-| | ... | Additional teardown for tests which uses classify tables.
+| | ... | Additional teardown for tests which uses packet trace.
 | |
-| | Run Keyword If Test Failed
-| | ... | Show Classify Tables Verbose on all DUTs | ${nodes}
+| | Show Packet Trace on All DUTs | ${nodes}
 
 | Additional Test Tear Down Action For container
 | | [Documentation]
@@ -86,40 +94,42 @@
 | | | Destroy all '${container_group}' containers
 | | END
 
-| Additional Test Tear Down Action For det44
+| Additional Test Tear Down Action For vhost
 | | [Documentation]
-| | ... | Additional teardown for tests which uses DET44 feature.
+| | ... | Additional teardown for tests which uses vhost(s) and VM(s).
 | |
-| | FOR | ${dut} | IN | @{duts}
-| | | Run Keyword If Test Failed
-| | | ... | Show DET44 verbose | ${nodes['${dut}']}
-| | END
+| | Show VPP vhost on all DUTs | ${nodes}
+| | ${vnf_status} | ${value}= | Run Keyword And Ignore Error
+| | ... | Keyword Should Exist | vnf_manager.Kill All VMs
+| | Run Keyword If | '${vnf_status}' == 'PASS' | vnf_manager.Kill All VMs
 
-| Additional Test Tear Down Action For geneve4
+| Additional Test Tear Down Action For vhost-pt
 | | [Documentation]
-| | ... | Additional teardown for tests which uses GENEVE IPv4 tunnel.
+| | ... | Additional teardown for tests which uses pci-passtrough and VM(s).
 | |
-| | FOR | ${dut} | IN | @{duts}
-| | | Run Keyword If Test Failed
-| | | ... | Show Geneve Tunnel Data | ${nodes['${dut}']}
-| | END
+| | ${vnf_status} | ${value}= | Run Keyword And Ignore Error
+| | ... | Keyword Should Exist | vnf_manager.Kill All VMs
+| | Run Keyword If | '${vnf_status}' == 'PASS' | vnf_manager.Kill All VMs
 
-| Additional Test Tear Down Action For linux_bridge
+| Additional Test Tear Down Action For det44
 | | [Documentation]
-| | ... | Additional teardown for tests which uses linux_bridge.
+| | ... | Additional teardown for tests which uses DET44 feature.
 | |
 | | FOR | ${dut} | IN | @{duts}
-| | | Linux Del Bridge | ${nodes['${dut}']} | ${bid_TAP}
+| | | Run Keyword If Test Failed
+| | | ... | Show DET44 verbose | ${nodes['${dut}']}
 | | END
 
-| Additional Test Tear Down Action For macipacl
+| Additional Test Tear Down Action For nat-ed
 | | [Documentation]
-| | ... | Additional teardown for tests which uses MACIP ACL feature.
+| | ... | Additional teardown for tests which uses NAT feature.
 | |
-| | Run Keyword If Test Failed
-| | ... | Vpp Log Macip Acl Settings | ${dut1}
-| | Run Keyword If Test Failed
-| | ... | Vpp Log Macip Acl Interface Assignment | ${dut1}
+| | FOR | ${dut} | IN | @{duts}
+| | | Show NAT44 Config | ${nodes['${dut}']}
+| | | Show NAT44 Summary | ${nodes['${dut}']}
+| | | Show NAT Base Data | ${nodes['${dut}']}
+| | | Vpp Get Ip Table Summary | ${nodes['${dut}']}
+| | END
 
 | Additional Test Tear Down Action For namespace
 | | [Documentation]
@@ -129,41 +139,38 @@
 | | | Clean Up Namespaces | ${nodes['${dut}']}
 | | END
 
-| Additional Test Tear Down Action For nat-ed
+| Additional Test Tear Down Action For linux_bridge
 | | [Documentation]
-| | ... | Additional teardown for tests which uses NAT feature.
+| | ... | Additional teardown for tests which uses linux_bridge.
 | |
 | | FOR | ${dut} | IN | @{duts}
-| | | Show NAT44 Config | ${nodes['${dut}']}
-| | | Show NAT44 Summary | ${nodes['${dut}']}
-| | | Show NAT Base Data | ${nodes['${dut}']}
-| | | Vpp Get Ip Table Summary | ${nodes['${dut}']}
+| | | Linux Del Bridge | ${nodes['${dut}']} | ${bid_TAP}
 | | END
 
-| Additional Test Tear Down Action For packet_trace
+| Additional Test Tear Down Action For acl
 | | [Documentation]
-| | ... | Additional teardown for tests which uses packet trace.
+| | ... | Additional teardown for tests which uses ACL feature.
 | |
-| | Show Packet Trace on All DUTs | ${nodes}
+| | Run Keyword If Test Failed
+| | ... | Vpp Log Plugin Acl Settings | ${dut1}
+| | Run Keyword If Test Failed
+| | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
 
-| Additional Test Tear Down Action For performance
+| Additional Test Tear Down Action For macipacl
 | | [Documentation]
-| | ... | Additional teardown for tests which uses performance measurement.
-| | ... | Optionally, call \${resetter} (if defined) to reset DUT state.
+| | ... | Additional teardown for tests which uses MACIP ACL feature.
 | |
-| | ... | TODO: Document what test variables are required or optional.
+| | Run Keyword If Test Failed
+| | ... | Vpp Log Macip Acl Settings | ${dut1}
+| | Run Keyword If Test Failed
+| | ... | Vpp Log Macip Acl Interface Assignment | ${dut1}
+
+| Additional Test Tear Down Action For classify
+| | [Documentation]
+| | ... | Additional teardown for tests which uses classify tables.
 | |
-| | Run Keyword If Test Passed | Return From Keyword
-| | ${use_latency} = | Get Use Latency
-| | ${rate_for_teardown} = | Get Rate For Teardown
-| | Call Resetter
-| | Set Test Variable | \${extended_debug} | ${True}
-| | Send traffic at specified rate
-| | ... | trial_duration=${1.0}
-| | ... | rate=${rate_for_teardown}
-| | ... | trial_multiplicity=${1}
-| | ... | use_latency=${use_latency}
-| | ... | duration_limit=${1.0}
+| | Run Keyword If Test Failed
+| | ... | Show Classify Tables Verbose on all DUTs | ${nodes}
 
 | Additional Test Tear Down Action For srv6
 | | [Documentation]
@@ -175,20 +182,3 @@
 | | ... | Show SR Steering Policies on all DUTs | ${nodes}
 | | Run Keyword If Test Failed
 | | ... | Show SR LocalSIDs on all DUTs | ${nodes}
-
-| Additional Test Tear Down Action For vhost
-| | [Documentation]
-| | ... | Additional teardown for tests which uses vhost(s) and VM(s).
-| |
-| | Show VPP vhost on all DUTs | ${nodes}
-| | ${vnf_status} | ${value}= | Run Keyword And Ignore Error
-| | ... | Keyword Should Exist | vnf_manager.Kill All VMs
-| | Run Keyword If | '${vnf_status}' == 'PASS' | vnf_manager.Kill All VMs
-
-| Additional Test Tear Down Action For vhost-pt
-| | [Documentation]
-| | ... | Additional teardown for tests which uses pci-passtrough and VM(s).
-| |
-| | ${vnf_status} | ${value}= | Run Keyword And Ignore Error
-| | ... | Keyword Should Exist | vnf_manager.Kill All VMs
-| | Run Keyword If | '${vnf_status}' == 'PASS' | vnf_manager.Kill All VMs
diff --git a/resources/libraries/robot/shared/traffic.robot b/resources/libraries/robot/shared/traffic.robot
index 08f579c9df..1f10787bc1 100644
--- a/resources/libraries/robot/shared/traffic.robot
+++ b/resources/libraries/robot/shared/traffic.robot
@@ -61,7 +61,7 @@
 | |
 | | ... | *Example:*
 | |
-| | ... | \| Send packet and verify headers \| \${nodes['TG']} \| 10.0.0.1 \
+| | ... | \| Send packet and verify headers \| ${nodes['TG']} \| 10.0.0.1 \
 | | ... | \| 32.0.0.1 \| eth2 \| 08:00:27:ee:fd:b3 \| 08:00:27:a2:52:5b \
 | | ... | \| eth3 \| 08:00:27:4d:ca:7a \| 08:00:27:7d:fd:10 \|
 | |
@@ -120,7 +120,7 @@
 | | ... | *Example:*
 | |
 | | ... | \| Packet transmission from port to port should fail \
-| | ... | \| \${nodes['TG']} \| 10.0.0.1 \ \| 32.0.0.1 \| eth2 \
+| | ... | \| ${nodes['TG']} \| 10.0.0.1 \ \| 32.0.0.1 \| eth2 \
 | | ... | \| 08:00:27:a2:52:5b \| eth3 \| 08:00:27:4d:ca:7a \
 | | ... | \| 08:00:27:ee:fd:b3 \| 08:00:27:7d:fd:10 \|
 | | [Arguments] | ${tg_node} | ${src_ip} | ${dst_ip} | ${tx_src_port}
@@ -150,7 +150,7 @@
 | | ... | - dst_ip - Packet destination IP address. Type: string
 | |
 | | ... | *Example:*
-| | ... | \| Send packet and verify marking \| \${nodes['TG']} \| eth1 \| eth2 \
+| | ... | \| Send packet and verify marking \| ${nodes['TG']} \| eth1 \| eth2 \
 | | ... | \| 08:00:27:87:4d:f7 \| 52:54:00:d4:d8:22 \| 192.168.122.2 \
 | | ... | \| 192.168.122.1 \|
 | |
@@ -190,9 +190,9 @@
 | | ... | *Example:*
 | |
 | | ... | \| Send VXLAN encapsulated packet and verify received packet \
-| | ... | \| \${tg_node} \| port4 \| port4 \
+| | ... | \| ${tg_node} \| port4 \| port4 \
 | | ... | \| fa:16:3e:6d:f9:c5 \| fa:16:3e:e6:6d:9a \| 192.168.0.1 \
-| | ... | \| 192.168.0.2 \| ${101} \| 192.168.0.2 \| 192.168.0.1 \| \${102} \|
+| | ... | \| 192.168.0.2 \| ${101} \| 192.168.0.2 \| 192.168.0.1 \| ${102} \|
 | |
 | | [Arguments] | ${tg_node} | ${tx_if} | ${rx_if}
 | | ... | ${tx_src_mac} | ${tx_dst_mac}
@@ -231,7 +231,7 @@
 | | ... | *Example:*
 | |
 | | ... | \| Send ICMP echo request and verify answer \
-| | ... | \| \${nodes['TG']} \| eth2 \
+| | ... | \| ${nodes['TG']} \| eth2 \
 | | ... | \| 08:00:27:46:2b:4c \| 08:00:27:66:b8:57 \
 | | ... | \| 192.168.23.10 \| 192.168.23.1 \| 10 \|
 | |
@@ -270,14 +270,14 @@
 | | ... | - r_tunnel - Remote tunnel IP address (optional). Type: string
 | |
 | | ... | *Example:*
-| | ... | \| \${encr_alg}= \| Crypto Alg AES CBC 128 \|
-| | ... | \| \${auth_alg}= \| Integ Alg SHA1 96 \|
+| | ... | \| ${encr_alg}= \| Crypto Alg AES CBC 128 \|
+| | ... | \| ${auth_alg}= \| Integ Alg SHA1 96 \|
 | | ... | \| Send IPsec Packet and verify ESP encapsulation in received packet\
-| | ... | \| \${nodes['TG']} \| eth1 \| eth2 \
-| | ... | \| 52:54:00:d4:d8:22 \| 52:54:00:d4:d8:3e \| \${encr_alg} \
+| | ... | \| ${nodes['TG']} \| eth1 \| eth2 \
+| | ... | \| 52:54:00:d4:d8:22 \| 52:54:00:d4:d8:3e \| ${encr_alg} \
 | | ... | \| sixteenbytes_key \| ${auth_alg} \| twentybytessecretkey \
-| | ... | \| \${1001} \| \00} \| 192.168.3.3 \| 192.168.4.4 \
-| | ... | \| 192.168.100.2 \| 192.168.100.3 \|
+| | ... | \| ${1001} \| ${1000} \| 192.168.3.3 \| 192.168.4.4 \| 192.168.100.2 \
+| | ... | \| 192.168.100.3 \|
 | |
 | | [Arguments] | ${node} | ${tx_interface} | ${rx_interface} | ${tx_dst_mac}
 | | ... | ${rx_src_mac} | ${crypto_alg} | ${crypto_key} | ${integ_alg}
@@ -329,7 +329,7 @@
 | |
 | | ... | *Example:*
 | |
-| | ... | \| Send packet and verify LISP encap \| \${nodes['TG']} \| 10.0.0.1 \
+| | ... | \| Send packet and verify LISP encap \| ${nodes['TG']} \| 10.0.0.1 \
 | | ... | \| 32.0.0.1 \| eth2 \| 08:00:27:ee:fd:b3 \| 08:00:27:a2:52:5b \
 | | ... | \| eth3 \| 08:00:27:4d:ca:7a \| 08:00:27:7d:fd:10 \| 10.0.1.1 \
 | | ... | \| 10.0.1.2 \|
@@ -373,14 +373,14 @@
 | | ... | - dst_tun - Destination tunnel IP address. Type: string
 | |
 | | ... | *Example:*
-| | ... | \| \${encr_alg}= \| Crypto Alg AES CBC 128 \|
-| | ... | \| \${auth_alg}= \| Integ Alg SHA1 96 \|
+| | ... | \| ${encr_alg}= \| Crypto Alg AES CBC 128 \|
+| | ... | \| ${auth_alg}= \| Integ Alg SHA1 96 \|
 | | ... | \| Send IPsec Packet and verify ESP encapsulation in received packet\
-| | ... | \| \${nodes['TG']} \| eth1 \| eth2 \
-| | ... | \| 52:54:00:d4:d8:22 \| 52:54:00:d4:d8:3e \| \${encr_alg} \
-| | ... | \| sixteenbytes_key \| \${auth_alg} \| twentybytessecretkey \
-| | ... | \| \${1001} \| \${1000} \| 192.168.3.3 \| 192.168.4.4 \
-| | ... | \| 192.168.100.2 \| 192.168.100.3 \|
+| | ... | \| ${nodes['TG']} \| eth1 \| eth2 \
+| | ... | \| 52:54:00:d4:d8:22 \| 52:54:00:d4:d8:3e \| ${encr_alg} \
+| | ... | \| sixteenbytes_key \| ${auth_alg} \| twentybytessecretkey \
+| | ... | \| ${1001} \| ${1000} \| 192.168.3.3 \| 192.168.4.4 \| 192.168.100.2 \
+| | ... | \| 192.168.100.3 \|
 | |
 | | [Arguments] | ${node} | ${tx_interface} | ${rx_interface} | ${tx_dst_mac}
 | | ... | ${rx_src_mac} | ${crypto_alg} | ${crypto_key} | ${integ_alg}
@@ -429,7 +429,7 @@
 | |
 | | ... | *Example:*
 | |
-| | ... | \| Send packet and verify LISP GPE encap \| \${nodes['TG']} \
+| | ... | \| Send packet and verify LISP GPE encap \| ${nodes['TG']} \
 | | ... | \| 10.0.0.1 \| 32.0.0.1 \
 | | ... | \| eth2 \| 08:00:27:ee:fd:b3 \| 08:00:27:a2:52:5b \
 | | ... | \| eth3 \| 08:00:27:4d:ca:7a \| 08:00:27:7d:fd:10 \
@@ -476,7 +476,7 @@
 | |
 | | ... | *Example:*
 | |
-| | ... | \| Send packet and verify LISP encap \| \${nodes['TG']} \| 10.0.0.1 \
+| | ... | \| Send packet and verify LISP encap \| ${nodes['TG']} \| 10.0.0.1 \
 | | ... | \| 32.0.0.1 \| eth2 \| 08:00:27:ee:fd:b3 \| 08:00:27:a2:52:5b \
 | | ... | \| eth3 \| 08:00:27:4d:ca:7a \| 08:00:27:7d:fd:10 \| 10.0.1.1 \
 | | ... | \| 10.0.1.2 \|
@@ -529,7 +529,7 @@
 | |
 | | ... | *Example:*
 | | ... | \| Send IPv6 Packet and verify SRv6 encapsulation in received packet\
-| | ... | \| \${nodes['TG']} \| eth1 \| eth2 \
+| | ... | \| ${nodes['TG']} \| eth1 \| eth2 \
 | | ... | \| 52:54:00:d4:d8:22 \| 52:54:00:d4:d8:3e \| 2002:1:: \
 | | ... | \| 2003:2:: \| 2003:1:: \| 2002:2:: \| decap=${False} \
 | | ... | \| tg_dstsid3=2002:4:: \| dut_dstsid3=2003:4:: \
@@ -589,7 +589,7 @@
 | | ... | *Example:*
 | |
 | | ... | \| Send TCP or UDP packet and verify network address translations \
-| | ... | \| \${nodes['TG']} \| port1 \| port2 \| 08:00:27:cc:4f:54 \
+| | ... | \| ${nodes['TG']} \| port1 \| port2 \| 08:00:27:cc:4f:54 \
 | | ... | \| 08:00:27:c9:6a:d5 \| 192.168.0.0 \| 68.142.68.0 \| 20.0.0.0 \
 | | ... | \| TCP \| 1024 \| 8080 \|
 | |
@@ -609,46 +609,3 @@
 | | ... | --src_port_in ${src_port_in} | --src_port_out ${src_port_out}
 | | ... | --dst_port ${dst_port}
 | | Run Traffic Script On Node | nat.py | ${tg_node} | ${args}
-
-| Send IP packet and verify GENEVE encapsulation in received packets
-| | [Documentation] | Send IP packet from TG to DUT. Receive GENEVE packet\
-| | ... | from DUT on TG and verify GENEVE encapsulation. Send GENEVE packet in\
-| | ... | opposite direction and verify received IP packet.
-| |
-| | ... | *Arguments:*
-| | ... | - node - TG node. Type: dictionary
-| | ... | - tx_interface - TG Interface 1. Type: string
-| | ... | - rx_interface - TG Interface 2. Type: string
-| | ... | - tx_dst_mac - Destination MAC for TX interface / DUT interface 1 MAC.
-| | ... | Type: string
-| | ... | - rx_src_mac - Source MAC for RX interface / DUT interface 2 MAC.
-| | ... | Type: string
-| | ... | - tun_local_ip - GENEVE tunnel source IP address. Type: string
-| | ... | - tun_remote_ip - GENEVE tunnel destination IP address. Type: string
-| | ... | - tun_vni - GENEVE tunnel VNI. Type: integer
-| | ... | - tun_src_ip - Source IP address of original IP packet / inner source
-| | ... | IP address of GENEVE packet. Type: string
-| | ... | - tun_dst_ip - Destination IP address of original IP packet / inner
-| | ... | destination IP address of GENEVE packet. Type: string
-| |
-| | ... | *Example:*
-| | ... | \| Send IP packet and verify GENEVE encapsulation in received packets\
-| | ... | \| \${nodes['TG']} \| eth1 \| eth2 \
-| | ... | \| 52:54:00:d4:d8:22 \| 52:54:00:d4:d8:3e \| 1.1.1.2 \| 1.1.1.1 \
-| | ... | \| 1 \| 10.128.1.0 \| 10.0.1.0 \| 24 \|11.0.1.2\|
-| |
-| | [Arguments] | ${node} | ${tx_interface} | ${rx_interface}
-| | ... | ${tx_dst_mac} | ${rx_src_mac} | ${tun_local_ip} | ${tun_remote_ip}
-| | ... | ${tun_vni} | ${tun_src_ip} | ${tun_dst_ip}
-| |
-| | ${tx_src_mac}= | Get Interface Mac | ${node} | ${tx_interface}
-| | ${tx_if_name}= | Get Interface Name | ${node} | ${tx_interface}
-| | ${rx_dst_mac}= | Get Interface Mac | ${node} | ${rx_interface}
-| | ${rx_if_name}= | Get Interface Name | ${node} | ${rx_interface}
-| | ${args}= | Catenate | --rx_if ${rx_if_name} | --tx_if ${tx_if_name}
-| | ... | --tx_src_mac ${tx_src_mac} | --tx_dst_mac ${tx_dst_mac}
-| | ... | --rx_src_mac ${rx_src_mac} | --rx_dst_mac ${rx_dst_mac}
-| | ... | --tun_local_ip ${tun_local_ip} | --tun_remote_ip ${tun_remote_ip}
-| | ... | --tun_vni ${tun_vni} | --tun_src_ip ${tun_src_ip}
-| | ... | --tun_dst_ip ${tun_dst_ip}
-| | Run Traffic Script On Node | geneve_tunnel.py | ${node} | ${args}