self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
def test_03_rdm_portmapping(self):
- response = test_utils.portmapping_request("ROADM-A1")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils.get_portmapping_node_attr("ROADM-A1", None, None)
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn(
{'supporting-port': 'L1', 'supporting-circuit-pack-name': '1/0',
'logical-connection-point': 'DEG1-TTP-TXRX', 'port-direction': 'bidirectional',
'port-admin-state': 'InService', 'port-oper-state': 'InService'},
- res['nodes'][0]['mapping'])
+ response['nodes'][0]['mapping'])
self.assertIn(
{'supporting-port': 'C3', 'supporting-circuit-pack-name': '3/0',
'logical-connection-point': 'SRG1-PP3-TXRX', 'port-direction': 'bidirectional',
'port-admin-state': 'InService', 'port-oper-state': 'InService'},
- res['nodes'][0]['mapping'])
+ response['nodes'][0]['mapping'])
def test_04_xpdr_portmapping(self):
- response = test_utils.portmapping_request("XPDR-A1")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils.get_portmapping_node_attr("XPDR-A1", None, None)
+ self.assertEqual(response['status_code'], requests.codes.ok)
self.assertIn(
{'supported-interface-capability': ['org-openroadm-port-types:if-OCH'],
'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
'logical-connection-point': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-network',
'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-CLIENT1',
- 'lcp-hash-val': 'AMkDwQ7xTmRI', 'xponder-type': 'tpdr',
+ 'lcp-hash-val': 'AMkDwQ7xTmRI', 'xpdr-type': 'tpdr',
'port-admin-state': 'InService', 'port-oper-state': 'InService'},
- res['nodes'][0]['mapping'])
+ response['nodes'][0]['mapping'])
self.assertIn(
{'supported-interface-capability': ['org-openroadm-port-types:if-100GE'],
'supporting-port': 'C1',
'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT',
'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional',
'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client',
- 'lcp-hash-val': 'AJUUr6I5fALj', 'xponder-type': 'tpdr',
+ 'lcp-hash-val': 'AJUUr6I5fALj', 'xpdr-type': 'tpdr',
'port-admin-state': 'InService', 'port-oper-state': 'InService'},
- res['nodes'][0]['mapping'])
+ response['nodes'][0]['mapping'])
def test_05_service_path_create(self):
- response = test_utils.service_path_request("create", "service_test", "7",
- [{"renderer:node-id": "ROADM-A1",
- "renderer:src-tp": "SRG1-PP3-TXRX",
- "renderer:dest-tp": "DEG1-TTP-TXRX"},
- {"renderer:node-id": "XPDR-A1",
- "renderer:src-tp": "XPDR1-CLIENT1",
- "renderer:dest-tp": "XPDR1-NETWORK1"}],
- 195.8, 40, 195.775, 195.825, 713,
- 720)
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertIn('Roadm-connection successfully created for nodes: ROADM-A1', res["output"]["result"])
+ response = test_utils.transportpce_api_rpc_request(
+ 'transportpce-device-renderer', 'service-path',
+ {
+ 'service-name': 'service_test',
+ 'wave-number': '7',
+ 'modulation-format': 'dp-qpsk',
+ 'operation': 'create',
+ 'nodes': [{'node-id': 'ROADM-A1', 'src-tp': 'SRG1-PP3-TXRX', 'dest-tp': 'DEG1-TTP-TXRX'},
+ {'node-id': 'XPDR-A1', 'src-tp': 'XPDR1-CLIENT1', 'dest-tp': 'XPDR1-NETWORK1'}],
+ 'center-freq': 195.8,
+ 'nmc-width': 40,
+ 'min-freq': 195.775,
+ 'max-freq': 195.825,
+ 'lower-spectral-slot-number': 713,
+ 'higher-spectral-slot-number': 720
+ })
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('Interfaces created successfully for nodes: ROADM-A1', response['output']['result'])
def test_06_service_path_create_rdm_check(self):
- response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-nmc-713:720")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils.check_node_attribute_request("ROADM-A1", "interface", "DEG1-TTP-TXRX-nmc-713:720")
+ self.assertEqual(response['status_code'], requests.codes.ok)
# the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
self.assertDictEqual(
dict({
'supporting-circuit-pack-name': '1/0',
'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint',
'supporting-port': 'L1'
- }, **res['interface'][0]),
- res['interface'][0]
+ }, **response['interface'][0]), response['interface'][0]
)
- self.assertDictEqual(
- {'frequency': 195.8, 'width': 40},
- res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'])
+ nmcctp = response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']
+ self.assertEqual(float(nmcctp['frequency']), 195.8)
+ self.assertEqual(float(nmcctp['width']), 40)
def test_07_service_path_create_rdm_check(self):
- response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-mc-713:720")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils.check_node_attribute_request("ROADM-A1", "interface", "DEG1-TTP-TXRX-mc-713:720")
+ self.assertEqual(response['status_code'], requests.codes.ok)
# the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
self.assertDictEqual(
dict({
'supporting-circuit-pack-name': '1/0',
'type': 'org-openroadm-interfaces:mediaChannelTrailTerminationPoint',
'supporting-port': 'L1'
- }, **res['interface'][0]),
- res['interface'][0]
+ }, **response['interface'][0]), response['interface'][0]
)
- self.assertDictEqual(
- {'min-freq': 195.775, 'max-freq': 195.825},
- res['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp'])
+ mcttp = response['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp']
+ self.assertEqual(float(mcttp['min-freq']), 195.775)
+ self.assertEqual(float(mcttp['max-freq']), 195.825)
def test_08_service_path_create_rdm_check(self):
- response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-nmc-713:720")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils.check_node_attribute_request("ROADM-A1", "interface", "SRG1-PP3-TXRX-nmc-713:720")
+ self.assertEqual(response['status_code'], requests.codes.ok)
# the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
self.assertDictEqual(
dict({
'supporting-circuit-pack-name': '3/0',
'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint',
'supporting-port': 'C3'
- }, **res['interface'][0]),
- res['interface'][0]
+ }, **response['interface'][0]), response['interface'][0]
)
- self.assertDictEqual(
- {'frequency': 195.8, 'width': 40},
- res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'])
+ nmcctp = response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']
+ self.assertEqual(float(nmcctp['frequency']), 195.8)
+ self.assertEqual(float(nmcctp['width']), 40)
# -mc supporting interfaces must not be created for SRG, only degrees
def test_09_service_path_create_rdm_check(self):
- response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-mc-713:720")
- self.assertEqual(response.status_code, requests.codes.conflict)
- res = response.json()
- self.assertIn(
- {"error-type": "application", "error-tag": "data-missing",
- "error-message": "Request could not be completed because the relevant data model content does not exist"},
- res['errors']['error'])
+ response = test_utils.check_node_attribute_request("ROADM-A1", "interface", "SRG1-PP3-TXRX-mc-713:720")
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_10_service_path_create_rdm_check(self):
- response = test_utils.check_netconf_node_request(
- "ROADM-A1", "roadm-connections/SRG1-PP3-TXRX-DEG1-TTP-TXRX-713:720")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils.check_node_attribute_request(
+ "ROADM-A1", "roadm-connections", "SRG1-PP3-TXRX-DEG1-TTP-TXRX-713:720")
+ self.assertEqual(response['status_code'], requests.codes.ok)
# the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
self.assertDictEqual(
dict({
'connection-name': 'SRG1-PP3-TXRX-DEG1-TTP-TXRX-713:720',
'opticalControlMode': 'off'
- }, **res['roadm-connections'][0]),
- res['roadm-connections'][0]
- )
- self.assertDictEqual(
- {'src-if': 'SRG1-PP3-TXRX-nmc-713:720'},
- res['roadm-connections'][0]['source'])
- self.assertDictEqual(
- {'dst-if': 'DEG1-TTP-TXRX-nmc-713:720'},
- res['roadm-connections'][0]['destination'])
+ }, **response['roadm-connections'][0]), response['roadm-connections'][0])
+ self.assertDictEqual({'src-if': 'SRG1-PP3-TXRX-nmc-713:720'}, response['roadm-connections'][0]['source'])
+ self.assertDictEqual({'dst-if': 'DEG1-TTP-TXRX-nmc-713:720'}, response['roadm-connections'][0]['destination'])
def test_11_service_path_create_xpdr_check(self):
- response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-713:720")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils.check_node_attribute_request("XPDR-A1", "interface", "XPDR1-NETWORK1-713:720")
+ self.assertEqual(response['status_code'], requests.codes.ok)
# the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
self.assertDictEqual(
dict({
'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
'type': 'org-openroadm-interfaces:opticalChannel',
'supporting-port': '1'
- }, **res['interface'][0]),
- res['interface'][0]
+ }, **response['interface'][0]), response['interface'][0]
)
- self.assertDictEqual(
- {'rate': 'org-openroadm-common-types:R100G',
- 'transmit-power': -5,
- 'modulation-format': 'dp-qpsk',
- 'frequency': 195.8},
- res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
+ intf = response['interface'][0]['org-openroadm-optical-channel-interfaces:och']
+ self.assertEqual(intf['rate'], 'org-openroadm-common-types:R100G')
+ self.assertEqual(intf['modulation-format'], 'dp-qpsk')
+ self.assertEqual(float(intf['frequency']), 195.8)
+ self.assertEqual(float(intf['transmit-power']), -5)
def test_12_service_path_create_xpdr_check(self):
- response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-OTU")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils.check_node_attribute_request("XPDR-A1", "interface", "XPDR1-NETWORK1-OTU")
+ self.assertEqual(response['status_code'], requests.codes.ok)
# the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
self.assertDictEqual(
dict({
'type': 'org-openroadm-interfaces:otnOtu',
'supporting-port': '1',
'supporting-interface': 'XPDR1-NETWORK1-7'
- }, **res['interface'][0]),
- res['interface'][0]
- )
- input_dict_2 = {'rate': 'org-openroadm-otn-common-types:OTU4',
- 'fec': 'scfec'}
- self.assertDictEqual(input_dict_2,
- res['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
+ }, **response['interface'][0]), response['interface'][0])
+ self.assertDictEqual(
+ dict({'rate': 'org-openroadm-otn-common-types:OTU4', 'fec': 'scfec'},
+ **response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
+ response['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
def test_13_service_path_create_xpdr_check(self):
- response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-ODU4")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils.check_node_attribute_request("XPDR-A1", "interface", "XPDR1-NETWORK1-ODU4")
+ self.assertEqual(response['status_code'], requests.codes.ok)
# the 2 following statements replace self.assertDictContainsSubset deprecated in python 3.2
self.assertDictEqual(
dict({
'type': 'org-openroadm-interfaces:otnOdu',
'supporting-port': '1',
'supporting-interface': 'XPDR1-NETWORK1-OTU'
- }, **res['interface'][0]),
- res['interface'][0]
- )
+ }, **response['interface'][0]), response['interface'][0])
self.assertDictEqual(
- dict({
- 'rate': 'org-openroadm-otn-common-types:ODU4',
- 'monitoring-mode': 'terminated'
- }, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
- )
+ dict({'rate': 'org-openroadm-otn-common-types:ODU4', 'monitoring-mode': 'terminated'},
+ **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
self.assertDictEqual({'exp-payload-type': '07', 'payload-type': '07'},
- res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+ response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
def test_14_service_path_create_xpdr_check(self):
- response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-CLIENT1-ETHERNET")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
+ response = test_utils.check_node_attribute_request("XPDR-A1", "interface", "XPDR1-CLIENT1-ETHERNET")
+ self.assertEqual(response['status_code'], requests.codes.ok)
# the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
self.assertDictEqual(
dict({
'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT',
'type': 'org-openroadm-interfaces:ethernetCsmacd',
'supporting-port': 'C1'
- }, **res['interface'][0]),
- res['interface'][0]
+ }, **response['interface'][0]), response['interface'][0]
)
self.assertDictEqual(
- {'fec': 'off', 'speed': 100000},
- res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
+ dict({'fec': 'off', 'speed': 100000},
+ **response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']),
+ response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
def test_15_service_path_create_xpdr_check(self):
- response = test_utils.check_netconf_node_request("XPDR-A1", "circuit-packs/1%2F0%2F1-PLUG-NET")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertIn('not-reserved-inuse', res['circuit-packs'][0]["equipment-state"])
+ response = test_utils.check_node_attribute_request("XPDR-A1", "circuit-packs", "1%2F0%2F1-PLUG-NET")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('not-reserved-inuse', response['circuit-packs'][0]['equipment-state'])
+ # FIXME: https://jira.opendaylight.org/browse/TRNSPRTPCE-591
def test_16_service_path_create_xpdr_check(self):
- response = test_utils.check_netconf_node_request("XPDR-A1", "circuit-packs/1%2F0%2F1-PLUG-CLIENT")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertIn('not-reserved-inuse', res['circuit-packs'][0]["equipment-state"])
+ response = test_utils.check_node_attribute_request("XPDR-A1", "circuit-packs", "1%2F0%2F1-PLUG-CLIENT")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertIn('not-reserved-inuse', response['circuit-packs'][0]['equipment-state'])
+ # FIXME: https://jira.opendaylight.org/browse/TRNSPRTPCE-591
def test_17_service_path_delete(self):
- response = test_utils.service_path_request("delete", "service_test", "7",
- [{"renderer:node-id": "ROADM-A1",
- "renderer:src-tp": "SRG1-PP3-TXRX",
- "renderer:dest-tp": "DEG1-TTP-TXRX"},
- {"renderer:node-id": "XPDR-A1",
- "renderer:src-tp": "XPDR1-CLIENT1",
- "renderer:dest-tp": "XPDR1-NETWORK1"}],
- 195.8, 40, 195.775, 195.825, 713,
- 720)
- self.assertEqual(response.status_code, requests.codes.ok)
- self.assertEqual(response.json(), {
- 'output': {'result': 'Request processed', 'success': True}})
+ response = test_utils.transportpce_api_rpc_request(
+ 'transportpce-device-renderer', 'service-path',
+ {
+ 'service-name': 'service_test',
+ 'wave-number': '7',
+ 'modulation-format': 'dp-qpsk',
+ 'operation': 'delete',
+ 'nodes': [{'node-id': 'ROADM-A1', 'src-tp': 'SRG1-PP3-TXRX', 'dest-tp': 'DEG1-TTP-TXRX'},
+ {'node-id': 'XPDR-A1', 'src-tp': 'XPDR1-CLIENT1', 'dest-tp': 'XPDR1-NETWORK1'}],
+ 'center-freq': 195.8,
+ 'nmc-width': 40,
+ 'min-freq': 195.775,
+ 'max-freq': 195.825,
+ 'lower-spectral-slot-number': 713,
+ 'higher-spectral-slot-number': 720
+ })
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertDictEqual(response['output'], {'result': 'Request processed', 'success': True})
def test_18_service_path_delete_rdm_check(self):
- response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-mc-713:720")
- self.assertEqual(response.status_code, requests.codes.conflict)
- res = response.json()
- self.assertIn(
- {"error-type": "application", "error-tag": "data-missing",
- "error-message": "Request could not be completed because the relevant data model content does not exist"},
- res['errors']['error'])
+ response = test_utils.check_node_attribute_request("ROADM-A1", "interface", "DEG1-TTP-TXRX-mc-713:720")
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_19_service_path_delete_rdm_check(self):
- response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-nmc-713:720")
- self.assertEqual(response.status_code, requests.codes.conflict)
- res = response.json()
- self.assertIn(
- {"error-type": "application", "error-tag": "data-missing",
- "error-message": "Request could not be completed because the relevant data model content does not exist"},
- res['errors']['error'])
+ response = test_utils.check_node_attribute_request("ROADM-A1", "interface", "DEG1-TTP-TXRX-nmc-713:720")
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_20_service_path_delete_rdm_check(self):
- response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-mc-713:720")
- self.assertEqual(response.status_code, requests.codes.conflict)
- res = response.json()
- self.assertIn({
- "error-type": "application",
- "error-tag": "data-missing",
- "error-message": "Request could not be completed because the relevant data model content does not exist"},
- res['errors']['error'])
+ response = test_utils.check_node_attribute_request("ROADM-A1", "interface", "SRG1-PP3-TXRX-mc-713:720")
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_21_service_path_delete_rdm_check(self):
- response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-nmc-713:720")
- self.assertEqual(response.status_code, requests.codes.conflict)
- res = response.json()
- self.assertIn({
- "error-type": "application",
- "error-tag": "data-missing",
- "error-message": "Request could not be completed because the relevant data model content does not exist"},
- res['errors']['error'])
+ response = test_utils.check_node_attribute_request("ROADM-A1", "interface", "SRG1-PP3-TXRX-nmc-713:720")
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_22_service_path_delete_rdm_check(self):
- response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-DEG1-TTP-TXRX-713:720")
- self.assertEqual(response.status_code, requests.codes.conflict)
- res = response.json()
- self.assertIn({
- "error-type": "application",
- "error-tag": "data-missing",
- "error-message": "Request could not be completed because the relevant data model content does not exist"},
- res['errors']['error'])
-
- def test_23_service_path_delete_xpdr_check(self):
- response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-713:720")
- self.assertEqual(response.status_code, requests.codes.conflict)
- res = response.json()
- self.assertIn({
- "error-type": "application",
- "error-tag": "data-missing",
- "error-message": "Request could not be completed because the relevant data model content does not exist"},
- res['errors']['error'])
+ response = test_utils.check_node_attribute_request(
+ "ROADM-A1", "interface", "SRG1-PP3-TXRX-DEG1-TTP-TXRX-713:720")
+ self.assertEqual(response['status_code'], requests.codes.conflict)
+
+ def test_23_service_path_delete_rdm_check(self):
+ response = test_utils.check_node_attribute_request(
+ "ROADM-A1", "roadm-connections", "SRG1-PP3-TXRX-DEG1-TTP-TXRX-713:720")
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_24_service_path_delete_xpdr_check(self):
- response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-OTU")
- self.assertEqual(response.status_code, requests.codes.conflict)
- res = response.json()
- self.assertIn({
- "error-type": "application",
- "error-tag": "data-missing",
- "error-message": "Request could not be completed because the relevant data model content does not exist"},
- res['errors']['error'])
+ response = test_utils.check_node_attribute_request("XPDR-A1", "interface", "XPDR1-NETWORK1-713:720")
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_25_service_path_delete_xpdr_check(self):
- response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-ODU")
- self.assertEqual(response.status_code, requests.codes.conflict)
- res = response.json()
- self.assertIn({
- "error-type": "application",
- "error-tag": "data-missing",
- "error-message": "Request could not be completed because the relevant data model content does not exist"},
- res['errors']['error'])
+ response = test_utils.check_node_attribute_request("XPDR-A1", "interface", "XPDR1-NETWORK1-OTU")
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_26_service_path_delete_xpdr_check(self):
- response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-CLIENT1-ETHERNET")
- self.assertEqual(response.status_code, requests.codes.conflict)
- res = response.json()
- self.assertIn({
- "error-type": "application",
- "error-tag": "data-missing",
- "error-message": "Request could not be completed because the relevant data model content does not exist"},
- res['errors']['error'])
+ response = test_utils.check_node_attribute_request("XPDR-A1", "interface", "XPDR1-NETWORK1-ODU")
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_27_service_path_delete_xpdr_check(self):
- response = test_utils.check_netconf_node_request("XPDR-A1", "circuit-packs/1%2F0%2F1-PLUG-NET")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertEqual('not-reserved-available', res["circuit-packs"][0]['equipment-state'])
+ response = test_utils.check_node_attribute_request("XPDR-A1", "interface", "XPDR1-CLIENT1-ETHERNET")
+ self.assertEqual(response['status_code'], requests.codes.conflict)
def test_28_service_path_delete_xpdr_check(self):
- response = test_utils.check_netconf_node_request("XPDR-A1", "circuit-packs/1%2F0%2F1-PLUG-CLIENT")
- self.assertEqual(response.status_code, requests.codes.ok)
- res = response.json()
- self.assertEqual('not-reserved-available', res["circuit-packs"][0]['equipment-state'])
+ response = test_utils.check_node_attribute_request("XPDR-A1", "circuit-packs", "1%2F0%2F1-PLUG-NET")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual('not-reserved-available', response["circuit-packs"][0]['equipment-state'])
+
+ def test_29_service_path_delete_xpdr_check(self):
+ response = test_utils.check_node_attribute_request("XPDR-A1", "circuit-packs", "1%2F0%2F1-PLUG-CLIENT")
+ self.assertEqual(response['status_code'], requests.codes.ok)
+ self.assertEqual('not-reserved-available', response["circuit-packs"][0]['equipment-state'])
- def test_29_rdm_device_disconnected(self):
+ def test_30_rdm_device_disconnected(self):
response = test_utils.unmount_device("ROADM-A1")
- self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
- def test_30_xpdr_device_disconnected(self):
+ def test_31_xpdr_device_disconnected(self):
response = test_utils.unmount_device("XPDR-A1")
- self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+ self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
if __name__ == "__main__":
Code Review / transportpce.git / blobdiff