From 3ec5306a2e0eb12c1ffc9b0e4b06e0f2fe1aa403 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Fri, 2 Sep 2022 12:10:58 +0200 Subject: [PATCH] Fix 7.1 functional tests RFC8040 uncompatibilities JIRA: TRNSPRTPCE-567 Signed-off-by: guillaume.lambert Change-Id: Ida705dc6df9cd91f8dc849b14c2fce89326698e4 --- tests/transportpce_tests/7.1/test01_portmapping.py | 10 ++++------ tests/transportpce_tests/7.1/test02_otn_renderer.py | 12 ++++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/tests/transportpce_tests/7.1/test01_portmapping.py b/tests/transportpce_tests/7.1/test01_portmapping.py index 1f3f7791f..b297e77cf 100644 --- a/tests/transportpce_tests/7.1/test01_portmapping.py +++ b/tests/transportpce_tests/7.1/test01_portmapping.py @@ -143,18 +143,16 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): self.assertEqual('InService', res['mapping'][0]['port-admin-state']) self.assertEqual('InService', res['mapping'][0]['port-oper-state']) self.assertEqual('mpdr', res['mapping'][0]['xponder-type']) - self.assertEqual({ - "min-trib-slot": "1.1", - "max-trib-slot": "1.20" - }, res['mapping'][0]['mpdr-restrictions']) + self.assertEqual(1.1, float(res['mapping'][0]['mpdr-restrictions']['min-trib-slot'])) + self.assertEqual(1.2, float(res['mapping'][0]['mpdr-restrictions']['max-trib-slot'])) # Added test to check mc-capability-profile for a transponder def test_08_check_mccapprofile(self): res = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mc-capabilities", "XPDR-mcprofile") self.assertEqual(res['status_code'], requests.codes.ok) self.assertEqual(res['mc-capabilities'][0]['mc-node-name'], 'XPDR-mcprofile') - self.assertEqual(str(res['mc-capabilities'][0]['center-freq-granularity']), '3.125') - self.assertEqual(str(res['mc-capabilities'][0]['slot-width-granularity']), '6.25') + self.assertEqual(float(res['mc-capabilities'][0]['center-freq-granularity']), 3.125) + self.assertEqual(float(res['mc-capabilities'][0]['slot-width-granularity']), 6.25) def test_09_mpdr_switching_pool(self): response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "switching-pool-lcp", "1") diff --git a/tests/transportpce_tests/7.1/test02_otn_renderer.py b/tests/transportpce_tests/7.1/test02_otn_renderer.py index 4bceb0993..58a25fa8b 100644 --- a/tests/transportpce_tests/7.1/test02_otn_renderer.py +++ b/tests/transportpce_tests/7.1/test02_otn_renderer.py @@ -643,16 +643,16 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): def test_37_check_no_interface_otuc3(self): response = test_utils_rfc8040.check_node_attribute_request("XPDR-A1", "interface", "XPDR2-NETWORK1-OTUC3") - self.assertEqual(response['status_code'], requests.codes.conflict) + self.assertIn(response['status_code'], (requests.codes.conflict, requests.codes.service_unavailable)) def test_38_check_no_interface_otsig(self): response = test_utils_rfc8040.check_node_attribute_request( "XPDR-A1", "interface", "XPDR2-NETWORK1-OTSIGROUP-300G") - self.assertEqual(response['status_code'], requests.codes.conflict) + self.assertIn(response['status_code'], (requests.codes.conflict, requests.codes.service_unavailable)) def test_39_check_no_interface_otsi(self): response = test_utils_rfc8040.check_node_attribute_request("XPDR-A1", "interface", "XPDR2-NETWORK1-755:768") - self.assertEqual(response['status_code'], requests.codes.conflict) + self.assertIn(response['status_code'], (requests.codes.conflict, requests.codes.service_unavailable)) def test_39a_check_no_otuc3(self): response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-NETWORK1") @@ -867,16 +867,16 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): def test_51_check_no_interface_otuc4(self): response = test_utils_rfc8040.check_node_attribute_request("XPDR-A1", "interface", "XPDR2-NETWORK1-OTUC4") - self.assertEqual(response['status_code'], requests.codes.conflict) + self.assertIn(response['status_code'], (requests.codes.conflict, requests.codes.service_unavailable)) def test_52_check_no_interface_otsig(self): response = test_utils_rfc8040.check_node_attribute_request( "XPDR-A1", "interface", "XPDR2-NETWORK1-OTSIGROUP-400G") - self.assertEqual(response['status_code'], requests.codes.conflict) + self.assertIn(response['status_code'], (requests.codes.conflict, requests.codes.service_unavailable)) def test_53_check_no_interface_otsi(self): response = test_utils_rfc8040.check_node_attribute_request("XPDR-A1", "interface", "XPDR2-NETWORK1-755:768") - self.assertEqual(response['status_code'], requests.codes.conflict) + self.assertIn(response['status_code'], (requests.codes.conflict, requests.codes.service_unavailable)) def test_53a_check_no_otuc4(self): response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-NETWORK1") -- 2.36.6