Fix few functests assert RFC8040 uncompatibilities

JIRA: TRNSPRTPCE-567
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8a5055716e32f3a888e226ab192ab24dfca0a09f

diff --git a/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py b/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py
index b95ed25396dacc5824d4b0e2a8cbb685be7ecb52..bde6c27d6d503e694bfcde349f2c3355283b8637 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py
+++ b/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py
@@ -164,16 +164,11 @@ class TransportPCERendererTesting(unittest.TestCase):
                 'type': 'org-openroadm-interfaces:opticalChannel',
                 'supporting-port': '1'
             }, **response['interface'][0]), response['interface'][0])
-        self.assertIn(
-            response['interface'][0]['org-openroadm-optical-channel-interfaces:och'],
-            [{'rate': 'org-openroadm-optical-channel-interfaces:R100G',
-              'transmit-power': '-5',
-              'wavelength-number': 7,
-              'modulation-format': 'dp-qpsk'},
-             {'rate': 'org-openroadm-optical-channel-interfaces:R100G',
-              'transmit-power': -5,
-              'wavelength-number': 7,
-              'modulation-format': 'dp-qpsk'}])
+        intf = response['interface'][0]['org-openroadm-optical-channel-interfaces:och']
+        self.assertEqual(intf['rate'], 'org-openroadm-optical-channel-interfaces:R100G')
+        self.assertEqual(intf['modulation-format'], 'dp-qpsk')
+        self.assertEqual(intf['wavelength-number'], 7)
+        self.assertEqual(float(intf['transmit-power']), -5)
 
     def test_10_service_path_create_xpdr_check(self):
         response = test_utils_rfc8040.check_node_attribute_request("XPDRA01", "interface", "XPDR1-NETWORK1-OTU")

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 0d3c13b0fb8b62bbe5cfee1de12e8b8c36d5014a..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
@@ -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

diff --git a/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py b/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py
index d5f6889d23e266cfdd96433ee73a24533fcb87f4..6e37b24a6bca9b6f89c172b44a4d9e029bad259a 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py
+++ b/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py
@@ -116,9 +116,9 @@ class TransportPCERendererTesting(unittest.TestCase):
                  'supporting-port': 'L1'
                  }, **response['interface'][0]), response['interface'][0]
         )
-        self.assertIn(response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'],
-                      [{'frequency': '195.8000', 'width': '40'},
-                       {'frequency': 195.8, 'width': 40}])
+        nmcctp = response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']
+        self.assertEqual(float(nmcctp['frequency']), 195.8)
+        self.assertEqual(float(nmcctp['width']), 40)
 
     def test_07_service_path_create_rdm_check(self):
         response = test_utils_rfc8040.check_node_attribute_request("ROADM-A1", "interface", "DEG1-TTP-TXRX-mc-713:720")
@@ -133,9 +133,9 @@ class TransportPCERendererTesting(unittest.TestCase):
                  'supporting-port': 'L1'
                  }, **response['interface'][0]), response['interface'][0]
         )
-        self.assertIn(response['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp'],
-                      [{'min-freq': '195.7750', 'max-freq': '195.8250'},
-                       {'min-freq': 195.775, 'max-freq': 195.825}])
+        mcttp = response['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp']
+        self.assertEqual(float(mcttp['min-freq']), 195.775)
+        self.assertEqual(float(mcttp['max-freq']), 195.825)
 
     def test_08_service_path_create_rdm_check(self):
         response = test_utils_rfc8040.check_node_attribute_request("ROADM-A1", "interface", "SRG1-PP3-TXRX-nmc-713:720")
@@ -150,9 +150,9 @@ class TransportPCERendererTesting(unittest.TestCase):
                  'supporting-port': 'C3'
                  }, **response['interface'][0]), response['interface'][0]
         )
-        self.assertIn(response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'],
-                      [{'frequency': '195.8000', 'width': '40'},
-                       {'frequency': 195.8, 'width': 40}])
+        nmcctp = response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']
+        self.assertEqual(float(nmcctp['frequency']), 195.8)
+        self.assertEqual(float(nmcctp['width']), 40)
 
     # -mc supporting interfaces must not be created for SRG, only degrees
     def test_09_service_path_create_rdm_check(self):
@@ -185,12 +185,11 @@ class TransportPCERendererTesting(unittest.TestCase):
                  'supporting-port': '1'
                  }, **response['interface'][0]), response['interface'][0]
         )
-        self.assertIn(
-            response['interface'][0]['org-openroadm-optical-channel-interfaces:och'],
-            [{'rate': 'org-openroadm-common-types:R100G', 'transmit-power': '-5',
-              'modulation-format': 'dp-qpsk', 'frequency': '195.8000'},
-             {'rate': 'org-openroadm-common-types:R100G', 'transmit-power': -5,
-              'modulation-format': 'dp-qpsk', 'frequency': 195.8}])
+        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']), 195.8)
+        self.assertEqual(float(intf['transmit-power']), -5)
 
     def test_12_service_path_create_xpdr_check(self):
         response = test_utils_rfc8040.check_node_attribute_request("XPDR-A1", "interface", "XPDR1-NETWORK1-OTU")

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 228b91e23590eeeb61ccd30917fe574cab7a4f91..c05e05265ec63183a04c3f83ad5abf8b9ba4655a 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test07_otn_renderer.py
+++ b/tests/transportpce_tests/2.2.1/test07_otn_renderer.py
@@ -130,13 +130,11 @@ 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")

diff --git a/tests/transportpce_tests/2.2.1/test08_otn_sh_renderer.py b/tests/transportpce_tests/2.2.1/test08_otn_sh_renderer.py
index ecb7a9d3b784f1c4817a70daafc56ab845984899..d38e228eb9f44f7026fb88643da912854b41ae15 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test08_otn_sh_renderer.py
+++ b/tests/transportpce_tests/2.2.1/test08_otn_sh_renderer.py
@@ -178,12 +178,11 @@ class TransportPCEtesting(unittest.TestCase):
                                    'supporting-port': 'CP1-CFP0-P1'
                                    }, **response['interface'][0]),
                              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_05_check_interface_OTU(self):
         response = test_utils_rfc8040.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-NETWORK1-OTU")
@@ -218,12 +217,11 @@ class TransportPCEtesting(unittest.TestCase):
                                    'supporting-port': 'CP1-CFP0-P1'
                                    }, **response['interface'][0]),
                              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-SC1", "interface", "XPDR1-NETWORK1-OTU")