From f5b631df0de2c7388150840d6e1c54e9c2e49941 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Tue, 16 Jun 2020 09:56:08 +0200 Subject: [PATCH 1/1] fix assertDictContainsSubset deprecation warnings that appeared in functional tests with python 3.2 Signed-off-by: guillaume.lambert Change-Id: I5d7c32c2af5adf47c8216ac537302c39f92eae12 --- .../transportpce_tests/1.2.1/test_end2end.py | 94 +++++++----- .../test_renderer_service_path_nominal.py | 129 ++++++++++------ .../transportpce_tests/2.2.1/test_end2end.py | 82 ++++++---- .../test_renderer_service_path_nominal.py | 140 ++++++++++++------ 4 files changed, 290 insertions(+), 155 deletions(-) diff --git a/tests/transportpce_tests/1.2.1/test_end2end.py b/tests/transportpce_tests/1.2.1/test_end2end.py index 58dd332d3..cacde4386 100644 --- a/tests/transportpce_tests/1.2.1/test_end2end.py +++ b/tests/transportpce_tests/1.2.1/test_end2end.py @@ -465,12 +465,16 @@ class TransportPCEFulltesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-number': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1', - 'wavelength-number': 1, - 'opticalControlMode': 'gainLoss', - 'target-output-power': -3.0}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-number': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1', + 'wavelength-number': 1, + 'opticalControlMode': 'gainLoss', + 'target-output-power': -3.0 + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( {'src-if': 'SRG1-PP1-TXRX-1'}, res['roadm-connections'][0]['source']) @@ -492,12 +496,16 @@ class TransportPCEFulltesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-number': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1', - 'wavelength-number': 1, - 'opticalControlMode': 'gainLoss', - 'target-output-power': 2.0}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-number': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1', + 'wavelength-number': 1, + 'opticalControlMode': 'gainLoss', + 'target-output-power': 2.0 + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( {'src-if': 'SRG1-PP1-TXRX-1'}, res['roadm-connections'][0]['source']) @@ -833,11 +841,15 @@ class TransportPCEFulltesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-number': 'DEG1-TTP-TXRX-SRG1-PP2-TXRX-2', - 'wavelength-number': 2, - 'opticalControlMode': 'power'}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-number': 'DEG1-TTP-TXRX-SRG1-PP2-TXRX-2', + 'wavelength-number': 2, + 'opticalControlMode': 'power' + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( {'src-if': 'DEG1-TTP-TXRX-2'}, res['roadm-connections'][0]['source']) @@ -1391,12 +1403,16 @@ class TransportPCEFulltesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-number': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1', - 'wavelength-number': 1, - 'opticalControlMode': 'gainLoss', - 'target-output-power': -3.0}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-number': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1', + 'wavelength-number': 1, + 'opticalControlMode': 'gainLoss', + 'target-output-power': -3.0 + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( {'src-if': 'SRG1-PP1-TXRX-1'}, res['roadm-connections'][0]['source']) @@ -1418,12 +1434,16 @@ class TransportPCEFulltesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-number': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1', - 'wavelength-number': 1, - 'opticalControlMode': 'gainLoss', - 'target-output-power': 2.0}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-number': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1', + 'wavelength-number': 1, + 'opticalControlMode': 'gainLoss', + 'target-output-power': 2.0 + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( {'src-if': 'SRG1-PP1-TXRX-1'}, res['roadm-connections'][0]['source']) @@ -1579,12 +1599,16 @@ class TransportPCEFulltesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-number': 'SRG1-PP2-TXRX-DEG1-TTP-TXRX-2', - 'wavelength-number': 2, - 'opticalControlMode': 'gainLoss', - 'target-output-power': -3.0}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-number': 'SRG1-PP2-TXRX-DEG1-TTP-TXRX-2', + 'wavelength-number': 2, + 'opticalControlMode': 'gainLoss', + 'target-output-power': -3.0 + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( {'src-if': 'SRG1-PP2-TXRX-2'}, res['roadm-connections'][0]['source']) diff --git a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py index 37bbfabaa..1cee5f143 100644 --- a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py +++ b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py @@ -181,10 +181,17 @@ class TransportPCERendererTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset({'name': 'DEG1-TTP-TXRX-7', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '2/0', - 'type': 'org-openroadm-interfaces:opticalChannel', - 'supporting-port': 'L1'}, res['interface'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'DEG1-TTP-TXRX-7', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '2/0', + 'type': 'org-openroadm-interfaces:opticalChannel', + 'supporting-port': 'L1' + }, **res['interface'][0]), + res['interface'][0] + ) self.assertDictEqual( {'wavelength-number': 7}, res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) @@ -199,12 +206,17 @@ class TransportPCERendererTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'name': 'SRG1-PP7-TXRX-7', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '4/0', - 'type': 'org-openroadm-interfaces:opticalChannel', - 'supporting-port': 'C7'}, - res['interface'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'SRG1-PP7-TXRX-7', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '4/0', + 'type': 'org-openroadm-interfaces:opticalChannel', + 'supporting-port': 'C7' + }, **res['interface'][0]), + res['interface'][0] + ) self.assertDictEqual( {'wavelength-number': 7}, res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) @@ -219,11 +231,15 @@ class TransportPCERendererTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-number': 'SRG1-PP7-TXRX-DEG1-TTP-TXRX-7', - 'wavelength-number': 7, - 'opticalControlMode': 'off'}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-number': 'SRG1-PP7-TXRX-DEG1-TTP-TXRX-7', + 'wavelength-number': 7, + 'opticalControlMode': 'off' + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( {'src-if': 'SRG1-PP7-TXRX-7'}, res['roadm-connections'][0]['source']) @@ -241,12 +257,17 @@ class TransportPCERendererTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'name': 'XPDR1-NETWORK1-7', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', - 'type': 'org-openroadm-interfaces:opticalChannel', - 'supporting-port': '1'}, - res['interface'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'XPDR1-NETWORK1-7', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', + 'type': 'org-openroadm-interfaces:opticalChannel', + 'supporting-port': '1' + }, **res['interface'][0]), + res['interface'][0] + ) self.assertDictEqual( {u'rate': u'org-openroadm-optical-channel-interfaces:R100G', u'transmit-power': -5, @@ -264,13 +285,18 @@ class TransportPCERendererTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'name': 'XPDR1-NETWORK1-OTU', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', - 'type': 'org-openroadm-interfaces:otnOtu', - 'supporting-port': '1', - 'supporting-interface': 'XPDR1-NETWORK1-7'}, - res['interface'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'XPDR1-NETWORK1-OTU', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', + 'type': 'org-openroadm-interfaces:otnOtu', + 'supporting-port': '1', + 'supporting-interface': 'XPDR1-NETWORK1-7' + }, **res['interface'][0]), + res['interface'][0] + ) self.assertDictEqual( {u'rate': u'org-openroadm-otn-otu-interfaces:OTU4', u'fec': u'scfec'}, @@ -286,17 +312,25 @@ class TransportPCERendererTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'name': 'XPDR1-NETWORK1-ODU', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', - 'type': 'org-openroadm-interfaces:otnOdu', - 'supporting-port': '1', - 'supporting-interface': 'XPDR1-NETWORK1-OTU'}, - res['interface'][0]) - self.assertDictContainsSubset( - {'rate': 'org-openroadm-otn-odu-interfaces:ODU4', - u'monitoring-mode': u'terminated'}, - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) + # the 2 following statements replace self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'XPDR1-NETWORK1-ODU', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', + 'type': 'org-openroadm-interfaces:otnOdu', + 'supporting-port': '1', + 'supporting-interface': 'XPDR1-NETWORK1-OTU' + }, **res['interface'][0]), + res['interface'][0] + ) + self.assertDictEqual( + dict({ + 'rate': 'org-openroadm-otn-odu-interfaces:ODU4', + u'monitoring-mode': u'terminated' + }, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), + res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'] + ) self.assertDictEqual({u'exp-payload-type': u'07', u'payload-type': u'07'}, res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) @@ -310,12 +344,17 @@ class TransportPCERendererTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'name': 'XPDR1-CLIENT1-ETHERNET', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT', - 'type': 'org-openroadm-interfaces:ethernetCsmacd', - 'supporting-port': 'C1'}, - res['interface'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'XPDR1-CLIENT1-ETHERNET', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT', + 'type': 'org-openroadm-interfaces:ethernetCsmacd', + 'supporting-port': 'C1' + }, **res['interface'][0]), + res['interface'][0] + ) self.assertDictEqual( {'speed': 100000, 'mtu': 9000, diff --git a/tests/transportpce_tests/2.2.1/test_end2end.py b/tests/transportpce_tests/2.2.1/test_end2end.py index 20d9351ce..83d938e8b 100644 --- a/tests/transportpce_tests/2.2.1/test_end2end.py +++ b/tests/transportpce_tests/2.2.1/test_end2end.py @@ -436,11 +436,15 @@ class TransportPCEFulltesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-name': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1', - 'opticalControlMode': 'gainLoss', - 'target-output-power': -3.0}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-name': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1', + 'opticalControlMode': 'gainLoss', + 'target-output-power': -3.0 + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( {'src-if': 'SRG1-PP1-TXRX-nmc-1'}, res['roadm-connections'][0]['source']) @@ -459,11 +463,15 @@ class TransportPCEFulltesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-name': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1', - 'opticalControlMode': 'gainLoss', - 'target-output-power': -3.0}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-name': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1', + 'opticalControlMode': 'gainLoss', + 'target-output-power': -3.0 + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( {'src-if': 'SRG1-PP1-TXRX-nmc-1'}, res['roadm-connections'][0]['source']) @@ -755,10 +763,14 @@ class TransportPCEFulltesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-name': 'DEG2-TTP-TXRX-SRG1-PP2-TXRX-2', - 'opticalControlMode': 'power'}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-name': 'DEG2-TTP-TXRX-SRG1-PP2-TXRX-2', + 'opticalControlMode': 'power' + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( {'src-if': 'DEG2-TTP-TXRX-nmc-2'}, res['roadm-connections'][0]['source']) @@ -1228,11 +1240,15 @@ class TransportPCEFulltesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-name': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1', - 'opticalControlMode': 'gainLoss', - 'target-output-power': -3.0}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-name': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1', + 'opticalControlMode': 'gainLoss', + 'target-output-power': -3.0 + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( {'src-if': 'SRG1-PP1-TXRX-nmc-1'}, res['roadm-connections'][0]['source']) @@ -1251,11 +1267,15 @@ class TransportPCEFulltesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-name': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1', - 'opticalControlMode': 'gainLoss', - 'target-output-power': -3.0}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-name': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1', + 'opticalControlMode': 'gainLoss', + 'target-output-power': -3.0 + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( {'src-if': 'SRG1-PP1-TXRX-nmc-1'}, res['roadm-connections'][0]['source']) @@ -1396,11 +1416,15 @@ class TransportPCEFulltesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-name': 'SRG1-PP2-TXRX-DEG2-TTP-TXRX-2', - 'opticalControlMode': 'gainLoss', - 'target-output-power': -3.0}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-name': 'SRG1-PP2-TXRX-DEG2-TTP-TXRX-2', + 'opticalControlMode': 'gainLoss', + 'target-output-power': -3.0 + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( {'src-if': 'SRG1-PP2-TXRX-nmc-2'}, res['roadm-connections'][0]['source']) diff --git a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py index cfd6de4d6..57b90df4d 100644 --- a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py +++ b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py @@ -188,10 +188,17 @@ class TransportPCERendererTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset({'name': 'DEG1-TTP-TXRX-nmc-7', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '1/0', - 'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint', - 'supporting-port': 'L1'}, res['interface'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'DEG1-TTP-TXRX-nmc-7', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/0', + 'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint', + 'supporting-port': 'L1' + }, **res['interface'][0]), + res['interface'][0] + ) self.assertDictEqual( {u'frequency': 195.8, u'width': 40}, res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']) @@ -206,10 +213,17 @@ class TransportPCERendererTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset({'name': 'DEG1-TTP-TXRX-mc-7', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '1/0', - 'type': 'org-openroadm-interfaces:mediaChannelTrailTerminationPoint', - 'supporting-port': 'L1'}, res['interface'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'DEG1-TTP-TXRX-mc-7', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/0', + 'type': 'org-openroadm-interfaces:mediaChannelTrailTerminationPoint', + 'supporting-port': 'L1' + }, **res['interface'][0]), + res['interface'][0] + ) self.assertDictEqual( {u'min-freq': 195.775, u'max-freq': 195.825}, res['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp']) @@ -224,10 +238,17 @@ class TransportPCERendererTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset({'name': 'SRG1-PP3-TXRX-nmc-7', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '3/0', - 'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint', - 'supporting-port': 'C3'}, res['interface'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'SRG1-PP3-TXRX-nmc-7', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '3/0', + 'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint', + 'supporting-port': 'C3' + }, **res['interface'][0]), + res['interface'][0] + ) self.assertDictEqual( {u'frequency': 195.8, u'width': 40}, res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']) @@ -258,10 +279,14 @@ class TransportPCERendererTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-name': 'SRG1-PP3-TXRX-DEG1-TTP-TXRX-7', - 'opticalControlMode': 'off'}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-name': 'SRG1-PP3-TXRX-DEG1-TTP-TXRX-7', + 'opticalControlMode': 'off' + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( {'src-if': 'SRG1-PP3-TXRX-nmc-7'}, res['roadm-connections'][0]['source']) @@ -279,12 +304,17 @@ class TransportPCERendererTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'name': 'XPDR1-NETWORK1-7', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', - 'type': 'org-openroadm-interfaces:opticalChannel', - 'supporting-port': '1'}, - res['interface'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'XPDR1-NETWORK1-7', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', + 'type': 'org-openroadm-interfaces:opticalChannel', + 'supporting-port': '1' + }, **res['interface'][0]), + res['interface'][0] + ) self.assertDictEqual( {u'rate': u'org-openroadm-common-types:R100G', u'transmit-power': -5, @@ -301,13 +331,18 @@ class TransportPCERendererTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'name': 'XPDR1-NETWORK1-OTU', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', - 'type': 'org-openroadm-interfaces:otnOtu', - 'supporting-port': '1', - 'supporting-interface': 'XPDR1-NETWORK1-7'}, - res['interface'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'XPDR1-NETWORK1-OTU', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', + 'type': 'org-openroadm-interfaces:otnOtu', + 'supporting-port': '1', + 'supporting-interface': 'XPDR1-NETWORK1-7' + }, **res['interface'][0]), + res['interface'][0] + ) self.assertDictEqual( {u'rate': u'org-openroadm-otn-common-types:OTU4', u'fec': u'scfec'}, @@ -323,17 +358,25 @@ class TransportPCERendererTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'name': 'XPDR1-NETWORK1-ODU', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', - 'type': 'org-openroadm-interfaces:otnOdu', - 'supporting-port': '1', - 'supporting-interface': 'XPDR1-NETWORK1-OTU'}, - res['interface'][0]) - self.assertDictContainsSubset( - {'rate': 'org-openroadm-otn-common-types:ODU4', - u'monitoring-mode': u'terminated'}, - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) + # the 2 following statements replace self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'XPDR1-NETWORK1-ODU', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', + 'type': 'org-openroadm-interfaces:otnOdu', + 'supporting-port': '1', + 'supporting-interface': 'XPDR1-NETWORK1-OTU' + }, **res['interface'][0]), + res['interface'][0] + ) + self.assertDictEqual( + dict({ + 'rate': 'org-openroadm-otn-common-types:ODU4', + u'monitoring-mode': u'terminated' + }, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), + res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'] + ) self.assertDictEqual({u'exp-payload-type': u'07', u'payload-type': u'07'}, res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) @@ -347,12 +390,17 @@ class TransportPCERendererTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'name': 'XPDR1-CLIENT1-ETHERNET', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT', - 'type': 'org-openroadm-interfaces:ethernetCsmacd', - 'supporting-port': 'C1'}, - res['interface'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'XPDR1-CLIENT1-ETHERNET', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT', + 'type': 'org-openroadm-interfaces:ethernetCsmacd', + 'supporting-port': 'C1' + }, **res['interface'][0]), + res['interface'][0] + ) self.assertDictEqual( {u'fec': u'off', u'speed': 100000}, res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) -- 2.36.6