X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F1.2.1%2Ftest_olm.py;h=b0711ab1b8767aafd3c127be03882bfb6a01c66b;hb=b4e7ad9d7bb73f2572e0cef1ccc3d14f40aa50d9;hp=bba76a072b82cca9b5c65bfe5107bfe16ff8a6da;hpb=19a9408ee823754859467888a5d2823bfd8655ab;p=transportpce.git diff --git a/tests/transportpce_tests/1.2.1/test_olm.py b/tests/transportpce_tests/1.2.1/test_olm.py index bba76a072..b0711ab1b 100644 --- a/tests/transportpce_tests/1.2.1/test_olm.py +++ b/tests/transportpce_tests/1.2.1/test_olm.py @@ -80,28 +80,14 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) def test_09_create_OTS_ROADMA(self): - url = "{}/operations/transportpce-device-renderer:create-ots-oms" - data = { - "input": { - "node-id": "ROADMA01", - "logical-connection-point": "DEG1-TTP-TXRX" - } - } - response = test_utils.post_request(url, data) + response = test_utils.create_ots_oms_request("ROADMA01", "DEG1-TTP-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Interfaces OTS-DEG1-TTP-TXRX - OMS-DEG1-TTP-TXRX successfully created on node ROADMA01', res["output"]["result"]) def test_10_create_OTS_ROADMC(self): - url = "{}/operations/transportpce-device-renderer:create-ots-oms" - data = { - "input": { - "node-id": "ROADMC01", - "logical-connection-point": "DEG2-TTP-TXRX" - } - } - response = test_utils.post_request(url, data) + response = test_utils.create_ots_oms_request("ROADMC01", "DEG2-TTP-TXRX") 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 ROADMC01', @@ -205,58 +191,33 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(5) def test_15_get_OTS_DEG1_TTP_TXRX_ROADMA(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/interface/OTS-DEG1-TTP-TXRX/" - "org-openroadm-optical-transport-interfaces:ots") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "ROADMA01", + "interface/OTS-DEG1-TTP-TXRX/org-openroadm-optical-transport-interfaces:ots") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(5.7, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']) self.assertEqual(15.1, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']) def test_16_get_OTS_DEG2_TTP_TXRX_ROADMC(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADMC01/yang-ext:mount/org-openroadm-device:org-openroadm-device/interface/OTS-DEG2-TTP-TXRX/" - "org-openroadm-optical-transport-interfaces:ots") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "ROADMC01", + "interface/OTS-DEG2-TTP-TXRX/org-openroadm-optical-transport-interfaces:ots") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(15.1, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']) self.assertEqual(5.7, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']) def test_17_servicePath_create_AToZ(self): - url = "{}/operations/transportpce-device-renderer:service-path" - data = { - "input": { - "service-name": "test", - "wave-number": "1", - "modulation-format": "qpsk", - "operation": "create", - "nodes": [ - { - "dest-tp": "XPDR1-NETWORK1", - "src-tp": "XPDR1-CLIENT1", - "node-id": "XPDRA01" - }, - { - "dest-tp": "DEG1-TTP-TXRX", - "src-tp": "SRG1-PP1-TXRX", - "node-id": "ROADMA01" - }, - { - "dest-tp": "SRG1-PP1-TXRX", - "src-tp": "DEG2-TTP-TXRX", - "node-id": "ROADMC01" - }, - { - "dest-tp": "XPDR1-CLIENT1", - "src-tp": "XPDR1-NETWORK1", - "node-id": "XPDRC01" - } - ] - } - } - response = test_utils.post_request(url, data) + response = test_utils.service_path_request("create", "test", "1", + [{"node-id": "XPDRA01", + "dest-tp": "XPDR1-NETWORK1", "src-tp": "XPDR1-CLIENT1"}, + {"node-id": "ROADMA01", + "dest-tp": "DEG1-TTP-TXRX", "src-tp": "SRG1-PP1-TXRX"}, + {"node-id": "ROADMC01", + "dest-tp": "SRG1-PP1-TXRX", "src-tp": "DEG2-TTP-TXRX"}, + {"node-id": "XPDRC01", + "dest-tp": "XPDR1-CLIENT1", "src-tp": "XPDR1-NETWORK1"}]) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"]) @@ -264,38 +225,15 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(10) def test_18_servicePath_create_ZToA(self): - url = "{}/operations/transportpce-device-renderer:service-path" - data = { - "input": { - "service-name": "test", - "wave-number": "1", - "modulation-format": "qpsk", - "operation": "create", - "nodes": [ - { - "dest-tp": "XPDR1-NETWORK1", - "src-tp": "XPDR1-CLIENT1", - "node-id": "XPDRC01" - }, - { - "dest-tp": "DEG2-TTP-TXRX", - "src-tp": "SRG1-PP1-TXRX", - "node-id": "ROADMC01" - }, - { - "src-tp": "DEG1-TTP-TXRX", - "dest-tp": "SRG1-PP1-TXRX", - "node-id": "ROADMA01" - }, - { - "src-tp": "XPDR1-NETWORK1", - "dest-tp": "XPDR1-CLIENT1", - "node-id": "XPDRA01" - } - ] - } - } - response = test_utils.post_request(url, data) + response = test_utils.service_path_request("create", "test", "1", + [{"node-id": "XPDRC01", + "dest-tp": "XPDR1-NETWORK1", "src-tp": "XPDR1-CLIENT1"}, + {"node-id": "ROADMC01", + "dest-tp": "DEG2-TTP-TXRX", "src-tp": "SRG1-PP1-TXRX"}, + {"node-id": "ROADMA01", + "src-tp": "DEG1-TTP-TXRX", "dest-tp": "SRG1-PP1-TXRX"}, + {"node-id": "XPDRA01", + "src-tp": "XPDR1-NETWORK1", "dest-tp": "XPDR1-CLIENT1"}]) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"]) @@ -338,30 +276,23 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Success', res["output"]["result"]) def test_20_get_interface_XPDRA_XPDR1_NETWORK1(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/XPDRA01/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/interface/XPDR1-NETWORK1-1/" - "org-openroadm-optical-channel-interfaces:och") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "XPDRA01", + "interface/XPDR1-NETWORK1-1/org-openroadm-optical-channel-interfaces:och") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(0, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) self.assertEqual(1, res['org-openroadm-optical-channel-interfaces:och']['wavelength-number']) def test_21_get_roadmconnection_ROADMA(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMA01/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/roadm-connections/" - "SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("gainLoss", res['roadm-connections'][0]['opticalControlMode']) self.assertEqual(-3.3, res['roadm-connections'][0]['target-output-power']) def test_22_get_roadmconnection_ROADMC(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMC01/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/roadm-connections/" - "DEG2-TTP-TXRX-SRG1-PP1-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/DEG2-TTP-TXRX-SRG1-PP1-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("power", res['roadm-connections'][0]['opticalControlMode']) @@ -402,20 +333,16 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Success', res["output"]["result"]) def test_24_get_interface_XPDRC_XPDR1_NETWORK1(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/XPDRC01/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/interface/XPDR1-NETWORK1-1/" - "org-openroadm-optical-channel-interfaces:och") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "XPDRC01", + "interface/XPDR1-NETWORK1-1/org-openroadm-optical-channel-interfaces:och") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(0, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) self.assertEqual(1, res['org-openroadm-optical-channel-interfaces:och']['wavelength-number']) def test_25_get_roadmconnection_ROADMC(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMC01/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/roadm-connections/" - "SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("gainLoss", res['roadm-connections'][0]['opticalControlMode']) @@ -457,95 +384,43 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Success', res["output"]["result"]) def test_27_get_roadmconnection_ROADMA(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMA01/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/roadm-connections/" - "SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("off", res['roadm-connections'][0]['opticalControlMode']) self.assertEqual(-60, res['roadm-connections'][0]['target-output-power']) def test_28_get_roadmconnection_ROADMC(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMC01/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/roadm-connections/" - "DEG2-TTP-TXRX-SRG1-PP1-TXRX-1") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/DEG2-TTP-TXRX-SRG1-PP1-TXRX-1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual("off", res['roadm-connections'][0]['opticalControlMode']) def test_29_servicePath_delete_AToZ(self): - url = "{}/operations/transportpce-device-renderer:service-path" - data = { - "input": { - "service-name": "test", - "wave-number": "1", - "modulation-format": "qpsk", - "operation": "delete", - "nodes": [ - { - "dest-tp": "XPDR1-NETWORK1", - "src-tp": "XPDR1-CLIENT1", - "node-id": "XPDRA01" - }, - { - "dest-tp": "DEG1-TTP-TXRX", - "src-tp": "SRG1-PP1-TXRX", - "node-id": "ROADMA01" - }, - { - "dest-tp": "SRG1-PP1-TXRX", - "src-tp": "DEG2-TTP-TXRX", - "node-id": "ROADMC01" - }, - { - "dest-tp": "XPDR1-CLIENT1", - "src-tp": "XPDR1-NETWORK1", - "node-id": "XPDRC01" - } - ] - } - } - response = test_utils.post_request(url, data) + response = test_utils.service_path_request("delete", "test", "1", + [{"node-id": "XPDRA01", + "dest-tp": "XPDR1-NETWORK1", "src-tp": "XPDR1-CLIENT1"}, + {"node-id": "ROADMA01", + "dest-tp": "DEG1-TTP-TXRX", "src-tp": "SRG1-PP1-TXRX"}, + {"node-id": "ROADMC01", + "dest-tp": "SRG1-PP1-TXRX", "src-tp": "DEG2-TTP-TXRX"}, + {"node-id": "XPDRC01", + "dest-tp": "XPDR1-CLIENT1", "src-tp": "XPDR1-NETWORK1"}]) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Request processed', res["output"]["result"]) time.sleep(10) def test_30_servicePath_delete_ZToA(self): - url = "{}/operations/transportpce-device-renderer:service-path" - data = { - "input": { - "service-name": "test", - "wave-number": "1", - "modulation-format": "qpsk", - "operation": "delete", - "nodes": [ - { - "dest-tp": "XPDR1-NETWORK1", - "src-tp": "XPDR1-CLIENT1", - "node-id": "XPDRC01" - }, - { - "dest-tp": "DEG2-TTP-TXRX", - "src-tp": "SRG1-PP1-TXRX", - "node-id": "ROADMC01" - }, - { - "src-tp": "DEG1-TTP-TXRX", - "dest-tp": "SRG1-PP1-TXRX", - "node-id": "ROADMA01" - }, - { - "src-tp": "XPDR1-NETWORK1", - "dest-tp": "XPDR1-CLIENT1", - "node-id": "XPDRA01" - } - ] - } - } - response = test_utils.post_request(url, data) + response = test_utils.service_path_request("delete", "test", "1", + [{"node-id": "XPDRC01", + "dest-tp": "XPDR1-NETWORK1", "src-tp": "XPDR1-CLIENT1"}, + {"node-id": "ROADMC01", + "dest-tp": "DEG2-TTP-TXRX", "src-tp": "SRG1-PP1-TXRX"}, + {"node-id": "ROADMA01", + "src-tp": "DEG1-TTP-TXRX", "dest-tp": "SRG1-PP1-TXRX"}, + {"node-id": "XPDRA01", + "src-tp": "XPDR1-NETWORK1", "dest-tp": "XPDR1-CLIENT1"}]) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Request processed', res["output"]["result"]) @@ -568,28 +443,11 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) def test_33_servicePath_create_AToZ(self): - url = "{}/operations/transportpce-device-renderer:service-path" - data = { - "input": { - "service-name": "test2", - "wave-number": "2", - "modulation-format": "qpsk", - "operation": "create", - "nodes": [ - { - "dest-tp": "XPDR1-NETWORK2", - "src-tp": "XPDR1-CLIENT2", - "node-id": "XPDRA01" - }, - { - "dest-tp": "DEG1-TTP-TXRX", - "src-tp": "SRG1-PP2-TXRX", - "node-id": "ROADMA01" - } - ] - } - } - response = test_utils.post_request(url, data) + response = test_utils.service_path_request("create", "test2", "2", + [{"node-id": "XPDRA01", + "dest-tp": "XPDR1-NETWORK2", "src-tp": "XPDR1-CLIENT2"}, + {"node-id": "ROADMA01", + "dest-tp": "DEG1-TTP-TXRX", "src-tp": "SRG1-PP2-TXRX"}]) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"]) @@ -597,38 +455,20 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(10) def test_34_get_interface_XPDRA_XPDR1_NETWORK2(self): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/XPDRA01/yang-ext:mount/" - "org-openroadm-device:org-openroadm-device/interface/XPDR1-NETWORK2-2/" - "org-openroadm-optical-channel-interfaces:och") - response = test_utils.get_request(url) + response = test_utils.check_netconf_node_request( + "XPDRA01", + "interface/XPDR1-NETWORK2-2/org-openroadm-optical-channel-interfaces:och") 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(2, res['org-openroadm-optical-channel-interfaces:och']['wavelength-number']) def test_35_servicePath_delete_AToZ(self): - url = "{}/operations/transportpce-device-renderer:service-path" - data = { - "input": { - "service-name": "test", - "wave-number": "1", - "modulation-format": "qpsk", - "operation": "delete", - "nodes": [ - { - "dest-tp": "XPDR1-NETWORK2", - "src-tp": "XPDR1-CLIENT2", - "node-id": "XPDRA01" - }, - { - "dest-tp": "DEG1-TTP-TXRX", - "src-tp": "SRG1-PP2-TXRX", - "node-id": "ROADMA01" - } - ] - } - } - response = test_utils.post_request(url, data) + response = test_utils.service_path_request("delete", "test", "1", + [{"node-id": "XPDRA01", + "dest-tp": "XPDR1-NETWORK2", "src-tp": "XPDR1-CLIENT2"}, + {"node-id": "ROADMA01", + "dest-tp": "DEG1-TTP-TXRX", "src-tp": "SRG1-PP2-TXRX"}]) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Request processed', res["output"]["result"])