Python3: resources and libraries

Change-Id: I1392c06b1d64f62b141d24c0d42a8e36913b15e2
Signed-off-by: Jan Gelety <jgelety@cisco.com>

12 files changed, 197 insertions, 917 deletions

diff --git a/resources/test_data/lisp/api/lisp_api_resources.py b/resources/test_data/lisp/api/lisp_api_resources.py
deleted file mode 100644
index cc97f1c0e3..0000000000
--- a/resources/test_data/lisp/api/lisp_api_resources.py
+++ /dev/null
@@ -1,140 +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 it is set correctly.
-eid_table = [{'eid': '192.168.0.0',
-              'vni': 0,
-              'eid-prefix-len': 24,
-              'locator': [],
-              'locator-set': 'ls1',
-              'ttl': 0,
-              'authoritative': 0},
-             {'eid': '192.168.1.0',
-              'vni': 0,
-              'eid-prefix-len': 24,
-              'locator': [],
-              'locator-set': 'ls1',
-              'ttl': 0,
-              'authoritative': 0},
-             {'eid': '192.168.2.0',
-              'vni': 0,
-              'eid-prefix-len': 24,
-              'locator': [],
-              'locator-set': 'ls1',
-              'ttl': 0,
-              'authoritative': 0},
-             {'eid': '192.168.3.0',
-              'vni': 0,
-              'eid-prefix-len': 24,
-              'locator': [],
-              'locator-set': 'ls1',
-              'ttl': 0,
-              'authoritative': 0},
-             {'eid': '10:1::',
-              'vni': 0,
-              'eid-prefix-len': 64,
-              'locator': [],
-              'locator-set': 'ls1',
-              'ttl': 0,
-              'authoritative': 0},
-             {'eid': '10:2::',
-              'vni': 0,
-              'eid-prefix-len': 64,
-              'locator': [],
-              'locator-set': 'ls1',
-              'ttl': 0,
-              'authoritative': 0},
-             {'eid': '10:3::',
-              'vni': 0,
-              'eid-prefix-len': 64,
-              'locator': [],
-              'locator-set': 'ls1',
-              'ttl': 0,
-              'authoritative': 0}]
-
-# Expected data from VPP via VAT
-eid_table_vat = [
-    {
-        "action": 0,
-        "is_local": 1,
-        "eid": "192.168.0.0/24",
-        "vni": 0,
-        "ttl": 0,
-        "authoritative": 0
-    },
-    {
-        "action": 0,
-        "is_local": 1,
-        "eid": "192.168.1.0/24",
-        "vni": 0,
-        "ttl": 0,
-        "authoritative": 0
-    },
-    {
-        "action": 0,
-        "is_local": 1,
-        "eid": "192.168.2.0/24",
-        "vni": 0,
-        "ttl": 0,
-        "authoritative": 0
-    },
-    {
-        "action": 0,
-        "is_local": 1,
-        "eid": "192.168.3.0/24",
-        "vni": 0,
-        "ttl": 0,
-        "authoritative": 0
-    },
-    {
-        "action": 0,
-        "is_local": 1,
-        "eid": "10:1::/64",
-        "vni": 0,
-        "ttl": 0,
-        "authoritative": 0
-    },
-    {
-        "action": 0,
-        "is_local": 1,
-        "eid": "10:2::/64",
-        "vni": 0,
-        "ttl": 0,
-        "authoritative": 0
-    },
-    {
-        "action": 0,
-        "is_local": 1,
-        "eid": "10:3::/64",
-        "vni": 0,
-        "ttl": 0,
-        "authoritative": 0
-    }
-]
-
-# Example lisp map resolvers data we want set to VPP
-# and then check if it is set correctly.
-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/resources/test_data/lisp/ipv4_ipsec_lispgpe_ipv4/ipv4_ipsec_lispgpe_ipv4.py b/resources/test_data/lisp/ipv4_ipsec_lispgpe_ipv4/ipv4_ipsec_lispgpe_ipv4.py
deleted file mode 100644
index 9ec54c5d4b..0000000000
--- a/resources/test_data/lisp/ipv4_ipsec_lispgpe_ipv4/ipv4_ipsec_lispgpe_ipv4.py
+++ /dev/null
@@ -1,58 +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 ip4-lispgpe-ip4 encapsulation test suite."""
-
-# Lisp default global value
-locator_name = 'tst_locator'
-
-# 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.6.3.1'
-dut2_to_dut1_ip4 = '6.6.3.2'
-dut1_to_tg_ip4 = '6.6.1.1'
-dut2_to_tg_ip4 = '6.6.2.1'
-tg1_ip4 = '6.6.1.2'
-tg2_ip4 = '6.6.2.2'
-prefix4 = 24
-
-dut1_to_dut2_ip4_static_adjacency = {'vni': 0,
-                                     'deid': '6.6.2.0',
-                                     'rloc': '6.6.3.2',
-                                     'seid': '6.6.1.0',
-                                     'prefix': 24}
-dut2_to_dut1_ip4_static_adjacency = {'vni': 0,
-                                     'deid': '6.6.1.0',
-                                     'seid': '6.6.2.0',
-                                     'rloc': '6.6.3.1',
-                                     'prefix': 24}
-
-dut1_ip4_eid = {'locator_name': locator_name,
-                'vni': 0,
-                'eid': '6.6.1.0',
-                'prefix': 24}
-dut2_ip4_eid = {'locator_name': locator_name,
-                'vni': 0,
-                'eid': '6.6.2.0',
-                'prefix': 24}
-
-fib_table_1 = 1
-dut1_dut2_vni = 1
-
-dut2_spi = 1000
-dut1_spi = 1001
-ESP_PROTO = 50
diff --git a/resources/test_data/lisp/ipv4_lispgpe_ipv4/ipv4_lispgpe_ipv4.py b/resources/test_data/lisp/ipv4_lispgpe_ipv4/ipv4_lispgpe_ipv4.py
deleted file mode 100644
index d5cfb8b6cd..0000000000
--- a/resources/test_data/lisp/ipv4_lispgpe_ipv4/ipv4_lispgpe_ipv4.py
+++ /dev/null
@@ -1,76 +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 ip4-lispgpe-ip4 encapsulation test suite."""
-
-# Lisp default global value
-locator_name = 'tst_locator'
-
-# Lisp default locator_set value
-duts_locator_set = {'locator_name': locator_name,
-                    'priority': 1,
-                    'weight': 1}
-
-# IPv4 Lisp static mapping configuration
-tg1_ip4 = '6.0.1.1'
-dut1_to_tg_ip4 = '6.0.1.2'
-
-dut1_vif1_ip4 = '6.0.2.1'
-vm1_vif1_ip4 = '6.0.2.2'
-
-vm1_vif2_ip4 = '6.0.3.1'
-dut1_vif2_ip4 = '6.0.3.2'
-
-dut1_to_dut2_ip4 = '6.0.4.1'
-dut2_to_dut1_ip4 = '6.0.4.2'
-
-dut2_to_tg_ip4 = '6.0.5.1'
-tg2_ip4 = '6.0.5.2'
-
-src_ip_range = '6.0.1.0'
-dst_ip_range = '6.0.5.0'
-
-vm1_vif1_mac = '52:54:00:00:04:01'
-vm1_vif2_mac = '52:54:00:00:04:02'
-
-vhost_ip = '6.6.1.3'
-
-prefix4 = 24
-
-dut1_to_dut2_ip4_static_adjacency = {'vni': 0,
-                                     'deid': dst_ip_range,
-                                     'seid': src_ip_range,
-                                     'rloc': dut2_to_dut1_ip4,
-                                     'prefix': prefix4}
-dut2_to_dut1_ip4_static_adjacency = {'vni': 0,
-                                     'deid': src_ip_range,
-                                     'seid': dst_ip_range,
-                                     'rloc': dut1_to_dut2_ip4,
-                                     'prefix': prefix4}
-
-dut1_ip4_eid = {'locator_name': locator_name,
-                'vni': 0,
-                'eid': src_ip_range,
-                'prefix': prefix4}
-dut2_ip4_eid = {'locator_name': locator_name,
-                'vni': 0,
-                'eid': dst_ip_range,
-                'prefix': prefix4}
-
-fib_table_1 = 1
-dut1_dut2_vni = 1
-
-sock1 = "/tmp/sock1"
-sock2 = "/tmp/sock2"
-
-bid = 10
diff --git a/resources/test_data/lisp/ipv4_lispgpe_ipv6/ipv4_lispgpe_ipsec_ipv6.py b/resources/test_data/lisp/ipv4_lispgpe_ipv6/ipv4_lispgpe_ipsec_ipv6.py
deleted file mode 100644
index 019b81f349..0000000000
--- a/resources/test_data/lisp/ipv4_lispgpe_ipv6/ipv4_lispgpe_ipsec_ipv6.py
+++ /dev/null
@@ -1,64 +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 ip4-lispgpe-ip6 encapsulation test suite."""
-
-# Lisp default global value
-locator_name = 'tst_locator'
-
-# Lisp default locator_set value
-duts_locator_set = {'locator_name': locator_name,
-                    'priority': 1,
-                    'weight': 1}
-
-# IPv4 Lisp static mapping configuration
-dut1_to_dut2_ip6 = '2001:cdba:3::1'
-dut2_to_dut1_ip6 = '2001:cdba: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
-prefix6 = 64
-vhost_ip = '6.6.1.3'
-lisp_gpe_int = 'lisp_gpe0'
-
-dut1_to_dut2_ip_static_adjacency = {'vni': 0,
-                                    'deid': '6.0.2.0',
-                                    'seid': '6.0.1.0',
-                                    'rloc': dut2_to_dut1_ip6,
-                                    'prefix': 24}
-dut2_to_dut1_ip_static_adjacency = {'vni': 0,
-                                    'deid': '6.0.1.0',
-                                    'seid': '6.0.2.0',
-                                    'rloc': dut1_to_dut2_ip6,
-                                    '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}
-
-dut1_fib_table = '1'
-dut2_fib_table = '2'
-
-dut2_spi = 1000
-dut1_spi = 1001
-ESP_PROTO = 50
-sock1 = '/tmp/sock1'
-sock2 = '/tmp/sock2'
-bid = 10
diff --git a/resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py b/resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py
deleted file mode 100644
index 735b023d5a..0000000000
--- a/resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py
+++ /dev/null
@@ -1,64 +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 ip6-ipsec-lispgpe-ip4 encapsulation test suite."""
-
-# Lisp default global value
-locator_name = 'tst_locator'
-
-# Lisp default locator_set value
-duts_locator_set = {'locator_name': locator_name,
-                    'priority': 1,
-                    'weight': 1}
-
-# IPv6 Lisp static mapping configuration
-dut1_to_dut2_ip4 = '6.6.3.1'
-dut2_to_dut1_ip4 = '6.6.3.2'
-dut1_to_tg_ip6 = '2001:cdba:1::1'
-dut2_to_tg_ip6 = '2001:cdba:2::1'
-tg1_ip6 = '2001:cdba:1::2'
-tg2_ip6 = '2001:cdba:2::2'
-prefix4 = 24
-prefix6 = 64
-vhost_ip = '2001:cdba:6::3'
-lisp_gpe_int = 'lisp_gpe0'
-
-dut1_to_dut2_ip_static_adjacency = {'vni': 0,
-                                    'deid': '2001:cdba:2::0',
-                                    'seid': '2001:cdba:1::0',
-                                    'rloc': dut2_to_dut1_ip4,
-                                    'prefix': 64}
-dut2_to_dut1_ip_static_adjacency = {'vni': 0,
-                                    'deid': '2001:cdba:1::0',
-                                    'seid': '2001:cdba:2::0',
-                                    'rloc': dut1_to_dut2_ip4,
-                                    'prefix': 64}
-
-dut1_ip6_eid = {'locator_name': locator_name,
-                'vni': 0,
-                'eid': '2001:cdba:1::0',
-                'prefix': 64}
-dut2_ip6_eid = {'locator_name': locator_name,
-                'vni': 0,
-                'eid': '2001:cdba:2::0',
-                'prefix': 64}
-
-fib_table_1 = 1
-dut1_dut2_vni = 1
-
-dut2_spi = 1000
-dut1_spi = 1001
-ESP_PROTO = 50
-sock1 = '/tmp/sock1'
-sock2 = '/tmp/sock2'
-bid = 10
diff --git a/resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipsec_ipv6.py b/resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipsec_ipv6.py
deleted file mode 100644
index 5d79e4b0eb..0000000000
--- a/resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipsec_ipv6.py
+++ /dev/null
@@ -1,54 +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 ip6-ipsec-lispgpe-ip6 encapsulation test suite."""
-
-# Lisp default global value
-locator_name = 'tst_locator'
-
-# Lisp default locator_set value
-duts_locator_set = {'locator_name': locator_name,
-                    'priority': 1,
-                    'weight': 1}
-
-# IPv4 Lisp static mapping configuration
-dut1_to_dut2_ip6 = '2001:cdba:3::1'
-dut2_to_dut1_ip6 = '2001:cdba:3::2'
-dut1_to_tg_ip6 = '2001:cdba:1::1'
-dut2_to_tg_ip6 = '2001:cdba:2::1'
-tg1_ip6 = '2001:cdba:1::2'
-tg2_ip6 = '2001:cdba:2::2'
-prefix6 = 64
-
-dut1_to_dut2_ip6_static_adjacency = {'vni': 0,
-                                     'deid': '2001:cdba:2::0',
-                                     'rloc': dut2_to_dut1_ip6,
-                                     'seid': '2001:cdba:1::0',
-                                     'prefix': 64}
-dut2_to_dut1_ip6_static_adjacency = {'vni': 0,
-                                     'deid': '2001:cdba:1::0',
-                                     'seid': '2001:cdba:2::0',
-                                     'rloc': dut1_to_dut2_ip6,
-                                     'prefix': 64}
-
-dut1_ip6_eid = {'locator_name': locator_name,
-                'vni': 0,
-                'eid': '2001:cdba:1::0',
-                'prefix': 64}
-dut2_ip6_eid = {'locator_name': locator_name,
-                'vni': 0,
-                'eid': '2001:cdba:2::0',
-                'prefix': 64}
-
-dut1_fib_table = '1'
-dut2_fib_table = '2'
diff --git a/resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipv6.py b/resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipv6.py
deleted file mode 100644
index 9f7fa3c926..0000000000
--- a/resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipv6.py
+++ /dev/null
@@ -1,60 +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 ip6-lispgpe-ip6 encapsulation test suite."""
-
-# Lisp default global value
-locator_name = 'tst_locator'
-
-# Lisp default locator_set value
-duts_locator_set = {'locator_name': locator_name,
-                    'priority': 1,
-                    'weight': 1}
-
-# IPv4 Lisp static mapping configuration
-dut1_to_dut2_ip6 = '2001:cdba:3::1'
-dut2_to_dut1_ip6 = '2001:cdba:3::2'
-dut1_to_tg_ip6 = '2001:cdba:1::1'
-dut2_to_tg_ip6 = '2001:cdba:2::1'
-tg1_ip6 = '2001:cdba:1::2'
-tg2_ip6 = '2001:cdba:2::2'
-prefix6 = 64
-
-vhost_ip = '2001:cdba:6::9'
-
-dut1_to_dut2_ip6_static_adjacency = {'vni': 0,
-                                     'deid': '2001:cdba:2::0',
-                                     'rloc': '2001:cdba:3::2',
-                                     'seid': '2001:cdba:1::0',
-                                     'prefix': 64}
-dut2_to_dut1_ip6_static_adjacency = {'vni': 0,
-                                     'deid': '2001:cdba:1::0',
-                                     'seid': '2001:cdba:2::0',
-                                     'rloc': '2001:cdba:3::1',
-                                     'prefix': 64}
-
-dut1_ip6_eid = {'locator_name': locator_name,
-                'vni': 0,
-                'eid': '2001:cdba:1::0',
-                'prefix': 64}
-dut2_ip6_eid = {'locator_name': locator_name,
-                'vni': 0,
-                'eid': '2001:cdba:2::0',
-                'prefix': 64}
-
-fib_table_1 = 1
-dut1_dut2_vni = 1
-
-sock1 = "/tmp/sock1"
-sock2 = "/tmp/sock2"
-bid = 10
diff --git a/resources/test_data/lisp/l2/l2_ipv4.py b/resources/test_data/lisp/l2/l2_ipv4.py
deleted file mode 100644
index 7edccbc9ca..0000000000
--- a/resources/test_data/lisp/l2/l2_ipv4.py
+++ /dev/null
@@ -1,47 +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 Eth-IPv4-ICMPv4-LISPGpe-IP4 encapsulation test suite."""
-
-# Lisp default global value
-locator_name = 'tst_locator'
-
-# Lisp default locator_set value
-lisp_dut_settings = {'locator_name': locator_name,
-                     'priority': 1,
-                     'weight': 1,
-                     'bd': 10,
-                     'vni': 5}
-
-# IPv4 Lisp static mapping configuration
-dut1_to_dut2_ip4 = '10.0.3.1'
-dut2_to_dut1_ip4 = '10.0.3.2'
-dut1_to_tg_ip4 = '10.0.1.1'
-dut2_to_tg_ip4 = '10.0.2.1'
-tg1_ip4 = '10.0.1.2'
-tg2_ip4 = '10.0.2.2'
-prefix4 = 24
-vpp_bd_id = 10
-tg_if1_mac = '08:22:22:22:22:11'
-tg_if2_mac = '08:22:22:22:22:22'
-
-dut1_to_dut2_ip4_static_adjacency = {'eid': tg_if2_mac,
-                                     'seid': tg_if1_mac,
-                                     'rloc': dut2_to_dut1_ip4,
-                                     'int': 'dut1_to_dut2',
-                                     'map_res': '10.0.0.2'}
-dut2_to_dut1_ip4_static_adjacency = {'eid': tg_if1_mac,
-                                     'seid': tg_if2_mac,
-                                     'rloc': dut1_to_dut2_ip4,
-                                     'map_res': '10.0.0.1',
-                                     'int': 'dut2_to_dut1'}
diff --git a/resources/test_data/lisp/l2/l2_ipv6.py b/resources/test_data/lisp/l2/l2_ipv6.py
deleted file mode 100644
index 2e158828a3..0000000000
--- a/resources/test_data/lisp/l2/l2_ipv6.py
+++ /dev/null
@@ -1,47 +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 Eth-IP6-ICMPv6-LISPGpe-IP6 encapsulation test suite."""
-
-# Lisp default global value
-locator_name = 'tst_locator'
-
-# Lisp default locator_set value
-lisp_dut_settings = {'locator_name': locator_name,
-                     'priority': 1,
-                     'weight': 1,
-                     'bd': 10,
-                     'vni': 5}
-
-# IPv4 Lisp static mapping configuration
-dut1_to_dut2_ip6 = '2001:cdba:3::1'
-dut2_to_dut1_ip6 = '2001:cdba:3::2'
-dut1_to_tg_ip6 = '2001:cdba:1::1'
-dut2_to_tg_ip6 = '2001:cdba:2::1'
-tg1_ip6 = '2001:cdba:1::2'
-tg2_ip6 = '2001:cdba:2::2'
-prefix6 = 64
-vpp_bd_id = 10
-tg_if1_mac = '08:22:22:22:22:11'
-tg_if2_mac = '08:22:22:22:22:22'
-
-dut1_to_dut2_ip6_static_adjacency = {'eid': tg_if2_mac,
-                                     'seid': tg_if1_mac,
-                                     'rloc': dut2_to_dut1_ip6,
-                                     'int': 'dut1_to_dut2',
-                                     'map_res': tg2_ip6}
-dut2_to_dut1_ip6_static_adjacency = {'eid': tg_if1_mac,
-                                     'seid': tg_if2_mac,
-                                     'rloc': dut1_to_dut2_ip6,
-                                     'map_res': tg1_ip6,
-                                     'int': 'dut2_to_dut1'}
diff --git a/resources/test_data/lisp/lisp.py b/resources/test_data/lisp/lisp.py
index 4539f8208d..f6a4152fda 100644
--- a/resources/test_data/lisp/lisp.py
+++ b/resources/test_data/lisp/lisp.py
@@ -14,80 +14,98 @@
 """Test variables of lisp and lispgpe (ip4/ip6) encapsulation test suite."""
 
 # Lisp default global value
