Code Review / transportpce.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Add unit & func tests for RPC service-reroute
[transportpce.git] / tests / transportpce_tests / 2.2.1 / test07_otn_renderer.py
diff --git a/tests/transportpce_tests/2.2.1/test07_otn_renderer.py b/tests/transportpce_tests/2.2.1/test07_otn_renderer.py
index d8aeb23d8cc0d9f6312e8edc1a99c45a748811c4..e9fca26d07bf4c9c286f5f0e8a187f4a0c52091b 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test07_otn_renderer.py
+++ b/tests/transportpce_tests/2.2.1/test07_otn_renderer.py
@@ -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 TransportPCEtesting(unittest.TestCase):
@@ -42,30 +42,30 @@ class TransportPCEtesting(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.processes = test_utils_rfc8040.start_tpce()
-        cls.processes = test_utils_rfc8040.start_sims([('spdra', cls.NODE_VERSION)])
+        cls.processes = test_utils.start_tpce()
+        cls.processes = test_utils.start_sims([('spdra', 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):
         time.sleep(5)
 
     def test_01_connect_SPDR_SA1(self):
-        response = test_utils_rfc8040.mount_device("SPDR-SA1", ('spdra', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
+        response = test_utils.mount_device("SPDR-SA1", ('spdra', self.NODE_VERSION))
+        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
         time.sleep(10)
 
-        response = test_utils_rfc8040.check_device_connection("SPDR-SA1")
+        response = test_utils.check_device_connection("SPDR-SA1")
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertEqual(response['connection-status'], 'connected')
 
     def test_02_get_portmapping_CLIENT4(self):
-        response = test_utils_rfc8040.portmapping_request("SPDR-SA1", "XPDR1-CLIENT4")
+        response = test_utils.get_portmapping_node_attr("SPDR-SA1", "mapping", "XPDR1-CLIENT4")
         self.assertEqual(response['status_code'], requests.codes.ok)
         res_mapping = response['mapping'][0]
         self.assertEqual('CP1-SFP4-P1', res_mapping['supporting-port'])
@@ -81,14 +81,15 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertIn('org-openroadm-port-types:if-10GE', res_mapping['supported-interface-capability'])
 
     def test_03_get_portmapping_NETWORK1(self):
-        response = test_utils_rfc8040.portmapping_request("SPDR-SA1", "XPDR1-NETWORK1")
+        response = test_utils.get_portmapping_node_attr("SPDR-SA1", "mapping", "XPDR1-NETWORK1")
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn(
             self.NETWORK1_CHECK_DICT,
             response['mapping'])
 
     def test_04_service_path_create_OCH_OTU4(self):
-        response = test_utils_rfc8040.device_renderer_service_path_request(
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'service-path',
             {
                 'service-name': 'service_test',
                 'wave-number': '7',
@@ -111,7 +112,7 @@ class TransportPCEtesting(unittest.TestCase):
              'och-interface-id': ['XPDR1-NETWORK1-761:768']}, response['output']['node-interface'])
 
     def test_05_get_portmapping_NETWORK1(self):
-        response = test_utils_rfc8040.portmapping_request("SPDR-SA1", "XPDR1-NETWORK1")
+        response = test_utils.get_portmapping_node_attr("SPDR-SA1", "mapping", "XPDR1-NETWORK1")
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.NETWORK1_CHECK_DICT["supporting-otu4"] = "XPDR1-NETWORK1-OTU"
         self.assertIn(
@@ -119,7 +120,7 @@ class TransportPCEtesting(unittest.TestCase):
             response['mapping'])
 
     def test_06_check_interface_och(self):
-        response = test_utils_rfc8040.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-NETWORK1-761:768")
+        response = test_utils.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-NETWORK1-761:768")
         self.assertEqual(response['status_code'], requests.codes.ok)
 
         self.assertDictEqual(dict(response['interface'][0], **{'name': 'XPDR1-NETWORK1-761:768',
@@ -129,16 +130,14 @@ class TransportPCEtesting(unittest.TestCase):
                                                                'supporting-port': 'CP1-CFP0-P1'
                                                                }),
                              response['interface'][0])
-
-        self.assertIn(
-            response['interface'][0]['org-openroadm-optical-channel-interfaces:och'],
-            [{'frequency': '196.1000', 'rate': 'org-openroadm-common-types:R100G',
-              'transmit-power': '-5', 'modulation-format': 'dp-qpsk'},
-             {'frequency': 196.1, 'rate': 'org-openroadm-common-types:R100G',
-              'transmit-power': -5, 'modulation-format': 'dp-qpsk'}])
+        intf = response['interface'][0]['org-openroadm-optical-channel-interfaces:och']
+        self.assertEqual(intf['rate'], 'org-openroadm-common-types:R100G')
+        self.assertEqual(intf['modulation-format'], 'dp-qpsk')
+        self.assertEqual(float(intf['frequency']), 196.1)
+        self.assertEqual(float(intf['transmit-power']), -5)
 
     def test_07_check_interface_OTU(self):
-        response = test_utils_rfc8040.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-NETWORK1-OTU")
+        response = test_utils.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-NETWORK1-OTU")
         self.assertEqual(response['status_code'], requests.codes.ok)
         input_dict_1 = {'name': 'XPDR1-NETWORK1-OTU',
                         'administrative-state': 'inService',
@@ -159,7 +158,8 @@ class TransportPCEtesting(unittest.TestCase):
                              response['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
 
     def test_08_otn_service_path_create_ODU4(self):
-        response = test_utils_rfc8040.device_renderer_otn_service_path_request(
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'otn-service-path',
             {
                 'service-name': 'service_ODU4',
                 'operation': 'create',
@@ -175,7 +175,7 @@ class TransportPCEtesting(unittest.TestCase):
              'odu-interface-id': ['XPDR1-NETWORK1-ODU4']}, response['output']['node-interface'])
 
     def test_09_get_portmapping_NETWORK1(self):
-        response = test_utils_rfc8040.portmapping_request("SPDR-SA1", "XPDR1-NETWORK1")
+        response = test_utils.get_portmapping_node_attr("SPDR-SA1", "mapping", "XPDR1-NETWORK1")
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.NETWORK1_CHECK_DICT["supporting-odu4"] = "XPDR1-NETWORK1-ODU4"
         self.NETWORK1_CHECK_DICT["supporting-otu4"] = "XPDR1-NETWORK1-OTU"
@@ -184,7 +184,7 @@ class TransportPCEtesting(unittest.TestCase):
             response['mapping'])
 
     def test_10_check_interface_ODU4(self):
-        response = test_utils_rfc8040.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU4")
+        response = test_utils.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU4")
         self.assertEqual(response['status_code'], requests.codes.ok)
         input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU4', 'administrative-state': 'inService',
                         'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-OTU',
@@ -205,7 +205,8 @@ class TransportPCEtesting(unittest.TestCase):
             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_11_otn_service_path_create_10GE(self):
-        response = test_utils_rfc8040.device_renderer_otn_service_path_request(
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'otn-service-path',
             {
                 'service-name': 'service1',
                 'operation': 'create',
@@ -220,14 +221,14 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertIn('Otn Service path was set up successfully for node :SPDR-SA1', response['output']['result'])
         self.assertTrue(response['output']['success'])
         self.assertEqual('SPDR-SA1', response['output']['node-interface'][0]['node-id'])
-        self.assertIn('XPDR1-CLIENT4-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1',
+        self.assertIn('XPDR1-CLIENT4-ODU2e-x-XPDR1-NETWORK1-ODU2e',
                       response['output']['node-interface'][0]['connection-id'])
         self.assertIn('XPDR1-CLIENT4-ETHERNET10G', response['output']['node-interface'][0]['eth-interface-id'])
-        self.assertIn('XPDR1-NETWORK1-ODU2e-service1', response['output']['node-interface'][0]['odu-interface-id'])
-        self.assertIn('XPDR1-CLIENT4-ODU2e-service1', response['output']['node-interface'][0]['odu-interface-id'])
+        self.assertIn('XPDR1-NETWORK1-ODU2e', response['output']['node-interface'][0]['odu-interface-id'])
+        self.assertIn('XPDR1-CLIENT4-ODU2e', response['output']['node-interface'][0]['odu-interface-id'])
 
     def test_12_check_interface_10GE_CLIENT(self):
-        response = test_utils_rfc8040.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-CLIENT4-ETHERNET10G")
+        response = test_utils.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-CLIENT4-ETHERNET10G")
         self.assertEqual(response['status_code'], requests.codes.ok)
         input_dict = {'name': 'XPDR1-CLIENT4-ETHERNET10G',
                       'administrative-state': 'inService',
@@ -240,11 +241,11 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(10000, response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']['speed'])
 
     def test_13_check_interface_ODU2E_CLIENT(self):
-        response = test_utils_rfc8040.check_node_attribute_request(
-            "SPDR-SA1", "interface", "XPDR1-CLIENT4-ODU2e-service1")
+        response = test_utils.check_node_attribute_request(
+            "SPDR-SA1", "interface", "XPDR1-CLIENT4-ODU2e")
         self.assertEqual(response['status_code'], requests.codes.ok)
 
-        input_dict_1 = {'name': 'XPDR1-CLIENT4-ODU2e-service1',
+        input_dict_1 = {'name': 'XPDR1-CLIENT4-ODU2e',
                         'administrative-state': 'inService',
                         'supporting-circuit-pack-name': 'CP1-SFP4',
                         'supporting-interface': 'XPDR1-CLIENT4-ETHERNET10G',
@@ -265,10 +266,10 @@ class TransportPCEtesting(unittest.TestCase):
             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_14_check_interface_ODU2E_NETWORK(self):
-        response = test_utils_rfc8040.check_node_attribute_request(
-            "SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU2e-service1")
+        response = test_utils.check_node_attribute_request(
+            "SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU2e")
         self.assertEqual(response['status_code'], requests.codes.ok)
-        input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-service1', 'administrative-state': 'inService',
+        input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', 'administrative-state': 'inService',
                         'supporting-circuit-pack-name': 'CP1-CFP0',
                         'supporting-interface': 'XPDR1-NETWORK1-ODU4',
                         'type': 'org-openroadm-interfaces:otnOdu',
@@ -296,24 +297,25 @@ class TransportPCEtesting(unittest.TestCase):
                           'parent-odu-allocation']['trib-slots'])
 
     def test_15_check_ODU2E_connection(self):
-        response = test_utils_rfc8040.check_node_attribute_request(
-            "SPDR-SA1", "odu-connection", "XPDR1-CLIENT4-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1")
+        response = test_utils.check_node_attribute_request(
+            "SPDR-SA1", "odu-connection", "XPDR1-CLIENT4-ODU2e-x-XPDR1-NETWORK1-ODU2e")
         self.assertEqual(response['status_code'], requests.codes.ok)
         input_dict_1 = {
             'connection-name':
-            'XPDR1-CLIENT4-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1',
+            'XPDR1-CLIENT4-ODU2e-x-XPDR1-NETWORK1-ODU2e',
             'direction': 'bidirectional'
         }
 
         self.assertDictEqual(dict(response['odu-connection'][0], **input_dict_1),
                              response['odu-connection'][0])
-        self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e-service1'},
+        self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'},
                              response['odu-connection'][0]['destination'])
-        self.assertDictEqual({'src-if': 'XPDR1-CLIENT4-ODU2e-service1'},
+        self.assertDictEqual({'src-if': 'XPDR1-CLIENT4-ODU2e'},
                              response['odu-connection'][0]['source'])
 
     def test_16_otn_service_path_delete_10GE(self):
-        response = test_utils_rfc8040.device_renderer_otn_service_path_request(
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'otn-service-path',
             {
                 'service-name': 'service1',
                 'operation': 'delete',
@@ -329,26 +331,27 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertTrue(response['output']['success'])
 
     def test_17_check_no_ODU2E_connection(self):
-        response = test_utils_rfc8040.check_node_attribute_request(
-            "SPDR-SA1", "odu-connection", "XPDR1-CLIENT4-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1")
+        response = test_utils.check_node_attribute_request(
+            "SPDR-SA1", "odu-connection", "XPDR1-CLIENT4-ODU2e-x-XPDR1-NETWORK1-ODU2e")
         self.assertEqual(response['status_code'], requests.codes.conflict)
 
     def test_18_check_no_interface_ODU2E_NETWORK(self):
-        response = test_utils_rfc8040.check_node_attribute_request(
-            "SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU2e-service1")
+        response = test_utils.check_node_attribute_request(
+            "SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU2e")
         self.assertEqual(response['status_code'], requests.codes.conflict)
 
     def test_19_check_no_interface_ODU2E_CLIENT(self):
-        response = test_utils_rfc8040.check_node_attribute_request(
-            "SPDR-SA1", "interface", "XPDR1-CLIENT4-ODU2e-service1")
+        response = test_utils.check_node_attribute_request(
+            "SPDR-SA1", "interface", "XPDR1-CLIENT4-ODU2e")
         self.assertEqual(response['status_code'], requests.codes.conflict)
 
     def test_20_check_no_interface_10GE_CLIENT(self):
-        response = test_utils_rfc8040.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-CLIENT4-ETHERNET10G")
+        response = test_utils.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-CLIENT4-ETHERNET10G")
         self.assertEqual(response['status_code'], requests.codes.conflict)
 
     def test_21_otn_service_path_delete_ODU4(self):
-        response = test_utils_rfc8040.device_renderer_otn_service_path_request(
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'otn-service-path',
             {
                 'service-name': 'service_ODU4',
                 'operation': 'delete',
@@ -361,11 +364,12 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertTrue(response['output']['success'])
 
     def test_22_check_no_interface_ODU4(self):
-        response = test_utils_rfc8040.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU4")
+        response = test_utils.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU4")
         self.assertEqual(response['status_code'], requests.codes.conflict)
 
     def test_23_service_path_delete_OCH_OTU4(self):
-        response = test_utils_rfc8040.device_renderer_service_path_request(
+        response = test_utils.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'service-path',
             {
                 'service-name': 'service_test',
                 'wave-number': '7',
@@ -384,15 +388,15 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertTrue(response['output']['success'])
 
     def test_24_check_no_interface_OTU4(self):
-        response = test_utils_rfc8040.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-NETWORK1-OTU")
+        response = test_utils.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-NETWORK1-OTU")
         self.assertEqual(response['status_code'], requests.codes.conflict)
 
     def test_25_check_no_interface_OCH(self):
-        response = test_utils_rfc8040.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-NETWORK1-1")
+        response = test_utils.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-NETWORK1-1")
         self.assertEqual(response['status_code'], requests.codes.conflict)
 
     def test_26_disconnect_SPDR_SA1(self):
-        response = test_utils_rfc8040.unmount_device("SPDR-SA1")
+        response = test_utils.unmount_device("SPDR-SA1")
         self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
 
 
Repository for Transport PCE project.