Remove u prefix obsoleted by python 3

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ib0913157fa97f418dd846124d4fdc3d97250ca0a

diff --git a/tests/transportpce_tests/1.2.1/test01_portmapping.py b/tests/transportpce_tests/1.2.1/test01_portmapping.py
index f9a1b51f77e273e4b5715d1440180d913a7dde76..bfd812bef57423e1ccc2ce6154033bf55e1e5efb 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test01_portmapping.py
+++ b/tests/transportpce_tests/1.2.1/test01_portmapping.py
@@ -59,11 +59,12 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(
-            {u'node-info': {u'node-type': u'rdm',
-                            u'node-ip-address': u'127.0.0.12',
-                            u'node-clli': u'NodeA',
-                            u'openroadm-version': u'1.2.1', u'node-vendor': u'vendorA',
-                            u'node-model': u'2'}},
+            {'node-info': {'node-type': 'rdm',
+                           'node-ip-address': '127.0.0.12',
+                           'node-clli': 'NodeA',
+                           'openroadm-version': '1.2.1',
+                           'node-vendor': 'vendorA',
+                           'node-model': '2'}},
             res)
         time.sleep(3)
 
@@ -115,11 +116,12 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(
-            {u'node-info': {u'node-type': u'xpdr',
-                            u'node-ip-address': u'127.0.0.10',
-                            u'node-clli': u'NodeA',
-                            u'openroadm-version': u'1.2.1', u'node-vendor': u'vendorA',
-                            u'node-model': u'1'}},
+            {'node-info': {'node-type': 'xpdr',
+                           'node-ip-address': '127.0.0.10',
+                           'node-clli': 'NodeA',
+                           'openroadm-version': '1.2.1',
+                           'node-vendor': 'vendorA',
+                           'node-model': '1'}},
             res)
         time.sleep(3)
 

