Update SO request to use GR_API instead of VNF_API

- add GR_API to so request
- request to AAI to retrieve cloud owner id
-add status "inprogress" after check

Issue-ID: EXTAPI-337
Signed-off-by: romaingimbert <romain.gimbert@orange.com>
Change-Id: I34911a3c785aac24f5feb71fede36a142f8fcffe

2 files changed, 24 insertions, 5 deletions

diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestDetails.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestDetails.java
index 2354b39..748af0d 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestDetails.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestDetails.java
@@ -89,8 +89,14 @@ public class RequestDetails {
 
     @Override
     public String toString() {
-        return "RequestDetails{" + "modelInfo=" + modelInfo + ", subscriberInfo=" + subscriberInfo + ", requestInfo="
-                + requestInfo + ", requestParameters=" + requestParameters + ", cloudConfiguration="
-                + cloudConfiguration + '}';
+        return "RequestDetails{" +
+            "modelInfo=" + modelInfo +
+            ", subscriberInfo=" + subscriberInfo +
+            ", requestInfo=" + requestInfo +
+            ", requestParameters=" + requestParameters +
+            ", cloudConfiguration=" + cloudConfiguration +
+            ", owningEntity=" + owningEntity +
+            ", project=" + project +
+            '}';
     }
 }
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestParameters.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestParameters.java
index e4bbfbb..147ad71 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestParameters.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestParameters.java
@@ -26,6 +26,15 @@ public class RequestParameters {
 
     private boolean aLaCarte;
 
+    private String testApi;
+
+    public String getTestApi() {
+        return testApi;
+    }
+
+    public void setTestApi(String testApi) {
+        this.testApi = testApi;
+    }
 
     public String getSubscriptionServiceType() {
         return subscriptionServiceType;
@@ -69,7 +78,11 @@ public class RequestParameters {
 
     @Override
     public String toString() {
-        return "RequestParameters{" + "subscriptionServiceType='" + subscriptionServiceType + '\'' + ", userParams="
-                + userParams + ", aLaCarte=" + aLaCarte + '}';
+        return "RequestParameters{" +
+            "subscriptionServiceType='" + subscriptionServiceType + '\'' +
+            ", userParams=" + userParams +
+            ", aLaCarte=" + aLaCarte +
+            ", testApi='" + testApi + '\'' +
+            '}';
     }
 }