-locator_name = 'tst_locator'
+locator_name = b"tst_locator"
 
 # Test configuration data
-tg_if1_ip4= '6.0.0.2'
-tg_if2_ip4= '6.0.1.2'
-dut_if1_ip4= '6.0.0.1'
-dut_if2_ip4= '6.0.1.1'
-tg_if2_ip6= '6:0:1::2'
-dut_if2_ip6= '6:0:1::1'
+tg_if1_ip4= u"6.0.0.2"
+tg_if2_ip4= u"6.0.1.2"
+dut_if1_ip4= u"6.0.0.1"
+dut_if2_ip4= u"6.0.1.1"
+tg_if2_ip6= u"6:0:1::2"
+dut_if2_ip6= u"6:0:1::1"
 ip4_plen= 24
-src_ip4= '6.0.0.2'
-dst_ip4= '6.0.2.2'
+src_ip4= u"6.0.0.2"
+dst_ip4= u"6.0.2.2"
 src_rloc4= dut_if2_ip4
 dst_rloc4= tg_if2_ip4
 src_rloc6= dut_if2_ip6
 dst_rloc6= tg_if2_ip6
 
 #IP6 over IP4 LISP configuration data
-tg_if1_ip6= '6::2'
-dut_if1_ip6= '6:0:0::1'
-src_ip6= '6::2'
-dst_ip6= '6:0:2::2'
+tg_if1_ip6= u"6::2"
+dut_if1_ip6= u"6:0:0::1"
+src_ip6= u"6::2"
+dst_ip6= u"6:0:2::2"
 ip6_plen=64
 
 # Lisp default locator_set value
