X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F2.2.1%2Ftest_renderer_service_path_nominal.py;h=432ae129413efbe5468af56d0ba2f92288c57f81;hb=15197bf3dcde69a90f01963ffa524fbf6354555c;hp=4162f5b574531075d7a1a5d54c7114b8a24a8506;hpb=a276255479f5ba8a3969b0645d001cb593982afe;p=transportpce.git 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 4162f5b57..432ae1294 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 @@ -9,8 +9,10 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################# +# pylint: disable=no-member +# pylint: disable=too-many-public-methods + import unittest -import json #from unittest.result import failfast import requests from common import test_utils @@ -27,6 +29,7 @@ class TransportPCERendererTesting(unittest.TestCase): @classmethod def tearDownClass(cls): + # pylint: disable=not-an-iterable for process in cls.processes: test_utils.shutdown_process(process) print("all processes killed") @@ -40,30 +43,22 @@ class TransportPCERendererTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_03_rdm_portmapping(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/ROADM-A1" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.portmapping_request("ROADM-A1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( {'supporting-port': 'L1', 'supporting-circuit-pack-name': '1/0', - 'logical-connection-point': 'DEG1-TTP-TXRX', 'port-direction': 'bidirectional'}, + 'logical-connection-point': 'DEG1-TTP-TXRX', 'port-direction': 'bidirectional', + 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, res['nodes'][0]['mapping']) self.assertIn( {'supporting-port': 'C3', 'supporting-circuit-pack-name': '3/0', - 'logical-connection-point': 'SRG1-PP3-TXRX', 'port-direction': 'bidirectional'}, + 'logical-connection-point': 'SRG1-PP3-TXRX', 'port-direction': 'bidirectional', + 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, res['nodes'][0]['mapping']) def test_04_xpdr_portmapping(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/XPDR-A1" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.portmapping_request("XPDR-A1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -71,7 +66,8 @@ class TransportPCERendererTesting(unittest.TestCase): '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': 'e54EtOovlcE='}, + 'lcp-hash-val': 'AMkDwQ7xTmRI', + 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, res['nodes'][0]['mapping']) self.assertIn( {'supported-interface-capability': ['org-openroadm-port-types:if-100GE'], @@ -79,45 +75,32 @@ class TransportPCERendererTesting(unittest.TestCase): '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': 'BIyxYXnFEFA='}, + 'lcp-hash-val': 'AJUUr6I5fALj', + 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, res['nodes'][0]['mapping']) def test_05_service_path_create(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) - data = {"renderer:input": { - "renderer:service-name": "service_test", - "renderer:wave-number": "7", - "renderer:modulation-format": "qpsk", - "renderer:operation": "create", - "renderer:nodes": [ - {"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"}]}} - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + 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"]) def test_06_service_path_create_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/DEG1-TTP-TXRX-nmc-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + 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() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ - 'name': 'DEG1-TTP-TXRX-nmc-7', + 'name': 'DEG1-TTP-TXRX-nmc-713:720', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/0', 'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint', @@ -130,13 +113,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']) def test_07_service_path_create_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/DEG1-TTP-TXRX-mc-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + 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() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -155,19 +132,13 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp']) def test_08_service_path_create_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/SRG1-PP3-TXRX-nmc-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + 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() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ - 'name': 'SRG1-PP3-TXRX-nmc-7', + 'name': 'SRG1-PP3-TXRX-nmc-713:720', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '3/0', 'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint', @@ -181,14 +152,8 @@ class TransportPCERendererTesting(unittest.TestCase): # -mc supporting interfaces must not be created for SRG, only degrees def test_09_service_path_create_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/SRG1-PP3-TXRX-mc-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) - self.assertEqual(response.status_code, requests.codes.not_found) + 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", @@ -196,44 +161,32 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_10_service_path_create_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/SRG1-PP3-TXRX-DEG1-TTP-TXRX-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + 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() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ - 'connection-name': 'SRG1-PP3-TXRX-DEG1-TTP-TXRX-7', + '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-7'}, + {'src-if': 'SRG1-PP3-TXRX-nmc-713:720'}, res['roadm-connections'][0]['source']) self.assertDictEqual( - {'dst-if': 'DEG1-TTP-TXRX-nmc-7'}, + {'dst-if': 'DEG1-TTP-TXRX-nmc-713:720'}, res['roadm-connections'][0]['destination']) def test_11_service_path_create_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + 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() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ - 'name': 'XPDR1-NETWORK1-7', + 'name': 'XPDR1-NETWORK1-713:720', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', 'type': 'org-openroadm-interfaces:opticalChannel', @@ -244,17 +197,12 @@ class TransportPCERendererTesting(unittest.TestCase): self.assertDictEqual( {u'rate': u'org-openroadm-common-types:R100G', u'transmit-power': -5, + u'modulation-format': 'dp-qpsk', u'frequency': 195.8}, res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_12_service_path_create_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-OTU" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-OTU") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -269,19 +217,15 @@ class TransportPCERendererTesting(unittest.TestCase): }, **res['interface'][0]), res['interface'][0] ) - self.assertDictEqual( - {u'rate': u'org-openroadm-otn-common-types:OTU4', - u'fec': u'scfec'}, - res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']) + input_dict_2 = {'tx-sapi': 'AMkDwQ7xTmRI', + 'expected-dapi': 'AMkDwQ7xTmRI', + 'rate': 'org-openroadm-otn-common-types:OTU4', + 'fec': 'scfec'} + self.assertDictEqual(input_dict_2, + res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']) def test_13_service_path_create_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-ODU" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-ODU") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the 2 following statements replace self.assertDictContainsSubset deprecated in python 3.2 @@ -307,13 +251,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) def test_14_service_path_create_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-CLIENT1-ETHERNET" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-CLIENT1-ETHERNET") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -332,59 +270,34 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) def test_15_service_path_create_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "circuit-packs/1%2F0%2F1-PLUG-NET" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + 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"]) def test_16_service_path_create_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "circuit-packs/1%2F0%2F1-PLUG-CLIENT" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + 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"]) def test_17_service_path_delete(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) - data = {"renderer:input": { - "renderer:service-name": "service_test", - "renderer:wave-number": "7", - "renderer:operation": "delete", - "renderer:nodes": [ - {"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"}]}} - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + 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}}) def test_18_service_path_delete_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/DEG1-TTP-TXRX-mc-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) - self.assertEqual(response.status_code, requests.codes.not_found) + 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", @@ -392,14 +305,8 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_19_service_path_delete_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/DEG1-TTP-TXRX-nmc-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) - self.assertEqual(response.status_code, requests.codes.not_found) + 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", @@ -407,14 +314,8 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_20_service_path_delete_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/SRG1-PP3-TXRX-mc-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) - self.assertEqual(response.status_code, requests.codes.not_found) + 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", @@ -423,14 +324,8 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_21_service_path_delete_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/SRG1-PP3-TXRX-nmc-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) - self.assertEqual(response.status_code, requests.codes.not_found) + 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", @@ -439,14 +334,8 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_22_service_path_delete_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/SRG1-PP3-TXRX-DEG1-TTP-TXRX-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) - self.assertEqual(response.status_code, requests.codes.not_found) + 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", @@ -455,14 +344,8 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_23_service_path_delete_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) - self.assertEqual(response.status_code, requests.codes.not_found) + 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", @@ -471,14 +354,8 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_24_service_path_delete_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-OTU" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) - self.assertEqual(response.status_code, requests.codes.not_found) + 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", @@ -487,14 +364,8 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_25_service_path_delete_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-ODU" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) - self.assertEqual(response.status_code, requests.codes.not_found) + 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", @@ -503,14 +374,8 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_26_service_path_delete_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-CLIENT1-ETHERNET" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) - self.assertEqual(response.status_code, requests.codes.not_found) + 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", @@ -519,25 +384,13 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_27_service_path_delete_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "circuit-packs/1%2F0%2F1-PLUG-NET" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + 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']) def test_28_service_path_delete_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "circuit-packs/1%2F0%2F1-PLUG-CLIENT" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + 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']) @@ -552,4 +405,4 @@ class TransportPCERendererTesting(unittest.TestCase): if __name__ == "__main__": - unittest.main(verbosity=2, failfast=True) + unittest.main(verbosity=2, failfast=False)