diff --git a/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py b/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py
index 356676904674d25b1dedb57cff2259dfadf7aa6a..37261ad560020ce05af83458031931eb7d549600 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py
+++ b/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py
@@ -174,10 +174,10 @@ class TransportPCERendererTesting(unittest.TestCase):
             res['interface'][0]
         )
         self.assertDictEqual(
-            {u'rate': u'org-openroadm-optical-channel-interfaces:R100G',
-             u'transmit-power': -5,
-             u'wavelength-number': 7,
-             u'modulation-format': u'dp-qpsk'},
+            {'rate': 'org-openroadm-optical-channel-interfaces:R100G',
+             'transmit-power': -5,
+             'wavelength-number': 7,
+             'modulation-format': 'dp-qpsk'},
             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_10_service_path_create_xpdr_check(self):
@@ -197,8 +197,8 @@ class TransportPCERendererTesting(unittest.TestCase):
             res['interface'][0]
         )
         self.assertDictEqual(
-            {u'rate': u'org-openroadm-otn-otu-interfaces:OTU4',
-             u'fec': u'scfec'},
+            {'rate': 'org-openroadm-otn-otu-interfaces:OTU4',
+             'fec': 'scfec'},
             res['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
 
     def test_11_service_path_create_xpdr_check(self):
@@ -220,11 +220,11 @@ class TransportPCERendererTesting(unittest.TestCase):
         self.assertDictEqual(
             dict({
                 'rate': 'org-openroadm-otn-odu-interfaces:ODU4',
-                u'monitoring-mode': u'terminated'
+                'monitoring-mode': 'terminated'
             }, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
         )
-        self.assertDictEqual({u'exp-payload-type': u'07', u'payload-type': u'07'},
+        self.assertDictEqual({'exp-payload-type': '07', 'payload-type': '07'},
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_12_service_path_create_xpdr_check(self):

diff --git a/tests/transportpce_tests/1.2.1/test06_end2end.py b/tests/transportpce_tests/1.2.1/test06_end2end.py
index 637addeed08a073b015a28114048d9706bb58e53..9d9fe8c3a52c4df512315abf976c0b92a0c68e2b 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test06_end2end.py
+++ b/tests/transportpce_tests/1.2.1/test06_end2end.py
@@ -302,8 +302,8 @@ class TransportPCEFulltesting(unittest.TestCase):
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
             if ele['tp-id'] == 'XPDR1-NETWORK1':
-                self.assertEqual({u'frequency': 196.1,
-                                  u'width': 40},
+                self.assertEqual({'frequency': 196.1,
+                                  'width': 40},
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
             if ele['tp-id'] == 'XPDR1-CLIENT2' or ele['tp-id'] == 'XPDR1-CLIENT1':
                 self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
@@ -441,12 +441,12 @@ class TransportPCEFulltesting(unittest.TestCase):
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
             if ele['tp-id'] == 'XPDR1-NETWORK1':
-                self.assertEqual({u'frequency': 196.1,
-                                  u'width': 40},
+                self.assertEqual({'frequency': 196.1,
+                                  'width': 40},
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
             if ele['tp-id'] == 'XPDR1-NETWORK2':
-                self.assertEqual({u'frequency': 196.05,
-                                  u'width': 40},
+                self.assertEqual({'frequency': 196.05,
+                                  'width': 40},
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
             if ele['tp-id'] == 'XPDR1-CLIENT1' or ele['tp-id'] == 'XPDR1-CLIENT2':
                 self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
@@ -563,21 +563,21 @@ class TransportPCEFulltesting(unittest.TestCase):
         res = response.json()
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
-            if ((ele[u'org-openroadm-common-network:tp-type'] ==
+            if ((ele['org-openroadm-common-network:tp-type'] ==
                  'XPONDER-CLIENT')
                     and (ele['tp-id'] == 'XPDR1-CLIENT1' or ele[
                         'tp-id'] == 'XPDR1-CLIENT3')):
                 self.assertNotIn(
                     'org-openroadm-network-topology:xpdr-client-attributes',
                     dict.keys(ele))
-            elif (ele[u'org-openroadm-common-network:tp-type'] ==
+            elif (ele['org-openroadm-common-network:tp-type'] ==
                   'XPONDER-NETWORK'):
-                self.assertIn(u'tail-equipment-id', dict.keys(
-                    ele[u'org-openroadm-network-topology:'
-                        u'xpdr-network-attributes']))
+                self.assertIn('tail-equipment-id', dict.keys(
+                    ele['org-openroadm-network-topology:'
+                        'xpdr-network-attributes']))
                 self.assertNotIn('wavelength', dict.keys(
-                    ele[u'org-openroadm-network-topology:'
-                        u'xpdr-network-attributes']))
+                    ele['org-openroadm-network-topology:'
+                        'xpdr-network-attributes']))
         time.sleep(10)
 
     def test_34_check_topo_ROADMA_SRG1(self):

diff --git a/tests/transportpce_tests/2.2.1/test01_portmapping.py b/tests/transportpce_tests/2.2.1/test01_portmapping.py
index 4381ba0cd481b54e4992a382f8a6f2eb4cd020da..66bc08380488877677ee0be040a0ac433b806d7b 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test01_portmapping.py
+++ b/tests/transportpce_tests/2.2.1/test01_portmapping.py
@@ -59,11 +59,12 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(
-            {u'node-info': {u'node-type': u'rdm',
-                            u'node-ip-address': u'127.0.0.11',
-                            u'node-clli': u'NodeA',
-                            u'openroadm-version': u'2.2.1', u'node-vendor': u'vendorA',
-                            u'node-model': u'model2'}},
+            {'node-info': {'node-type': 'rdm',
+                           'node-ip-address': '127.0.0.11',
+                           'node-clli': 'NodeA',
+                           'openroadm-version': '2.2.1',
+                           'node-vendor': 'vendorA',
+                           'node-model': 'model2'}},
             res)
         time.sleep(3)
 
@@ -127,11 +128,12 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(
-            {u'node-info': {u'node-type': u'xpdr',
-                            u'node-ip-address': u'1.2.3.4',
-                            u'node-clli': u'NodeA',
-                            u'openroadm-version': u'2.2.1', u'node-vendor': u'vendorA',
-                            u'node-model': u'model2'}},
+            {'node-info': {'node-type': 'xpdr',
+                           'node-ip-address': '1.2.3.4',
+                           'node-clli': 'NodeA',
+                           'openroadm-version': '2.2.1',
+                           'node-vendor': 'vendorA',
+                           'node-model': 'model2'}},
             res)
         time.sleep(3)
 

diff --git a/tests/transportpce_tests/2.2.1/test05_flex_grid.py b/tests/transportpce_tests/2.2.1/test05_flex_grid.py
index c82a0243f86840e1ad3e85862e74162254cc92b1..2719a91f3c2288ff887d43d58244cadeaf03d40c 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test05_flex_grid.py
+++ b/tests/transportpce_tests/2.2.1/test05_flex_grid.py
@@ -56,12 +56,13 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(
-            {u'node-info': {u'node-type': u'rdm',
-                            u'node-ip-address': u'127.0.0.14',
-                            u'node-clli': u'NodeD',
-                            u'openroadm-version': u'2.2.1', u'node-vendor': u'vendorD',
-                            u'node-model': u'model2',
-                            }},
+            {'node-info': {'node-type': 'rdm',
+                           'node-ip-address': '127.0.0.14',
+                           'node-clli': 'NodeD',
+                           'openroadm-version': '2.2.1',
+                           'node-vendor': 'vendorD',
+                           'node-model': 'model2',
+                           }},
             res)
         time.sleep(3)
 

diff --git a/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py b/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py
index 0b0592c1896d624bf3cb44768c206bd2acd07682..853daed46858cd528e22c90ba61a091fc4d5b6cf 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py
+++ b/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py
@@ -13,7 +13,7 @@
 # pylint: disable=too-many-public-methods
 
 import unittest
-#from unittest.result import failfast
+# from unittest.result import failfast
 import requests
 import sys
 sys.path.append('transportpce_tests/common/')
@@ -112,7 +112,7 @@ class TransportPCERendererTesting(unittest.TestCase):
             res['interface'][0]
         )
         self.assertDictEqual(
-            {u'frequency': 195.8, u'width': 40},
+            {'frequency': 195.8, 'width': 40},
             res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'])
 
     def test_07_service_path_create_rdm_check(self):
@@ -131,7 +131,7 @@ class TransportPCERendererTesting(unittest.TestCase):
             res['interface'][0]
         )
         self.assertDictEqual(
-            {u'min-freq': 195.775, u'max-freq': 195.825},
+            {'min-freq': 195.775, 'max-freq': 195.825},
             res['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp'])
 
     def test_08_service_path_create_rdm_check(self):
@@ -150,7 +150,7 @@ class TransportPCERendererTesting(unittest.TestCase):
             res['interface'][0]
         )
         self.assertDictEqual(
-            {u'frequency': 195.8, u'width': 40},
+            {'frequency': 195.8, 'width': 40},
             res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'])
 
     # -mc supporting interfaces must not be created for SRG, only degrees
@@ -199,10 +199,10 @@ class TransportPCERendererTesting(unittest.TestCase):
             res['interface'][0]
         )
         self.assertDictEqual(
-            {u'rate': u'org-openroadm-common-types:R100G',
-             u'transmit-power': -5,
-             u'modulation-format': 'dp-qpsk',
-             u'frequency': 195.8},
+            {'rate': 'org-openroadm-common-types:R100G',
+             'transmit-power': -5,
+             'modulation-format': 'dp-qpsk',
+             'frequency': 195.8},
             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_12_service_path_create_xpdr_check(self):
@@ -247,11 +247,11 @@ class TransportPCERendererTesting(unittest.TestCase):
         self.assertDictEqual(
             dict({
                  'rate': 'org-openroadm-otn-common-types:ODU4',
-                 u'monitoring-mode': u'terminated'
+                 'monitoring-mode': 'terminated'
                  }, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
         )
-        self.assertDictEqual({u'exp-payload-type': u'07', u'payload-type': u'07'},
+        self.assertDictEqual({'exp-payload-type': '07', 'payload-type': '07'},
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_14_service_path_create_xpdr_check(self):
@@ -270,7 +270,7 @@ class TransportPCERendererTesting(unittest.TestCase):
             res['interface'][0]
         )
         self.assertDictEqual(
-            {u'fec': u'off', u'speed': 100000},
+            {'fec': 'off', 'speed': 100000},
             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
 
     def test_15_service_path_create_xpdr_check(self):

diff --git a/tests/transportpce_tests/2.2.1/test07_otn_renderer.py b/tests/transportpce_tests/2.2.1/test07_otn_renderer.py
index df3f4eeaf8f0c4d4dac0c1c7539dfc5a1eae7ac9..3139986a00299c545fe8b4d016aa6a188276915c 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test07_otn_renderer.py
+++ b/tests/transportpce_tests/2.2.1/test07_otn_renderer.py
@@ -125,8 +125,8 @@ class TransportPCEtesting(unittest.TestCase):
                              res['interface'][0])
 
         self.assertDictEqual(
-            {u'frequency': 196.1, u'rate': u'org-openroadm-common-types:R100G',
-             u'transmit-power': -5, u'modulation-format': 'dp-qpsk'},
+            {'frequency': 196.1, 'rate': 'org-openroadm-common-types:R100G',
+             'transmit-power': -5, 'modulation-format': 'dp-qpsk'},
             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_07_check_interface_OTU(self):
@@ -199,7 +199,7 @@ class TransportPCEtesting(unittest.TestCase):
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
                              )
         self.assertDictEqual(
-            {u'payload-type': u'21', u'exp-payload-type': u'21'},
+            {'payload-type': '21', 'exp-payload-type': '21'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_11_otn_service_path_create_10GE(self):
@@ -233,7 +233,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertDictEqual(dict(res['interface'][0], **input_dict),
                              res['interface'][0])
         self.assertDictEqual(
-            {u'speed': 10000},
+            {'speed': 10000},
             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
 
     def test_13_check_interface_ODU2E_CLIENT(self):
@@ -258,7 +258,7 @@ class TransportPCEtesting(unittest.TestCase):
                                   **input_dict_2),
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual(
-            {u'payload-type': u'03', u'exp-payload-type': u'03'},
+            {'payload-type': '03', 'exp-payload-type': '03'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_14_check_interface_ODU2E_NETWORK(self):
@@ -306,9 +306,9 @@ class TransportPCEtesting(unittest.TestCase):
 
         self.assertDictEqual(dict(res['odu-connection'][0], **input_dict_1),
                              res['odu-connection'][0])
-        self.assertDictEqual({u'dst-if': u'XPDR1-NETWORK1-ODU2e-service1'},
+        self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e-service1'},
                              res['odu-connection'][0]['destination'])
-        self.assertDictEqual({u'src-if': u'XPDR1-CLIENT4-ODU2e-service1'},
+        self.assertDictEqual({'src-if': 'XPDR1-CLIENT4-ODU2e-service1'},
                              res['odu-connection'][0]['source'])
 
     def test_16_otn_service_path_delete_10GE(self):

diff --git a/tests/transportpce_tests/2.2.1/test08_otn_sh_renderer.py b/tests/transportpce_tests/2.2.1/test08_otn_sh_renderer.py
index cf358f2207c7913ee2b20cb842e99750c90e50c4..dbfbec5f631fd802a0b68967132602f82b2b3dba 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test08_otn_sh_renderer.py
+++ b/tests/transportpce_tests/2.2.1/test08_otn_sh_renderer.py
@@ -189,8 +189,8 @@ class TransportPCEtesting(unittest.TestCase):
                              res['interface'][0])
 
         self.assertDictEqual(
-            {u'frequency': 196.1, u'rate': u'org-openroadm-common-types:R100G',
-             u'transmit-power': -5, u'modulation-format': 'dp-qpsk'},
+            {'frequency': 196.1, 'rate': 'org-openroadm-common-types:R100G',
+             'transmit-power': -5, 'modulation-format': 'dp-qpsk'},
             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_05_check_interface_OTU(self):
@@ -232,8 +232,8 @@ class TransportPCEtesting(unittest.TestCase):
                              res['interface'][0])
 
         self.assertDictEqual(
-            {u'frequency': 196.1, u'rate': u'org-openroadm-common-types:R100G',
-             u'transmit-power': -5, u'modulation-format': 'dp-qpsk'},
+            {'frequency': 196.1, 'rate': 'org-openroadm-common-types:R100G',
+             'transmit-power': -5, 'modulation-format': 'dp-qpsk'},
             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_07_check_interface_OTU(self):
@@ -393,7 +393,7 @@ class TransportPCEtesting(unittest.TestCase):
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
                              )
         self.assertDictEqual(
-            {u'payload-type': u'21', u'exp-payload-type': u'21'},
+            {'payload-type': '21', 'exp-payload-type': '21'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_10_check_interface_ODU4(self):
@@ -421,7 +421,7 @@ class TransportPCEtesting(unittest.TestCase):
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
                              )
         self.assertDictEqual(
-            {u'payload-type': u'21', u'exp-payload-type': u'21'},
+            {'payload-type': '21', 'exp-payload-type': '21'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     # Test creation of 10G service
@@ -546,7 +546,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertDictEqual(dict(input_dict, **res['interface'][0]),
                              res['interface'][0])
         self.assertDictEqual(
-            {u'speed': 10000},
+            {'speed': 10000},
             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
 
     def test_13_check_interface_ODU2E_CLIENT(self):
@@ -570,7 +570,7 @@ class TransportPCEtesting(unittest.TestCase):
                                   **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual(
-            {u'payload-type': u'03', u'exp-payload-type': u'03'},
+            {'payload-type': '03', 'exp-payload-type': '03'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_14_check_ODU2E_connection(self):
@@ -587,9 +587,9 @@ class TransportPCEtesting(unittest.TestCase):
 
         self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
                              res['odu-connection'][0])
-        self.assertDictEqual({u'dst-if': u'XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G'},
+        self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G'},
                              res['odu-connection'][0]['destination'])
-        self.assertDictEqual({u'src-if': u'XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G'},
+        self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G'},
                              res['odu-connection'][0]['source'])
 
     def test_15_check_interface_ODU2E_NETWORK(self):
@@ -670,7 +670,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertDictEqual(dict(input_dict, **res['interface'][0]),
                              res['interface'][0])
         self.assertDictEqual(
-            {u'speed': 10000},
+            {'speed': 10000},
             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
 
     def test_18_check_interface_ODU2E_CLIENT(self):
@@ -694,7 +694,7 @@ class TransportPCEtesting(unittest.TestCase):
                                   **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual(
-            {u'payload-type': u'03', u'exp-payload-type': u'03'},
+            {'payload-type': '03', 'exp-payload-type': '03'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_19_check_ODU2E_connection(self):
@@ -711,9 +711,9 @@ class TransportPCEtesting(unittest.TestCase):
 
         self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
                              res['odu-connection'][0])
-        self.assertDictEqual({u'dst-if': u'XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G'},
+        self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G'},
                              res['odu-connection'][0]['destination'])
-        self.assertDictEqual({u'src-if': u'XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G'},
+        self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G'},
                              res['odu-connection'][0]['source'])
 
     def test_20_check_interface_ODU2E_NETWORK(self):

diff --git a/tests/transportpce_tests/2.2.1/test11_otn_end2end.py b/tests/transportpce_tests/2.2.1/test11_otn_end2end.py
index d62719b485d087b1d65dcaeedb478ede743b8e3c..385887c47d2e302ed3ae588682d047785b988cd0 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test11_otn_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test11_otn_end2end.py
@@ -282,8 +282,8 @@ class TransportPCEtesting(unittest.TestCase):
                              res['interface'][0])
 
         self.assertDictEqual(
-            {u'frequency': 196.1, u'rate': u'org-openroadm-common-types:R100G',
-             u'transmit-power': -5, u'modulation-format': 'dp-qpsk'},
+            {'frequency': 196.1, 'rate': 'org-openroadm-common-types:R100G',
+             'transmit-power': -5, 'modulation-format': 'dp-qpsk'},
             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_15_check_interface_OTU4_spdra(self):
@@ -324,8 +324,8 @@ class TransportPCEtesting(unittest.TestCase):
                              res['interface'][0])
 
         self.assertDictEqual(
-            {u'frequency': 196.1, u'rate': u'org-openroadm-common-types:R100G',
-             u'transmit-power': -5, u'modulation-format': 'dp-qpsk'},
+            {'frequency': 196.1, 'rate': 'org-openroadm-common-types:R100G',
+             'transmit-power': -5, 'modulation-format': 'dp-qpsk'},
             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_17_check_interface_OTU4_spdrc(self):
@@ -371,8 +371,8 @@ class TransportPCEtesting(unittest.TestCase):
         res = response.json()
         ele = res['node'][0]['ietf-network-topology:termination-point'][0]
         self.assertEqual('XPDR1-NETWORK1', ele['tp-id'])
-        self.assertEqual({u'frequency': 196.1,
-                          u'width': 40},
+        self.assertEqual({'frequency': 196.1,
+                          'width': 40},
                          ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
         time.sleep(3)
 
@@ -496,7 +496,7 @@ class TransportPCEtesting(unittest.TestCase):
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
                              )
         self.assertDictEqual(
-            {u'payload-type': u'21', u'exp-payload-type': u'21'},
+            {'payload-type': '21', 'exp-payload-type': '21'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_26_check_interface_ODU4_spdrc(self):
@@ -525,7 +525,7 @@ class TransportPCEtesting(unittest.TestCase):
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
                              )
         self.assertDictEqual(
-            {u'payload-type': u'21', u'exp-payload-type': u'21'},
+            {'payload-type': '21', 'exp-payload-type': '21'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_27_check_otn_topo_links(self):
@@ -623,7 +623,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertDictEqual(dict(input_dict, **res['interface'][0]),
                              res['interface'][0])
         self.assertDictEqual(
-            {u'speed': 10000},
+            {'speed': 10000},
             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
 
     def test_32_check_interface_ODU2E_CLIENT_spdra(self):
@@ -648,7 +648,7 @@ class TransportPCEtesting(unittest.TestCase):
                                   **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual(
-            {u'payload-type': u'03', u'exp-payload-type': u'03'},
+            {'payload-type': '03', 'exp-payload-type': '03'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_33_check_interface_ODU2E_NETWORK_spdra(self):
@@ -694,9 +694,9 @@ class TransportPCEtesting(unittest.TestCase):
 
         self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
                              res['odu-connection'][0])
-        self.assertDictEqual({u'dst-if': u'XPDR1-NETWORK1-ODU2e-service1-10GE'},
+        self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e-service1-10GE'},
                              res['odu-connection'][0]['destination'])
-        self.assertDictEqual({u'src-if': u'XPDR1-CLIENT1-ODU2e-service1-10GE'},
+        self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e-service1-10GE'},
                              res['odu-connection'][0]['source'])
 
     def test_35_check_interface_10GE_CLIENT_spdrc(self):
@@ -713,7 +713,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertDictEqual(dict(input_dict, **res['interface'][0]),
                              res['interface'][0])
         self.assertDictEqual(
-            {u'speed': 10000},
+            {'speed': 10000},
             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
 
     def test_36_check_interface_ODU2E_CLIENT_spdrc(self):
@@ -738,7 +738,7 @@ class TransportPCEtesting(unittest.TestCase):
                                   **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual(
-            {u'payload-type': u'03', u'exp-payload-type': u'03'},
+            {'payload-type': '03', 'exp-payload-type': '03'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_37_check_interface_ODU2E_NETWORK_spdrc(self):
@@ -788,9 +788,9 @@ class TransportPCEtesting(unittest.TestCase):
 
         self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
                              res['odu-connection'][0])
-        self.assertDictEqual({u'dst-if': u'XPDR1-NETWORK1-ODU2e-service1-10GE'},
+        self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e-service1-10GE'},
                              res['odu-connection'][0]['destination'])
-        self.assertDictEqual({u'src-if': u'XPDR1-CLIENT1-ODU2e-service1-10GE'},
+        self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e-service1-10GE'},
                              res['odu-connection'][0]['source'])
 
     def test_39_check_otn_topo_links(self):
@@ -968,7 +968,7 @@ class TransportPCEtesting(unittest.TestCase):
         tp = res['node'][0]['ietf-network-topology:termination-point'][0]
         self.assertEqual('XPDR1-NETWORK1', tp['tp-id'])
         self.assertNotIn('wavelength', dict.keys(
-            tp[u'org-openroadm-network-topology:xpdr-network-attributes']))
+            tp['org-openroadm-network-topology:xpdr-network-attributes']))
         time.sleep(3)
 
     def test_60_check_openroadm_topo_ROADMA_SRG(self):
@@ -1176,7 +1176,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertDictEqual(dict(input_dict, **res['interface'][0]),
                              res['interface'][0])
         self.assertDictEqual(
-            {u'speed': 1000},
+            {'speed': 1000},
             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
 
     def test_73_check_interface_ODU0_CLIENT_spdra(self):
@@ -1201,7 +1201,7 @@ class TransportPCEtesting(unittest.TestCase):
                                   **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual(
-            {u'payload-type': u'07', u'exp-payload-type': u'07'},
+            {'payload-type': '07', 'exp-payload-type': '07'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_74_check_interface_ODU0_NETWORK_spdra(self):
@@ -1247,9 +1247,9 @@ class TransportPCEtesting(unittest.TestCase):
 
         self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
                              res['odu-connection'][0])
-        self.assertDictEqual({u'dst-if': u'XPDR3-NETWORK1-ODU0-service1-1GE'},
+        self.assertDictEqual({'dst-if': 'XPDR3-NETWORK1-ODU0-service1-1GE'},
                              res['odu-connection'][0]['destination'])
-        self.assertDictEqual({u'src-if': u'XPDR3-CLIENT1-ODU0-service1-1GE'},
+        self.assertDictEqual({'src-if': 'XPDR3-CLIENT1-ODU0-service1-1GE'},
                              res['odu-connection'][0]['source'])
 
     def test_76_check_interface_1GE_CLIENT_spdrc(self):
@@ -1266,7 +1266,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertDictEqual(dict(input_dict, **res['interface'][0]),
                              res['interface'][0])
         self.assertDictEqual(
-            {u'speed': 1000},
+            {'speed': 1000},
             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
 
     def test_77_check_interface_ODU0_CLIENT_spdrc(self):
@@ -1291,7 +1291,7 @@ class TransportPCEtesting(unittest.TestCase):
                                   **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual(
-            {u'payload-type': u'07', u'exp-payload-type': u'07'},
+            {'payload-type': '07', 'exp-payload-type': '07'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_78_check_interface_ODU0_NETWORK_spdrc(self):
@@ -1341,9 +1341,9 @@ class TransportPCEtesting(unittest.TestCase):
 
         self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
                              res['odu-connection'][0])
-        self.assertDictEqual({u'dst-if': u'XPDR3-NETWORK1-ODU0-service1-1GE'},
+        self.assertDictEqual({'dst-if': 'XPDR3-NETWORK1-ODU0-service1-1GE'},
                              res['odu-connection'][0]['destination'])
-        self.assertDictEqual({u'src-if': u'XPDR3-CLIENT1-ODU0-service1-1GE'},
+        self.assertDictEqual({'src-if': 'XPDR3-CLIENT1-ODU0-service1-1GE'},
                              res['odu-connection'][0]['source'])
 
     def test_80_check_otn_topo_links(self):

diff --git a/tests/transportpce_tests/2.2.1/test12_end2end.py b/tests/transportpce_tests/2.2.1/test12_end2end.py
index c8011b0d76a86aca8f2c6ca3eb8b25a394ec5e70..97ee94d1b7753c1c3efda9316c4d058856e76a2b 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test12_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test12_end2end.py
@@ -286,8 +286,8 @@ class TransportPCEFulltesting(unittest.TestCase):
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
             if ele['tp-id'] == 'XPDR1-NETWORK1':
-                self.assertEqual({u'frequency': 196.1,
-                                  u'width': 40},
+                self.assertEqual({'frequency': 196.1,
+                                  'width': 40},
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
             if ele['tp-id'] == 'XPDR1-CLIENT2' or ele['tp-id'] == 'XPDR1-CLIENT1':
                 self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
@@ -419,12 +419,12 @@ class TransportPCEFulltesting(unittest.TestCase):
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
             if ele['tp-id'] == 'XPDR1-NETWORK1':
-                self.assertEqual({u'frequency': 196.1,
-                                  u'width': 40},
+                self.assertEqual({'frequency': 196.1,
+                                  'width': 40},
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
             if ele['tp-id'] == 'XPDR1-NETWORK2':
-                self.assertEqual({u'frequency': 196.05,
-                                  u'width': 40},
+                self.assertEqual({'frequency': 196.05,
+                                  'width': 40},
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
             if ele['tp-id'] == 'XPDR1-CLIENT1' or ele['tp-id'] == 'XPDR1-CLIENT2':
                 self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
@@ -532,13 +532,13 @@ class TransportPCEFulltesting(unittest.TestCase):
         res = response.json()
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
-            if ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-CLIENT':
+            if ele['org-openroadm-common-network:tp-type'] == 'XPONDER-CLIENT':
                 self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
-            elif ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-NETWORK':
-                self.assertIn(u'tail-equipment-id',
-                              dict.keys(ele[u'org-openroadm-network-topology:xpdr-network-attributes']))
+            elif ele['org-openroadm-common-network:tp-type'] == 'XPONDER-NETWORK':
+                self.assertIn('tail-equipment-id',
+                              dict.keys(ele['org-openroadm-network-topology:xpdr-network-attributes']))
                 self.assertNotIn('wavelength', dict.keys(
-                    ele[u'org-openroadm-network-topology:xpdr-network-attributes']))
+                    ele['org-openroadm-network-topology:xpdr-network-attributes']))
         time.sleep(10)
 
     def test_34_check_topo_ROADMA_SRG1(self):

diff --git a/tests/transportpce_tests/2.2.1/test14_otn_switch_end2end.py b/tests/transportpce_tests/2.2.1/test14_otn_switch_end2end.py
index d66e72641640774865108b87a8897461496315a3..2c4f46f43779cf3f4272a88d3131e9df811c5dfb 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test14_otn_switch_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test14_otn_switch_end2end.py
@@ -433,8 +433,8 @@ class TransportPCEtesting(unittest.TestCase):
                              res['interface'][0])
 
         self.assertDictEqual(
-            {u'frequency': 196.1, u'rate': u'org-openroadm-common-types:R100G',
-             u'transmit-power': -5, u'modulation-format': 'dp-qpsk'},
+            {'frequency': 196.1, 'rate': 'org-openroadm-common-types:R100G',
+             'transmit-power': -5, 'modulation-format': 'dp-qpsk'},
             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_28_check_interface_OTU4_spdra(self):
@@ -475,8 +475,8 @@ class TransportPCEtesting(unittest.TestCase):
                              res['interface'][0])
 
         self.assertDictEqual(
-            {u'frequency': 196.1, u'rate': u'org-openroadm-common-types:R100G',
-             u'transmit-power': -5, u'modulation-format': 'dp-qpsk'},
+            {'frequency': 196.1, 'rate': 'org-openroadm-common-types:R100G',
+             'transmit-power': -5, 'modulation-format': 'dp-qpsk'},
             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_30_check_interface_OTU4_spdrB(self):
@@ -522,8 +522,8 @@ class TransportPCEtesting(unittest.TestCase):
         res = response.json()
         ele = res['node'][0]['ietf-network-topology:termination-point'][0]
         self.assertEqual('XPDR2-NETWORK1', ele['tp-id'])
-        self.assertEqual({u'frequency': 196.1,
-                          u'width': 40},
+        self.assertEqual({'frequency': 196.1,
+                          'width': 40},
                          ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
         self.assertEqual('ROADM-A1-SRG1--SRG1-PP3-TXRX',
                          ele['org-openroadm-network-topology:xpdr-network-attributes']['tail-equipment-id'])
@@ -644,8 +644,8 @@ class TransportPCEtesting(unittest.TestCase):
                              res['interface'][0])
 
         self.assertDictEqual(
-            {u'frequency': 196.05, u'rate': u'org-openroadm-common-types:R100G',
-             u'transmit-power': -5, u'modulation-format': 'dp-qpsk'},
+            {'frequency': 196.05, 'rate': 'org-openroadm-common-types:R100G',
+             'transmit-power': -5, 'modulation-format': 'dp-qpsk'},
             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_38_check_interface_OTU4_spdrB(self):
@@ -686,8 +686,8 @@ class TransportPCEtesting(unittest.TestCase):
                              res['interface'][0])
 
         self.assertDictEqual(
-            {u'frequency': 196.05, u'rate': u'org-openroadm-common-types:R100G',
-             u'transmit-power': -5, u'modulation-format': 'dp-qpsk'},
+            {'frequency': 196.05, 'rate': 'org-openroadm-common-types:R100G',
+             'transmit-power': -5, 'modulation-format': 'dp-qpsk'},
             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_40_check_interface_OTU4_spdrC(self):
@@ -734,14 +734,14 @@ class TransportPCEtesting(unittest.TestCase):
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
             if ele['tp-id'] == 'XPDR2-NETWORK1':
-                self.assertEqual({u'frequency': 196.1,
-                                  u'width': 40},
+                self.assertEqual({'frequency': 196.1,
+                                  'width': 40},
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
                 self.assertEqual('ROADM-B1-SRG1--SRG1-PP1-TXRX',
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['tail-equipment-id'])
             elif ele['tp-id'] == 'XPDR2-NETWORK2':
-                self.assertEqual({u'frequency': 196.05,
-                                  u'width': 40},
+                self.assertEqual({'frequency': 196.05,
+                                  'width': 40},
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
                 self.assertEqual('ROADM-B1-SRG1--SRG1-PP2-TXRX',
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['tail-equipment-id'])
@@ -878,8 +878,8 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertDictEqual(dict(input_dict, **res['interface'][0]),
                              res['interface'][0])
         self.assertDictEqual(
-            {u'speed': 100000,
-             u'fec': 'off'},
+            {'speed': 100000,
+             'fec': 'off'},
             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
 
     def test_49_check_interface_ODU4_CLIENT_spdra(self):
@@ -904,7 +904,7 @@ class TransportPCEtesting(unittest.TestCase):
                                   **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual(
-            {u'payload-type': u'07', u'exp-payload-type': u'07'},
+            {'payload-type': '07', 'exp-payload-type': '07'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_50_check_interface_ODU4_NETWORK_spdra(self):
@@ -928,7 +928,7 @@ class TransportPCEtesting(unittest.TestCase):
                                   **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual(
-            {u'payload-type': u'07', u'exp-payload-type': u'07'},
+            {'payload-type': '07', 'exp-payload-type': '07'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_51_check_ODU4_connection_spdra(self):
@@ -945,9 +945,9 @@ class TransportPCEtesting(unittest.TestCase):
 
         self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
                              res['odu-connection'][0])
-        self.assertDictEqual({u'dst-if': u'XPDR2-NETWORK1-ODU4'},
+        self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4'},
                              res['odu-connection'][0]['destination'])
-        self.assertDictEqual({u'src-if': u'XPDR2-CLIENT1-ODU4'},
+        self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4'},
                              res['odu-connection'][0]['source'])
 
     def test_52_check_interface_100GE_CLIENT_spdrc(self):
@@ -964,8 +964,8 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertDictEqual(dict(input_dict, **res['interface'][0]),
                              res['interface'][0])
         self.assertDictEqual(
-            {u'speed': 100000,
-             u'fec': 'off'},
+            {'speed': 100000,
+             'fec': 'off'},
             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
 
     def test_53_check_interface_ODU4_CLIENT_spdrc(self):
@@ -990,7 +990,7 @@ class TransportPCEtesting(unittest.TestCase):
                                   **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual(
-            {u'payload-type': u'07', u'exp-payload-type': u'07'},
+            {'payload-type': '07', 'exp-payload-type': '07'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_54_check_interface_ODU4_NETWORK_spdrc(self):
@@ -1014,7 +1014,7 @@ class TransportPCEtesting(unittest.TestCase):
                                   **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual(
-            {u'payload-type': u'07', u'exp-payload-type': u'07'},
+            {'payload-type': '07', 'exp-payload-type': '07'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_55_check_ODU4_connection_spdrc(self):
@@ -1031,9 +1031,9 @@ class TransportPCEtesting(unittest.TestCase):
 
         self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
                              res['odu-connection'][0])
-        self.assertDictEqual({u'dst-if': u'XPDR2-NETWORK1-ODU4'},
+        self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4'},
                              res['odu-connection'][0]['destination'])
-        self.assertDictEqual({u'src-if': u'XPDR2-CLIENT1-ODU4'},
+        self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4'},
                              res['odu-connection'][0]['source'])
 
     def test_56_check_interface_ODU4_NETWORK1_spdrb(self):
@@ -1057,7 +1057,7 @@ class TransportPCEtesting(unittest.TestCase):
                                   **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual(
-            {u'payload-type': u'07', u'exp-payload-type': u'07'},
+            {'payload-type': '07', 'exp-payload-type': '07'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_57_check_interface_ODU4_NETWORK2_spdrb(self):
@@ -1081,7 +1081,7 @@ class TransportPCEtesting(unittest.TestCase):
                                   **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual(
-            {u'payload-type': u'07', u'exp-payload-type': u'07'},
+            {'payload-type': '07', 'exp-payload-type': '07'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_58_check_ODU4_connection_spdrb(self):
@@ -1098,9 +1098,9 @@ class TransportPCEtesting(unittest.TestCase):
 
         self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
                              res['odu-connection'][0])
-        self.assertDictEqual({u'dst-if': u'XPDR2-NETWORK2-ODU4'},
+        self.assertDictEqual({'dst-if': 'XPDR2-NETWORK2-ODU4'},
                              res['odu-connection'][0]['destination'])
-        self.assertDictEqual({u'src-if': u'XPDR2-NETWORK1-ODU4'},
+        self.assertDictEqual({'src-if': 'XPDR2-NETWORK1-ODU4'},
                              res['odu-connection'][0]['source'])
 
     def test_59_check_otn_topo_links(self):
@@ -1204,7 +1204,7 @@ class TransportPCEtesting(unittest.TestCase):
         tp = res['node'][0]['ietf-network-topology:termination-point'][0]
         self.assertEqual('XPDR2-NETWORK1', tp['tp-id'])
         self.assertNotIn('wavelength', dict.keys(
-            tp[u'org-openroadm-network-topology:xpdr-network-attributes']))
+            tp['org-openroadm-network-topology:xpdr-network-attributes']))
         time.sleep(3)
 
     def test_74_check_openroadm_topo_ROADMB_SRG1(self):

diff --git a/tests/transportpce_tests/7.1/test01_portmapping.py b/tests/transportpce_tests/7.1/test01_portmapping.py
index 8fa07397d6dd4d9c0bd0a1c9776e8ce6b176549c..ede9a4a3355a0e8799efeb522929226b2e1edb1b 100644 (file)
--- a/tests/transportpce_tests/7.1/test01_portmapping.py
+++ b/tests/transportpce_tests/7.1/test01_portmapping.py
@@ -62,12 +62,12 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(
-            {u'node-info': {u'node-type': u'xpdr',
-                            u'node-ip-address': u'1.2.3.4',
-                            u'node-clli': u'NodeA',
-                            u'openroadm-version': u'7.1',
-                            u'node-vendor': u'vendorA',
-                            u'node-model': u'model'}},
+            {'node-info': {'node-type': 'xpdr',
+                           'node-ip-address': '1.2.3.4',
+                           'node-clli': 'NodeA',
+                           'openroadm-version': '7.1',
+                           'node-vendor': 'vendorA',
+                           'node-model': 'model'}},
             res)
         time.sleep(3)
 

diff --git a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py
index 856713da0dd0239bb77d6f5597152684c22aa4dd..db0a67c1e61e2b768ea02005b679683860fcbe79 100644 (file)
--- a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py
+++ b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py
@@ -292,8 +292,8 @@ class TransportPCEtesting(unittest.TestCase):
                              res['interface'][0])
 
         self.assertDictEqual(
-            dict({u'frequency': 196.0812, u'otsi-rate': u'org-openroadm-common-optical-channel-types:R400G-otsi',
-                  u'transmit-power': -5, u'modulation-format': 'dp-qam16'},
+            dict({'frequency': 196.0812, 'otsi-rate': 'org-openroadm-common-optical-channel-types:R400G-otsi',
+                  'transmit-power': -5, 'modulation-format': 'dp-qam16'},
                  **res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']),
             res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi'])
 
@@ -358,8 +358,8 @@ class TransportPCEtesting(unittest.TestCase):
                              res['interface'][0])
 
         self.assertDictEqual(
-            dict({u'frequency': 196.0812, u'otsi-rate': u'org-openroadm-common-optical-channel-types:R400G-otsi',
-                  u'transmit-power': -5, u'modulation-format': 'dp-qam16'},
+            dict({'frequency': 196.0812, 'otsi-rate': 'org-openroadm-common-optical-channel-types:R400G-otsi',
+                  'transmit-power': -5, 'modulation-format': 'dp-qam16'},
                  **res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']),
             res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi'])
 
@@ -430,8 +430,8 @@ class TransportPCEtesting(unittest.TestCase):
         res = response.json()
         ele = res['node'][0]['ietf-network-topology:termination-point'][0]
         self.assertEqual('XPDR2-NETWORK1', ele['tp-id'])
-        self.assertEqual({u'frequency': 196.08125,
-                          u'width': 75},
+        self.assertEqual({'frequency': 196.08125,
+                          'width': 75},
                          ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
         time.sleep(3)
 
@@ -520,7 +520,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual(
-            {u'payload-type': u'22', u'exp-payload-type': u'22'},
+            {'payload-type': '22', 'exp-payload-type': '22'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_26_check_interface_ODUC4_xpdrc2(self):
@@ -547,7 +547,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual(
-            {u'payload-type': u'22', u'exp-payload-type': u'22'},
+            {'payload-type': '22', 'exp-payload-type': '22'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_27_check_otn_topo_links(self):
@@ -642,7 +642,7 @@ class TransportPCEtesting(unittest.TestCase):
                         'type': 'org-openroadm-interfaces:ethernetCsmacd',
                         'supporting-port': 'C1'
                         }
-        input_dict_2 = {u'speed': 100000}
+        input_dict_2 = {'speed': 100000}
         self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
                              res['interface'][0])
         self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']),
@@ -670,7 +670,7 @@ class TransportPCEtesting(unittest.TestCase):
                                   **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual(
-            {u'payload-type': u'07', u'exp-payload-type': u'07'},
+            {'payload-type': '07', 'exp-payload-type': '07'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_33_check_interface_ODU4_NETWORK_xpdra2(self):
@@ -688,7 +688,7 @@ class TransportPCEtesting(unittest.TestCase):
             'odu-function': 'org-openroadm-otn-common-types:ODU-CTP',
             'rate': 'org-openroadm-otn-common-types:ODU4',
             'monitoring-mode': 'not-terminated'}
-        input_dict_3 = {u'trib-port-number': 1}
+        input_dict_3 = {'trib-port-number': 1}
 
         self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
                              res['interface'][0])
@@ -718,9 +718,9 @@ class TransportPCEtesting(unittest.TestCase):
 
         self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
                              res['odu-connection'][0])
-        self.assertDictEqual({u'dst-if': u'XPDR2-NETWORK1-ODU4-service-100GE'},
+        self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4-service-100GE'},
                              res['odu-connection'][0]['destination'])
-        self.assertDictEqual({u'src-if': u'XPDR2-CLIENT1-ODU4-service-100GE'},
+        self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4-service-100GE'},
                              res['odu-connection'][0]['source'])
 
     def test_35_check_interface_100GE_CLIENT_xpdrc2(self):
@@ -734,7 +734,7 @@ class TransportPCEtesting(unittest.TestCase):
                         'type': 'org-openroadm-interfaces:ethernetCsmacd',
                         'supporting-port': 'C1'
                         }
-        input_dict_2 = {u'speed': 100000}
+        input_dict_2 = {'speed': 100000}
         self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
                              res['interface'][0])
         self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']),
@@ -762,7 +762,7 @@ class TransportPCEtesting(unittest.TestCase):
                                   **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual(
-            {u'payload-type': u'07', u'exp-payload-type': u'07'},
+            {'payload-type': '07', 'exp-payload-type': '07'},
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_37_check_interface_ODU4_NETWORK_xpdrc2(self):
@@ -816,9 +816,9 @@ class TransportPCEtesting(unittest.TestCase):
 
         self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
                              res['odu-connection'][0])
-        self.assertDictEqual({u'dst-if': u'XPDR2-NETWORK1-ODU4-service-100GE'},
+        self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4-service-100GE'},
                              res['odu-connection'][0]['destination'])
-        self.assertDictEqual({u'src-if': u'XPDR2-CLIENT1-ODU4-service-100GE'},
+        self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4-service-100GE'},
                              res['odu-connection'][0]['source'])
 
     def test_39_check_otn_topo_links(self):
@@ -1081,7 +1081,7 @@ class TransportPCEtesting(unittest.TestCase):
         tp = res['node'][0]['ietf-network-topology:termination-point'][0]
         self.assertEqual('XPDR2-NETWORK1', tp['tp-id'])
         self.assertNotIn('wavelength', dict.keys(
-            tp[u'org-openroadm-network-topology:xpdr-network-attributes']))
+            tp['org-openroadm-network-topology:xpdr-network-attributes']))
         time.sleep(3)
 
     def test_67_check_openroadm_topology(self):
@@ -1187,8 +1187,8 @@ class TransportPCEtesting(unittest.TestCase):
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
             if ele['tp-id'] == 'XPDR1-NETWORK1':
-                self.assertEqual({u'frequency': 196.08125,
-                                  u'width': 75},
+                self.assertEqual({'frequency': 196.08125,
+                                  'width': 75},
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
             if ele['tp-id'] == 'XPDR1-CLIENT1':
                 self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
@@ -1246,7 +1246,7 @@ class TransportPCEtesting(unittest.TestCase):
                         'type': 'org-openroadm-interfaces:ethernetCsmacd',
                         'supporting-port': 'C1'
                         }
-        input_dict_2 = {u'speed': 400000}
+        input_dict_2 = {'speed': 400000}
         self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
                              res['interface'][0])
         self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']),