X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F1.2.1%2Ftest_renderer_service_path_nominal.py;h=305c2ec89ee83a0b2d8ea96c808bdfcf4abbc00a;hb=c834356f10cb8bc04c8b0a9eb2a438b2e9c50632;hp=5d4e55931e8ef7732e85862182be874531316ba8;hpb=20b2ae818f0b19079c176fffa65a8e96af435375;p=transportpce.git 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 5d4e55931..305c2ec89 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 @@ -9,25 +9,29 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################# +# pylint: disable=no-member +# pylint: disable=too-many-public-methods + import unittest -import json import time -#from unittest.result import failfast import requests -from common import test_utils - +import sys +sys.path.append('transportpce_tests/common/') +import test_utils class TransportPCERendererTesting(unittest.TestCase): processes = None + NODE_VERSION = '1.2.1' @classmethod def setUpClass(cls): cls.processes = test_utils.start_tpce() - cls.processes = test_utils.start_sims(['xpdra', 'roadma']) + cls.processes = test_utils.start_sims([('xpdra', cls.NODE_VERSION), ('roadma', cls.NODE_VERSION)]) @classmethod def tearDownClass(cls): + # pylint: disable=not-an-iterable for process in cls.processes: test_utils.shutdown_process(process) print("all processes killed") @@ -37,86 +41,71 @@ class TransportPCERendererTesting(unittest.TestCase): time.sleep(10) def test_01_rdm_device_connected(self): - response = test_utils.mount_device("ROADMA01", 'roadma') + response = test_utils.mount_device("ROADMA01", ('roadma', self.NODE_VERSION)) self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_02_xpdr_device_connected(self): - response = test_utils.mount_device("XPDRA01", 'xpdra') + response = test_utils.mount_device("XPDRA01", ('xpdra', self.NODE_VERSION)) 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/ROADMA01" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.portmapping_request("ROADMA01") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( {'supporting-port': 'L1', 'supporting-circuit-pack-name': '2/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': 'C7', 'supporting-circuit-pack-name': '4/0', - 'logical-connection-point': 'SRG1-PP7-TXRX', 'port-direction': 'bidirectional'}, + 'logical-connection-point': 'SRG1-PP7-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/XPDRA01" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.portmapping_request("XPDRA01") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', 'logical-connection-point': 'XPDR1-NETWORK1', 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network', - 'lcp-hash-val': 'OSvMgUyP+mE='}, + 'lcp-hash-val': 'OSvMgUyP+mE=', + 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, res['nodes'][0]['mapping']) self.assertIn( {'supporting-port': 'C1', 'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT', 'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client', - 'lcp-hash-val': 'AO9UFkY/TLYw'}, + 'lcp-hash-val': 'AO9UFkY/TLYw', + '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": "ROADMA01", - "renderer:src-tp": "SRG1-PP7-TXRX", - "renderer:dest-tp": "DEG1-TTP-TXRX"}, - {"renderer:node-id": "XPDRA01", - "renderer:src-tp": "XPDR1-CLIENT1", - "renderer:dest-tp": "XPDR1-NETWORK1"}]}} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.service_path_request("create", "service_test", "7", + [{"renderer:node-id": "ROADMA01", + "renderer:src-tp": "SRG1-PP7-TXRX", + "renderer:dest-tp": "DEG1-TTP-TXRX"}, + {"renderer:node-id": "XPDRA01", + "renderer:src-tp": "XPDR1-CLIENT1", + "renderer:dest-tp": "XPDR1-NETWORK1"}], + 195.8, 40, 195.775, 195.825, 713, + 720) + print(response.json()) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes: ROADMA01', res["output"]["result"]) def test_06_service_path_create_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/DEG1-TTP-TXRX-7" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("ROADMA01", "interface/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({ - 'name': 'DEG1-TTP-TXRX-7', + 'name': 'DEG1-TTP-TXRX-713:720', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '2/0', 'type': 'org-openroadm-interfaces:opticalChannel', @@ -129,18 +118,13 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_07_service_path_create_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/SRG1-PP7-TXRX-7" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("ROADMA01", "interface/SRG1-PP7-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({ - 'name': 'SRG1-PP7-TXRX-7', + 'name': 'SRG1-PP7-TXRX-713:720', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '4/0', 'type': 'org-openroadm-interfaces:opticalChannel', @@ -153,43 +137,34 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_08_service_path_create_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/SRG1-PP7-TXRX-DEG1-TTP-TXRX-7" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request( + "ROADMA01", "roadm-connections/SRG1-PP7-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-number': 'SRG1-PP7-TXRX-DEG1-TTP-TXRX-7', + 'connection-number': 'SRG1-PP7-TXRX-DEG1-TTP-TXRX-713:720', 'wavelength-number': 7, 'opticalControlMode': 'off' }, **res['roadm-connections'][0]), res['roadm-connections'][0] ) self.assertDictEqual( - {'src-if': 'SRG1-PP7-TXRX-7'}, + {'src-if': 'SRG1-PP7-TXRX-713:720'}, res['roadm-connections'][0]['source']) self.assertDictEqual( - {'dst-if': 'DEG1-TTP-TXRX-7'}, + {'dst-if': 'DEG1-TTP-TXRX-713:720'}, res['roadm-connections'][0]['destination']) def test_09_service_path_create_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-7" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDRA01", "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', @@ -205,12 +180,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_10_service_path_create_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-OTU" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDRA01", "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 @@ -221,7 +191,7 @@ class TransportPCERendererTesting(unittest.TestCase): 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', 'type': 'org-openroadm-interfaces:otnOtu', 'supporting-port': '1', - 'supporting-interface': 'XPDR1-NETWORK1-7' + 'supporting-interface': 'XPDR1-NETWORK1-713:720' }, **res['interface'][0]), res['interface'][0] ) @@ -231,12 +201,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']) def test_11_service_path_create_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-ODU" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDRA01", "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 @@ -262,12 +227,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) def test_12_service_path_create_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-CLIENT1-ETHERNET" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDRA01", "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 @@ -290,44 +250,28 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) def test_13_service_path_create_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "circuit-packs/1%2F0%2F1-PLUG-NET" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDRA01", "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_14_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": "ROADMA01", - "renderer:src-tp": "SRG1-PP7-TXRX", - "renderer:dest-tp": "DEG1-TTP-TXRX"}, - {"renderer:node-id": "XPDRA01", - "renderer:src-tp": "XPDR1-CLIENT1", - "renderer:dest-tp": "XPDR1-NETWORK1"}]}} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.service_path_request("delete", "service_test", "7", + [{"renderer:node-id": "ROADMA01", + "renderer:src-tp": "SRG1-PP7-TXRX", + "renderer:dest-tp": "DEG1-TTP-TXRX"}, + {"renderer:node-id": "XPDRA01", + "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_15_service_path_delete_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/DEG1-TTP-TXRX-7" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, 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("ROADMA01", "interface/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", @@ -335,96 +279,67 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_16_service_path_delete_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/SRG1-PP7-TXRX-7" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, 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("ROADMA01", "interface/SRG1-PP7-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"}, + "error-message": + "Request could not be completed because the relevant data model content does not exist"}, res['errors']['error']) def test_17_service_path_delete_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/SRG1-PP7-TXRX-DEG1-TTP-TXRX-7" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, 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("ROADMA01", "roadm-connections/SRG1-PP7-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"}, + "error-message": + "Request could not be completed because the relevant data model content does not exist"}, res['errors']['error']) def test_18_service_path_delete_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-7" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, 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("XPDRA01", "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"}, + "error-message": + "Request could not be completed because the relevant data model content does not exist"}, res['errors']['error']) def test_19_service_path_delete_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-OTU" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, 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("XPDRA01", "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"}, + "error-message": + "Request could not be completed because the relevant data model content does not exist"}, res['errors']['error']) def test_20_service_path_delete_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-ODU" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, 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("XPDRA01", "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"}, + "error-message": + "Request could not be completed because the relevant data model content does not exist"}, res['errors']['error']) def test_21_service_path_delete_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-CLIENT1-ETHERNET" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, 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("XPDRA01", "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"}, + "error-message": + "Request could not be completed because the relevant data model content does not exist"}, res['errors']['error']) def test_22_service_path_delete_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "circuit-packs/1%2F0%2F1-PLUG-NET" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDRA01", "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']) @@ -439,4 +354,4 @@ class TransportPCERendererTesting(unittest.TestCase): if __name__ == "__main__": - unittest.main(verbosity=2, failfast=True) + unittest.main(verbosity=2, failfast=False)