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 20356b2976ae3dc3928205db916f017fdc35742a..2441c0c52c7f8c9a77f5bd029ca73acbd8da2f3e 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,16 @@ 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='}
 
     @classmethod
     def setUpClass(cls):
@@ -68,23 +78,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='},
+            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()
@@ -100,16 +101,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="},
+            self.NETWORK1_CHECK_DICT,
             res['mapping'])
 
     def test_06_check_interface_och(self):
@@ -172,19 +164,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="
-             },
+            self.NETWORK1_CHECK_DICT,
             res['mapping'])
 
     def test_10_check_interface_ODU4(self):
@@ -369,7 +351,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()