diff options
| author |   Neale Ranns <nranns@cisco.com> | 2017-02-17 21:09:54 +0000 |
|---|---|---|
| committer |   Jan Gelety <jgelety@cisco.com> | 2017-02-22 11:06:10 +0000 |
| commit | c5b285aebcfc93dcccf3285abbde672cf000e3cc (patch) | |
| tree | 4a9a9115f76694eee7fe97409a2d51dbaaf9c74a | |
| parent | 8ef4983395b46a834e3ffe712197ec2e2f2b50d1 (diff) | |
The interface must be assigned to the VRF and then given a prefix
Change-Id: I6a2fc503989576f806413ae98845e3e3676889b8
Signed-off-by: Neale Ranns <nranns@cisco.com>
| -rw-r--r-- | ID | bin | 0 -> 165760 bytes | |||
| -rw-r--r-- | resources/libraries/python/InterfaceUtil.py | 12 | ||||
| -rw-r--r-- | tests/func/lisp/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot | 2 | ||||
| -rw-r--r-- | tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot | 2 | ||||
| -rw-r--r-- | tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot | 4 | ||||
| -rw-r--r-- | tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot | 4 |
6 files changed, 14 insertions, 10 deletions
| Binary files differ diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py index 16acdf3214..5d6d8f7044 100644 --- a/resources/libraries/python/InterfaceUtil.py +++ b/resources/libraries/python/InterfaceUtil.py @@ -950,10 +950,14 @@ class InterfaceUtil(object): ipv6 = 'ipv6' if ipv6 else '' with VatTerminal(node) as vat: - vat.vat_terminal_exec_cmd_from_template("set_fib_to_interface.vat", - sw_index=sw_if_index, - vrf=table_id, - ipv6=ipv6) + ret = vat.vat_terminal_exec_cmd_from_template( + "set_fib_to_interface.vat", + sw_index=sw_if_index, vrf=table_id, ipv6=ipv6) + + if ret[0]["retval"] != 0: + raise RuntimeError('Unable to assign interface to FIB node {}.' + .format(node)) + @staticmethod def set_linux_interface_mac(node, interface, mac, namespace=None): diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot index d1eec4b25e..f9860e859e 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -110,9 +110,9 @@ | | ... | | ${vhost1}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock1} | | ${vhost2}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock2} -| | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${vhost2} | ${fib_table} +| | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up | | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} 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 7c6c6f4d3b..d83dec66c3 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 @@ -109,9 +109,9 @@ | | ... | | ${vhost1}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock1} | | ${vhost2}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock2} -| | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${vhost2} | ${fib_table} +| | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up | | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} 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 7baaeeec7e..9d47158e18 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 @@ -105,10 +105,10 @@ | | ... | | ${vhost1}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock1} | | ${vhost2}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock2} -| | Vpp Set If IPv6 Addr | ${dut1_node} | ${vhost2} | ${vhost_ip} -| | ... | ${prefix6} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${vhost2} | ${fib_table} | ipv6=${TRUE} +| | Vpp Set If IPv6 Addr | ${dut1_node} | ${vhost2} | ${vhost_ip} +| | ... | ${prefix6} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up | | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} 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 d9b489e198..52c37b3306 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 @@ -112,10 +112,10 @@ | | ... | | ${vhost1}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock1} | | ${vhost2}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock2} -| | Vpp Set If IPv6 Addr | ${dut1_node} | ${vhost2} | ${vhost_ip} -| | ... | ${prefix6} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${vhost2} | ${fib_table} | ipv6=${TRUE} +| | Vpp Set If IPv6 Addr | ${dut1_node} | ${vhost2} | ${vhost_ip} +| | ... | ${prefix6} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up | | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} |