From 19a9408ee823754859467888a5d2823bfd8655ab Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Fri, 26 Jun 2020 21:18:36 +0200 Subject: [PATCH] generalize RESTconf requests methods in func tests Signed-off-by: guillaume.lambert Change-Id: Ifc2f5644e3c4d9601bb8f59a81ca6cbed78e7284 --- .../transportpce_tests/1.2.1/test_end2end.py | 381 +++++------------- tests/transportpce_tests/1.2.1/test_gnpy.py | 88 ++-- tests/transportpce_tests/1.2.1/test_olm.py | 254 +++--------- tests/transportpce_tests/1.2.1/test_pce.py | 188 +++------ .../1.2.1/test_portmapping.py | 89 ++-- .../test_renderer_service_path_nominal.py | 103 ++--- .../1.2.1/test_topoPortMapping.py | 21 +- .../transportpce_tests/1.2.1/test_topology.py | 265 ++++-------- .../transportpce_tests/2.2.1/test_end2end.py | 371 ++++------------- tests/transportpce_tests/2.2.1/test_olm.py | 286 +++---------- .../2.2.1/test_otn_renderer.py | 141 +++---- .../2.2.1/test_otn_topology.py | 67 +-- .../2.2.1/test_portmapping.py | 106 ++--- .../test_renderer_service_path_nominal.py | 162 +++----- tests/transportpce_tests/2.2.1/test_tapi.py | 48 +-- .../2.2.1/test_topoPortMapping.py | 34 +- .../transportpce_tests/2.2.1/test_topology.py | 255 ++++-------- tests/transportpce_tests/common/test_utils.py | 102 ++++- 18 files changed, 906 insertions(+), 2055 deletions(-) diff --git a/tests/transportpce_tests/1.2.1/test_end2end.py b/tests/transportpce_tests/1.2.1/test_end2end.py index f23790b3b..245d5c148 100644 --- a/tests/transportpce_tests/1.2.1/test_end2end.py +++ b/tests/transportpce_tests/1.2.1/test_end2end.py @@ -55,23 +55,8 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_05_connect_xprdA_N1_to_roadmA_PP1(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".\ - format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDRA01", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADMA01", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - 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.connect_xpdr_to_rdm_request("XPDRA01", "1", "1", + "ROADMA01", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Xponder Roadm Link created successfully', @@ -79,8 +64,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_06_connect_roadmA_PP1_to_xpdrA_N1(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".\ - format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links" data = { "networkutils:input": { "networkutils:links-input": { @@ -93,9 +77,9 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - 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.post_request(url, data) + response = test_utils.connect_rdm_to_xpdr_request("XPDRA01", "1", "1", + "ROADMA01", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm Xponder links created successfully', @@ -103,23 +87,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_07_connect_xprdC_N1_to_roadmC_PP1(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".\ - format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDRC01", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADMC01", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - 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.connect_xpdr_to_rdm_request("XPDRC01", "1", "1", + "ROADMC01", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Xponder Roadm Link created successfully', @@ -127,23 +96,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_08_connect_roadmC_PP1_to_xpdrC_N1(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".\ - format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDRC01", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADMC01", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - 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.connect_rdm_to_xpdr_request("XPDRC01", "1", "1", + "ROADMC01", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm Xponder links created successfully', @@ -158,7 +112,7 @@ class TransportPCEFulltesting(unittest.TestCase): "link/ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX/" "org-openroadm-network-topology:" "OMS-attributes/span" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {"span": { "clfi": "fiber1", "auto-spanloss": "true", @@ -170,9 +124,7 @@ class TransportPCEFulltesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.put_request(url, data) self.assertEqual(response.status_code, requests.codes.created) def test_10_add_omsAttributes_ROADMC_ROADMA(self): @@ -183,7 +135,7 @@ class TransportPCEFulltesting(unittest.TestCase): "link/ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX/" "org-openroadm-network-topology:" "OMS-attributes/span" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {"span": { "clfi": "fiber1", "auto-spanloss": "true", @@ -195,15 +147,12 @@ class TransportPCEFulltesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.put_request(url, data) self.assertEqual(response.status_code, requests.codes.created) # test service-create for Eth service from xpdr to xpdr def test_11_create_eth_service1(self): - url = ("{}/operations/org-openroadm-service:service-create" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-create" data = { "input": { "sdnc-request-header": { @@ -302,9 +251,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -313,10 +260,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(self.WAITING) def test_12_get_eth_service1(self): - url = ("{}/operational/org-openroadm-service:service-list/services/" - "service1".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)) + url = "{}/operational/org-openroadm-service:service-list/services/service1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -337,9 +282,8 @@ class TransportPCEFulltesting(unittest.TestCase): "node/ROADMA01/yang-ext:" "mount/org-openroadm-device:org-openroadm-device/" "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -367,9 +311,8 @@ class TransportPCEFulltesting(unittest.TestCase): "node/ROADMC01/yang-ext:mount/org-openroadm-device:" "org-openroadm-device/" "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -391,12 +334,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(5) def test_15_check_topo_XPDRA(self): - url1 = ( - "{}/config/ietf-network:" - "networks/network/openroadm-topology/node/XPDRA01-XPDR1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/XPDRA01-XPDR1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() liste_tp = res['node'][0]['ietf-network-topology:termination-point'] @@ -415,12 +354,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(3) def test_16_check_topo_ROADMA_SRG1(self): - url1 = ( - "{}/config/ietf-network:" - "networks/network/openroadm-topology/node/ROADMA01-SRG1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-SRG1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn({u'index': 1}, @@ -439,12 +374,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(3) def test_17_check_topo_ROADMA_DEG1(self): - url1 = ( - "{}/config/ietf-network:" - "networks/network/openroadm-topology/node/ROADMA01-DEG1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-DEG1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn({u'index': 1}, @@ -467,23 +398,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(3) def test_18_connect_xprdA_N2_to_roadmA_PP2(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".\ - format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDRA01", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "2", - "networkutils:rdm-node": "ROADMA01", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP2-TXRX" - } - } - } - 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.connect_xpdr_to_rdm_request("XPDRA01", "1", "2", + "ROADMA01", "1", "SRG1-PP2-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Xponder Roadm Link created successfully', @@ -491,23 +407,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_19_connect_roadmA_PP2_to_xpdrA_N2(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".\ - format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDRA01", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "2", - "networkutils:rdm-node": "ROADMA01", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP2-TXRX" - } - } - } - 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.connect_rdm_to_xpdr_request("XPDRA01", "1", "2", + "ROADMA01", "1", "SRG1-PP2-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm Xponder links created successfully', @@ -515,23 +416,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_20_connect_xprdC_N2_to_roadmC_PP2(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".\ - format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDRC01", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "2", - "networkutils:rdm-node": "ROADMC01", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP2-TXRX" - } - } - } - 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.connect_xpdr_to_rdm_request("XPDRC01", "1", "2", + "ROADMC01", "1", "SRG1-PP2-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Xponder Roadm Link created successfully', @@ -539,23 +425,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_21_connect_roadmC_PP2_to_xpdrC_N2(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".\ - format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDRC01", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "2", - "networkutils:rdm-node": "ROADMC01", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP2-TXRX" - } - } - } - 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.connect_rdm_to_xpdr_request("XPDRC01", "1", "2", + "ROADMC01", "1", "SRG1-PP2-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm Xponder links created successfully', @@ -563,8 +434,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_22_create_eth_service2(self): - url = ("{}/operations/org-openroadm-service:service-create" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-create" data = { "input": { "sdnc-request-header": { @@ -663,9 +533,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -674,11 +542,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(self.WAITING) def test_23_get_eth_service2(self): - url = ("{}/operational/org-openroadm-service:" - "service-list/services/service2" - .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)) + url = "{}/operational/org-openroadm-service:service-list/services/service2" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -699,9 +564,8 @@ class TransportPCEFulltesting(unittest.TestCase): "node/ROADMA01/yang-ext:" "mount/org-openroadm-device:org-openroadm-device/" "roadm-connections/DEG1-TTP-TXRX-SRG1-PP2-TXRX-2" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -721,12 +585,8 @@ class TransportPCEFulltesting(unittest.TestCase): res['roadm-connections'][0]['destination']) def test_25_check_topo_XPDRA(self): - url1 = ( - "{}/config/ietf-network:" - "networks/network/openroadm-topology/node/XPDRA01-XPDR1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/XPDRA01-XPDR1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() liste_tp = res['node'][0]['ietf-network-topology:termination-point'] @@ -749,12 +609,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(10) def test_26_check_topo_ROADMA_SRG1(self): - url1 = ( - "{}/config/ietf-network:" - "networks/network/openroadm-topology/node/ROADMA01-SRG1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-SRG1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn({u'index': 1}, res['node'][0][ @@ -787,12 +643,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(10) def test_27_check_topo_ROADMA_DEG1(self): - url1 = ( - "{}/config/ietf-network:" - "networks/network/openroadm-topology/node/ROADMA01-DEG1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-DEG1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn({u'index': 1}, res['node'][0][ @@ -821,8 +673,7 @@ class TransportPCEFulltesting(unittest.TestCase): # creation service test on a non-available resource def test_28_create_eth_service3(self): - url = ("{}/operations/org-openroadm-service:service-create" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-create" data = { "input": { "sdnc-request-header": { @@ -921,9 +772,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -937,8 +786,7 @@ class TransportPCEFulltesting(unittest.TestCase): # contains 2 elements def test_29_delete_eth_service3(self): - url = ("{}/operations/org-openroadm-service:service-delete" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -953,9 +801,7 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Service \'service3\' does not exist in datastore', @@ -966,8 +812,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(20) def test_30_delete_eth_service1(self): - url = ("{}/operations/org-openroadm-service:service-delete" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -982,9 +827,7 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Renderer service delete in progress', @@ -993,8 +836,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(20) def test_31_delete_eth_service2(self): - url = ("{}/operations/org-openroadm-service:service-delete" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1009,9 +851,7 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Renderer service delete in progress', @@ -1025,9 +865,8 @@ class TransportPCEFulltesting(unittest.TestCase): "network-topology/topology/topology-netconf/" "node/ROADMA01/yang-ext:" "mount/org-openroadm-device:org-openroadm-device/" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) res = response.json() self.assertEqual(response.status_code, requests.codes.ok) self.assertNotIn('roadm-connections', @@ -1035,12 +874,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_33_check_topo_XPDRA(self): - url1 = ( - "{}/config/ietf-network:" - "networks/network/openroadm-topology/node/XPDRA01-XPDR1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/XPDRA01-XPDR1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() liste_tp = res['node'][0]['ietf-network-topology:termination-point'] @@ -1063,12 +898,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(10) def test_34_check_topo_ROADMA_SRG1(self): - url1 = ( - "{}/config/ietf-network:" - "networks/network/openroadm-topology/node/ROADMA01-SRG1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-SRG1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn({u'index': 1}, res['node'][0][ @@ -1089,12 +920,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(10) def test_35_check_topo_ROADMA_DEG1(self): - url1 = ( - "{}/config/ietf-network:" - "networks/network/openroadm-topology/node/ROADMA01-DEG1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-DEG1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn({u'index': 1}, res['node'][0][ @@ -1115,8 +942,7 @@ class TransportPCEFulltesting(unittest.TestCase): # test service-create for Optical Channel (OC) service from srg-pp to srg-pp def test_36_create_oc_service1(self): - url = ("{}/operations/org-openroadm-service:service-create" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-create" data = { "input": { "sdnc-request-header": { @@ -1215,9 +1041,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -1226,11 +1050,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(self.WAITING) def test_37_get_oc_service1(self): - url = ("{}/operational/org-openroadm-service:" - "service-list/services/service1" - .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)) + url = "{}/operational/org-openroadm-service:service-list/services/service1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -1251,9 +1072,8 @@ class TransportPCEFulltesting(unittest.TestCase): "node/ROADMA01/yang-ext:" "mount/org-openroadm-device:org-openroadm-device/" "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -1281,9 +1101,8 @@ class TransportPCEFulltesting(unittest.TestCase): "node/ROADMC01/yang-ext:mount/org-openroadm-device:" "org-openroadm-device/" "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -1305,8 +1124,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(7) def test_40_create_oc_service2(self): - url = ("{}/operations/org-openroadm-service:service-create" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-create" data = { "input": { "sdnc-request-header": { @@ -1405,9 +1223,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -1416,11 +1232,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(self.WAITING) def test_41_get_oc_service2(self): - url = ("{}/operational/org-openroadm-service:" - "service-list/services/service2" - .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)) + url = "{}/operational/org-openroadm-service:service-list/services/service2" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -1441,9 +1254,8 @@ class TransportPCEFulltesting(unittest.TestCase): "node/ROADMA01/yang-ext:mount/org-openroadm-device:" "org-openroadm-device/" "roadm-connections/SRG1-PP2-TXRX-DEG1-TTP-TXRX-2" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -1470,8 +1282,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(3) def test_44_delete_oc_service1(self): - url = ("{}/operations/org-openroadm-service:service-delete" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1486,9 +1297,7 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Renderer service delete in progress', @@ -1497,8 +1306,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(20) def test_45_delete_oc_service2(self): - url = ("{}/operations/org-openroadm-service:service-delete" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1513,9 +1321,7 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Renderer service delete in progress', @@ -1526,9 +1332,8 @@ class TransportPCEFulltesting(unittest.TestCase): def test_46_get_no_oc_services(self): print("start test") url = ("{}/operational/org-openroadm-service:service-list" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -1548,9 +1353,8 @@ class TransportPCEFulltesting(unittest.TestCase): "network-topology/topology/topology-netconf" "/node/ROADMA01/yang-ext:mount/org-openroadm-device:" "org-openroadm-device/" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn(['roadm-connections'][0], res['org-openroadm-device']) @@ -1573,13 +1377,11 @@ class TransportPCEFulltesting(unittest.TestCase): self.test_30_delete_eth_service1() def test_50_loop_create_oc_service(self): - url = ("{}/operational/org-openroadm-service:" - "service-list/services/service1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request("GET", url, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + 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" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1594,10 +1396,7 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - requests.request("POST", url, data=json.dumps(data), - headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD) - ) + test_utils.post_request(url, data) time.sleep(5) for i in range(1, 6): diff --git a/tests/transportpce_tests/1.2.1/test_gnpy.py b/tests/transportpce_tests/1.2.1/test_gnpy.py index 26ab184b9..111d8d892 100644 --- a/tests/transportpce_tests/1.2.1/test_gnpy.py +++ b/tests/transportpce_tests/1.2.1/test_gnpy.py @@ -41,49 +41,40 @@ class TransportGNPYtesting(unittest.TestCase): # Mount the different topologies def test_01_connect_clliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/config/ietf-network:networks/network/clli-network" topo_cllinet_file = "sample_configs/gnpy/clliNetwork.json" if os.path.isfile(topo_cllinet_file): with open(topo_cllinet_file, 'r') as clli_net: - body = clli_net.read() - response = requests.request( - "PUT", url, data=body, headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + data = clli_net.read() + #TODO : review this os specific path and treat error with an else-statement + response = test_utils.rawput_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) time.sleep(3) def test_02_connect_openroadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/config/ietf-network:networks/network/openroadm-network" topo_ordnet_file = "sample_configs/gnpy/openroadmNetwork.json" if os.path.isfile(topo_ordnet_file): with open(topo_ordnet_file, 'r') as ord_net: - body = ord_net.read() - response = requests.request( - "PUT", url, data=body, headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + data = ord_net.read() + response = test_utils.rawput_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) time.sleep(3) def test_03_connect_openroadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" topo_ordtopo_file = "sample_configs/gnpy/openroadmTopology.json" if os.path.isfile(topo_ordtopo_file): with open(topo_ordtopo_file, 'r') as ord_topo: - body = ord_topo.read() - response = requests.request( - "PUT", url, data=body, headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + data = ord_topo.read() + response = test_utils.rawput_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) time.sleep(3) # Path computed by PCE is feasible according to Gnpy def test_04_path_computation_FeasibleWithPCE(self): - url = ("{}/operations/transportpce-pce:path-computation-request" - .format(test_utils.RESTCONF_BASE_URL)) - body = { + url = "{}/operations/transportpce-pce:path-computation-request" + data = { "input": { "service-name": "service-1", "resource-reserve": "true", @@ -105,9 +96,7 @@ class TransportGNPYtesting(unittest.TestCase): } } } - response = requests.request( - "POST", url, data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['output']['configuration-response-common'][ @@ -126,9 +115,8 @@ class TransportGNPYtesting(unittest.TestCase): # Path computed by PCE is not feasible by GNPy and GNPy cannot find # another one (low SNR) def test_05_path_computation_FoundByPCE_NotFeasibleByGnpy(self): - url = ("{}/operations/transportpce-pce:path-computation-request" - .format(test_utils.RESTCONF_BASE_URL)) - body = { + url = "{}/operations/transportpce-pce:path-computation-request" + data = { "input": { "service-name": "service-2", "resource-reserve": "true", @@ -174,9 +162,7 @@ class TransportGNPYtesting(unittest.TestCase): } } } - response = requests.request( - "POST", url, data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['output']['configuration-response-common'][ @@ -196,9 +182,8 @@ class TransportGNPYtesting(unittest.TestCase): # #PCE cannot find a path while GNPy finds a feasible one def test_06_path_computation_NotFoundByPCE_FoundByGNPy(self): - url = ("{}/operations/transportpce-pce:path-computation-request" - .format(test_utils.RESTCONF_BASE_URL)) - body = { + url = "{}/operations/transportpce-pce:path-computation-request" + data = { "input": { "service-name": "service-3", "resource-reserve": "true", @@ -238,9 +223,7 @@ class TransportGNPYtesting(unittest.TestCase): } } } - response = requests.request( - "POST", url, data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['output']['configuration-response-common'][ @@ -258,9 +241,8 @@ class TransportGNPYtesting(unittest.TestCase): # Not found path by PCE and GNPy cannot find another one def test_07_path_computation_FoundByPCE_NotFeasibleByGnpy(self): - url = ("{}/operations/transportpce-pce:path-computation-request" - .format(test_utils.RESTCONF_BASE_URL)) - body = { + url = "{}/operations/transportpce-pce:path-computation-request" + data = { "input": { "service-name": "service-4", "resource-reserve": "true", @@ -312,9 +294,7 @@ class TransportGNPYtesting(unittest.TestCase): } } } - response = requests.request( - "POST", url, data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['output']['configuration-response-common'][ @@ -326,32 +306,20 @@ class TransportGNPYtesting(unittest.TestCase): # Disconnect the different topologies def test_08_disconnect_openroadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .format(test_utils.RESTCONF_BASE_URL)) - data = {} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.delete_request(url) self.assertEqual(response.status_code, requests.codes.ok) time.sleep(3) def test_09_disconnect_openroadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .format(test_utils.RESTCONF_BASE_URL)) - data = {} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-network" + response = test_utils.delete_request(url) self.assertEqual(response.status_code, requests.codes.ok) time.sleep(3) def test_10_disconnect_clliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .format(test_utils.RESTCONF_BASE_URL)) - data = {} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/clli-network" + response = test_utils.delete_request(url) self.assertEqual(response.status_code, requests.codes.ok) time.sleep(3) diff --git a/tests/transportpce_tests/1.2.1/test_olm.py b/tests/transportpce_tests/1.2.1/test_olm.py index 6f32b83a5..bba76a072 100644 --- a/tests/transportpce_tests/1.2.1/test_olm.py +++ b/tests/transportpce_tests/1.2.1/test_olm.py @@ -12,7 +12,6 @@ import unittest import time import json -#from unittest.result import failfast import requests from common import test_utils @@ -53,123 +52,63 @@ class TransportOlmTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_05_connect_xprdA_to_roadmA(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDRA01", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADMA01", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - 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.connect_xpdr_to_rdm_request("XPDRA01", "1", "1", + "ROADMA01", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) def test_06_connect_roadmA_to_xpdrA(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDRA01", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADMA01", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - 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.connect_rdm_to_xpdr_request("XPDRA01", "1", "1", + "ROADMA01", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) def test_07_connect_xprdC_to_roadmC(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDRC01", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADMC01", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - 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.connect_xpdr_to_rdm_request("XPDRC01", "1", "1", + "ROADMC01", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) def test_08_connect_roadmC_to_xpdrC(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDRC01", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADMC01", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - 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.connect_rdm_to_xpdr_request("XPDRC01", "1", "1", + "ROADMC01", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) def test_09_create_OTS_ROADMA(self): - url = "{}/operations/transportpce-device-renderer:create-ots-oms".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:create-ots-oms" data = { "input": { "node-id": "ROADMA01", "logical-connection-point": "DEG1-TTP-TXRX" } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Interfaces OTS-DEG1-TTP-TXRX - OMS-DEG1-TTP-TXRX successfully created on node ROADMA01', res["output"]["result"]) def test_10_create_OTS_ROADMC(self): - url = "{}/operations/transportpce-device-renderer:create-ots-oms".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:create-ots-oms" data = { "input": { "node-id": "ROADMC01", "logical-connection-point": "DEG2-TTP-TXRX" } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Interfaces OTS-DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX successfully created on node ROADMC01', res["output"]["result"]) def test_11_get_PM_ROADMA(self): - url = "{}/operations/transportpce-olm:get-pm".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-olm:get-pm" data = { "input": { "node-id": "ROADMA01", @@ -180,9 +119,7 @@ class TransportOlmTesting(unittest.TestCase): } } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn({ @@ -199,7 +136,7 @@ class TransportOlmTesting(unittest.TestCase): }, res["output"]["measurements"]) def test_12_get_PM_ROADMC(self): - url = "{}/operations/transportpce-olm:get-pm".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-olm:get-pm" data = { "input": { "node-id": "ROADMC01", @@ -210,9 +147,7 @@ class TransportOlmTesting(unittest.TestCase): } } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn({ @@ -229,16 +164,14 @@ class TransportOlmTesting(unittest.TestCase): }, res["output"]["measurements"]) def test_13_calculate_span_loss_base_ROADMA_ROADMC(self): - url = "{}/operations/transportpce-olm:calculate-spanloss-base".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-olm:calculate-spanloss-base" data = { "input": { "src-type": "link", "link-id": "ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX" } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', @@ -250,15 +183,13 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(5) def test_14_calculate_span_loss_base_all(self): - url = "{}/operations/transportpce-olm:calculate-spanloss-base".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-olm:calculate-spanloss-base" data = { "input": { "src-type": "all" } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', @@ -276,9 +207,8 @@ class TransportOlmTesting(unittest.TestCase): 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".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)) + "org-openroadm-optical-transport-interfaces:ots") + response = test_utils.get_request(url) 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']) @@ -287,16 +217,15 @@ class TransportOlmTesting(unittest.TestCase): 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".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)) + "org-openroadm-optical-transport-interfaces:ots") + response = test_utils.get_request(url) 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']) self.assertEqual(5.7, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']) def test_17_servicePath_create_AToZ(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = { "input": { "service-name": "test", @@ -327,9 +256,7 @@ class TransportOlmTesting(unittest.TestCase): ] } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"]) @@ -337,7 +264,7 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(10) def test_18_servicePath_create_ZToA(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = { "input": { "service-name": "test", @@ -368,9 +295,7 @@ class TransportOlmTesting(unittest.TestCase): ] } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"]) @@ -378,7 +303,7 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(10) def test_19_service_power_setup_XPDRA_XPDRC(self): - url = "{}/operations/transportpce-olm:service-power-setup".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-olm:service-power-setup" data = { "input": { "service-name": "test", @@ -407,9 +332,7 @@ class TransportOlmTesting(unittest.TestCase): ] } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', res["output"]["result"]) @@ -417,9 +340,8 @@ class TransportOlmTesting(unittest.TestCase): 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".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)) + "org-openroadm-optical-channel-interfaces:och") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(0, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) @@ -428,9 +350,8 @@ class TransportOlmTesting(unittest.TestCase): 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".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)) + "SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("gainLoss", res['roadm-connections'][0]['opticalControlMode']) @@ -439,15 +360,14 @@ class TransportOlmTesting(unittest.TestCase): 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".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)) + "DEG2-TTP-TXRX-SRG1-PP1-TXRX-1") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("power", res['roadm-connections'][0]['opticalControlMode']) def test_23_service_power_setup_XPDRC_XPDRA(self): - url = "{}/operations/transportpce-olm:service-power-setup".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-olm:service-power-setup" data = { "input": { "service-name": "test", @@ -476,9 +396,7 @@ class TransportOlmTesting(unittest.TestCase): ] } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', res["output"]["result"]) @@ -486,9 +404,8 @@ class TransportOlmTesting(unittest.TestCase): 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".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)) + "org-openroadm-optical-channel-interfaces:och") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(0, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) @@ -497,16 +414,15 @@ class TransportOlmTesting(unittest.TestCase): 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".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)) + "SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("gainLoss", res['roadm-connections'][0]['opticalControlMode']) self.assertEqual(2, res['roadm-connections'][0]['target-output-power']) def test_26_service_power_turndown_XPDRA_XPDRC(self): - url = "{}/operations/transportpce-olm:service-power-turndown".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-olm:service-power-turndown" data = { "input": { "service-name": "test", @@ -535,9 +451,7 @@ class TransportOlmTesting(unittest.TestCase): ] } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', res["output"]["result"]) @@ -545,9 +459,8 @@ class TransportOlmTesting(unittest.TestCase): 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".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)) + "SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("off", res['roadm-connections'][0]['opticalControlMode']) @@ -556,15 +469,14 @@ class TransportOlmTesting(unittest.TestCase): 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".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)) + "DEG2-TTP-TXRX-SRG1-PP1-TXRX-1") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("off", res['roadm-connections'][0]['opticalControlMode']) def test_29_servicePath_delete_AToZ(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = { "input": { "service-name": "test", @@ -595,16 +507,14 @@ class TransportOlmTesting(unittest.TestCase): ] } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Request processed', res["output"]["result"]) time.sleep(10) def test_30_servicePath_delete_ZToA(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = { "input": { "service-name": "test", @@ -635,9 +545,7 @@ class TransportOlmTesting(unittest.TestCase): ] } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Request processed', res["output"]["result"]) @@ -646,49 +554,21 @@ class TransportOlmTesting(unittest.TestCase): """to test case where SRG where the xpdr is connected to has no optical range data""" def test_31_connect_xprdA_to_roadmA(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDRA01", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "2", - "networkutils:rdm-node": "ROADMA01", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP2-TXRX" - } - } - } - 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.connect_xpdr_to_rdm_request("XPDRA01", "1", "2", + "ROADMA01", "1", "SRG1-PP2-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) def test_32_connect_roadmA_to_xpdrA(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDRA01", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "2", - "networkutils:rdm-node": "ROADMA01", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP2-TXRX" - } - } - } - 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.connect_rdm_to_xpdr_request("XPDRA01", "1", "2", + "ROADMA01", "1", "SRG1-PP2-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) def test_33_servicePath_create_AToZ(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = { "input": { "service-name": "test2", @@ -709,9 +589,7 @@ class TransportOlmTesting(unittest.TestCase): ] } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"]) @@ -721,16 +599,15 @@ class TransportOlmTesting(unittest.TestCase): 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".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)) + "org-openroadm-optical-channel-interfaces:och") + response = test_utils.get_request(url) 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(2, res['org-openroadm-optical-channel-interfaces:och']['wavelength-number']) def test_35_servicePath_delete_AToZ(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = { "input": { "service-name": "test", @@ -751,9 +628,7 @@ class TransportOlmTesting(unittest.TestCase): ] } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Request processed', res["output"]["result"]) @@ -768,9 +643,8 @@ class TransportOlmTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) def test_38_calculate_span_loss_current(self): - url = "{}/operations/transportpce-olm:calculate-spanloss-current".format(test_utils.RESTCONF_BASE_URL) - response = requests.request( - "POST", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/operations/transportpce-olm:calculate-spanloss-current" + response = test_utils.post_request(url, None) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', diff --git a/tests/transportpce_tests/1.2.1/test_pce.py b/tests/transportpce_tests/1.2.1/test_pce.py index c33af419a..a1b35323b 100644 --- a/tests/transportpce_tests/1.2.1/test_pce.py +++ b/tests/transportpce_tests/1.2.1/test_pce.py @@ -58,21 +58,16 @@ class TransportPCEtesting(unittest.TestCase): # Load simple bidirectional topology def test_01_load_simple_topology_bi(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .format(test_utils.RESTCONF_BASE_URL)) - body = self.simple_topo_bi_dir_data - response = requests.request( - "PUT", url, data=body, headers=test_utils.TYPE_APPLICATION_XML, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + data = self.simple_topo_bi_dir_data + response = test_utils.put_xmlrequest(url, data) self.assertEqual(response.status_code, requests.codes.ok) time.sleep(2) # Get existing nodeId def test_02_get_nodeId(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-SRG1" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-SRG1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -81,10 +76,8 @@ class TransportPCEtesting(unittest.TestCase): # Get existing linkId def test_03_get_linkId(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology/link/XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/link/XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -94,9 +87,8 @@ class TransportPCEtesting(unittest.TestCase): # Path Computation success def test_04_path_computation_xpdr_bi(self): - url = ("{}/operations/transportpce-pce:path-computation-request" - .format(test_utils.RESTCONF_BASE_URL)) - body = {"input": { + url = "{}/operations/transportpce-pce:path-computation-request" + data = {"input": { "service-name": "service-1", "resource-reserve": "true", "pce-metric": "hop-count", @@ -117,9 +109,7 @@ class TransportPCEtesting(unittest.TestCase): } } } - response = requests.request( - "POST", url, data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -128,9 +118,8 @@ class TransportPCEtesting(unittest.TestCase): # Path Computation success def test_05_path_computation_rdm_bi(self): - url = ("{}/operations/transportpce-pce:path-computation-request" - .format(test_utils.RESTCONF_BASE_URL)) - body = {"input": { + url = "{}/operations/transportpce-pce:path-computation-request" + data = {"input": { "service-name": "service-1", "resource-reserve": "true", "pce-metric": "hop-count", @@ -151,9 +140,7 @@ class TransportPCEtesting(unittest.TestCase): } } } - response = requests.request( - "POST", url, data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -162,39 +149,30 @@ class TransportPCEtesting(unittest.TestCase): # Delete topology def test_06_delete_simple_topology_bi(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "DELETE", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.delete_request(url) self.assertEqual(response.status_code, requests.codes.ok) time.sleep(2) # Test deleted topology def test_07_test_topology_simple_bi_deleted(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-SRG1" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-SRG1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, 404) time.sleep(1) # Load simple bidirectional topology def test_08_load_simple_topology_uni(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .format(test_utils.RESTCONF_BASE_URL)) - body = self.simple_topo_uni_dir_data - response = requests.request( - "PUT", url, data=body, headers=test_utils.TYPE_APPLICATION_XML, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + data = self.simple_topo_uni_dir_data + response = test_utils.put_xmlrequest(url, data) self.assertEqual(response.status_code, 201) time.sleep(2) # Get existing nodeId def test_09_get_nodeId(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPONDER-1-2" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/XPONDER-1-2" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -204,10 +182,8 @@ class TransportPCEtesting(unittest.TestCase): # Get existing linkId def test_10_get_linkId(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology/link/XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/link/XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -217,9 +193,8 @@ class TransportPCEtesting(unittest.TestCase): # Path Computation success def test_11_path_computation_xpdr_uni(self): - url = ("{}/operations/transportpce-pce:path-computation-request" - .format(test_utils.RESTCONF_BASE_URL)) - body = {"input": { + url = "{}/operations/transportpce-pce:path-computation-request" + data = {"input": { "service-name": "service-1", "resource-reserve": "true", "pce-metric": "hop-count", @@ -240,9 +215,7 @@ class TransportPCEtesting(unittest.TestCase): } } } - response = requests.request( - "POST", url, data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -251,9 +224,8 @@ class TransportPCEtesting(unittest.TestCase): # Path Computation success def test_12_path_computation_rdm_uni(self): - url = ("{}/operations/transportpce-pce:path-computation-request" - .format(test_utils.RESTCONF_BASE_URL)) - body = {"input": { + url = "{}/operations/transportpce-pce:path-computation-request" + data = {"input": { "service-name": "service1", "resource-reserve": "true", "service-handler-header": { @@ -274,9 +246,7 @@ class TransportPCEtesting(unittest.TestCase): "pce-metric": "hop-count" } } - response = requests.request( - "POST", url, data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -297,39 +267,30 @@ class TransportPCEtesting(unittest.TestCase): # Delete topology def test_13_delete_simple_topology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "DELETE", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.delete_request(url) self.assertEqual(response.status_code, requests.codes.ok) time.sleep(2) # Test deleted topology def test_14_test_topology_simple_deleted(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPONDER-1-2" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/XPONDER-1-2" + response = test_utils.get_request(url) self.assertEqual(response.status_code, 404) time.sleep(1) # Load complex topology def test_15_load_complex_topology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .format(test_utils.RESTCONF_BASE_URL)) - body = self.complex_topo_uni_dir_data - response = requests.request( - "PUT", url, data=body, headers=test_utils.TYPE_APPLICATION_XML, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + data = self.complex_topo_uni_dir_data + response = test_utils.put_xmlrequest(url, data) self.assertEqual(response.status_code, 201) time.sleep(2) # Get existing nodeId def test_16_get_nodeId(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPONDER-3-2" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/XPONDER-3-2" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -339,17 +300,14 @@ class TransportPCEtesting(unittest.TestCase): # Test failed path computation def test_17_fail_path_computation(self): - url = ("{}/operations/transportpce-pce:path-computation-request" - .format(test_utils.RESTCONF_BASE_URL)) - body = {"input": { + url = "{}/operations/transportpce-pce:path-computation-request" + data = {"input": { "service-handler-header": { "request-id": "request-1" } } } - response = requests.request( - "POST", url, data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Service Name is not set', @@ -358,9 +316,8 @@ class TransportPCEtesting(unittest.TestCase): # Test1 success path computation def test_18_success1_path_computation(self): - url = ("{}/operations/transportpce-pce:path-computation-request" - .format(test_utils.RESTCONF_BASE_URL)) - body = {"input": { + url = "{}/operations/transportpce-pce:path-computation-request" + data = {"input": { "service-name": "service1", "resource-reserve": "true", "service-handler-header": { @@ -446,9 +403,7 @@ class TransportPCEtesting(unittest.TestCase): "locally-protected-links": "true" } } - response = requests.request( - "POST", url, data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -457,9 +412,8 @@ class TransportPCEtesting(unittest.TestCase): # Test2 success path computation with path description def test_19_success2_path_computation(self): - url = ("{}/operations/transportpce-pce:path-computation-request" - .format(test_utils.RESTCONF_BASE_URL)) - body = {"input": { + url = "{}/operations/transportpce-pce:path-computation-request" + data = {"input": { "service-name": "service 1", "resource-reserve": "true", "service-handler-header": { @@ -480,9 +434,7 @@ class TransportPCEtesting(unittest.TestCase): "pce-metric": "hop-count" } } - response = requests.request( - "POST", url, data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -495,9 +447,8 @@ class TransportPCEtesting(unittest.TestCase): # Test3 success path computation with hard-constraints exclude def test_20_success3_path_computation(self): - url = ("{}/operations/transportpce-pce:path-computation-request" - .format(test_utils.RESTCONF_BASE_URL)) - body = {"input": { + url = "{}/operations/transportpce-pce:path-computation-request" + data = {"input": { "service-name": "service 1", "resource-reserve": "true", "service-handler-header": { @@ -523,9 +474,7 @@ class TransportPCEtesting(unittest.TestCase): "pce-metric": "hop-count" } } - response = requests.request( - "POST", url, data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -538,9 +487,8 @@ class TransportPCEtesting(unittest.TestCase): # Path computation before deleting oms-attribute of the link :openroadm1-3 to openroadm1-2 def test_21_path_computation_before_oms_attribute_deletion(self): - url = ("{}/operations/transportpce-pce:path-computation-request" - .format(test_utils.RESTCONF_BASE_URL)) - body = {"input": { + url = "{}/operations/transportpce-pce:path-computation-request" + data = {"input": { "service-name": "service 1", "resource-reserve": "true", "service-handler-header": { @@ -561,9 +509,7 @@ class TransportPCEtesting(unittest.TestCase): "pce-metric": "hop-count" } } - response = requests.request( - "POST", url, data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -584,17 +530,15 @@ class TransportPCEtesting(unittest.TestCase): def test_22_delete_oms_attribute_in_openroadm13toopenroadm12_link(self): url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:link/" "OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2/org-openroadm-network-topology:OMS-attributes/span" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "DELETE", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.delete_request(url) self.assertEqual(response.status_code, requests.codes.ok) time.sleep(2) # Path computation after deleting oms-attribute of the link :openroadm1-3 to openroadm1-2 def test_23_path_computation_after_oms_attribute_deletion(self): - url = ("{}/operations/transportpce-pce:path-computation-request" - .format(test_utils.RESTCONF_BASE_URL)) - body = {"input": { + url = "{}/operations/transportpce-pce:path-computation-request" + data = {"input": { "service-name": "service 1", "resource-reserve": "true", "service-handler-header": { @@ -615,9 +559,7 @@ class TransportPCEtesting(unittest.TestCase): "pce-metric": "hop-count" } } - response = requests.request( - "POST", url, data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -636,19 +578,15 @@ class TransportPCEtesting(unittest.TestCase): # Delete complex topology def test_24_delete_complex_topology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "DELETE", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.delete_request(url) self.assertEqual(response.status_code, requests.codes.ok) time.sleep(2) # Test deleted complex topology def test_25_test_topology_complex_deleted(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPONDER-3-2" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/XPONDER-3-2" + response = test_utils.get_request(url) self.assertEqual(response.status_code, 404) time.sleep(1) diff --git a/tests/transportpce_tests/1.2.1/test_portmapping.py b/tests/transportpce_tests/1.2.1/test_portmapping.py index 3f78d5aea..2c992342e 100644 --- a/tests/transportpce_tests/1.2.1/test_portmapping.py +++ b/tests/transportpce_tests/1.2.1/test_portmapping.py @@ -36,7 +36,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): # def test_01_restconfAPI(self): # url = ("{}/operational/network-topology:network-topology/topology/" -# "topology-netconf/node/controller-config".format(test_utils.RESTCONF_BASE_URL)) +# "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() @@ -44,7 +44,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): # 'connected') # def test_02_restconfAPI(self): -# url = ("{}/config/transportpce-portmapping:network/nodes/controller-config".format(test_utils.RESTCONF_BASE_URL)) +# url = ("{}/config/transportpce-portmapping:network/nodes/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.not_found) @@ -61,9 +61,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): def test_02_rdm_device_connected(self): url = ("{}/operational/network-topology:" "network-topology/topology/topology-netconf/node/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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -74,9 +73,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): def test_03_rdm_portmapping_info(self): url = ("{}/config/transportpce-portmapping:network/" "nodes/ROADMA01/node-info" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -91,9 +89,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): def test_04_rdm_portmapping_DEG1_TTP_TXRX(self): url = ("{}/config/transportpce-portmapping:network/" "nodes/ROADMA01/mapping/DEG1-TTP-TXRX" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -104,9 +101,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): def test_05_rdm_portmapping_SRG1_PP7_TXRX(self): url = ("{}/config/transportpce-portmapping:network/" "nodes/ROADMA01/mapping/SRG1-PP7-TXRX" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -117,9 +113,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): def test_06_rdm_portmapping_SRG3_PP1_TXRX(self): url = ("{}/config/transportpce-portmapping:network/" "nodes/ROADMA01/mapping/SRG3-PP1-TXRX" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -134,9 +129,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): def test_08_xpdr_device_connected(self): url = ("{}/operational/network-topology:" "network-topology/topology/topology-netconf/node/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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -147,9 +141,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): def test_09_xpdr_portmapping_info(self): url = ("{}/config/transportpce-portmapping:network/" "nodes/XPDRA01/node-info" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -164,9 +157,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): def test_10_xpdr_portmapping_NETWORK1(self): url = ("{}/config/transportpce-portmapping:network/" "nodes/XPDRA01/mapping/XPDR1-NETWORK1" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -179,9 +171,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): def test_11_xpdr_portmapping_NETWORK2(self): url = ("{}/config/transportpce-portmapping:network/" "nodes/XPDRA01/mapping/XPDR1-NETWORK2" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -194,9 +185,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): def test_12_xpdr_portmapping_CLIENT1(self): url = ("{}/config/transportpce-portmapping:network/" "nodes/XPDRA01/mapping/XPDR1-CLIENT1" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -210,9 +200,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): def test_13_xpdr_portmapping_CLIENT2(self): url = ("{}/config/transportpce-portmapping:network/" "nodes/XPDRA01/mapping/XPDR1-CLIENT2" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -226,9 +215,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): def test_14_xpdr_portmapping_CLIENT3(self): url = ("{}/config/transportpce-portmapping:network/" "nodes/XPDRA01/mapping/XPDR1-CLIENT3" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -242,9 +230,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): def test_15_xpdr_portmapping_CLIENT4(self): url = ("{}/config/transportpce-portmapping:network/" "nodes/XPDRA01/mapping/XPDR1-CLIENT4" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -260,9 +247,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): def test_17_xpdr_device_disconnected(self): url = ("{}/operational/network-topology:network-topology/topology/" - "topology-netconf/node/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)) + "topology-netconf/node/XPDRA01") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -271,9 +257,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): res['errors']['error']) def test_18_xpdr_device_not_connected(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)) + url = ("{}/config/transportpce-portmapping:network/nodes/XPDRA01") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -287,9 +272,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): def test_20_rdm_device_disconnected(self): url = ("{}/operational/network-topology:network-topology/topology/topology-netconf/node/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.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -298,9 +282,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): res['errors']['error']) def test_21_rdm_device_not_connected(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)) + url = ("{}/config/transportpce-portmapping:network/nodes/ROADMA01") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( 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 4132801a4..9fbc51cd6 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 @@ -12,7 +12,6 @@ import unittest import json import time -#from unittest.result import failfast import requests from common import test_utils @@ -47,9 +46,8 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -64,9 +62,8 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -84,7 +81,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['nodes'][0]['mapping']) def test_05_service_path_create(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = {"renderer:input": { "renderer:service-name": "service_test", "renderer:wave-number": "7", @@ -97,9 +94,7 @@ class TransportPCERendererTesting(unittest.TestCase): {"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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes: ROADMA01', res["output"]["result"]) @@ -108,9 +103,8 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -132,9 +126,8 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -156,9 +149,8 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -181,9 +173,8 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -208,9 +199,8 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -234,9 +224,8 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the 2 following statements replace self.assertDictContainsSubset deprecated in python 3.2 @@ -265,9 +254,8 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -293,15 +281,14 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) 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) + url = "{}/operations/transportpce-device-renderer:service-path" data = {"renderer:input": { "renderer:service-name": "service_test", "renderer:wave-number": "7", @@ -313,9 +300,7 @@ class TransportPCERendererTesting(unittest.TestCase): {"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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) self.assertEqual(response.json(), { 'output': {'result': 'Request processed', 'success': True}}) @@ -324,9 +309,8 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -338,9 +322,8 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -352,9 +335,8 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -366,9 +348,8 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -380,9 +361,8 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -394,9 +374,8 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -408,9 +387,8 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -422,9 +400,8 @@ class TransportPCERendererTesting(unittest.TestCase): 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.get_request(url) 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/1.2.1/test_topoPortMapping.py b/tests/transportpce_tests/1.2.1/test_topoPortMapping.py index 712dfe179..576999ac4 100644 --- a/tests/transportpce_tests/1.2.1/test_topoPortMapping.py +++ b/tests/transportpce_tests/1.2.1/test_topoPortMapping.py @@ -40,10 +40,8 @@ class TransportPCEtesting(unittest.TestCase): # Verify the termination points of the ROADMA def test_02_compareOpenroadmTopologyPortMapping_rdm(self): - urlTopo = ("{}/config/ietf-network:networks/network/openroadm-topology" - .format(test_utils.RESTCONF_BASE_URL)) - responseTopo = requests.request("GET", urlTopo, headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + urlTopo = "{}/config/ietf-network:networks/network/openroadm-topology" + responseTopo = test_utils.get_request(urlTopo) resTopo = responseTopo.json() nbNode = len(resTopo['network'][0]['node']) nbMapCumul = 0 @@ -52,11 +50,8 @@ class TransportPCEtesting(unittest.TestCase): nodeId = resTopo['network'][0]['node'][i]['node-id'] nodeMapId = nodeId.split("-")[0] urlMapList = "{}/config/transportpce-portmapping:network/nodes/" + nodeMapId - urlMapListFull = urlMapList.format(test_utils.RESTCONF_BASE_URL) - responseMapList = requests.request("GET", urlMapListFull, headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + responseMapList = test_utils.get_request(urlMapList) resMapList = responseMapList.json() - nbMappings = len(resMapList['nodes'][0]['mapping']) - nbMapCumul nbTp = len(resTopo['network'][0]['node'][i]['ietf-network-topology:termination-point']) nbMapCurrent = 0 @@ -64,15 +59,7 @@ class TransportPCEtesting(unittest.TestCase): tpId = resTopo['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['tp-id'] if((not "CP" in tpId) and (not "CTP" in tpId)): urlMap = "{}/config/transportpce-portmapping:network/nodes/" + nodeMapId + "/mapping/" + tpId - urlMapFull = urlMap.format(test_utils.RESTCONF_BASE_URL) - responseMap = requests.request("GET", urlMapFull, headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) - self.assertEqual(responseMap.status_code, requests.codes.ok) - if responseMap.status_code == requests.codes.ok: - nbMapCurrent += 1 - nbMapCumul += nbMapCurrent - nbMappings -= nbMapCurrent - self.assertEqual(nbMappings, 0) + responseMap = test_utils.get_request(urlMap) # Disconnect the ROADMA def test_03_disconnect_rdm(self): diff --git a/tests/transportpce_tests/1.2.1/test_topology.py b/tests/transportpce_tests/1.2.1/test_topology.py index 24847612b..947af8202 100644 --- a/tests/transportpce_tests/1.2.1/test_topology.py +++ b/tests/transportpce_tests/1.2.1/test_topology.py @@ -40,9 +40,8 @@ class TransportPCETopologyTesting(unittest.TestCase): def test_02_getClliNetwork(self): url = ("{}/config/ietf-network:networks/network/clli-network" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['network'][0]['node'][0]['node-id'], 'NodeA') @@ -50,9 +49,8 @@ class TransportPCETopologyTesting(unittest.TestCase): def test_03_getOpenRoadmNetwork(self): url = ("{}/config/ietf-network:networks/network/openroadm-network" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['network'][0]['node'][0]['node-id'], 'ROADMA01') @@ -62,10 +60,8 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][0]['org-openroadm-network:model'], '2') def test_04_getLinks_OpenroadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links @@ -98,10 +94,8 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(len(dropLink), 0) def test_05_getNodes_OpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) res = response.json() # Tests related to nodes self.assertEqual(response.status_code, requests.codes.ok) @@ -172,20 +166,16 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_07_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .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)) + url = "{}/config/ietf-network:networks/network/clli-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['network'][0]['node'][0]['node-id'], 'NodeA') self.assertEqual(res['network'][0]['node'][0]['org-openroadm-clli-network:clli'], 'NodeA') def test_08_getOpenRoadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -204,10 +194,8 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertFalse(True) def test_09_getNodes_OpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) res = response.json() # Tests related to nodes self.assertEqual(response.status_code, requests.codes.ok) @@ -292,49 +280,19 @@ class TransportPCETopologyTesting(unittest.TestCase): # Connect the tail XPDRA to ROADMA and vice versa def test_10_connect_tail_xpdr_rdm(self): # Connect the tail: XPDRA to ROADMA - url = ("{}/operations/transportpce-networkutils:init-xpdr-rdm-links" - .format(test_utils.RESTCONF_BASE_URL)) - data = {"networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDRA01", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADMA01", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - 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.connect_xpdr_to_rdm_request("XPDRA01", "1", "1", + "ROADMA01", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) def test_11_connect_tail_rdm_xpdr(self): # Connect the tail: ROADMA to XPDRA - url = ("{}/operations/transportpce-networkutils:init-rdm-xpdr-links" - .format(test_utils.RESTCONF_BASE_URL)) - data = {"networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDRA01", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADMA01", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - 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.connect_rdm_to_xpdr_request("XPDRA01", "1", "1", + "ROADMA01", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) def test_12_getLinks_OpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links @@ -388,7 +346,7 @@ class TransportPCETopologyTesting(unittest.TestCase): url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" "OMS-attributes/span" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -397,9 +355,7 @@ class TransportPCETopologyTesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.put_request(url, data) self.assertEqual(response.status_code, requests.codes.created) def test_15_omsAttributes_ROADMC_ROADMA(self): @@ -407,7 +363,7 @@ class TransportPCETopologyTesting(unittest.TestCase): url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" "OMS-attributes/span" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -416,16 +372,12 @@ class TransportPCETopologyTesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.put_request(url, data) self.assertEqual(response.status_code, requests.codes.created) def test_16_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .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)) + url = "{}/config/ietf-network:networks/network/clli-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -444,9 +396,8 @@ class TransportPCETopologyTesting(unittest.TestCase): def test_17_getOpenRoadmNetwork(self): url = ("{}/config/ietf-network:networks/network/openroadm-network" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -475,10 +426,8 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(len(listNode), 0) def test_18_getROADMLinkOpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links @@ -533,10 +482,8 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(len(XPDR_OUT), 0) def test_19_getLinkOmsAttributesOpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links @@ -560,10 +507,8 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(len(R2RLink), 0) def test_20_getNodes_OpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) res = response.json() # Tests related to nodes self.assertEqual(response.status_code, requests.codes.ok) @@ -679,7 +624,7 @@ class TransportPCETopologyTesting(unittest.TestCase): url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB01-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" "OMS-attributes/span" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -688,9 +633,7 @@ class TransportPCETopologyTesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.put_request(url, data) self.assertEqual(response.status_code, requests.codes.created) def test_23_omsAttributes_ROADMB_ROADMA(self): @@ -698,7 +641,7 @@ class TransportPCETopologyTesting(unittest.TestCase): url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/ROADMB01-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" "OMS-attributes/span" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -707,9 +650,7 @@ class TransportPCETopologyTesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.put_request(url, data) self.assertEqual(response.status_code, requests.codes.created) def test_24_omsAttributes_ROADMB_ROADMC(self): @@ -717,7 +658,7 @@ class TransportPCETopologyTesting(unittest.TestCase): url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/ROADMB01-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" "OMS-attributes/span" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -726,9 +667,7 @@ class TransportPCETopologyTesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.put_request(url, data) self.assertEqual(response.status_code, requests.codes.created) def test_25_omsAttributes_ROADMC_ROADMB(self): @@ -736,7 +675,7 @@ class TransportPCETopologyTesting(unittest.TestCase): url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB01-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" "OMS-attributes/span" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -745,16 +684,12 @@ class TransportPCETopologyTesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.put_request(url, data) self.assertEqual(response.status_code, requests.codes.created) def test_26_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .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)) + url = "{}/config/ietf-network:networks/network/clli-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -773,10 +708,8 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(len(listNode), 0) def test_27_verifyDegree(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links @@ -793,10 +726,8 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(len(listR2RLink), 0) def test_28_verifyOppositeLinkTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links @@ -810,9 +741,7 @@ class TransportPCETopologyTesting(unittest.TestCase): oppLink_id = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:opposite-link'] # Find the opposite link url_oppLink = "{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:link/"+oppLink_id - url = (url_oppLink.format(test_utils.RESTCONF_BASE_URL)) - response_oppLink = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response_oppLink = test_utils.get_request(url_oppLink) self.assertEqual(response_oppLink.status_code, requests.codes.ok) res_oppLink = response_oppLink.json() self.assertEqual(res_oppLink['ietf-network-topology:link'][0] @@ -835,9 +764,8 @@ class TransportPCETopologyTesting(unittest.TestCase): def test_29_getLinkOmsAttributesOpenRoadmTopology(self): url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbLink = len(res['network'][0]['ietf-network-topology:link']) @@ -867,31 +795,23 @@ class TransportPCETopologyTesting(unittest.TestCase): response = test_utils.unmount_device("ROADMB01") self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) # Delete in the clli-network - url = ("{}/config/ietf-network:networks/network/clli-network/node/NodeB" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/config/ietf-network:networks/network/clli-network/node/NodeB" data = {} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.delete_request(url) self.assertEqual(response.status_code, requests.codes.ok) def test_31_disconnect_ROADMC(self): response = test_utils.unmount_device("ROADMC01") self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) # Delete in the clli-network - url = ("{}/config/ietf-network:networks/network/clli-network/node/NodeC" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/config/ietf-network:networks/network/clli-network/node/NodeC" data = {} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.delete_request(url) self.assertEqual(response.status_code, requests.codes.ok) def test_32_getNodes_OpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) res = response.json() # Tests related to nodes self.assertEqual(response.status_code, requests.codes.ok) @@ -970,10 +890,8 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertNotEqual(res['network'][0]['node'][i]['node-id'], 'ROADMC01-DEG2') def test_33_getOpenRoadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -983,10 +901,8 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertNotEqual(res['network'][0]['node'][i]['node-id'], 'ROADMB01') def test_34_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .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)) + url = "{}/config/ietf-network:networks/network/clli-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -1000,9 +916,8 @@ class TransportPCETopologyTesting(unittest.TestCase): def test_36_getClliNetwork(self): url = ("{}/config/ietf-network:networks/network/clli-network" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -1011,9 +926,8 @@ class TransportPCETopologyTesting(unittest.TestCase): def test_37_getOpenRoadmNetwork(self): url = ("{}/config/ietf-network:networks/network/openroadm-network" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -1022,10 +936,8 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertNotEqual(res['network'][0]['node'][i]['node-id'], 'XPDRA01') def test_38_getNodes_OpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) res = response.json() # Tests related to nodes self.assertEqual(response.status_code, requests.codes.ok) @@ -1079,27 +991,21 @@ class TransportPCETopologyTesting(unittest.TestCase): # Link-1 url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.delete_request(url) self.assertEqual(response.status_code, requests.codes.ok) # Link-2 url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.delete_request(url) self.assertEqual(response.status_code, requests.codes.ok) def test_40_getLinks_OpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbLink = len(res['network'][0]['ietf-network-topology:link']) @@ -1143,37 +1049,28 @@ class TransportPCETopologyTesting(unittest.TestCase): response = test_utils.unmount_device("ROADMA01") self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) # Delete in the clli-network - url = ("{}/config/ietf-network:networks/network/clli-network/node/NodeA" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/config/ietf-network:networks/network/clli-network/node/NodeA" data = {} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.delete_request(url) self.assertEqual(response.status_code, requests.codes.ok) def test_42_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .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)) + url = "{}/config/ietf-network:networks/network/clli-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn('node', res['network'][0]) def test_43_getOpenRoadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn('node', res['network'][0]) def test_44_check_roadm2roadm_link_persistence(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbLink = len(res['network'][0]['ietf-network-topology:link']) diff --git a/tests/transportpce_tests/2.2.1/test_end2end.py b/tests/transportpce_tests/2.2.1/test_end2end.py index 6555bcf15..581071b8f 100644 --- a/tests/transportpce_tests/2.2.1/test_end2end.py +++ b/tests/transportpce_tests/2.2.1/test_end2end.py @@ -52,88 +52,32 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_05_connect_xprdA_N1_to_roadmA_PP1(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDR-A1", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADM-A1", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - 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.connect_xpdr_to_rdm_request("XPDR-A1", "1", "1", + "ROADM-A1", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) time.sleep(2) def test_06_connect_roadmA_PP1_to_xpdrA_N1(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDR-A1", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADM-A1", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - 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.connect_rdm_to_xpdr_request("XPDR-A1", "1", "1", + "ROADM-A1", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) time.sleep(2) def test_07_connect_xprdC_N1_to_roadmC_PP1(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDR-C1", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADM-C1", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - 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.connect_xpdr_to_rdm_request("XPDR-C1", "1", "1", + "ROADM-C1", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) time.sleep(2) def test_08_connect_roadmC_PP1_to_xpdrC_N1(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDR-C1", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADM-C1", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - 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.connect_rdm_to_xpdr_request("XPDR-C1", "1", "1", + "ROADM-C1", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) @@ -143,8 +87,7 @@ class TransportPCEFulltesting(unittest.TestCase): # Config ROADMA-ROADMC oms-attributes url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" - "OMS-attributes/span" - .format(test_utils.RESTCONF_BASE_URL)) + "OMS-attributes/span") data = {"span": { "auto-spanloss": "true", "spanloss-base": 11.4, @@ -155,17 +98,14 @@ class TransportPCEFulltesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.put_request(url, data) self.assertEqual(response.status_code, requests.codes.created) def test_10_add_omsAttributes_ROADMC_ROADMA(self): # Config ROADMC-ROADMA oms-attributes url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" - "OMS-attributes/span" - .format(test_utils.RESTCONF_BASE_URL)) + "OMS-attributes/span") data = {"span": { "auto-spanloss": "true", "spanloss-base": 11.4, @@ -176,15 +116,12 @@ class TransportPCEFulltesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.put_request(url, data) self.assertEqual(response.status_code, requests.codes.created) # test service-create for Eth service from xpdr to xpdr def test_11_create_eth_service1(self): - url = ("{}/operations/org-openroadm-service:service-create" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-create" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -273,9 +210,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -283,10 +218,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(self.WAITING) def test_12_get_eth_service1(self): - url = ("{}/operational/org-openroadm-service:service-list/services/service1" - .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)) + url = "{}/operational/org-openroadm-service:service-list/services/service1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -302,10 +235,8 @@ class TransportPCEFulltesting(unittest.TestCase): 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" - .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)) + "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -328,10 +259,8 @@ class TransportPCEFulltesting(unittest.TestCase): 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" - .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)) + "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -352,10 +281,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(5) def test_15_check_topo_XPDRA(self): - url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDR-A1-XPDR1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/XPDR-A1-XPDR1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() liste_tp = res['node'][0]['ietf-network-topology:termination-point'] @@ -371,10 +298,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(3) def test_16_check_topo_ROADMA_SRG1(self): - url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-SRG1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-SRG1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn({u'index': 1}, @@ -390,10 +315,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(3) def test_17_check_topo_ROADMA_DEG1(self): - url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-DEG2" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-DEG2" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn({u'index': 1}, @@ -411,96 +334,39 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(3) def test_18_connect_xprdA_N2_to_roadmA_PP2(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDR-A1", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "2", - "networkutils:rdm-node": "ROADM-A1", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP2-TXRX" - } - } - } - 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.connect_xpdr_to_rdm_request("XPDR-A1", "1", "2", + "ROADM-A1", "1", "SRG1-PP2-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) time.sleep(2) def test_19_connect_roadmA_PP2_to_xpdrA_N2(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDR-A1", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "2", - "networkutils:rdm-node": "ROADM-A1", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP2-TXRX" - } - } - } - 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.connect_rdm_to_xpdr_request("XPDR-A1", "1", "2", + "ROADM-A1", "1", "SRG1-PP2-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) time.sleep(2) def test_20_connect_xprdC_N2_to_roadmC_PP2(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDR-C1", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "2", - "networkutils:rdm-node": "ROADM-C1", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP2-TXRX" - } - } - } - 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.connect_xpdr_to_rdm_request("XPDR-C1", "1", "2", + "ROADM-C1", "1", "SRG1-PP2-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) time.sleep(2) def test_21_connect_roadmC_PP2_to_xpdrC_N2(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDR-C1", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "2", - "networkutils:rdm-node": "ROADM-C1", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP2-TXRX" - } - } - } - 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.connect_rdm_to_xpdr_request("XPDR-C1", "1", "2", + "ROADM-C1", "1", "SRG1-PP2-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) time.sleep(2) def test_22_create_eth_service2(self): - url = ("{}/operations/org-openroadm-service:service-create" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-create" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -589,9 +455,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -599,10 +463,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(self.WAITING) def test_23_get_eth_service2(self): - url = ("{}/operational/org-openroadm-service:service-list/services/service2" - .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)) + url = "{}/operational/org-openroadm-service:service-list/services/service2" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -619,10 +481,8 @@ class TransportPCEFulltesting(unittest.TestCase): 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" - .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)) + "roadm-connections/DEG2-TTP-TXRX-SRG1-PP2-TXRX-2") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -641,10 +501,8 @@ class TransportPCEFulltesting(unittest.TestCase): res['roadm-connections'][0]['destination']) def test_25_check_topo_XPDRA(self): - url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDR-A1-XPDR1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/XPDR-A1-XPDR1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() liste_tp = res['node'][0]['ietf-network-topology:termination-point'] @@ -662,10 +520,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(10) def test_26_check_topo_ROADMA_SRG1(self): - url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-SRG1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-SRG1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn({u'index': 1}, res['node'][0] @@ -692,10 +548,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(10) def test_27_check_topo_ROADMA_DEG2(self): - url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-DEG2" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-DEG2" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn({u'index': 1}, res['node'][0] @@ -720,8 +574,7 @@ class TransportPCEFulltesting(unittest.TestCase): # creation service test on a non-available resource def test_28_create_eth_service3(self): - url = ("{}/operations/org-openroadm-service:service-create" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-create" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -810,9 +663,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -822,8 +673,7 @@ class TransportPCEFulltesting(unittest.TestCase): # add a test that check the openroadm-service-list still only contains 2 elements def test_29_delete_eth_service3(self): - url = ("{}/operations/org-openroadm-service:service-delete" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -837,9 +687,7 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Service \'service3\' does not exist in datastore', @@ -848,8 +696,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(20) def test_30_delete_eth_service1(self): - url = ("{}/operations/org-openroadm-service:service-delete" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -863,9 +710,7 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Renderer service delete in progress', @@ -873,8 +718,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(20) def test_31_delete_eth_service2(self): - url = ("{}/operations/org-openroadm-service:service-delete" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -888,9 +732,7 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Renderer service delete in progress', @@ -899,20 +741,16 @@ class TransportPCEFulltesting(unittest.TestCase): 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/" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/") + response = test_utils.get_request(url) res = response.json() self.assertEqual(response.status_code, requests.codes.ok) self.assertNotIn('roadm-connections', dict.keys(res['org-openroadm-device'])) time.sleep(2) def test_33_check_topo_XPDRA(self): - url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDR-A1-XPDR1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/XPDR-A1-XPDR1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() liste_tp = res['node'][0]['ietf-network-topology:termination-point'] @@ -927,10 +765,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(10) def test_34_check_topo_ROADMA_SRG1(self): - url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-SRG1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-SRG1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn({u'index': 1}, res['node'][0] @@ -946,10 +782,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(10) def test_35_check_topo_ROADMA_DEG2(self): - url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-DEG2" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-DEG2" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn({u'index': 1}, res['node'][0] @@ -966,8 +800,7 @@ class TransportPCEFulltesting(unittest.TestCase): # test service-create for Optical Channel (OC) service from srg-pp to srg-pp def test_36_create_oc_service1(self): - url = ("{}/operations/org-openroadm-service:service-create" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-create" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1056,9 +889,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -1066,10 +897,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(self.WAITING) def test_37_get_oc_service1(self): - url = ("{}/operational/org-openroadm-service:service-list/services/service1" - .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)) + url = "{}/operational/org-openroadm-service:service-list/services/service1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -1086,10 +915,8 @@ class TransportPCEFulltesting(unittest.TestCase): 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" - .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)) + "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -1112,10 +939,8 @@ class TransportPCEFulltesting(unittest.TestCase): 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" - .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)) + "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -1136,8 +961,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(7) def test_40_create_oc_service2(self): - url = ("{}/operations/org-openroadm-service:service-create" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-create" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1226,9 +1050,7 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -1236,10 +1058,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(self.WAITING) def test_41_get_oc_service2(self): - url = ("{}/operational/org-openroadm-service:service-list/services/service2" - .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)) + url = "{}/operational/org-openroadm-service:service-list/services/service2" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -1256,10 +1076,8 @@ class TransportPCEFulltesting(unittest.TestCase): 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" - .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)) + "roadm-connections/SRG1-PP2-TXRX-DEG2-TTP-TXRX-2") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -1285,8 +1103,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(3) def test_44_delete_oc_service1(self): - url = ("{}/operations/org-openroadm-service:service-delete" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1300,9 +1117,7 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Renderer service delete in progress', @@ -1310,8 +1125,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(20) def test_45_delete_oc_service2(self): - url = ("{}/operations/org-openroadm-service:service-delete" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1325,9 +1139,7 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Renderer service delete in progress', @@ -1336,10 +1148,8 @@ class TransportPCEFulltesting(unittest.TestCase): def test_46_get_no_oc_services(self): print("start test") - url = ("{}/operational/org-openroadm-service:service-list" - .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)) + 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() self.assertIn( @@ -1350,10 +1160,8 @@ class TransportPCEFulltesting(unittest.TestCase): 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/" - .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)) + "/node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn(['roadm-connections'][0], res['org-openroadm-device']) @@ -1376,12 +1184,10 @@ class TransportPCEFulltesting(unittest.TestCase): self.test_30_delete_eth_service1() def test_50_loop_create_oc_service(self): - url = ("{}/operational/org-openroadm-service:service-list/services/service1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request("GET", url, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + 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" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1395,8 +1201,7 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - requests.request("POST", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + test_utils.post_request(url, data) time.sleep(5) for i in range(1, 6): diff --git a/tests/transportpce_tests/2.2.1/test_olm.py b/tests/transportpce_tests/2.2.1/test_olm.py index 8c59393a6..b9cf5b682 100644 --- a/tests/transportpce_tests/2.2.1/test_olm.py +++ b/tests/transportpce_tests/2.2.1/test_olm.py @@ -12,7 +12,6 @@ import unittest import time import json -#from unittest.result import failfast import requests from common import test_utils @@ -53,105 +52,42 @@ class TransportOlmTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_05_connect_xprdA_to_roadmA(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDR-A1", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADM-A1", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.connect_xpdr_to_rdm_request("XPDR-A1", "1", "1", + "ROADM-A1", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) def test_06_connect_roadmA_to_xpdrA(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDR-A1", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADM-A1", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.connect_rdm_to_xpdr_request("XPDR-A1", "1", "1", + "ROADM-A1", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) def test_07_connect_xprdC_to_roadmC(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDR-C1", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADM-C1", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.connect_xpdr_to_rdm_request("XPDR-C1", "1", "1", + "ROADM-C1", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) def test_08_connect_roadmC_to_xpdrC(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDR-C1", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADM-C1", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.connect_rdm_to_xpdr_request("XPDR-C1", "1", "1", + "ROADM-C1", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) def test_09_create_OTS_ROADMA(self): - url = "{}/operations/transportpce-device-renderer:create-ots-oms".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:create-ots-oms" data = { "input": { "node-id": "ROADM-A1", "logical-connection-point": "DEG1-TTP-TXRX" } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) time.sleep(10) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -159,24 +95,21 @@ class TransportOlmTesting(unittest.TestCase): res["output"]["result"]) def test_10_create_OTS_ROADMC(self): - url = "{}/operations/transportpce-device-renderer:create-ots-oms".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:create-ots-oms" data = { "input": { "node-id": "ROADM-C1", "logical-connection-point": "DEG2-TTP-TXRX" } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Interfaces OTS-DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX successfully created on node ROADM-C1', res["output"]["result"]) def test_11_get_PM_ROADMA(self): - url = "{}/operations/transportpce-olm:get-pm".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-olm:get-pm" data = { "input": { "node-id": "ROADM-A1", @@ -187,10 +120,7 @@ class TransportOlmTesting(unittest.TestCase): } } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn({ @@ -207,7 +137,7 @@ class TransportOlmTesting(unittest.TestCase): }, res["output"]["measurements"]) def test_12_get_PM_ROADMC(self): - url = "{}/operations/transportpce-olm:get-pm".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-olm:get-pm" data = { "input": { "node-id": "ROADM-C1", @@ -218,10 +148,7 @@ class TransportOlmTesting(unittest.TestCase): } } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn({ @@ -238,17 +165,14 @@ class TransportOlmTesting(unittest.TestCase): }, res["output"]["measurements"]) def test_13_calculate_span_loss_base_ROADMA_ROADMC(self): - url = "{}/operations/transportpce-olm:calculate-spanloss-base".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-olm:calculate-spanloss-base" data = { "input": { "src-type": "link", "link-id": "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX" } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', @@ -260,16 +184,13 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(5) def test_14_calculate_span_loss_base_all(self): - url = "{}/operations/transportpce-olm:calculate-spanloss-base".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-olm:calculate-spanloss-base" data = { "input": { "src-type": "all" } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', @@ -287,10 +208,8 @@ class TransportOlmTesting(unittest.TestCase): 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".format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + "org-openroadm-optical-transport-interfaces:ots") + response = test_utils.get_request(url) 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']) @@ -299,17 +218,15 @@ class TransportOlmTesting(unittest.TestCase): 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".format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + "org-openroadm-optical-transport-interfaces:ots") + response = test_utils.get_request(url) 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']) self.assertEqual(17.6, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']) def test_17_servicePath_create_AToZ(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = { "input": { "service-name": "test", @@ -340,10 +257,7 @@ class TransportOlmTesting(unittest.TestCase): ] } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"]) @@ -351,7 +265,7 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(10) def test_18_servicePath_create_ZToA(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = { "input": { "service-name": "test", @@ -382,10 +296,7 @@ class TransportOlmTesting(unittest.TestCase): ] } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"]) @@ -393,7 +304,7 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(10) def test_19_service_power_setup_XPDRA_XPDRC(self): - url = "{}/operations/transportpce-olm:service-power-setup".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-olm:service-power-setup" data = { "input": { "service-name": "test", @@ -422,10 +333,7 @@ class TransportOlmTesting(unittest.TestCase): ] } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', res["output"]["result"]) @@ -433,10 +341,8 @@ class TransportOlmTesting(unittest.TestCase): 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".format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + "org-openroadm-optical-channel-interfaces:och") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(-5, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) @@ -445,10 +351,8 @@ class TransportOlmTesting(unittest.TestCase): 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".format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + "SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("gainLoss", res['roadm-connections'][0]['opticalControlMode']) @@ -457,16 +361,14 @@ class TransportOlmTesting(unittest.TestCase): 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".format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + "DEG1-TTP-TXRX-SRG1-PP1-TXRX-1") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("power", res['roadm-connections'][0]['opticalControlMode']) def test_23_service_power_setup_XPDRC_XPDRA(self): - url = "{}/operations/transportpce-olm:service-power-setup".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-olm:service-power-setup" data = { "input": { "service-name": "test", @@ -495,10 +397,7 @@ class TransportOlmTesting(unittest.TestCase): ] } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', res["output"]["result"]) @@ -506,10 +405,8 @@ class TransportOlmTesting(unittest.TestCase): 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".format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + "org-openroadm-optical-channel-interfaces:och") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(-5, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) @@ -518,17 +415,15 @@ class TransportOlmTesting(unittest.TestCase): 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".format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + "SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") + response = test_utils.get_request(url) 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_26_service_power_turndown_XPDRA_XPDRC(self): - url = "{}/operations/transportpce-olm:service-power-turndown".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-olm:service-power-turndown" data = { "input": { "service-name": "test", @@ -557,10 +452,7 @@ class TransportOlmTesting(unittest.TestCase): ] } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', res["output"]["result"]) @@ -568,10 +460,8 @@ class TransportOlmTesting(unittest.TestCase): 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".format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + "SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("off", res['roadm-connections'][0]['opticalControlMode']) @@ -580,16 +470,14 @@ class TransportOlmTesting(unittest.TestCase): 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".format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + "DEG1-TTP-TXRX-SRG1-PP1-TXRX-1") + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("off", res['roadm-connections'][0]['opticalControlMode']) def test_29_servicePath_delete_AToZ(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = { "input": { "service-name": "test", @@ -620,17 +508,14 @@ class TransportOlmTesting(unittest.TestCase): ] } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Request processed', res["output"]["result"]) time.sleep(10) def test_30_servicePath_delete_ZToA(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = { "input": { "service-name": "test", @@ -661,10 +546,7 @@ class TransportOlmTesting(unittest.TestCase): ] } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Request processed', res["output"]["result"]) @@ -673,51 +555,21 @@ class TransportOlmTesting(unittest.TestCase): """to test case where SRG where the xpdr is connected to has no optical range data""" def test_31_connect_xprdA_to_roadmA(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDR-A1", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "2", - "networkutils:rdm-node": "ROADM-A1", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP2-TXRX" - } - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.connect_xpdr_to_rdm_request("XPDR-A1", "1", "2", + "ROADM-A1", "1", "SRG1-PP2-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) def test_32_connect_roadmA_to_xpdrA(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(test_utils.RESTCONF_BASE_URL) - data = { - "networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDR-A1", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "2", - "networkutils:rdm-node": "ROADM-A1", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP2-TXRX" - } - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.connect_rdm_to_xpdr_request("XPDR-A1", "1", "2", + "ROADM-A1", "1", "SRG1-PP2-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) def test_33_servicePath_create_AToZ(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = { "input": { "service-name": "test2", @@ -738,10 +590,7 @@ class TransportOlmTesting(unittest.TestCase): ] } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"]) @@ -751,17 +600,15 @@ class TransportOlmTesting(unittest.TestCase): 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".format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + "org-openroadm-optical-channel-interfaces:och") + response = test_utils.get_request(url) 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(2, res['org-openroadm-optical-channel-interfaces:och']['wavelength-number']) def test_35_servicePath_delete_AToZ(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = { "input": { "service-name": "test", @@ -782,10 +629,7 @@ class TransportOlmTesting(unittest.TestCase): ] } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Request processed', res["output"]["result"]) @@ -800,10 +644,8 @@ class TransportOlmTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) def test_38_calculate_span_loss_current(self): - url = "{}/operations/transportpce-olm:calculate-spanloss-current".format(test_utils.RESTCONF_BASE_URL) - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/operations/transportpce-olm:calculate-spanloss-current" + response = test_utils.post_request(url, None) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', 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 0cc60cf91..1748b8065 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_renderer.py +++ b/tests/transportpce_tests/2.2.1/test_otn_renderer.py @@ -39,11 +39,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) time.sleep(10) - url = ("{}/operational/network-topology:" - "network-topology/topology/topology-netconf/node/SPDR-SA1" - .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)) + url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/SPDR-SA1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -51,11 +48,8 @@ class TransportPCEtesting(unittest.TestCase): 'connected') def test_02_get_portmapping_CLIENT1(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/SPDR-SA1/mapping/XPDR1-CLIENT1" - .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)) + url = "{}/config/transportpce-portmapping:network/nodes/SPDR-SA1/mapping/XPDR1-CLIENT1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -72,11 +66,8 @@ class TransportPCEtesting(unittest.TestCase): res['mapping']) def test_03_get_portmapping_NETWORK1(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/SPDR-SA1/mapping/XPDR1-NETWORK1" - .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)) + url = "{}/config/transportpce-portmapping:network/nodes/SPDR-SA1/mapping/XPDR1-NETWORK1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -93,7 +84,7 @@ class TransportPCEtesting(unittest.TestCase): res['mapping']) def test_04_service_path_create_OCH_OTU4(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = {"renderer:input": { "service-name": "service_ODU4", "wave-number": "1", @@ -102,9 +93,7 @@ class TransportPCEtesting(unittest.TestCase): "nodes": [ {"node-id": "SPDR-SA1", "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.post_request(url, data) time.sleep(3) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -116,11 +105,8 @@ class TransportPCEtesting(unittest.TestCase): 'och-interface-id': ['XPDR1-NETWORK1-1']}, res["output"]['node-interface']) def test_05_get_portmapping_NETWORK1(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/SPDR-SA1/mapping/XPDR1-NETWORK1" - .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)) + url = "{}/config/transportpce-portmapping:network/nodes/SPDR-SA1/mapping/XPDR1-NETWORK1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -140,9 +126,8 @@ class TransportPCEtesting(unittest.TestCase): 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" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -163,9 +148,8 @@ class TransportPCEtesting(unittest.TestCase): 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" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = {'name': 'XPDR1-NETWORK1-OTU', @@ -191,7 +175,7 @@ class TransportPCEtesting(unittest.TestCase): res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']) def test_08_otn_service_path_create_ODU4(self): - url = "{}/operations/transportpce-device-renderer:otn-service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:otn-service-path" data = {"renderer:input": { "service-name": "service_ODU4", "operation": "create", @@ -200,9 +184,7 @@ class TransportPCEtesting(unittest.TestCase): "nodes": [ {"node-id": "SPDR-SA1", "network-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.post_request(url, data) time.sleep(3) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -213,11 +195,8 @@ class TransportPCEtesting(unittest.TestCase): 'odu-interface-id': ['XPDR1-NETWORK1-ODU4']}, res["output"]['node-interface']) def test_09_get_portmapping_NETWORK1(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/SPDR-SA1/mapping/XPDR1-NETWORK1" - .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)) + url = "{}/config/transportpce-portmapping:network/nodes/SPDR-SA1/mapping/XPDR1-NETWORK1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -239,9 +218,8 @@ class TransportPCEtesting(unittest.TestCase): 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" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU4', 'administrative-state': 'inService', @@ -267,7 +245,7 @@ class TransportPCEtesting(unittest.TestCase): res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) def test_11_otn_service_path_create_10GE(self): - url = "{}/operations/transportpce-device-renderer:otn-service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:otn-service-path" data = {"renderer:input": { "service-name": "service1", "operation": "create", @@ -280,9 +258,7 @@ class TransportPCEtesting(unittest.TestCase): {"node-id": "SPDR-SA1", "client-tp": "XPDR1-CLIENT1", "network-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.post_request(url, data) time.sleep(3) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -298,9 +274,8 @@ class TransportPCEtesting(unittest.TestCase): 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" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict = {'name': 'XPDR1-CLIENT1-ETHERNET10G', @@ -319,9 +294,8 @@ class TransportPCEtesting(unittest.TestCase): 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" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -349,9 +323,8 @@ class TransportPCEtesting(unittest.TestCase): 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" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-service1', 'administrative-state': 'inService', @@ -385,9 +358,8 @@ class TransportPCEtesting(unittest.TestCase): 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" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = { @@ -404,7 +376,7 @@ class TransportPCEtesting(unittest.TestCase): res['odu-connection'][0]['source']) def test_16_otn_service_path_delete_10GE(self): - url = "{}/operations/transportpce-device-renderer:otn-service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:otn-service-path" data = {"renderer:input": { "service-name": "service1", "operation": "delete", @@ -417,9 +389,7 @@ class TransportPCEtesting(unittest.TestCase): {"node-id": "SPDR-SA1", "client-tp": "XPDR1-CLIENT1", "network-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.post_request(url, data) time.sleep(3) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -430,40 +400,36 @@ class TransportPCEtesting(unittest.TestCase): 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" - .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.get_request(url) 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" - .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.get_request(url) 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" - .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.get_request(url) 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" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) def test_21_otn_service_path_delete_ODU4(self): - url = "{}/operations/transportpce-device-renderer:otn-service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:otn-service-path" data = {"renderer:input": { "service-name": "service_ODU4", "operation": "delete", @@ -472,9 +438,7 @@ class TransportPCEtesting(unittest.TestCase): "nodes": [ {"node-id": "SPDR-SA1", "network-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.post_request(url, data) time.sleep(3) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -485,13 +449,12 @@ class TransportPCEtesting(unittest.TestCase): 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" - .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.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) def test_23_service_path_delete_OCH_OTU4(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = {"renderer:input": { "service-name": "service_OTU4", "wave-number": "1", @@ -500,9 +463,7 @@ class TransportPCEtesting(unittest.TestCase): "nodes": [ {"node-id": "SPDR-SA1", "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.post_request(url, data) time.sleep(3) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -513,18 +474,16 @@ class TransportPCEtesting(unittest.TestCase): 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" - .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.get_request(url) 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" - .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.get_request(url) 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_topology.py b/tests/transportpce_tests/2.2.1/test_otn_topology.py index 42bb7bcc5..ef4dbdb12 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_topology.py +++ b/tests/transportpce_tests/2.2.1/test_otn_topology.py @@ -39,11 +39,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) time.sleep(10) - url = ("{}/operational/network-topology:" - "network-topology/topology/topology-netconf/node/SPDR-SA1" - .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)) + url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/SPDR-SA1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -51,10 +48,8 @@ class TransportPCEtesting(unittest.TestCase): 'connected') def test_02_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .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)) + url = "{}/config/ietf-network:networks/network/clli-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() logging.info(res) @@ -62,10 +57,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][0]['org-openroadm-clli-network:clli'], 'NodeSA') def test_03_getOpenRoadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['network'][0]['node'][0]['node-id'], 'SPDR-SA1') @@ -77,20 +70,16 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][0]['org-openroadm-network:ip'], '1.2.3.4') def test_04_getLinks_OpenroadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links self.assertNotIn('ietf-network-topology:link', res['network'][0]) def test_05_getNodes_OpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) res = response.json() # Tests related to nodes self.assertEqual(response.status_code, requests.codes.ok) @@ -145,19 +134,15 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(listNode), 0) def test_06_getLinks_OtnTopology(self): - url = ("{}/config/ietf-network:networks/network/otn-topology" - .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)) + url = "{}/config/ietf-network:networks/network/otn-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn('ietf-network-topology:link', res['network'][0]) def test_07_getNodes_OtnTopology(self): - url = ("{}/config/ietf-network:networks/network/otn-topology" - .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)) + url = "{}/config/ietf-network:networks/network/otn-topology" + response = test_utils.get_request(url) res = response.json() self.assertEqual(response.status_code, requests.codes.ok) nbNode = len(res['network'][0]['node']) @@ -273,10 +258,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) def test_09_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .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)) + url = "{}/config/ietf-network:networks/network/clli-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -284,27 +267,21 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][0]['org-openroadm-clli-network:clli'], 'NodeSA') def test_10_getOpenRoadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn('node', res['network'][0]) def test_11_getNodes_OpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) res = response.json() self.assertNotIn('node', res['network'][0]) def test_12_getNodes_OtnTopology(self): - url = ("{}/config/ietf-network:networks/network/otn-topology" - .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)) + url = "{}/config/ietf-network:networks/network/otn-topology" + response = test_utils.get_request(url) res = response.json() self.assertNotIn('node', res['network'][0]) diff --git a/tests/transportpce_tests/2.2.1/test_portmapping.py b/tests/transportpce_tests/2.2.1/test_portmapping.py index b0f4a11d0..c065c8c1d 100644 --- a/tests/transportpce_tests/2.2.1/test_portmapping.py +++ b/tests/transportpce_tests/2.2.1/test_portmapping.py @@ -39,11 +39,8 @@ 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/ROADM-A1" - .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)) + url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/ROADM-A1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -52,11 +49,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): time.sleep(10) def test_03_rdm_portmapping_info(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/ROADM-A1/node-info" - .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)) + url = "{}/config/transportpce-portmapping:network/nodes/ROADM-A1/node-info" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -69,11 +63,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): time.sleep(3) def test_04_rdm_portmapping_DEG1_TTP_TXRX(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/ROADM-A1/mapping/DEG1-TTP-TXRX" - .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)) + url = "{}/config/transportpce-portmapping:network/nodes/ROADM-A1/mapping/DEG1-TTP-TXRX" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -82,11 +73,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): res['mapping']) def test_05_rdm_portmapping_DEG2_TTP_TXRX_with_ots_oms(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/ROADM-A1/mapping/DEG2-TTP-TXRX" - .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)) + url = "{}/config/transportpce-portmapping:network/nodes/ROADM-A1/mapping/DEG2-TTP-TXRX" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -97,11 +85,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): res['mapping']) def test_06_rdm_portmapping_SRG1_PP3_TXRX(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/ROADM-A1/mapping/SRG1-PP3-TXRX" - .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)) + url = "{}/config/transportpce-portmapping:network/nodes/ROADM-A1/mapping/SRG1-PP3-TXRX" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -110,11 +95,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): res['mapping']) def test_07_rdm_portmapping_SRG3_PP1_TXRX(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/ROADM-A1/mapping/SRG3-PP1-TXRX" - .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)) + url = "{}/config/transportpce-portmapping:network/nodes/ROADM-A1/mapping/SRG3-PP1-TXRX" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -127,11 +109,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_09_xpdr_device_connected(self): - url = ("{}/operational/network-topology:" - "network-topology/topology/topology-netconf/node/XPDR-A1" - .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)) + url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/XPDR-A1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -140,11 +119,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): time.sleep(10) def test_10_xpdr_portmapping_info(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/XPDR-A1/node-info" - .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)) + url = "{}/config/transportpce-portmapping:network/nodes/XPDR-A1/node-info" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -157,11 +133,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): time.sleep(3) def test_11_xpdr_portmapping_NETWORK1(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/XPDR-A1/mapping/XPDR1-NETWORK1" - .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)) + url = "{}/config/transportpce-portmapping:network/nodes/XPDR-A1/mapping/XPDR1-NETWORK1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -173,11 +146,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): res['mapping']) def test_12_xpdr_portmapping_NETWORK2(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/XPDR-A1/mapping/XPDR1-NETWORK2" - .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)) + url = "{}/config/transportpce-portmapping:network/nodes/XPDR-A1/mapping/XPDR1-NETWORK2" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -189,11 +159,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): res['mapping']) def test_13_xpdr_portmapping_CLIENT1(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/XPDR-A1/mapping/XPDR1-CLIENT1" - .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)) + url = "{}/config/transportpce-portmapping:network/nodes/XPDR-A1/mapping/XPDR1-CLIENT1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -206,11 +173,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): res['mapping']) def test_14_xpdr_portmapping_CLIENT2(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/XPDR-A1/mapping/XPDR1-CLIENT2" - .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)) + url = "{}/config/transportpce-portmapping:network/nodes/XPDR-A1/mapping/XPDR1-CLIENT2" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -227,10 +191,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) def test_16_xpdr_device_disconnected(self): - url = ("{}/operational/network-topology:network-topology/topology/" - "topology-netconf/node/XPDR-A1".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)) + url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/XPDR-A1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -239,9 +201,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): res['errors']['error']) def test_17_xpdr_device_not_connected(self): - url = ("{}/config/transportpce-portmapping:network/nodes/XPDR-A1".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)) + url = "{}/config/transportpce-portmapping:network/nodes/XPDR-A1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -254,10 +215,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) def test_19_rdm_device_disconnected(self): - url = ("{}/operational/network-topology:network-topology/topology/topology-netconf/node/ROADM-A1" - .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)) + url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/ROADM-A1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -266,9 +225,8 @@ class TransportPCEPortMappingTesting(unittest.TestCase): res['errors']['error']) def test_20_rdm_device_not_connected(self): - url = ("{}/config/transportpce-portmapping:network/nodes/ROADM-A1".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)) + url = "{}/config/transportpce-portmapping:network/nodes/ROADM-A1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( 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 3215eb820..56dd59e17 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 @@ -40,12 +40,8 @@ class TransportPCERendererTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_03_rdm_portmapping(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/ROADM-A1" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/transportpce-portmapping:network/nodes/ROADM-A1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -58,12 +54,8 @@ class TransportPCERendererTesting(unittest.TestCase): res['nodes'][0]['mapping']) def test_04_xpdr_portmapping(self): - url = ("{}/config/transportpce-portmapping:network/" - "nodes/XPDR-A1" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + url = "{}/config/transportpce-portmapping:network/nodes/XPDR-A1" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -83,7 +75,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['nodes'][0]['mapping']) def test_05_service_path_create(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = {"renderer:input": { "renderer:service-name": "service_test", "renderer:wave-number": "7", @@ -96,10 +88,7 @@ class TransportPCERendererTesting(unittest.TestCase): {"renderer:node-id": "XPDR-A1", "renderer:src-tp": "XPDR1-CLIENT1", "renderer:dest-tp": "XPDR1-NETWORK1"}]}} - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes: ROADM-A1', res["output"]["result"]) @@ -108,10 +97,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "interface/DEG1-TTP-TXRX-nmc-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -133,10 +120,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "interface/DEG1-TTP-TXRX-mc-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -158,10 +143,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "interface/SRG1-PP3-TXRX-nmc-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -184,10 +167,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "interface/SRG1-PP3-TXRX-mc-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -199,10 +180,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "roadm-connections/SRG1-PP3-TXRX-DEG1-TTP-TXRX-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -224,10 +203,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "interface/XPDR1-NETWORK1-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -251,10 +228,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "interface/XPDR1-NETWORK1-OTU" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -280,10 +255,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "interface/XPDR1-NETWORK1-ODU" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the 2 following statements replace self.assertDictContainsSubset deprecated in python 3.2 @@ -312,10 +285,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "interface/XPDR1-CLIENT1-ETHERNET" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -337,10 +308,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "circuit-packs/1%2F0%2F1-PLUG-NET" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('not-reserved-inuse', res['circuit-packs'][0]["equipment-state"]) @@ -349,16 +318,14 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "circuit-packs/1%2F0%2F1-PLUG-CLIENT" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('not-reserved-inuse', res['circuit-packs'][0]["equipment-state"]) def test_17_service_path_delete(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = {"renderer:input": { "renderer:service-name": "service_test", "renderer:wave-number": "7", @@ -370,10 +337,7 @@ class TransportPCERendererTesting(unittest.TestCase): {"renderer:node-id": "XPDR-A1", "renderer:src-tp": "XPDR1-CLIENT1", "renderer:dest-tp": "XPDR1-NETWORK1"}]}} - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) self.assertEqual(response.json(), { 'output': {'result': 'Request processed', 'success': True}}) @@ -382,10 +346,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "interface/DEG1-TTP-TXRX-mc-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -397,10 +359,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "interface/DEG1-TTP-TXRX-nmc-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -412,10 +372,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "interface/SRG1-PP3-TXRX-mc-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn({ @@ -428,10 +386,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "interface/SRG1-PP3-TXRX-nmc-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn({ @@ -444,10 +400,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "roadm-connections/SRG1-PP3-TXRX-DEG1-TTP-TXRX-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn({ @@ -460,10 +414,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "interface/XPDR1-NETWORK1-7" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn({ @@ -476,10 +428,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "interface/XPDR1-NETWORK1-OTU" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn({ @@ -492,10 +442,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "interface/XPDR1-NETWORK1-ODU" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn({ @@ -508,10 +456,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "interface/XPDR1-CLIENT1-ETHERNET" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn({ @@ -524,10 +470,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "circuit-packs/1%2F0%2F1-PLUG-NET" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual('not-reserved-available', res["circuit-packs"][0]['equipment-state']) @@ -536,10 +480,8 @@ class TransportPCERendererTesting(unittest.TestCase): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" "circuit-packs/1%2F0%2F1-PLUG-CLIENT" - .format(test_utils.RESTCONF_BASE_URL)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) 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_tapi.py b/tests/transportpce_tests/2.2.1/test_tapi.py index 2225e75de..946703438 100644 --- a/tests/transportpce_tests/2.2.1/test_tapi.py +++ b/tests/transportpce_tests/2.2.1/test_tapi.py @@ -85,9 +85,8 @@ class TransportTapitesting(unittest.TestCase): time.sleep(20) def test_05_connect_xprda_n1_to_roadma_pp1(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(test_utils.RESTCONF_BASE_URL) - data = test_utils.generate_link_data("XPDR-A1", "1", "1", "ROADM-A1", "1", "SRG1-PP1-TXRX") - response = test_utils.post_request(url, data, test_utils.ODL_LOGIN, test_utils.ODL_PWD) + response = test_utils.connect_xpdr_to_rdm_request("XPDR-A1", "1", "1", + "ROADM-A1", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) res = response.json() self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"], @@ -95,9 +94,8 @@ class TransportTapitesting(unittest.TestCase): time.sleep(2) def test_06_connect_roadma_pp1_to_xpdra_n1(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(test_utils.RESTCONF_BASE_URL) - data = test_utils.generate_link_data("XPDR-A1", "1", "1", "ROADM-A1", "1", "SRG1-PP1-TXRX") - response = test_utils.post_request(url, data, test_utils.ODL_LOGIN, test_utils.ODL_PWD) + response = test_utils.connect_rdm_to_xpdr_request("XPDR-A1", "1", "1", + "ROADM-A1", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) res = response.json() self.assertIn('Roadm Xponder links created successfully', res["output"]["result"], @@ -105,9 +103,8 @@ class TransportTapitesting(unittest.TestCase): time.sleep(2) def test_07_connect_xprdc_n1_to_roadmc_pp1(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(test_utils.RESTCONF_BASE_URL) - data = test_utils.generate_link_data("XPDR-C1", "1", "1", "ROADM-C1", "1", "SRG1-PP1-TXRX") - response = test_utils.post_request(url, data, test_utils.ODL_LOGIN, test_utils.ODL_PWD) + response = test_utils.connect_xpdr_to_rdm_request("XPDR-C1", "1", "1", + "ROADM-C1", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) res = response.json() self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"], @@ -115,9 +112,8 @@ class TransportTapitesting(unittest.TestCase): time.sleep(2) def test_08_connect_roadmc_pp1_to_xpdrc_n1(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(test_utils.RESTCONF_BASE_URL) - data = test_utils.generate_link_data("XPDR-C1", "1", "1", "ROADM-C1", "1", "SRG1-PP1-TXRX") - response = test_utils.post_request(url, data, test_utils.ODL_LOGIN, test_utils.ODL_PWD) + response = test_utils.connect_rdm_to_xpdr_request("XPDR-C1", "1", "1", + "ROADM-C1", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) res = response.json() self.assertIn('Roadm Xponder links created successfully', res["output"]["result"], @@ -125,9 +121,8 @@ class TransportTapitesting(unittest.TestCase): time.sleep(2) def test_09_connect_xprda_n2_to_roadma_pp2(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(test_utils.RESTCONF_BASE_URL) - data = test_utils.generate_link_data("XPDR-A1", "1", "2", "ROADM-A1", "1", "SRG1-PP2-TXRX") - response = test_utils.post_request(url, data, test_utils.ODL_LOGIN, test_utils.ODL_PWD) + response = test_utils.connect_xpdr_to_rdm_request("XPDR-A1", "1", "2", + "ROADM-A1", "1", "SRG1-PP2-TXRX") self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) res = response.json() self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"], @@ -135,9 +130,8 @@ class TransportTapitesting(unittest.TestCase): time.sleep(2) def test_10_connect_roadma_pp2_to_xpdra_n2(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(test_utils.RESTCONF_BASE_URL) - data = test_utils.generate_link_data("XPDR-A1", "1", "2", "ROADM-A1", "1", "SRG1-PP2-TXRX") - response = test_utils.post_request(url, data, test_utils.ODL_LOGIN, test_utils.ODL_PWD) + response = test_utils.connect_rdm_to_xpdr_request("XPDR-A1", "1", "2", + "ROADM-A1", "1", "SRG1-PP2-TXRX") self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) res = response.json() self.assertIn('Roadm Xponder links created successfully', res["output"]["result"], @@ -145,9 +139,8 @@ class TransportTapitesting(unittest.TestCase): time.sleep(2) def test_11_connect_xprdc_n2_to_roadmc_pp2(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(test_utils.RESTCONF_BASE_URL) - data = test_utils.generate_link_data("XPDR-C1", "1", "2", "ROADM-C1", "1", "SRG1-PP2-TXRX") - response = test_utils.post_request(url, data, test_utils.ODL_LOGIN, test_utils.ODL_PWD) + response = test_utils.connect_xpdr_to_rdm_request("XPDR-C1", "1", "2", + "ROADM-C1", "1", "SRG1-PP2-TXRX") self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) res = response.json() self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"], @@ -155,9 +148,8 @@ class TransportTapitesting(unittest.TestCase): time.sleep(2) def test_12_connect_roadmc_pp2_to_xpdrc_n2(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(test_utils.RESTCONF_BASE_URL) - data = test_utils.generate_link_data("XPDR-C1", "1", "2", "ROADM-C1", "1", "SRG1-PP2-TXRX") - response = test_utils.post_request(url, data, test_utils.ODL_LOGIN, test_utils.ODL_PWD) + response = test_utils.connect_rdm_to_xpdr_request("XPDR-C1", "1", "2", + "ROADM-C1", "1", "SRG1-PP2-TXRX") self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) res = response.json() self.assertIn('Roadm Xponder links created successfully', res["output"]["result"], @@ -165,14 +157,14 @@ class TransportTapitesting(unittest.TestCase): time.sleep(2) def test_13_get_tapi_openroadm_topology(self): - url = "{}/operations/tapi-topology:get-topology-details".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/tapi-topology:get-topology-details" data = { "tapi-topology:input": { "tapi-topology:topology-id-or-name": "openroadm-topology" } } - response = test_utils.post_request(url, data, test_utils.ODL_LOGIN, test_utils.ODL_PWD) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) res = response.json() self.assertEqual(len(res["output"]["topology"]["node"]), 1, 'There should be 1 node') @@ -180,14 +172,14 @@ class TransportTapitesting(unittest.TestCase): 'There should be 4 owned-node-edge-points') def test_14_get_tapi_otn_topology(self): - url = "{}/operations/tapi-topology:get-topology-details".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/tapi-topology:get-topology-details" data = { "tapi-topology:input": { "tapi-topology:topology-id-or-name": "otn-topology" } } - response = test_utils.post_request(url, data, test_utils.ODL_LOGIN, test_utils.ODL_PWD) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) res = response.json() self.assertEqual(len(res["output"]["topology"]["node"]), 4, 'There should be 4 nodes') diff --git a/tests/transportpce_tests/2.2.1/test_topoPortMapping.py b/tests/transportpce_tests/2.2.1/test_topoPortMapping.py index 6fcfa9912..28ec76c90 100644 --- a/tests/transportpce_tests/2.2.1/test_topoPortMapping.py +++ b/tests/transportpce_tests/2.2.1/test_topoPortMapping.py @@ -41,10 +41,8 @@ class TransportPCEtesting(unittest.TestCase): # Verify the termination points of the ROADMA def test_02_compareOpenroadmTopologyPortMapping_rdm(self): - urlTopo = ("{}/config/ietf-network:networks/network/openroadm-topology" - .format(test_utils.RESTCONF_BASE_URL)) - responseTopo = requests.request( - "GET", urlTopo, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + urlTopo = "{}/config/ietf-network:networks/network/openroadm-topology" + responseTopo = test_utils.get_request(urlTopo) resTopo = responseTopo.json() nbNode = len(resTopo['network'][0]['node']) nbMapCumul = 0 @@ -55,9 +53,7 @@ class TransportPCEtesting(unittest.TestCase): nodeMapId = nodeId.split("-")[0] + "-" + nodeId.split("-")[1] print("nodeMapId={}".format(nodeMapId)) urlMapList = "{}/config/transportpce-portmapping:network/nodes/" + nodeMapId - urlMapListFull = urlMapList.format(test_utils.RESTCONF_BASE_URL) - responseMapList = requests.request( - "GET", urlMapListFull, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + responseMapList = test_utils.get_request(urlMapList) resMapList = responseMapList.json() nbMappings = len(resMapList['nodes'][0]['mapping']) - nbMapCumul @@ -67,9 +63,7 @@ class TransportPCEtesting(unittest.TestCase): tpId = resTopo['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['tp-id'] if((not "CP" in tpId) and (not "CTP" in tpId)): urlMap = "{}/config/transportpce-portmapping:network/nodes/" + nodeMapId + "/mapping/" + tpId - urlMapFull = urlMap.format(test_utils.RESTCONF_BASE_URL) - responseMap = requests.request( - "GET", urlMapFull, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + responseMap = test_utils.get_request(urlMap) self.assertEqual(responseMap.status_code, requests.codes.ok) if(responseMap.status_code == requests.codes.ok): nbMapCurrent += 1 @@ -79,14 +73,8 @@ class TransportPCEtesting(unittest.TestCase): # Disconnect the ROADMA def test_03_disconnect_rdm(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADM-A1" - .format(test_utils.RESTCONF_BASE_URL)) - data = {} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) - self.assertEqual(response.status_code, requests.codes.ok) + response = test_utils.unmount_device("ROADM-A1") + self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) # #Connect the XPDRA def test_04_connect_xpdr(self): @@ -99,14 +87,8 @@ class TransportPCEtesting(unittest.TestCase): # Disconnect the XPDRA def test_06_disconnect_device(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/XPDR-A1" - .format(test_utils.RESTCONF_BASE_URL)) - data = {} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) - self.assertEqual(response.status_code, requests.codes.ok) + response = test_utils.unmount_device("XPDR-A1") + self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) if __name__ == "__main__": diff --git a/tests/transportpce_tests/2.2.1/test_topology.py b/tests/transportpce_tests/2.2.1/test_topology.py index 2b0e7b358..9a738e801 100644 --- a/tests/transportpce_tests/2.2.1/test_topology.py +++ b/tests/transportpce_tests/2.2.1/test_topology.py @@ -40,10 +40,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_02_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .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)) + url = "{}/config/ietf-network:networks/network/clli-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() logging.info(res) @@ -51,10 +49,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][0]['org-openroadm-clli-network:clli'], 'NodeA') def test_03_getOpenRoadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['network'][0]['node'][0]['node-id'], 'ROADM-A1') @@ -64,10 +60,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][0]['org-openroadm-network:model'], 'model2') def test_04_getLinks_OpenroadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links @@ -104,10 +98,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(dropLink), 0) def test_05_getNodes_OpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) res = response.json() # Tests related to nodes self.assertEqual(response.status_code, requests.codes.ok) @@ -178,20 +170,16 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_07_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .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)) + url = "{}/config/ietf-network:networks/network/clli-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['network'][0]['node'][0]['node-id'], 'NodeA') self.assertEqual(res['network'][0]['node'][0]['org-openroadm-clli-network:clli'], 'NodeA') def test_08_getOpenRoadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -210,10 +198,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertFalse(True) def test_09_getNodes_OpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) res = response.json() # Tests related to nodes self.assertEqual(response.status_code, requests.codes.ok) @@ -299,8 +285,7 @@ class TransportPCEtesting(unittest.TestCase): # Connect the tail XPDRA to ROADMA and vice versa def test_10_connect_tail_xpdr_rdm(self): # Connect the tail: XPDRA to ROADMA - url = ("{}/operations/transportpce-networkutils:init-xpdr-rdm-links" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links" data = {"networkutils:input": { "networkutils:links-input": { "networkutils:xpdr-node": "XPDR-A1", @@ -312,15 +297,12 @@ class TransportPCEtesting(unittest.TestCase): } } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) def test_11_connect_tail_rdm_xpdr(self): # Connect the tail: ROADMA to XPDRA - url = ("{}/operations/transportpce-networkutils:init-rdm-xpdr-links" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links" data = {"networkutils:input": { "networkutils:links-input": { "networkutils:xpdr-node": "XPDR-A1", @@ -332,16 +314,12 @@ class TransportPCEtesting(unittest.TestCase): } } } - 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.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) def test_12_getLinks_OpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links @@ -395,7 +373,7 @@ class TransportPCEtesting(unittest.TestCase): url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" "OMS-attributes/span" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -404,9 +382,7 @@ class TransportPCEtesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.put_request(url, data) self.assertEqual(response.status_code, requests.codes.created) def test_15_omsAttributes_ROADMC_ROADMA(self): @@ -414,7 +390,7 @@ class TransportPCEtesting(unittest.TestCase): url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" "OMS-attributes/span" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -424,16 +400,12 @@ class TransportPCEtesting(unittest.TestCase): "SRLG-length": 100000, "pmd": 0.5}]}} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.put_request(url, data) self.assertEqual(response.status_code, requests.codes.created) def test_16_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .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)) + url = "{}/config/ietf-network:networks/network/clli-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -450,10 +422,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(listNode), 0) def test_17_getOpenRoadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -482,10 +452,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(listNode), 0) def test_18_getROADMLinkOpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links @@ -540,10 +508,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(XPDR_OUT), 0) def test_19_getLinkOmsAttributesOpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links @@ -567,10 +533,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(R2RLink), 0) def test_20_getNodes_OpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) res = response.json() # Tests related to nodes self.assertEqual(response.status_code, requests.codes.ok) @@ -686,7 +650,7 @@ class TransportPCEtesting(unittest.TestCase): url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" "OMS-attributes/span" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -697,9 +661,7 @@ class TransportPCEtesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.put_request(url, data) self.assertEqual(response.status_code, requests.codes.created) def test_23_omsAttributes_ROADMB_ROADMA(self): @@ -707,7 +669,7 @@ class TransportPCEtesting(unittest.TestCase): url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" "OMS-attributes/span" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -718,9 +680,7 @@ class TransportPCEtesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.put_request(url, data) self.assertEqual(response.status_code, requests.codes.created) def test_24_omsAttributes_ROADMB_ROADMC(self): @@ -728,7 +688,7 @@ class TransportPCEtesting(unittest.TestCase): url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" "OMS-attributes/span" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -739,9 +699,7 @@ class TransportPCEtesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.put_request(url, data) self.assertEqual(response.status_code, requests.codes.created) def test_25_omsAttributes_ROADMC_ROADMB(self): @@ -749,7 +707,7 @@ class TransportPCEtesting(unittest.TestCase): url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" "OMS-attributes/span" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -758,16 +716,12 @@ class TransportPCEtesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.put_request(url, data) self.assertEqual(response.status_code, requests.codes.created) def test_26_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .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)) + url = "{}/config/ietf-network:networks/network/clli-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -786,10 +740,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(listNode), 0) def test_27_verifyDegree(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links @@ -806,10 +758,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(listR2RLink), 0) def test_28_verifyOppositeLinkTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links @@ -823,9 +773,7 @@ class TransportPCEtesting(unittest.TestCase): oppLink_id = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:opposite-link'] # Find the opposite link url_oppLink = "{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:link/"+oppLink_id - url = (url_oppLink.format(test_utils.RESTCONF_BASE_URL)) - response_oppLink = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response_oppLink = test_utils.get_request(url_oppLink) self.assertEqual(response_oppLink.status_code, requests.codes.ok) res_oppLink = response_oppLink.json() self.assertEqual(res_oppLink['ietf-network-topology:link'][0] @@ -847,10 +795,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(oppLink_type, 'XPONDER-INPUT') def test_29_getLinkOmsAttributesOpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbLink = len(res['network'][0]['ietf-network-topology:link']) @@ -879,12 +825,9 @@ class TransportPCEtesting(unittest.TestCase): # Delete in the topology-netconf response = test_utils.unmount_device("ROADM-B1") # Delete in the clli-network - url = ("{}/config/ietf-network:networks/network/clli-network/node/NodeB" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/config/ietf-network:networks/network/clli-network/node/NodeB" data = {} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.delete_request(url) self.assertEqual(response.status_code, requests.codes.ok) def test_31_disconnect_ROADMC(self): @@ -892,19 +835,14 @@ class TransportPCEtesting(unittest.TestCase): response = test_utils.unmount_device("ROADM-C1") self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) # Delete in the clli-network - url = ("{}/config/ietf-network:networks/network/clli-network/node/NodeC" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/config/ietf-network:networks/network/clli-network/node/NodeC" data = {} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.delete_request(url) self.assertEqual(response.status_code, requests.codes.ok) # def test_24_check_roadm2roadm_links_deletion(self): -# url = ("{}/config/ietf-network:networks/network/openroadm-topology" -# .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)) +# url = "{}/config/ietf-network:networks/network/openroadm-topology" +# response = test_utils.request(url) # self.assertEqual(response.status_code, requests.codes.ok) # res = response.json() # #Write the response in the log @@ -959,10 +897,8 @@ class TransportPCEtesting(unittest.TestCase): # self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'],'ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX') def test_32_getNodes_OpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) res = response.json() # Tests related to nodes self.assertEqual(response.status_code, requests.codes.ok) @@ -1041,10 +977,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertNotEqual(res['network'][0]['node'][i]['node-id'], 'ROADM-C1-DEG2') def test_33_getOpenRoadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -1054,10 +988,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertNotEqual(res['network'][0]['node'][i]['node-id'], 'ROADM-B1') def test_34_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .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)) + url = "{}/config/ietf-network:networks/network/clli-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -1070,10 +1002,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) def test_36_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .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)) + url = "{}/config/ietf-network:networks/network/clli-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -1081,10 +1011,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][0]['org-openroadm-clli-network:clli'], 'NodeA') def test_37_getOpenRoadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -1093,10 +1021,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertNotEqual(res['network'][0]['node'][i]['node-id'], 'XPDR-A1') def test_38_getNodes_OpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) res = response.json() # Tests related to nodes self.assertEqual(response.status_code, requests.codes.ok) @@ -1150,27 +1076,21 @@ class TransportPCEtesting(unittest.TestCase): # Link-1 url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.delete_request(url) self.assertEqual(response.status_code, requests.codes.ok) # Link-2 url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1" - .format(test_utils.RESTCONF_BASE_URL)) + ) data = {} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.delete_request(url) self.assertEqual(response.status_code, requests.codes.ok) def test_40_getLinks_OpenRoadmTopology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbLink = len(res['network'][0]['ietf-network-topology:link']) @@ -1214,37 +1134,28 @@ class TransportPCEtesting(unittest.TestCase): response = test_utils.unmount_device("ROADM-A1") self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) # Delete in the clli-network - url = ("{}/config/ietf-network:networks/network/clli-network/node/NodeA" - .format(test_utils.RESTCONF_BASE_URL)) + url = "{}/config/ietf-network:networks/network/clli-network/node/NodeA" data = {} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, - auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.delete_request(url) self.assertEqual(response.status_code, requests.codes.ok) def test_42_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .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)) + url = "{}/config/ietf-network:networks/network/clli-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn('node', res['network'][0]) def test_43_getOpenRoadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-network" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn('node', res['network'][0]) def test_44_check_roadm2roadm_link_persistence(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .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)) + url = "{}/config/ietf-network:networks/network/openroadm-topology" + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbLink = len(res['network'][0]['ietf-network-topology:link']) diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py index b0daf88fb..9dfd69448 100644 --- a/tests/transportpce_tests/common/test_utils.py +++ b/tests/transportpce_tests/common/test_utils.py @@ -122,28 +122,70 @@ def install_karaf_feature(feature_name: str): universal_newlines=True) -def post_request(url, data, username, password): +def get_request(url): return requests.request( - "POST", url, data=json.dumps(data), - headers=TYPE_APPLICATION_JSON, auth=(username, password)) + "GET", url.format(RESTCONF_BASE_URL), + headers=TYPE_APPLICATION_JSON, + auth=(ODL_LOGIN, ODL_PWD)) + + +def post_request(url, data): + if data: + return requests.request( + "POST", url.format(RESTCONF_BASE_URL), + data=json.dumps(data), + headers=TYPE_APPLICATION_JSON, + auth=(ODL_LOGIN, ODL_PWD)) + else: + return requests.request( + "POST", url.format(RESTCONF_BASE_URL), + headers=TYPE_APPLICATION_JSON, + auth=(ODL_LOGIN, ODL_PWD)) + + +def post_xmlrequest(url, data): + if data: + return requests.request( + "POST", url.format(RESTCONF_BASE_URL), + data=data, + headers=TYPE_APPLICATION_XML, + auth=(ODL_LOGIN, ODL_PWD)) + + +def put_request(url, data): + return requests.request( + "PUT", url.format(RESTCONF_BASE_URL), + data=json.dumps(data), + headers=TYPE_APPLICATION_JSON, + auth=(ODL_LOGIN, ODL_PWD)) -def put_request(url, data, username, password): +def put_xmlrequest(url, data): return requests.request( - "PUT", url, data=json.dumps(data), headers=TYPE_APPLICATION_JSON, - auth=(username, password)) + "PUT", url.format(RESTCONF_BASE_URL), + data=data, + headers=TYPE_APPLICATION_XML, + auth=(ODL_LOGIN, ODL_PWD)) -def delete_request(url, username, password): +def rawput_request(url, data): return requests.request( - "DELETE", url, headers=TYPE_APPLICATION_JSON, - auth=(username, password)) + "PUT", url.format(RESTCONF_BASE_URL), + data=data, + headers=TYPE_APPLICATION_JSON, + auth=(ODL_LOGIN, ODL_PWD)) + + +def delete_request(url): + return requests.request( + "DELETE", url.format(RESTCONF_BASE_URL), + headers=TYPE_APPLICATION_JSON, + auth=(ODL_LOGIN, ODL_PWD)) def mount_device(node_id, sim): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/" - + node_id).format(RESTCONF_BASE_URL) - headers = {"node": [{ + url = "{}/config/network-topology:network-topology/topology/topology-netconf/node/"+node_id + body = {"node": [{ "node-id": node_id, "netconf-node-topology:username": NODES_LOGIN, "netconf-node-topology:password": NODES_PWD, @@ -151,7 +193,7 @@ def mount_device(node_id, sim): "netconf-node-topology:port": SIMS[sim]['port'], "netconf-node-topology:tcp-only": "false", "netconf-node-topology:pass-through": {}}]} - response = put_request(url, headers, ODL_LOGIN, ODL_PWD) + response = put_request(url, body) if wait_until_log_contains(TPCE_LOG, re.escape("Triggering notification stream NETCONF for node "+node_id), 60): print("Node "+node_id+" correctly added to tpce topology", end='... ', flush=True) else: @@ -163,9 +205,8 @@ def mount_device(node_id, sim): def unmount_device(node_id): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/" - + node_id).format(RESTCONF_BASE_URL) - response = delete_request(url, ODL_LOGIN, ODL_PWD) + url = "{}/config/network-topology:network-topology/topology/topology-netconf/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) else: @@ -173,8 +214,27 @@ def unmount_device(node_id): return response -def generate_link_data(xpdr_node: str, xpdr_num: str, network_num: str, rdm_node: str, srg_num: str, - termination_num: str): +def connect_xpdr_to_rdm_request(xpdr_node: str, xpdr_num: str, network_num: str, + rdm_node: str, srg_num: str, termination_num: str): + url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links" + data = { + "networkutils:input": { + "networkutils:links-input": { + "networkutils:xpdr-node": xpdr_node, + "networkutils:xpdr-num": xpdr_num, + "networkutils:network-num": network_num, + "networkutils:rdm-node": rdm_node, + "networkutils:srg-num": srg_num, + "networkutils:termination-point-num": termination_num + } + } + } + return post_request(url, data) + + +def connect_rdm_to_xpdr_request(xpdr_node: str, xpdr_num: str, network_num: str, + rdm_node: str, srg_num: str, termination_num: str): + url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links" data = { "networkutils:input": { "networkutils:links-input": { @@ -187,7 +247,7 @@ def generate_link_data(xpdr_node: str, xpdr_num: str, network_num: str, rdm_node } } } - return data + return post_request(url, data) def shutdown_process(process): @@ -222,13 +282,13 @@ def wait_until_log_contains(log_file, regexp, time_to_wait=20): while True: line = filelogs.readline() if compiled_regexp.search(line): - print("String found!", end=' ') + print("Pattern found!", end=' ') stringfound = True break if not line: time.sleep(0.1) except TimeoutError: - print("String not found after "+str(time_to_wait), end=" seconds! ", flush=True) + print("Pattern not found after "+str(time_to_wait), end=" seconds! ", flush=True) except PermissionError: print("Permission Error when trying to access the log file", end=" ... ", flush=True) finally: -- 2.36.6