Refactor func tests transportpce api rpc calls 1/2

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

diff --git a/tests/transportpce_tests/1.2.1/test05_olm.py b/tests/transportpce_tests/1.2.1/test05_olm.py
index 8684cfc746bafa718ca5ca0b92aa0f8ef423194a..ca5306bd3b98ad7ee08f6255d6c1291704724131 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test05_olm.py
+++ b/tests/transportpce_tests/1.2.1/test05_olm.py
@@ -97,14 +97,16 @@ class TransportOlmTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
 
     def test_11_get_PM_ROADMA(self):
-        response = test_utils_rfc8040.olm_get_pm_request({
-            'node-id': 'ROADMA01',
-            'resource-type': 'interface',
-            'granularity': '15min',
-            'resource-identifier': {
-                'resource-name': 'OTS-DEG1-TTP-TXRX'
-            }
-        })
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-olm', 'get-pm',
+            {
+                'node-id': 'ROADMA01',
+                'resource-type': 'interface',
+                'granularity': '15min',
+                'resource-identifier': {
+                    'resource-name': 'OTS-DEG1-TTP-TXRX'
+                }
+            })
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn({
             'pmparameter-name': 'OpticalPowerOutput',
@@ -120,14 +122,16 @@ class TransportOlmTesting(unittest.TestCase):
         }, response['output']['measurements'])
 
     def test_12_get_PM_ROADMC(self):
-        response = test_utils_rfc8040.olm_get_pm_request({
-            'node-id': 'ROADMC01',
-            'resource-type': 'interface',
-            'granularity': '15min',
-            'resource-identifier': {
-                'resource-name': 'OTS-DEG2-TTP-TXRX'
-            }
-        })
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-olm', 'get-pm',
+            {
+                'node-id': 'ROADMC01',
+                'resource-type': 'interface',
+                'granularity': '15min',
+                'resource-identifier': {
+                    'resource-name': 'OTS-DEG2-TTP-TXRX'
+                }
+            })
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn({
             'pmparameter-name': 'OpticalPowerOutput',
@@ -143,10 +147,12 @@ class TransportOlmTesting(unittest.TestCase):
         }, response['output']['measurements'])
 
     def test_13_calculate_span_loss_base_ROADMA_ROADMC(self):
-        response = test_utils_rfc8040.olm_calculate_spanloss_base_request({
-            'src-type': 'link',
-            'link-id': 'ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX'
-        })
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-olm', 'calculate-spanloss-base',
+            {
+                'src-type': 'link',
+                'link-id': 'ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX'
+            })
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Success',
                       response['output']['result'])
@@ -157,9 +163,11 @@ class TransportOlmTesting(unittest.TestCase):
         time.sleep(5)
 
     def test_14_calculate_span_loss_base_all(self):
-        response = test_utils_rfc8040.olm_calculate_spanloss_base_request({
-            'src-type': 'all'
-        })
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-olm', 'calculate-spanloss-base',
+            {
+                'src-type': 'all'
+            })
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Success',
                       response['output']['result'])
@@ -192,90 +200,96 @@ class TransportOlmTesting(unittest.TestCase):
         self.assertEqual(float(response['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']), 5.7)
 
     def test_17_servicePath_create_AToZ(self):
-        response = test_utils_rfc8040.device_renderer_service_path_request({
-            'service-name': 'test',
-            'wave-number': '1',
-            'modulation-format': 'dp-qpsk',
-            'operation': 'create',
-            'nodes':
-            [{'node-id': 'XPDRA01',
-              'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'},
-             {'node-id': 'ROADMA01',
-              'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'},
-             {'node-id': 'ROADMC01',
-              'dest-tp': 'SRG1-PP1-TXRX', 'src-tp': 'DEG2-TTP-TXRX'},
-             {'node-id': 'XPDRC01',
-              'dest-tp': 'XPDR1-CLIENT1', 'src-tp': 'XPDR1-NETWORK1'}],
-            'center-freq': 196.1,
-            'nmc-width': 40,
-            'min-freq': 196.075,
-            'max-freq': 196.125,
-            'lower-spectral-slot-number': 761,
-            'higher-spectral-slot-number': 768
-        })
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'service-path',
+            {
+                'service-name': 'test',
+                'wave-number': '1',
+                'modulation-format': 'dp-qpsk',
+                'operation': 'create',
+                'nodes':
+                [{'node-id': 'XPDRA01',
+                  'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'},
+                 {'node-id': 'ROADMA01',
+                    'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'},
+                    {'node-id': 'ROADMC01',
+                     'dest-tp': 'SRG1-PP1-TXRX', 'src-tp': 'DEG2-TTP-TXRX'},
+                    {'node-id': 'XPDRC01',
+                     'dest-tp': 'XPDR1-CLIENT1', 'src-tp': 'XPDR1-NETWORK1'}],
+                'center-freq': 196.1,
+                'nmc-width': 40,
+                'min-freq': 196.075,
+                'max-freq': 196.125,
+                'lower-spectral-slot-number': 761,
+                'higher-spectral-slot-number': 768
+            })
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Interfaces created successfully for nodes: ', response['output']['result'])
         time.sleep(10)
 
     def test_18_servicePath_create_ZToA(self):
-        response = test_utils_rfc8040.device_renderer_service_path_request({
-            'service-name': 'test',
-            'wave-number': '1',
-            'modulation-format': 'dp-qpsk',
-            'operation': 'create',
-            'nodes':
-            [{'node-id': 'XPDRC01',
-              'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'},
-             {'node-id': 'ROADMC01',
-              'dest-tp': 'DEG2-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'},
-             {'node-id': 'ROADMA01',
-              'src-tp': 'DEG1-TTP-TXRX', 'dest-tp': 'SRG1-PP1-TXRX'},
-             {'node-id': 'XPDRA01',
-              'src-tp': 'XPDR1-NETWORK1', 'dest-tp': 'XPDR1-CLIENT1'}],
-            'center-freq': 196.1,
-            'nmc-width': 40,
-            'min-freq': 196.075,
-            'max-freq': 196.125,
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'service-path',
+            {
+                'service-name': 'test',
+                'wave-number': '1',
+                'modulation-format': 'dp-qpsk',
+                'operation': 'create',
+                'nodes':
+                [{'node-id': 'XPDRC01',
+                  'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'},
+                 {'node-id': 'ROADMC01',
+                    'dest-tp': 'DEG2-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'},
+                    {'node-id': 'ROADMA01',
+                     'src-tp': 'DEG1-TTP-TXRX', 'dest-tp': 'SRG1-PP1-TXRX'},
+                    {'node-id': 'XPDRA01',
+                     'src-tp': 'XPDR1-NETWORK1', 'dest-tp': 'XPDR1-CLIENT1'}],
+                'center-freq': 196.1,
+                'nmc-width': 40,
+                'min-freq': 196.075,
+                'max-freq': 196.125,
                 'lower-spectral-slot-number': 761,
                 'higher-spectral-slot-number': 768
-        })
+            })
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Interfaces created successfully for nodes: ', response['output']['result'])
         time.sleep(10)
 
     def test_19_service_power_setup_XPDRA_XPDRC(self):
-        response = test_utils_rfc8040.olm_service_power_setup_request({
-            'service-name': 'test',
-            'wave-number': 1,
-            'nodes': [
-                {
-                    'dest-tp': 'XPDR1-NETWORK1',
-                    'src-tp': 'XPDR1-CLIENT1',
-                    'node-id': 'XPDRA01'
-                },
-                {
-                    'dest-tp': 'DEG1-TTP-TXRX',
-                    'src-tp': 'SRG1-PP1-TXRX',
-                    'node-id': 'ROADMA01'
-                },
-                {
-                    'dest-tp': 'SRG1-PP1-TXRX',
-                    'src-tp': 'DEG2-TTP-TXRX',
-                    'node-id': 'ROADMC01'
-                },
-                {
-                    'dest-tp': 'XPDR1-CLIENT1',
-                    'src-tp': 'XPDR1-NETWORK1',
-                    'node-id': 'XPDRC01'
-                }
-            ],
-            'center-freq': 196.1,
-            'nmc-width': 40,
-            'min-freq': 196.075,
-            'max-freq': 196.125,
-            'lower-spectral-slot-number': 761,
-            'higher-spectral-slot-number': 768
-        })
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-olm', 'service-power-setup',
+            {
+                'service-name': 'test',
+                'wave-number': 1,
+                'nodes': [
+                    {
+                        'dest-tp': 'XPDR1-NETWORK1',
+                        'src-tp': 'XPDR1-CLIENT1',
+                        'node-id': 'XPDRA01'
+                    },
+                    {
+                        'dest-tp': 'DEG1-TTP-TXRX',
+                        'src-tp': 'SRG1-PP1-TXRX',
+                        'node-id': 'ROADMA01'
+                    },
+                    {
+                        'dest-tp': 'SRG1-PP1-TXRX',
+                        'src-tp': 'DEG2-TTP-TXRX',
+                        'node-id': 'ROADMC01'
+                    },
+                    {
+                        'dest-tp': 'XPDR1-CLIENT1',
+                        'src-tp': 'XPDR1-NETWORK1',
+                        'node-id': 'XPDRC01'
+                    }
+                ],
+                'center-freq': 196.1,
+                'nmc-width': 40,
+                'min-freq': 196.075,
+                'max-freq': 196.125,
+                'lower-spectral-slot-number': 761,
+                'higher-spectral-slot-number': 768
+            })
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Success', response['output']['result'])
 
@@ -300,38 +314,40 @@ class TransportOlmTesting(unittest.TestCase):
         self.assertEqual("power", response['roadm-connections'][0]['opticalControlMode'])
 
     def test_23_service_power_setup_XPDRC_XPDRA(self):
-        response = test_utils_rfc8040.olm_service_power_setup_request({
-            'service-name': 'test',
-            'wave-number': 1,
-            'nodes': [
-                {
-                    'dest-tp': 'XPDR1-NETWORK1',
-                    'src-tp': 'XPDR1-CLIENT1',
-                    'node-id': 'XPDRC01'
-                },
-                {
-                    'dest-tp': 'DEG2-TTP-TXRX',
-                    'src-tp': 'SRG1-PP1-TXRX',
-                    'node-id': 'ROADMC01'
-                },
-                {
-                    'src-tp': 'DEG1-TTP-TXRX',
-                    'dest-tp': 'SRG1-PP1-TXRX',
-                    'node-id': 'ROADMA01'
-                },
-                {
-                    'src-tp': 'XPDR1-NETWORK1',
-                    'dest-tp': 'XPDR1-CLIENT1',
-                    'node-id': 'XPDRA01'
-                }
-            ],
-            'center-freq': 196.1,
-            'nmc-width': 40,
-            'min-freq': 196.075,
-            'max-freq': 196.125,
-            'lower-spectral-slot-number': 761,
-            'higher-spectral-slot-number': 768
-        })
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-olm', 'service-power-setup',
+            {
+                'service-name': 'test',
+                'wave-number': 1,
+                'nodes': [
+                    {
+                        'dest-tp': 'XPDR1-NETWORK1',
+                        'src-tp': 'XPDR1-CLIENT1',
+                        'node-id': 'XPDRC01'
+                    },
+                    {
+                        'dest-tp': 'DEG2-TTP-TXRX',
+                        'src-tp': 'SRG1-PP1-TXRX',
+                        'node-id': 'ROADMC01'
+                    },
+                    {
+                        'src-tp': 'DEG1-TTP-TXRX',
+                        'dest-tp': 'SRG1-PP1-TXRX',
+                        'node-id': 'ROADMA01'
+                    },
+                    {
+                        'src-tp': 'XPDR1-NETWORK1',
+                        'dest-tp': 'XPDR1-CLIENT1',
+                        'node-id': 'XPDRA01'
+                    }
+                ],
+                'center-freq': 196.1,
+                'nmc-width': 40,
+                'min-freq': 196.075,
+                'max-freq': 196.125,
+                'lower-spectral-slot-number': 761,
+                'higher-spectral-slot-number': 768
+            })
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Success', response['output']['result'])
 
@@ -350,38 +366,40 @@ class TransportOlmTesting(unittest.TestCase):
         self.assertEqual(float(response['roadm-connections'][0]['target-output-power']), -0.63)
 
     def test_26_service_power_turndown_XPDRA_XPDRC(self):
-        response = test_utils_rfc8040.olm_service_power_turndown_request({
-            'service-name': 'test',
-            'wave-number': 1,
-            'nodes': [
-                {
-                    'dest-tp': 'XPDR1-NETWORK1',
-                    'src-tp': 'XPDR1-CLIENT1',
-                    'node-id': 'XPDRA01'
-                },
-                {
-                    'dest-tp': 'DEG1-TTP-TXRX',
-                    'src-tp': 'SRG1-PP1-TXRX',
-                    'node-id': 'ROADMA01'
-                },
-                {
-                    'dest-tp': 'SRG1-PP1-TXRX',
-                    'src-tp': 'DEG2-TTP-TXRX',
-                    'node-id': 'ROADMC01'
-                },
-                {
-                    'dest-tp': 'XPDR1-CLIENT1',
-                    'src-tp': 'XPDR1-NETWORK1',
-                    'node-id': 'XPDRC01'
-                }
-            ],
-            'center-freq': 196.1,
-            'nmc-width': 40,
-            'min-freq': 196.075,
-            'max-freq': 196.125,
-            'lower-spectral-slot-number': 761,
-            'higher-spectral-slot-number': 768
-        })
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-olm', 'service-power-turndown',
+            {
+                'service-name': 'test',
+                'wave-number': 1,
+                'nodes': [
+                    {
+                        'dest-tp': 'XPDR1-NETWORK1',
+                        'src-tp': 'XPDR1-CLIENT1',
+                        'node-id': 'XPDRA01'
+                    },
+                    {
+                        'dest-tp': 'DEG1-TTP-TXRX',
+                        'src-tp': 'SRG1-PP1-TXRX',
+                        'node-id': 'ROADMA01'
+                    },
+                    {
+                        'dest-tp': 'SRG1-PP1-TXRX',
+                        'src-tp': 'DEG2-TTP-TXRX',
+                        'node-id': 'ROADMC01'
+                    },
+                    {
+                        'dest-tp': 'XPDR1-CLIENT1',
+                        'src-tp': 'XPDR1-NETWORK1',
+                        'node-id': 'XPDRC01'
+                    }
+                ],
+                'center-freq': 196.1,
+                'nmc-width': 40,
+                'min-freq': 196.075,
+                'max-freq': 196.125,
+                'lower-spectral-slot-number': 761,
+                'higher-spectral-slot-number': 768
+            })
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Success', response['output']['result'])
 
@@ -399,53 +417,57 @@ class TransportOlmTesting(unittest.TestCase):
         self.assertEqual("off", response['roadm-connections'][0]['opticalControlMode'])
 
     def test_29_servicePath_delete_AToZ(self):
-        response = test_utils_rfc8040.device_renderer_service_path_request({
-            'service-name': 'test',
-            'wave-number': '1',
-            'modulation-format': 'dp-qpsk',
-            'operation': 'delete',
-            'nodes':
-            [{'node-id': 'XPDRA01',
-              'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'},
-             {'node-id': 'ROADMA01',
-              'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'},
-             {'node-id': 'ROADMC01',
-              'dest-tp': 'SRG1-PP1-TXRX', 'src-tp': 'DEG2-TTP-TXRX'},
-             {'node-id': 'XPDRC01',
-              'dest-tp': 'XPDR1-CLIENT1', 'src-tp': 'XPDR1-NETWORK1'}],
-            'center-freq': 196.1,
-            'nmc-width': 40,
-            'min-freq': 196.075,
-            'max-freq': 196.125,
-            'lower-spectral-slot-number': 761,
-            'higher-spectral-slot-number': 768
-        })
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'service-path',
+            {
+                'service-name': 'test',
+                'wave-number': '1',
+                'modulation-format': 'dp-qpsk',
+                'operation': 'delete',
+                'nodes':
+                [{'node-id': 'XPDRA01',
+                  'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'},
+                 {'node-id': 'ROADMA01',
+                    'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'},
+                    {'node-id': 'ROADMC01',
+                     'dest-tp': 'SRG1-PP1-TXRX', 'src-tp': 'DEG2-TTP-TXRX'},
+                    {'node-id': 'XPDRC01',
+                     'dest-tp': 'XPDR1-CLIENT1', 'src-tp': 'XPDR1-NETWORK1'}],
+                'center-freq': 196.1,
+                'nmc-width': 40,
+                'min-freq': 196.075,
+                'max-freq': 196.125,
+                'lower-spectral-slot-number': 761,
+                'higher-spectral-slot-number': 768
+            })
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Request processed', response['output']['result'])
         time.sleep(10)
 
     def test_30_servicePath_delete_ZToA(self):
-        response = test_utils_rfc8040.device_renderer_service_path_request({
-            'service-name': 'test',
-            'wave-number': '1',
-            'modulation-format': 'dp-qpsk',
-            'operation': 'delete',
-            'nodes':
-                           [{'node-id': 'XPDRC01',
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'service-path',
+            {
+                'service-name': 'test',
+                'wave-number': '1',
+                'modulation-format': 'dp-qpsk',
+                'operation': 'delete',
+                'nodes':
+                [{'node-id': 'XPDRC01',
                              'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'},
-                            {'node-id': 'ROADMC01',
+                 {'node-id': 'ROADMC01',
                              'dest-tp': 'DEG2-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'},
-                            {'node-id': 'ROADMA01',
+                 {'node-id': 'ROADMA01',
                              'src-tp': 'DEG1-TTP-TXRX', 'dest-tp': 'SRG1-PP1-TXRX'},
-                            {'node-id': 'XPDRA01',
+                 {'node-id': 'XPDRA01',
                              'src-tp': 'XPDR1-NETWORK1', 'dest-tp': 'XPDR1-CLIENT1'}],
-            'center-freq': 196.1,
-            'nmc-width': 40,
-            'min-freq': 196.075,
-            'max-freq': 196.125,
-            'lower-spectral-slot-number': 761,
-            'higher-spectral-slot-number': 768
-        })
+                'center-freq': 196.1,
+                'nmc-width': 40,
+                'min-freq': 196.075,
+                'max-freq': 196.125,
+                'lower-spectral-slot-number': 761,
+                'higher-spectral-slot-number': 768
+            })
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Request processed', response['output']['result'])
         time.sleep(10)
@@ -465,23 +487,25 @@ class TransportOlmTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
 
     def test_33_servicePath_create_AToZ(self):
-        response = test_utils_rfc8040.device_renderer_service_path_request({
-            'service-name': 'test2',
-            'wave-number': '2',
-            'modulation-format': 'dp-qpsk',
-            'operation': 'create',
-            'nodes':
-            [{'node-id': 'XPDRA01',
-                         'dest-tp': 'XPDR1-NETWORK2', 'src-tp': 'XPDR1-CLIENT2'},
-             {'node-id': 'ROADMA01',
-                         'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP2-TXRX'}],
-            'center-freq': 196.05,
-            'nmc-width': 40,
-            'min-freq': 196.025,
-            'max-freq': 196.075,
-            'lower-spectral-slot-number': 753,
-            'higher-spectral-slot-number': 760
-        })
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'service-path',
+            {
+                'service-name': 'test2',
+                'wave-number': '2',
+                'modulation-format': 'dp-qpsk',
+                'operation': 'create',
+                'nodes':
+                [{'node-id': 'XPDRA01',
+                  'dest-tp': 'XPDR1-NETWORK2', 'src-tp': 'XPDR1-CLIENT2'},
+                 {'node-id': 'ROADMA01',
+                  'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP2-TXRX'}],
+                'center-freq': 196.05,
+                'nmc-width': 40,
+                'min-freq': 196.025,
+                'max-freq': 196.075,
+                'lower-spectral-slot-number': 753,
+                'higher-spectral-slot-number': 760
+            })
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Interfaces created successfully for nodes', response['output']['result'])
         time.sleep(10)
@@ -494,23 +518,25 @@ class TransportOlmTesting(unittest.TestCase):
         self.assertEqual(int(response['org-openroadm-optical-channel-interfaces:och']['wavelength-number']), 2)
 
     def test_35_servicePath_delete_AToZ(self):
-        response = test_utils_rfc8040.device_renderer_service_path_request({
-            'service-name': 'test2',
-            'wave-number': '2',
-            'modulation-format': 'dp-qpsk',
-            'operation': 'delete',
-            'nodes':
-            [{'node-id': 'XPDRA01',
-                         'dest-tp': 'XPDR1-NETWORK2', 'src-tp': 'XPDR1-CLIENT2'},
-             {'node-id': 'ROADMA01',
-                         'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP2-TXRX'}],
-            'center-freq': 196.05,
-            'nmc-width': 40,
-            'min-freq': 196.025,
-            'max-freq': 196.075,
-            'lower-spectral-slot-number': 753,
-            'higher-spectral-slot-number': 760
-        })
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'service-path',
+            {
+                'service-name': 'test2',
+                'wave-number': '2',
+                'modulation-format': 'dp-qpsk',
+                'operation': 'delete',
+                'nodes':
+                [{'node-id': 'XPDRA01',
+                  'dest-tp': 'XPDR1-NETWORK2', 'src-tp': 'XPDR1-CLIENT2'},
+                 {'node-id': 'ROADMA01',
+                  'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP2-TXRX'}],
+                'center-freq': 196.05,
+                'nmc-width': 40,
+                'min-freq': 196.025,
+                'max-freq': 196.075,
+                'lower-spectral-slot-number': 753,
+                'higher-spectral-slot-number': 760
+            })
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Request processed', response['output']['result'])
         time.sleep(10)
@@ -524,7 +550,9 @@ class TransportOlmTesting(unittest.TestCase):
         self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
 
     def test_38_calculate_span_loss_current(self):
-        response = test_utils_rfc8040.olm_calculate_spanloss_current_request()
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-olm', 'calculate-spanloss-current',
+            None)
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Success',
                       response["output"]["result"])