X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F1.2.1%2Ftest_end2end.py;h=abba02530dc5c8b31b85d0613065daafea20359e;hb=78441ef64aae46fc7a050bbe0c1b85ddb7b16123;hp=3fad3d284b05c931c8cd5a0e18381c083212fa1f;hpb=f9bb9e323c48640b14908cbc4101c2ad41b1de60;p=transportpce.git diff --git a/tests/transportpce_tests/1.2.1/test_end2end.py b/tests/transportpce_tests/1.2.1/test_end2end.py index 3fad3d284..abba02530 100644 --- a/tests/transportpce_tests/1.2.1/test_end2end.py +++ b/tests/transportpce_tests/1.2.1/test_end2end.py @@ -10,315 +10,16 @@ import json -import signal import time import unittest -import psutil import requests -import test_utils +from common import test_utils class TransportPCEFulltesting(unittest.TestCase): - headers = {'content-type': 'application/json'} - odl_process = None - sim_process1 = None - sim_process2 = None - sim_process3 = None - sim_process4 = None - restconf_baseurl = "http://localhost:8181/restconf" - WAITING = 20 # nominal value is 300 - # START_IGNORE_XTESTING - - @classmethod - def setUpClass(cls): - cls.sim_process1 = test_utils.start_sim('xpdra') - time.sleep(20) - - cls.sim_process2 = test_utils.start_sim('roadma-full') - time.sleep(20) - - cls.sim_process3 = test_utils.start_sim('roadmc-full') - time.sleep(20) - - cls.sim_process4 = test_utils.start_sim('xpdrc') - time.sleep(20) - print("all sims started") - - cls.odl_process = test_utils.start_tpce() - time.sleep(80) - print("opendaylight started") - - @classmethod - def tearDownClass(cls): - for child in psutil.Process(cls.odl_process.pid).children(): - child.send_signal(signal.SIGINT) - child.wait() - cls.odl_process.send_signal(signal.SIGINT) - cls.odl_process.wait() - for child in psutil.Process(cls.sim_process1.pid).children(): - child.send_signal(signal.SIGINT) - child.wait() - cls.sim_process1.send_signal(signal.SIGINT) - cls.sim_process1.wait() - for child in psutil.Process(cls.sim_process2.pid).children(): - child.send_signal(signal.SIGINT) - child.wait() - cls.sim_process2.send_signal(signal.SIGINT) - cls.sim_process2.wait() - for child in psutil.Process(cls.sim_process3.pid).children(): - child.send_signal(signal.SIGINT) - child.wait() - cls.sim_process3.send_signal(signal.SIGINT) - cls.sim_process3.wait() - for child in psutil.Process(cls.sim_process4.pid).children(): - child.send_signal(signal.SIGINT) - child.wait() - cls.sim_process4.send_signal(signal.SIGINT) - cls.sim_process4.wait() - print("all processes killed") - - def setUp(self): # instruction executed before each test method - print("execution of {}".format(self.id().split(".")[-1])) - - # END_IGNORE_XTESTING - - # connect netconf devices - def test_01_connect_xpdrA(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/XPDRA01" - .format(self.restconf_baseurl)) - data = {"node": [{ - "node-id": "XPDRA01", - "netconf-node-topology:username": "admin", - "netconf-node-topology:password": "admin", - "netconf-node-topology:host": "127.0.0.1", - "netconf-node-topology:port": test_utils.sims['xpdra']['port'], - "netconf-node-topology:tcp-only": "false", - "netconf-node-topology:pass-through": {}}]} - headers = {'content-type': 'application/json'} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.created) - time.sleep(20) - - def test_02_connect_xpdrC(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/XPDRC01" - .format(self.restconf_baseurl)) - data = {"node": [{ - "node-id": "XPDRC01", - "netconf-node-topology:username": "admin", - "netconf-node-topology:password": "admin", - "netconf-node-topology:host": "127.0.0.1", - "netconf-node-topology:port": test_utils.sims['xpdrc']['port'], - "netconf-node-topology:tcp-only": "false", - "netconf-node-topology:pass-through": {}}]} - headers = {'content-type': 'application/json'} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.created) - time.sleep(20) - - def test_03_connect_rdmA(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADMA01" - .format(self.restconf_baseurl)) - data = {"node": [{ - "node-id": "ROADMA01", - "netconf-node-topology:username": "admin", - "netconf-node-topology:password": "admin", - "netconf-node-topology:host": "127.0.0.1", - "netconf-node-topology:port": test_utils.sims['roadma-full']['port'], - "netconf-node-topology:tcp-only": "false", - "netconf-node-topology:pass-through": {}}]} - headers = {'content-type': 'application/json'} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.created) - time.sleep(20) - - def test_04_connect_rdmC(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADMC01" - .format(self.restconf_baseurl)) - data = {"node": [{ - "node-id": "ROADMC01", - "netconf-node-topology:username": "admin", - "netconf-node-topology:password": "admin", - "netconf-node-topology:host": "127.0.0.1", - "netconf-node-topology:port": test_utils.sims['roadmc-full']['port'], - "netconf-node-topology:tcp-only": "false", - "netconf-node-topology:pass-through": {}}]} - headers = {'content-type': 'application/json'} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.created) - time.sleep(20) - - def test_05_connect_xprdA_N1_to_roadmA_PP1(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".\ - format(self.restconf_baseurl) - 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" - } - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) - 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(self.restconf_baseurl) - 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" - } - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) - 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(self.restconf_baseurl) - 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" - } - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) - 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(self.restconf_baseurl) - 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" - } - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) - 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_09_add_omsAttributes_ROADMA_ROADMC(self): - # Config ROADMA-ROADMC oms-attributes - 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(self.restconf_baseurl)) - data = {"span": { - "clfi": "fiber1", - "auto-spanloss": "true", - "spanloss-base": 11.4, - "spanloss-current": 12, - "engineered-spanloss": 12.2, - "link-concatenation": [{ - "SRLG-Id": 0, - "fiber-type": "smf", - "SRLG-length": 100000, - "pmd": 0.5}]}} - headers = {'content-type': 'application/json'} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - 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/ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX/" - "org-openroadm-network-topology:" - "OMS-attributes/span" - .format(self.restconf_baseurl)) - data = {"span": { - "clfi": "fiber1", - "auto-spanloss": "true", - "spanloss-base": 11.4, - "spanloss-current": 12, - "engineered-spanloss": 12.2, - "link-concatenation": [{ - "SRLG-Id": 0, - "fiber-type": "smf", - "SRLG-length": 100000, - "pmd": 0.5}]}} - headers = {'content-type': 'application/json'} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - 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(self.restconf_baseurl)) - data = { - "input": { + cr_serv_sample_data = { "input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", "rpc-action": "service-create", @@ -415,11 +116,126 @@ class TransportPCEFulltesting(unittest.TestCase): "operator-contact": "pw1234" } } - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + processes = None + WAITING = 20 + + @classmethod + def setUpClass(cls): + cls.processes = test_utils.start_tpce() + cls.processes = test_utils.start_sims(['xpdra', 'roadma-full', 'roadmc-full', 'xpdrc']) + + @classmethod + def tearDownClass(cls): + for process in cls.processes: + test_utils.shutdown_process(process) + print("all processes killed") + + def setUp(self): # instruction executed before each test method + print("execution of {}".format(self.id().split(".")[-1])) + + # connect netconf devices + def test_01_connect_xpdrA(self): + response = test_utils.mount_device("XPDRA01", 'xpdra') + self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) + + def test_02_connect_xpdrC(self): + response = test_utils.mount_device("XPDRC01", 'xpdrc') + self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) + + def test_03_connect_rdmA(self): + response = test_utils.mount_device("ROADMA01", 'roadma-full') + self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) + + def test_04_connect_rdmC(self): + response = test_utils.mount_device("ROADMC01", 'roadmc-full') + self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) + + def test_05_connect_xprdA_N1_to_roadmA_PP1(self): + 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"]) + time.sleep(2) + + def test_06_connect_roadmA_PP1_to_xpdrA_N1(self): + url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links" + 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 = 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', + res["output"]["result"]) + time.sleep(2) + + def test_07_connect_xprdC_N1_to_roadmC_PP1(self): + 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"]) + time.sleep(2) + + def test_08_connect_roadmC_PP1_to_xpdrC_N1(self): + 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"]) + time.sleep(2) + + def test_09_add_omsAttributes_ROADMA_ROADMC(self): + # Config ROADMA-ROADMC oms-attributes + data = {"span": { + "clfi": "fiber1", + "auto-spanloss": "true", + "spanloss-base": 11.4, + "spanloss-current": 12, + "engineered-spanloss": 12.2, + "link-concatenation": [{ + "SRLG-Id": 0, + "fiber-type": "smf", + "SRLG-length": 100000, + "pmd": 0.5}]}} + response = test_utils.add_oms_attr_request("ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX", data) + self.assertEqual(response.status_code, requests.codes.created) + + def test_10_add_omsAttributes_ROADMC_ROADMA(self): + # Config ROADMC-ROADMA oms-attributes + data = {"span": { + "clfi": "fiber1", + "auto-spanloss": "true", + "spanloss-base": 11.4, + "spanloss-current": 12, + "engineered-spanloss": 12.2, + "link-concatenation": [{ + "SRLG-Id": 0, + "fiber-type": "smf", + "SRLG-length": 100000, + "pmd": 0.5}]}} + response = test_utils.add_oms_attr_request("ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX", 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): + self.cr_serv_sample_data["input"]["service-name"] = "service1" + response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -428,12 +244,7 @@ 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(self.restconf_baseurl)) - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.get_service_list_request("services/service1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -448,16 +259,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_13_check_xc1_ROADMA(self): - url = ( - "{}/config/network-topology:" - "network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:" - "mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -479,16 +281,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(5) def test_14_check_xc1_ROADMC(self): - url = ( - "{}/config/network-topology:" - "network-topology/topology/topology-netconf/" - "node/ROADMC01/yang-ext:mount/org-openroadm-device:" - "org-openroadm-device/" - "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -510,24 +303,15 @@ 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(self.restconf_baseurl)) - response = requests.request( - "GET", url1, auth=('admin', 'admin')) + response = test_utils.get_ordm_topo_request("node/XPDRA01-XPDR1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() liste_tp = res['node'][0]['ietf-network-topology:termination-point'] for ele in liste_tp: if ele['tp-id'] == 'XPDR1-NETWORK1': self.assertEqual({u'frequency': 196.1, u'width': 40}, - ele[ - 'org-openroadm-network-topology:' - 'xpdr-network-attributes'][ - 'wavelength']) - if ele['tp-id'] == 'XPDR1-CLIENT1' or \ - ele['tp-id'] == 'XPDR1-CLIENT3': + ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']) + if ele['tp-id'] == 'XPDR1-CLIENT1' or ele['tp-id'] == 'XPDR1-CLIENT3': self.assertNotIn( 'org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele)) @@ -538,12 +322,7 @@ 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(self.restconf_baseurl)) - response = requests.request( - "GET", url1, auth=('admin', 'admin')) + response = test_utils.get_ordm_topo_request("node/ROADMA01-SRG1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn({u'index': 1}, @@ -562,12 +341,7 @@ 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(self.restconf_baseurl)) - response = requests.request( - "GET", url1, auth=('admin', 'admin')) + response = test_utils.get_ordm_topo_request("node/ROADMA01-DEG1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn({u'index': 1}, @@ -590,24 +364,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(self.restconf_baseurl) - 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" - } - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) + 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', @@ -615,24 +373,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(self.restconf_baseurl) - 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" - } - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) + 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', @@ -640,24 +382,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(self.restconf_baseurl) - 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" - } - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) + 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', @@ -665,24 +391,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(self.restconf_baseurl) - 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" - } - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) + 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', @@ -690,111 +400,8 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_22_create_eth_service2(self): - url = ("{}/operations/org-openroadm-service:service-create" - .format(self.restconf_baseurl)) - data = { - "input": { - "sdnc-request-header": { - "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", - "rpc-action": "service-create", - "request-system-id": "appname", - "notification-url": - "http://localhost:8585/NotificationServer/notify" - }, - "service-name": "service2", - "common-id": "ASATT1234567", - "connection-type": "service", - "service-a-end": { - "service-rate": "100", - "node-id": "XPDRA01", - "service-format": "Ethernet", - "clli": "SNJSCAMCJP8", - "tx-direction": { - "port": { - "port-device-name": - "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": - "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.3", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": - "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": - "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.4", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "service-z-end": { - "service-rate": "100", - "node-id": "XPDRC01", - "service-format": "Ethernet", - "clli": "SNJSCAMCJT4", - "tx-direction": { - "port": { - "port-device-name": - "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": - "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.29", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": - "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": - "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.30", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "due-date": "2016-11-28T00:00:01Z", - "operator-contact": "pw1234" - } - } - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + self.cr_serv_sample_data["input"]["service-name"] = "service2" + response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -803,13 +410,7 @@ 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(self.restconf_baseurl)) - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.get_service_list_request("services/service2") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -824,16 +425,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(1) def test_24_check_xc2_ROADMA(self): - url = ( - "{}/config/network-topology:" - "network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:" - "mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/DEG1-TTP-TXRX-SRG1-PP2-TXRX-2" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/DEG1-TTP-TXRX-SRG1-PP2-TXRX-2") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -853,12 +445,7 @@ 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(self.restconf_baseurl)) - response = requests.request( - "GET", url1, auth=('admin', 'admin')) + response = test_utils.get_ordm_topo_request("node/XPDRA01-XPDR1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() liste_tp = res['node'][0]['ietf-network-topology:termination-point'] @@ -877,187 +464,74 @@ class TransportPCEFulltesting(unittest.TestCase): ele['tp-id'] == 'XPDR1-CLIENT3': self.assertNotIn( 'org-openroadm-network-topology:xpdr-client-attributes', - dict.keys(ele)) - time.sleep(10) - - def test_26_check_topo_ROADMA_SRG1(self): - url1 = ( - "{}/config/ietf-network:" - "networks/network/openroadm-topology/node/ROADMA01-SRG1" - .format(self.restconf_baseurl)) - response = requests.request( - "GET", url1, auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertNotIn({u'index': 1}, res['node'][0][ - u'org-openroadm-network-topology:srg-attributes'][ - 'available-wavelengths']) - self.assertNotIn({u'index': 2}, res['node'][0][ - u'org-openroadm-network-topology:srg-attributes'][ - 'available-wavelengths']) - liste_tp = res['node'][0]['ietf-network-topology:termination-point'] - for ele in liste_tp: - if ele['tp-id'] == 'SRG1-PP1-TXRX': - self.assertIn({u'index': 1, u'frequency': 196.1, u'width': 40}, - ele['org-openroadm-network-topology:' - 'pp-attributes']['used-wavelength']) - self.assertNotIn({u'index': 2, u'frequency': 196.05, - u'width': 40}, - ele['org-openroadm-network-topology:' - 'pp-attributes']['used-wavelength']) - if ele['tp-id'] == 'SRG1-PP2-TXRX': - self.assertIn({u'index': 2, u'frequency': 196.05, u'width': 40}, - ele['org-openroadm-network-topology:' - 'pp-attributes']['used-wavelength']) - self.assertNotIn({u'index': 1, u'frequency': 196.1, - u'width': 40}, - ele['org-openroadm-network-topology:' - 'pp-attributes']['used-wavelength']) - if ele['tp-id'] == 'SRG1-PP3-TXRX': - self.assertNotIn('org-openroadm-network-topology:pp-attributes', - dict.keys(ele)) - time.sleep(10) - - def test_27_check_topo_ROADMA_DEG1(self): - url1 = ( - "{}/config/ietf-network:" - "networks/network/openroadm-topology/node/ROADMA01-DEG1" - .format(self.restconf_baseurl)) - response = requests.request( - "GET", url1, auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertNotIn({u'index': 1}, res['node'][0][ - u'org-openroadm-network-topology:degree-attributes'][ - 'available-wavelengths']) - self.assertNotIn({u'index': 2}, res['node'][0][ - u'org-openroadm-network-topology:degree-attributes'][ - 'available-wavelengths']) - liste_tp = res['node'][0]['ietf-network-topology:termination-point'] - for ele in liste_tp: - if ele['tp-id'] == 'DEG1-CTP-TXRX': - self.assertIn({u'index': 1, u'frequency': 196.1, u'width': 40}, - ele['org-openroadm-network-topology:' - 'ctp-attributes']['used-wavelengths']) - self.assertIn({u'index': 2, u'frequency': 196.05, u'width': 40}, - ele['org-openroadm-network-topology:' - 'ctp-attributes']['used-wavelengths']) - if ele['tp-id'] == 'DEG1-TTP-TXRX': - self.assertIn({u'index': 1, u'frequency': 196.1, u'width': 40}, - ele['org-openroadm-network-topology:' - 'tx-ttp-attributes']['used-wavelengths']) - self.assertIn({u'index': 2, u'frequency': 196.05, u'width': 40}, - ele['org-openroadm-network-topology:' - 'tx-ttp-attributes']['used-wavelengths']) - time.sleep(10) - - # creation service test on a non-available resource - def test_28_create_eth_service3(self): - url = ("{}/operations/org-openroadm-service:service-create" - .format(self.restconf_baseurl)) - data = { - "input": { - "sdnc-request-header": { - "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", - "rpc-action": "service-create", - "request-system-id": "appname", - "notification-url": - "http://localhost:8585/NotificationServer/notify" - }, - "service-name": "service3", - "common-id": "ASATT1234567", - "connection-type": "service", - "service-a-end": { - "service-rate": "100", - "node-id": "XPDRA01", - "service-format": "Ethernet", - "clli": "SNJSCAMCJP8", - "tx-direction": { - "port": { - "port-device-name": - "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": - "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.3", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": - "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": - "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.4", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "service-z-end": { - "service-rate": "100", - "node-id": "XPDRC01", - "service-format": "Ethernet", - "clli": "SNJSCAMCJT4", - "tx-direction": { - "port": { - "port-device-name": - "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": - "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.29", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": - "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": - "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.30", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "due-date": "2016-11-28T00:00:01Z", - "operator-contact": "pw1234" - } - } - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + dict.keys(ele)) + time.sleep(10) + + def test_26_check_topo_ROADMA_SRG1(self): + response = test_utils.get_ordm_topo_request("node/ROADMA01-SRG1") + self.assertEqual(response.status_code, requests.codes.ok) + res = response.json() + self.assertNotIn({u'index': 1}, res['node'][0][ + u'org-openroadm-network-topology:srg-attributes'][ + 'available-wavelengths']) + self.assertNotIn({u'index': 2}, res['node'][0][ + u'org-openroadm-network-topology:srg-attributes'][ + 'available-wavelengths']) + liste_tp = res['node'][0]['ietf-network-topology:termination-point'] + for ele in liste_tp: + if ele['tp-id'] == 'SRG1-PP1-TXRX': + self.assertIn({u'index': 1, u'frequency': 196.1, u'width': 40}, + ele['org-openroadm-network-topology:' + 'pp-attributes']['used-wavelength']) + self.assertNotIn({u'index': 2, u'frequency': 196.05, + u'width': 40}, + ele['org-openroadm-network-topology:' + 'pp-attributes']['used-wavelength']) + if ele['tp-id'] == 'SRG1-PP2-TXRX': + self.assertIn({u'index': 2, u'frequency': 196.05, u'width': 40}, + ele['org-openroadm-network-topology:' + 'pp-attributes']['used-wavelength']) + self.assertNotIn({u'index': 1, u'frequency': 196.1, + u'width': 40}, + ele['org-openroadm-network-topology:' + 'pp-attributes']['used-wavelength']) + if ele['tp-id'] == 'SRG1-PP3-TXRX': + self.assertNotIn('org-openroadm-network-topology:pp-attributes', + dict.keys(ele)) + time.sleep(10) + + def test_27_check_topo_ROADMA_DEG1(self): + response = test_utils.get_ordm_topo_request("node/ROADMA01-DEG1") + self.assertEqual(response.status_code, requests.codes.ok) + res = response.json() + self.assertNotIn({u'index': 1}, res['node'][0][ + u'org-openroadm-network-topology:degree-attributes'][ + 'available-wavelengths']) + self.assertNotIn({u'index': 2}, res['node'][0][ + u'org-openroadm-network-topology:degree-attributes'][ + 'available-wavelengths']) + liste_tp = res['node'][0]['ietf-network-topology:termination-point'] + for ele in liste_tp: + if ele['tp-id'] == 'DEG1-CTP-TXRX': + self.assertIn({u'index': 1, u'frequency': 196.1, u'width': 40}, + ele['org-openroadm-network-topology:' + 'ctp-attributes']['used-wavelengths']) + self.assertIn({u'index': 2, u'frequency': 196.05, u'width': 40}, + ele['org-openroadm-network-topology:' + 'ctp-attributes']['used-wavelengths']) + if ele['tp-id'] == 'DEG1-TTP-TXRX': + self.assertIn({u'index': 1, u'frequency': 196.1, u'width': 40}, + ele['org-openroadm-network-topology:' + 'tx-ttp-attributes']['used-wavelengths']) + self.assertIn({u'index': 2, u'frequency': 196.05, u'width': 40}, + ele['org-openroadm-network-topology:' + 'tx-ttp-attributes']['used-wavelengths']) + time.sleep(10) + + # creation service test on a non-available resource + def test_28_create_eth_service3(self): + self.cr_serv_sample_data["input"]["service-name"] = "service3" + response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -1071,8 +545,7 @@ class TransportPCEFulltesting(unittest.TestCase): # contains 2 elements def test_29_delete_eth_service3(self): - url = ("{}/operations/org-openroadm-service:service-delete" - .format(self.restconf_baseurl)) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1087,10 +560,7 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + 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', @@ -1101,8 +571,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(20) def test_30_delete_eth_service1(self): - url = ("{}/operations/org-openroadm-service:service-delete" - .format(self.restconf_baseurl)) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1117,10 +586,7 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + 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', @@ -1129,8 +595,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(20) def test_31_delete_eth_service2(self): - url = ("{}/operations/org-openroadm-service:service-delete" - .format(self.restconf_baseurl)) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1145,10 +610,7 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + 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', @@ -1157,14 +619,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(20) def test_32_check_no_xc_ROADMA(self): - url = ( - "{}/config/network-topology:" - "network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:" - "mount/org-openroadm-device:org-openroadm-device/" - .format(self.restconf_baseurl)) - response = requests.request( - "GET", url, auth=('admin', 'admin')) + response = test_utils.check_netconf_node_request("ROADMA01", "") res = response.json() self.assertEqual(response.status_code, requests.codes.ok) self.assertNotIn('roadm-connections', @@ -1172,12 +627,7 @@ 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(self.restconf_baseurl)) - response = requests.request( - "GET", url1, auth=('admin', 'admin')) + response = test_utils.get_ordm_topo_request("node/XPDRA01-XPDR1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() liste_tp = res['node'][0]['ietf-network-topology:termination-point'] @@ -1200,12 +650,7 @@ 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(self.restconf_baseurl)) - response = requests.request( - "GET", url1, auth=('admin', 'admin')) + response = test_utils.get_ordm_topo_request("node/ROADMA01-SRG1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn({u'index': 1}, res['node'][0][ @@ -1226,12 +671,7 @@ 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(self.restconf_baseurl)) - response = requests.request( - "GET", url1, auth=('admin', 'admin')) + response = test_utils.get_ordm_topo_request("node/ROADMA01-DEG1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn({u'index': 1}, res['node'][0][ @@ -1252,111 +692,13 @@ 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(self.restconf_baseurl)) - data = { - "input": { - "sdnc-request-header": { - "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", - "rpc-action": "service-create", - "request-system-id": "appname", - "notification-url": - "http://localhost:8585/NotificationServer/notify" - }, - "service-name": "service1", - "common-id": "ASATT1234567", - "connection-type": "roadm-line", - "service-a-end": { - "service-rate": "100", - "node-id": "ROADMA01", - "service-format": "OC", - "clli": "SNJSCAMCJP8", - "tx-direction": { - "port": { - "port-device-name": - "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": - "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.3", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": - "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": - "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.4", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "service-z-end": { - "service-rate": "100", - "node-id": "ROADMC01", - "service-format": "OC", - "clli": "SNJSCAMCJT4", - "tx-direction": { - "port": { - "port-device-name": - "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": - "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.29", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": - "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": - "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.30", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "due-date": "2016-11-28T00:00:01Z", - "operator-contact": "pw1234" - } - } - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + self.cr_serv_sample_data["input"]["service-name"] = "service1" + self.cr_serv_sample_data["input"]["connection-type"] = "roadm-line" + self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "ROADMA01" + self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "OC" + self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "ROADMC01" + self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "OC" + response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -1365,13 +707,7 @@ 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(self.restconf_baseurl)) - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.get_service_list_request("services/service1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -1386,16 +722,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(1) def test_38_check_xc1_ROADMA(self): - url = ( - "{}/config/network-topology:" - "network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:" - "mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -1417,16 +744,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(7) def test_39_check_xc1_ROADMC(self): - url = ( - "{}/config/network-topology:" - "network-topology/topology/topology-netconf/" - "node/ROADMC01/yang-ext:mount/org-openroadm-device:" - "org-openroadm-device/" - "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -1448,111 +766,13 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(7) def test_40_create_oc_service2(self): - url = ("{}/operations/org-openroadm-service:service-create" - .format(self.restconf_baseurl)) - data = { - "input": { - "sdnc-request-header": { - "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", - "rpc-action": "service-create", - "request-system-id": "appname", - "notification-url": - "http://localhost:8585/NotificationServer/notify" - }, - "service-name": "service2", - "common-id": "ASATT1234567", - "connection-type": "roadm-line", - "service-a-end": { - "service-rate": "100", - "node-id": "ROADMA01", - "service-format": "OC", - "clli": "SNJSCAMCJP8", - "tx-direction": { - "port": { - "port-device-name": - "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": - "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.3", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": - "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": - "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.4", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "service-z-end": { - "service-rate": "100", - "node-id": "ROADMC01", - "service-format": "OC", - "clli": "SNJSCAMCJT4", - "tx-direction": { - "port": { - "port-device-name": - "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": - "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.29", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": - "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": - "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.30", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "due-date": "2016-11-28T00:00:01Z", - "operator-contact": "pw1234" - } - } - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + self.cr_serv_sample_data["input"]["service-name"] = "service2" + self.cr_serv_sample_data["input"]["connection-type"] = "roadm-line" + self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "ROADMA01" + self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "OC" + self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "ROADMC01" + self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "OC" + response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -1561,13 +781,7 @@ 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(self.restconf_baseurl)) - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.get_service_list_request("services/service2") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -1582,16 +796,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_42_check_xc2_ROADMA(self): - url = ( - "{}/config/network-topology:" - "network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:mount/org-openroadm-device:" - "org-openroadm-device/" - "roadm-connections/SRG1-PP2-TXRX-DEG1-TTP-TXRX-2" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP2-TXRX-DEG1-TTP-TXRX-2") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -1618,8 +823,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(3) def test_44_delete_oc_service1(self): - url = ("{}/operations/org-openroadm-service:service-delete" - .format(self.restconf_baseurl)) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1634,10 +838,7 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + 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', @@ -1646,8 +847,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(20) def test_45_delete_oc_service2(self): - url = ("{}/operations/org-openroadm-service:service-delete" - .format(self.restconf_baseurl)) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1662,10 +862,7 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + 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', @@ -1675,12 +872,7 @@ class TransportPCEFulltesting(unittest.TestCase): def test_46_get_no_oc_services(self): print("start test") - url = ("{}/operational/org-openroadm-service:service-list" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.get_service_list_request("") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -1695,16 +887,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(1) def test_47_get_no_xc_ROADMA(self): - url = ( - "{}/config/network-topology:" - "network-topology/topology/topology-netconf" - "/node/ROADMA01/yang-ext:mount/org-openroadm-device:" - "org-openroadm-device/" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.check_netconf_node_request("ROADMA01", "") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn(['roadm-connections'][0], res['org-openroadm-device']) @@ -1716,7 +899,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 ROADMA01") @@ -1727,13 +910,9 @@ 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(self.restconf_baseurl)) - response = requests.request("GET", url, auth=('admin', 'admin')) + response = test_utils.get_service_list_request("services/service1") if response.status_code != 404: - url = ("{}/operations/org-openroadm-service:service-delete" - .format(self.restconf_baseurl)) + url = "{}/operations/org-openroadm-service:service-delete" data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1748,15 +927,11 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - headers = {'content-type': 'application/json'} - requests.request("POST", url, data=json.dumps(data), - headers=headers, - auth=('admin', 'admin') - ) + 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 ROADMA01") @@ -1767,48 +942,20 @@ class TransportPCEFulltesting(unittest.TestCase): self.test_44_delete_oc_service1() def test_51_disconnect_XPDRA(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/XPDRA01" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "DELETE", url, headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - time.sleep(10) + response = test_utils.unmount_device("XPDRA01") + self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) def test_52_disconnect_XPDRC(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/XPDRC01" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "DELETE", url, headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - time.sleep(10) + response = test_utils.unmount_device("XPDRC01") + self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) def test_53_disconnect_ROADMA(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADMA01" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "DELETE", url, headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - time.sleep(10) + response = test_utils.unmount_device("ROADMA01") + self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) def test_54_disconnect_ROADMC(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADMC01" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "DELETE", url, headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - time.sleep(10) + response = test_utils.unmount_device("ROADMC01") + self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) if __name__ == "__main__":