From 8385036969ef8d3e5b0f6c9ef2c6750305d7a4de Mon Sep 17 00:00:00 2001 From: aosull01 Date: Wed, 19 Sep 2018 16:30:18 +0100 Subject: EXTAPI-150 Correct SO Paths Issue-ID: EXTAPI-150 Change-Id: I488803bf97b427ee6e0324b427cbe202bd91b352 Signed-off-by: aosull01 --- src/test/java/org/onap/nbi/apis/ApiTest.java | 18 +++++++++--------- .../resources/mappings/so_delete_service_instance.json | 4 ++-- .../mappings/so_e2e_delete_service_instance.json | 2 +- src/test/resources/mappings/so_get_.json | 4 ++-- src/test/resources/mappings/so_get_e2e.json | 2 +- src/test/resources/mappings/so_get_e2e_delete.json | 2 +- .../mappings/so_post_create_service_instance.json | 4 ++-- .../mappings/so_post_e2e_create_service_instance.json | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/test') diff --git a/src/test/java/org/onap/nbi/apis/ApiTest.java b/src/test/java/org/onap/nbi/apis/ApiTest.java index 5bf9983..3ac2f7e 100644 --- a/src/test/java/org/onap/nbi/apis/ApiTest.java +++ b/src/test/java/org/onap/nbi/apis/ApiTest.java @@ -988,7 +988,7 @@ public class ApiTest { ExecutionTask executionTaskA = ServiceOrderAssertions.setUpBddForExecutionTaskSucess(serviceOrderRepository, executionTaskRepository, ActionType.ADD); - removeWireMockMapping("/ecomp/mso/infra/orchestrationRequests/v6/requestId"); + removeWireMockMapping("/onap/so/infra/orchestrationRequests/v7/requestId"); SoTaskProcessor.processOrderItem(executionTaskA); @@ -1025,7 +1025,7 @@ public class ApiTest { ExecutionTask executionTaskA = ServiceOrderAssertions.setUpBddForE2EExecutionTaskSucess(serviceOrderRepository, executionTaskRepository, ActionType.ADD); - removeWireMockMapping("/ecomp/mso/infra/e2eServiceInstances/v3/serviceId/operations/operationId"); + removeWireMockMapping("/onap/so/infra/e2eServiceInstances/v3/serviceId/operations/operationId"); SoTaskProcessor.processOrderItem(executionTaskA); @@ -1061,7 +1061,7 @@ public class ApiTest { ExecutionTask executionTaskA = ServiceOrderAssertions.setUpBddForExecutionTaskSucess(serviceOrderRepository, executionTaskRepository, ActionType.ADD); - removeWireMockMapping("/ecomp/mso/infra/serviceInstances/v6"); + removeWireMockMapping("/onap/so/infra/serviceInstantiation/v7/serviceInstances/"); SoTaskProcessor.processOrderItem(executionTaskA); @@ -1083,8 +1083,8 @@ public class ApiTest { ExecutionTask executionTaskA = ServiceOrderAssertions.setUpBddForExecutionTaskSucess(serviceOrderRepository, executionTaskRepository, ActionType.ADD); - removeWireMockMapping("/ecomp/mso/infra/serviceInstances/v6"); - removeWireMockMapping("/ecomp/mso/infra/orchestrationRequests/v6/requestId"); + removeWireMockMapping("/onap/so/infra/serviceInstantiation/v7/serviceInstances/"); + removeWireMockMapping("/onap/so/infra/orchestrationRequests/v7/requestId"); SoTaskProcessor.processOrderItem(executionTaskA); @@ -1104,8 +1104,8 @@ public class ApiTest { ExecutionTask executionTaskA = ServiceOrderAssertions.setUpBddForE2EExecutionTaskSucess(serviceOrderRepository, executionTaskRepository, ActionType.ADD); - removeWireMockMapping("/ecomp/mso/infra/e2eServiceInstances/v3"); - removeWireMockMapping("/ecomp/mso/infra/e2eServiceInstances/v3/serviceId/operations/operationId"); + removeWireMockMapping("/onap/so/infra/e2eServiceInstances/v3"); + removeWireMockMapping("/onap/so/infra/e2eServiceInstances/v3/serviceId/operations/operationId"); SoTaskProcessor.processOrderItem(executionTaskA); @@ -1127,7 +1127,7 @@ public class ApiTest { executionTaskRepository, ActionType.ADD); - changeWireMockResponse("/ecomp/mso/infra/serviceInstances/v6",400,"\"serviceException\": {\n" + changeWireMockResponse("/onap/so/infra/serviceInstantiation/v7/serviceInstances/",400,"\"serviceException\": {\n" + " \"messageId\": \"SVC0002\",\n" + " \"text\": \"Error parsing request. org.openecomp.mso.apihandler.common.ValidationException: serviceInstance already existsd\"\n" + " }"); @@ -1211,7 +1211,7 @@ public class ApiTest { ExecutionTask executionTaskA = ServiceOrderAssertions.setUpBddForExecutionTaskSucess(serviceOrderRepository, executionTaskRepository, ActionType.MODIFY); ExecutionTask executionTaskB; - removeWireMockMapping("/ecomp/mso/infra/orchestrationRequests/v6/requestId"); + removeWireMockMapping("/onap/so/infra/orchestrationRequests/v7/requestId"); SoTaskProcessor.processOrderItem(executionTaskA); diff --git a/src/test/resources/mappings/so_delete_service_instance.json b/src/test/resources/mappings/so_delete_service_instance.json index 141b877..92a713d 100644 --- a/src/test/resources/mappings/so_delete_service_instance.json +++ b/src/test/resources/mappings/so_delete_service_instance.json @@ -1,7 +1,7 @@ { "request": { "method": "DELETE", - "url": "/ecomp/mso/infra/serviceInstances/v6/e4688e5f-61a0-4f8b-ae02-a2fbde623bcb" + "url": "/onap/so/infra/serviceInstantiation/v7/serviceInstances/e4688e5f-61a0-4f8b-ae02-a2fbde623bcb" }, "response": { "status": 202, @@ -15,4 +15,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/test/resources/mappings/so_e2e_delete_service_instance.json b/src/test/resources/mappings/so_e2e_delete_service_instance.json index 0b0615c..ea7b446 100644 --- a/src/test/resources/mappings/so_e2e_delete_service_instance.json +++ b/src/test/resources/mappings/so_e2e_delete_service_instance.json @@ -1,7 +1,7 @@ { "request": { "method": "DELETE", - "url": "/ecomp/mso/infra/e2eServiceInstances/v3/e4688e5f-61a0-4f8b-ae02-a2fbde623bcb" + "url": "/onap/so/infra/e2eServiceInstances/v3/e4688e5f-61a0-4f8b-ae02-a2fbde623bcb" }, "response": { "status": 202, diff --git a/src/test/resources/mappings/so_get_.json b/src/test/resources/mappings/so_get_.json index 6fc9c9c..a251e69 100644 --- a/src/test/resources/mappings/so_get_.json +++ b/src/test/resources/mappings/so_get_.json @@ -1,7 +1,7 @@ { "request": { "method": "GET", - "url": "/ecomp/mso/infra/orchestrationRequests/v6/requestId" + "url": "/onap/so/infra/orchestrationRequests/v7/requestId" }, "response": { "status": 200, @@ -17,4 +17,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/test/resources/mappings/so_get_e2e.json b/src/test/resources/mappings/so_get_e2e.json index c79dd78..530cd84 100644 --- a/src/test/resources/mappings/so_get_e2e.json +++ b/src/test/resources/mappings/so_get_e2e.json @@ -1,7 +1,7 @@ { "request": { "method": "GET", - "url": "/ecomp/mso/infra/e2eServiceInstances/v3/serviceId/operations/operationId" + "url": "/onap/so/infra/e2eServiceInstances/v3/serviceId/operations/operationId" }, "response": { "status": 200, diff --git a/src/test/resources/mappings/so_get_e2e_delete.json b/src/test/resources/mappings/so_get_e2e_delete.json index f6bc117..34247e0 100644 --- a/src/test/resources/mappings/so_get_e2e_delete.json +++ b/src/test/resources/mappings/so_get_e2e_delete.json @@ -1,7 +1,7 @@ { "request": { "method": "GET", - "url": "/ecomp/mso/infra/e2eServiceInstances/v3/e4688e5f-61a0-4f8b-ae02-a2fbde623bcb/operations/operationId" + "url": "/onap/so/infra/e2eServiceInstances/v3/e4688e5f-61a0-4f8b-ae02-a2fbde623bcb/operations/operationId" }, "response": { "status": 200, diff --git a/src/test/resources/mappings/so_post_create_service_instance.json b/src/test/resources/mappings/so_post_create_service_instance.json index 7724860..8d319f6 100644 --- a/src/test/resources/mappings/so_post_create_service_instance.json +++ b/src/test/resources/mappings/so_post_create_service_instance.json @@ -1,7 +1,7 @@ { "request": { "method": "POST", - "url": "/ecomp/mso/infra/serviceInstances/v6" + "url": "/onap/so/infra/serviceInstantiation/v7/serviceInstances/" }, "response": { "status": 201, @@ -15,4 +15,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/test/resources/mappings/so_post_e2e_create_service_instance.json b/src/test/resources/mappings/so_post_e2e_create_service_instance.json index a5b7cce..a357bef 100644 --- a/src/test/resources/mappings/so_post_e2e_create_service_instance.json +++ b/src/test/resources/mappings/so_post_e2e_create_service_instance.json @@ -1,7 +1,7 @@ { "request": { "method": "POST", - "url": "/ecomp/mso/infra/e2eServiceInstances/v3" + "url": "/onap/so/infra/e2eServiceInstances/v3" }, "response": { "status": 201, -- cgit 1.2.3-korg