Recipe param xsd support

Recipe param xsd support

Change-Id: I561d98358a76f1007b979cdf6753d2f3b7754991
Issue-ID: SO-583
Signed-off-by: c00149107 <chenchuanyu@huawei.com>

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryResourceRecipe.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryResourceRecipe.java
index 5be6970..7d6aed4 100644 (file)
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryResourceRecipe.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryResourceRecipe.java
@@ -24,6 +24,10 @@ import java.util.Map;
 \r
 import org.openecomp.mso.db.catalog.beans.Recipe;\r
 \r
+import com.fasterxml.jackson.core.JsonProcessingException;\r
+import com.fasterxml.jackson.databind.ObjectMapper;\r
+import com.fasterxml.jackson.databind.SerializationFeature;\r
+\r
 /**\r
  * serivce csar query support \r
  * <br>\r
@@ -41,16 +45,6 @@ public class QueryResourceRecipe extends CatalogQuery{
         this.resourceRecipe =resourceRecipe;\r
     }\r
 \r
-    private final String template =\r
-            "\t{\n"+\r
-            "\t\t\"id\"                     : <ID>,\n"+\r
-            "\t\t\"action\"                 : <ACTION>,\n"+\r
-            "\t\t\"orchestrationUri\"       : <ORCHESTRATION_URI>,\n"+\r
-            "\t\t\"recipeTimeout\"          : <RECIPE_TIMEOUT>,\n"+\r
-            "\t\t\"paramXSD\"               : <PARAM_XSD>,\n"+\r
-            "\t\t\"description\"            : <DESCRIPTION>\n"+\r
-            "\t}";\r
-    \r
     @Override\r
     public String toString() {\r
 \r
@@ -58,15 +52,25 @@ public class QueryResourceRecipe extends CatalogQuery{
     }\r
 \r
     @Override\r
-    public String JSON2(boolean isArray, boolean isEmbed) {\r
+    public String JSON2(boolean isArray, boolean isEmbed) {            \r
+       \r
         Map<String, String> valueMap = new HashMap<>();\r
-        put(valueMap, "ID", null == resourceRecipe ? null : resourceRecipe.getId());\r
-        put(valueMap, "ACTION", null == resourceRecipe ? null : resourceRecipe.getAction());\r
-        put(valueMap, "ORCHESTRATION_URI", null == resourceRecipe ? null : resourceRecipe.getOrchestrationUri());\r
-        put(valueMap, "RECIPE_TIMEOUT", null == resourceRecipe ? null : resourceRecipe.getRecipeTimeout());\r
-        put(valueMap, "PARAM_XSD", null == resourceRecipe ? null : resourceRecipe.getParamXSD());\r
-        put(valueMap, "DESCRIPTION", null == resourceRecipe ? null : resourceRecipe.getDescription());\r
-        return this.setTemplate(template, valueMap);\r
+        valueMap.put("id",  null == resourceRecipe ? null :String.valueOf(resourceRecipe.getId()));\r
+        valueMap.put("action",  null == resourceRecipe ? null :resourceRecipe.getAction());\r
+        valueMap.put("orchestrationUri", null == resourceRecipe ? null : resourceRecipe.getOrchestrationUri());\r
+        valueMap.put("recipeTimeout", null == resourceRecipe ? null : String.valueOf(resourceRecipe.getRecipeTimeout()));\r
+        valueMap.put("paramXSD", null == resourceRecipe ? null : resourceRecipe.getParamXSD());\r
+        valueMap.put("description", null == resourceRecipe ? null : resourceRecipe.getDescription());\r
+        ObjectMapper mapper = new ObjectMapper();\r
+        mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false);\r
+        String jsonStr = "";\r
+        try {\r
+            jsonStr = mapper.writeValueAsString(valueMap);\r
+        } catch(JsonProcessingException e) {\r
+\r
+            e.printStackTrace();\r
+        }\r
+        return jsonStr;\r
     }\r
 \r
 }\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVFCNSResource.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVFCNSResource.groovy
index ca32420..9f3910b 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVFCNSResource.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVFCNSResource.groovy
@@ -80,6 +80,8 @@ public class CreateVFCNSResource extends AbstractServiceTaskProcessor {
            //deal with operation key\r
            String globalSubscriberId = jsonUtil.getJsonValue(resourceInput, "globalSubscriberId")\r
            utils.log("INFO", "globalSubscriberId:" + globalSubscriberId, isDebugEnabled)\r
+           //set local globalSubscriberId variable\r
+           execution.setVariable("globalSubscriberId", globalSubscriberId);\r
 \r
            String serviceType = execution.getVariable("serviceType")\r
            utils.log("INFO", "serviceType:" + serviceType, isDebugEnabled)\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/AbstractSdncOperationTask.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/AbstractSdncOperationTask.java
index 0aeb0c6..25141a0 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/AbstractSdncOperationTask.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/AbstractSdncOperationTask.java
@@ -84,13 +84,14 @@ public abstract class AbstractSdncOperationTask extends BaseTask {
 
     private void updateResOperStatus(ResourceOperationStatus resourceOperationStatus) throws RouteException {
         logger.info("AbstractSdncOperationTask.updateResOperStatus begin!");
-        String url = "http://mso:8080/dbadapters/RequestsDbAdapter";
-        HttpPost httpPost = new HttpPost(url);
+               Map<String, String> properties = PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties");
+               String requestsdbEndPoint = properties.get("mso.adapters.openecomp.db.endpoint");
+        HttpPost httpPost = new HttpPost(requestsdbEndPoint);
         httpPost.addHeader("Authorization", "Basic QlBFTENsaWVudDpwYXNzd29yZDEk");
         httpPost.addHeader("Content-type", "application/soap+xml");
         String postBody = getPostStringBody(resourceOperationStatus);
         httpPost.setEntity(new StringEntity(postBody, ContentType.APPLICATION_XML));
-        httpPost(url, httpPost);
+        httpPost(requestsdbEndPoint, httpPost);
         logger.info("AbstractSdncOperationTask.updateResOperStatus end!");
     }
 
@@ -165,13 +166,14 @@ public abstract class AbstractSdncOperationTask extends BaseTask {
 
     private ResourceOperationStatus getResourceOperationStatus(String serviceId, String operationId, String resourceTemplateUUID) throws RouteException {
         logger.info("AbstractSdncOperationTask.getResourceOperationStatus begin!");
-        String url = "http://mso:8080/dbadapters/RequestsDbAdapter";
-        HttpPost httpPost = new HttpPost(url);
+               Map<String, String> properties = PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties");
+               String requestsdbEndPoint = properties.get("mso.adapters.openecomp.db.endpoint");
+        HttpPost httpPost = new HttpPost(requestsdbEndPoint);
         httpPost.addHeader("Authorization", "Basic QlBFTENsaWVudDpwYXNzd29yZDEk");
         httpPost.addHeader("Content-type", "application/soap+xml");
         String getBody = getGetStringBody(serviceId, operationId, resourceTemplateUUID);
         httpPost.setEntity(new StringEntity(getBody, ContentType.APPLICATION_XML));
-        String result = httpPost(url, httpPost);
+        String result = httpPost(requestsdbEndPoint, httpPost);
         ResourceOperationStatus resourceOperationStatus = getResourceOperationStatusFromXmlString(result);
         logger.info("AbstractSdncOperationTask.getResourceOperationStatus end!");
         return resourceOperationStatus;