-duts_locator_set = {'locator_name': locator_name,
-                    'priority': 1,
-                    'weight': 1}
+duts_locator_set = {
+    u"locator_name": locator_name,
+    u"priority": 1,
+    u"weight": 1
+}
 
 # IPv4 Lisp static mapping configuration
 
-dut1_to_tg_ip4_static_adjacency = {'vni': 0,
-                                   'deid': '6.0.2.0',
-                                   'seid': '6.0.0.0',
-                                   'rloc': '6.0.1.2',
-                                   'prefix': 24}
+dut1_to_tg_ip4_static_adjacency = {
+    u"vni": 0,
+    u"deid": u"6.0.2.0",
+    u"seid": u"6.0.0.0",
+    u"rloc": u"6.0.1.2",
+    u"prefix": 24
+}
 
-dut1_ip4_eid = {'locator_name': locator_name,
-                'vni': 0,
-                'eid': '6.0.0.0',
-                'prefix': 24}
+dut1_ip4_eid = {
+    u"locator_name": locator_name,
+    u"vni": 0,
+    u"eid": u"6.0.0.0",
+    u"prefix": 24
+}
 
 # IPv6 Lisp static mapping configuration
 
-dut1_to_tg_ip6_static_adjacency = {'vni': 0,
-                                   'deid': '6:0:2::0',
-                                   'seid': '6:0:0::0',
-                                   'rloc': '6:0:1::2',
-                                   'prefix': 64}
+dut1_to_tg_ip6_static_adjacency = {
+    u"vni": 0,
+    u"deid": u"6:0:2::0",
+    u"seid": u"6:0:0::0",
+    u"rloc": u"6:0:1::2",
+    u"prefix": 64
+}
 
-dut1_ip6_eid = {'locator_name': locator_name,
-                'vni': 0,
-                'eid': '6:0:0::0',
-                'prefix': 64}
+dut1_ip6_eid = {
+    u"locator_name": locator_name,
+    u"vni": 0,
+    u"eid": u"6:0:0::0",
+    u"prefix": 64
+}
 
 
 #IPv6 over IPv4 LISP mapping
-dut1_ip6o4_static_adjacency = {'vni': 0,
-                               'deid': '6:0:2::0',
-                               'seid': '6:0:0::0',
-                               'rloc': '6.0.1.2',
-                               'prefix': 64}
-dut1_ip6o4_eid = {'locator_name': locator_name,
-                  'vni': 0,
-                  'eid': '6:0:0::0',
-                  'prefix': 64}
+dut1_ip6o4_static_adjacency = {
+    u"vni": 0,
+    u"deid": u"6:0:2::0",
+    u"seid": u"6:0:0::0",
+    u"rloc": u"6.0.1.2",
+    u"prefix": 64
+}
+dut1_ip6o4_eid = {
+    u"locator_name": locator_name,
+    u"vni": 0,
+    u"eid": u"6:0:0::0",
+    u"prefix": 64
+}
 
 #IPv4 over IPv6 LISP mapping
