From: Neale Ranns Date: Sat, 25 Feb 2017 14:23:37 +0000 (+0000) Subject: Remove unused VRF paramter from IP neighbour Add/del X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=refs%2Fchanges%2F23%2F5523%2F6 Remove unused VRF paramter from IP neighbour Add/del Change-Id: I4a348c696e4cacbf5aa0723f2b8070bbcce7666c Signed-off-by: Neale Ranns --- diff --git a/ID b/ID deleted file mode 100644 index 076076fc8d..0000000000 Binary files a/ID and /dev/null differ diff --git a/resources/libraries/python/IPv4Setup.py b/resources/libraries/python/IPv4Setup.py index 0220139c04..7129e67231 100644 --- a/resources/libraries/python/IPv4Setup.py +++ b/resources/libraries/python/IPv4Setup.py @@ -202,23 +202,19 @@ class Dut(IPv4Node): # TODO: check return value VatExecutor.cmd_from_template(self.node_info, script, **args) - def set_arp(self, iface_key, ip_address, mac_address, vrf=None): + def set_arp(self, iface_key, ip_address, mac_address): """Set entry in ARP cache. :param iface_key: Interface key. :param ip_address: IP address. :param mac_address: MAC address. - :param vrf: VRF table ID (Optional). :type iface_key: str :type ip_address: str :type mac_address: str - :type vrf: int """ - vrf = "vrf {}".format(vrf) if vrf else '' self.exec_vat('add_ip_neighbor.vat', sw_if_index=self.get_sw_if_index(iface_key), - ip_address=ip_address, mac_address=mac_address, - vrf=vrf) + ip_address=ip_address, mac_address=mac_address) def set_ip(self, interface, address, prefix_length): self.exec_vat('add_ip_address.vat', @@ -350,18 +346,16 @@ class IPv4Setup(object): get_node(node).set_arp(iface_key, ip_address, mac_address) @staticmethod - def add_arp_on_dut(node, iface_key, ip_address, mac_address, vrf=None): + def add_arp_on_dut(node, iface_key, ip_address, mac_address): """Set ARP cache entree on DUT node. :param node: VPP Node in the topology. :param iface_key: Interface key. :param ip_address: IP address of the interface. :param mac_address: MAC address of the interface. - :param vrf: VRF table ID (Optional). :type node: dict :type iface_key: str :type ip_address: str :type mac_address: str - :type vrf: int """ - get_node(node).set_arp(iface_key, ip_address, mac_address, vrf) + get_node(node).set_arp(iface_key, ip_address, mac_address) diff --git a/resources/libraries/python/IPv6Util.py b/resources/libraries/python/IPv6Util.py index 2a4704dff2..1aab1816f2 100644 --- a/resources/libraries/python/IPv6Util.py +++ b/resources/libraries/python/IPv6Util.py @@ -111,22 +111,18 @@ class IPv6Util(object): n=node['host'], p=interface)) @staticmethod - def add_ip_neighbor(node, interface, ip_address, mac_address, vrf=None): + def add_ip_neighbor(node, interface, ip_address, mac_address): """Add IP neighbor. :param node: VPP node to add ip neighbor. :param interface: Interface name or sw_if_index. :param ip_address: IP address. :param mac_address: MAC address. - :param vrf: VRF table ID (Optional). :type node: dict :type interface: str or int :type ip_address: str :type mac_address: str - :type vrf: int """ - vrf = "vrf {}".format(vrf) if vrf else '' - if isinstance(interface, basestring): sw_if_index = Topology.get_interface_sw_index(node, interface) else: @@ -136,5 +132,4 @@ class IPv6Util(object): vat.vat_terminal_exec_cmd_from_template("add_ip_neighbor.vat", sw_if_index=sw_if_index, ip_address=ip_address, - mac_address=mac_address, - vrf=vrf) + mac_address=mac_address) diff --git a/resources/libraries/robot/vrf.robot b/resources/libraries/robot/vrf.robot index b741e4a533..ef6091ec89 100644 --- a/resources/libraries/robot/vrf.robot +++ b/resources/libraries/robot/vrf.robot @@ -67,9 +67,9 @@ | | ... | ${node} | ${vrf_src_if} | ${table} | | ... | | Add IP Neighbor | ${node} | ${vrf_src_if} -| | ... | ${src_if_ip} | ${src_if_mac} | vrf=${table} +| | ... | ${src_if_ip} | ${src_if_mac} | | Add IP Neighbor | ${node} | ${route_interface} -| | ... | ${route_gateway_ip} | ${route_gateway_mac} | vrf=${table} +| | ... | ${route_gateway_ip} | ${route_gateway_mac} | | ... | | Vpp Route Add | ${node} | ${route_dst_ip} | ${prefix_len} | | ... | ${route_gateway_ip} | ${route_interface} | vrf=${table} diff --git a/resources/templates/vat/add_ip_neighbor.vat b/resources/templates/vat/add_ip_neighbor.vat index de868e1de7..730e7112ad 100644 --- a/resources/templates/vat/add_ip_neighbor.vat +++ b/resources/templates/vat/add_ip_neighbor.vat @@ -1 +1 @@ -ip_neighbor_add_del sw_if_index {sw_if_index} dst {ip_address} mac {mac_address} {vrf} +ip_neighbor_add_del sw_if_index {sw_if_index} dst {ip_address} mac {mac_address} diff --git a/tests/func/ipv4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot index b456c4f0a6..b7d25746d7 100644 --- a/tests/func/ipv4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot +++ b/tests/func/ipv4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot @@ -89,7 +89,7 @@ | | ... | vrf=${fib_table_2} | | Add IP Neighbor | ${dut_node} | ${vhost1} | ${net2_ip2} | ${vhost2_mac} | | Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} -| | ... | ${tg_to_dut_if2_mac} | vrf=${fib_table_2} +| | ... | ${tg_to_dut_if2_mac} | | When VM for Vhost L2BD forwarding is setup | | ... | ${dut_node} | ${sock1} | ${sock2} | | Then Send Packet And Check Headers diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot index d3a3cda788..e3f94250a2 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -183,14 +183,12 @@ | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot index 04067a6f0f..c6cd734fe6 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot @@ -163,7 +163,7 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup 3-node Topology | ${fib_table_1} -| | And Add IP Neighbors | ${fib_table_1} +| | And Add IP Neighbors | | When IPsec Generate Keys | ${encr_alg} | ${auth_alg} | | And Set up LISP GPE topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} @@ -205,7 +205,7 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup 3-node Topology | ${fib_table_1} -| | And Add IP Neighbors | ${fib_table_1} +| | And Add IP Neighbors | | And Set up LISP GPE topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} @@ -260,14 +260,12 @@ | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot index 3d3b3ceb8e..d59d85897a 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -153,13 +153,13 @@ | | Vpp Set If IPv6 Addr | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | | ... | ${prefix6} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6} -| | ... | ${tg_to_dut2_mac} | ${fib_table} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} | | ... | ${dut1_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} -| | ... | ${tg_to_dut1_mac} | ${fib_table} +| | ... | ${tg_to_dut1_mac} | | Set up LISP GPE topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot index df942c7888..484a5cdb9e 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot @@ -145,13 +145,13 @@ | | Vpp Set If IPv6 Addr | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | | ... | ${prefix6} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6} -| | ... | ${tg_to_dut2_mac} | ${fib_table} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} | | ... | ${dut1_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} -| | ... | ${tg_to_dut1_mac} | ${fib_table} +| | ... | ${tg_to_dut1_mac} | | Set up LISP GPE topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot index 4974224edd..a4089e03a9 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot @@ -118,13 +118,13 @@ | | Vpp Set If IPv6 Addr | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | | ... | ${prefix6} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6} -| | ... | ${tg_to_dut2_mac} | ${fib_table} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} | | ... | ${dut1_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} -| | ... | ${tg_to_dut1_mac} | ${fib_table} +| | ... | ${tg_to_dut1_mac} | | Set up LISP GPE topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot index cac15ce4a4..d095b79f97 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot @@ -95,14 +95,12 @@ *** Keywords *** | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot index d83dec66c3..7199cda821 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot @@ -76,7 +76,7 @@ | | ... | ${dut1_to_tg} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} -| | And Add IP Neighbors | ${fib_table_1} +| | And Add IP Neighbors | | And IP addresses are set on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} @@ -125,14 +125,12 @@ | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot index 83c15ec882..65c6e932ba 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot @@ -75,7 +75,7 @@ | | ... | ${dut1_to_tg} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} -| | And Add IP Neighbors | ${fib_table_1} +| | And Add IP Neighbors | | And IP addresses are set on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} @@ -100,14 +100,12 @@ *** Keywords *** | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot index b959ff20d0..896dc43a60 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot @@ -103,14 +103,12 @@ *** Keywords *** | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6o4} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6o4} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6o4} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot index 7d88aa0016..7cc24ba11d 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot @@ -68,7 +68,7 @@ | | ... | ${dut1_to_tg} | ${fib_table_1} | ip6=${TRUE} | | And Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} | ip6=${TRUE} -| | And Add IP Neighbors | ${fib_table_1} +| | And Add IP Neighbors | | And IP addresses are set on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6o4} | | ... | ${dut_prefix6o4} @@ -95,14 +95,12 @@ *** Keywords *** | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6o4} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6o4} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6o4} diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot index 9d47158e18..4c8bf01bcc 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -122,14 +122,12 @@ | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6} diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot index 28316511cc..c82465c106 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot @@ -97,14 +97,12 @@ *** Keywords *** | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6} diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot index 52c37b3306..6b45cd09d9 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot @@ -84,7 +84,7 @@ | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip6} | ${prefix6} | | And Vpp Set If IPv6 Addr | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6} -| | And Add IP Neighbors | ${fib_table_1} +| | And Add IP Neighbors | | When Set up LISP GPE topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} @@ -129,14 +129,12 @@ | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6} diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot index 500f138da6..662aba0c2e 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot @@ -82,7 +82,7 @@ | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip6} | ${prefix6} | | And Vpp Set If IPv6 Addr | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6} -| | And Add IP Neighbors | ${fib_table_1} +| | And Add IP Neighbors | | When Set up LISP GPE topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} @@ -102,14 +102,12 @@ *** Keywords *** | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6} diff --git a/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot b/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot index 7a76a1805c..f2413ff612 100644 --- a/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot +++ b/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot @@ -363,22 +363,22 @@ | | ... | ${dut2_to_dut1_ip2} | ${ip_prefix} | | And Add Arp On Dut | ${dut1_node} | ${dut1_to_tg_if1} -| | ... | ${tg_dut1_ip1} | ${tg_to_dut1_if1_mac} | vrf=${fib_table_1} +| | ... | ${tg_dut1_ip1} | ${tg_to_dut1_if1_mac} | | And Add Arp On Dut | ${dut1_node} | ${dut1_to_dut2_if1} -| | ... | ${dut2_to_dut1_ip1} | ${dut2_to_dut1_if1_mac} | vrf=${fib_table_1} +| | ... | ${dut2_to_dut1_ip1} | ${dut2_to_dut1_if1_mac} | | And Add Arp On Dut | ${dut2_node} | ${dut2_to_tg_if1} -| | ... | ${tg_dut2_ip1} | ${tg_to_dut2_if1_mac} | vrf=${fib_table_1} +| | ... | ${tg_dut2_ip1} | ${tg_to_dut2_if1_mac} | | And Add Arp On Dut | ${dut2_node} | ${dut2_to_dut1_if1} -| | ... | ${dut1_to_dut2_ip1} | ${dut1_to_dut2_if1_mac} | vrf=${fib_table_1} +| | ... | ${dut1_to_dut2_ip1} | ${dut1_to_dut2_if1_mac} | | And Add Arp On Dut | ${dut1_node} | ${dut1_to_tg_if2} -| | ... | ${tg_dut1_ip2} | ${tg_to_dut1_if2_mac} | vrf=${fib_table_2} +| | ... | ${tg_dut1_ip2} | ${tg_to_dut1_if2_mac} | | And Add Arp On Dut | ${dut1_node} | ${dut1_to_dut2_if2} -| | ... | ${dut2_to_dut1_ip2} | ${dut2_to_dut1_if2_mac} | vrf=${fib_table_2} +| | ... | ${dut2_to_dut1_ip2} | ${dut2_to_dut1_if2_mac} | | And Add Arp On Dut | ${dut2_node} | ${dut2_to_tg_if2} -| | ... | ${tg_dut2_ip2} | ${tg_to_dut2_if2_mac} | vrf=${fib_table_2} +| | ... | ${tg_dut2_ip2} | ${tg_to_dut2_if2_mac} | | And Add Arp On Dut | ${dut2_node} | ${dut2_to_dut1_if2} -| | ... | ${dut1_to_dut2_ip2} | ${dut1_to_dut2_if2_mac} | vrf=${fib_table_2} +| | ... | ${dut1_to_dut2_ip2} | ${dut1_to_dut2_if2_mac} | | And Vpp Route Add | ${dut1_node} | ${tg_dut2_ip1} | ${ip_prefix} | | ... | ${dut2_to_dut1_ip1} | ${dut1_to_dut2_if1} | vrf=${fib_table_1} diff --git a/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot b/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot index b88b6fd577..acbf7ea543 100644 --- a/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot +++ b/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot @@ -379,22 +379,22 @@ | | ... | ${dut2_to_dut1_ip2} | ${ip_prefix} | | And Add IP Neighbor | ${dut1_node} | ${dut1_to_tg_if1} -| | ... | ${tg_dut1_ip1} | ${tg_to_dut1_if1_mac} | vrf=${fib_table_1} +| | ... | ${tg_dut1_ip1} | ${tg_to_dut1_if1_mac} | | And Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2_if1} -| | ... | ${dut2_to_dut1_ip1} | ${dut2_to_dut1_if1_mac} | vrf=${fib_table_1} +| | ... | ${dut2_to_dut1_ip1} | ${dut2_to_dut1_if1_mac} | | And Add IP Neighbor | ${dut2_node} | ${dut2_to_tg_if1} -| | ... | ${tg_dut2_ip1} | ${tg_to_dut2_if1_mac} | vrf=${fib_table_1} +| | ... | ${tg_dut2_ip1} | ${tg_to_dut2_if1_mac} | | And Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1_if1} -| | ... | ${dut1_to_dut2_ip1} | ${dut1_to_dut2_if1_mac} | vrf=${fib_table_1} +| | ... | ${dut1_to_dut2_ip1} | ${dut1_to_dut2_if1_mac} | | And Add IP Neighbor | ${dut1_node} | ${dut1_to_tg_if2} -| | ... | ${tg_dut1_ip2} | ${tg_to_dut1_if2_mac} | vrf=${fib_table_2} +| | ... | ${tg_dut1_ip2} | ${tg_to_dut1_if2_mac} | | And Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2_if2} -| | ... | ${dut2_to_dut1_ip2} | ${dut2_to_dut1_if2_mac} | vrf=${fib_table_2} +| | ... | ${dut2_to_dut1_ip2} | ${dut2_to_dut1_if2_mac} | | And Add IP Neighbor | ${dut2_node} | ${dut2_to_tg_if2} -| | ... | ${tg_dut2_ip2} | ${tg_to_dut2_if2_mac} | vrf=${fib_table_2} +| | ... | ${tg_dut2_ip2} | ${tg_to_dut2_if2_mac} | | And Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1_if2} -| | ... | ${dut1_to_dut2_ip2} | ${dut1_to_dut2_if2_mac} | vrf=${fib_table_2} +| | ... | ${dut1_to_dut2_ip2} | ${dut1_to_dut2_if2_mac} | | And Vpp Route Add | ${dut1_node} | ${tg_dut2_ip1} | ${ip_prefix} | | ... | ${dut2_to_dut1_ip1} | ${dut1_to_dut2_if1} | vrf=${fib_table_1}