X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F2.2.1%2Ftest_end2end.py;h=dd92540c44aca23052cdf7f550304b19a8225941;hb=c8bd98e0844257ae2e40e01d54546a40596df26d;hp=a5c9de321d5447936678793d76f1865939f74742;hpb=fb27343dc571a64a0690badae85a85ef101c0090;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 a5c9de321..dd92540c4 100644 --- a/tests/transportpce_tests/2.2.1/test_end2end.py +++ b/tests/transportpce_tests/2.2.1/test_end2end.py @@ -18,199 +18,46 @@ import shutil import subprocess import time import unittest +from common import test_utils class TransportPCEFulltesting(unittest.TestCase): - odl_process = None - honeynode_process1 = None - honeynode_process2 = None - honeynode_process3 = None - honeynode_process4 = None - restconf_baseurl = "http://localhost:8181/restconf" - WAITING = 20 #nominal value is 300 - -#START_IGNORE_XTESTING - - @classmethod - def __start_honeynode1(cls): - executable = ("./honeynode/2.2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" - "/honeynode-distribution-1.18.01/honeycomb-tpce") - if os.path.isfile(executable): - with open('honeynode1.log', 'w') as outfile: - cls.honeynode_process1 = subprocess.Popen( - [executable, "17840", "sample_configs/openroadm/2.2.1/oper-XPDRA.xml"], - stdout=outfile) - - @classmethod - def __start_honeynode2(cls): - executable = ("./honeynode/2.2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" - "/honeynode-distribution-1.18.01/honeycomb-tpce") - if os.path.isfile(executable): - with open('honeynode2.log', 'w') as outfile: - cls.honeynode_process2 = subprocess.Popen( - [executable, "17841", "sample_configs/openroadm/2.2.1/oper-ROADMA.xml"], - stdout=outfile) - - @classmethod - def __start_honeynode3(cls): - executable = ("./honeynode/2.2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" - "/honeynode-distribution-1.18.01/honeycomb-tpce") - if os.path.isfile(executable): - with open('honeynode3.log', 'w') as outfile: - cls.honeynode_process3 = subprocess.Popen( - [executable, "17843", "sample_configs/openroadm/2.2.1/oper-ROADMC.xml"], - stdout=outfile) - - @classmethod - def __start_honeynode4(cls): - executable = ("./honeynode/2.2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" - "/honeynode-distribution-1.18.01/honeycomb-tpce") - if os.path.isfile(executable): - with open('honeynode4.log', 'w') as outfile: - cls.honeynode_process4 = subprocess.Popen( - [executable, "17844", "sample_configs/openroadm/2.2.1/oper-XPDRC.xml"], - stdout=outfile) - - @classmethod - def __start_odl(cls): - executable = "../karaf/target/assembly/bin/karaf" - with open('odl.log', 'w') as outfile: - cls.odl_process = subprocess.Popen( - ["bash", executable, "server"], stdout=outfile, - stdin=open(os.devnull)) + processes = None + WAITING = 20 # nominal value is 300 @classmethod def setUpClass(cls): - print ("starting honeynode1") - cls.__start_honeynode1() - time.sleep(40) - print ("starting honeynode2") - cls.__start_honeynode2() - time.sleep(40) - print ("starting honeynode3") - cls.__start_honeynode3() - time.sleep(40) - print ("starting honeynode4") - cls.__start_honeynode4() - time.sleep(40) - print ("starting opendaylight") - cls.__start_odl() - time.sleep(80) + cls.processes = test_utils.start_tpce() + cls.processes = test_utils.start_sims(['xpdra', 'roadma', 'roadmc', 'xpdrc']) @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.honeynode_process1.pid).children(): - child.send_signal(signal.SIGINT) - child.wait() - cls.honeynode_process1.send_signal(signal.SIGINT) - cls.honeynode_process1.wait() - for child in psutil.Process(cls.honeynode_process2.pid).children(): - child.send_signal(signal.SIGINT) - child.wait() - cls.honeynode_process2.send_signal(signal.SIGINT) - cls.honeynode_process2.wait() - for child in psutil.Process(cls.honeynode_process3.pid).children(): - child.send_signal(signal.SIGINT) - child.wait() - cls.honeynode_process3.send_signal(signal.SIGINT) - cls.honeynode_process3.wait() - for child in psutil.Process(cls.honeynode_process4.pid).children(): - child.send_signal(signal.SIGINT) - child.wait() - cls.honeynode_process4.send_signal(signal.SIGINT) - cls.honeynode_process4.wait() - print ("all processes killed") + 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])) - -#END_IGNORE_XTESTING + print("execution of {}".format(self.id().split(".")[-1])) -# connect netconf devices def test_01_connect_xpdrA(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/XPDR-A1" - .format(self.restconf_baseurl)) - data = {"node": [{ - "node-id": "XPDR-A1", - "netconf-node-topology:username": "admin", - "netconf-node-topology:password": "admin", - "netconf-node-topology:host": "127.0.0.1", - "netconf-node-topology:port": "17840", - "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) + response = test_utils.mount_device("XPDR-A1", 'xpdra') + self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_02_connect_xpdrC(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/XPDR-C1" - .format(self.restconf_baseurl)) - data = {"node": [{ - "node-id": "XPDR-C1", - "netconf-node-topology:username": "admin", - "netconf-node-topology:password": "admin", - "netconf-node-topology:host": "127.0.0.1", - "netconf-node-topology:port": "17844", - "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) + response = test_utils.mount_device("XPDR-C1", 'xpdrc') + self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_03_connect_rdmA(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADM-A1" - .format(self.restconf_baseurl)) - data = {"node": [{ - "node-id": "ROADM-A1", - "netconf-node-topology:username": "admin", - "netconf-node-topology:password": "admin", - "netconf-node-topology:host": "127.0.0.1", - "netconf-node-topology:port": "17841", - "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) + response = test_utils.mount_device("ROADM-A1", 'roadma') + self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_04_connect_rdmC(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADM-C1" - .format(self.restconf_baseurl)) - data = {"node": [{ - "node-id": "ROADM-C1", - "netconf-node-topology:username": "admin", - "netconf-node-topology:password": "admin", - "netconf-node-topology:host": "127.0.0.1", - "netconf-node-topology:port": "17843", - "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) + response = test_utils.mount_device("ROADM-C1", 'roadmc') + 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(self.restconf_baseurl) + url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(test_utils.RESTCONF_BASE_URL) data = { "networkutils:input": { "networkutils:links-input": { @@ -223,17 +70,16 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - headers = {'content-type': 'application/json'} response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) + "POST", url, data=json.dumps(data), + headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) 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) + url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(test_utils.RESTCONF_BASE_URL) data = { "networkutils:input": { "networkutils:links-input": { @@ -246,18 +92,16 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - headers = {'content-type': 'application/json'} response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) + "POST", url, data=json.dumps(data), + headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) 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) + url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(test_utils.RESTCONF_BASE_URL) data = { "networkutils:input": { "networkutils:links-input": { @@ -270,18 +114,16 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - headers = {'content-type': 'application/json'} response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) + "POST", url, data=json.dumps(data), + headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) 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) + url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(test_utils.RESTCONF_BASE_URL) data = { "networkutils:input": { "networkutils:links-input": { @@ -294,20 +136,60 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - headers = {'content-type': 'application/json'} response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) + "POST", url, data=json.dumps(data), + headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) 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/ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" + "OMS-attributes/span" + .format(test_utils.RESTCONF_BASE_URL)) + data = {"span": { + "auto-spanloss": "true", + "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 = requests.request( + "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, + auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + self.assertEqual(response.status_code, requests.codes.created) -#test service-create for Eth service from xpdr to xpdr - def test_09_create_eth_service1(self): + 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)) + data = {"span": { + "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 = requests.request( + "PUT", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, + auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + self.assertEqual(response.status_code, requests.codes.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)) + .format(test_utils.RESTCONF_BASE_URL)) data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -394,31 +276,26 @@ class TransportPCEFulltesting(unittest.TestCase): }, "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')) + "POST", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, + auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', - res['output']['configuration-response-common']['response-message']) + res['output']['configuration-response-common']['response-message']) time.sleep(self.WAITING) - def test_10_get_eth_service1(self): + 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"} + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( - res['services'][0]['administrative-state'], - 'inService') + res['services'][0]['administrative-state'], 'inService') self.assertEqual( res['services'][0]['service-name'], 'service1') self.assertEqual( @@ -427,105 +304,119 @@ class TransportPCEFulltesting(unittest.TestCase): res['services'][0]['lifecycle-state'], 'planned') time.sleep(2) - def test_11_check_xc1_ROADMA(self): + 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(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-name': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1', - 'opticalControlMode': 'gainLoss', - 'target-output-power': -3.0}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-name': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1', + 'opticalControlMode': 'gainLoss', + 'target-output-power': -3.0 + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( - {'src-if': 'SRG1-PP1-TXRX-nmc'}, - res['roadm-connections'][0]['source']) + {'src-if': 'SRG1-PP1-TXRX-nmc-1'}, + res['roadm-connections'][0]['source']) self.assertDictEqual( - {'dst-if': 'DEG2-TTP-TXRX-nmc'}, - res['roadm-connections'][0]['destination']) + {'dst-if': 'DEG2-TTP-TXRX-nmc-1'}, + res['roadm-connections'][0]['destination']) time.sleep(5) - def test_12_check_xc1_ROADMC(self): + 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(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-name': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1', - 'opticalControlMode': 'gainLoss', - 'target-output-power': -3.0}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-name': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1', + 'opticalControlMode': 'gainLoss', + 'target-output-power': -3.0 + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( - {'src-if': 'SRG1-PP1-TXRX-nmc'}, - res['roadm-connections'][0]['source']) + {'src-if': 'SRG1-PP1-TXRX-nmc-1'}, + res['roadm-connections'][0]['source']) self.assertDictEqual( - {'dst-if': 'DEG1-TTP-TXRX-nmc'}, - res['roadm-connections'][0]['destination']) + {'dst-if': 'DEG1-TTP-TXRX-nmc-1'}, + res['roadm-connections'][0]['destination']) time.sleep(5) - def test_13_check_topo_XPDRA(self): + def test_15_check_topo_XPDRA(self): url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDR-A1-XPDR1" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url1, auth=('admin', 'admin')) + "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) 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.099999999999994315658113919198513031005859375, - u'width': 1528.76999999999998181010596454143524169921875}, - ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']) + self.assertEqual({u'frequency': 196.1, + u'width': 40}, + ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']) if ele['tp-id'] == 'XPDR1-CLIENT2' or ele['tp-id'] == 'XPDR1-CLIENT1': - self.assertNotIn('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-client-attributes'])) + self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele)) if ele['tp-id'] == 'XPDR1-NETWORK2': - self.assertNotIn('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-network-attributes'])) + self.assertNotIn('org-openroadm-network-topology:xpdr-network-attributes', dict.keys(ele)) time.sleep(3) - def test_14_check_topo_ROADMA_SRG1(self): + def test_16_check_topo_ROADMA_SRG1(self): url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-SRG1" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url1, auth=('admin', 'admin')) + "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) 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': 1}, + 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}, ele['org-openroadm-network-topology:pp-attributes']['used-wavelength']) + self.assertIn({u'index': 1, u'frequency': 196.1, + u'width': 40}, + ele['org-openroadm-network-topology:pp-attributes']['used-wavelength']) if ele['tp-id'] == 'SRG1-PP2-TXRX': self.assertNotIn('used-wavelength', dict.keys(ele)) time.sleep(3) - def test_15_check_topo_ROADMA_DEG1(self): + def test_17_check_topo_ROADMA_DEG1(self): url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-DEG2" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url1, auth=('admin', 'admin')) + "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) 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': 1}, + 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'] == 'DEG2-CTP-TXRX': - self.assertIn({u'index': 1}, ele['org-openroadm-network-topology:ctp-attributes']['used-wavelengths']) + self.assertIn({u'index': 1, u'frequency': 196.1, + u'width': 40}, + ele['org-openroadm-network-topology:ctp-attributes']['used-wavelengths']) if ele['tp-id'] == 'DEG2-TTP-TXRX': - self.assertIn({u'index': 1}, ele['org-openroadm-network-topology:tx-ttp-attributes']['used-wavelengths']) + self.assertIn({u'index': 1, u'frequency': 196.1, + u'width': 40}, + ele['org-openroadm-network-topology:tx-ttp-attributes']['used-wavelengths']) time.sleep(3) - def test_16_connect_xprdA_N2_to_roadmA_PP2(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(self.restconf_baseurl) + 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": { @@ -538,17 +429,16 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - headers = {'content-type': 'application/json'} response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) + "POST", url, data=json.dumps(data), + headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) time.sleep(2) - def test_17_connect_roadmA_PP2_to_xpdrA_N2(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(self.restconf_baseurl) + 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": { @@ -561,17 +451,16 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - headers = {'content-type': 'application/json'} response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) + "POST", url, data=json.dumps(data), + headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) time.sleep(2) - def test_18_connect_xprdC_N2_to_roadmC_PP2(self): - url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(self.restconf_baseurl) + 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": { @@ -584,17 +473,16 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - headers = {'content-type': 'application/json'} response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) + "POST", url, data=json.dumps(data), + headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) time.sleep(2) - def test_19_connect_roadmC_PP2_to_xpdrC_N2(self): - url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(self.restconf_baseurl) + 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": { @@ -607,18 +495,17 @@ class TransportPCEFulltesting(unittest.TestCase): } } } - headers = {'content-type': 'application/json'} response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) + "POST", url, data=json.dumps(data), + headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) time.sleep(2) - def test_20_create_eth_service2(self): + def test_22_create_eth_service2(self): url = ("{}/operations/org-openroadm-service:service-create" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -705,26 +592,22 @@ class TransportPCEFulltesting(unittest.TestCase): }, "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')) + "POST", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, + auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', - res['output']['configuration-response-common']['response-message']) + res['output']['configuration-response-common']['response-message']) time.sleep(self.WAITING) - def test_21_get_eth_service2(self): + 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"} + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -738,93 +621,112 @@ class TransportPCEFulltesting(unittest.TestCase): res['services'][0]['lifecycle-state'], 'planned') time.sleep(1) - def test_22_check_xc2_ROADMA(self): + 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(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-name': 'DEG2-TTP-TXRX-SRG1-PP2-TXRX-2', - 'opticalControlMode': 'power'}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( - {'src-if': 'DEG2-TTP-TXRX-nmc'}, - res['roadm-connections'][0]['source']) + dict({ + 'connection-name': 'DEG2-TTP-TXRX-SRG1-PP2-TXRX-2', + 'opticalControlMode': 'power' + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( - {'dst-if': 'SRG1-PP2-TXRX-nmc'}, - res['roadm-connections'][0]['destination']) + {'src-if': 'DEG2-TTP-TXRX-nmc-2'}, + res['roadm-connections'][0]['source']) + self.assertDictEqual( + {'dst-if': 'SRG1-PP2-TXRX-nmc-2'}, + res['roadm-connections'][0]['destination']) - def test_23_check_topo_XPDRA(self): + def test_25_check_topo_XPDRA(self): url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDR-A1-XPDR1" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url1, auth=('admin', 'admin')) + "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) 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.099999999999994315658113919198513031005859375, - u'width': 1528.76999999999998181010596454143524169921875}, - ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']) + self.assertEqual({u'frequency': 196.1, + u'width': 40}, + ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']) if ele['tp-id'] == 'XPDR1-NETWORK2': - self.assertEqual({u'frequency': 196.04999999999998, - u'width': 1529.16}, - ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']) + self.assertEqual({u'frequency': 196.05, + u'width': 40}, + ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']) if ele['tp-id'] == 'XPDR1-CLIENT1' or ele['tp-id'] == 'XPDR1-CLIENT2': - self.assertNotIn('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-client-attributes'])) + self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele)) time.sleep(10) - def test_24_check_topo_ROADMA_SRG1(self): + def test_26_check_topo_ROADMA_SRG1(self): url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-SRG1" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url1, auth=('admin', 'admin')) + "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) 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']) + 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}, ele['org-openroadm-network-topology:pp-attributes']['used-wavelength']) - self.assertNotIn({u'index': 2}, ele['org-openroadm-network-topology:pp-attributes']['used-wavelength']) + 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}, ele['org-openroadm-network-topology:pp-attributes']['used-wavelength']) - self.assertNotIn({u'index': 1}, ele['org-openroadm-network-topology:pp-attributes']['used-wavelength']) + 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_25_check_topo_ROADMA_DEG2(self): + def test_27_check_topo_ROADMA_DEG2(self): url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-DEG2" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url1, auth=('admin', 'admin')) + "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) 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']) + 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'] == 'DEG2-CTP-TXRX': - self.assertIn({u'index': 1}, ele['org-openroadm-network-topology:ctp-attributes']['used-wavelengths']) - self.assertIn({u'index': 2}, ele['org-openroadm-network-topology:ctp-attributes']['used-wavelengths']) + 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'] == 'DEG2-TTP-TXRX': - self.assertIn({u'index': 1}, ele['org-openroadm-network-topology:tx-ttp-attributes']['used-wavelengths']) - self.assertIn({u'index': 2}, ele['org-openroadm-network-topology:tx-ttp-attributes']['used-wavelengths']) + 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_26_create_eth_service3(self): + def test_28_create_eth_service3(self): url = ("{}/operations/org-openroadm-service:service-create" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -911,25 +813,22 @@ class TransportPCEFulltesting(unittest.TestCase): }, "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')) + "POST", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, + auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', - res['output']['configuration-response-common']['response-message']) + res['output']['configuration-response-common']['response-message']) self.assertIn('200', res['output']['configuration-response-common']['response-code']) time.sleep(self.WAITING) # add a test that check the openroadm-service-list still only contains 2 elements - - def test_27_delete_eth_service3(self): + def test_29_delete_eth_service3(self): url = ("{}/operations/org-openroadm-service:service-delete" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -941,22 +840,21 @@ class TransportPCEFulltesting(unittest.TestCase): "service-name": "service3", "tail-retention": "no" } - } - } - headers = {'content-type': 'application/json'} + } + } response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + "POST", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, + auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Service \'service3\' does not exist in datastore', - res['output']['configuration-response-common']['response-message']) + res['output']['configuration-response-common']['response-message']) self.assertIn('500', res['output']['configuration-response-common']['response-code']) time.sleep(20) - def test_28_delete_eth_service1(self): + def test_30_delete_eth_service1(self): url = ("{}/operations/org-openroadm-service:service-delete" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -968,21 +866,20 @@ class TransportPCEFulltesting(unittest.TestCase): "service-name": "service1", "tail-retention": "no" } - } - } - headers = {'content-type': 'application/json'} + } + } response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + "POST", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, + auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Renderer service delete in progress', - res['output']['configuration-response-common']['response-message']) + res['output']['configuration-response-common']['response-message']) time.sleep(20) - def test_29_delete_eth_service2(self): + def test_31_delete_eth_service2(self): url = ("{}/operations/org-openroadm-service:service-delete" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -994,53 +891,57 @@ class TransportPCEFulltesting(unittest.TestCase): "service-name": "service2", "tail-retention": "no" } - } - } - headers = {'content-type': 'application/json'} + } + } response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + "POST", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, + auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Renderer service delete in progress', - res['output']['configuration-response-common']['response-message']) + res['output']['configuration-response-common']['response-message']) time.sleep(20) - def test_30_check_no_xc_ROADMA(self): + 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(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url, auth=('admin', 'admin')) + "GET", url, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) 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_31_check_topo_XPDRA(self): + def test_33_check_topo_XPDRA(self): url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDR-A1-XPDR1" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url1, auth=('admin', 'admin')) + "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) 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[u'org-openroadm-network-topology:tp-type'] == 'XPONDER-CLIENT': - self.assertNotIn('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-client-attributes'])) - elif ele[u'org-openroadm-network-topology:tp-type'] == 'XPONDER-NETWORK': - self.assertNotIn('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-network-attributes'])) + if ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-CLIENT': + self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele)) + elif (ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-NETWORK'): + self.assertIn(u'tail-equipment-id', + dict.keys(ele[u'org-openroadm-network-topology:xpdr-network-attributes'])) + self.assertNotIn('wavelength', dict.keys( + ele[u'org-openroadm-network-topology:xpdr-network-attributes'])) time.sleep(10) - def test_32_check_topo_ROADMA_SRG1(self): + def test_34_check_topo_ROADMA_SRG1(self): url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-SRG1" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url1, auth=('admin', 'admin')) + "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertIn({u'index': 1}, res['node'][0][u'org-openroadm-network-topology:srg-attributes']['available-wavelengths']) - self.assertIn({u'index': 2}, res['node'][0][u'org-openroadm-network-topology:srg-attributes']['available-wavelengths']) + self.assertIn({u'index': 1}, res['node'][0] + [u'org-openroadm-network-topology:srg-attributes']['available-wavelengths']) + self.assertIn({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' or ele['tp-id'] == 'SRG1-PP1-TXRX': @@ -1049,28 +950,29 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele)) time.sleep(10) - def test_33_check_topo_ROADMA_DEG2(self): + def test_35_check_topo_ROADMA_DEG2(self): url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADM-A1-DEG2" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url1, auth=('admin', 'admin')) + "GET", url1, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertIn({u'index': 1}, res['node'][0][u'org-openroadm-network-topology:degree-attributes']['available-wavelengths']) - self.assertIn({u'index': 2}, res['node'][0][u'org-openroadm-network-topology:degree-attributes']['available-wavelengths']) + self.assertIn({u'index': 1}, res['node'][0] + [u'org-openroadm-network-topology:degree-attributes']['available-wavelengths']) + self.assertIn({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'] == 'DEG2-CTP-TXRX': - self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele)) + self.assertNotIn('org-openroadm-network-topology:ctp-attributes', dict.keys(ele)) if ele['tp-id'] == 'DEG2-TTP-TXRX': - self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele)) + self.assertNotIn('org-openroadm-network-topology:tx-ttp-attributes', dict.keys(ele)) time.sleep(10) - # test service-create for Optical Channel (OC) service from srg-pp to srg-pp - def test_34_create_oc_service1(self): + def test_36_create_oc_service1(self): url = ("{}/operations/org-openroadm-service:service-create" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1157,26 +1059,22 @@ class TransportPCEFulltesting(unittest.TestCase): }, "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')) + "POST", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, + auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', - res['output']['configuration-response-common']['response-message']) + res['output']['configuration-response-common']['response-message']) time.sleep(self.WAITING) - def test_35_get_oc_service1(self): + 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"} + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -1190,55 +1088,61 @@ class TransportPCEFulltesting(unittest.TestCase): res['services'][0]['lifecycle-state'], 'planned') time.sleep(1) - def test_36_check_xc1_ROADMA(self): + 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(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-name': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1', - 'opticalControlMode': 'gainLoss', - 'target-output-power': -3.0}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( - {'src-if': 'SRG1-PP1-TXRX-nmc'}, - res['roadm-connections'][0]['source']) + dict({ + 'connection-name': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1', + 'opticalControlMode': 'gainLoss', + 'target-output-power': -3.0 + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( - {'dst-if': 'DEG2-TTP-TXRX-nmc'}, - res['roadm-connections'][0]['destination']) + {'src-if': 'SRG1-PP1-TXRX-nmc-1'}, + res['roadm-connections'][0]['source']) + self.assertDictEqual( + {'dst-if': 'DEG2-TTP-TXRX-nmc-1'}, + res['roadm-connections'][0]['destination']) time.sleep(7) - def test_37_check_xc1_ROADMC(self): + 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(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-name': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1', - 'opticalControlMode': 'gainLoss', - 'target-output-power': -3.0}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-name': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1', + 'opticalControlMode': 'gainLoss', + 'target-output-power': -3.0 + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( - {'src-if': 'SRG1-PP1-TXRX-nmc'}, - res['roadm-connections'][0]['source']) + {'src-if': 'SRG1-PP1-TXRX-nmc-1'}, + res['roadm-connections'][0]['source']) self.assertDictEqual( - {'dst-if': 'DEG1-TTP-TXRX-nmc'}, - res['roadm-connections'][0]['destination']) + {'dst-if': 'DEG1-TTP-TXRX-nmc-1'}, + res['roadm-connections'][0]['destination']) time.sleep(7) - def test_38_create_oc_service2(self): + def test_40_create_oc_service2(self): url = ("{}/operations/org-openroadm-service:service-create" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1325,26 +1229,22 @@ class TransportPCEFulltesting(unittest.TestCase): }, "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')) + "POST", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, + auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', - res['output']['configuration-response-common']['response-message']) + res['output']['configuration-response-common']['response-message']) time.sleep(self.WAITING) - def test_39_get_oc_service2(self): + 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"} + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -1358,38 +1258,40 @@ class TransportPCEFulltesting(unittest.TestCase): res['services'][0]['lifecycle-state'], 'planned') time.sleep(2) - def test_40_check_xc2_ROADMA(self): + 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(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-name': 'SRG1-PP2-TXRX-DEG2-TTP-TXRX-2', - 'opticalControlMode': 'gainLoss', - 'target-output-power': -3.0}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( - {'src-if': 'SRG1-PP2-TXRX-nmc'}, - res['roadm-connections'][0]['source']) + dict({ + 'connection-name': 'SRG1-PP2-TXRX-DEG2-TTP-TXRX-2', + 'opticalControlMode': 'gainLoss', + 'target-output-power': -3.0 + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( - {'dst-if': 'DEG2-TTP-TXRX-nmc'}, - res['roadm-connections'][0]['destination']) + {'src-if': 'SRG1-PP2-TXRX-nmc-2'}, + res['roadm-connections'][0]['source']) + self.assertDictEqual( + {'dst-if': 'DEG2-TTP-TXRX-nmc-2'}, + res['roadm-connections'][0]['destination']) time.sleep(2) - def test_41_check_topo_ROADMA(self): - self.test_24_check_topo_ROADMA_SRG1() - self.test_25_check_topo_ROADMA_DEG2() + def test_43_check_topo_ROADMA(self): + self.test_26_check_topo_ROADMA_SRG1() + self.test_27_check_topo_ROADMA_DEG2() time.sleep(3) - - def test_42_delete_oc_service1(self): + def test_44_delete_oc_service1(self): url = ("{}/operations/org-openroadm-service:service-delete" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1401,21 +1303,20 @@ class TransportPCEFulltesting(unittest.TestCase): "service-name": "service1", "tail-retention": "no" } - } - } - headers = {'content-type': 'application/json'} + } + } response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + "POST", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, + auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Renderer service delete in progress', - res['output']['configuration-response-common']['response-message']) + res['output']['configuration-response-common']['response-message']) time.sleep(20) - def test_43_delete_oc_service2(self): + def test_45_delete_oc_service2(self): url = ("{}/operations/org-openroadm-service:service-delete" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", @@ -1427,144 +1328,108 @@ class TransportPCEFulltesting(unittest.TestCase): "service-name": "service2", "tail-retention": "no" } - } - } - headers = {'content-type': 'application/json'} + } + } response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + "POST", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, + auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Renderer service delete in progress', - res['output']['configuration-response-common']['response-message']) + res['output']['configuration-response-common']['response-message']) time.sleep(20) - def test_44_get_no_oc_services(self): - print ("start test") + 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"} + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( - {"error-type":"application", "error-tag":"data-missing", - "error-message":"Request could not be completed because the relevant data model content does not exist"}, + {"error-type": "application", "error-tag": "data-missing", + "error-message": "Request could not be completed because the relevant data model content does not exist"}, res['errors']['error']) time.sleep(1) - def test_45_get_no_xc_ROADMA(self): + 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(self.restconf_baseurl)) - headers = {'content-type': 'application/json', - "Accept": "application/json"} + .format(test_utils.RESTCONF_BASE_URL)) response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn(['roadm-connections'][0], res['org-openroadm-device']) time.sleep(1) - def test_46_check_topo_ROADMA(self): - self.test_32_check_topo_ROADMA_SRG1() - self.test_33_check_topo_ROADMA_DEG2() + def test_48_check_topo_ROADMA(self): + self.test_34_check_topo_ROADMA_SRG1() + self.test_35_check_topo_ROADMA_DEG2() - @unittest.expectedFailure - def test_47_loop_create_eth_service(self): - for i in range(1,6): - print ("trial number {}".format(i)) + def test_49_loop_create_eth_service(self): + for i in range(1, 6): + print("trial number {}".format(i)) print("eth service creation") - self.test_09_create_eth_service1() - print ("check xc in ROADM-A1") - self.test_11_check_xc1_ROADMA() - print ("check xc in ROADM-C1") - self.test_12_check_xc1_ROADMC() - print ("eth service deletion\n") - self.test_28_delete_eth_service1() - - @unittest.expectedFailure - def test_48_loop_create_oc_service(self): + self.test_11_create_eth_service1() + print("check xc in ROADM-A1") + self.test_13_check_xc1_ROADMA() + print("check xc in ROADM-C1") + self.test_14_check_xc1_ROADMC() + print("eth service deletion\n") + 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')) + .format(test_utils.RESTCONF_BASE_URL)) + response = requests.request("GET", url, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) if response.status_code != 404: url = ("{}/operations/org-openroadm-service:service-delete" - .format(self.restconf_baseurl)) + .format(test_utils.RESTCONF_BASE_URL)) data = {"input": { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", "rpc-action": "service-delete", "request-system-id": "appname", "notification-url": "http://localhost:8585/NotificationServer/notify" - }, + }, "service-delete-req-info": { "service-name": "service1", "tail-retention": "no" - } } } - headers = {'content-type': 'application/json'} - requests.request("POST", url, data=json.dumps(data), headers=headers, auth=('admin', 'admin')) + } + requests.request("POST", url, data=json.dumps(data), headers=test_utils.TYPE_APPLICATION_JSON, + auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) time.sleep(5) - for i in range(1,6): - print ("trial number {}".format(i)) + for i in range(1, 6): + print("trial number {}".format(i)) print("oc service creation") - self.test_34_create_oc_service1() - print ("check xc in ROADM-A1") - self.test_36_check_xc1_ROADMA() - print ("check xc in ROADM-C1") - self.test_37_check_xc1_ROADMC() - print ("oc service deletion\n") - self.test_42_delete_oc_service1() - - - def test_49_disconnect_XPDRA(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/XPDR-A1" - .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) - - def test_50_disconnect_XPDRC(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/XPDR-C1" - .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) - - def test_51_disconnect_ROADMA(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADM-A1" - .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) - - def test_52_disconnect_ROADMC(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADM-C1" - .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) + self.test_36_create_oc_service1() + print("check xc in ROADM-A1") + self.test_38_check_xc1_ROADMA() + print("check xc in ROADM-C1") + self.test_39_check_xc1_ROADMC() + print("oc service deletion\n") + self.test_44_delete_oc_service1() + + def test_51_disconnect_XPDRA(self): + response = test_utils.unmount_device("XPDR-A1") + self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) + + def test_52_disconnect_XPDRC(self): + response = test_utils.unmount_device("XPDR-C1") + self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) + + def test_53_disconnect_ROADMA(self): + response = test_utils.unmount_device("ROADM-A1") + self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) + + def test_54_disconnect_ROADMC(self): + response = test_utils.unmount_device("ROADM-C1") + self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) if __name__ == "__main__":