From 021f8d100444281caf176b33f6dcc12bfba09f1f Mon Sep 17 00:00:00 2001 From: Andrej Kozemcak Date: Wed, 6 Jul 2016 16:17:00 +0200 Subject: CSIT-195: Update LISP test - add new input parameters for LISP API - change LISP json output Change-Id: I36dbf44dc78f128963c7f665a01d2ecde4598c28 Signed-off-by: Andrej Kozemcak --- tests/suites/lisp/lisp_api_untagged.robot | 5 +- tests/suites/lisp/lisp_dataplane_untagged.robot | 7 +- tests/suites/lisp/resources/lisp_api_resources.py | 59 ---------- tests/suites/lisp/resources/lisp_static_mapping.py | 124 --------------------- 4 files changed, 10 insertions(+), 185 deletions(-) delete mode 100644 tests/suites/lisp/resources/lisp_api_resources.py delete mode 100644 tests/suites/lisp/resources/lisp_static_mapping.py (limited to 'tests') diff --git a/tests/suites/lisp/lisp_api_untagged.robot b/tests/suites/lisp/lisp_api_untagged.robot index 21ccc68858..f92a92d435 100644 --- a/tests/suites/lisp/lisp_api_untagged.robot +++ b/tests/suites/lisp/lisp_api_untagged.robot @@ -20,7 +20,7 @@ | Resource | resources/libraries/robot/interfaces.robot | Resource | resources/libraries/robot/lisp/lisp_api.robot # import additional Lisp settings from resource file -| Variables | tests/suites/lisp/resources/lisp_api_resources.py +| Variables | resources/test_data/lisp/api/lisp_api_resources.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV | Test Setup | Run Keywords | Setup all DUTs before test @@ -49,6 +49,7 @@ | | ... | DUT1 enable LISP. [Ver1] Check DUT1 if LISP is enabled. [Cfg2] | | ... | Then disable LISP. [Ver2] Check DUT1 if LISP is disabled. [Ref] | | ... | RFC6830. +| | [Tags] | EXPECTED_FAILING | | When Enable lisp | ${nodes['DUT1']} | | Then Check if lisp is enabled | ${nodes['DUT1']} | ${lisp_status} | | When Disable lisp | ${nodes['DUT1']} @@ -61,6 +62,7 @@ | | ... | 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']} @@ -78,6 +80,7 @@ | | ... | 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']} diff --git a/tests/suites/lisp/lisp_dataplane_untagged.robot b/tests/suites/lisp/lisp_dataplane_untagged.robot index 47c7cf87be..0808d366c6 100644 --- a/tests/suites/lisp/lisp_dataplane_untagged.robot +++ b/tests/suites/lisp/lisp_dataplane_untagged.robot @@ -22,7 +22,7 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPv4Util.IPv4Util # import additional Lisp settings from resource file -| Variables | tests/suites/lisp/resources/lisp_static_mapping.py +| Variables | resources/test_data/lisp/static_mapping/lisp_static_mapping.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV | Test Setup | Run Keywords | Setup all DUTs before test @@ -59,6 +59,7 @@ | | ... | ICMPv4 Echo Req between its interfaces across both DUTs and LISP | | ... | tunnel between them; verify IPv4 headers on received packets are | | ... | correct. [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 @@ -99,6 +100,7 @@ | | ... | ICMPv6 Echo Req between its interfaces across both DUTs and LISP | | ... | tunnel between them; verify IPv4 headers on received packets are | | ... | correct. [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 @@ -139,6 +141,7 @@ | | ... | ICMPv4 Echo Req between its interfaces across both DUTs and LISP | | ... | tunnel between them; verify IPv4 headers on received packets are | | ... | correct. [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 @@ -179,6 +182,7 @@ | | ... | ICMPv6 Echo Req between its interfaces across both DUTs and LISP | | ... | tunnel between them; verify IPv4 headers on received packets are | | ... | correct. [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 @@ -221,6 +225,7 @@ | | ... | correct. [Cfg2] Disable LISP. [Ver2] verify packets are not | | ... | received via LISP tunnel. [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/suites/lisp/resources/lisp_api_resources.py b/tests/suites/lisp/resources/lisp_api_resources.py deleted file mode 100644 index 7a85fd8558..0000000000 --- a/tests/suites/lisp/resources/lisp_api_resources.py +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright (c) 2016 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. - -"""Test variables for Lisp API test suite.""" - -"""Lisp status example test data.""" -lisp_status = [[{"gpe_status":"disabled", - "feature_status":"disabled"}], - [{"gpe_status":"enabled", - "feature_status":"enabled"}]] - -"""Example lisp local eid we want set to VPP -and then check if is set correct.""" -eid_table = [{'eid address': '192.168.0.1', - 'vni': 0, - 'eid prefix len': 24, - 'locator-set': 'ls1'}, - {'eid address': '192.168.1.1', - 'vni': 0, - 'eid prefix len': 24, - 'locator-set': 'ls1'}, - {'eid address': '192.168.2.1', - 'vni': 0, - 'eid prefix len': 24, - 'locator-set': 'ls1'}, - {'eid address': '192.168.3.1', - 'vni': 0, - 'eid prefix len': 24, - 'locator-set': 'ls1'}, - {'eid address': '10:1::1', - 'vni': 0, - 'eid prefix len': 32, - 'locator-set': 'ls1'}, - {'eid address': '10:2::1', - 'vni': 0, - 'eid prefix len': 32, - 'locator-set': 'ls1'}, - {'eid address': '10:3::1', - 'vni': 0, - 'eid prefix len': 32, - 'locator-set': 'ls1'}] - -"""Example lisp map resolvers data we want set to VPP -and then check if is set correct.""" -map_resolver = [{'map resolver': '192.169.0.1'}, - {'map resolver': '192.169.1.1'}, - {'map resolver': '192.169.2.1'}, - {'map resolver': '12:1::1'}, - {'map resolver': '12:2::1'}] diff --git a/tests/suites/lisp/resources/lisp_static_mapping.py b/tests/suites/lisp/resources/lisp_static_mapping.py deleted file mode 100644 index 3b27af969b..0000000000 --- a/tests/suites/lisp/resources/lisp_static_mapping.py +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright (c) 2016 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. - -"""Test variables for Lisp remote static mapping test suite.""" - -#Lisp default global value -locator_name = 'ls1' - -#Lisp default locator_set value -duts_locator_set = {'locator_name': locator_name, - 'priority': 1, - 'weight': 1} - -# IPv4 Lisp static mapping configuration -dut1_to_dut2_ip4 = '6.0.3.1' -dut2_to_dut1_ip4 = '6.0.3.2' -dut1_to_tg_ip4 = '6.0.1.1' -dut2_to_tg_ip4 = '6.0.2.1' -tg1_ip4 = '6.0.1.2' -tg2_ip4 = '6.0.2.2' -prefix4 = 24 -dut1_ip4_static_mapping = {'vni': 0, - 'deid': '6.0.2.0', - 'seid': '6.0.1.0', - 'rloc': '6.0.3.2', - 'prefix': 24} -dut2_ip4_static_mapping = {'vni': 0, - 'deid': '6.0.1.0', - 'seid': '6.0.2.0', - 'rloc': '6.0.3.1', - 'prefix': 24} -dut1_ip4_eid = {'locator_name': locator_name, - 'eid': '6.0.1.0', - 'prefix': 24} -dut2_ip4_eid = {'locator_name': locator_name, - 'eid': '6.0.2.0', - 'prefix': 24} - -# IPv6 Lisp static mapping configuration -dut1_to_dut2_ip6 = '6:0:3::1' -dut2_to_dut1_ip6 = '6:0:3::2' -dut1_to_tg_ip6 = '6:0:1::1' -dut2_to_tg_ip6 = '6:0:2::1' -tg1_ip6 = '6:0:1::2' -tg2_ip6 = '6:0:2::2' -prefix6 = 64 -dut1_ip6_static_mapping = {'vni': 0, - 'deid': '6:0:2::0', - 'seid': '6:0:1::0', - 'rloc': '6:0:3::2', - 'prefix': 64} -dut2_ip6_static_mapping = {'vni': 0, - 'deid': '6:0:1::0', - 'seid': '6:0:2::0', - 'rloc': '6:0:3::1', - 'prefix': 64} -dut1_ip6_eid = {'locator_name': locator_name, - 'eid': '6:0:1::0', - 'prefix': 64} -dut2_ip6_eid = {'locator_name': locator_name, - 'eid': '6:0:2::0', - 'prefix': 64} - -# IPv4 over IPv6 Lisp static mapping configuration -dut1_to_dut2_ip4o6 = '6:0:3::1' -dut2_to_dut1_ip4o6 = '6:0:3::2' -dut1_to_tg_ip4o6 = '6.0.1.1' -dut2_to_tg_ip4o6 = '6.0.2.1' -tg1_ip4o6 = '6.0.1.2' -tg2_ip4o6 = '6.0.2.2' -tg_prefix4o6 = 24 -dut_prefix4o6 = 64 -dut1_ip4o6_static_mapping = {'vni': 0, - 'deid': '6.0.2.0', - 'seid': '6.0.1.0', - 'rloc': '6:0:3::2', - 'prefix': 24} -dut2_ip4o6_static_mapping = {'vni': 0, - 'deid': '6.0.1.0', - 'seid': '6.0.2.0', - 'rloc': '6:0:3::1', - 'prefix': 24} -dut1_ip4o6_eid = {'locator_name': locator_name, - 'eid': '6.0.1.0', - 'prefix': 24} -dut2_ip4o6_eid = {'locator_name': locator_name, - 'eid': '6.0.2.0', - 'prefix': 24} - -# IPv6 over IPv4 Lisp static mapping configuration -dut1_to_dut2_ip6o4 = '6.0.3.1' -dut2_to_dut1_ip6o4 = '6.0.3.2' -dut1_to_tg_ip6o4 = '6:0:1::1' -dut2_to_tg_ip6o4 = '6:0:2::1' -tg1_ip6o4 = '6:0:1::2' -tg2_ip6o4 = '6:0:2::2' -tg_prefix6o4 = 64 -dut_prefix6o4 = 24 -dut1_ip6o4_static_mapping = {'vni': 0, - 'deid': '6:0:2::0', - 'seid': '6:0:1::0', - 'rloc': '6.0.3.2', - 'prefix': 64} -dut2_ip6o4_static_mapping = {'vni': 0, - 'deid': '6:0:1::0', - 'seid': '6:0:2::0', - 'rloc': '6.0.3.1', - 'prefix': 64} -dut1_ip6o4_eid = {'locator_name': locator_name, - 'eid': '6:0:1::0', - 'prefix': 64} -dut2_ip6o4_eid = {'locator_name': locator_name, - 'eid': '6:0:2::0', - 'prefix': 64} -- cgit 1.2.3-korg