From c75b9804c9510d0a342563e41407089145b38d50 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Wed, 21 Sep 2016 10:19:35 +0200 Subject: LISP - implement changes done in VPP-376 Change-Id: Ia9f7913522421b6fd9ecba18eb4d68bc0f3b3271 Signed-off-by: Tibor Frank --- tests/func/lisp/lisp_api_untagged.robot | 19 ++++++++----------- tests/func/lisp/lisp_dataplane_untagged.robot | 5 ----- tests/func/lisp/lisp_ipv4_lispgpe_ipv4.robot | 2 +- 3 files changed, 9 insertions(+), 17 deletions(-) (limited to 'tests/func') diff --git a/tests/func/lisp/lisp_api_untagged.robot b/tests/func/lisp/lisp_api_untagged.robot index 385b4a7d3b..38692a067a 100644 --- a/tests/func/lisp/lisp_api_untagged.robot +++ b/tests/func/lisp/lisp_api_untagged.robot @@ -61,10 +61,9 @@ | | ... | configured locator_set and locator are correct. [Cfg2] Then | | ... | remove locator_set and locator. [Ver2] check DUT1 locator_set | | ... | and locator are removed. [Ref] RFC6830. -| | [Tags] | EXPECTED_FAILING | | Given Lisp locator_set data is prepared | | ... | ${nodes['DUT1']} | ${locator_set_num} -| | And Enable lisp | ${nodes['DUT1']} +| | And Enable lisp | ${nodes['DUT1']} | | When Lisp locator_set data is set | ${nodes['DUT1']} | | Then Lisp locator_set is set correctly | ${nodes['DUT1']} | | When Delete all lisp locator_set from VPP | ${nodes['DUT1']} @@ -79,10 +78,9 @@ | | ... | locator are correct. [Cfg3] Then remove locator_set and locator. | | ... | [Ver3] Check DUT1 all locator_set and locators are removed. | | ... | [Ref] RFC6830. -| | [Tags] | EXPECTED_FAILING | | Given Lisp locator_set data use for test reset locator_set are prepared | | ... | ${nodes['DUT1']} | ${locator_set_num} -| | And Enable lisp | ${nodes['DUT1']} +| | And Enable lisp | ${nodes['DUT1']} | | When Lisp locator_set data is set | ${nodes['DUT1']} | | Then Lisp locator_set is set correctly | ${nodes['DUT1']} | | When Delete all lisp locator_set from VPP | ${nodes['DUT1']} @@ -94,11 +92,10 @@ | | ... | configure LISP eid IP address. [Ver1] Check DUT1 configured data | | ... | is correct. [Cfg2] Remove configured data. [Ver2] Check DUT1 all | | ... | eid IP addresses are removed. [Ref] RFC6830. -| | [Tags] | EXPECTED_FAILING | | Given Enable lisp | ${nodes['DUT1']} | | When Lisp eid address is set | ${nodes['DUT1']} | ${eid_table} -| | Then Lisp eid address is set correctly to eid table | ${nodes['DUT1']} -| | ... | ${eid_table} +| | Then Lisp eid address is set correctly to eid table +| | ... | ${nodes['DUT1']} | ${eid_table_vat} | | When Delete all lisp eid address from VPP | ${nodes['DUT1']} | ${eid_table} | | Then Lisp eid table should be empty | ${nodes['DUT1']} @@ -111,8 +108,8 @@ | | ... | RFC6830. | | Given Enable lisp | ${nodes['DUT1']} | | When Lisp map resolver address is set | ${nodes['DUT1']} | ${map_resolver} -| | Then Lisp map resolver address is set correctly | ${nodes['DUT1']} -| | ... | ${map_resolver} -| | When Delete all lisp map resolver address from VPP | ${nodes['DUT1']} -| | ... | ${map_resolver} +| | Then Lisp map resolver address is set correctly +| | ... | ${nodes['DUT1']} | ${map_resolver} +| | When Delete all lisp map resolver address from VPP +| | ... | ${nodes['DUT1']} | ${map_resolver} | | Then Lip map resolver address should be empty | ${nodes['DUT1']} diff --git a/tests/func/lisp/lisp_dataplane_untagged.robot b/tests/func/lisp/lisp_dataplane_untagged.robot index 0fe9aaff18..f2da80a2db 100644 --- a/tests/func/lisp/lisp_dataplane_untagged.robot +++ b/tests/func/lisp/lisp_dataplane_untagged.robot @@ -62,7 +62,6 @@ | | ... | [Cfg2] Reconf LISP. | | ... | [Ver2] Verify packets are received again via LISP tunnel. | | ... | [Ref] RFC6830. -| | [Tags] | EXPECTED_FAILING | | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Interfaces in 3-node path are up @@ -122,7 +121,6 @@ | | ... | [Cfg2] Reconf LISP. | | ... | [Ver2] Verify packets are received again via LISP tunnel. | | ... | [Ref] RFC6830. -| | [Tags] | EXPECTED_FAILING | | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Interfaces in 3-node path are up @@ -182,7 +180,6 @@ | | ... | [Cfg2] Reconf LISP. | | ... | [Ver2] Verify packets are received again via LISP tunnel. | | ... | [Ref] RFC6830. -| | [Tags] | EXPECTED_FAILING | | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Interfaces in 3-node path are up @@ -241,7 +238,6 @@ | | ... | [Cfg2] Reconf LISP. | | ... | [Ver2] Verify packets are received again via LISP tunnel. | | ... | [Ref] RFC6830. -| | [Tags] | EXPECTED_FAILING | | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Interfaces in 3-node path are up @@ -302,7 +298,6 @@ | | ... | [Cfg3] Re-enable LISP. | | ... | [Ver3] Verify packets are received again via LISP tunnel. | | ... | [Ref] RFC6830. -| | [Tags] | EXPECTED_FAILING | | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Interfaces in 3-node path are up diff --git a/tests/func/lisp/lisp_ipv4_lispgpe_ipv4.robot b/tests/func/lisp/lisp_ipv4_lispgpe_ipv4.robot index 8a18962e35..0ffcb8909a 100644 --- a/tests/func/lisp/lisp_ipv4_lispgpe_ipv4.robot +++ b/tests/func/lisp/lisp_ipv4_lispgpe_ipv4.robot @@ -26,7 +26,7 @@ # Import configuration and test data: | Variables | resources/test_data/lisp/ipv4_lispgpe_ipv4/ipv4_lispgpe_ipv4.py | ... -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | EXPECTED_FAILING +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | ... | Test Setup | Run Keywords | Setup all DUTs before test | ... | AND | Setup all TGs before traffic script -- cgit 1.2.3-korg