Merge "Add UT for HealthCheckHandlerTest"

diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml
index 66ecbd8..a06a16d 100644 (file)
--- a/asdc-controller/pom.xml
+++ b/asdc-controller/pom.xml
@@ -81,7 +81,6 @@
                <dependency>
                                <groupId>org.apache.httpcomponents</groupId>
                                <artifactId>httpclient</artifactId>
-                               <version>4.5.5</version>
                                <scope>compile</scope>
                                <exclusions>
                                        <exclusion>  

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceInput.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceInput.java
index 0a008d1..00e4ae7 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceInput.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceInput.java
@@ -19,6 +19,8 @@
  */\r
 package org.openecomp.mso.bpmn.common.recipe;\r
 \r
+import org.openecomp.mso.bpmn.core.domain.ModelInfo;\r
+\r
 import com.fasterxml.jackson.annotation.JsonProperty;\r
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;\r
 import com.fasterxml.jackson.annotation.JsonRootName;\r
@@ -35,7 +37,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
  * @author\r
  * @version     ONAP Beijing Release  2018-03-08\r
  */\r
-@JsonPropertyOrder({"resourceInstanceName", "resourceInstanceDes", "globalSubscriberId", "serviceType", "serviceId", "operationId", "resourceType","resourceCustomizationUuid"})\r
+@JsonPropertyOrder({"resourceInstanceName", "resourceInstanceDes", "globalSubscriberId", "serviceType", "serviceId", "operationId", "serviceModelInfo","resourceModelInfo", "resourceInstancenUuid","resourceParameters","operationType"})\r
 @JsonRootName("variables")\r
 public class ResourceInput {\r
 \r
@@ -57,17 +59,11 @@ public class ResourceInput {
     @JsonProperty("operationId")\r
     private String operationId;\r
     \r
-    //for create resource\r
-    @JsonProperty("resourceInvariantUuid")\r
-    private String resourceInvariantUuid;\r
+    @JsonProperty("serviceModelInfo")\r
+    private ModelInfo serviceModelInfo;\r
     \r
-    //for create resource\r
-    @JsonProperty("resourceUuid")\r
-    private String resourceUuid;\r
-\r
-    //for create resource\r
-    @JsonProperty("resourceCustomizationUuid")\r
-    private String resourceCustomizationUuid;\r
+    @JsonProperty("resourceModelInfo")\r
+    private ModelInfo resourceModelInfo;\r
     \r
     //for delete resource\r
     @JsonProperty("resourceInstancenUuid")\r
@@ -186,66 +182,46 @@ public class ResourceInput {
     public void setOperationId(String operationId) {\r
         this.operationId = operationId;\r
     }\r
-        \r
-   \r
     \r
     /**\r
-     * @return Returns the resourceInvariantUuid.\r
+     * @return Returns the serviceModelInfo.\r
      */\r
-    @JsonProperty("resourceInvariantUuid")\r
-    public String getResourceInvariantUuid() {\r
-        return resourceInvariantUuid;\r
+    @JsonProperty("serviceModelInfo")\r
+    public ModelInfo getServiceModelInfo() {\r
+        return serviceModelInfo;\r
     }\r
 \r
 \r
     \r
     /**\r
-     * @param resourceInvariantUuid The resourceInvariantUuid to set.\r
+     * @param serviceModelInfo The serviceModelInfo to set.\r
      */\r
-    @JsonProperty("resourceInvariantUuid")\r
-    public void setResourceInvariantUuid(String resourceInvariantUuid) {\r
-        this.resourceInvariantUuid = resourceInvariantUuid;\r
+    @JsonProperty("serviceModelInfo")\r
+    public void setServiceModelInfo(ModelInfo serviceModelInfo) {\r
+        this.serviceModelInfo = serviceModelInfo;\r
     }\r
 \r
 \r
     \r
     /**\r
-     * @return Returns the resourceUuid.\r
+     * @return Returns the resourceModelInfo.\r
      */\r
-    @JsonProperty("resourceUuid")\r
-    public String getResourceUuid() {\r
-        return resourceUuid;\r
+    @JsonProperty("resourceModelInfo")\r
+    public ModelInfo getResourceModelInfo() {\r
+        return resourceModelInfo;\r
     }\r
 \r
 \r
     \r
     /**\r
-     * @param resourceUuid The resourceUuid to set.\r
-     */\r
-    @JsonProperty("resourceUuid")\r
-    public void setResourceUuid(String resourceUuid) {\r
-        this.resourceUuid = resourceUuid;\r
-    }\r
-\r
-\r
-    /**\r
-     * @return Returns the resourceCustomizationUuid.\r
+     * @param resourceModelInfo The resourceModelInfo to set.\r
      */\r
-    @JsonProperty("resourceCustomizationUuid")\r
-    public String getResourceCustomizationUuid() {\r
-        return resourceCustomizationUuid;\r
+    @JsonProperty("resourceModelInfo")\r
+    public void setResourceModelInfo(ModelInfo resourceModelInfo) {\r
+        this.resourceModelInfo = resourceModelInfo;\r
     }\r
 \r
-    \r
-    /**\r
-     * @param resourceCustomizationUuid The resourceCustomizationUuid to set.\r
-     */\r
-    @JsonProperty("resourceCustomizationUuid")\r
-    public void setResourceCustomizationUuid(String resourceCustomizationUuid) {\r
-        this.resourceCustomizationUuid = resourceCustomizationUuid;\r
-    }\r
 \r
-    \r
     /**\r
      * @return Returns the resourceParameters.\r
      */\r

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceInputTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceInputTest.java
index fe1975f..466f4a1 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceInputTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceInputTest.java
@@ -19,9 +19,10 @@
 */
 package org.openecomp.mso.bpmn.common.recipe;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
+import org.openecomp.mso.bpmn.core.domain.ModelInfo;
 
 public class ResourceInputTest {
    
@@ -34,9 +35,16 @@ public class ResourceInputTest {
                ri.setServiceType("serviceType");
                ri.setServiceInstanceId("serviceId");
                ri.setOperationId("operationId");
-               ri.setResourceInvariantUuid("resourceInvariantUuid");
-               ri.setResourceUuid("resourceUuid");
-               ri.setResourceCustomizationUuid("resourceCustomizationUuid");
+               ModelInfo serviceModelInfo = new ModelInfo();
+               serviceModelInfo.setModelCustomizationUuid("modelCustomizationUuid");
+               serviceModelInfo.setModelInvariantUuid("modelInvariantUuid");
+               serviceModelInfo.setModelUuid("modelUuid");
+               ri.setServiceModelInfo(serviceModelInfo);
+        ModelInfo resourceModelInfo = new ModelInfo();
+        resourceModelInfo.setModelCustomizationUuid("modelCustomizationUuid");
+        resourceModelInfo.setModelInvariantUuid("modelInvariantUuid");
+        resourceModelInfo.setModelUuid("modelUuid");
+        ri.setResourceModelInfo(resourceModelInfo);
                ri.setResourceInstancenUuid("resourceInstancenUuid");
                ri.setResourceParameters("resourceParameters");
                ri.setOperationType("operationType");
@@ -46,9 +54,6 @@ public class ResourceInputTest {
                assertEquals(ri.getServiceType(), "serviceType");
                assertEquals(ri.getServiceInstanceId(), "serviceId");
                assertEquals(ri.getOperationId(), "operationId");
-               assertEquals(ri.getResourceInvariantUuid(), "resourceInvariantUuid");
-               assertEquals(ri.getResourceUuid(), "resourceUuid");
-               assertEquals(ri.getResourceCustomizationUuid(), "resourceCustomizationUuid");
                assertEquals(ri.getResourceInstancenUuid(), "resourceInstancenUuid");
                assertEquals(ri.getResourceParameters(), "resourceParameters");
                assertEquals(ri.getOperationType(), "operationType");

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy
index 072c381..933d450 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy
@@ -133,11 +133,76 @@ public class CreateSDNCCNetworkResource extends AbstractServiceTaskProcessor {
             String sdncCallback = execution.getVariable("URN_mso_workflow_sdncadapter_callback")\r
             String createNetworkInput = execution.getVariable(Prefix + "networkRequest")\r
 \r
+            String hdrRequestId = execution.getVariable("mso-request-id")\r
             String serviceInstanceId = execution.getVariable(Prefix + "serviceInstanceId")\r
-            \r
+            String source = execution.getVariable("source")\r
+            String sdnc_service_id = execution.getVariable(Prefix + "sdncServiceId")\r
+            ResourceInput resourceInputObj = execution.getVariable(Prefix + "resourceInput")\r
+            String serviceType = resourceInputObj.getServiceType()\r
+            String serviceModelInvariantUuid = resourceInputObj.getServiceModelInfo().getModelInvariantUuid()\r
+            String serviceModelUuid = resourceInputObj.getServiceModelInfo().getModelUuid()\r
+            String serviceModelVersion = resourceInputObj.getServiceModelInfo().getModelName()\r
+            String serviceModelName = resourceInputObj.getServiceModelInfo().getModelVersion()\r
+            String globalCustomerId = resourceInputObj.getGlobalSubscriberId()\r
+            String modelInvariantUuid = resourceInputObj.getResourceModelInfo().getModelInvariantUuid();\r
+            String modelCustomizationUuid = resourceInputObj.getResourceModelInfo().getModelCustomizationUuid()\r
+            String modelUuid = resourceInputObj.getResourceModelInfo().getModelUuid()\r
+            String modelName = resourceInputObj.getResourceModelInfo().getModelName()\r
+            String modelVersion = resourceInputObj.getResourceModelInfo().getModelVersion()\r
+            String resourceInputPrameters = resourceInputObj.getResourceParameters()\r
+            String netowrkInputParametersJson = jsonUtil.getJsonValue(resourceInputPrameters, "requestInputs")\r
+            //here convert json string to xml string\r
+            String netowrkInputParameters = jsonUtil.json2xml(netowrkInputParametersJson)\r
             // 1. prepare assign topology via SDNC Adapter SUBFLOW call\r
             String sndcTopologyCreateRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, createNetworkInput, serviceInstanceId, sdncCallback, sdnc_svcAction, sdnc_requestAction, null, null, null)\r
-\r
+                    String content =\r
+                    """<aetgt:SDNCAdapterWorkflowRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"\r
+                                                              xmlns:sdncadapter="http://org.openecomp.mso/workflow/sdnc/adapter/schema/v1" \r
+                                                              xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">\r
+                                 <sdncadapter:RequestHeader>\r
+                                    <sdncadapter:RequestId>${hdrRequestId}</sdncadapter:RequestId>\r
+                                    <sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>\r
+                                    <sdncadapter:SvcAction>${sdnc_svcAction}</sdncadapter:SvcAction>\r
+                                    <sdncadapter:SvcOperation>network-topology-operation</sdncadapter:SvcOperation>\r
+                                    <sdncadapter:CallbackUrl>sdncCallback</sdncadapter:CallbackUrl>\r
+                                    <sdncadapter:MsoAction>generic-resource</sdncadapter:MsoAction>\r
+                                 </sdncadapter:RequestHeader>\r
+                                 <sdncadapterworkflow:SDNCRequestData>\r
+                                     <request-information>\r
+                                        <request-id>${hdrRequestId}</request-id>\r
+                                        <request-action>${sdnc_requestAction}</request-action>\r
+                                        <source>${source}</source>\r
+                                        <notification-url></notification-url>\r
+                                        <order-number></order-number>\r
+                                        <order-version></order-version>\r
+                                     </request-information>\r
+                                     <service-information>\r
+                                        <service-id>${sdnc_service_id}</service-id>\r
+                                        <subscription-service-type>${serviceType}</subscription-service-type>\r
+                                        <ecomp-model-information>\r
+                                             <model-invariant-uuid>${serviceModelInvariantUuid}</model-invariant-uuid>\r
+                                             <model-uuid>${serviceModelUuid}</model-uuid>\r
+                                             <model-version>${serviceModelVersion}</model-version>\r
+                                             <model-name>${serviceModelName}</model-name>\r
+                                        </ecomp-model-information>\r
+                                        <service-instance-id>${serviceInstanceId}</service-instance-id>\r
+                                        <global-customer-id>${globalCustomerId}</global-customer-id>\r
+                                     </service-information>\r
+                                     <network-information>\r
+                                        <ecomp-model-information>\r
+                                             <model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>\r
+                                             <model-customization-uuid>${modelCustomizationUuid}</model-customization-uuid>\r
+                                             <model-uuid>${modelUuid}</model-uuid>\r
+                                             <model-version>${modelVersion}</model-version>\r
+                                             <model-name>${modelName}</model-name>\r
+                                        </ecomp-model-information>\r
+                                     </network-information>\r
+                                     <network-request-input>\r
+                                       <network-input-parameters>${netowrkInputParameters}</network-input-parameters>\r
+                                     </network-request-input>\r
+                                </sdncadapterworkflow:SDNCRequestData>\r
+                             </aetgt:SDNCAdapterWorkflowRequest>""".trim()\r
+            \r
             String sndcTopologyCreateRequesAsString = utils.formatXml(sndcTopologyCreateRequest)\r
             utils.logAudit(sndcTopologyCreateRequesAsString)\r
             execution.setVariable(Prefix + "createSDNCRequest", sndcTopologyCreateRequesAsString)\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
index 5eb3fd9..f32df04 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
@@ -548,12 +548,9 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
          def currentIndex = execution.getVariable("currentResourceIndex")
          List<Resource> sequencedResourceList = execution.getVariable("sequencedResourceList")  
          Resource currentResource = sequencedResourceList.get(currentIndex)
-         String resourceCustomizationUuid = currentResource.getModelInfo().getModelCustomizationUuid()
-         resourceInput.setResourceCustomizationUuid(resourceCustomizationUuid);
-         String resourceInvariantUuid = currentResource.getModelInfo().getModelInvariantUuid()
-         resourceInput.setResourceInvariantUuid(resourceInvariantUuid)
-         String resourceUuid = currentResource.getModelInfo().getModelUuid()
-         resourceInput.setResourceUuid(resourceUuid)
+         resourceInput.setResourceModelInfo(currentResource.getModelInfo());
+         ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
+         resourceInput.setServiceModelInfo(serviceDecomposition.getModelInfo());
          
          String incomingRequest = execution.getVariable("uuiRequest")
          //set the requestInputs from tempalte  To Be Done

diff --git a/cloudify-client/pom.xml b/cloudify-client/pom.xml
index 9b2ca39..057a1ed 100644 (file)
--- a/cloudify-client/pom.xml
+++ b/cloudify-client/pom.xml
@@ -35,12 +35,10 @@
                <dependency>
                        <groupId>org.apache.httpcomponents</groupId>
                        <artifactId>httpcore</artifactId>
-<!--                   <version>4.3.1</version> -->
                </dependency>
                <dependency>
                        <groupId>org.apache.httpcomponents</groupId>
                        <artifactId>httpclient</artifactId>
-<!--                   <version>4.5.5</version> -->
                </dependency>
                <dependency>
                        <groupId>org.hamcrest</groupId>

diff --git a/pom.xml b/pom.xml
index 263a632..0ca4836 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -549,7 +549,7 @@
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpcore</artifactId>
-        <version>4.4.1</version>
+        <version>4.4.4</version>
         <scope>compile</scope>
       </dependency>
       <dependency>