1 files changed, 58 insertions, 60 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/NetworkRpcInputEntityBuilder.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/NetworkRpcInputEntityBuilder.java
index bcac56a518..a1e47df501 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/NetworkRpcInputEntityBuilder.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/NetworkRpcInputEntityBuilder.java
@@ -1,42 +1,45 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
 package org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.builder;
 
-import org.apache.commons.lang3.StringUtils;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.request.information.RequestInformation;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.sdnc.request.header.SdncRequestHeader;
+import org.camunda.bpm.engine.delegate.DelegateExecution;
 import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.entity.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 /**
  * Created by 10112215 on 2017/9/20.
  */
-public class NetworkRpcInputEntityBuilder implements AbstractBuilder<Map<String, String>, NetworkRpcInputEntity> {
-
-    public static final String SVC_REQUEST_ID = "MSO";
-    public static final String SDC_ACTION = "SDC_ACTION";
-    public static final RequestInformation.RequestAction REQUEST_ACTION = RequestInformation.RequestAction.CreateNetworkInstance;
-
-    protected NetworkRpcInputEntity getSdncEntityInput(Map<String, String> inputs) {
-        NetworkRpcInputEntity networkRpcInputEntity = new NetworkRpcInputEntity();
-        InputEntity inputEntity = new InputEntity();
-        {
-            loadSdncRequestHeaderEntity(inputs, inputEntity);
-            loadRequestInformationEntity(inputEntity);
+public class NetworkRpcInputEntityBuilder extends AbstractBuilder<Map<String, String>, RpcNetworkTopologyOperationInputEntity> {
 
-            ServiceInformationEntity serviceInformationEntity = new ServiceInformationEntity();
-            String serviceId = inputs.get("serviceId");
-            serviceInformationEntity.setServiceId(serviceId);
-
-
-            loadNetwrokRequestInputEntity(inputs, inputEntity);
-        }
-        networkRpcInputEntity.setInput(inputEntity);
-        return networkRpcInputEntity;
+    @Override
+    public RpcNetworkTopologyOperationInputEntity build(DelegateExecution execution, Map<String, String> inputs) {
+        RpcNetworkTopologyOperationInputEntity rpcNetworkTopologyOperationInputEntity = new RpcNetworkTopologyOperationInputEntity();
+        NetworkTopologyOperationInputEntity networkTopologyOperationInputEntity = getNetworkTopologyOperationInputEntity(execution, inputs);
+        rpcNetworkTopologyOperationInputEntity.setInput(networkTopologyOperationInputEntity);
+        return rpcNetworkTopologyOperationInputEntity;
     }
 
-    private void loadNetwrokRequestInputEntity(Map<String, String> inputs, InputEntity inputEntity) {
+    private void loadNetwrokRequestInputEntity(Map<String, String> inputs, NetworkTopologyOperationInputEntity networkTopologyOperationInputEntity) {
         NetworkRequestInputEntity networkRequestInputEntity = new NetworkRequestInputEntity();
         {
             NetworkInputPaarametersEntity networkInputPaarametersEntity = new NetworkInputPaarametersEntity();
@@ -44,52 +47,47 @@ public class NetworkRpcInputEntityBuilder implements AbstractBuilder<Map<String,
                 List<ParamEntity> paramEntityList = getParamEntities(inputs);
                 networkInputPaarametersEntity.setParamList(paramEntityList);
             }
-
         }
-        inputEntity.setNetworkRequestInput(networkRequestInputEntity);
+        networkTopologyOperationInputEntity.setNetworkRequestInput(networkRequestInputEntity);
     }
 
-    private List<ParamEntity> getParamEntities(Map<String, String> inputs) {
-        List<ParamEntity> paramEntityList = new ArrayList<>();
-        if (inputs != null && !inputs.isEmpty()) {
-            inputs.keySet().forEach(key -> {
-                ParamEntity paramEntity = new ParamEntity();
-                paramEntity.setName(key);
-                paramEntity.setValue(inputs.get(key));
-                paramEntityList.add(paramEntity);
-            });
-        }
-        return paramEntityList;
+    private void loadRequestInformationEntity(NetworkTopologyOperationInputEntity networkTopologyOperationInputEntity, DelegateExecution execution) {
+        RequestInformationEntity requestInformationEntity = getRequestInformationEntity(execution);
+        networkTopologyOperationInputEntity.setRequestInformation(requestInformationEntity);
     }
 
-    private void loadRequestInformationEntity(InputEntity inputEntity) {
-        RequestInformationEntity requestInformationEntity = new RequestInformationEntity();
+    private void loadSdncRequestHeaderEntity(NetworkTopologyOperationInputEntity networkTopologyOperationInputEntity, DelegateExecution execution) {
+        SdncRequestHeaderEntity sdncRequestHeaderEntity = new SdncRequestHeaderEntity();
         {
-            requestInformationEntity.setRequestId(SVC_REQUEST_ID);
-            requestInformationEntity.setRequestAction(REQUEST_ACTION.name());
+            sdncRequestHeaderEntity.setSvcRequestId(getRequestId(execution));
+            sdncRequestHeaderEntity.setSvcAction(getOperationType(execution));
         }
-        inputEntity.setRequestInformation(requestInformationEntity);
+        networkTopologyOperationInputEntity.setSdncRequestHeader(sdncRequestHeaderEntity);
     }
 
-    private void loadSdncRequestHeaderEntity(Map<String, String> inputs, InputEntity inputEntity) {
-        SdncRequestHeaderEntity sdncRequestHeaderEntity = new SdncRequestHeaderEntity();
+    private void loadServiceInformation(NetworkTopologyOperationInputEntity networkTopologyOperationInputEntity, DelegateExecution execution) {
+        ServiceInformationEntity serviceInformationEntity = getServiceInformationEntity(execution);
+        networkTopologyOperationInputEntity.setServiceInformation(serviceInformationEntity);
+    }
+
+    private NetworkTopologyOperationInputEntity getNetworkTopologyOperationInputEntity(DelegateExecution execution, Map<String, String> inputs) {
+        NetworkTopologyOperationInputEntity networkTopologyOperationInputEntity = new NetworkTopologyOperationInputEntity();
         {
-            sdncRequestHeaderEntity.setSvcRequestId(SVC_REQUEST_ID);
-            String action = inputs.get(SDC_ACTION);
-            if (!StringUtils.isBlank(action)) {
-                if (action.toLowerCase().contains("delete")) {
-                    action = SdncRequestHeader.SvcAction.Delete.name();
-                } else if (action.toLowerCase().contains("create")) {
-                    action = SdncRequestHeader.SvcAction.Create.name();
-                }
-            }
-            sdncRequestHeaderEntity.setSvcAction(action);
+            loadSdncRequestHeaderEntity(networkTopologyOperationInputEntity, execution);
+            loadRequestInformationEntity(networkTopologyOperationInputEntity, execution);
+            loadServiceInformation(networkTopologyOperationInputEntity, execution);
+            loadNetworkInformationEntity(execution, networkTopologyOperationInputEntity);
+            loadNetwrokRequestInputEntity(inputs, networkTopologyOperationInputEntity);
         }
-        inputEntity.setSdncRequestHeader(sdncRequestHeaderEntity);
+        return networkTopologyOperationInputEntity;
     }
 
-    @Override
-    public NetworkRpcInputEntity build(Map<String, String> input) {
-        return null;
+    private void loadNetworkInformationEntity(DelegateExecution execution, NetworkTopologyOperationInputEntity networkTopologyOperationInputEntity) {
+        NetworkInformationEntity networkInformationEntity = new NetworkInformationEntity();
+        {
+            OnapModelInformationEntity onapModelInformationEntity = getOnapModelInformationEntity(execution);
+            networkInformationEntity.setOnapModelInformation(onapModelInformationEntity);
+        }
+        networkTopologyOperationInputEntity.setNetworkInformation(networkInformationEntity);
     }
 }