"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'])
"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'])
"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'])
"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'])
"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'])
"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'])
"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'])
"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'])
"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'])
"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,
"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'},
"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'])
"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,
"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'])
"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'])
"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'])
"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'])
"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'])
"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'])
"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'])
"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'])
"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'])
"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'])
"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,
"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'},
"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'])
"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'])