Fix multiple instantations via serviceOrder

[externalapi/nbi.git] / src / main / java / org / onap / nbi / apis / serviceorder / workflow / PostSoProcessor.java

diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/PostSoProcessor.java b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/PostSoProcessor.java
index 17b72e4..83e3785 100644 (file)
--- a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/PostSoProcessor.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/PostSoProcessor.java
@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
+import java.util.Random;
 
 import org.onap.nbi.apis.servicecatalog.ServiceSpecificationService;
 import org.onap.nbi.apis.serviceorder.SoClient;
@@ -29,6 +30,7 @@ import org.onap.nbi.apis.serviceorder.model.ServiceCharacteristic;
 import org.onap.nbi.apis.serviceorder.model.ServiceOrder;
 import org.onap.nbi.apis.serviceorder.model.ServiceOrderItem;
 import org.onap.nbi.apis.serviceorder.model.StateType;
+import org.onap.nbi.apis.serviceorder.model.ServiceStateType;
 import org.onap.nbi.apis.serviceorder.model.consumer.CloudConfiguration;
 import org.onap.nbi.apis.serviceorder.model.consumer.CreateE2EServiceInstanceResponse;
 import org.onap.nbi.apis.serviceorder.model.consumer.CreateMacroServiceInstanceResponse;
@@ -182,20 +184,34 @@ public class PostSoProcessor {
                         service.getServiceType(), serviceOrderItem.getService().getId());
                 break;
             case MODIFY:
-                if (StateType.INPROGRESS_MODIFY_ITEM_TO_CREATE == serviceOrderItem.getState()) {
+            //EXT-API supports E2E service activation/deactivation with action=modify and seviceState=active/inactive
+               boolean isActivateReq = ServiceStateType.ACTIVE == serviceOrderItem.getService().getServiceState() ||
+                               ServiceStateType.INACTIVE == serviceOrderItem.getService().getServiceState();
+
+                if (ServiceStateType.ACTIVE == serviceOrderItem.getService().getServiceState()) {
+                       response = soClient.callServiceActivationE2EService(service.getGlobalSubscriberId(),
+                            service.getServiceType(), serviceOrderItem.getService().getId(),"activate");
+               }
+               if (ServiceStateType.INACTIVE == serviceOrderItem.getService().getServiceState()) {
+                       response = soClient.callServiceActivationE2EService(service.getGlobalSubscriberId(),
+                            service.getServiceType(), serviceOrderItem.getService().getId(),"deactivate");
+               }
+               //Other E2E service modification follows Deletion followed by activation.
+               //For service modification, do not send serviceState=active/inactive
+               if (!isActivateReq && StateType.INPROGRESS_MODIFY_ITEM_TO_CREATE == serviceOrderItem.getState()) {
                     response = soClient.callE2ECreateServiceInstance(msoE2EPayload);
                 }
-                if (StateType.ACKNOWLEDGED == serviceOrderItem.getState()) {
+                if (!isActivateReq && StateType.ACKNOWLEDGED == serviceOrderItem.getState()) {
                     response = soClient.callE2EDeleteServiceInstance(service.getGlobalSubscriberId(),
                             service.getServiceType(), serviceOrderItem.getService().getId());
                 }
                 break;
-            default:
+           default:
                 break;
         }
         return response;
     }
