From d81a3d491cbc1566f4bf93a4c28438be19687dbc Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Tue, 7 Jul 2020 17:09:11 +0200 Subject: [PATCH] add a method to check nodes configs in func tests Signed-off-by: guillaume.lambert Change-Id: Ia080da8480363c2387ffd0828eb3c9ed3583d64f --- .../transportpce_tests/1.2.1/test_end2end.py | 76 ++-------- tests/transportpce_tests/1.2.1/test_olm.py | 60 +++----- .../1.2.1/test_portmapping.py | 20 +-- .../test_renderer_service_path_nominal.py | 96 +++---------- .../transportpce_tests/2.2.1/test_end2end.py | 38 ++--- tests/transportpce_tests/2.2.1/test_olm.py | 60 +++----- .../2.2.1/test_otn_renderer.py | 88 +++--------- .../2.2.1/test_otn_sh_renderer.py | 94 +++---------- .../test_renderer_service_path_nominal.py | 132 +++--------------- tests/transportpce_tests/common/test_utils.py | 12 +- 10 files changed, 150 insertions(+), 526 deletions(-) diff --git a/tests/transportpce_tests/1.2.1/test_end2end.py b/tests/transportpce_tests/1.2.1/test_end2end.py index 245d5c148..6db0f3ed2 100644 --- a/tests/transportpce_tests/1.2.1/test_end2end.py +++ b/tests/transportpce_tests/1.2.1/test_end2end.py @@ -276,14 +276,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_13_check_xc1_ROADMA(self): - url = ( - "{}/config/network-topology:" - "network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:" - "mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -305,14 +298,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(5) def test_14_check_xc1_ROADMC(self): - url = ( - "{}/config/network-topology:" - "network-topology/topology/topology-netconf/" - "node/ROADMC01/yang-ext:mount/org-openroadm-device:" - "org-openroadm-device/" - "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -558,14 +544,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(1) def test_24_check_xc2_ROADMA(self): - url = ( - "{}/config/network-topology:" - "network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:" - "mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/DEG1-TTP-TXRX-SRG1-PP2-TXRX-2" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/DEG1-TTP-TXRX-SRG1-PP2-TXRX-2") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -860,13 +839,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(20) def test_32_check_no_xc_ROADMA(self): - url = ( - "{}/config/network-topology:" - "network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:" - "mount/org-openroadm-device:org-openroadm-device/" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMA01", "") res = response.json() self.assertEqual(response.status_code, requests.codes.ok) self.assertNotIn('roadm-connections', @@ -1066,14 +1039,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(1) def test_38_check_xc1_ROADMA(self): - url = ( - "{}/config/network-topology:" - "network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:" - "mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -1095,14 +1061,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(7) def test_39_check_xc1_ROADMC(self): - url = ( - "{}/config/network-topology:" - "network-topology/topology/topology-netconf/" - "node/ROADMC01/yang-ext:mount/org-openroadm-device:" - "org-openroadm-device/" - "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -1248,14 +1207,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_42_check_xc2_ROADMA(self): - url = ( - "{}/config/network-topology:" - "network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:mount/org-openroadm-device:" - "org-openroadm-device/" - "roadm-connections/SRG1-PP2-TXRX-DEG1-TTP-TXRX-2" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP2-TXRX-DEG1-TTP-TXRX-2") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -1331,8 +1283,7 @@ class TransportPCEFulltesting(unittest.TestCase): def test_46_get_no_oc_services(self): print("start test") - url = ("{}/operational/org-openroadm-service:service-list" - ) + url = "{}/operational/org-openroadm-service:service-list" response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() @@ -1348,13 +1299,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(1) def test_47_get_no_xc_ROADMA(self): - url = ( - "{}/config/network-topology:" - "network-topology/topology/topology-netconf" - "/node/ROADMA01/yang-ext:mount/org-openroadm-device:" - "org-openroadm-device/" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMA01", "") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn(['roadm-connections'][0], res['org-openroadm-device']) @@ -1380,8 +1325,7 @@ class TransportPCEFulltesting(unittest.TestCase): url = "{}/operational/org-openroadm-service:service-list/services/service1" response = test_utils.get_request(url) if response.status_code != 404: - url = ("{}/operations/org-openroadm-service:service-delete" - ) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", diff --git a/tests/transportpce_tests/1.2.1/test_olm.py b/tests/transportpce_tests/1.2.1/test_olm.py index bba76a072..c40da05d7 100644 --- a/tests/transportpce_tests/1.2.1/test_olm.py +++ b/tests/transportpce_tests/1.2.1/test_olm.py @@ -205,20 +205,18 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(5) def test_15_get_OTS_DEG1_TTP_TXRX_ROADMA(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/interface/OTS-DEG1-TTP-TXRX/" - "org-openroadm-optical-transport-interfaces:ots") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "ROADMA01", + "interface/OTS-DEG1-TTP-TXRX/org-openroadm-optical-transport-interfaces:ots") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(5.7, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']) self.assertEqual(15.1, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']) def test_16_get_OTS_DEG2_TTP_TXRX_ROADMC(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADMC01/yang-ext:mount/org-openroadm-device:org-openroadm-device/interface/OTS-DEG2-TTP-TXRX/" - "org-openroadm-optical-transport-interfaces:ots") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "ROADMC01", + "interface/OTS-DEG2-TTP-TXRX/org-openroadm-optical-transport-interfaces:ots") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(15.1, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']) @@ -338,30 +336,23 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Success', res["output"]["result"]) def test_20_get_interface_XPDRA_XPDR1_NETWORK1(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/XPDRA01/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/interface/XPDR1-NETWORK1-1/" - "org-openroadm-optical-channel-interfaces:och") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "XPDRA01", + "interface/XPDR1-NETWORK1-1/org-openroadm-optical-channel-interfaces:och") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(0, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) self.assertEqual(1, res['org-openroadm-optical-channel-interfaces:och']['wavelength-number']) def test_21_get_roadmconnection_ROADMA(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMA01/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/roadm-connections/" - "SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("gainLoss", res['roadm-connections'][0]['opticalControlMode']) self.assertEqual(-3.3, res['roadm-connections'][0]['target-output-power']) def test_22_get_roadmconnection_ROADMC(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMC01/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/roadm-connections/" - "DEG2-TTP-TXRX-SRG1-PP1-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/DEG2-TTP-TXRX-SRG1-PP1-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("power", res['roadm-connections'][0]['opticalControlMode']) @@ -402,20 +393,16 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Success', res["output"]["result"]) def test_24_get_interface_XPDRC_XPDR1_NETWORK1(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/XPDRC01/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/interface/XPDR1-NETWORK1-1/" - "org-openroadm-optical-channel-interfaces:och") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "XPDRC01", + "interface/XPDR1-NETWORK1-1/org-openroadm-optical-channel-interfaces:och") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(0, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) self.assertEqual(1, res['org-openroadm-optical-channel-interfaces:och']['wavelength-number']) def test_25_get_roadmconnection_ROADMC(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMC01/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/roadm-connections/" - "SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("gainLoss", res['roadm-connections'][0]['opticalControlMode']) @@ -457,20 +444,14 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Success', res["output"]["result"]) def test_27_get_roadmconnection_ROADMA(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMA01/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/roadm-connections/" - "SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("off", res['roadm-connections'][0]['opticalControlMode']) self.assertEqual(-60, res['roadm-connections'][0]['target-output-power']) def test_28_get_roadmconnection_ROADMC(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMC01/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/roadm-connections/" - "DEG2-TTP-TXRX-SRG1-PP1-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/DEG2-TTP-TXRX-SRG1-PP1-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("off", res['roadm-connections'][0]['opticalControlMode']) @@ -597,10 +578,9 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(10) def test_34_get_interface_XPDRA_XPDR1_NETWORK2(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/XPDRA01/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/interface/XPDR1-NETWORK2-2/" - "org-openroadm-optical-channel-interfaces:och") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "XPDRA01", + "interface/XPDR1-NETWORK2-2/org-openroadm-optical-channel-interfaces:och") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(-5, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) diff --git a/tests/transportpce_tests/1.2.1/test_portmapping.py b/tests/transportpce_tests/1.2.1/test_portmapping.py index 2c992342e..693fbc2e4 100644 --- a/tests/transportpce_tests/1.2.1/test_portmapping.py +++ b/tests/transportpce_tests/1.2.1/test_portmapping.py @@ -35,9 +35,9 @@ class TransportPCEPortMappingTesting(unittest.TestCase): time.sleep(10) # def test_01_restconfAPI(self): -# url = ("{}/operational/network-topology:network-topology/topology/" -# "topology-netconf/node/controller-config") -# response = requests.request("GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) +# url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/controller-config" +# 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.ok) # res = response.json() # self.assertEqual(res['node'] [0] ['netconf-node-topology:connection-status'], @@ -59,9 +59,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_02_rdm_device_connected(self): - url = ("{}/operational/network-topology:" - "network-topology/topology/topology-netconf/node/ROADMA01" - ) + url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/ROADMA01" response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -127,9 +125,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_08_xpdr_device_connected(self): - url = ("{}/operational/network-topology:" - "network-topology/topology/topology-netconf/node/XPDRA01" - ) + url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/XPDRA01" response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -246,8 +242,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) def test_17_xpdr_device_disconnected(self): - url = ("{}/operational/network-topology:network-topology/topology/" - "topology-netconf/node/XPDRA01") + url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/XPDRA01" response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() @@ -271,8 +266,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) def test_20_rdm_device_disconnected(self): - url = ("{}/operational/network-topology:network-topology/topology/topology-netconf/node/ROADMA01" - ) + url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/ROADMA01" response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() 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 9fbc51cd6..7dd4bf66a 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 @@ -100,11 +100,7 @@ class TransportPCERendererTesting(unittest.TestCase): 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMA01", "interface/DEG1-TTP-TXRX-7") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -123,11 +119,7 @@ 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMA01", "interface/SRG1-PP7-TXRX-7") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -146,11 +138,7 @@ 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP7-TXRX-DEG1-TTP-TXRX-7") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -170,11 +158,7 @@ class TransportPCERendererTesting(unittest.TestCase): 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-NETWORK1-7") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -196,11 +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" - ) - response = test_utils.get_request(url) + 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,11 +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" - ) - response = test_utils.get_request(url) + 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 @@ -251,11 +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" - ) - response = test_utils.get_request(url) + 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 @@ -278,11 +250,7 @@ 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" - ) - response = test_utils.get_request(url) + 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"]) @@ -306,11 +274,7 @@ class TransportPCERendererTesting(unittest.TestCase): '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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMA01", "interface/DEG1-TTP-TXRX-7") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -319,11 +283,7 @@ 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMA01", "interface/SRG1-PP7-TXRX-7") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -332,11 +292,7 @@ class TransportPCERendererTesting(unittest.TestCase): 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP7-TXRX-DEG1-TTP-TXRX-7") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -345,11 +301,7 @@ class TransportPCERendererTesting(unittest.TestCase): 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-NETWORK1-7") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -358,11 +310,7 @@ class TransportPCERendererTesting(unittest.TestCase): 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-NETWORK1-OTU") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -371,11 +319,7 @@ class TransportPCERendererTesting(unittest.TestCase): 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-NETWORK1-ODU") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -384,11 +328,7 @@ class TransportPCERendererTesting(unittest.TestCase): 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-CLIENT1-ETHERNET") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -397,11 +337,7 @@ class TransportPCERendererTesting(unittest.TestCase): 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" - ) - response = test_utils.get_request(url) + 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']) diff --git a/tests/transportpce_tests/2.2.1/test_end2end.py b/tests/transportpce_tests/2.2.1/test_end2end.py index 581071b8f..a2fad0916 100644 --- a/tests/transportpce_tests/2.2.1/test_end2end.py +++ b/tests/transportpce_tests/2.2.1/test_end2end.py @@ -233,10 +233,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_13_check_xc1_ROADMA(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-PP1-TXRX-DEG2-TTP-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -257,10 +254,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(5) def test_14_check_xc1_ROADMC(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-C1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-C1", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -479,10 +473,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(1) def test_24_check_xc2_ROADMA(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/DEG2-TTP-TXRX-SRG1-PP2-TXRX-2") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "roadm-connections/DEG2-TTP-TXRX-SRG1-PP2-TXRX-2") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -740,9 +731,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(20) def test_32_check_no_xc_ROADMA(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "") res = response.json() self.assertEqual(response.status_code, requests.codes.ok) self.assertNotIn('roadm-connections', dict.keys(res['org-openroadm-device'])) @@ -913,10 +902,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(1) def test_38_check_xc1_ROADMA(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-PP1-TXRX-DEG2-TTP-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -937,10 +923,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(7) def test_39_check_xc1_ROADMC(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-C1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-C1", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -1074,10 +1057,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_42_check_xc2_ROADMA(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-PP2-TXRX-DEG2-TTP-TXRX-2") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "roadm-connections/SRG1-PP2-TXRX-DEG2-TTP-TXRX-2") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -1159,9 +1139,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(1) def test_47_get_no_xc_ROADMA(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf" - "/node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn(['roadm-connections'][0], res['org-openroadm-device']) diff --git a/tests/transportpce_tests/2.2.1/test_olm.py b/tests/transportpce_tests/2.2.1/test_olm.py index b9cf5b682..f892a2329 100644 --- a/tests/transportpce_tests/2.2.1/test_olm.py +++ b/tests/transportpce_tests/2.2.1/test_olm.py @@ -206,20 +206,18 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(5) def test_15_get_OTS_DEG2_TTP_TXRX_ROADMA(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/interface/OTS-DEG2-TTP-TXRX/" - "org-openroadm-optical-transport-interfaces:ots") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "ROADM-A1", + "interface/OTS-DEG2-TTP-TXRX/org-openroadm-optical-transport-interfaces:ots") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(17.6, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']) self.assertEqual(25.7, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']) def test_16_get_OTS_DEG1_TTP_TXRX_ROADMC(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-C1/yang-ext:mount/org-openroadm-device:org-openroadm-device/interface/OTS-DEG1-TTP-TXRX/" - "org-openroadm-optical-transport-interfaces:ots") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "ROADM-C1", + "interface/OTS-DEG1-TTP-TXRX/org-openroadm-optical-transport-interfaces:ots") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(25.7, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']) @@ -339,30 +337,23 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Success', res["output"]["result"]) def test_20_get_interface_XPDRA_XPDR1_NETWORK1(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-1/" - "org-openroadm-optical-channel-interfaces:och") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "XPDR-A1", + "interface/XPDR1-NETWORK1-1/org-openroadm-optical-channel-interfaces:och") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(-5, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) self.assertEqual(196.1, res['org-openroadm-optical-channel-interfaces:och']['frequency']) def test_21_get_roadmconnection_ROADMA(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-PP1-TXRX-DEG2-TTP-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("gainLoss", res['roadm-connections'][0]['opticalControlMode']) self.assertEqual(2.0, res['roadm-connections'][0]['target-output-power']) def test_22_get_roadmconnection_ROADMC(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADM-C1/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/roadm-connections/" - "DEG1-TTP-TXRX-SRG1-PP1-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-C1", "roadm-connections/DEG1-TTP-TXRX-SRG1-PP1-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("power", res['roadm-connections'][0]['opticalControlMode']) @@ -403,20 +394,16 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Success', res["output"]["result"]) def test_24_get_interface_XPDRC_XPDR1_NETWORK1(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/XPDR-C1/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/interface/XPDR1-NETWORK1-1/" - "org-openroadm-optical-channel-interfaces:och") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "XPDR-C1", + "interface/XPDR1-NETWORK1-1/org-openroadm-optical-channel-interfaces:och") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(-5, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) self.assertEqual(196.1, res['org-openroadm-optical-channel-interfaces:och']['frequency']) def test_25_get_roadmconnection_ROADMC(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADM-C1/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/roadm-connections/" - "SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-C1", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("gainLoss", res['roadm-connections'][0]['opticalControlMode']) @@ -458,20 +445,14 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Success', res["output"]["result"]) def test_27_get_roadmconnection_ROADMA(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-PP1-TXRX-DEG2-TTP-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("off", res['roadm-connections'][0]['opticalControlMode']) self.assertEqual(-60, res['roadm-connections'][0]['target-output-power']) def test_28_get_roadmconnection_ROADMC(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADM-C1/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/roadm-connections/" - "DEG1-TTP-TXRX-SRG1-PP1-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-C1", "roadm-connections/DEG1-TTP-TXRX-SRG1-PP1-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("off", res['roadm-connections'][0]['opticalControlMode']) @@ -598,10 +579,9 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(10) def test_34_get_interface_XPDRA_XPDR1_NETWORK2(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/XPDR-A1/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/interface/XPDR1-NETWORK2-2/" - "org-openroadm-optical-channel-interfaces:och") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "XPDR-A1", + "interface/XPDR1-NETWORK2-2/org-openroadm-optical-channel-interfaces:och") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(-5, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) diff --git a/tests/transportpce_tests/2.2.1/test_otn_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_renderer.py index 1748b8065..6e4179243 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_renderer.py +++ b/tests/transportpce_tests/2.2.1/test_otn_renderer.py @@ -123,11 +123,7 @@ class TransportPCEtesting(unittest.TestCase): res['mapping']) def test_06_check_interface_och(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-1" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -145,11 +141,7 @@ class TransportPCEtesting(unittest.TestCase): res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_07_check_interface_OTU(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-OTU" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-OTU") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = {'name': 'XPDR1-NETWORK1-OTU', @@ -215,11 +207,7 @@ class TransportPCEtesting(unittest.TestCase): res['mapping']) def test_10_check_interface_ODU4(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-ODU4" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU4', 'administrative-state': 'inService', @@ -271,11 +259,7 @@ class TransportPCEtesting(unittest.TestCase): 'eth-interface-id': ['XPDR1-CLIENT1-ETHERNET10G']}, res["output"]['node-interface']) def test_12_check_interface_10GE_CLIENT(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-CLIENT1-ETHERNET10G" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ETHERNET10G") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict = {'name': 'XPDR1-CLIENT1-ETHERNET10G', @@ -291,11 +275,7 @@ class TransportPCEtesting(unittest.TestCase): res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) def test_13_check_interface_ODU2E_CLIENT(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-CLIENT1-ODU2e-service1" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -320,11 +300,7 @@ class TransportPCEtesting(unittest.TestCase): res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) def test_14_check_interface_ODU2E_NETWORK(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-ODU2e-service1" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e-service1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-service1', 'administrative-state': 'inService', @@ -355,11 +331,9 @@ class TransportPCEtesting(unittest.TestCase): 'parent-odu-allocation']['trib-slots']) def test_15_check_ODU2E_connection(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "odu-connection/XPDR1-CLIENT1-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "SPDR-SA1", + "odu-connection/XPDR1-CLIENT1-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = { @@ -397,35 +371,21 @@ class TransportPCEtesting(unittest.TestCase): self.assertTrue(res["output"]["success"]) def test_17_check_no_ODU2E_connection(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "odu-connection/XPDR1-CLIENT1-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "SPDR-SA1", + "odu-connection/XPDR1-CLIENT1-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1") self.assertEqual(response.status_code, requests.codes.not_found) def test_18_check_no_interface_ODU2E_NETWORK(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-ODU2e-service1" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e-service1") self.assertEqual(response.status_code, requests.codes.not_found) def test_19_check_no_interface_ODU2E_CLIENT(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-CLIENT1-ODU2e-service1" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1") self.assertEqual(response.status_code, requests.codes.not_found) def test_20_check_no_interface_10GE_CLIENT(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-CLIENT1-ETHERNET10G" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ETHERNET10G") self.assertEqual(response.status_code, requests.codes.not_found) def test_21_otn_service_path_delete_ODU4(self): @@ -446,11 +406,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertTrue(res["output"]["success"]) def test_22_check_no_interface_ODU4(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-ODU4" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4") self.assertEqual(response.status_code, requests.codes.not_found) def test_23_service_path_delete_OCH_OTU4(self): @@ -471,19 +427,11 @@ class TransportPCEtesting(unittest.TestCase): self.assertTrue(res["output"]["success"]) def test_24_check_no_interface_OTU4(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-OTU" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-OTU") self.assertEqual(response.status_code, requests.codes.not_found) def test_25_check_no_interface_OCH(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-1" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-1") self.assertEqual(response.status_code, requests.codes.not_found) def test_26_disconnect_SPDR_SA1(self): diff --git a/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py index b87bcb95f..95586d1d0 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py +++ b/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py @@ -138,11 +138,7 @@ class TransportPCEtesting(unittest.TestCase): # Test OCH-OTU interfaces on SPDR-A1 def test_04_check_interface_och(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-1" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertDictEqual(dict({'name': 'XPDR1-NETWORK1-1', @@ -159,11 +155,7 @@ class TransportPCEtesting(unittest.TestCase): res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_05_check_interface_OTU(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-OTU" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-OTU") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = {'name': 'XPDR1-NETWORK1-OTU', @@ -189,11 +181,7 @@ class TransportPCEtesting(unittest.TestCase): # Test OCH-OTU interfaces on SPDR-C1 def test_06_check_interface_och(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SC1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-1" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SC1", "interface/XPDR1-NETWORK1-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertDictEqual(dict({'name': 'XPDR1-NETWORK1-1', @@ -210,11 +198,7 @@ class TransportPCEtesting(unittest.TestCase): res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_07_check_interface_OTU(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SC1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-OTU" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SC1", "interface/XPDR1-NETWORK1-OTU") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = {'name': 'XPDR1-NETWORK1-OTU', @@ -318,11 +302,7 @@ class TransportPCEtesting(unittest.TestCase): # Test ODU4 interfaces on SPDR-A1 and SPDR-C1 def test_09_check_interface_ODU4(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-ODU4" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU4', @@ -350,11 +330,7 @@ class TransportPCEtesting(unittest.TestCase): res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) def test_10_check_interface_ODU4(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SC1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-ODU4" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SC1", "interface/XPDR1-NETWORK1-ODU4") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU4', @@ -488,11 +464,7 @@ class TransportPCEtesting(unittest.TestCase): # Test the interfaces on SPDR-A1 def test_12_check_interface_10GE_CLIENT(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-CLIENT1-ETHERNET10G" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ETHERNET10G") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict = {'name': 'XPDR1-CLIENT1-ETHERNET10G', @@ -508,11 +480,7 @@ class TransportPCEtesting(unittest.TestCase): res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) def test_13_check_interface_ODU2E_CLIENT(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G', @@ -536,11 +504,9 @@ class TransportPCEtesting(unittest.TestCase): res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) def test_14_check_ODU2E_connection(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "odu-connection/XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G-x-XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "SPDR-SA1", + "odu-connection/XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G-x-XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = { @@ -557,11 +523,7 @@ class TransportPCEtesting(unittest.TestCase): res['odu-connection'][0]['source']) def test_15_check_interface_ODU2E_NETWORK(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G', @@ -594,11 +556,7 @@ class TransportPCEtesting(unittest.TestCase): # Test the interfaces on SPDR-C1 def test_16_check_interface_ODU2E_NETWORK(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SA1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SC1", "interface/XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G', @@ -630,11 +588,7 @@ class TransportPCEtesting(unittest.TestCase): 'parent-odu-allocation']['trib-slots']) def test_17_check_interface_10GE_CLIENT(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SC1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-CLIENT1-ETHERNET10G" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SC1", "interface/XPDR1-CLIENT1-ETHERNET10G") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict = {'name': 'XPDR1-CLIENT1-ETHERNET10G', @@ -650,11 +604,7 @@ class TransportPCEtesting(unittest.TestCase): res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) def test_18_check_interface_ODU2E_CLIENT(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SC1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SC1", "interface/XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G', @@ -678,11 +628,9 @@ class TransportPCEtesting(unittest.TestCase): res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) def test_19_check_ODU2E_connection(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SC1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "odu-connection/XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G-x-XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "SPDR-SC1", + "odu-connection/XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G-x-XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = { @@ -699,11 +647,7 @@ class TransportPCEtesting(unittest.TestCase): res['odu-connection'][0]['source']) def test_20_check_interface_ODU2E_NETWORK(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/SPDR-SC1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("SPDR-SC1", "interface/XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G', 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 56dd59e17..bb5f5bb27 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 @@ -94,11 +94,7 @@ class TransportPCERendererTesting(unittest.TestCase): 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-nmc-7") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -117,11 +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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-mc-7") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -140,11 +132,7 @@ 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-nmc-7") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -164,11 +152,7 @@ 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-mc-7") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -177,11 +161,7 @@ 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "roadm-connections/SRG1-PP3-TXRX-DEG1-TTP-TXRX-7") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -200,11 +180,7 @@ class TransportPCERendererTesting(unittest.TestCase): 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-7") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -225,11 +201,7 @@ class TransportPCERendererTesting(unittest.TestCase): 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" - ) - response = test_utils.get_request(url) + 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 @@ -252,11 +224,7 @@ class TransportPCERendererTesting(unittest.TestCase): 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" - ) - response = test_utils.get_request(url) + 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 @@ -282,11 +250,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" - ) - response = test_utils.get_request(url) + 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 @@ -305,21 +269,13 @@ 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" - ) - response = test_utils.get_request(url) + 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" - ) - response = test_utils.get_request(url) + 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"]) @@ -343,11 +299,7 @@ class TransportPCERendererTesting(unittest.TestCase): '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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-mc-7") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -356,11 +308,7 @@ 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-nmc-7") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -369,11 +317,7 @@ 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-mc-7") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn({ @@ -383,11 +327,7 @@ 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-nmc-7") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn({ @@ -397,11 +337,7 @@ 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-DEG1-TTP-TXRX-7") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn({ @@ -411,11 +347,7 @@ 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-7") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn({ @@ -425,11 +357,7 @@ 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-OTU") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn({ @@ -439,11 +367,7 @@ 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-ODU") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn({ @@ -453,11 +377,7 @@ 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" - ) - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-CLIENT1-ETHERNET") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn({ @@ -467,21 +387,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" - ) - response = test_utils.get_request(url) + 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" - ) - response = test_utils.get_request(url) + 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']) diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py index 9dfd69448..6b6958f73 100644 --- a/tests/transportpce_tests/common/test_utils.py +++ b/tests/transportpce_tests/common/test_utils.py @@ -34,6 +34,7 @@ ODL_LOGIN = "admin" ODL_PWD = "admin" NODES_LOGIN = "admin" NODES_PWD = "admin" +URL_CONFIG_NETCONF_TOPO = "{}/config/network-topology:network-topology/topology/topology-netconf/" TYPE_APPLICATION_JSON = {'Content-Type': 'application/json', 'Accept': 'application/json'} TYPE_APPLICATION_XML = {'Content-Type': 'application/xml', 'Accept': 'application/xml'} @@ -184,7 +185,7 @@ def delete_request(url): def mount_device(node_id, sim): - url = "{}/config/network-topology:network-topology/topology/topology-netconf/node/"+node_id + url = URL_CONFIG_NETCONF_TOPO+"node/"+node_id body = {"node": [{ "node-id": node_id, "netconf-node-topology:username": NODES_LOGIN, @@ -205,7 +206,7 @@ def mount_device(node_id, sim): def unmount_device(node_id): - url = "{}/config/network-topology:network-topology/topology/topology-netconf/node/"+node_id + url = URL_CONFIG_NETCONF_TOPO+"node/"+node_id response = delete_request(url) if wait_until_log_contains(TPCE_LOG, re.escape("onDeviceDisConnected: "+node_id), 60): print("Node "+node_id+" correctly deleted from tpce topology", end='... ', flush=True) @@ -250,6 +251,13 @@ def connect_rdm_to_xpdr_request(xpdr_node: str, xpdr_num: str, network_num: str, return post_request(url, data) +def check_netconf_node_request(node: str, suffix: str): + url = URL_CONFIG_NETCONF_TOPO + ( + "node/" + node + "/yang-ext:mount/org-openroadm-device:org-openroadm-device/" + suffix + ) + return get_request(url) + + def shutdown_process(process): if process is not None: for child in psutil.Process(process.pid).children(): -- 2.36.6