X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftransportpce_tests%2F1.2.1%2Ftest_renderer_service_path_nominal.py;h=7dd4bf66abf3192ede600db8558f0069760f07d9;hb=d81a3d491cbc1566f4bf93a4c28438be19687dbc;hp=8d2d33de537262e5a19a9a0dcc4a95dcc1863987;hpb=c8bd98e0844257ae2e40e01d54546a40596df26d;p=transportpce.git diff --git a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py index 8d2d33de5..7dd4bf66a 100644 --- a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py +++ b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py @@ -10,15 +10,9 @@ ############################################################################# import unittest -import requests -import time -import subprocess -import signal import json -import os -import psutil -import shutil -from unittest.result import failfast +import time +import requests from common import test_utils @@ -52,9 +46,8 @@ class TransportPCERendererTesting(unittest.TestCase): def test_03_rdm_portmapping(self): url = ("{}/config/transportpce-portmapping:network/" "nodes/ROADMA01" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( @@ -69,27 +62,26 @@ class TransportPCERendererTesting(unittest.TestCase): def test_04_xpdr_portmapping(self): url = ("{}/config/transportpce-portmapping:network/" "nodes/XPDRA01" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + ) + response = test_utils.get_request(url) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', 'logical-connection-point': 'XPDR1-NETWORK1', 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network', - 'lcp-hash-val': '3b3ab304d2a6eb3c3623e52746dbb7aa'}, + 'lcp-hash-val': 'OSvMgUyP+mE='}, res['nodes'][0]['mapping']) self.assertIn( {'supporting-port': 'C1', 'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT', 'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client', - 'lcp-hash-val': '64b8effe7ba72211420bf267d0ca1ae5'}, + 'lcp-hash-val': 'AO9UFkY/TLYw'}, res['nodes'][0]['mapping']) def test_05_service_path_create(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = {"renderer:input": { "renderer:service-name": "service_test", "renderer:wave-number": "7", @@ -102,20 +94,13 @@ class TransportPCERendererTesting(unittest.TestCase): {"renderer:node-id": "XPDRA01", "renderer:src-tp": "XPDR1-CLIENT1", "renderer:dest-tp": "XPDR1-NETWORK1"}]}} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes: ROADMA01', res["output"]["result"]) def test_06_service_path_create_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/DEG1-TTP-TXRX-7" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("ROADMA01", "interface/DEG1-TTP-TXRX-7") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -134,12 +119,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_07_service_path_create_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/SRG1-PP7-TXRX-7" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("ROADMA01", "interface/SRG1-PP7-TXRX-7") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -158,12 +138,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_08_service_path_create_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/SRG1-PP7-TXRX-DEG1-TTP-TXRX-7" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP7-TXRX-DEG1-TTP-TXRX-7") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -183,12 +158,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['roadm-connections'][0]['destination']) def test_09_service_path_create_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-7" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-NETWORK1-7") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -210,12 +180,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_10_service_path_create_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-OTU" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-NETWORK1-OTU") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -236,12 +201,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']) def test_11_service_path_create_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-ODU" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-NETWORK1-ODU") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the 2 following statements replace self.assertDictContainsSubset deprecated in python 3.2 @@ -267,12 +227,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) def test_12_service_path_create_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-CLIENT1-ETHERNET" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-CLIENT1-ETHERNET") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -295,18 +250,13 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) def test_13_service_path_create_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "circuit-packs/1%2F0%2F1-PLUG-NET" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDRA01", "circuit-packs/1%2F0%2F1-PLUG-NET") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('not-reserved-inuse', res['circuit-packs'][0]["equipment-state"]) def test_14_service_path_delete(self): - url = "{}/operations/transportpce-device-renderer:service-path".format(test_utils.RESTCONF_BASE_URL) + url = "{}/operations/transportpce-device-renderer:service-path" data = {"renderer:input": { "renderer:service-name": "service_test", "renderer:wave-number": "7", @@ -318,20 +268,13 @@ class TransportPCERendererTesting(unittest.TestCase): {"renderer:node-id": "XPDRA01", "renderer:src-tp": "XPDR1-CLIENT1", "renderer:dest-tp": "XPDR1-NETWORK1"}]}} - response = requests.request( - "POST", url, data=json.dumps(data), - headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.post_request(url, data) self.assertEqual(response.status_code, requests.codes.ok) self.assertEqual(response.json(), { 'output': {'result': 'Request processed', 'success': True}}) def test_15_service_path_delete_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/DEG1-TTP-TXRX-7" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("ROADMA01", "interface/DEG1-TTP-TXRX-7") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -340,12 +283,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_16_service_path_delete_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/SRG1-PP7-TXRX-7" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("ROADMA01", "interface/SRG1-PP7-TXRX-7") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -354,12 +292,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_17_service_path_delete_rdm_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "roadm-connections/SRG1-PP7-TXRX-DEG1-TTP-TXRX-7" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP7-TXRX-DEG1-TTP-TXRX-7") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -368,12 +301,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_18_service_path_delete_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-7" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-NETWORK1-7") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -382,12 +310,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_19_service_path_delete_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-OTU" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-NETWORK1-OTU") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -396,12 +319,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_20_service_path_delete_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-ODU" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-NETWORK1-ODU") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -410,12 +328,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_21_service_path_delete_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-CLIENT1-ETHERNET" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-CLIENT1-ETHERNET") self.assertEqual(response.status_code, requests.codes.not_found) res = response.json() self.assertIn( @@ -424,12 +337,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_22_service_path_delete_xpdr_check(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "circuit-packs/1%2F0%2F1-PLUG-NET" - .format(test_utils.RESTCONF_BASE_URL)) - response = requests.request( - "GET", url, headers=test_utils.TYPE_APPLICATION_JSON, auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD)) + response = test_utils.check_netconf_node_request("XPDRA01", "circuit-packs/1%2F0%2F1-PLUG-NET") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual('not-reserved-available', res["circuit-packs"][0]['equipment-state']) @@ -444,4 +352,4 @@ class TransportPCERendererTesting(unittest.TestCase): if __name__ == "__main__": - unittest.main(verbosity=2, failfast=True) + unittest.main(verbosity=2, failfast=False)