-    
+ 
     private ResponseEntity<CreateMacroServiceInstanceResponse> postSOMacroRequest(ServiceOrderItem serviceOrderItem,
                             ServiceOrderInfo serviceOrderInfo) {
       
@@ -211,8 +227,8 @@ public class PostSoProcessor {
           response = soClient.callMacroCreateServiceInstance(msoMacroPayload);
           break;
         case DELETE:
-          // response = soClient.callDeleteServiceInstance(msoPayload,
-          // serviceOrderItem.getService().getId());
+           response = soClient.callMacroDeleteServiceInstance(msoMacroPayload,
+           serviceOrderItem.getService().getId());
           break;
         case MODIFY:
           if (StateType.INPROGRESS_MODIFY_ITEM_TO_CREATE == serviceOrderItem.getState()) {
@@ -273,7 +289,9 @@ public class PostSoProcessor {
                        instanceSpecification.putAll(vnfInstanceParams);
                        vnfInstanceParam.add(instanceSpecification);
                } else {
-                       vnfInstanceParams.put("k8s-rb-profile-name", k8sRbProfileName);
+                       //if skip_post_instantiation_configuration is true then add k8s-rb-profile-name
+                       if(instanceSpecification.get("skip_post_instantiation_configuration").equals(true))
+                               vnfInstanceParams.put("k8s-rb-profile-name", k8sRbProfileName);
                        vnfInstanceParam.add(vnfInstanceParams);
                }
 
@@ -304,13 +322,22 @@ public class PostSoProcessor {
                Map<String, String> lob = new HashMap<>();
                lob.put("lineOfBusinessName", "LOB-Demonstration");
 
+               //Create a random variable that will be concatanate to the instanceName
+               Random rand = new Random();
+               int upperbound = 100000;
+               //generate random values from 0-upperbound
+               int int_random = rand.nextInt(upperbound); 
+               
+               String vnfInstanceNameTmp = (String) resSpecMap.get("resourceInstanceName");
+               String vnfInstanceName = vnfInstanceNameTmp + int_random;
+               
                Map<String, Object> vnfModel = new HashMap<>();
                vnfModel.put("modelInfo", vnfInfoObject);
                vnfModel.put("cloudConfiguration", cloudConfiguration);
                vnfModel.put("platform", platformName);
                vnfModel.put("lineOfBusiness", lob);
                vnfModel.put("productFamilyId", "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb");
-               vnfModel.put("instanceName", (String) resSpecMap.get("resourceInstanceName"));
+               vnfModel.put("instanceName", vnfInstanceName);
                vnfModel.put("instanceParams", vnfInstanceParam);
 
                List<Object> vfModulesObjects = new ArrayList<>();
@@ -322,7 +349,8 @@ public class PostSoProcessor {
                        
                } else {
                        Map<String, Object> instanceParam = new HashMap<>();
-                       instanceParam.put("k8s-rb-profile-name", k8sRbProfileName);
+                       if(instanceSpecification.get("skip_post_instantiation_configuration").equals(true))
+                               instanceParam.put("k8s-rb-profile-name", k8sRbProfileName);
                        vfInstanceParam.add(instanceParam);
                }
                
@@ -330,13 +358,19 @@ public class PostSoProcessor {
                        Map<String, Object> vfModuleObject = new HashMap<>();
                        Map<String, String> vfModuleInfo = new HashMap<>();
 
+                       //generate random values from 0-upperbound
+                       int_random = rand.nextInt(upperbound); 
+               
+                       String vfmoduleInstanceNameTmp = (String) crsObject.getModelName();
+                       String vfmoduleInstanceName = vfmoduleInstanceNameTmp + int_random;     
+               
                        vfModuleInfo.put("modelName", crsObject.getModelName());
                        vfModuleInfo.put("modelVersionId", crsObject.getModelUuid());
                        vfModuleInfo.put("modelInvariantUuid", crsObject.getModelInvariantUuid());
                        vfModuleInfo.put("modelVersion", crsObject.getModelVersion());
                        vfModuleInfo.put("modelCustomizationId", crsObject.getModelCustomizationUuid());
                        vfModuleObject.put("modelInfo", vfModuleInfo);
-                       vfModuleObject.put("instanceName", crsObject.getModelName());
+                       vfModuleObject.put("instanceName", vfmoduleInstanceName);
                        vfModuleObject.put("instanceParams", vfInstanceParam);
 
                        vfModulesObjects.add(vfModuleObject);
@@ -660,4 +694,4 @@ public class PostSoProcessor {
 
        }
 
-}
\ No newline at end of file
+}