Update connection and interface name

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

diff --git a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
index 24b24230dcc9e937b912e1dadf26d0ce85cfd678..b57f578746ef3a64c0adccd51c4b77e174a40279 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
+++ b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
@@ -84,19 +84,22 @@ class TransportPCERendererTesting(unittest.TestCase):
                                                      "renderer:dest-tp": "DEG1-TTP-TXRX"},
                                                     {"renderer:node-id": "XPDRA01",
                                                      "renderer:src-tp": "XPDR1-CLIENT1",
-                                                     "renderer:dest-tp": "XPDR1-NETWORK1"}])
+                                                     "renderer:dest-tp": "XPDR1-NETWORK1"}],
+                                                   195.8, 40, 195.775, 195.825, 713,
+                                                   720)
+        print(response.json())
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Roadm-connection successfully created for nodes: ROADMA01', res["output"]["result"])
 
     def test_06_service_path_create_rdm_check(self):
-        response = test_utils.check_netconf_node_request("ROADMA01", "interface/DEG1-TTP-TXRX-7")
+        response = test_utils.check_netconf_node_request("ROADMA01", "interface/DEG1-TTP-TXRX-713:720")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
         self.assertDictEqual(
             dict({
-                'name': 'DEG1-TTP-TXRX-7',
+                'name': 'DEG1-TTP-TXRX-713:720',
                 'administrative-state': 'inService',
                 'supporting-circuit-pack-name': '2/0',
                 'type': 'org-openroadm-interfaces:opticalChannel',
@@ -109,13 +112,13 @@ class TransportPCERendererTesting(unittest.TestCase):
             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_07_service_path_create_rdm_check(self):
-        response = test_utils.check_netconf_node_request("ROADMA01", "interface/SRG1-PP7-TXRX-7")
+        response = test_utils.check_netconf_node_request("ROADMA01", "interface/SRG1-PP7-TXRX-713:720")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
         self.assertDictEqual(
             dict({
-                'name': 'SRG1-PP7-TXRX-7',
+                'name': 'SRG1-PP7-TXRX-713:720',
                 'administrative-state': 'inService',
                 'supporting-circuit-pack-name': '4/0',
                 'type': 'org-openroadm-interfaces:opticalChannel',
@@ -128,33 +131,34 @@ class TransportPCERendererTesting(unittest.TestCase):
             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_08_service_path_create_rdm_check(self):
-        response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP7-TXRX-DEG1-TTP-TXRX-7")
+        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.ok)
         res = response.json()
         # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
         self.assertDictEqual(
             dict({
-                'connection-number': 'SRG1-PP7-TXRX-DEG1-TTP-TXRX-7',
+                'connection-number': 'SRG1-PP7-TXRX-DEG1-TTP-TXRX-713:720',
                 'wavelength-number': 7,
                 'opticalControlMode': 'off'
             }, **res['roadm-connections'][0]),
             res['roadm-connections'][0]
         )
         self.assertDictEqual(
-            {'src-if': 'SRG1-PP7-TXRX-7'},
+            {'src-if': 'SRG1-PP7-TXRX-713:720'},
             res['roadm-connections'][0]['source'])
         self.assertDictEqual(
-            {'dst-if': 'DEG1-TTP-TXRX-7'},
+            {'dst-if': 'DEG1-TTP-TXRX-713:720'},
             res['roadm-connections'][0]['destination'])
 
     def test_09_service_path_create_xpdr_check(self):
-        response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-NETWORK1-7")
+        response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-NETWORK1-713:720")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
         self.assertDictEqual(
             dict({
-                'name': 'XPDR1-NETWORK1-7',
+                'name': 'XPDR1-NETWORK1-713:720',
                 'administrative-state': 'inService',
                 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
                 'type': 'org-openroadm-interfaces:opticalChannel',
@@ -181,7 +185,7 @@ class TransportPCERendererTesting(unittest.TestCase):
                 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
                 'type': 'org-openroadm-interfaces:otnOtu',
                 'supporting-port': '1',
-                'supporting-interface': 'XPDR1-NETWORK1-7'
+                'supporting-interface': 'XPDR1-NETWORK1-713:720'
             }, **res['interface'][0]),
             res['interface'][0]
         )
@@ -252,13 +256,15 @@ class TransportPCERendererTesting(unittest.TestCase):
                                                      "renderer:dest-tp": "DEG1-TTP-TXRX"},
                                                     {"renderer:node-id": "XPDRA01",
                                                      "renderer:src-tp": "XPDR1-CLIENT1",
-                                                     "renderer:dest-tp": "XPDR1-NETWORK1"}])
+                                                     "renderer:dest-tp": "XPDR1-NETWORK1"}],
+                                                   195.8, 40, 195.775, 195.825, 713,
+                                                   720)
         self.assertEqual(response.status_code, requests.codes.ok)
         self.assertEqual(response.json(), {
             'output': {'result': 'Request processed', 'success': True}})
 
     def test_15_service_path_delete_rdm_check(self):
-        response = test_utils.check_netconf_node_request("ROADMA01", "interface/DEG1-TTP-TXRX-7")
+        response = test_utils.check_netconf_node_request("ROADMA01", "interface/DEG1-TTP-TXRX-713:720")
         self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn(
@@ -267,7 +273,7 @@ class TransportPCERendererTesting(unittest.TestCase):
             res['errors']['error'])
 
     def test_16_service_path_delete_rdm_check(self):
-        response = test_utils.check_netconf_node_request("ROADMA01", "interface/SRG1-PP7-TXRX-7")
+        response = test_utils.check_netconf_node_request("ROADMA01", "interface/SRG1-PP7-TXRX-713:720")
         self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn(
@@ -277,7 +283,7 @@ 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-7")
+        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(
@@ -287,7 +293,7 @@ class TransportPCERendererTesting(unittest.TestCase):
             res['errors']['error'])
 
     def test_18_service_path_delete_xpdr_check(self):
-        response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-NETWORK1-7")
+        response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-NETWORK1-713:720")
         self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn(