X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F2.2.1%2Ftest_end2end.py;h=a2fad0916de78c978865b8dda4b539cbe3f8e851;hb=d81a3d491cbc1566f4bf93a4c28438be19687dbc;hp=dd92540c44aca23052cdf7f550304b19a8225941;hpb=c8bd98e0844257ae2e40e01d54546a40596df26d;p=transportpce.git diff --git a/tests/transportpce_tests/2.2.1/test_end2end.py b/tests/transportpce_tests/2.2.1/test_end2end.py index dd92540c4..a2fad0916 100644 --- a/tests/transportpce_tests/2.2.1/test_end2end.py +++ b/tests/transportpce_tests/2.2.1/test_end2end.py @@ -9,15 +9,10 @@ ############################################################################## +import unittest import json -import os -import psutil -import requests -import signal -import shutil -import subprocess import time -import unittest +import requests from common import test_utils @@ -57,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"]) @@ -148,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, @@ -160,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, @@ -181,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", @@ -278,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', @@ -288,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( @@ -305,12 +233,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_13_check_xc1_ROADMA(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("ROADM-A1", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -331,12 +254,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(5) def test_14_check_xc1_ROADMC(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-C1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("ROADM-C1", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -357,10 +275,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'] @@ -376,10 +292,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}, @@ -395,10 +309,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}, @@ -416,96 +328,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", @@ -594,9 +449,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', @@ -604,10 +457,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( @@ -622,12 +473,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(1) def test_24_check_xc2_ROADMA(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/DEG2-TTP-TXRX-SRG1-PP2-TXRX-2" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("ROADM-A1", "roadm-connections/DEG2-TTP-TXRX-SRG1-PP2-TXRX-2") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -646,10 +492,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'] @@ -667,10 +511,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] @@ -697,10 +539,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] @@ -725,8 +565,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", @@ -815,9 +654,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', @@ -827,8 +664,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", @@ -842,9 +678,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', @@ -853,8 +687,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", @@ -868,9 +701,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', @@ -878,8 +709,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", @@ -893,9 +723,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', @@ -903,21 +731,15 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(20) def test_32_check_no_xc_ROADMA(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("ROADM-A1", "") res = response.json() self.assertEqual(response.status_code, requests.codes.ok) self.assertNotIn('roadm-connections', dict.keys(res['org-openroadm-device'])) 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'] @@ -932,10 +754,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] @@ -951,10 +771,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] @@ -971,8 +789,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", @@ -1061,9 +878,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', @@ -1071,10 +886,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( @@ -1089,12 +902,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(1) def test_38_check_xc1_ROADMA(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("ROADM-A1", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -1115,12 +923,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(7) def test_39_check_xc1_ROADMC(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-C1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("ROADM-C1", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -1141,8 +944,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", @@ -1231,9 +1033,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', @@ -1241,10 +1041,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( @@ -1259,12 +1057,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_42_check_xc2_ROADMA(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/SRG1-PP2-TXRX-DEG2-TTP-TXRX-2" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("ROADM-A1", "roadm-connections/SRG1-PP2-TXRX-DEG2-TTP-TXRX-2") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -1290,8 +1083,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", @@ -1305,9 +1097,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', @@ -1315,8 +1105,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", @@ -1330,9 +1119,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', @@ -1341,10 +1128,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( @@ -1354,11 +1139,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(1) def test_47_get_no_xc_ROADMA(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf" - "/node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("ROADM-A1", "") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn(['roadm-connections'][0], res['org-openroadm-device']) @@ -1370,7 +1151,7 @@ class TransportPCEFulltesting(unittest.TestCase): def test_49_loop_create_eth_service(self): for i in range(1, 6): - print("trial number {}".format(i)) + print("iteration number {}".format(i)) print("eth service creation") self.test_11_create_eth_service1() print("check xc in ROADM-A1") @@ -1381,12 +1162,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", @@ -1400,12 +1179,11 @@ 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): - print("trial number {}".format(i)) + print("iteration number {}".format(i)) print("oc service creation") self.test_36_create_oc_service1() print("check xc in ROADM-A1")