Update SO POST API for serviceInstances

Issue-ID: EXTAPI-431

Signed-off-by: aosull01 <adrian.osullivan@huawei.com>
Change-Id: Ieadbfb3ff3bc15664b7526c3ee8e8d628d6af4d7

diff --git a/Dockerfile b/Dockerfile
index 3f82d6e..11e2eee 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ FROM registry.gitlab.com/onap-integration/docker/onap-java
 USER onap
 
 ARG SERVER_PORT
-ARG PKG_FILENAME=nbi-rest-services-6.0.2-SNAPSHOT.jar
+ARG PKG_FILENAME=nbi-rest-services-6.0.3-SNAPSHOT.jar
 ADD target/$PKG_FILENAME /opt/onap/app.jar
 
 RUN mkdir temptoscafile && chown onap:onap temptoscafile/

diff --git a/pom.xml b/pom.xml
index 900f60c..9f8e3a9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
   <groupId>org.onap.externalapi-nbi</groupId>
   <artifactId>nbi-rest-services</artifactId>
-  <version>6.0.2-SNAPSHOT</version>
+  <version>6.0.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>externalapi-nbi</name>

diff --git a/src/main/java/org/onap/nbi/OnapComponentsUrlPaths.java b/src/main/java/org/onap/nbi/OnapComponentsUrlPaths.java
index c01b04c..417fa51 100644 (file)
--- a/src/main/java/org/onap/nbi/OnapComponentsUrlPaths.java
+++ b/src/main/java/org/onap/nbi/OnapComponentsUrlPaths.java
@@ -58,7 +58,7 @@ public final class OnapComponentsUrlPaths {
 
     // MSO
     public static final String MSO_CREATE_SERVICE_INSTANCE_PATH =
-            "/onap/so/infra/serviceInstantiation/v7/serviceInstances/";
+            "/onap/so/infra/serviceInstantiation/v7/serviceInstances";
     public static final String MSO_GET_REQUEST_STATUS_PATH = "/onap/so/infra/orchestrationRequests/v7/";
     public static final String MSO_DELETE_REQUEST_STATUS_PATH =
             "/onap/so/infra/serviceInstantiation/v7/serviceInstances/";

diff --git a/src/test/java/org/onap/nbi/test/ExecutionTaskTest.java b/src/test/java/org/onap/nbi/test/ExecutionTaskTest.java
index ca33c39..5b39600 100644 (file)
--- a/src/test/java/org/onap/nbi/test/ExecutionTaskTest.java
+++ b/src/test/java/org/onap/nbi/test/ExecutionTaskTest.java
@@ -414,7 +414,7 @@ public class ExecutionTaskTest {
         ExecutionTask executionTaskA = ServiceOrderExecutionTaskAssertions
                 .setUpBddForExecutionTaskSucess(serviceOrderRepository, executionTaskRepository, ActionType.ADD);
 
-        Context.removeWireMockMapping("/onap/so/infra/serviceInstantiation/v7/serviceInstances/");
+        Context.removeWireMockMapping("/onap/so/infra/serviceInstantiation/v7/serviceInstances");
 
         SoTaskProcessor.processOrderItem(executionTaskA);
         ServiceOrder serviceOrderChecked = getServiceOrder("test");
@@ -433,7 +433,7 @@ public class ExecutionTaskTest {
         ExecutionTask executionTaskA = ServiceOrderExecutionTaskAssertions
                 .setUpBddForExecutionTaskSucess(serviceOrderRepository, executionTaskRepository, ActionType.ADD);
 
-        Context.removeWireMockMapping("/onap/so/infra/serviceInstantiation/v7/serviceInstances/");
+        Context.removeWireMockMapping("/onap/so/infra/serviceInstantiation/v7/serviceInstances");
         Context.removeWireMockMapping("/onap/so/infra/orchestrationRequests/v7/requestId");
 
         SoTaskProcessor.processOrderItem(executionTaskA);
@@ -473,7 +473,7 @@ public class ExecutionTaskTest {
         ExecutionTask executionTaskA = ServiceOrderExecutionTaskAssertions
                 .setUpBddForExecutionTaskSucess(serviceOrderRepository, executionTaskRepository, ActionType.ADD);
 
-        changeWireMockResponse("/onap/so/infra/serviceInstantiation/v7/serviceInstances/", 400,
+        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"
                         + "    }");

diff --git a/src/test/resources/mappings/so/so_post_create_service_instance.json b/src/test/resources/mappings/so/so_post_create_service_instance.json
index 8d319f6..c1d556e 100644 (file)
--- a/src/test/resources/mappings/so/so_post_create_service_instance.json
+++ b/src/test/resources/mappings/so/so_post_create_service_instance.json
@@ -1,7 +1,7 @@
 {
     "request": {
         "method": "POST",
-        "url": "/onap/so/infra/serviceInstantiation/v7/serviceInstances/"
+        "url": "/onap/so/infra/serviceInstantiation/v7/serviceInstances"
     },
     "response": {
         "status": 201,

diff --git a/version.properties b/version.properties
index c7be00a..16dbf04 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -20,7 +20,7 @@
 
 major            = 6
 minor            = 0
-patch            = 2
+patch            = 3
 
 base_version     = ${major}.${minor}.${patch}