Migrate portmapping functional tests to RFC8040

[transportpce.git] / tests / transportpce_tests / 1.2.1 / test04_renderer_service_path_nominal.py

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 305c2ec89ee83a0b2d8ea96c808bdfcf4abbc00a..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
@@ -17,7 +17,8 @@ import time
 import requests
 import sys
 sys.path.append('transportpce_tests/common/')
-import test_utils
+import test_utils  # nopep8
+
 
 class TransportPCERendererTesting(unittest.TestCase):
 
@@ -173,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):
@@ -196,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):
@@ -219,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):
@@ -289,7 +290,8 @@ class TransportPCERendererTesting(unittest.TestCase):
             res['errors']['error'])
 
     def test_17_service_path_delete_rdm_check(self):
-        response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP7-TXRX-DEG1-TTP-TXRX-713:720")
+        response = test_utils.check_netconf_node_request(
+            "ROADMA01", "roadm-connections/SRG1-PP7-TXRX-DEG1-TTP-TXRX-713:720")
         self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn(