Fix some typos in functional tests naming
[transportpce.git] / tests / transportpce_tests / 2.2.1 / test09_olm.py
index b19f14efef3e87ce65275aaed8f800a048c99c76..55c4eaf52d31ebdf7bc927f9555eebb41cc9f9ff 100644 (file)
@@ -20,7 +20,7 @@ import sys
 sys.path.append('transportpce_tests/common/')
 # pylint: disable=wrong-import-position
 # pylint: disable=import-error
-import test_utils_rfc8040  # nopep8
+import test_utils  # nopep8
 
 
 class TransportOlmTesting(unittest.TestCase):
@@ -30,17 +30,17 @@ class TransportOlmTesting(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.processes = test_utils_rfc8040.start_tpce()
-        cls.processes = test_utils_rfc8040.start_sims([('xpdra', cls.NODE_VERSION),
-                                                       ('roadma', cls.NODE_VERSION),
-                                                       ('roadmc', cls.NODE_VERSION),
-                                                       ('xpdrc', cls.NODE_VERSION)])
+        cls.processes = test_utils.start_tpce()
+        cls.processes = test_utils.start_sims([('xpdra', cls.NODE_VERSION),
+                                               ('roadma', cls.NODE_VERSION),
+                                               ('roadmc', cls.NODE_VERSION),
+                                               ('xpdrc', cls.NODE_VERSION)])
 
     @classmethod
     def tearDownClass(cls):
         # pylint: disable=not-an-iterable
         for process in cls.processes:
-            test_utils_rfc8040.shutdown_process(process)
+            test_utils.shutdown_process(process)
         print("all processes killed")
 
     def setUp(self):
@@ -49,105 +49,121 @@ class TransportOlmTesting(unittest.TestCase):
         time.sleep(1)
 
     def test_01_xpdrA_device_connected(self):
-        response = test_utils_rfc8040.mount_device("XPDR-A1", ('xpdra', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
+        response = test_utils.mount_device("XPDR-A1", ('xpdra', self.NODE_VERSION))
+        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
     def test_02_xpdrC_device_connected(self):
-        response = test_utils_rfc8040.mount_device("XPDR-C1", ('xpdrc', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
+        response = test_utils.mount_device("XPDR-C1", ('xpdrc', self.NODE_VERSION))
+        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
     def test_03_rdmA_device_connected(self):
-        response = test_utils_rfc8040.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
+        response = test_utils.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION))
+        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
     def test_04_rdmC_device_connected(self):
-        response = test_utils_rfc8040.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
-
-    def test_05_connect_xprdA_to_roadmA(self):
-        response = test_utils_rfc8040.connect_xpdr_to_rdm_request(
-            {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1',
-             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'})
-        self.assertEqual(response.status_code, requests.codes.ok)
+        response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION))
+        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+
+    def test_05_connect_xpdrA_to_roadmA(self):
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
 
     def test_06_connect_roadmA_to_xpdrA(self):
-        response = test_utils_rfc8040.connect_rdm_to_xpdr_request(
-            {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1',
-             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'})
-        self.assertEqual(response.status_code, requests.codes.ok)
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
 
-    def test_07_connect_xprdC_to_roadmC(self):
-        response = test_utils_rfc8040.connect_xpdr_to_rdm_request(
-            {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1',
-             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'})
-        self.assertEqual(response.status_code, requests.codes.ok)
+    def test_07_connect_xpdrC_to_roadmC(self):
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
 
     def test_08_connect_roadmC_to_xpdrC(self):
-        response = test_utils_rfc8040.connect_rdm_to_xpdr_request(
-            {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1',
-             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'})
-        self.assertEqual(response.status_code, requests.codes.ok)
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
 
     def test_09_create_OTS_ROADMA(self):
-        response = test_utils_rfc8040.device_renderer_create_ots_oms_request('ROADM-A1', 'DEG1-TTP-TXRX')
-        self.assertEqual(response.status_code, requests.codes.ok)
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'create-ots-oms',
+            {
+                'node-id': 'ROADM-A1',
+                'logical-connection-point': 'DEG1-TTP-TXRX'
+            })
+        self.assertEqual(response['status_code'], requests.codes.ok)
 
     def test_10_create_OTS_ROADMC(self):
-        response = test_utils_rfc8040.device_renderer_create_ots_oms_request('ROADM-C1', 'DEG2-TTP-TXRX')
-        self.assertEqual(response.status_code, requests.codes.ok)
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'create-ots-oms',
+            {
+                'node-id': 'ROADM-C1',
+                'logical-connection-point': 'DEG2-TTP-TXRX'
+            })
+        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': 'ROADM-A1',
-            'resource-type': 'interface',
-            'granularity': '15min',
-            'resource-identifier': {
-                'resource-name': 'OTS-DEG2-TTP-TXRX'
-            }
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-olm', 'get-pm',
+            {
+                'node-id': 'ROADM-A1',
+                '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',
-            'pmparameter-value': '2.5'
-        }, response['output']['measurements'])
-        self.assertIn({
-            'pmparameter-name': 'OpticalReturnLoss',
-            'pmparameter-value': '40'
-        }, response['output']['measurements'])
-        self.assertIn({
-            'pmparameter-name': 'OpticalPowerInput',
-            'pmparameter-value': '-21.1'
-        }, response['output']['measurements'])
+        measures = {}
+        for measure in response['output']['measurements']:
+            if bool(measure['pmparameter-name']) and bool(measure['pmparameter-value']):
+                measures[measure['pmparameter-name']] = float(measure['pmparameter-value'])
+        self.assertIn('OpticalPowerOutput', list(measures.keys()))
+        self.assertIn('OpticalReturnLoss', list(measures.keys()))
+        self.assertIn('OpticalPowerInput', list(measures.keys()))
+        self.assertEqual(measures['OpticalPowerOutput'], 2.5)
+        self.assertEqual(measures['OpticalReturnLoss'], 40)
+        self.assertEqual(measures['OpticalPowerInput'], -21.1)
 
     def test_12_get_PM_ROADMC(self):
-        response = test_utils_rfc8040.olm_get_pm_request({
-            'node-id': 'ROADM-C1',
-            'resource-type': 'interface',
-            'granularity': '15min',
-            'resource-identifier': {
-                'resource-name': 'OTS-DEG1-TTP-TXRX'
-            }
-        })
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-olm', 'get-pm',
+            {
+                'node-id': 'ROADM-C1',
+                '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',
-            'pmparameter-value': '4.6'
-        }, response['output']['measurements'])
-        self.assertIn({
-            'pmparameter-name': 'OpticalReturnLoss',
-            'pmparameter-value': '49.1'
-        }, response['output']['measurements'])
-        self.assertIn({
-            'pmparameter-name': 'OpticalPowerInput',
-            'pmparameter-value': '-15.1'
-        }, response['output']['measurements'])
+        measures = {}
+        for measure in response['output']['measurements']:
+            if bool(measure['pmparameter-name']) and bool(measure['pmparameter-value']):
+                measures[measure['pmparameter-name']] = float(measure['pmparameter-value'])
+        self.assertIn('OpticalPowerOutput', list(measures.keys()))
+        self.assertIn('OpticalReturnLoss', list(measures.keys()))
+        self.assertIn('OpticalPowerInput', list(measures.keys()))
+        self.assertEqual(measures['OpticalPowerOutput'], 4.6)
+        self.assertEqual(measures['OpticalReturnLoss'], 49.1)
+        self.assertEqual(measures['OpticalPowerInput'], -15.1)
 
     def test_13_calculate_span_loss_base_ROADMA_ROADMC(self):
-        response = test_utils_rfc8040.olm_calculate_spanloss_base_request({
-            'src-type': 'link',
-            'link-id': 'ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX'
-        })
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-olm', 'calculate-spanloss-base',
+            {
+                'src-type': 'link',
+                'link-id': 'ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX'
+            })
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Success',
                       response['output']['result'])
@@ -158,9 +174,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.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'])
@@ -175,352 +193,374 @@ class TransportOlmTesting(unittest.TestCase):
         time.sleep(5)
 
     def test_15_get_OTS_DEG2_TTP_TXRX_ROADMA(self):
-        response = test_utils_rfc8040.check_node_attribute2_request(
+        response = test_utils.check_node_attribute2_request(
             'ROADM-A1', 'interface', 'OTS-DEG2-TTP-TXRX', 'org-openroadm-optical-transport-interfaces:ots')
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertEqual(float(response['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']), 17.6)
         self.assertEqual(float(response['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']), 25.7)
 
     def test_16_get_OTS_DEG1_TTP_TXRX_ROADMC(self):
-        response = test_utils_rfc8040.check_node_attribute2_request(
+        response = test_utils.check_node_attribute2_request(
             'ROADM-C1', 'interface', 'OTS-DEG1-TTP-TXRX', 'org-openroadm-optical-transport-interfaces:ots')
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertEqual(float(response['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']), 25.7)
         self.assertEqual(float(response['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']), 17.6)
 
     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': 'XPDR-A1',
-              'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'},
-             {'node-id': 'ROADM-A1',
-              'dest-tp': 'DEG2-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'},
-             {'node-id': 'ROADM-C1',
-              'dest-tp': 'SRG1-PP1-TXRX', 'src-tp': 'DEG1-TTP-TXRX'},
-             {'node-id': 'XPDR-C1',
-              '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.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'service-path',
+            {
+                'service-name': 'test',
+                'wave-number': '1',
+                'modulation-format': 'dp-qpsk',
+                'operation': 'create',
+                'nodes':
+                [{'node-id': 'XPDR-A1',
+                  'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'},
+                 {'node-id': 'ROADM-A1',
+                    'dest-tp': 'DEG2-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'},
+                    {'node-id': 'ROADM-C1',
+                     'dest-tp': 'SRG1-PP1-TXRX', 'src-tp': 'DEG1-TTP-TXRX'},
+                    {'node-id': 'XPDR-C1',
+                     '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': 'XPDR-C1',
-              'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'},
-             {'node-id': 'ROADM-C1',
-              'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'},
-             {'node-id': 'ROADM-A1',
-              'src-tp': 'DEG2-TTP-TXRX', 'dest-tp': 'SRG1-PP1-TXRX'},
-             {'node-id': 'XPDR-A1',
-              '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
-        })
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'service-path',
+            {
+                'service-name': 'test',
+                'wave-number': '1',
+                'modulation-format': 'dp-qpsk',
+                'operation': 'create',
+                'nodes':
+                [{'node-id': 'XPDR-C1',
+                  'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'},
+                 {'node-id': 'ROADM-C1',
+                    'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'},
+                    {'node-id': 'ROADM-A1',
+                     'src-tp': 'DEG2-TTP-TXRX', 'dest-tp': 'SRG1-PP1-TXRX'},
+                    {'node-id': 'XPDR-A1',
+                     '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': 'XPDR-A1'
-                },
-                {
-                    'dest-tp': 'DEG2-TTP-TXRX',
-                    'src-tp': 'SRG1-PP1-TXRX',
-                    'node-id': 'ROADM-A1'
-                },
-                {
-                    'dest-tp': 'SRG1-PP1-TXRX',
-                    'src-tp': 'DEG1-TTP-TXRX',
-                    'node-id': 'ROADM-C1'
-                },
-                {
-                    'dest-tp': 'XPDR1-CLIENT1',
-                    'src-tp': 'XPDR1-NETWORK1',
-                    'node-id': 'XPDR-C1'
-                }
-            ],
-            'lower-spectral-slot-number': 761,
-            'higher-spectral-slot-number': 768
-        })
+        response = test_utils.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': 'XPDR-A1'
+                    },
+                    {
+                        'dest-tp': 'DEG2-TTP-TXRX',
+                        'src-tp': 'SRG1-PP1-TXRX',
+                        'node-id': 'ROADM-A1'
+                    },
+                    {
+                        'dest-tp': 'SRG1-PP1-TXRX',
+                        'src-tp': 'DEG1-TTP-TXRX',
+                        'node-id': 'ROADM-C1'
+                    },
+                    {
+                        'dest-tp': 'XPDR1-CLIENT1',
+                        'src-tp': 'XPDR1-NETWORK1',
+                        'node-id': 'XPDR-C1'
+                    }
+                ],
+                'lower-spectral-slot-number': 761,
+                'higher-spectral-slot-number': 768
+            })
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Success', response['output']['result'])
 
     def test_20_get_interface_XPDRA_XPDR1_NETWORK1(self):
-        response = test_utils_rfc8040.check_node_attribute2_request(
+        response = test_utils.check_node_attribute2_request(
             'XPDR-A1', 'interface', 'XPDR1-NETWORK1-761:768', 'org-openroadm-optical-channel-interfaces:och')
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertEqual(float(response['org-openroadm-optical-channel-interfaces:och']['transmit-power']), -5)
         self.assertEqual(float(response['org-openroadm-optical-channel-interfaces:och']['frequency']), 196.1)
 
     def test_21_get_roadmconnection_ROADMA(self):
-        response = test_utils_rfc8040.check_node_attribute_request(
+        response = test_utils.check_node_attribute_request(
             'ROADM-A1', 'roadm-connections', 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768')
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertEqual("gainLoss", response['roadm-connections'][0]['opticalControlMode'])
         self.assertEqual(float(response['roadm-connections'][0]['target-output-power']), 0.21)
 
     def test_22_get_roadmconnection_ROADMC(self):
-        response = test_utils_rfc8040.check_node_attribute_request(
+        response = test_utils.check_node_attribute_request(
             'ROADM-C1', 'roadm-connections', 'DEG1-TTP-TXRX-SRG1-PP1-TXRX-761:768')
         self.assertEqual(response['status_code'], requests.codes.ok)
         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': 'XPDR-C1'
-                },
-                {
-                    'dest-tp': 'DEG1-TTP-TXRX',
-                    'src-tp': 'SRG1-PP1-TXRX',
-                    'node-id': 'ROADM-C1'
-                },
-                {
-                    'src-tp': 'DEG2-TTP-TXRX',
-                    'dest-tp': 'SRG1-PP1-TXRX',
-                    'node-id': 'ROADM-A1'
-                },
-                {
-                    'src-tp': 'XPDR1-NETWORK1',
-                    'dest-tp': 'XPDR1-CLIENT1',
-                    'node-id': 'XPDR-A1'
-                }
-            ],
-            'lower-spectral-slot-number': 761,
-            'higher-spectral-slot-number': 768
-        })
+        response = test_utils.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': 'XPDR-C1'
+                    },
+                    {
+                        'dest-tp': 'DEG1-TTP-TXRX',
+                        'src-tp': 'SRG1-PP1-TXRX',
+                        'node-id': 'ROADM-C1'
+                    },
+                    {
+                        'src-tp': 'DEG2-TTP-TXRX',
+                        'dest-tp': 'SRG1-PP1-TXRX',
+                        'node-id': 'ROADM-A1'
+                    },
+                    {
+                        'src-tp': 'XPDR1-NETWORK1',
+                        'dest-tp': 'XPDR1-CLIENT1',
+                        'node-id': 'XPDR-A1'
+                    }
+                ],
+                'lower-spectral-slot-number': 761,
+                'higher-spectral-slot-number': 768
+            })
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Success', response['output']['result'])
 
     def test_24_get_interface_XPDRC_XPDR1_NETWORK1(self):
-        response = test_utils_rfc8040.check_node_attribute2_request(
+        response = test_utils.check_node_attribute2_request(
             'XPDR-C1', 'interface', 'XPDR1-NETWORK1-761:768', 'org-openroadm-optical-channel-interfaces:och')
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertEqual(float(response['org-openroadm-optical-channel-interfaces:och']['transmit-power']), -5)
         self.assertEqual(float(response['org-openroadm-optical-channel-interfaces:och']['frequency']), 196.1)
 
     def test_25_get_roadmconnection_ROADMC(self):
-        response = test_utils_rfc8040.check_node_attribute_request(
+        response = test_utils.check_node_attribute_request(
             'ROADM-C1', 'roadm-connections', 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768')
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertEqual("gainLoss", response['roadm-connections'][0]['opticalControlMode'])
         self.assertEqual(float(response['roadm-connections'][0]['target-output-power']), 2.0)
 
     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': 'XPDR-A1'
-                },
-                {
-                    'dest-tp': 'DEG2-TTP-TXRX',
-                    'src-tp': 'SRG1-PP1-TXRX',
-                    'node-id': 'ROADM-A1'
-                },
-                {
-                    'dest-tp': 'SRG1-PP1-TXRX',
-                    'src-tp': 'DEG1-TTP-TXRX',
-                    'node-id': 'ROADM-C1'
-                },
-                {
-                    'dest-tp': 'XPDR1-CLIENT1',
-                    'src-tp': 'XPDR1-NETWORK1',
-                    'node-id': 'XPDR-C1'
-                }
-            ],
-            'lower-spectral-slot-number': 761,
-            'higher-spectral-slot-number': 768
-        })
+        response = test_utils.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': 'XPDR-A1'
+                    },
+                    {
+                        'dest-tp': 'DEG2-TTP-TXRX',
+                        'src-tp': 'SRG1-PP1-TXRX',
+                        'node-id': 'ROADM-A1'
+                    },
+                    {
+                        'dest-tp': 'SRG1-PP1-TXRX',
+                        'src-tp': 'DEG1-TTP-TXRX',
+                        'node-id': 'ROADM-C1'
+                    },
+                    {
+                        'dest-tp': 'XPDR1-CLIENT1',
+                        'src-tp': 'XPDR1-NETWORK1',
+                        'node-id': 'XPDR-C1'
+                    }
+                ],
+                'lower-spectral-slot-number': 761,
+                'higher-spectral-slot-number': 768
+            })
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Success', response['output']['result'])
 
     def test_27_get_roadmconnection_ROADMA(self):
-        response = test_utils_rfc8040.check_node_attribute_request(
+        response = test_utils.check_node_attribute_request(
             'ROADM-A1', 'roadm-connections', 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768')
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertEqual("off", response['roadm-connections'][0]['opticalControlMode'])
         self.assertEqual(float(response['roadm-connections'][0]['target-output-power']), -60)
 
     def test_28_get_roadmconnection_ROADMC(self):
-        response = test_utils_rfc8040.check_node_attribute_request(
+        response = test_utils.check_node_attribute_request(
             'ROADM-C1', 'roadm-connections', 'DEG1-TTP-TXRX-SRG1-PP1-TXRX-761:768')
         self.assertEqual(response['status_code'], requests.codes.ok)
         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': 'XPDR-A1',
-              'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'},
-             {'node-id': 'ROADM-A1',
-              'dest-tp': 'DEG2-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'},
-             {'node-id': 'ROADM-C1',
-              'dest-tp': 'SRG1-PP1-TXRX', 'src-tp': 'DEG1-TTP-TXRX'},
-             {'node-id': 'XPDR-C1',
-              '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.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'service-path',
+            {
+                'service-name': 'test',
+                'wave-number': '1',
+                'modulation-format': 'dp-qpsk',
+                'operation': 'delete',
+                'nodes':
+                [{'node-id': 'XPDR-A1',
+                  'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'},
+                 {'node-id': 'ROADM-A1',
+                    'dest-tp': 'DEG2-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'},
+                    {'node-id': 'ROADM-C1',
+                     'dest-tp': 'SRG1-PP1-TXRX', 'src-tp': 'DEG1-TTP-TXRX'},
+                    {'node-id': 'XPDR-C1',
+                     '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': 'XPDR-C1',
-              'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'},
-             {'node-id': 'ROADM-C1',
-              'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'},
-             {'node-id': 'ROADM-A1',
-              'src-tp': 'DEG2-TTP-TXRX', 'dest-tp': 'SRG1-PP1-TXRX'},
-             {'node-id': 'XPDR-A1',
-              '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
-        })
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'service-path',
+            {
+                'service-name': 'test',
+                'wave-number': '1',
+                'modulation-format': 'dp-qpsk',
+                'operation': 'delete',
+                'nodes':
+                [{'node-id': 'XPDR-C1',
+                  'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'},
+                 {'node-id': 'ROADM-C1',
+                    'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'},
+                    {'node-id': 'ROADM-A1',
+                     'src-tp': 'DEG2-TTP-TXRX', 'dest-tp': 'SRG1-PP1-TXRX'},
+                    {'node-id': 'XPDR-A1',
+                     '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('Request processed', response['output']['result'])
         time.sleep(10)
 
-   #"""to test case where SRG where the xpdr is connected to has no optical range data"""
+   # """to test case where SRG where the xpdr is connected to has no optical range data"""
 
-    def test_31_connect_xprdA_to_roadmA(self):
-        response = test_utils_rfc8040.connect_xpdr_to_rdm_request(
-            {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '2',
-             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'})
-        self.assertEqual(response.status_code, requests.codes.ok)
+    def test_31_connect_xpdrA_to_roadmA(self):
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '2',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
 
     def test_32_connect_roadmA_to_xpdrA(self):
-        response = test_utils_rfc8040.connect_rdm_to_xpdr_request(
-            {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '2',
-             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'})
-        self.assertEqual(response.status_code, requests.codes.ok)
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '2',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        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': 'XPDR-A1',
-              'dest-tp': 'XPDR1-NETWORK2', 'src-tp': 'XPDR1-CLIENT2'},
-             {'node-id': 'ROADM-A1',
-              'dest-tp': 'DEG2-TTP-TXRX', 'src-tp': 'SRG1-PP2-TXRX'}],
-            'center-freq': 196.1,
-            'nmc-width': 40,
-            'min-freq': 196.075,
-            'max-freq': 196.125,
-            'lower-spectral-slot-number': 753,
-            'higher-spectral-slot-number': 760
-        })
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'service-path',
+            {
+                'service-name': 'test2',
+                'wave-number': '2',
+                'modulation-format': 'dp-qpsk',
+                'operation': 'create',
+                'nodes':
+                [{'node-id': 'XPDR-A1',
+                  'dest-tp': 'XPDR1-NETWORK2', 'src-tp': 'XPDR1-CLIENT2'},
+                 {'node-id': 'ROADM-A1',
+                    'dest-tp': 'DEG2-TTP-TXRX', 'src-tp': 'SRG1-PP2-TXRX'}],
+                'center-freq': 196.1,
+                'nmc-width': 40,
+                'min-freq': 196.075,
+                'max-freq': 196.125,
+                '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)
 
     def test_34_get_interface_XPDRA_XPDR1_NETWORK2(self):
-        response = test_utils_rfc8040.check_node_attribute2_request(
+        response = test_utils.check_node_attribute2_request(
             'XPDR-A1', 'interface', 'XPDR1-NETWORK2-753:760', 'org-openroadm-optical-channel-interfaces:och')
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertEqual(float(response['org-openroadm-optical-channel-interfaces:och']['transmit-power']), -5)
 #         self.assertEqual(2, response['org-openroadm-optical-channel-interfaces:och']['wavelength-number'])
 
     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': 'XPDR-A1',
-              'dest-tp': 'XPDR1-NETWORK2', 'src-tp': 'XPDR1-CLIENT2'},
-             {'node-id': 'ROADM-A1',
-              'dest-tp': 'DEG2-TTP-TXRX', 'src-tp': 'SRG1-PP2-TXRX'}],
-            'center-freq': 196.1,
-            'nmc-width': 40,
-            'min-freq': 196.075,
-            'max-freq': 196.125,
-            'lower-spectral-slot-number': 753,
-            'higher-spectral-slot-number': 760
-        })
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'service-path',
+            {
+                'service-name': 'test2',
+                'wave-number': '2',
+                'modulation-format': 'dp-qpsk',
+                'operation': 'delete',
+                'nodes':
+                [{'node-id': 'XPDR-A1',
+                  'dest-tp': 'XPDR1-NETWORK2', 'src-tp': 'XPDR1-CLIENT2'},
+                 {'node-id': 'ROADM-A1',
+                    'dest-tp': 'DEG2-TTP-TXRX', 'src-tp': 'SRG1-PP2-TXRX'}],
+                'center-freq': 196.1,
+                'nmc-width': 40,
+                'min-freq': 196.075,
+                'max-freq': 196.125,
+                '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)
 
     def test_36_xpdrA_device_disconnected(self):
-        response = test_utils_rfc8040.unmount_device("XPDR-A1")
+        response = test_utils.unmount_device("XPDR-A1")
         self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
 
     def test_37_xpdrC_device_disconnected(self):
-        response = test_utils_rfc8040.unmount_device("XPDR-C1")
+        response = test_utils.unmount_device("XPDR-C1")
         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.transportpce_api_rpc_request(
+            'transportpce-olm', 'calculate-spanloss-current',
+            None)
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Success',
                       response["output"]["result"])
         time.sleep(5)
 
     def test_39_rdmA_device_disconnected(self):
-        response = test_utils_rfc8040.unmount_device("ROADM-A1")
+        response = test_utils.unmount_device("ROADM-A1")
         self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
 
     def test_40_rdmC_device_disconnected(self):
-        response = test_utils_rfc8040.unmount_device("ROADM-C1")
+        response = test_utils.unmount_device("ROADM-C1")
         self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))