Merge "Fix input for SDNC resource creaation"

diff --combined bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java
index 636b8b5,c72cc71..d32a06d
--- 1/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java
--- 2/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java
@@@ -22,6 -22,7 +22,7 @@@ package org.openecomp.mso.bpmn.common.r
  
  import java.io.File;
  import java.io.IOException;
+ import java.util.ArrayList;
  import java.util.HashMap;
  import java.util.LinkedHashMap;
  import java.util.List;
@@@ -34,6 -35,9 +35,6 @@@ import org.camunda.bpm.engine.runtime.E
  import org.jboss.resteasy.client.jaxrs.ResteasyClient;
  import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
  import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
 -import org.openecomp.mso.bpmn.core.json.JsonUtils;
 -import org.openecomp.mso.logger.MessageEnum;
 -import org.openecomp.mso.logger.MsoLogger;
  import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
  import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
  import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
@@@ -41,10 -45,6 +42,10 @@@ import org.onap.sdc.toscaparser.api.Nod
  import org.onap.sdc.toscaparser.api.Property;
  import org.onap.sdc.toscaparser.api.functions.GetInput;
  import org.onap.sdc.toscaparser.api.parameters.Input;
 +import org.openecomp.mso.bpmn.core.PropertyConfiguration;
 +import org.openecomp.mso.bpmn.core.json.JsonUtils;
 +import org.openecomp.mso.logger.MessageEnum;
 +import org.openecomp.mso.logger.MsoLogger;
  
  import com.fasterxml.jackson.core.JsonProcessingException;
  import com.fasterxml.jackson.databind.ObjectMapper;
@@@ -56,11 -56,10 +57,11 @@@ public class ResourceRequestBuilder 
  
      public static String CUSTOMIZATION_UUID = "customizationUUID";
  
 -    public static String SERVICE_URL_TOSCA_CSAR = "http://mso:8080/ecomp/mso/catalog/v3/serviceToscaCsar?serviceModelUuid=";
 +    public static String SERVICE_URL_TOSCA_CSAR = "/v3/serviceToscaCsar?serviceModelUuid=";
  
      private static MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.RA);
  
 +   
      static JsonUtils jsonUtil = new JsonUtils();
  
          /**
@@@ -122,7 -121,7 +123,7 @@@
              throws SdcToscaParserException {
  
          Map<String, Object> resouceRequest = new HashMap<>();
- 
+         List<Map<String, Object>> param = new ArrayList<>();
          String csarpath = null;
          try {
              csarpath = getCsarFromUuid(serviceUuid);
@@@ -146,9 -145,13 +147,13 @@@
                  Property property = resourceProperties.get(key);
  
                  Object value = getValue(property.getValue(), serviceInputs, serInput);
-                 resouceRequest.put(key, value);
+                 HashMap<String, Object> parameter = new HashMap<>();
+                 parameter.put("name", key);
+                 parameter.put("value", value);
+                 param.add(parameter);
              }
          }
+         resouceRequest.put("param", param);
          return resouceRequest;
      }
  
@@@ -181,9 -184,7 +186,9 @@@
      private static String getCsarFromUuid(String uuid) throws Exception {
  
          ResteasyClient client = new ResteasyClientBuilder().build();
 -        ResteasyWebTarget target = client.target(SERVICE_URL_TOSCA_CSAR + uuid);
 +              Map<String, String> properties = PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties");
 +              String catalogEndPoint = properties.get("mso.catalog.db.endpoint");
 +              ResteasyWebTarget target = client.target(catalogEndPoint + SERVICE_URL_TOSCA_CSAR + uuid);
          Response response = target.request().get();
          String value = response.readEntity(String.class);