diff options
21 files changed, 65 insertions, 33 deletions
diff --git a/resources/libraries/python/Routing.py b/resources/libraries/python/Routing.py index 2da7c1ac8d..f72d211a6b 100644 --- a/resources/libraries/python/Routing.py +++ b/resources/libraries/python/Routing.py @@ -25,7 +25,7 @@ class Routing(object): def vpp_route_add(node, network, prefix_len, gateway=None, interface=None, use_sw_index=True, resolve_attempts=10, count=1, vrf=None, lookup_vrf=None, multipath=False, - weight=None): + weight=None, local=False): """Add route to the VPP node. :param node: Node to add route on. @@ -37,6 +37,7 @@ class Routing(object): :param use_sw_index: Use sw_if_index in VAT command. :param resolve_attempts: Resolve attempts IP route add parameter. :param count: number of IP addresses to add starting from network IP + :param local: The route is local with same prefix (increment is 1). If None, then is not used. :param lookup_vrf: VRF table ID for lookup. :param multipath: Enable multipath routing. @@ -53,12 +54,16 @@ class Routing(object): :type lookup_vrf: int :type multipath: bool :type weight: int + :type local: bool """ - if use_sw_index: - int_cmd = ('sw_if_index {}'. - format(Topology.get_interface_sw_index(node, interface))) + if interface: + if use_sw_index: + int_cmd = ('sw_if_index {}'. + format(Topology.get_interface_sw_index(node, interface))) + else: + int_cmd = interface else: - int_cmd = interface + int_cmd = '' rap = 'resolve-attempts {}'.format(resolve_attempts) \ if resolve_attempts else '' @@ -76,6 +81,8 @@ class Routing(object): weight = 'weight {}'.format(weight) if weight else '' + local = 'local' if local else '' + with VatTerminal(node, json_param=False) as vat: vat.vat_terminal_exec_cmd_from_template('add_route.vat', network=network, @@ -87,29 +94,24 @@ class Routing(object): count=cnt, lookup_vrf=lookup_vrf, multipath=multipath, - weight=weight) + weight=weight, + local=local) @staticmethod - def add_fib_table(node, network, prefix_len, fib_id, place): + def add_fib_table(node, table_id, ipv6=False): """Create new FIB table according to ID. :param node: Node to add FIB on. - :param network: IP address to add to the FIB table. - :param prefix_len: IP address prefix length. - :param fib_id: FIB table ID. - :param place: Possible variants are local, drop. + :param table_id: FIB table ID. + :param ipv6: Is this an IPv6 table :type node: dict - :type network: str - :type prefix_len: int - :type fib_id: int - :type place: str + :type table_id: int + :type ipv6: bool """ with VatTerminal(node) as vat: vat.vat_terminal_exec_cmd_from_template('add_fib_table.vat', - network=network, - prefix_length=prefix_len, - fib_number=fib_id, - where=place) + table_id=table_id, + ipv6="ipv6" if ipv6 else "") @staticmethod def add_route(node, ip_addr, prefix, gateway, namespace=None): diff --git a/resources/templates/vat/add_fib_table.vat b/resources/templates/vat/add_fib_table.vat index 5adedd740d..2182be4ebd 100644 --- a/resources/templates/vat/add_fib_table.vat +++ b/resources/templates/vat/add_fib_table.vat @@ -1 +1 @@ -ip_add_del_route {network}/{prefix_length} {where} vrf {fib_number} create-vrf
\ No newline at end of file +ip_table_add_del table {table_id} {ipv6} diff --git a/resources/templates/vat/add_route.vat b/resources/templates/vat/add_route.vat index 8411bfbdfb..64c6a6c3b8 100644 --- a/resources/templates/vat/add_route.vat +++ b/resources/templates/vat/add_route.vat @@ -1 +1 @@ -ip_add_del_route {network}/{prefix_length} {via} {vrf} {interface} {resolve_attempts} {count} {lookup_vrf} {multipath} {weight}
\ No newline at end of file +ip_add_del_route {network}/{prefix_length} {via} {vrf} {interface} {resolve_attempts} {count} {lookup_vrf} {multipath} {weight} {local}
\ No newline at end of file diff --git a/resources/templates/vat/del_fib_table.vat b/resources/templates/vat/del_fib_table.vat new file mode 100644 index 0000000000..e287bc45bd --- /dev/null +++ b/resources/templates/vat/del_fib_table.vat @@ -0,0 +1 @@ +ip_table_add_del table {table_id} {ipv6} del diff --git a/tests/vpp/func/crypto/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot b/tests/vpp/func/crypto/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot index 11d7550563..15c10d40fc 100644 --- a/tests/vpp/func/crypto/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot +++ b/tests/vpp/func/crypto/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot @@ -241,8 +241,10 @@ | | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | Set interfaces in 3-node circular topology up +| | And Add Fib Table | ${dut1_node} | ${fib_table} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table} +| | And Add Fib Table | ${dut2_node} | ${fib_table} | | Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table} | | Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} diff --git a/tests/vpp/func/crypto/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot b/tests/vpp/func/crypto/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot index e85ef57d1f..8c131181f3 100644 --- a/tests/vpp/func/crypto/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot +++ b/tests/vpp/func/crypto/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot @@ -76,6 +76,8 @@ | | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Set interfaces in 3-node circular topology up +| | And Add Fib Table | ${dut1_node} | ${fib_table_1} | ip6=${TRUE} +| | And Add Fib Table | ${dut2_node} | ${fib_table_1} | ip6=${TRUE} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ip6=${TRUE} | | Assign Interface To Fib Table | ${dut2_node} diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copblklistbase-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copblklistbase-func.robot index 9ff3d2df75..2da3802480 100644 --- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copblklistbase-func.robot +++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copblklistbase-func.robot @@ -81,8 +81,7 @@ | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if2_ip_GW} | ${tg_to_dut2_mac} | | And Vpp Route Add | ${dut1_node} | | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_to_dut2} -| | And Add fib table | ${dut1_node} -| | ... | ${cop_dut_ip} | ${ip_prefix} | ${fib_table_number} | drop +| | And Add fib table | ${dut1_node} | ${fib_table_number} | | When COP Add whitelist Entry | | ... | ${dut1_node} | ${dut1_to_tg} | ip4 | ${fib_table_number} | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copwhlistbase-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copwhlistbase-func.robot index 775cbae579..df37b7b609 100644 --- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copwhlistbase-func.robot +++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copwhlistbase-func.robot @@ -81,8 +81,9 @@ | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if2_ip_GW} | ${tg_to_dut2_mac} | | And Vpp Route Add | ${dut1_node} | | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_to_dut2} -| | And Add fib table | ${dut1_node} -| | ... | ${cop_dut_ip} | ${ip_prefix} | ${fib_table_number} | local +| | And Add fib table | ${dut1_node} | ${fib_table_number} +| | And Vpp Route Add | ${dut1_node} +| | ... | ${cop_dut_ip} | ${ip_prefix} | vrf=${fib_table_number} | local=${TRUE} | | When COP Add whitelist Entry | | ... | ${dut1_node} | ${dut1_to_tg} | ip4 | ${fib_table_number} | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot index b520d4df6c..46bcf757d2 100644 --- a/tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot +++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot @@ -309,16 +309,20 @@ | | ... | ${dut2_node} | ${dut2_to_dut1_if1} | | ${dut2_if2_idx}= | Get Interface SW Index | | ... | ${dut2_node} | ${dut2_to_dut1_if2} -| | And Add fib table | ${dut1_node} +| | And Add fib table | ${dut1_node} | ${fib_table_1} +| | And Add fib table | ${dut1_node} | ${fib_table_2} +| | And Add fib table | ${dut2_node} | ${fib_table_1} +| | And Add fib table | ${dut2_node} | ${fib_table_2} +| | And Vpp Route Add | ${dut1_node} | | ... | ${tg_dut2_ip1} | ${ip_prefix} | ${fib_table_1} | | ... | via ${dut2_to_dut1_ip1} sw_if_index ${dut1_if1_idx} multipath -| | And Add fib table | ${dut1_node} +| | And Vpp Route Add | ${dut1_node} | | ... | ${tg_dut2_ip2} | ${ip_prefix} | ${fib_table_2} | | ... | via ${dut1_to_dut2_ip2} sw_if_index ${dut1_if2_idx} multipath -| | And Add fib table | ${dut2_node} +| | And Vpp Route Add | ${dut2_node} | | ... | ${tg_dut1_ip1} | ${ip_prefix} | ${fib_table_1} | | ... | via ${dut2_to_dut1_ip1} sw_if_index ${dut2_if1_idx} multipath -| | And Add fib table | ${dut2_node} +| | And Vpp Route Add | ${dut2_node} | | ... | ${tg_dut1_ip2} | ${ip_prefix} | ${fib_table_2} | | ... | via ${dut2_to_dut1_ip2} sw_if_index ${dut2_if2_idx} multipath diff --git a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot b/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot index 9346be1e5d..2aa4990564 100644 --- a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot +++ b/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot @@ -67,6 +67,8 @@ | | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Set interfaces in 3-node circular topology up +| | And Add Fib Table | ${dut1_node} | ${fib_table_1} +| | And Add Fib Table | ${dut2_node} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut2_node} diff --git a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot b/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot index 668e870ff0..2b13eae0dd 100644 --- a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot +++ b/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot @@ -66,6 +66,8 @@ | | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Set interfaces in 3-node circular topology up +| | And Add Fib Table | ${dut1_node} | ${fib_table_1} | ip6=${TRUE} +| | And Add Fib Table | ${dut2_node} | ${fib_table_1} | ip6=${TRUE} | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ip6=${TRUE} | | And Assign Interface To Fib Table | ${dut2_node} diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copblklistbase-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copblklistbase-func.robot index f4314500e5..f93c5b7f71 100644 --- a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copblklistbase-func.robot +++ b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copblklistbase-func.robot @@ -90,8 +90,7 @@ | | And Vpp Route Add | ${dut1_node} | | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_to_dut2} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | And Add fib table | ${dut1_node} -| | ... | ${cop_dut_ip} | ${ip_prefix} | ${fib_table_number} | drop +| | And Add fib table | ${dut1_node} | ${fib_table_number} | ipv6=${TRUE} | | When COP Add whitelist Entry | | ... | ${dut1_node} | ${dut1_to_tg} | ip6 | ${fib_table_number} | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copwhlistbase-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copwhlistbase-func.robot index a60aa7760c..22fc1517ba 100644 --- a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copwhlistbase-func.robot +++ b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copwhlistbase-func.robot @@ -90,8 +90,9 @@ | | And Vpp Route Add | ${dut1_node} | | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_to_dut2} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | And Add fib table | ${dut1_node} | ${cop_dut_ip} | ${ip_prefix} | -| | ... | ${fib_table_number} | local +| | And Add fib table | ${dut1_node} | ${fib_table_number} | ipv6=${TRUE} +| | And Vpp Route Add | ${dut1_node} +| | ... | ${cop_dut_ip} | ${ip_prefix} | vrf=${fib_table_number} | local=${TRUE} | | When COP Add whitelist Entry | ${dut1_node} | ${dut1_to_tg} | ip6 | | | ... | ${fib_table_number} | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6basevrf-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6basevrf-func.robot index cf0ed43a4a..2fbfd88a7c 100644 --- a/tests/vpp/func/ip6/eth2p-ethip6-ip6basevrf-func.robot +++ b/tests/vpp/func/ip6/eth2p-ethip6-ip6basevrf-func.robot @@ -338,6 +338,8 @@ | | ${dut2_if2_idx}= | Get Interface SW Index | | ... | ${dut2_node} | ${dut2_to_dut1_if2} +| | And Add Fib Table | ${dut1_node} | ${fib_table_1} | ipv6=${TRUE} +| | And Add Fib Table | ${dut1_node} | ${fib_table_2} | ipv6=${TRUE} | | Assign Interface To Fib Table | | ... | ${dut1_node} | ${dut1_to_dut2_if1} | ${fib_table_1} | ipv6=${TRUE} | | Assign Interface To Fib Table @@ -347,6 +349,8 @@ | | Assign Interface To Fib Table | | ... | ${dut1_node} | ${dut1_to_tg_if2} | ${fib_table_2} | ipv6=${TRUE} +| | And Add Fib Table | ${dut2_node} | ${fib_table_1} | ipv6=${TRUE} +| | And Add Fib Table | ${dut2_node} | ${fib_table_2} | ipv6=${TRUE} | | Assign Interface To Fib Table | | ... | ${dut2_node} | ${dut2_to_dut1_if1} | ${fib_table_1} | ipv6=${TRUE} | | Assign Interface To Fib Table diff --git a/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot b/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot index 198a14ce77..c89ab68414 100644 --- a/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot +++ b/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot @@ -66,6 +66,8 @@ | | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Set interfaces in 3-node circular topology up +| | And Add Fib Table | ${dut1_node} | ${fib_table_1} | ip6=${TRUE} +| | And Add Fib Table | ${dut2_node} | ${fib_table_1} | ip6=${TRUE} | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ipv6=${TRUE} | | And Assign Interface To Fib Table | ${dut2_node} diff --git a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot index 2a426f5efd..fe61568ba9 100644 --- a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot +++ b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot @@ -70,6 +70,7 @@ | | ${vhost2}= | And Vpp Create Vhost User Interface | ${dut_node} | ${sock2} | | And Set Interface State | ${dut_node} | ${vhost1} | up | | And Set Interface State | ${dut_node} | ${vhost2} | up +| | And Add Fib Table | ${dut_node} | ${fib_table_2} | | And Assign Interface To Fib Table | ${dut_node} | | ... | ${vhost2} | ${fib_table_2} | | And Assign Interface To Fib Table | ${dut_node} diff --git a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot index f4ff9a37d2..a247919fa1 100644 --- a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -163,6 +163,8 @@ | | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | Set interfaces in 3-node circular topology up +| | And Add Fib Table | ${dut1_node} | ${fib_table} +| | And Add Fib Table | ${dut2_node} | ${fib_table} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table} | | Assign Interface To Fib Table | ${dut2_node} diff --git a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot index 2bbafed6ee..c4c0c4a1d7 100644 --- a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -105,6 +105,7 @@ | | ... | | ${vhost1}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock1} | | ${vhost2}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock2} +| | And Add Fib Table | ${dut1_node} | ${fib_table} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${vhost2} | ${fib_table} | | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} diff --git a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot index 0a6a5e4603..09bed1aea7 100644 --- a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot @@ -67,6 +67,8 @@ | | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Set interfaces in 3-node circular topology up +| | And Add Fib Table | ${dut1_node} | ${fib_table_1} +| | And Add Fib Table | ${dut2_node} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut2_node} @@ -104,6 +106,7 @@ | | ... | | ${vhost1}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock1} | | ${vhost2}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock2} +| | And Add Fib Table | ${dut1_node} | ${fib_table} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${vhost2} | ${fib_table} | | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} diff --git a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot index 9ed970df7c..45b81d4f56 100644 --- a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -101,6 +101,7 @@ | | ... | | ${vhost1}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock1} | | ${vhost2}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock2} +| | And Add Fib Table | ${dut1_node} | ${fib_table} | ipv6={TRUE} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${vhost2} | ${fib_table} | ipv6=${TRUE} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${vhost2} | ${vhost_ip} diff --git a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot index a9d57c577f..16cded0f24 100644 --- a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot @@ -67,6 +67,8 @@ | | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Set interfaces in 3-node circular topology up +| | And Add Fib Table | ${dut1_node} | ${fib_table_1} | ipv6=${TRUE} +| | And Add Fib Table | ${dut2_node} | ${fib_table_1} | ipv6=${TRUE} | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ipv6=${TRUE} | | And Assign Interface To Fib Table | ${dut2_node} @@ -108,6 +110,7 @@ | | ... | | ${vhost1}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock1} | | ${vhost2}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock2} +| | And Add Fib Table | ${dut1_node} | ${fib_table} | ipv6=${TRUE} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${vhost2} | ${fib_table} | ipv6=${TRUE} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${vhost2} | ${vhost_ip} |