-dut1_ip4o6_static_adjacency = {'vni': 0,
-                               'deid': '6.0.2.0',
-                               'seid': '6.0.0.0',
-                               'rloc': '6:0:1::2',
-                               'prefix': 24}
-dut1_ip4o6_eid = {'locator_name': locator_name,
-                  'vni': 0,
-                  'eid': '6.0.0.0',
-                  'prefix': 24}
+dut1_ip4o6_static_adjacency = {
+    u"vni": 0,
+    u"deid": u"6.0.2.0",
+    u"seid": u"6.0.0.0",
+    u"rloc": u"6:0:1::2",
+    u"prefix": 24
+}
+dut1_ip4o6_eid = {
+    u"locator_name": locator_name,
+    u"vni": 0,
+    u"eid": u"6.0.0.0",
+    u"prefix": 24
+}
diff --git a/resources/test_data/lisp/performance/lisp_static_adjacency.py b/resources/test_data/lisp/performance/lisp_static_adjacency.py
index 11648b91a3..29ab80ad73 100644
--- a/resources/test_data/lisp/performance/lisp_static_adjacency.py
+++ b/resources/test_data/lisp/performance/lisp_static_adjacency.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2019 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:
@@ -14,111 +14,145 @@
 """Test variables for Lisp remote static mapping test suite."""
 
 # Lisp default global value
