Python3: resources and libraries

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

1 files changed, 70 insertions, 52 deletions

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
+}