Introduce tosca saving
[clamp.git] / src / main / java / org / onap / clamp / clds / service / CldsService.java
index a0aadcc..521f3ce 100644 (file)
  * ============LICENSE_START=======================================================
  * ONAP CLAMP
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * Copyright (C) 2017-2018 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. 
+ * 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 
+ *
+ * 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============================================
+ * Modifications copyright (c) 2018 Nokia
  * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ *
  */
 
 package org.onap.clamp.clds.service;
 
-import com.att.ajsc.common.AjscService;
-import com.att.ajsc.filemonitor.AJSCPropertiesMap;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.onap.clamp.clds.client.SdcCatalogServices;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.NotAuthorizedException;
+import javax.xml.transform.TransformerException;
+
+import org.apache.camel.Produce;
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.lang3.StringUtils;
+import org.json.simple.parser.ParseException;
+import org.onap.clamp.clds.camel.CamelProxy;
+import org.onap.clamp.clds.client.DcaeDispatcherServices;
+import org.onap.clamp.clds.client.DcaeInventoryServices;
+import org.onap.clamp.clds.client.req.sdc.SdcCatalogServices;
+import org.onap.clamp.clds.config.ClampProperties;
 import org.onap.clamp.clds.dao.CldsDao;
-import org.onap.clamp.clds.model.prop.ModelProperties;
-import org.onap.clamp.clds.model.refprop.RefProp;
+import org.onap.clamp.clds.exception.CldsConfigException;
+import org.onap.clamp.clds.exception.policy.PolicyClientException;
+import org.onap.clamp.clds.exception.sdc.SdcCommunicationException;
+import org.onap.clamp.clds.model.CldsDbServiceCache;
+import org.onap.clamp.clds.model.CldsEvent;
+import org.onap.clamp.clds.model.CldsInfo;
+import org.onap.clamp.clds.model.CldsModel;
+import org.onap.clamp.clds.model.CldsModelProp;
+import org.onap.clamp.clds.model.CldsMonitoringDetails;
+import org.onap.clamp.clds.model.CldsServiceData;
+import org.onap.clamp.clds.model.CldsTemplate;
+import org.onap.clamp.clds.model.DcaeEvent;
+import org.onap.clamp.clds.model.ValueItem;
+import org.onap.clamp.clds.model.properties.AbstractModelElement;
+import org.onap.clamp.clds.model.properties.ModelProperties;
+import org.onap.clamp.clds.model.sdc.SdcResource;
+import org.onap.clamp.clds.model.sdc.SdcServiceDetail;
+import org.onap.clamp.clds.model.sdc.SdcServiceInfo;
+import org.onap.clamp.clds.sdc.controller.installer.CsarInstallerImpl;
 import org.onap.clamp.clds.transform.XslTransformer;
-import org.apache.commons.lang3.StringUtils;
-import org.camunda.bpm.engine.RuntimeService;
-import org.camunda.bpm.engine.runtime.ProcessInstance;
-import org.jboss.resteasy.spi.BadRequestException;
-import org.onap.clamp.clds.model.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.onap.clamp.clds.util.JacksonUtils;
+import org.onap.clamp.clds.util.LoggingUtils;
+import org.onap.clamp.clds.util.ONAPLogConstants;
+import org.slf4j.event.Level;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.ApplicationContext;
-import org.springframework.core.io.Resource;
-
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.HttpClientErrorException;
 
 /**
  * Service to save and retrieve the CLDS model attributes.
  */
-@AjscService
-@Path("/clds")
+@Component
 public class CldsService extends SecureServiceBase {
 
-    @Autowired
-    private ApplicationContext appContext;
-
-    private static final Logger logger = LoggerFactory.getLogger(CldsService.class);
-
-    @Value("${CLDS_PERMISSION_TYPE_CL:org.onap.clamp.clds.cl}")
-    private static String CLDS_PERMISSION_TYPE_CL;
-
-    @Value("${CLDS_PERMISSION_TYPE_CL_MANAGE:org.onap.clamp.clds.cl.manage}")
-    private static String CLDS_PERMISSION_TYPE_CL_MANAGE;
-
-    @Value("${CLDS_PERMISSION_TYPE_CL_EVENT:/META-INF/securityFilterRules.json}")
-    private static String CLDS_PERMISSION_TYPE_CL_EVENT;
-
-    @Value("${CLDS_PERMISSION_TYPE_FILTER_VF:/META-INF/securityFilterRules.json}")
-    private static String CLDS_PERMISSION_TYPE_FILTER_VF;
+    @Produce(uri = "direct:processSubmit")
+    private CamelProxy camelProxy;
+    protected static final EELFLogger securityLogger = EELFManager.getInstance().getSecurityLogger();
+    protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsService.class);
+
+    public static final String GLOBAL_PROPERTIES_KEY = "files.globalProperties";
+    private final String cldsPersmissionTypeCl;
+    private final String cldsPermissionTypeClManage;
+    private final String cldsPermissionTypeClEvent;
+    private final String cldsPermissionTypeFilterVf;
+    private final String cldsPermissionTypeTemplate;
+    private final String cldsPermissionInstance;
+    final SecureServicePermission permissionReadCl;
+    final SecureServicePermission permissionUpdateCl;
+    final SecureServicePermission permissionReadTemplate;
+    final SecureServicePermission permissionUpdateTemplate;
+    final SecureServicePermission permissionReadTosca;
+    final SecureServicePermission permissionUpdateTosca;
+
+    private final CldsDao cldsDao;
+    private final XslTransformer cldsBpmnTransformer;
+    private final ClampProperties refProp;
+    private final SdcCatalogServices sdcCatalogServices;
+    private final DcaeDispatcherServices dcaeDispatcherServices;
+    private final DcaeInventoryServices dcaeInventoryServices;
+    private LoggingUtils util = new LoggingUtils(logger);
 
-    @Value("${CLDS_PERMISSION_INSTANCE:/META-INF/securityFilterRules.json}")
-    private static String CLDS_PERMISSION_INSTANCE;
-
-    private static final SecureServicePermission PERMISSION_READ_CL = SecureServicePermission.create(CLDS_PERMISSION_TYPE_CL, CLDS_PERMISSION_INSTANCE, "read");
-
-    private static final SecureServicePermission PERMISSION_UPDATE_CL = SecureServicePermission.create(CLDS_PERMISSION_TYPE_CL, CLDS_PERMISSION_INSTANCE, "update");
-
-    @Value("${org.onap.clamp.config.files.globalClds:classpath:/clds/globalClds.properties}")
-    private String globalClds;
-    private Properties globalCldsProperties;
-
-    @Autowired
-    private CldsDao cldsDao;
     @Autowired
-    private RuntimeService runtimeService;
-    @Autowired
-    private XslTransformer cldsBpmnTransformer;
-
-    @Autowired
-    private RefProp refProp;
-
+    private HttpServletRequest request;
     @Autowired
