Fix few functests assert RFC8040 uncompatibilities

[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 ef3faf8dd640db215008357282a54bf2cd5abcf8..96940bd47a2bbc5f3398c634728a3519b715770c 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test05_flex_grid.py
+++ b/tests/transportpce_tests/2.2.1/test05_flex_grid.py
@@ -55,7 +55,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         time.sleep(10)
 
     def test_03_rdm_portmapping_info(self):
-        response = test_utils_rfc8040.get_portmapping_node_info("ROADM-D1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-D1", "node-info", None)
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertEqual(
             {'node-type': 'rdm',
@@ -69,7 +69,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
 
     def test_04_rdm_deg1_lcp(self):
         # pylint: disable=line-too-long
-        response = test_utils_rfc8040.portmapping_mc_capa_request("ROADM-D1", "DEG1-TTP")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-D1", "mc-capabilities", "DEG1-TTP")
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn(response['mc-capabilities'],
                       [[{'mc-node-name': 'DEG1-TTP', 'center-freq-granularity': '6.25', 'slot-width-granularity': '12.5'}],
@@ -78,7 +78,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
 
     def test_05_rdm_deg2_lcp(self):
         # pylint: disable=line-too-long
-        response = test_utils_rfc8040.portmapping_mc_capa_request("ROADM-D1", "DEG2-TTP")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-D1", "mc-capabilities", "DEG2-TTP")
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn(response['mc-capabilities'],
                       [[{'mc-node-name': 'DEG2-TTP', 'center-freq-granularity': '6.25', 'slot-width-granularity': '12.5'}],
@@ -87,7 +87,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
 
     def test_06_rdm_srg1_lcp(self):
         # pylint: disable=line-too-long
-        response = test_utils_rfc8040.portmapping_mc_capa_request("ROADM-D1", "SRG1-PP")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-D1", "mc-capabilities", "SRG1-PP")
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn(response['mc-capabilities'],
                       [[{'mc-node-name': 'SRG1-PP', 'center-freq-granularity': '6.25', 'slot-width-granularity': '12.5'}],
@@ -96,29 +96,29 @@ 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
@@ -134,11 +134,10 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
                   "supporting-port": "L1",
                   "type": "org-openroadm-interfaces:mediaChannelTrailTerminationPoint"},
                  **response['interface'][0]), response['interface'][0])
-
         # Check the mc-ttp max and min-freq
-        self.assertIn(response['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp'],
-                      [{'min-freq': '196.00625', 'max-freq': '196.09375'},
-                       {'min-freq': 196.00625, 'max-freq': 196.09375}])
+        mcttp = response['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp']
+        self.assertEqual(float(mcttp['min-freq']), 196.00625)
+        self.assertEqual(float(mcttp['max-freq']), 196.09375)
         time.sleep(3)
 
     # get DEG-NMC interface and check
@@ -154,11 +153,9 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
                   "supporting-port": "L1",
                   "type": "org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint"},
                  **response['interface'][0]), response['interface'][0])
-
-        # Check the mc-ttp max and min-freq
-        self.assertIn(response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'],
-                      [{'frequency': '196.05000', 'width': '80'},
-                       {'frequency': 196.05, 'width': 80}])
+        nmcctp = response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']
+        self.assertEqual(float(nmcctp['frequency']), 196.05)
+        self.assertEqual(float(nmcctp['width']), 80)
         time.sleep(3)
 
     # get SRG-NMC interface
@@ -173,9 +170,9 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
                   "supporting-port": "C1",
                   "type": "org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint"},
                  **response['interface'][0]), response['interface'][0])
-        self.assertIn(response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'],
-                      [{'frequency': '196.05000', 'width': '80'},
-                       {'frequency': 196.05, 'width': 80}])
+        nmcctp = response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']
+        self.assertEqual(float(nmcctp['frequency']), 196.05)
+        self.assertEqual(float(nmcctp['width']), 80)
         time.sleep(3)
 
     # Create ROADM-connection