-locator_name = 'ls1'
+locator_name = b"ls1"
 
 # Lisp default locator_set value
-duts_locator_set = {'locator_name': locator_name,
-                    'priority': 1,
-                    'weight': 1}
+duts_locator_set = {
+    u"locator_name": locator_name,
+    u"priority": 1,
+    u"weight": 1
+}
 
 # IPv4 Lisp static mapping configuration
-dut1_to_dut2_ip4 = '1.1.1.1'
-dut2_to_dut1_ip4 = '1.1.1.2'
-dut1_to_tg_ip4 = '10.10.10.1'
-dut2_to_tg_ip4 = '20.20.20.1'
+dut1_to_dut2_ip4 = u"1.1.1.1"
+dut2_to_dut1_ip4 = u"1.1.1.2"
+dut1_to_tg_ip4 = u"10.10.10.1"
+dut2_to_tg_ip4 = u"20.20.20.1"
 prefix4 = 24
-dut1_ip4_static_adjacency = {'vni': 0,
-                             'deid': '20.20.20.0',
-                             'seid': '10.10.10.0',
-                             'rloc': '1.1.1.2',
-                           'prefix': 24}
-dut2_ip4_static_adjacency = {'vni': 0,
-                             'deid': '10.10.10.0',
-                             'seid': '20.20.20.0',
-                             'rloc': '1.1.1.1',
-                             'prefix': 24}
-dut1_ip4_eid = {'locator_name': locator_name,
-                'vni': 0,
-                'eid': '10.10.10.0',
-                'prefix': 24}
-dut2_ip4_eid = {'locator_name': locator_name,
-                'vni': 0,
-                'eid': '20.20.20.0',
-                'prefix': 24}
+dut1_ip4_static_adjacency = {
+    u"vni": 0,
+    u"deid": u"20.20.20.0",
+    u"seid": u"10.10.10.0",
+    u"rloc": u"1.1.1.2",
+    u"prefix": 24
+}
+dut2_ip4_static_adjacency = {
+    u"vni": 0,
+    u"deid": u"10.10.10.0",
+    u"seid": u"20.20.20.0",
+    u"rloc": u"1.1.1.1",
+    u"prefix": 24
+}
+dut1_ip4_eid = {
+    u"locator_name": locator_name,
+    u"vni": 0,
+    u"eid": u"10.10.10.0",
+    u"prefix": 24
+}
+dut2_ip4_eid = {
+    u"locator_name": locator_name,
+    u"vni": 0,
+    u"eid": u"20.20.20.0",
+    u"prefix": 24
+}
 
 # IPv6 Lisp static mapping configuration