-    private SdcCatalogServices asdcCatalogServices;
-    //
+    public CldsService(CldsDao cldsDao, XslTransformer cldsBpmnTransformer, ClampProperties refProp,
+        SdcCatalogServices sdcCatalogServices, DcaeDispatcherServices dcaeDispatcherServices,
+        DcaeInventoryServices dcaeInventoryServices,
+        @Value("${clamp.config.security.permission.type.cl:permission-type-cl}") String cldsPersmissionTypeCl,
+        @Value("${clamp.config.security.permission.type.cl.manage:permission-type-cl-manage}") String cldsPermissionTypeClManage,
+        @Value("${clamp.config.security.permission.type.cl.event:permission-type-cl-event}") String cldsPermissionTypeClEvent,
+        @Value("${clamp.config.security.permission.type.filter.vf:permission-type-filter-vf}") String cldsPermissionTypeFilterVf,
+        @Value("${clamp.config.security.permission.type.template:permission-type-template}") String cldsPermissionTypeTemplate,
+            @Value("${clamp.config.security.permission.type.tosca:permission-type-tosca}") String cldsPermissionTypeTosca,
+        @Value("${clamp.config.security.permission.instance:dev}") String cldsPermissionInstance) {
+        this.cldsDao = cldsDao;
+        this.cldsBpmnTransformer = cldsBpmnTransformer;
+        this.refProp = refProp;
+        this.sdcCatalogServices = sdcCatalogServices;
+        this.dcaeDispatcherServices = dcaeDispatcherServices;
+        this.dcaeInventoryServices = dcaeInventoryServices;
+        this.cldsPersmissionTypeCl = cldsPersmissionTypeCl;
+        this.cldsPermissionTypeClManage = cldsPermissionTypeClManage;
+        this.cldsPermissionTypeClEvent = cldsPermissionTypeClEvent;
+        this.cldsPermissionTypeFilterVf = cldsPermissionTypeFilterVf;
+        this.cldsPermissionTypeTemplate = cldsPermissionTypeTemplate;
+        this.cldsPermissionInstance = cldsPermissionInstance;
+        permissionReadCl = SecureServicePermission.create(cldsPersmissionTypeCl, cldsPermissionInstance, "read");
+        permissionUpdateCl = SecureServicePermission.create(cldsPersmissionTypeCl, cldsPermissionInstance, "update");
+        permissionReadTemplate = SecureServicePermission.create(cldsPermissionTypeTemplate, cldsPermissionInstance,
+            "read");
+        permissionUpdateTemplate = SecureServicePermission.create(cldsPermissionTypeTemplate, cldsPermissionInstance,
+            "update");
+        permissionReadTosca = SecureServicePermission.create(cldsPermissionTypeTosca, cldsPermissionInstance, "read");
+        permissionUpdateTosca = SecureServicePermission.create(cldsPermissionTypeTosca, cldsPermissionInstance,
+                "update");
+    }
 
