From 53c5b508d518a7d5ce972f5e96723558523a964a Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Tue, 25 Aug 2020 15:09:32 +0200 Subject: [PATCH] improve OTN renderer functional test port-types listed in supported-interface-capability are not ordered. Thus, all possible order must be supported. Signed-off-by: guillaume.lambert Change-Id: Iadec827ba5fff1c8b462f5add104d543a40c734f --- .../2.2.1/test_otn_renderer.py | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/tests/transportpce_tests/2.2.1/test_otn_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_renderer.py index 8d3db78ba..a854d11fa 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_renderer.py +++ b/tests/transportpce_tests/2.2.1/test_otn_renderer.py @@ -49,19 +49,21 @@ class TransportPCEtesting(unittest.TestCase): def test_02_get_portmapping_CLIENT1(self): response = test_utils.portmapping_request("SPDR-SA1/mapping/XPDR1-CLIENT1") self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn( - {'supported-interface-capability': [ - 'org-openroadm-port-types:if-10GE-ODU2e', - 'org-openroadm-port-types:if-10GE-ODU2', - 'org-openroadm-port-types:if-10GE'], - 'supporting-port': 'CP1-SFP4-P1', - 'supporting-circuit-pack-name': 'CP1-SFP4', - 'logical-connection-point': 'XPDR1-CLIENT1', - 'port-direction': 'bidirectional', - 'port-qual': 'xpdr-client', - 'lcp-hash-val': 'FqlcrxV7p30='}, - res['mapping']) + res_mapping = (response.json())['mapping'][0] + self.assertSetEqual({'org-openroadm-port-types:if-10GE-ODU2e', + 'org-openroadm-port-types:if-10GE-ODU2', + 'org-openroadm-port-types:if-10GE'}, + set(res_mapping['supported-interface-capability'])) + self.assertDictEqual( + dict( + {'supporting-port': 'CP1-SFP4-P1', + 'supporting-circuit-pack-name': 'CP1-SFP4', + 'logical-connection-point': 'XPDR1-CLIENT1', + 'port-direction': 'bidirectional', + 'port-qual': 'xpdr-client', + 'lcp-hash-val': 'FqlcrxV7p30='}, + **res_mapping), + res_mapping) def test_03_get_portmapping_NETWORK1(self): response = test_utils.portmapping_request("SPDR-SA1/mapping/XPDR1-NETWORK1") -- 2.36.6