-dut1_to_dut2_ip6 = '2001:3::1'
-dut2_to_dut1_ip6 = '2001:3::2'
-dut1_to_tg_ip6 = '2001:1::1'
-dut2_to_tg_ip6 = '2001:2::1'
+dut1_to_dut2_ip6 = u"2001:3::1"
+dut2_to_dut1_ip6 = u"2001:3::2"
+dut1_to_tg_ip6 = u"2001:1::1"
+dut2_to_tg_ip6 = u"2001:2::1"
 prefix6 = 64
-dut1_ip6_static_adjacency = {'vni': 0,
-                             'deid': '2001:2::0',
-                             'seid': '2001:1::0',
-                             'rloc': '2001:3::2',
-                             'prefix': 64}
-dut2_ip6_static_adjacency = {'vni': 0,
-                             'deid': '2001:1::0',
-                             'seid': '2001:2::0',
-                             'rloc': '2001:3::1',
-                             'prefix': 64}
-dut1_ip6_eid = {'locator_name': locator_name,
-                'vni': 0,
-                'eid': '2001:1::0',
-                'prefix': 64}
-dut2_ip6_eid = {'locator_name': locator_name,
-                'vni': 0,
-                'eid': '2001:2::0',
-                'prefix': 64}
+dut1_ip6_static_adjacency = {
+    u"vni": 0,
+    u"deid": u"2001:2::0",
+    u"seid": u"2001:1::0",
+    u"rloc": u"2001:3::2",
+    u"prefix": 64
+}
+dut2_ip6_static_adjacency = {
+    u"vni": 0,
+    u"deid": u"2001:1::0",
+    u"seid": u"2001:2::0",
+    u"rloc": u"2001:3::1",
+    u"prefix": 64
+}
+dut1_ip6_eid = {
+    u"locator_name": locator_name,
+    u"vni": 0,
+    u"eid": u"2001:1::0",
+    u"prefix": 64
+}
+dut2_ip6_eid = {
+    u"locator_name": locator_name,
+    u"vni": 0,
+    u"eid": u"2001:2::0",
+    u"prefix": 64
+}
 
 # IPv4 over IPv6 Lisp static mapping configuration
-dut1_to_dut2_ip4o6 = '2001:3::1'
-dut2_to_dut1_ip4o6 = '2001:3::2'
-dut1_to_tg_ip4o6 = '10.10.10.1'
-dut2_to_tg_ip4o6 = '20.20.20.1'
+dut1_to_dut2_ip4o6 = u"2001:3::1"
+dut2_to_dut1_ip4o6 = u"2001:3::2"
+dut1_to_tg_ip4o6 = u"10.10.10.1"
+dut2_to_tg_ip4o6 = u"20.20.20.1"
 tg_prefix4o6 = 24
 dut_prefix4o6 = 64
-dut1_ip4o6_static_adjacency = {'vni': 0,
-                               'deid': '20.20.20.0',
-                               'seid': '10.10.10.0',
-                               'rloc': '2001:3::2',
-                               'prefix': 24}
-dut2_ip4o6_static_adjacency = {'vni': 0,
-                               'deid': '10.10.10.0',
-                               'seid': '20.20.20.0',
-                               'rloc': '2001:3::1',
-                               'prefix': 24}
-dut1_ip4o6_eid = {'locator_name': locator_name,
-                  'vni': 0,
-                  'eid': '10.10.10.0',
-                  'prefix': 24}
-dut2_ip4o6_eid = {'locator_name': locator_name,
-                  'vni': 0,
-                  'eid': '20.20.20.0',
-                  'prefix': 24}
+dut1_ip4o6_static_adjacency = {
+    u"vni": 0,
+    u"deid": u"20.20.20.0",
+    u"seid": u"10.10.10.0",
+    u"rloc": u"2001:3::2",
+    u"prefix": 24
+}
+dut2_ip4o6_static_adjacency = {
+    u"vni": 0,
+    u"deid": u"10.10.10.0",
+    u"seid": u"20.20.20.0",
+    u"rloc": u"2001:3::1",
+    u"prefix": 24
+}
+dut1_ip4o6_eid = {
+    u"locator_name": locator_name,
+    u"vni": 0,
+    u"eid": u"10.10.10.0",
+    u"prefix": 24
+}
+dut2_ip4o6_eid = {
+    u"locator_name": locator_name,
+    u"vni": 0,
+    u"eid": u"20.20.20.0",
+    u"prefix": 24
+}
 
 # IPv6 over IPv4 Lisp static mapping configuration
-dut1_to_dut2_ip6o4 = '1.1.1.1'
-dut2_to_dut1_ip6o4 = '1.1.1.2'
-dut1_to_tg_ip6o4 = '2001:1::1'
-dut2_to_tg_ip6o4 = '2001:2::1'
+dut1_to_dut2_ip6o4 = u"1.1.1.1"
+dut2_to_dut1_ip6o4 = u"1.1.1.2"
+dut1_to_tg_ip6o4 = u"2001:1::1"
+dut2_to_tg_ip6o4 = u"2001:2::1"
 tg_prefix6o4 = 64
 dut_prefix6o4 = 24
-dut1_ip6o4_static_adjacency = {'vni': 0,
-                               'deid': '2001:2::0',
-                               'seid': '2001:1::0',
-                               'rloc': '1.1.1.2',
-                               'prefix': 64}
-dut2_ip6o4_static_adjacency = {'vni': 0,
-                               'deid': '2001:1::0',
-                               'seid': '2001:2::0',
-                               'rloc': '1.1.1.1',
-                               'prefix': 64}
-dut1_ip6o4_eid = {'locator_name': locator_name,
-                  'vni': 0,
-                  'eid': '2001:1::0',
-                  'prefix': 64}
-dut2_ip6o4_eid = {'locator_name': locator_name,
-                  'vni': 0,
-                  'eid': '2001:2::0',
-                  'prefix': 64}
+dut1_ip6o4_static_adjacency = {
+    u"vni": 0,
+    u"deid": u"2001:2::0",
+    u"seid": u"2001:1::0",
+    u"rloc": u"1.1.1.2",
+    u"prefix": 64
+}
+dut2_ip6o4_static_adjacency = {
+    u"vni": 0,
+    u"deid": u"2001:1::0",
+    u"seid": u"2001:2::0",
+    u"rloc": u"1.1.1.1",
+    u"prefix": 64
+}
+dut1_ip6o4_eid = {
+    u"locator_name": locator_name,
+    u"vni": 0,
+    u"eid": u"2001:1::0",
+    u"prefix": 64
+}
+dut2_ip6o4_eid = {
+    u"locator_name": locator_name,
+    u"vni": 0,
+    u"eid": u"2001:2::0",
+    u"prefix": 64
+}
diff --git a/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py b/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py
deleted file mode 100644
index 334dcbfe3d..0000000000
--- a/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py
+++ /dev/null
@@ -1,162 +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'
-fib_table1 = 1
-dut1_dut2_vni = 1
-sock1 = '/tmp/sock1'
-sock2 = '/tmp/sock2'
-bid = 10
-vhost_ip = '6:6:1::3'
-
-# 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}
-dut2_to_dut1_ip4_reconf = '6.0.3.20'
-dut1_to_dut2_ip4_static_adjacency_reconf = {'vni': 0,
-                                            'deid': '6.0.2.0',
-                                            'seid': '6.0.1.0',
-                                            'rloc': '6.0.3.20',
-                                            '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}
-dut2_to_dut1_ip6_reconf = '6:0:3::20'
-dut1_to_dut2_ip6_static_adjacency_reconf = {'vni': 0,
-                                            'deid': '6:0:2::0',
-                                            'seid': '6:0:1::0',
-                                            'rloc': '6:0:3::20',
-                                            '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}
-dut2_to_dut1_ip4o6_reconf = '6:0:3::20'
-dut1_ip4o6_static_adjacency_reconf = {'vni': 0,
-                                      'deid': '6.0.2.0',
-                                      'seid': '6.0.1.0',
-                                      'rloc': '6:0:3::20',
-                                      '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}
-dut2_to_dut1_ip6o4_reconf = '6.0.3.20'
-dut1_ip6o4_static_adjacency_reconf = {'vni': 0,
-                                      'deid': '6:0:2::0',
-                                      'seid': '6:0:1::0',
-                                      'rloc': '6.0.3.20',
-                                      'prefix': 64}