-    public CldsService() {
+    /*
+     * @return list of CLDS-Monitoring-Details: CLOSELOOP_NAME | Close loop name
+     * used in the CLDS application (prefix: ClosedLoop- + unique ClosedLoop ID)
+     * MODEL_NAME | Model Name in CLDS application SERVICE_TYPE_ID | TypeId returned
+     * from the DCAE application when the ClosedLoop is submitted
+     * (DCAEServiceTypeRequest generated in DCAE application). DEPLOYMENT_ID | Id
+     * generated when the ClosedLoop is deployed in DCAE. TEMPLATE_NAME | Template
+     * used to generate the ClosedLoop model. ACTION_CD | Current state of the
+     * ClosedLoop in CLDS application.
+     */
+    public List<CldsMonitoringDetails> getCLDSDetails() {
+        util.entering(request, "CldsService: GET model details");
+        Date startTime = new Date();
+        List<CldsMonitoringDetails> cldsMonitoringDetailsList = cldsDao.getCLDSMonitoringDetails();
+        // audit log
+        LoggingUtils.setTimeContext(startTime, new Date());
+        auditLogger.info("GET cldsDetails completed");
+        util.exiting("200", "Get cldsDetails success", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
+        return cldsMonitoringDetailsList;
     }
 
-    public CldsService(RefProp refProp) {
-        this.refProp = refProp;
+    /*
+     * CLDS IFO service will return 3 things 1. User Name 2. CLDS code version that
+     * is currently installed from pom.xml file 3. User permissions
+     */
+    public CldsInfo getCldsInfo() {
+        util.entering(request, "CldsService: GET cldsInfo");
+        Date startTime = new Date();
+        LoggingUtils.setTimeContext(startTime, new Date());
+
+        CldsInfoProvider cldsInfoProvider = new CldsInfoProvider(this);
+        CldsInfo cldsInfo = cldsInfoProvider.getCldsInfo();
+
+        // audit log
+        LoggingUtils.setTimeContext(startTime, new Date());
+        securityLogger.info("GET cldsInfo completed");
+        util.exiting("200", "Get cldsInfo success", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
+        return cldsInfo;
     }
 
     /**
      * REST service that retrieves BPMN for a CLDS model name from the database.
-     * This is subset of the json getModel.
-     * This is only expected to be used for testing purposes, not by the UI.
+     * This is subset of the json getModel. This is only expected to be used for
+     * testing purposes, not by the UI.
      *
      * @param modelName
      * @return bpmn xml text - content of bpmn given name
      */
-    @GET
-    @Path("/model/bpmn/{modelName}")
-    @Produces(MediaType.TEXT_XML)
-    public String getBpmnXml(@PathParam("modelName") String modelName) {
-        isAuthorized(PERMISSION_READ_CL);
+    public String getBpmnXml(String modelName) {
+        util.entering(request, "CldsService: GET model bpmn");
+        Date startTime = new Date();
+        isAuthorized(permissionReadCl);
         logger.info("GET bpmnText for modelName={}", modelName);
         CldsModel model = CldsModel.retrieve(cldsDao, modelName, false);
+        // audit log
+        LoggingUtils.setTimeContext(startTime, new Date());
+        auditLogger.info("GET model bpmn completed");
+        util.exiting("200", "Get model bpmn success", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
         return model.getBpmnText();
     }
 
-    /**
-     * REST service that saves BPMN for a CLDS model by name in the database.
-     * This is subset of the json putModel.
-     * This is only expected to be used for testing purposes, not by the UI.
-     *
-     * @param modelName
-     */
-    @PUT
-    @Path("/model/bpmn/{modelName}")
-    @Consumes(MediaType.TEXT_XML)
-    public String putBpmnXml(@PathParam("modelName") String modelName, String bpmnText) {
-        isAuthorized(PERMISSION_UPDATE_CL);
-        logger.info("PUT bpmnText for modelName={}", modelName);
-        logger.info("PUT bpmnText={}", bpmnText);
-        CldsModel cldsModel = CldsModel.retrieve(cldsDao, modelName, true);
-        cldsModel.setBpmnText(bpmnText);
-        cldsModel.save(cldsDao, getUserid());
-        return "wrote bpmnText for modelName=" + modelName;
-    }
-
     /**
      * REST service that retrieves image for a CLDS model name from the database.
-     * This is subset of the json getModel.
-     * This is only expected to be used for testing purposes, not by the UI.
+     * This is subset of the json getModel. This is only expected to be used for
+     * testing purposes, not by the UI.
      *
      * @param modelName
      * @return image xml text - content of image given name
      */
-    @GET
-    @Path("/model/image/{modelName}")
-    @Produces(MediaType.TEXT_XML)
-    public String getImageXml(@PathParam("modelName") String modelName) {
-        isAuthorized(PERMISSION_READ_CL);
+    public String getImageXml(String modelName) {
+       util.entering(request, "CldsService: GET model image");
+        Date startTime = new Date();
+        isAuthorized(permissionReadCl);
         logger.info("GET imageText for modelName={}", modelName);
         CldsModel model = CldsModel.retrieve(cldsDao, modelName, false);
+        // audit log
+        LoggingUtils.setTimeContext(startTime, new Date());
+        auditLogger.info("GET model image completed");
+        util.exiting("200", "Get model image success", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
         return model.getImageText();
     }
 
-    /**
-     * REST service that saves image for a CLDS model by name in the database.
-     * This is subset of the json putModel.
-     * This is only expected to be used for testing purposes, not by the UI.
-     *
-     * @param modelName
-     */
-    @PUT
-    @Path("/model/image/{modelName}")
-    @Consumes(MediaType.TEXT_XML)
-    public String putImageXml(@PathParam("modelName") String modelName, String imageText) {
-        isAuthorized(PERMISSION_UPDATE_CL);
-        logger.info("PUT iamgeText for modelName={}", modelName);
-        logger.info("PUT imageText={}", imageText);
-        CldsModel cldsModel = CldsModel.retrieve(cldsDao, modelName, true);
-        cldsModel.setImageText(imageText);
-        cldsModel.save(cldsDao, getUserid());
-        return "wrote imageText for modelName=" + modelName;
-    }
-
     /**
      * REST service that retrieves a CLDS model by name from the database.
      *
      * @param modelName
      * @return clds model - clds model for the given model name
-     * @throws NotAuthorizedException
      */
-    @GET
-    @Path("/model/{modelName}")
-    @Produces(MediaType.APPLICATION_JSON)
-    public CldsModel getModel(@PathParam("modelName") String modelName) throws NotAuthorizedException {
-        isAuthorized(PERMISSION_READ_CL);
+    public CldsModel getModel(String modelName) {
+       util.entering(request, "CldsService: GET model");
+        Date startTime = new Date();
+        isAuthorized(permissionReadCl);
         logger.debug("GET model for  modelName={}", modelName);
         CldsModel cldsModel = CldsModel.retrieve(cldsDao, modelName, false);
         isAuthorizedForVf(cldsModel);
+        // Checking condition whether our CLDS model can call Inventory Method
+        if (cldsModel.canInventoryCall()) {
+            try {
+                // Method to call dcae inventory and invoke insert event method
+                dcaeInventoryServices.setEventInventory(cldsModel, getUserId());
+            } catch (Exception e) {
+                LoggingUtils.setErrorContext("900", "Set event inventory error");
+                logger.error("getModel set event Inventory error:" + e);
+            }
+        }
+        // audit log
+        LoggingUtils.setTimeContext(startTime, new Date());
+        auditLogger.info("GET model completed");
+        util.exiting("200", "Get model success", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
         return cldsModel;
     }
 
@@ -210,31 +268,25 @@ public class CldsService extends SecureServiceBase {
      * REST service that saves a CLDS model by name in the database.
      *
      * @param modelName
-     * @throws TransformerException
-     * @throws TransformerConfigurationException
      */
-    @PUT
-    @Path("/model/{modelName}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public CldsModel putModel(@PathParam("modelName") String modelName, CldsModel cldsModel) throws TransformerException {
-        isAuthorized(PERMISSION_UPDATE_CL);
+    public CldsModel putModel(String modelName, CldsModel cldsModel) {
+       util.entering(request, "CldsService: PUT model");
+        Date startTime = new Date();
+        isAuthorized(permissionUpdateCl);
         isAuthorizedForVf(cldsModel);
         logger.info("PUT model for  modelName={}", modelName);
         logger.info("PUT bpmnText={}", cldsModel.getBpmnText());
         logger.info("PUT propText={}", cldsModel.getPropText());
         logger.info("PUT imageText={}", cldsModel.getImageText());
         cldsModel.setName(modelName);
-
-        if (cldsModel.getTemplateName() != null) {
-            CldsTemplate template = cldsDao.getTemplate(cldsModel.getTemplateName());
-            if (template != null) {
-                cldsModel.setTemplateId(template.getId());
-                cldsModel.setDocText(template.getPropText());
-                cldsModel.setDocId(template.getPropId());
-            }
-        }
-        cldsModel.save(cldsDao, getUserid());
+        fillInCldsModel(cldsModel);
+        updateAndInsertNewEvent(cldsModel.getName(), cldsModel.getControlNamePrefix(), cldsModel.getEvent(),
+            CldsEvent.ACTION_MODIFY);
+        cldsModel.save(cldsDao, getUserId());
+        // audit log
+        LoggingUtils.setTimeContext(startTime, new Date());
+        auditLogger.info("PUT model completed");
+        util.exiting("200", "Put model success", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
         return cldsModel;
     }
 
@@ -243,13 +295,31 @@ public class CldsService extends SecureServiceBase {
      *
      * @return model names in JSON
      */
-    @GET
-    @Path("/model-names")
-    @Produces(MediaType.APPLICATION_JSON)
     public List<ValueItem> getModelNames() {
-//             isAuthorized(PERMISSION_READ_CL);
+        util.entering(request, "CldsService: GET model names");
+        Date startTime = new Date();
+        isAuthorized(permissionReadCl);
         logger.info("GET list of model names");
-        return cldsDao.getBpmnNames();
+        List<ValueItem> names = cldsDao.getBpmnNames();
+        // audit log
+        LoggingUtils.setTimeContext(startTime, new Date());
+        auditLogger.info("GET model names completed");
+        util.exiting("200", "Get model names success", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
+        return names;
+    }
+
+    private void fillInCldsModel(CldsModel model) {
+        if (model.getTemplateName() != null) {
+            CldsTemplate template = cldsDao.getTemplate(model.getTemplateName());
+            if (template != null) {
+                model.setTemplateId(template.getId());
+                model.setDocText(template.getPropText());
+                // This is to provide the Bpmn XML when Template part in UI
+                // is
+                // disabled
+                model.setBpmnText(template.getBpmnText());
+            }
+        }
     }
 
     /**
@@ -257,104 +327,124 @@ public class CldsService extends SecureServiceBase {
      *
      * @param action
      * @param modelName
-     * @param test
+     * @param validateFlag
      * @param model
      * @return
-     * @throws TransformerConfigurationException
      * @throws TransformerException
-     * @throws IOException
-     * @throws JsonProcessingException
-     * @throws NotAuthorizedException
+     *         In case of issues when doing the XSLT of the BPMN flow
+     * @throws ParseException
+     *         In case of issues when parsing the JSON
+     * @throws GeneralSecurityException
+     *         In case of issues when decrypting the password
+     * @throws DecoderException
+     *         In case of issues with the Hex String decoding
      */
-    @PUT
-    @Path("/action/{action}/{modelName}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public CldsModel putModelAndProcessAction(@PathParam("action") String action, @PathParam("modelName") String modelName, @QueryParam("test") String test, CldsModel model) throws TransformerException, NotAuthorizedException, IOException {
-        String actionCd = action.toUpperCase();
-        SecureServicePermission permisionManage = SecureServicePermission.create(CLDS_PERMISSION_TYPE_CL_MANAGE, CLDS_PERMISSION_INSTANCE, actionCd);
-        isAuthorized(permisionManage);
-        isAuthorizedForVf(model);
-        String userid = getUserid();
-        String actionStateCd = CldsEvent.ACTION_STATE_INITIATED;
-        String processDefinitionKey = "clds-process-action-wf";
-
-        logger.info("PUT actionCd={}", actionCd);
-        logger.info("PUT actionStateCd={}", actionStateCd);
-        logger.info("PUT processDefinitionKey={}", processDefinitionKey);
-        logger.info("PUT modelName={}", modelName);
-        logger.info("PUT test={}", test);
-        logger.info("PUT bpmnText={}", model.getBpmnText());
-        logger.info("PUT propText={}", model.getPropText());
-        logger.info("PUT userid={}", userid);
-
-        if (model.getTemplateName() != null) {
-            CldsTemplate template = cldsDao.getTemplate(model.getTemplateName());
-            if (template != null) {
-                model.setTemplateId(template.getId());
-                model.setDocText(template.getPropText());
-                model.setDocId(template.getPropId());
+    public ResponseEntity<?> putModelAndProcessAction(String action,
+        String modelName,String test, CldsModel model)
+            throws TransformerException, ParseException {
+        util.entering(request, "CldsService: Process model action");
+        Date startTime = new Date();
+        CldsModel retrievedModel = null;
+        Boolean errorCase = false;
+        try {
+            String actionCd = action.toUpperCase();
+            SecureServicePermission permisionManage = SecureServicePermission.create(cldsPermissionTypeClManage,
+                cldsPermissionInstance, actionCd);
+            isAuthorized(permisionManage);
+            isAuthorizedForVf(model);
+            String userId = getUserId();
+            logger.info("PUT actionCd={}", actionCd);
+            logger.info("PUT modelName={}", modelName);
+            logger.info("PUT test={}", test);
+            logger.info("PUT bpmnText={}", model.getBpmnText());
+            logger.info("PUT propText={}", model.getPropText());
+            logger.info("PUT userId={}", userId);
+            logger.info("PUT getTypeId={}", model.getTypeId());
+            logger.info("PUT deploymentId={}", model.getDeploymentId());
+            this.fillInCldsModel(model);
+            // save model to db
+            model.setName(modelName);
+            updateAndInsertNewEvent(modelName, model.getControlNamePrefix(), model.getEvent(), CldsEvent.ACTION_MODIFY);
+            model.save(cldsDao, getUserId());
+            // get vars and format if necessary
+            String prop = model.getPropText();
+            String bpmn = model.getBpmnText();
+            String docText = model.getDocText();
+            String controlName = model.getControlName();
+            String bpmnJson = cldsBpmnTransformer.doXslTransformToString(bpmn);
+            logger.info("PUT bpmnJson={}", bpmnJson);
+            // Flag indicates whether it is triggered by Validation Test button
+            // from
+            // UI
+            boolean isTest = Boolean.valueOf(test);
+            if (!isTest) {
+                String actionTestOverride = refProp.getStringValue("action.test.override");
+                if (Boolean.valueOf(actionTestOverride)) {
+                    logger.info("PUT actionTestOverride={}", actionTestOverride);
+                    logger.info("PUT override test indicator and setting it to true");
+                    isTest = true;
+                }
             }
-        }
-        // save model to db
-        model.setName(modelName);
-        model.save(cldsDao, getUserid());
-
-        // get vars and format if necessary
-        String prop = model.getPropText();
-        String bpmn = model.getBpmnText();
-        String docText = model.getDocText();
-        String controlName = model.getControlName();
-
-        String bpmnJson = cldsBpmnTransformer.doXslTransformToString(bpmn);
-        logger.info("PUT bpmnJson={}", bpmnJson);
-
-        boolean isTest = false;
-        if (test != null && test.equalsIgnoreCase("true")) {
-            isTest = true;
-        } else {
-            // if action.test.override is true, then any action will be marked as test=true (even if incoming action request had test=false); otherwise, test flag will be unchanged on the action request
-            String actionTestOverride = refProp.getStringValue("action.test.override");
-            if (actionTestOverride != null && actionTestOverride.equalsIgnoreCase("true")) {
-                logger.info("PUT actionTestOverride={}", actionTestOverride);
-                logger.info("PUT override test indicator and setting it to true");
-                isTest = true;
+            logger.info("PUT isTest={}", isTest);
+            String insertTestEvent = refProp.getStringValue("action.insert.test.event");
+            boolean isInsertTestEvent = Boolean.valueOf(insertTestEvent);
+
+            logger.info("PUT isInsertTestEvent={}", isInsertTestEvent);
+            // determine if requested action is permitted
+            model.validateAction(actionCd);
+            logger.info("modelProp - " + prop);
+            logger.info("docText - " + docText);
+            try {
+                String result = camelProxy.submit(actionCd, prop, bpmnJson, modelName, controlName, docText, isTest,
+                    userId, isInsertTestEvent, model.getEvent().getActionCd());
+                logger.info("Starting Camel flow on request, result is: ", result);
+            } catch (SdcCommunicationException | PolicyClientException | BadRequestException e) {
+                errorCase = true;
+                logger.error("Exception occured during invoking Camel process", e);
+            }
+            if (!actionCd.equalsIgnoreCase(CldsEvent.ACTION_DELETE)) {
+                // refresh model info from db (get fresh event info)
+                retrievedModel = CldsModel.retrieve(cldsDao, modelName, false);
             }
+            if (retrievedModel != null) {
+                if (!isTest && !errorCase && (actionCd.equalsIgnoreCase(CldsEvent.ACTION_SUBMIT)
+                    || actionCd.equalsIgnoreCase(CldsEvent.ACTION_RESUBMIT)
+                    || actionCd.equalsIgnoreCase(CldsEvent.ACTION_SUBMITDCAE))) {
+                    if (retrievedModel.getTemplateName().startsWith(CsarInstallerImpl.TEMPLATE_NAME_PREFIX)) {
+                        // SDC artifact case
+                        logger.info("Skipping DCAE inventory call as closed loop has been created from SDC notification");
+                        DcaeEvent dcaeEvent = new DcaeEvent();
+                        dcaeEvent.setArtifactName(retrievedModel.getControlName() + ".yml");
+                        dcaeEvent.setEvent(DcaeEvent.EVENT_DISTRIBUTION);
+                        CldsEvent.insEvent(cldsDao, dcaeEvent.getControlName(), userId, dcaeEvent.getCldsActionCd(),
+                            CldsEvent.ACTION_STATE_RECEIVED, null);
+                    } else {
+                        // This should be done only when the call to DCAE
+                        // has not yet been done. When CL comes from SDC
+                        // this is not required as the DCAE inventory call is done
+                        // during the CL deployment.
+                        dcaeInventoryServices.setEventInventory(retrievedModel, getUserId());
+                    }
+                    retrievedModel.save(cldsDao, getUserId());
+                }
+                // audit log
+                LoggingUtils.setTimeContext(startTime, new Date());
+                auditLogger.info("Process model action completed");
+            } else {
+                logger.error("CldsModel not found in database with modelName: " + modelName);
+                util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "CldsModel not found in database with modelName " + "modelName", Level.INFO, ONAPLogConstants.ResponseStatus.ERROR);
+                return new ResponseEntity<String>("CldsModel not found in database with modelName: \" + modelName", HttpStatus.INTERNAL_SERVER_ERROR);
+            }
+        } catch (Exception e) {
+            errorCase = true;
+            logger.error("Exception occured during putModelAndProcessAction", e);
         }
-        logger.info("PUT isTest={}", isTest);
-
-
-        boolean isInsertTestEvent = false;
-        String insertTestEvent = refProp.getStringValue("action.insert.test.event");
-        if (insertTestEvent != null && insertTestEvent.equalsIgnoreCase("true")) {
-            isInsertTestEvent = true;
+        if (errorCase) {
+            util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "putModelAndProcessAction failed", Level.INFO, ONAPLogConstants.ResponseStatus.ERROR);
+            return new ResponseEntity<>(retrievedModel, HttpStatus.INTERNAL_SERVER_ERROR);
         }
-        logger.info("PUT isInsertTestEvent={}", isInsertTestEvent);
-
-
-        // determine if requested action is permitted
-        model.validateAction(actionCd);
-
-        // input variables to camunda process
-        Map<String, Object> variables = new HashMap<>();
-        variables.put("actionCd", actionCd);
-        variables.put("modelProp", prop);
-        variables.put("modelBpmnProp", bpmnJson);
-        variables.put("modelName", modelName);
-        variables.put("controlName", controlName);
-        variables.put("docText", docText);
-        variables.put("isTest", isTest);
-        variables.put("userid", userid);
-        variables.put("isInsertTestEvent", isInsertTestEvent);
-
-        // start camunda process
-        ProcessInstance pi = runtimeService.startProcessInstanceByKey(processDefinitionKey, variables);
-
-        // log process info
-        logger.info("Started processDefinitionId={}, processInstanceId={}", pi.getProcessDefinitionId(), pi.getProcessInstanceId());
-
-        // refresh model info from db (get fresh event info)
-        return CldsModel.retrieve(cldsDao, modelName, false);
+        util.exiting(HttpStatus.OK.toString(), "Successful", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
+        return new ResponseEntity<>(retrievedModel, HttpStatus.OK);
     }
 
     /**
@@ -362,149 +452,148 @@ public class CldsService extends SecureServiceBase {
      *
      * @param test
      * @param dcaeEvent
-     * @throws BadRequestException
      */
-    @POST
-    @Path("/dcae/event")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public String postDcaeEvent(@QueryParam("test") String test, DcaeEvent dcaeEvent) throws BadRequestException {
+    public String postDcaeEvent(String test, DcaeEvent dcaeEvent) {
+        util.entering(request, "CldsService: Post dcae event");
+        Date startTime = new Date();
         String userid = null;
-        // TODO: allow auth checking to be turned off by removing the permission type property
-        if (CLDS_PERMISSION_TYPE_CL_EVENT != null && CLDS_PERMISSION_TYPE_CL_EVENT.length() > 0) {
-            SecureServicePermission permissionEvent = SecureServicePermission.create(CLDS_PERMISSION_TYPE_CL_EVENT, CLDS_PERMISSION_INSTANCE, dcaeEvent.getEvent());
+        // TODO: allow auth checking to be turned off by removing the permission
+        // type property
+        if (cldsPermissionTypeClEvent != null && cldsPermissionTypeClEvent.length() > 0) {
+            SecureServicePermission permissionEvent = SecureServicePermission.create(cldsPermissionTypeClEvent,
+                cldsPermissionInstance, dcaeEvent.getEvent());
             isAuthorized(permissionEvent);
-            userid = getUserid();
-        }
-
-        boolean isTest = false;
-        if (test != null && test.equalsIgnoreCase("true")) {
-            isTest = true;
+            userid = getUserId();
         }
-
+        // Flag indicates whether it is triggered by Validation Test button from
+        // UI
+        boolean isTest = Boolean.valueOf(test);
         int instanceCount = 0;
         if (dcaeEvent.getInstances() != null) {
             instanceCount = dcaeEvent.getInstances().size();
         }
-        String msgInfo = "event=" + dcaeEvent.getEvent() + " serviceUUID=" + dcaeEvent.getServiceUUID() + " resourceUUID=" + dcaeEvent.getResourceUUID() + " artifactName=" + dcaeEvent.getArtifactName() + " instance count=" + instanceCount + " isTest=" + isTest;
+        String msgInfo = "event=" + dcaeEvent.getEvent() + " serviceUUID=" + dcaeEvent.getServiceUUID()
+        + " resourceUUID=" + dcaeEvent.getResourceUUID() + " artifactName=" + dcaeEvent.getArtifactName()
+        + " instance count=" + instanceCount + " isTest=" + isTest;
         logger.info("POST dcae event {}", msgInfo);
-
         if (isTest) {
             logger.warn("Ignorning test event from DCAE");
         } else {
             if (DcaeEvent.EVENT_DEPLOYMENT.equalsIgnoreCase(dcaeEvent.getEvent())) {
                 CldsModel.insertModelInstance(cldsDao, dcaeEvent, userid);
             } else {
-                CldsEvent.insEvent(cldsDao, dcaeEvent.getControlName(), userid, dcaeEvent.getCldsActionCd(), CldsEvent.ACTION_STATE_RECEIVED, null);
+                CldsEvent.insEvent(cldsDao, dcaeEvent.getControlName(), userid, dcaeEvent.getCldsActionCd(),
+                    CldsEvent.ACTION_STATE_RECEIVED, null);
             }
-            // EVENT_UNDEPLOYMENT is defunct - DCAE Proxy will not undeploy individual instances.  It will send an empty list of
-            // deployed instances to indicate all have been removed.  Or it will send an updated list to indicate those that
-            // are still deployed with any not on the list considered undeployed.
-            //else if(DcaeEvent.EVENT_UNDEPLOYMENT.equalsIgnoreCase(dcaeEvent.getEvent()))
-            //{
-            // CldsModel.removeModelInstance(cldsDao, dcaeEvent);
-            //}
         }
-
+        // audit log
+        LoggingUtils.setTimeContext(startTime, new Date());
+        auditLogger.info("Post dcae event completed");
+        util.exiting("200", "Post dcae event success", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
         return msgInfo;
     }
 
     /**
-     * REST service that retrieves asdc services
+     * REST service that retrieves sdc services
      *
-     * @throws Exception
+     * @throws GeneralSecurityException
+     *         In case of issue when decryting the SDC password
+     * @throws DecoderException
+     *         In case of issues with the decoding of the Hex String
      */
-    @GET
-    @Path("/asdc/services")
-    @Produces(MediaType.APPLICATION_JSON)
-    public String getAsdcServices() throws Exception {
+    public String getSdcServices() throws GeneralSecurityException, DecoderException {
+        util.entering(request, "CldsService: GET sdc services");
+        Date startTime = new Date();
         String retStr;
         try {
-            String responseStr = asdcCatalogServices.getAsdcServicesInformation(null);
-            retStr = createUiServiceFormatJson(responseStr);
-        } catch (Exception e) {
-            logger.info("{} {}", e.getClass().getName(), e.getMessage());
-            throw e;
+            retStr = createUiServiceFormatJson(sdcCatalogServices.getSdcServicesInformation(null));
+        } catch (IOException e) {
+            logger.error("IOException during SDC communication", e);
+            throw new SdcCommunicationException("IOException during SDC communication", e);
         }
-        logger.info("value of asdcServices : {}", retStr);
+        logger.info("value of sdcServices : {}", retStr);
+        // audit log
+        LoggingUtils.setTimeContext(startTime, new Date());
+        auditLogger.info("GET sdc services completed");
+        util.exiting("200", "Get sdc services success", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
         return retStr;
     }
 
     /**
      * REST service that retrieves total properties required by UI
      *
-     * @throws Exception
+     * @throws IOException
+     *         In case of issues
      */
-    @GET
-    @Path("/properties")
-    @Produces(MediaType.APPLICATION_JSON)
-    public String getAsdcProperties() throws Exception {
-        return createPropertiesObjectByUUID(getGlobalCldsString(), "{}");
+    public String getSdcProperties() throws IOException {
+        return createPropertiesObjectByUUID("{}");
     }
 
     /**
-     * REST service that retrieves total properties by using invariantUUID based on refresh and non refresh
+     * REST service that retrieves total properties by using invariantUUID based on
+     * refresh and non refresh
      *
-     * @throws Exception
+     * @throws GeneralSecurityException
+     *         In case of issues with the decryting the encrypted password
+     * @throws DecoderException
+     *         In case of issues with the decoding of the Hex String
+     * @throws IOException
+     *         In case of issue to convert CldsServiceCache to InputStream
      */
-    @GET
-    @Path("/properties/{serviceInvariantUUID}")
-    @Produces(MediaType.APPLICATION_JSON)
-    public String getAsdcPropertiesByServiceUUIDForRefresh(@PathParam("serviceInvariantUUID") String serviceInvariantUUID, @DefaultValue("false") @QueryParam("refresh") String refresh) throws Exception {
+    public String getSdcPropertiesByServiceUUIDForRefresh(
+        String serviceInvariantUUID, Boolean refresh)
+            throws GeneralSecurityException, DecoderException, IOException {
+        util.entering(request, "CldsService: GET sdc properties by uuid");
+        Date startTime = new Date();
         CldsServiceData cldsServiceData = new CldsServiceData();
         cldsServiceData.setServiceInvariantUUID(serviceInvariantUUID);
-
-        boolean isCldsAsdcDataExpired = true;
-        //  To getcldsService information from database cache using invariantUUID only when refresh = false
-        if (refresh != null && refresh.equalsIgnoreCase("false")) {
-            cldsServiceData = cldsServiceData.getCldsServiceCache(cldsDao, serviceInvariantUUID);
-            // If cldsService is available in database Cache , verify is data expired or not
-            if (cldsServiceData != null) {
-                isCldsAsdcDataExpired = asdcCatalogServices.isCldsAsdcCacheDataExpired(cldsServiceData);
-            }
+        if (!Optional.ofNullable(refresh).orElse(false)) {
+            cldsServiceData = cldsDao.getCldsServiceCache(serviceInvariantUUID);
         }
-        // If user Requested for refresh or database cache expired , get all data from asdc api.
-        if ((refresh != null && refresh.equalsIgnoreCase("true")) || isCldsAsdcDataExpired) {
-            cldsServiceData = asdcCatalogServices.getCldsServiceDataWithAlarmConditions(serviceInvariantUUID);
-            CldsDBServiceCache cldsDBServiceCache = asdcCatalogServices.getCldsDBServiceCacheUsingCldsServiceData(cldsServiceData);
-            if (cldsDBServiceCache != null && cldsDBServiceCache.getInvariantId() != null && cldsDBServiceCache.getServiceId() != null) {
-                cldsServiceData.setCldsServiceCache(cldsDao, cldsDBServiceCache);
-            }
+        if (sdcCatalogServices.isCldsSdcCacheDataExpired(cldsServiceData)) {
+            cldsServiceData = sdcCatalogServices.getCldsServiceDataWithAlarmConditions(serviceInvariantUUID);
+            cldsDao.setCldsServiceCache(new CldsDbServiceCache(cldsServiceData));
         }
-
         // filter out VFs the user is not authorized for
         cldsServiceData.filterVfs(this);
-
         // format retrieved data into properties json
-        return asdcCatalogServices.createPropertiesObjectByUUID(getGlobalCldsString(), cldsServiceData);
+        String sdcProperties = sdcCatalogServices.createPropertiesObjectByUUID(cldsServiceData);
+        // audit log
+        LoggingUtils.setTimeContext(startTime, new Date());
+        auditLogger.info("GET sdc properties by uuid completed");
+        util.exiting("200", "Get sdc properties by uuid success", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
+        return sdcProperties;
     }
 
     /**
-     * Determine if the user is authorized for a particular VF by its invariant UUID.
+     * Determine if the user is authorized for a particular VF by its invariant
+     * UUID.
      *
      * @param vfInvariantUuid
      * @throws NotAuthorizedException
      * @return
      */
-    public boolean isAuthorizedForVf(String vfInvariantUuid) throws NotAuthorizedException {
-        if (CLDS_PERMISSION_TYPE_FILTER_VF != null && CLDS_PERMISSION_TYPE_FILTER_VF.length() > 0) {
-            SecureServicePermission permission = SecureServicePermission.create(CLDS_PERMISSION_TYPE_FILTER_VF, CLDS_PERMISSION_INSTANCE, vfInvariantUuid);
+    public boolean isAuthorizedForVf(String vfInvariantUuid) {
+        if (cldsPermissionTypeFilterVf != null && !cldsPermissionTypeFilterVf.isEmpty()) {
+            SecureServicePermission permission = SecureServicePermission.create(cldsPermissionTypeFilterVf,
+                cldsPermissionInstance, vfInvariantUuid);
             return isAuthorized(permission);
         } else {
-            // if CLDS_PERMISSION_TYPE_FILTER_VF property is not provided, then VF filtering is turned off
+            // if CLDS_PERMISSION_TYPE_FILTER_VF property is not provided, then
+            // VF filtering is turned off
             logger.warn("VF filtering turned off");
             return true;
         }
     }
 
     /**
-     * Determine if the user is authorized for a particular VF by its invariant UUID.
-     * If not authorized, then NotAuthorizedException is thrown.
+     * Determine if the user is authorized for a particular VF by its invariant
+     * UUID. If not authorized, then NotAuthorizedException is thrown.
      *
      * @param model
      * @return
      */
-    private boolean isAuthorizedForVf(CldsModel model) throws NotAuthorizedException {
+    private boolean isAuthorizedForVf(CldsModel model) {
         String vf = ModelProperties.getVf(model);
         if (vf == null || vf.length() == 0) {
             logger.info("VF not found in model");
@@ -518,17 +607,18 @@ public class CldsService extends SecureServiceBase {
         if (StringUtils.isBlank(responseStr)) {
             return "";
         }
-        ObjectMapper objectMapper = new ObjectMapper();
-        List<CldsAsdcServiceInfo> rawList = objectMapper.readValue(responseStr, objectMapper.getTypeFactory().constructCollectionType(List.class, CldsAsdcServiceInfo.class));
+        ObjectMapper objectMapper = JacksonUtils.getObjectMapperInstance();
+        List<SdcServiceInfo> rawList = objectMapper.readValue(responseStr,
+            objectMapper.getTypeFactory().constructCollectionType(List.class, SdcServiceInfo.class));
         ObjectNode invariantIdServiceNode = objectMapper.createObjectNode();
         ObjectNode serviceNode = objectMapper.createObjectNode();
         logger.info("value of cldsserviceiNfolist: {}", rawList);
-        if (rawList != null && rawList.size() > 0) {
-            List<CldsAsdcServiceInfo> cldsAsdcServiceInfoList = asdcCatalogServices.removeDuplicateServices(rawList);
-
-            for (CldsAsdcServiceInfo currCldsAsdcServiceInfo : cldsAsdcServiceInfoList) {
-                if (currCldsAsdcServiceInfo != null) {
-                    invariantIdServiceNode.put(currCldsAsdcServiceInfo.getInvariantUUID(), currCldsAsdcServiceInfo.getName());
+        if (rawList != null && !rawList.isEmpty()) {
+            List<SdcServiceInfo> cldsSdcServiceInfoList = sdcCatalogServices.removeDuplicateServices(rawList);
+            for (SdcServiceInfo currCldsSdcServiceInfo : cldsSdcServiceInfoList) {
+                if (currCldsSdcServiceInfo != null) {
+                    invariantIdServiceNode.put(currCldsSdcServiceInfo.getInvariantUUID(),
+                        currCldsSdcServiceInfo.getName());
                 }
             }
             serviceNode.putPOJO("service", invariantIdServiceNode);
@@ -536,43 +626,36 @@ public class CldsService extends SecureServiceBase {
         return serviceNode.toString();
     }
 
-    private String createPropertiesObjectByUUID(String globalProps, String cldsResponseStr) throws IOException {
-        ObjectMapper mapper = new ObjectMapper();
-        CldsAsdcServiceDetail cldsAsdcServiceDetail = mapper.readValue(cldsResponseStr, CldsAsdcServiceDetail.class);
-        ObjectNode globalPropsJson = null;
-        if (cldsAsdcServiceDetail != null && cldsAsdcServiceDetail.getUuid() != null) {
+    private String createPropertiesObjectByUUID(String cldsResponseStr) throws IOException {
+        ObjectMapper mapper = JacksonUtils.getObjectMapperInstance();
+        SdcServiceDetail cldsSdcServiceDetail = mapper.readValue(cldsResponseStr, SdcServiceDetail.class);
+        ObjectNode globalPropsJson = (ObjectNode) refProp.getJsonTemplate(GLOBAL_PROPERTIES_KEY);
+        if (cldsSdcServiceDetail != null && cldsSdcServiceDetail.getUuid() != null) {
             /**
              * to create json with vf, alarm and locations
              */
-            ObjectNode serviceObjectNode = createEmptyVfAlarmObject(mapper);
+            ObjectNode serviceObjectNode = createEmptyVfAlarmObject();
             ObjectNode vfObjectNode = mapper.createObjectNode();
-
             /**
              * to create json with vf and vfresourceId
              */
-            createVfObjectNode(vfObjectNode, mapper, cldsAsdcServiceDetail.getResources());
-            serviceObjectNode.putPOJO(cldsAsdcServiceDetail.getInvariantUUID(), vfObjectNode);
+            createVfObjectNode(vfObjectNode, cldsSdcServiceDetail.getResources());
+            serviceObjectNode.putPOJO(cldsSdcServiceDetail.getInvariantUUID(), vfObjectNode);
             ObjectNode byServiceBasicObjetNode = mapper.createObjectNode();
             byServiceBasicObjetNode.putPOJO("byService", serviceObjectNode);
-
             /**
              * to create json with VFC Node
              */
-            ObjectNode emptyvfcobjectNode = createByVFCObjectNode(mapper, cldsAsdcServiceDetail.getResources());
+            ObjectNode emptyvfcobjectNode = createByVFCObjectNode(cldsSdcServiceDetail.getResources());
             byServiceBasicObjetNode.putPOJO("byVf", emptyvfcobjectNode);
-            globalPropsJson = (ObjectNode) mapper.readValue(globalProps, JsonNode.class);
             globalPropsJson.putPOJO("shared", byServiceBasicObjetNode);
             logger.info("valuie of objNode: {}", globalPropsJson);
-        } else {
-            /**
-             *  to create json with total properties when no serviceUUID passed
-             */
-            globalPropsJson = (ObjectNode) mapper.readValue(globalProps, JsonNode.class);
         }
         return globalPropsJson.toString();
     }
 
-    private ObjectNode createEmptyVfAlarmObject(ObjectMapper mapper) {
+    private ObjectNode createEmptyVfAlarmObject() {
+        ObjectMapper mapper = JacksonUtils.getObjectMapperInstance();
         ObjectNode emptyObjectNode = mapper.createObjectNode();
         emptyObjectNode.put("", "");
         ObjectNode vfObjectNode = mapper.createObjectNode();
@@ -584,63 +667,219 @@ public class CldsService extends SecureServiceBase {
         return emptyServiceObjectNode;
     }
 
-    private void createVfObjectNode(ObjectNode vfObjectNode2, ObjectMapper mapper, List<CldsAsdcResource> rawCldsAsdcResourceList) throws IOException {
+    private void createVfObjectNode(ObjectNode vfObjectNode2, List<SdcResource> rawCldsSdcResourceList) {
+        ObjectMapper mapper = JacksonUtils.getObjectMapperInstance();
         ObjectNode vfNode = mapper.createObjectNode();
         vfNode.put("", "");
-
-        // To remove repeated resource instance name from resourceInstanceList
-        List<CldsAsdcResource> cldsAsdcResourceList = asdcCatalogServices.removeDuplicateAsdcResourceInstances(rawCldsAsdcResourceList);
+        // To remove repeated resource instance name from
+        // resourceInstanceList
+        List<SdcResource> cldsSdcResourceList = sdcCatalogServices
+            .removeDuplicateSdcResourceInstances(rawCldsSdcResourceList);
         /**
-         * Creating vf resource node using cldsAsdcResource Object
+         * Creating vf resource node using cldsSdcResource Object
          */
-        if (cldsAsdcResourceList != null && cldsAsdcResourceList.size() > 0) {
-            for (CldsAsdcResource cldsAsdcResource : cldsAsdcResourceList) {
-                if (cldsAsdcResource != null && cldsAsdcResource.getResoucreType() != null && cldsAsdcResource.getResoucreType().equalsIgnoreCase("VF")) {
-                    vfNode.put(cldsAsdcResource.getResourceUUID(), cldsAsdcResource.getResourceName());
+        if (cldsSdcResourceList != null && !cldsSdcResourceList.isEmpty()) {
+            for (SdcResource cldsSdcResource : cldsSdcResourceList) {
+                if (cldsSdcResource != null && "VF".equalsIgnoreCase(cldsSdcResource.getResoucreType())) {
+                    vfNode.put(cldsSdcResource.getResourceUUID(), cldsSdcResource.getResourceName());
                 }
             }
         }
         vfObjectNode2.putPOJO("vf", vfNode);
-        String locationStringValue = refProp.getStringValue("ui.location.default");
-        String alarmStringValue = refProp.getStringValue("ui.alarm.default");
-
         /**
-         *  creating location json object using properties file value
+         * creating location json object using properties file value
          */
-        ObjectNode locationJsonNode = (ObjectNode) mapper.readValue(locationStringValue, JsonNode.class);
+        ObjectNode locationJsonNode;
+        try {
+            locationJsonNode = (ObjectNode) mapper.readValue(refProp.getStringValue("ui.location.default"),
+                JsonNode.class);
+        } catch (IOException e) {
+            logger.error("Unable to load ui.location.default JSON in clds-references.properties properly", e);
+            throw new CldsConfigException(
+                "Unable to load ui.location.default JSON in clds-references.properties properly", e);
+        }
         vfObjectNode2.putPOJO("location", locationJsonNode);
-
         /**
          * creating alarm json object using properties file value
          */
+        String alarmStringValue = refProp.getStringValue("ui.alarm.default");
         logger.info("value of alarm: {}", alarmStringValue);
-        ObjectNode alarmStringJsonNode = (ObjectNode) mapper.readValue(alarmStringValue, JsonNode.class);
+        ObjectNode alarmStringJsonNode;
+        try {
+            alarmStringJsonNode = (ObjectNode) mapper.readValue(alarmStringValue, JsonNode.class);
+        } catch (IOException e) {
+            logger.error("Unable to ui.alarm.default JSON in clds-references.properties properly", e);
+            throw new CldsConfigException("Unable to load ui.alarm.default JSON in clds-references.properties properly",
+                e);
+        }
         vfObjectNode2.putPOJO("alarmCondition", alarmStringJsonNode);
     }
 
-    private ObjectNode createByVFCObjectNode(ObjectMapper mapper, List<CldsAsdcResource> cldsAsdcResourceList) {
+    private ObjectNode createByVFCObjectNode(List<SdcResource> cldsSdcResourceList) {
+        ObjectMapper mapper = JacksonUtils.getObjectMapperInstance();
         ObjectNode emptyObjectNode = mapper.createObjectNode();
         ObjectNode emptyvfcobjectNode = mapper.createObjectNode();
         ObjectNode vfCObjectNode = mapper.createObjectNode();
         vfCObjectNode.putPOJO("vfC", emptyObjectNode);
         ObjectNode subVfCObjectNode = mapper.createObjectNode();
         subVfCObjectNode.putPOJO("vfc", emptyObjectNode);
-        if (cldsAsdcResourceList != null && cldsAsdcResourceList.size() > 0) {
-            for (CldsAsdcResource cldsAsdcResource : cldsAsdcResourceList) {
-                if (cldsAsdcResource != null && cldsAsdcResource.getResoucreType() != null && cldsAsdcResource.getResoucreType().equalsIgnoreCase("VF")) {
-                    vfCObjectNode.putPOJO(cldsAsdcResource.getResourceUUID(), subVfCObjectNode);
+        if (cldsSdcResourceList != null && !cldsSdcResourceList.isEmpty()) {
+            for (SdcResource cldsSdcResource : cldsSdcResourceList) {
+                if (cldsSdcResource != null && "VF".equalsIgnoreCase(cldsSdcResource.getResoucreType())) {
+                    vfCObjectNode.putPOJO(cldsSdcResource.getResourceUUID(), subVfCObjectNode);
                 }
             }
         }
         emptyvfcobjectNode.putPOJO("", vfCObjectNode);
         return emptyvfcobjectNode;
     }
-    
-    private String getGlobalCldsString() throws Exception {
-       if  (null == globalCldsProperties) {
-            globalCldsProperties = new Properties();
-            globalCldsProperties.load(appContext.getResource(globalClds).getInputStream());
-       }
-       return (String) globalCldsProperties.get("globalCldsProps");
+
+    public ResponseEntity<CldsModel> deployModel(String modelName, CldsModel model) {
+        util.entering(request, "CldsService: Deploy model");
+        Date startTime = new Date();
+        Boolean errorCase = false;
+        try {
+            fillInCldsModel(model);
+            String bpmnJson = cldsBpmnTransformer.doXslTransformToString(model.getBpmnText());
+            logger.info("PUT bpmnJson={}", bpmnJson);
+            SecureServicePermission permisionManage = SecureServicePermission.create(cldsPermissionTypeClManage,
+                cldsPermissionInstance, CldsEvent.ACTION_DEPLOY);
+            isAuthorized(permisionManage);
+            isAuthorizedForVf(model);
+            ModelProperties modelProp = new ModelProperties(modelName, model.getControlName(), CldsEvent.ACTION_DEPLOY,
+                false, bpmnJson, model.getPropText());
+            checkForDuplicateServiceVf(modelName, model.getPropText());
+            String deploymentId = "";
+            // If model is already deployed then pass same deployment id
+            if (model.getDeploymentId() != null && !model.getDeploymentId().isEmpty()) {
+                deploymentId = model.getDeploymentId();
+            } else {
+                deploymentId = "closedLoop_" + UUID.randomUUID() + "_deploymentId";
+            }
+            String createNewDeploymentStatusUrl = dcaeDispatcherServices.createNewDeployment(deploymentId,
+                model.getTypeId(), modelProp.getGlobal().getDeployParameters());
+            String operationStatus = dcaeDispatcherServices.getOperationStatusWithRetry(createNewDeploymentStatusUrl);
+            if ("succeeded".equalsIgnoreCase(operationStatus)) {
+                String artifactName = model.getControlName();
+                if (artifactName != null) {
+                    artifactName = artifactName + ".yml";
+                }
+                DcaeEvent dcaeEvent = new DcaeEvent();
+                /* set dcae events */
+                dcaeEvent.setArtifactName(artifactName);
+                dcaeEvent.setEvent(DcaeEvent.EVENT_DEPLOYMENT);
+                CldsEvent.insEvent(cldsDao, dcaeEvent.getControlName(), getUserId(), dcaeEvent.getCldsActionCd(),
+                    CldsEvent.ACTION_STATE_RECEIVED, null);
+                model.setDeploymentId(deploymentId);
+                model.save(cldsDao, getUserId());
+            } else {
+                logger.info("Deploy model (" + modelName + ") failed...Operation Status is - " + operationStatus);
+                util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "DeployModel failed", Level.INFO, ONAPLogConstants.ResponseStatus.ERROR);
+                throw new HttpClientErrorException(HttpStatus.INTERNAL_SERVER_ERROR,
+                    "Deploy model (" + modelName + ") failed...Operation Status is - " + operationStatus);
+            }
+            logger.info("Deploy model (" + modelName + ") succeeded...Deployment Id is - " + deploymentId);
+            // audit log
+            LoggingUtils.setTimeContext(startTime, new Date());
+            auditLogger.info("Deploy model completed");
+        } catch (Exception e) {
+            errorCase = true;
+            logger.error("Exception occured during deployModel", e);
+        }
+        if (errorCase) {
+               util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "DeployModel failed", Level.INFO, ONAPLogConstants.ResponseStatus.ERROR);
+            return new ResponseEntity<>(model, HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+        util.exiting(HttpStatus.OK.toString(), "Successful", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
+        return new ResponseEntity<>(model, HttpStatus.OK);
+    }
+
+    public ResponseEntity<CldsModel> unDeployModel(String modelName, CldsModel model) {
+        util.entering(request, "CldsService: Undeploy model");
+        Date startTime = new Date();
+        Boolean errorCase = false;
+        try {
+            SecureServicePermission permisionManage = SecureServicePermission.create(cldsPermissionTypeClManage,
+                cldsPermissionInstance, CldsEvent.ACTION_UNDEPLOY);
+            isAuthorized(permisionManage);
+            isAuthorizedForVf(model);
+            String operationStatusUndeployUrl = dcaeDispatcherServices.deleteExistingDeployment(model.getDeploymentId(),
+                model.getTypeId());
+            String operationStatus = dcaeDispatcherServices.getOperationStatusWithRetry(operationStatusUndeployUrl);
+            if ("succeeded".equalsIgnoreCase(operationStatus)) {
+                String artifactName = model.getControlName();
+                if (artifactName != null) {
+                    artifactName = artifactName + ".yml";
+                }
+                DcaeEvent dcaeEvent = new DcaeEvent();
+                // set dcae events
+                dcaeEvent.setArtifactName(artifactName);
+                dcaeEvent.setEvent(DcaeEvent.EVENT_UNDEPLOYMENT);
+                CldsEvent.insEvent(cldsDao, model.getControlName(), getUserId(), dcaeEvent.getCldsActionCd(),
+                    CldsEvent.ACTION_STATE_RECEIVED, null);
+                model.setDeploymentId(null);
+                model.save(cldsDao, getUserId());
+            } else {
+                logger.info("Undeploy model (" + modelName + ") failed...Operation Status is - " + operationStatus);
+                util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "UndeployModel failed", Level.INFO, ONAPLogConstants.ResponseStatus.ERROR);
+                throw new HttpClientErrorException(HttpStatus.INTERNAL_SERVER_ERROR,
+                    "Undeploy model (" + modelName + ") failed...Operation Status is - " + operationStatus);
+            }
+            logger.info("Undeploy model (" + modelName + ") succeeded.");
+            // audit log
+            LoggingUtils.setTimeContext(startTime, new Date());
+            auditLogger.info("Undeploy model completed");
+        } catch (Exception e) {
+            errorCase = true;
+            logger.error("Exception occured during unDeployModel", e);
+        }
+        if (errorCase) {
+            util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "UndeployModel failed", Level.INFO, ONAPLogConstants.ResponseStatus.ERROR);
+            return new ResponseEntity<>(model, HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+        util.exiting(HttpStatus.OK.toString(), "Successful", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
+        return new ResponseEntity<>(model, HttpStatus.OK);
+    }
+
+    private void checkForDuplicateServiceVf(String modelName, String modelPropText) throws IOException {
+        JsonNode globalNode = JacksonUtils.getObjectMapperInstance().readTree(modelPropText).get("global");
+        String service = AbstractModelElement.getValueByName(globalNode, "service");
+        List<String> resourceVf = AbstractModelElement.getValuesByName(globalNode, "vf");
+        if (service != null && resourceVf != null && !resourceVf.isEmpty()) {
+            List<CldsModelProp> cldsModelPropList = cldsDao.getDeployedModelProperties();
+            for (CldsModelProp cldsModelProp : cldsModelPropList) {
+                JsonNode currentNode = JacksonUtils.getObjectMapperInstance().readTree(cldsModelProp.getPropText())
+                    .get("global");
+                String currentService = AbstractModelElement.getValueByName(currentNode, "service");
+                List<String> currentVf = AbstractModelElement.getValuesByName(currentNode, "vf");
+                if (currentVf != null && !currentVf.isEmpty()) {
+                    if (!modelName.equalsIgnoreCase(cldsModelProp.getName()) && service.equalsIgnoreCase(currentService)
+                        && resourceVf.get(0).equalsIgnoreCase(currentVf.get(0))) {
+                        throw new BadRequestException("Same Service/VF already exists in " + cldsModelProp.getName()
+                        + " model, please select different Service/VF.");
+                    }
+                }
+            }
+        }
+    }
+
+    private void updateAndInsertNewEvent(String cldsModelName, String cldsControlNamePrfx, CldsEvent event,
+        String newAction) {
+        // If model action is in submit/resubmit/distributed and user try
+        // to save then we are changing action back to create.
+        if (event != null && (CldsEvent.ACTION_SUBMIT.equalsIgnoreCase(event.getActionCd())
+            || CldsEvent.ACTION_RESUBMIT.equalsIgnoreCase(event.getActionCd())
+            || CldsEvent.ACTION_DISTRIBUTE.equalsIgnoreCase(event.getActionCd()))) {
+            CldsEvent newEvent = new CldsEvent();
+            newEvent.setUserid(getUserId());
+            newEvent.setActionCd(newAction);
+            newEvent.setActionStateCd(CldsEvent.ACTION_STATE_COMPLETED);
+            cldsDao.insEvent(cldsModelName, cldsControlNamePrfx, null, newEvent);
+        }
+    }
+
+    // Created for the integration test
+    public void setLoggingUtil (LoggingUtils utilP) {
+        util =  utilP;
     }
-}
+}
\ No newline at end of file