Improve otnrenderer functional test

JIRA: TRNSPRTPCE-415
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iace4b508f1da2ad61cab6eaf947eba4350d03c84

diff --git a/tests/transportpce_tests/2.2.1/test_otn_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_renderer.py
index 8c2cec49f57ca0f3cb9e40ae5dde2aea61024491..a275c2ab4c9aaf7df399a72ad4fef3eac82c4f23 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_renderer.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_renderer.py
@@ -21,6 +21,18 @@ from common import test_utils
 class TransportPCEtesting(unittest.TestCase):
 
     processes = None
+    NETWORK1_CHECK_DICT = {"logical-connection-point": "XPDR1-NETWORK1",
+                           "supporting-port": "CP1-CFP0-P1",
+                           "supported-interface-capability": [
+                               "org-openroadm-port-types:if-OCH-OTU4-ODU4"
+                           ],
+                           "port-direction": "bidirectional",
+                           "port-qual": "xpdr-network",
+                           "supporting-circuit-pack-name": "CP1-CFP0",
+                           "xponder-type": "mpdr",
+                           'lcp-hash-val': 'Swfw02qXGyI=',
+                           'port-admin-state': 'InService',
+                           'port-oper-state': 'InService'}
 
     @classmethod
     def setUpClass(cls):
@@ -70,25 +82,14 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn(
-            {"logical-connection-point": "XPDR1-NETWORK1",
-             "supporting-port": "CP1-CFP0-P1",
-             "supported-interface-capability": [
-                 "org-openroadm-port-types:if-OCH-OTU4-ODU4"
-             ],
-                "port-direction": "bidirectional",
-                "port-qual": "xpdr-network",
-                "supporting-circuit-pack-name": "CP1-CFP0",
-                "xponder-type": "mpdr",
-             'lcp-hash-val': 'Swfw02qXGyI=',
-             'port-admin-state': 'InService',
-             'port-oper-state': 'InService'},
-           res['mapping'])
+            self.NETWORK1_CHECK_DICT,
+            res['mapping'])
 
     def test_04_service_path_create_OCH_OTU4(self):
         response = test_utils.service_path_request("create", "service_OCH_OTU4", "1",
                                                    [{"node-id": "SPDR-SA1", "dest-tp": "XPDR1-NETWORK1"}],
                                                    196.1, 40, 196.075, 196.125, 761,
-                                                    768)
+                                                   768)
         time.sleep(3)
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
@@ -104,18 +105,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn(
-            {"logical-connection-point": "XPDR1-NETWORK1",
-             "supporting-port": "CP1-CFP0-P1",
-             "supported-interface-capability": [
-                 "org-openroadm-port-types:if-OCH-OTU4-ODU4"
-             ],
-                "port-direction": "bidirectional",
-                "port-qual": "xpdr-network",
-                "supporting-circuit-pack-name": "CP1-CFP0",
-                "xponder-type": "mpdr",
-                "lcp-hash-val": "Swfw02qXGyI=",
-                "port-admin-state": "InService",
-                "port-oper-state": "InService"},
+            self.NETWORK1_CHECK_DICT,
             res['mapping'])
 
     def test_06_check_interface_och(self):
@@ -178,21 +168,9 @@ class TransportPCEtesting(unittest.TestCase):
         response = test_utils.portmapping_request("SPDR-SA1/mapping/XPDR1-NETWORK1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
+        self.NETWORK1_CHECK_DICT["supporting-odu4"] = "XPDR1-NETWORK1-ODU4"
         self.assertIn(
-            {"logical-connection-point": "XPDR1-NETWORK1",
-             "supporting-port": "CP1-CFP0-P1",
-             "supported-interface-capability": [
-                 "org-openroadm-port-types:if-OCH-OTU4-ODU4"
-             ],
-                "port-direction": "bidirectional",
-                "port-qual": "xpdr-network",
-                "supporting-circuit-pack-name": "CP1-CFP0",
-                "xponder-type": "mpdr",
-                "supporting-odu4": "XPDR1-NETWORK1-ODU4",
-                "lcp-hash-val": "Swfw02qXGyI=",
-                "port-admin-state": "InService",
-                "port-oper-state": "InService"
-             },
+            self.NETWORK1_CHECK_DICT,
             res['mapping'])
 
     def test_10_check_interface_ODU4(self):
@@ -377,7 +355,7 @@ class TransportPCEtesting(unittest.TestCase):
         response = test_utils.service_path_request("delete", "service_OCH_OTU4", "1",
                                                    [{"node-id": "SPDR-SA1", "dest-tp": "XPDR1-NETWORK1"}],
                                                    196.1, 40, 196.075, 196.125, 761,
-                                                    768)
+                                                   768)
         time.sleep(3)
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()