X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F2.2.1%2Ftest_olm.py;h=09b5e2ed39b7ecbe528bf4d398410fb0b9b450df;hb=f4d7679be9ffcc5ef14241cbfe9040c1c177b260;hp=83d268ac2d512197ff70c1be3026824c2627f867;hpb=166a4562d82e400ae1a2915d38ac6c8efeb8e56e;p=transportpce.git diff --git a/tests/transportpce_tests/2.2.1/test_olm.py b/tests/transportpce_tests/2.2.1/test_olm.py index 83d268ac2..09b5e2ed3 100644 --- a/tests/transportpce_tests/2.2.1/test_olm.py +++ b/tests/transportpce_tests/2.2.1/test_olm.py @@ -19,123 +19,39 @@ import os import psutil import shutil from unittest.result import failfast +from common import test_utils class TransportOlmTesting(unittest.TestCase): - honeynode_process1 = None - honeynode_process2 = None - honeynode_process3 = None - honeynode_process4 = None - odl_process = None + processes = None restconf_baseurl = "http://localhost:8181/restconf" -#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)) - @classmethod def setUpClass(cls): - cls.__start_honeynode1() - time.sleep(30) - cls.__start_honeynode2() - time.sleep(30) - cls.__start_honeynode3() - time.sleep(30) - cls.__start_honeynode4() - time.sleep(30) - cls.__start_odl() - time.sleep(60) + 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() + for process in cls.processes: + test_utils.shutdown_process(process) + print("all processes killed") def setUp(self): - print ("execution of {}".format(self.id().split(".")[-1])) + print("execution of {}".format(self.id().split(".")[-1])) time.sleep(1) -#END_IGNORE_XTESTING - def test_01_xpdrA_device_connected(self): url = ("{}/config/network-topology:" "network-topology/topology/topology-netconf/node/XPDR-A1" - .format(self.restconf_baseurl)) + .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:port": test_utils.sims['xpdra']['port'], "netconf-node-topology:tcp-only": "false", "netconf-node-topology:pass-through": {}}]} headers = {'content-type': 'application/json'} @@ -148,13 +64,13 @@ class TransportOlmTesting(unittest.TestCase): def test_02_xpdrC_device_connected(self): url = ("{}/config/network-topology:" "network-topology/topology/topology-netconf/node/XPDR-C1" - .format(self.restconf_baseurl)) + .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:port": test_utils.sims['xpdrc']['port'], "netconf-node-topology:tcp-only": "false", "netconf-node-topology:pass-through": {}}]} headers = {'content-type': 'application/json'} @@ -169,17 +85,17 @@ class TransportOlmTesting(unittest.TestCase): "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": {}}]} + "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": test_utils.sims['roadma']['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')) + "PUT", url, data=json.dumps(data), headers=headers, + auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.created) time.sleep(20) @@ -188,17 +104,17 @@ class TransportOlmTesting(unittest.TestCase): "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": {}}]} + "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": test_utils.sims['roadmc']['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')) + "PUT", url, data=json.dumps(data), headers=headers, + auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.created) time.sleep(20) @@ -218,8 +134,8 @@ class TransportOlmTesting(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=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"]) @@ -240,8 +156,8 @@ class TransportOlmTesting(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=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"]) @@ -262,8 +178,8 @@ class TransportOlmTesting(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=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"]) @@ -284,8 +200,8 @@ class TransportOlmTesting(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=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"]) @@ -293,15 +209,15 @@ class TransportOlmTesting(unittest.TestCase): def test_09_create_OTS_ROADMA(self): url = "{}/operations/transportpce-device-renderer:create-ots-oms".format(self.restconf_baseurl) data = { - "input" : { - "node-id" : "ROADM-A1", - "logical-connection-point" : "DEG1-TTP-TXRX" + "input": { + "node-id": "ROADM-A1", + "logical-connection-point": "DEG1-TTP-TXRX" } } headers = {'content-type': 'application/json'} response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) + "POST", url, data=json.dumps(data), + headers=headers, auth=('admin', 'admin')) time.sleep(10) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -311,15 +227,15 @@ class TransportOlmTesting(unittest.TestCase): def test_10_create_OTS_ROADMC(self): url = "{}/operations/transportpce-device-renderer:create-ots-oms".format(self.restconf_baseurl) data = { - "input" : { - "node-id" : "ROADM-C1", - "logical-connection-point" : "DEG2-TTP-TXRX" + "input": { + "node-id": "ROADM-C1", + "logical-connection-point": "DEG2-TTP-TXRX" } } headers = {'content-type': 'application/json'} response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) + "POST", url, data=json.dumps(data), + headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Interfaces OTS-DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX successfully created on node ROADM-C1', @@ -333,28 +249,28 @@ class TransportOlmTesting(unittest.TestCase): "resource-type": "interface", "granularity": "15min", "resource-identifier": { - "resource-name" : "OTS-DEG2-TTP-TXRX" + "resource-name": "OTS-DEG2-TTP-TXRX" } } } 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=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn({ - "pmparameter-name": "OpticalPowerOutput", - "pmparameter-value": "2.5" - }, res["output"]["measurements"]) + "pmparameter-name": "OpticalPowerOutput", + "pmparameter-value": "2.5" + }, res["output"]["measurements"]) self.assertIn({ - "pmparameter-name": "OpticalReturnLoss", - "pmparameter-value": "40" - }, res["output"]["measurements"]) + "pmparameter-name": "OpticalReturnLoss", + "pmparameter-value": "40" + }, res["output"]["measurements"]) self.assertIn({ - "pmparameter-name": "OpticalPowerInput", - "pmparameter-value": "-21.1" - }, res["output"]["measurements"]) + "pmparameter-name": "OpticalPowerInput", + "pmparameter-value": "-21.1" + }, res["output"]["measurements"]) def test_12_get_PM_ROADMC(self): url = "{}/operations/transportpce-olm:get-pm".format(self.restconf_baseurl) @@ -364,28 +280,28 @@ class TransportOlmTesting(unittest.TestCase): "resource-type": "interface", "granularity": "15min", "resource-identifier": { - "resource-name" : "OTS-DEG1-TTP-TXRX" + "resource-name": "OTS-DEG1-TTP-TXRX" } } } 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=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn({ - "pmparameter-name": "OpticalPowerOutput", - "pmparameter-value": "4.6" - }, res["output"]["measurements"]) + "pmparameter-name": "OpticalPowerOutput", + "pmparameter-value": "4.6" + }, res["output"]["measurements"]) self.assertIn({ - "pmparameter-name": "OpticalReturnLoss", - "pmparameter-value": "49.1" - }, res["output"]["measurements"]) + "pmparameter-name": "OpticalReturnLoss", + "pmparameter-value": "49.1" + }, res["output"]["measurements"]) self.assertIn({ - "pmparameter-name": "OpticalPowerInput", - "pmparameter-value": "-15.1" - }, res["output"]["measurements"]) + "pmparameter-name": "OpticalPowerInput", + "pmparameter-value": "-15.1" + }, res["output"]["measurements"]) def test_13_calculate_span_loss_base_ROADMA_ROADMC(self): url = "{}/operations/transportpce-olm:calculate-spanloss-base".format(self.restconf_baseurl) @@ -397,16 +313,16 @@ class TransportOlmTesting(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=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', res["output"]["result"]) self.assertIn({ - "spanloss": "18", - "link-id": "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX" - }, res["output"]["spans"]) + "spanloss": "17.6", + "link-id": "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX" + }, res["output"]["spans"]) time.sleep(5) def test_14_calculate_span_loss_base_all(self): @@ -418,20 +334,20 @@ class TransportOlmTesting(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=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', res["output"]["result"]) self.assertIn({ - "spanloss": "26", - "link-id": "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX" - }, res["output"]["spans"]) + "spanloss": "25.7", + "link-id": "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX" + }, res["output"]["spans"]) self.assertIn({ - "spanloss": "18", - "link-id": "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX" - }, res["output"]["spans"]) + "spanloss": "17.6", + "link-id": "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX" + }, res["output"]["spans"]) time.sleep(5) def test_15_get_OTS_DEG2_TTP_TXRX_ROADMA(self): @@ -443,8 +359,8 @@ class TransportOlmTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertEqual(18, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']) - self.assertEqual(26, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']) + self.assertEqual(17.6, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']) + self.assertEqual(25.7, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']) def test_16_get_OTS_DEG1_TTP_TXRX_ROADMC(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" @@ -455,8 +371,8 @@ class TransportOlmTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertEqual(26, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']) - self.assertEqual(18, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']) + self.assertEqual(25.7, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']) + self.assertEqual(17.6, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']) def test_17_servicePath_create_AToZ(self): url = "{}/operations/transportpce-device-renderer:service-path".format(self.restconf_baseurl) @@ -492,12 +408,13 @@ class TransportOlmTesting(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=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"]) - time.sleep(40) + # time.sleep(40) + time.sleep(10) def test_18_servicePath_create_ZToA(self): url = "{}/operations/transportpce-device-renderer:service-path".format(self.restconf_baseurl) @@ -533,12 +450,13 @@ class TransportOlmTesting(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=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"]) - time.sleep(40) + # time.sleep(40) + time.sleep(10) def test_19_service_power_setup_XPDRA_XPDRC(self): url = "{}/operations/transportpce-olm:service-power-setup".format(self.restconf_baseurl) @@ -572,8 +490,8 @@ class TransportOlmTesting(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=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', res["output"]["result"]) @@ -645,8 +563,8 @@ class TransportOlmTesting(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=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', res["output"]["result"]) @@ -660,7 +578,7 @@ class TransportOlmTesting(unittest.TestCase): "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertEqual(-5 , res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) + self.assertEqual(-5, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) self.assertEqual(196.1, res['org-openroadm-optical-channel-interfaces:och']['frequency']) def test_25_get_roadmconnection_ROADMC(self): @@ -707,8 +625,8 @@ class TransportOlmTesting(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=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', res["output"]["result"]) @@ -770,8 +688,8 @@ class TransportOlmTesting(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=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Request processed', res["output"]["result"]) @@ -811,8 +729,8 @@ class TransportOlmTesting(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=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Request processed', res["output"]["result"]) @@ -836,8 +754,8 @@ class TransportOlmTesting(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=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"]) @@ -858,8 +776,8 @@ class TransportOlmTesting(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=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"]) @@ -888,12 +806,13 @@ class TransportOlmTesting(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=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"]) - time.sleep(40) + # time.sleep(40) + time.sleep(10) def test_34_get_interface_XPDRA_XPDR1_NETWORK2(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/XPDR-A1/yang-ext:mount/" @@ -931,8 +850,8 @@ class TransportOlmTesting(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=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Request processed', res["output"]["result"]) @@ -940,23 +859,23 @@ class TransportOlmTesting(unittest.TestCase): def test_36_xpdrA_device_disconnected(self): url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/XPDR-A1" + "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')) + "DELETE", url, headers=headers, + auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) time.sleep(10) def test_37_xpdrC_device_disconnected(self): url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/XPDR-C1" + "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')) + "DELETE", url, headers=headers, + auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) time.sleep(10) @@ -964,7 +883,7 @@ class TransportOlmTesting(unittest.TestCase): url = "{}/operations/transportpce-olm:calculate-spanloss-current".format(self.restconf_baseurl) headers = {'content-type': 'application/json'} response = requests.request( - "POST", url, headers=headers, auth=('admin', 'admin')) + "POST", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Success', @@ -973,25 +892,26 @@ class TransportOlmTesting(unittest.TestCase): def test_39_rdmA_device_disconnected(self): url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADM-A1" + "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')) + "DELETE", url, headers=headers, + auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) time.sleep(10) def test_40_rdmC_device_disconnected(self): url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADM-C1" + "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')) + "DELETE", url, headers=headers, + auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) time.sleep(10) + if __name__ == "__main__": unittest.main(verbosity=2)