Code Review / transportpce.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Refactor func tests transportpce api rpc calls 1/2
[transportpce.git] / tests / transportpce_tests / 2.2.1 / test05_flex_grid.py
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 c80259de9111c7f655907e00f48bbdabd09e6dc2..2d5674bc5b8119632abe81e3a8fd95a585b91402 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test05_flex_grid.py
+++ b/tests/transportpce_tests/2.2.1/test05_flex_grid.py
@@ -96,34 +96,34 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
 
     # Renderer interface creations
     def test_07_device_renderer(self):
-        data = {
-            "input": {
-                "modulation-format": "dp-qpsk",
-                "operation": "create",
-                "service-name": "testNMC-MC",
-                "wave-number": "0",
-                "center-freq": "196.05",
-                "nmc-width": "80",
-                "nodes": [
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'service-path',
+            {
+                'modulation-format': 'dp-qpsk',
+                'operation': 'create',
+                'service-name': 'testNMC-MC',
+                'wave-number': '0',
+                'center-freq': '196.05',
+                'nmc-width': '80',
+                'nodes': [
                     {
-                        "node-id": "ROADM-D1",
-                        "src-tp": "SRG1-PP1-TXRX",
-                        "dest-tp": "DEG1-TTP-TXRX"
+                        'node-id': 'ROADM-D1',
+                        'src-tp': 'SRG1-PP1-TXRX',
+                        'dest-tp': 'DEG1-TTP-TXRX'
                     }
                 ],
-                "min-freq": 196.00625,
-                "max-freq": 196.09375,
-                "lower-spectral-slot-number": 749,
-                "higher-spectral-slot-number": 763
-            }
-        }
-        response = test_utils_rfc8040.device_renderer_service_path_request(data)
-        self.assertEqual(response.status_code, requests.codes.ok)
+                'min-freq': 196.00625,
+                'max-freq': 196.09375,
+                'lower-spectral-slot-number': 749,
+                'higher-spectral-slot-number': 763
+            })
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Interfaces created successfully for nodes: ', response['output']['result'])
         time.sleep(10)
 
     # Get Degree MC interface and check
     def test_08_degree_mc_interface(self):
-        response = test_utils_rfc8040.check_interface_request("ROADM-D1", "DEG1-TTP-TXRX-mc-749:763")
+        response = test_utils_rfc8040.check_node_attribute_request("ROADM-D1", "interface", "DEG1-TTP-TXRX-mc-749:763")
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertDictEqual(
             dict({"name": "DEG1-TTP-TXRX-mc-749:763",
@@ -143,7 +143,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
 
     # get DEG-NMC interface and check
     def test_09_degree_nmc_interface(self):
-        response = test_utils_rfc8040.check_interface_request("ROADM-D1", "DEG1-TTP-TXRX-nmc-749:763")
+        response = test_utils_rfc8040.check_node_attribute_request("ROADM-D1", "interface", "DEG1-TTP-TXRX-nmc-749:763")
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertDictEqual(
             dict({"name": "DEG1-TTP-TXRX-nmc-749:763",
@@ -163,7 +163,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
 
     # get SRG-NMC interface
     def test_10_srg_nmc_interface(self):
-        response = test_utils_rfc8040.check_interface_request("ROADM-D1", "SRG1-PP1-TXRX-nmc-749:763")
+        response = test_utils_rfc8040.check_node_attribute_request("ROADM-D1", "interface", "SRG1-PP1-TXRX-nmc-749:763")
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertEqual(
             dict({"name": "SRG1-PP1-TXRX-nmc-749:763",
@@ -180,7 +180,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
 
     # Create ROADM-connection
     def test_11_roadm_connection(self):
-        response = test_utils_rfc8040.check_roadm_connections_request("ROADM-D1", "SRG1-PP1-TXRX-DEG1-TTP-TXRX-749:763")
+        response = test_utils_rfc8040.check_node_attribute_request(
+            "ROADM-D1", "roadm-connections", "SRG1-PP1-TXRX-DEG1-TTP-TXRX-749:763")
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertEqual("SRG1-PP1-TXRX-DEG1-TTP-TXRX-749:763",
                          response['roadm-connections'][0]['connection-name'])
@@ -194,25 +195,26 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
 
     # delete ROADM connection
     def test_12_delete_roadm_connection(self):
-        response = test_utils_rfc8040.del_roadm_connections_request("ROADM-D1", "SRG1-PP1-TXRX-DEG1-TTP-TXRX-749:763")
+        response = test_utils_rfc8040.del_node_attribute_request(
+            "ROADM-D1", "roadm-connections", "SRG1-PP1-TXRX-DEG1-TTP-TXRX-749:763")
         self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
         time.sleep(3)
 
     # Delete NMC SRG interface
     def test_13_delete_srg_interface(self):
-        response = test_utils_rfc8040.del_interface_request("ROADM-D1", "SRG1-PP1-TXRX-nmc-749:763")
+        response = test_utils_rfc8040.del_node_attribute_request("ROADM-D1", "interface", "SRG1-PP1-TXRX-nmc-749:763")
         self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
         time.sleep(3)
 
     # Delete NMC Degree interface
     def test_14_delete_degree_interface(self):
-        response = test_utils_rfc8040.del_interface_request("ROADM-D1", "DEG1-TTP-TXRX-nmc-749:763")
+        response = test_utils_rfc8040.del_node_attribute_request("ROADM-D1", "interface", "DEG1-TTP-TXRX-nmc-749:763")
         self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
         time.sleep(3)
 
     # Delete MC Degree interface
     def test_15_delete_degree_interface(self):
-        response = test_utils_rfc8040.del_interface_request("ROADM-D1", "DEG1-TTP-TXRX-mc-749:763")
+        response = test_utils_rfc8040.del_node_attribute_request("ROADM-D1", "interface", "DEG1-TTP-TXRX-mc-749:763")
         self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
         time.sleep(3)
 
Repository for Transport PCE project.