From 721f39743c31003ccbdad3c27ffcc3145bfccf90 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Thu, 7 Jul 2016 23:00:04 +0200 Subject: CSIT-199: Use static adjacencies in LISP dp tests Switch to using static adjacencies and remote mappings instead of only the latter in LISP data plane tests. Change-Id: Ia2a05165425ac68fa7839f9c8f402033b8274fcf Signed-off-by: Florin Coras --- .../lisp/static_adjacency/lisp_static_adjacency.py | 132 +++++++++++++++++++++ .../lisp/static_mapping/lisp_static_mapping.py | 132 --------------------- 2 files changed, 132 insertions(+), 132 deletions(-) create mode 100644 resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py delete mode 100644 resources/test_data/lisp/static_mapping/lisp_static_mapping.py (limited to 'resources/test_data') diff --git a/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py b/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py new file mode 100644 index 0000000000..de7aff068d --- /dev/null +++ b/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py @@ -0,0 +1,132 @@ +# 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_to_dut2_ip4_static_adjacency = {'vni': 0, + 'deid': '6.0.2.0', + 'seid': '6.0.1.0', + 'rloc': '6.0.3.2', + 'prefix': 24} +dut2_to_dut1_ip4_static_adjacency = {'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, + 'vni': 0, + 'eid': '6.0.1.0', + 'prefix': 24} +dut2_ip4_eid = {'locator_name': locator_name, + 'vni': 0, + '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_to_dut2_ip6_static_adjacency = {'vni': 0, + 'deid': '6:0:2::0', + 'seid': '6:0:1::0', + 'rloc': '6:0:3::2', + 'prefix': 64} +dut2_to_dut1_ip6_static_adjacency = {'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, + 'vni': 0, + 'eid': '6:0:1::0', + 'prefix': 64} +dut2_ip6_eid = {'locator_name': locator_name, + 'vni': 0, + '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_adjacency = {'vni': 0, + 'deid': '6.0.2.0', + 'seid': '6.0.1.0', + 'rloc': '6:0:3::2', + 'prefix': 24} +dut2_ip4o6_static_adjacency = {'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, + 'vni': 0, + 'eid': '6.0.1.0', + 'prefix': 24} +dut2_ip4o6_eid = {'locator_name': locator_name, + 'vni': 0, + '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_adjacency = {'vni': 0, + 'deid': '6:0:2::0', + 'seid': '6:0:1::0', + 'rloc': '6.0.3.2', + 'prefix': 64} +dut2_ip6o4_static_adjacency = {'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, + 'vni': 0, + 'eid': '6:0:1::0', + 'prefix': 64} +dut2_ip6o4_eid = {'locator_name': locator_name, + 'vni': 0, + 'eid': '6:0:2::0', + 'prefix': 64} diff --git a/resources/test_data/lisp/static_mapping/lisp_static_mapping.py b/resources/test_data/lisp/static_mapping/lisp_static_mapping.py deleted file mode 100644 index 94ff2c529c..0000000000 --- a/resources/test_data/lisp/static_mapping/lisp_static_mapping.py +++ /dev/null @@ -1,132 +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, - 'vni': 0, - 'eid': '6.0.1.0', - 'prefix': 24} -dut2_ip4_eid = {'locator_name': locator_name, - 'vni': 0, - '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, - 'vni': 0, - 'eid': '6:0:1::0', - 'prefix': 64} -dut2_ip6_eid = {'locator_name': locator_name, - 'vni': 0, - '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, - 'vni': 0, - 'eid': '6.0.1.0', - 'prefix': 24} -dut2_ip4o6_eid = {'locator_name': locator_name, - 'vni': 0, - '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, - 'vni': 0, - 'eid': '6:0:1::0', - 'prefix': 64} -dut2_ip6o4_eid = {'locator_name': locator_name, - 'vni': 0, - 'eid': '6:0:2::0', - 'prefix': 64} -- cgit 1.2.3-korg