X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F2.2.1%2Ftest_otn_end2end.py;h=ffda6a582e0ad182de832d5f6c71e8355c5e310f;hb=d9b2da0d29b8da2e1052bc2c653399e68dc767ff;hp=edf2bbc12c98f7c6ad210e0a2eedaf6b7ec5f572;hpb=834b34963a5d59217c3bd998b06f81294ff4cfc1;p=transportpce.git diff --git a/tests/transportpce_tests/2.2.1/test_otn_end2end.py b/tests/transportpce_tests/2.2.1/test_otn_end2end.py index edf2bbc12..ffda6a582 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_end2end.py +++ b/tests/transportpce_tests/2.2.1/test_otn_end2end.py @@ -21,108 +21,106 @@ class TransportPCEtesting(unittest.TestCase): WAITING = 20 # nominal value is 300 cr_serv_sample_data = {"input": { - "sdnc-request-header": { - "request-id": "request-1", - "rpc-action": "service-create", - "request-system-id": "appname" - }, - "service-name": "service1-OCH-OTU4", - "common-id": "commonId", - "connection-type": "infrastructure", - "service-a-end": { - "service-rate": "100", - "node-id": "SPDR-SA1", - "service-format": "OTU", - "otu-service-rate": "org-openroadm-otn-common-types:OTU4", - "clli": "NodeSA", - "subrate-eth-sla": { + "sdnc-request-header": { + "request-id": "request-1", + "rpc-action": "service-create", + "request-system-id": "appname" + }, + "service-name": "service1-OCH-OTU4", + "common-id": "commonId", + "connection-type": "infrastructure", + "service-a-end": { + "service-rate": "100", + "node-id": "SPDR-SA1", + "service-format": "OTU", + "otu-service-rate": "org-openroadm-otn-common-types:OTU4", + "clli": "NodeSA", + "subrate-eth-sla": { "subrate-eth-sla": { "committed-info-rate": "100000", "committed-burst-size": "64" } + }, + "tx-direction": { + "port": { + "port-device-name": "SPDR-SA1-XPDR1", + "port-type": "fixed", + "port-name": "XPDR1-NETWORK1", + "port-rack": "000000.00", + "port-shelf": "Chassis#1" }, - "tx-direction": { - "port": { - "port-device-name": "SPDR-SA1-XPDR1", - "port-type": "fixed", - "port-name": "XPDR1-NETWORK1", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "SPDR-SA1-XPDR1", - "port-type": "fixed", - "port-name": "XPDR1-NETWORK1", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } + "lgx": { + "lgx-device-name": "Some lgx-device-name", + "lgx-port-name": "Some lgx-port-name", + "lgx-port-rack": "000000.00", + "lgx-port-shelf": "00" + } + }, + "rx-direction": { + "port": { + "port-device-name": "SPDR-SA1-XPDR1", + "port-type": "fixed", + "port-name": "XPDR1-NETWORK1", + "port-rack": "000000.00", + "port-shelf": "Chassis#1" }, - "optic-type": "gray" + "lgx": { + "lgx-device-name": "Some lgx-device-name", + "lgx-port-name": "Some lgx-port-name", + "lgx-port-rack": "000000.00", + "lgx-port-shelf": "00" + } }, - "service-z-end": { - "service-rate": "100", - "node-id": "SPDR-SC1", - "service-format": "OTU", - "otu-service-rate": "org-openroadm-otn-common-types:OTU4", - "clli": "NodeSC", - "subrate-eth-sla": { + "optic-type": "gray" + }, + "service-z-end": { + "service-rate": "100", + "node-id": "SPDR-SC1", + "service-format": "OTU", + "otu-service-rate": "org-openroadm-otn-common-types:OTU4", + "clli": "NodeSC", + "subrate-eth-sla": { "subrate-eth-sla": { "committed-info-rate": "100000", "committed-burst-size": "64" } + }, + "tx-direction": { + "port": { + "port-device-name": "SPDR-SC1-XPDR1", + "port-type": "fixed", + "port-name": "XPDR1-NETWORK1", + "port-rack": "000000.00", + "port-shelf": "Chassis#1" }, - "tx-direction": { - "port": { - "port-device-name": "SPDR-SC1-XPDR1", - "port-type": "fixed", - "port-name": "XPDR1-NETWORK1", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "SPDR-SC1-XPDR1", - "port-type": "fixed", - "port-name": "XPDR1-NETWORK1", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } + "lgx": { + "lgx-device-name": "Some lgx-device-name", + "lgx-port-name": "Some lgx-port-name", + "lgx-port-rack": "000000.00", + "lgx-port-shelf": "00" + } + }, + "rx-direction": { + "port": { + "port-device-name": "SPDR-SC1-XPDR1", + "port-type": "fixed", + "port-name": "XPDR1-NETWORK1", + "port-rack": "000000.00", + "port-shelf": "Chassis#1" }, - "optic-type": "gray" + "lgx": { + "lgx-device-name": "Some lgx-device-name", + "lgx-port-name": "Some lgx-port-name", + "lgx-port-rack": "000000.00", + "lgx-port-shelf": "00" + } }, + "optic-type": "gray" + }, "due-date": "2018-06-15T00:00:01Z", "operator-contact": "pw1234" - } } - - + } @classmethod def setUpClass(cls): @@ -225,7 +223,6 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(nbNode, 4) self.assertNotIn('ietf-network-topology:link', res['network'][0]) - def test_12_create_OCH_OTU4_service(self): response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) @@ -334,7 +331,7 @@ class TransportPCEtesting(unittest.TestCase): def test_18_check_no_interface_ODU4_spdra(self): response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4") - self.assertEqual(response.status_code, requests.codes.not_found) + self.assertEqual(response.status_code, requests.codes.conflict) res = response.json() self.assertIn( {"error-type": "application", "error-tag": "data-missing", @@ -769,21 +766,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertNotIn(1, xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']) def test_41_delete_10GE_service(self): - url = "{}/operations/org-openroadm-service:service-delete" - 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-10GE", - "tail-retention": "no" - } - } - } - response = test_utils.post_request(url, data) + response = test_utils.service_delete_request("service1-10GE") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Renderer service delete in progress', @@ -806,15 +789,15 @@ class TransportPCEtesting(unittest.TestCase): def test_44_check_no_interface_ODU2E_NETWORK_spdra(self): response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e-service1") - self.assertEqual(response.status_code, requests.codes.not_found) + self.assertEqual(response.status_code, requests.codes.conflict) def test_45_check_no_interface_ODU2E_CLIENT_spdra(self): response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1") - self.assertEqual(response.status_code, requests.codes.not_found) + self.assertEqual(response.status_code, requests.codes.conflict) def test_46_check_no_interface_10GE_CLIENT_spdra(self): response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ETHERNET10G") - self.assertEqual(response.status_code, requests.codes.not_found) + self.assertEqual(response.status_code, requests.codes.conflict) def test_47_check_otn_topo_links(self): response = test_utils.get_otn_topo_request() @@ -842,21 +825,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']), 80) def test_49_delete_ODU4_service(self): - url = "{}/operations/org-openroadm-service:service-delete" - 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-ODU4", - "tail-retention": "no" - } - } - } - response = test_utils.post_request(url, data) + response = test_utils.service_delete_request("service1-ODU4") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Renderer service delete in progress', @@ -872,7 +841,7 @@ class TransportPCEtesting(unittest.TestCase): def test_51_check_no_interface_ODU4_spdra(self): response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4") - self.assertEqual(response.status_code, requests.codes.not_found) + self.assertEqual(response.status_code, requests.codes.conflict) def test_52_check_otn_topo_links(self): self.test_22_check_otn_topo_otu4_links() @@ -890,21 +859,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertNotIn('odtu-tpn-pool', dict.keys(xpdrTpPortConAt)) def test_54_delete_OCH_OTU4_service(self): - url = "{}/operations/org-openroadm-service:service-delete" - 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-OCH-OTU4", - "tail-retention": "no" - } - } - } - response = test_utils.post_request(url, data) + response = test_utils.service_delete_request("service1-OCH-OTU4") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Renderer service delete in progress', @@ -913,7 +868,7 @@ class TransportPCEtesting(unittest.TestCase): def test_55_get_no_service(self): response = test_utils.get_service_list_request("") - self.assertEqual(response.status_code, requests.codes.not_found) + self.assertEqual(response.status_code, requests.codes.conflict) res = response.json() self.assertIn( {"error-type": "application", "error-tag": "data-missing", @@ -923,11 +878,11 @@ class TransportPCEtesting(unittest.TestCase): def test_56_check_no_interface_OTU4_spdra(self): response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-OTU") - self.assertEqual(response.status_code, requests.codes.not_found) + self.assertEqual(response.status_code, requests.codes.conflict) def test_57_check_no_interface_OCH_spdra(self): response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-1") - self.assertEqual(response.status_code, requests.codes.not_found) + self.assertEqual(response.status_code, requests.codes.conflict) def test_58_getLinks_OtnTopology(self): response = test_utils.get_otn_topo_request()