Merge "update the SO architecture"

diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapter.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapter.java
index 84ff054..7feaa9c 100644 (file)
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapter.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapter.java
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlElement;
 import org.onap.so.adapters.requestsdb.exceptions.MsoRequestsDbException;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.db.request.beans.InstanceNfvoMapping;
+import org.onap.so.db.request.beans.OperationStatus;
 import org.onap.so.db.request.beans.ResourceOperationStatus;
 
 /**
@@ -76,6 +77,12 @@ public interface MsoRequestsDbAdapter {
     @WebMethod
     public boolean getSiteStatus(@WebParam(name = "siteName") @XmlElement(required = true) String siteName);
 
+    @WebMethod
+    public OperationStatus getServiceOperationStatus(
+            @WebParam(name = "serviceId") @XmlElement(required = true) String serviceId,
+            @WebParam(name = "operationId") @XmlElement(required = false) String operationId)
+            throws MsoRequestsDbException;
+
     @WebMethod
     public void updateServiceOperationStatus(
             @WebParam(name = "serviceId") @XmlElement(required = true) String serviceId,

diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapterImpl.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
index b262cb2..8782cce 100644 (file)
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
@@ -221,6 +221,27 @@ public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
         }
     }
 
+    /**
+     * get the operation status
+     *
+     * @param serviceId
+     * @param operationId
+     * @return operationStatus
+     * @throws MsoRequestsDbException
+     */
+    @Override
+    @Transactional
+    public OperationStatus getServiceOperationStatus(String serviceId, String operationId)
+            throws MsoRequestsDbException {
+        OperationStatus operationStatus;
+        if (operationId.isEmpty()) {
+            operationStatus = operationStatusRepository.findOneByServiceId(serviceId);
+        } else {
+            operationStatus = operationStatusRepository.findOneByServiceIdAndOperationId(serviceId, operationId);
+        }
+        return operationStatus;
+    }
+
     /**
      * update operation status <br>
      *

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateCommunicationService.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateCommunicationService.groovy
index 8689972..cf6bef6 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateCommunicationService.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateCommunicationService.groovy
@@ -383,9 +383,6 @@ class CreateCommunicationService extends AbstractServiceTaskProcessor {
             }
 
             e2eInputMap.put("sNSSAI", execution.getVariable("sNSSAI_id"))
-            e2eInputMap.put("areaTrafficCapDL", 100)
-            e2eInputMap.put("areaTrafficCapUL", 100)
-            e2eInputMap.put("sST", execution.getVariable("csServiceType"))
 
             execution.setVariable("e2eInputMap", e2eInputMap)
             execution.setVariable("e2eServiceType", e2eServiceDecomposition.getServiceType())

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSliceService.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSliceService.groovy
index b3f030d..2da5878 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSliceService.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSliceService.groovy
@@ -155,9 +155,14 @@ public class CreateSliceService extends AbstractServiceTaskProcessor {
             Map<String, Object> parameterObject = (Map<String, Object>) serviceObject.get("parameters")
             Map<String, Object> requestInputs = (Map<String, Object>) parameterObject.get("requestInputs")
 
+            def serviceProfile = [:]
+            for(entry in requestInputs) {
+                serviceProfile[entry.key] = entry.value
+            }
+
             execution.setVariable("serviceInputParams", inputMap)
             execution.setVariable("uuiRequest", uuiRequest)
-            execution.setVariable("serviceProfile", requestInputs)
+            execution.setVariable("serviceProfile", serviceProfile)
 
             //TODO
             //execution.setVariable("serviceInputParams", jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.userParams"))

diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/camundabeans/CamundaVIDRequest.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/camundabeans/CamundaVIDRequest.java
index 4517811..65c850a 100644 (file)
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/camundabeans/CamundaVIDRequest.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/camundabeans/CamundaVIDRequest.java
@@ -65,7 +65,8 @@ public class CamundaVIDRequest {
 
     @JsonProperty(CommonConstants.SERVICE_INSTANCE_ID_VARIABLE)
     private CamundaInput serviceInstanceId;
-
+    @JsonProperty(CommonConstants.OPERATION_TYPE)
+    private CamundaInput operationType;
     @JsonProperty(CommonConstants.PNF_CORRELATION_ID)
     private CamundaInput pnfCorrelationId;
 
@@ -194,6 +195,16 @@ public class CamundaVIDRequest {
         this.serviceInstanceId = serviceInstanceId;
     }
 
+    @JsonProperty(CommonConstants.OPERATION_TYPE)
+    public CamundaInput getOperationType() {
+        return operationType;
+    }
+
+    @JsonProperty(CommonConstants.OPERATION_TYPE)
+    public void setOperationType(CamundaInput operationType) {
+        this.operationType = operationType;
+    }
+
     @JsonProperty(CommonConstants.PNF_CORRELATION_ID)
     public CamundaInput getPnfCorrelationId() {
         return pnfCorrelationId;

diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/CamundaClient.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/CamundaClient.java
index 33e4740..4bbfa1d 100644 (file)
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/CamundaClient.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/CamundaClient.java
@@ -90,7 +90,8 @@ public class CamundaClient {
                 parameterObject.getVnfType(), parameterObject.getVfModuleType(), parameterObject.getNetworkType(),
                 parameterObject.getRequestDetails(), parameterObject.getApiVersion(), parameterObject.isaLaCarte(),
                 parameterObject.getRequestUri(), parameterObject.getRecipeParamXsd(),
-                parameterObject.getInstanceGroupId(), parameterObject.isGenerateIdsOnly());
+                parameterObject.getInstanceGroupId(), parameterObject.isGenerateIdsOnly(),
+                parameterObject.getOperationType());
 
         return post(jsonReq, orchestrationURI);
     }
@@ -167,7 +168,7 @@ public class CamundaClient {
             String serviceInstanceId, String pnfCorrelationId, String vnfId, String vfModuleId, String volumeGroupId,
             String networkId, String configurationId, String serviceType, String vnfType, String vfModuleType,
             String networkType, String requestDetails, String apiVersion, boolean aLaCarte, String requestUri,
-            String paramXsd, String instanceGroupId, boolean generateIdsOnly) {
+            String paramXsd, String instanceGroupId, boolean generateIdsOnly, String operationType) {
         String jsonReq = null;
 
         try {
@@ -179,6 +180,7 @@ public class CamundaClient {
             CamundaIntegerInput recipeTimeoutInput = new CamundaIntegerInput();
             CamundaInput requestActionInput = new CamundaInput();
             CamundaInput serviceInstanceIdInput = new CamundaInput();
+            CamundaInput operationTypeInput = new CamundaInput();
             CamundaInput pnfCorrelationIdInput = new CamundaInput();
             CamundaInput vnfIdInput = new CamundaInput();
             CamundaInput vfModuleIdInput = new CamundaInput();
@@ -196,7 +198,7 @@ public class CamundaClient {
             CamundaInput instanceGroupIdInput = new CamundaInput();
             CamundaBooleanInput generateIds = new CamundaBooleanInput();
 
-
+            operationTypeInput.setValue(StringUtils.defaultString(operationType));
             requestIdInput.setValue(StringUtils.defaultString(requestId));
             isBaseVfModuleInput.setValue(isBaseVfModule);
             recipeTimeoutInput.setValue(recipeTimeout);
@@ -228,6 +230,7 @@ public class CamundaClient {
             camundaRequest.setRecipeTimeout(recipeTimeoutInput);
             camundaRequest.setRequestAction(requestActionInput);
             camundaRequest.setServiceInstanceId(serviceInstanceIdInput);
+            camundaRequest.setOperationType(operationTypeInput);
             camundaRequest.setPnfCorrelationId(pnfCorrelationIdInput);
             camundaRequest.setVnfId(vnfIdInput);
             camundaRequest.setVfModuleId(vfModuleIdInput);

diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/CommonConstants.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/CommonConstants.java
index 6d2bbfc..d667126 100644 (file)
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/CommonConstants.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/CommonConstants.java
@@ -54,6 +54,7 @@ public final class CommonConstants {
     public static final String RECIPE_TIMEOUT_VARIABLE = "recipeTimeout";
     public static final String REQUEST_ACTION_VARIABLE = "requestAction";
     public static final String SERVICE_INSTANCE_ID_VARIABLE = "serviceInstanceId";
+    public static final String OPERATION_TYPE = "operationType";
     public static final String PNF_CORRELATION_ID = "pnfCorrelationId";
     public static final String VNF_ID_VARIABLE = "vnfId";
     public static final String VF_MODULE_ID_VARIABLE = "vfModuleId";

diff --git a/mso-api-handlers/mso-api-handler-common/src/test/java/org/onap/so/apihandler/common/CamundaClientTest.java b/mso-api-handlers/mso-api-handler-common/src/test/java/org/onap/so/apihandler/common/CamundaClientTest.java
index e51f0e2..e0f4fe3 100644 (file)
--- a/mso-api-handlers/mso-api-handler-common/src/test/java/org/onap/so/apihandler/common/CamundaClientTest.java
+++ b/mso-api-handlers/mso-api-handler-common/src/test/java/org/onap/so/apihandler/common/CamundaClientTest.java
@@ -139,11 +139,12 @@ public class CamundaClientTest {
         boolean aLaCarte = true;
         String requestUri = "v7/serviceInstances/assign";
         String instanceGroupId = "ff305d54-75b4-431b-adb2-eb6b9e5ff000";
+        String operationType = "activation";
 
         String testResult = client.wrapVIDRequest(requestId, isBaseVfModule, recipeTimeout, requestAction,
                 serviceInstanceId, pnfCorrelationId, vnfId, vfModuleId, volumeGroupId, networkId, configurationId,
                 serviceType, vnfType, vfModuleType, networkType, requestDetails, apiVersion, aLaCarte, requestUri, "",
-                instanceGroupId, false);
+                instanceGroupId, false, operationType);
         String expected = inputStream("/WrappedVIDRequest.json");
 
         JSONAssert.assertEquals(expected, testResult, false);

diff --git a/mso-api-handlers/mso-api-handler-common/src/test/resources/CamundaClientTest/WrappedVIDRequest.json b/mso-api-handlers/mso-api-handler-common/src/test/resources/CamundaClientTest/WrappedVIDRequest.json
index 3353f8c..6eebb5f 100644 (file)
--- a/mso-api-handlers/mso-api-handler-common/src/test/resources/CamundaClientTest/WrappedVIDRequest.json
+++ b/mso-api-handlers/mso-api-handler-common/src/test/resources/CamundaClientTest/WrappedVIDRequest.json
@@ -95,6 +95,10 @@
                "generateIdsOnly": {
                        "value": false,
                        "type": "Boolean"
+               },
+               "operationType": {
+                       "value": "activation",
+                       "type": "String"
                }
        }
 }