Fix some typos in functional tests naming

[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..b277c23c9750b1be77baa331b99be830b9acfa3d 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test05_olm.py
+++ b/tests/transportpce_tests/1.2.1/test05_olm.py
@@ -64,7 +64,7 @@ class TransportOlmTesting(unittest.TestCase):
         response = test_utils.mount_device("ROADMC01", ('roadmc-full', self.NODE_VERSION))
         self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
-    def test_05_connect_xprdA_to_roadmA(self):
+    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': 'XPDRA01', 'xpdr-num': '1', 'network-num': '1',
@@ -78,7 +78,7 @@ class TransportOlmTesting(unittest.TestCase):
                              'rdm-node': 'ROADMA01', '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):
+    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': 'XPDRC01', 'xpdr-num': '1', 'network-num': '1',
@@ -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(
@@ -486,9 +482,9 @@ class TransportOlmTesting(unittest.TestCase):
         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):
+    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': 'XPDRA01', 'xpdr-num': '1', 'network-num': '2',