Adapt functional tests to Chlorine

[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 1950a54e58c8bf1826993ee93975d8971049797a..55b05a419754c90fd11ccd266987b41f8ddc2c95 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test05_olm.py
+++ b/tests/transportpce_tests/1.2.1/test05_olm.py
@@ -122,18 +122,16 @@ class TransportOlmTesting(unittest.TestCase):
                 }
             })
         self.assertEqual(response['status_code'], requests.codes.ok)
-        self.assertIn({
-            'pmparameter-name': 'OpticalPowerOutput',
-            'pmparameter-value': '2.50'
-        }, response['output']['measurements'])
-        self.assertIn({
-            'pmparameter-name': 'OpticalReturnLoss',
-            'pmparameter-value': '49.90'
-        }, response['output']['measurements'])
-        self.assertIn({
-            'pmparameter-name': 'OpticalPowerInput',
-            'pmparameter-value': '3'
-        }, 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'], 49.9)
+        self.assertEqual(measures['OpticalPowerInput'], 3.0)
 
     def test_12_get_PM_ROADMC(self):
         response = test_utils.transportpce_api_rpc_request(
@@ -147,18 +145,16 @@ class TransportOlmTesting(unittest.TestCase):
                 }
             })
         self.assertEqual(response['status_code'], requests.codes.ok)
-        self.assertIn({
-            'pmparameter-name': 'OpticalPowerOutput',
-            'pmparameter-value': '18.10'
-        }, response['output']['measurements'])
-        self.assertIn({
-            'pmparameter-name': 'OpticalReturnLoss',
-            'pmparameter-value': '48.80'
-        }, response['output']['measurements'])
-        self.assertIn({
-            'pmparameter-name': 'OpticalPowerInput',
-            'pmparameter-value': '-3.20'
-        }, 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'], 18.1)
+        self.assertEqual(measures['OpticalReturnLoss'], 48.8)
+        self.assertEqual(measures['OpticalPowerInput'], -3.2)
 
     def test_13_calculate_span_loss_base_ROADMA_ROADMC(self):
         response = test_utils.transportpce_api_rpc_request(