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=7b068f8970a478a40f96d7d5ccc89ea71ed58d16;hpb=d0ca9c380a04b5567693abf452c8489c357f3785;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 7b068f897..ffda6a582 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_end2end.py +++ b/tests/transportpce_tests/2.2.1/test_otn_end2end.py @@ -20,6 +20,108 @@ class TransportPCEtesting(unittest.TestCase): processes = None 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": { + "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" + }, + "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" + } + }, + "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" + }, + "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" + } + }, + "optic-type": "gray" + }, + "due-date": "2018-06-15T00:00:01Z", + "operator-contact": "pw1234" + } + } + @classmethod def setUpClass(cls): cls.processes = test_utils.start_tpce() @@ -114,8 +216,7 @@ class TransportPCEtesting(unittest.TestCase): # test service-create for OCH-OTU4 service from spdr to spdr def test_11_check_otn_topology(self): - url = "{}/config/ietf-network:networks/network/otn-topology" - response = test_utils.get_request(url) + response = test_utils.get_otn_topo_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -123,109 +224,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertNotIn('ietf-network-topology:link', res['network'][0]) def test_12_create_OCH_OTU4_service(self): - url = "{}/operations/org-openroadm-service:service-create" - 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": { - "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" - }, - "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" - } - }, - "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" - }, - "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" - } - }, - "optic-type": "gray" - }, - "due-date": "2018-06-15T00:00:01Z", - "operator-contact": "pw1234" - } - } - response = test_utils.post_request(url, data) + response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -233,8 +232,7 @@ class TransportPCEtesting(unittest.TestCase): time.sleep(self.WAITING) def test_13_get_OCH_OTU4_service1(self): - url = "{}/operational/org-openroadm-service:service-list/services/service1-OCH-OTU4" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("services/service1-OCH-OTU4") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -262,7 +260,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertDictEqual( {u'frequency': 196.1, u'rate': u'org-openroadm-common-types:R100G', - u'transmit-power': -5}, + u'transmit-power': -5, u'modulation-format': 'dp-qpsk'}, res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_15_check_interface_OTU4_spdra(self): @@ -302,7 +300,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertDictEqual( {u'frequency': 196.1, u'rate': u'org-openroadm-common-types:R100G', - u'transmit-power': -5}, + u'transmit-power': -5, u'modulation-format': 'dp-qpsk'}, res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_17_check_interface_OTU4_spdrc(self): @@ -333,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", @@ -386,8 +384,7 @@ class TransportPCEtesting(unittest.TestCase): time.sleep(3) def test_22_check_otn_topo_otu4_links(self): - url = "{}/config/ietf-network:networks/network/otn-topology" - response = test_utils.get_request(url) + response = test_utils.get_otn_topo_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nb_links = len(res['network'][0]['ietf-network-topology:link']) @@ -404,109 +401,15 @@ class TransportPCEtesting(unittest.TestCase): # test service-create for ODU4 service from spdr to spdr def test_23_create_ODU4_service(self): - url = "{}/operations/org-openroadm-service:service-create" - data = {"input": { - "sdnc-request-header": { - "request-id": "request-1", - "rpc-action": "service-create", - "request-system-id": "appname" - }, - "service-name": "service1-ODU4", - "common-id": "commonId", - "connection-type": "infrastructure", - "service-a-end": { - "service-rate": "100", - "node-id": "SPDR-SA1", - "service-format": "ODU", - "odu-service-rate": "org-openroadm-otn-common-types:ODU4", - "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" - }, - "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" - } - }, - "optic-type": "gray" - }, - "service-z-end": { - "service-rate": "100", - "node-id": "SPDR-SC1", - "service-format": "ODU", - "odu-service-rate": "org-openroadm-otn-common-types:ODU4", - "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" - }, - "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" - } - }, - "optic-type": "gray" - }, - "due-date": "2018-06-15T00:00:01Z", - "operator-contact": "pw1234" - } - } - response = test_utils.post_request(url, data) + self.cr_serv_sample_data["input"]["service-name"] = "service1-ODU4" + self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "ODU" + del self.cr_serv_sample_data["input"]["service-a-end"]["otu-service-rate"] + self.cr_serv_sample_data["input"]["service-a-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODU4" + self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "ODU" + del self.cr_serv_sample_data["input"]["service-z-end"]["otu-service-rate"] + self.cr_serv_sample_data["input"]["service-z-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODU4" + + response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -514,8 +417,7 @@ class TransportPCEtesting(unittest.TestCase): time.sleep(self.WAITING) def test_24_get_ODU4_service1(self): - url = "{}/operational/org-openroadm-service:service-list/services/service1-ODU4" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("services/service1-ODU4") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -585,8 +487,7 @@ class TransportPCEtesting(unittest.TestCase): res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) def test_27_check_otn_topo_links(self): - url = "{}/config/ietf-network:networks/network/otn-topology" - response = test_utils.get_request(url) + response = test_utils.get_otn_topo_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nb_links = len(res['network'][0]['ietf-network-topology:link']) @@ -610,8 +511,7 @@ class TransportPCEtesting(unittest.TestCase): self.fail("this link should not exist") def test_28_check_otn_topo_tp(self): - url = "{}/config/ietf-network:networks/network/otn-topology" - response = test_utils.get_request(url) + response = test_utils.get_otn_topo_request() res = response.json() for node in res['network'][0]['node']: if (node['node-id'] == 'SPDR-SA1-XPDR1' or 'SPDR-SC1-XPDR1'): @@ -626,107 +526,19 @@ class TransportPCEtesting(unittest.TestCase): # test service-create for 10GE service from spdr to spdr def test_29_create_10GE_service(self): - url = "{}/operations/org-openroadm-service:service-create" - data = {"input": { - "sdnc-request-header": { - "request-id": "request-1", - "rpc-action": "service-create", - "request-system-id": "appname" - }, - "service-name": "service1-10GE", - "common-id": "commonId", - "connection-type": "service", - "service-a-end": { - "service-rate": "10", - "node-id": "SPDR-SA1", - "service-format": "Ethernet", - "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-CLIENT1", - "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-CLIENT1", - "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" - } - }, - "optic-type": "gray" - }, - "service-z-end": { - "service-rate": "10", - "node-id": "SPDR-SC1", - "service-format": "Ethernet", - "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-CLIENT1", - "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-CLIENT1", - "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" - } - }, - "optic-type": "gray" - }, - "due-date": "2018-06-15T00:00:01Z", - "operator-contact": "pw1234" - } - } - response = test_utils.post_request(url, data) + self.cr_serv_sample_data["input"]["service-name"] = "service1-10GE" + self.cr_serv_sample_data["input"]["connection-type"] = "service" + self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "10" + self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "Ethernet" + del self.cr_serv_sample_data["input"]["service-a-end"]["odu-service-rate"] + self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-name"] = "XPDR1-CLIENT1" + self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-name"] = "XPDR1-CLIENT1" + self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "10" + self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "Ethernet" + del self.cr_serv_sample_data["input"]["service-z-end"]["odu-service-rate"] + self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-name"] = "XPDR1-CLIENT1" + self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-name"] = "XPDR1-CLIENT1" + response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('PCE calculation in progress', @@ -734,8 +546,7 @@ class TransportPCEtesting(unittest.TestCase): time.sleep(self.WAITING) def test_30_get_10GE_service1(self): - url = "{}/operational/org-openroadm-service:service-list/services/service1-10GE" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("services/service1-10GE") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -927,8 +738,7 @@ class TransportPCEtesting(unittest.TestCase): res['odu-connection'][0]['source']) def test_39_check_otn_topo_links(self): - url = "{}/config/ietf-network:networks/network/otn-topology" - response = test_utils.get_request(url) + response = test_utils.get_otn_topo_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nb_links = len(res['network'][0]['ietf-network-topology:link']) @@ -941,8 +751,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(link['org-openroadm-otn-network-topology:used-bandwidth'], 10000) def test_40_check_otn_topo_tp(self): - url = "{}/config/ietf-network:networks/network/otn-topology" - response = test_utils.get_request(url) + response = test_utils.get_otn_topo_request() res = response.json() for node in res['network'][0]['node']: if (node['node-id'] == 'SPDR-SA1-XPDR1' or 'SPDR-SC1-XPDR1'): @@ -957,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', @@ -979,8 +774,7 @@ class TransportPCEtesting(unittest.TestCase): time.sleep(20) def test_42_check_service_list(self): - url = "{}/operational/org-openroadm-service:service-list" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(len(res['service-list']['services']), 2) @@ -995,19 +789,18 @@ 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): - url = "{}/config/ietf-network:networks/network/otn-topology" - response = test_utils.get_request(url) + response = test_utils.get_otn_topo_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nb_links = len(res['network'][0]['ietf-network-topology:link']) @@ -1020,8 +813,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(link['org-openroadm-otn-network-topology:used-bandwidth'], 0) def test_48_check_otn_topo_tp(self): - url = "{}/config/ietf-network:networks/network/otn-topology" - response = test_utils.get_request(url) + response = test_utils.get_otn_topo_request() res = response.json() for node in res['network'][0]['node']: if (node['node-id'] == 'SPDR-SA1-XPDR1' or 'SPDR-SC1-XPDR1'): @@ -1033,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', @@ -1055,8 +833,7 @@ class TransportPCEtesting(unittest.TestCase): time.sleep(20) def test_50_check_service_list(self): - url = "{}/operational/org-openroadm-service:service-list" - response = test_utils.get_request(url) + response = test_utils.get_service_list_request("") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(len(res['service-list']['services']), 1) @@ -1064,14 +841,13 @@ 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() def test_53_check_otn_topo_tp(self): - url = "{}/config/ietf-network:networks/network/otn-topology" - response = test_utils.get_request(url) + response = test_utils.get_otn_topo_request() res = response.json() for node in res['network'][0]['node']: if (node['node-id'] == 'SPDR-SA1-XPDR1' or 'SPDR-SC1-XPDR1'): @@ -1083,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', @@ -1105,9 +867,8 @@ class TransportPCEtesting(unittest.TestCase): time.sleep(20) def test_55_get_no_service(self): - url = "{}/operational/org-openroadm-service:service-list" - response = test_utils.get_request(url) - self.assertEqual(response.status_code, requests.codes.not_found) + response = test_utils.get_service_list_request("") + self.assertEqual(response.status_code, requests.codes.conflict) res = response.json() self.assertIn( {"error-type": "application", "error-tag": "data-missing", @@ -1117,15 +878,14 @@ 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): - url = "{}/config/ietf-network:networks/network/otn-topology" - response = test_utils.get_request(url) + response = test_utils.get_otn_topo_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn('ietf-network-topology:link', res['network'][0])