Changes to capability check processing

Code changes to ensure processing continues if
capability artifact is not available

Issue-ID:APPC-269
Change-Id: I27663622e56f54f721d40705d842ab30a173519d
Signed-off-by: Ramya Balaji <rb111y@att.com>

2 files changed, 849 insertions, 877 deletions

diff --git a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/DGGeneralDBService.java b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/DGGeneralDBService.java
index 1b63d75e9..cfb24939b 100644
--- a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/DGGeneralDBService.java
+++ b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/DGGeneralDBService.java
@@ -34,383 +34,383 @@ import com.att.eelf.configuration.EELFManager;
 
 public class DGGeneralDBService {
 
-	private static final EELFLogger log = EELFManager.getInstance().getLogger(DGGeneralDBService.class);
-	private SvcLogicResource serviceLogic;
-	private static DGGeneralDBService dgGeneralDBService = null;
-
-	public static DGGeneralDBService initialise() {
-		if (dgGeneralDBService == null) {
-			dgGeneralDBService = new DGGeneralDBService();
-		}
-		return dgGeneralDBService;
-	}
-
-	private DGGeneralDBService() {
-		if (serviceLogic == null) {
-			serviceLogic = new SqlResource();
-		}
-	}
-
-	public QueryStatus getDeviceProtocolByVnfType(SvcLogicContext ctx, String prefix) throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			String key = "SELECT * FROM DEVICE_INTERFACE_PROTOCOL WHERE vnf_type = $vnf-type ;";
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-		}
-		return status;
-	}
-
-	public QueryStatus getDeviceAuthenticationByVnfType(SvcLogicContext ctx, String prefix) throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			String key = "SELECT * FROM DEVICE_AUTHENTICATION WHERE vnf_type = $vnf-type ;";
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-
-		}
-		return status;
-	}
-
-	public QueryStatus getConfigFileReferenceByVnfType(SvcLogicContext ctx, String prefix) throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			String key = "SELECT * FROM CONFIG_FILE_REFERENCE WHERE vnf_type = $vnf-type ;";
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-		}
-		return status;
-	}
-
-	public QueryStatus getConfigFileReferenceByFileTypeNVnfType(SvcLogicContext ctx, String prefix, String fileType)
-			throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			String key = "SELECT * FROM CONFIG_FILE_REFERENCE  WHERE file_type = '" + fileType
-					+ "' and vnf_type = $vnf-type ;";
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-		}
-		return status;
-	}
-
-	public QueryStatus getTemplate(SvcLogicContext ctx, String prefix, String fileCategory) throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			String key = "SELECT artifact_content file_content , asdc_artifacts_id config_file_id "
-					+ " FROM ASDC_ARTIFACTS "
-					+ " WHERE asdc_artifacts_id = ( SELECT MAX(a.asdc_artifacts_id) configfileid  "
-					+ " FROM ASDC_ARTIFACTS a, ASDC_REFERENCE b " + " WHERE a.artifact_name = b.artifact_name "
-					+ " AND file_category =  '" + fileCategory + "'" + " AND action =  $request-action "
-					+ " AND vnf_type =  $vnf-type  " + " AND vnfc_type =   $vnfc-type ) ; ";
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-		}
-		return status;
-	}
-
-	public QueryStatus getTemplateByVnfTypeNAction(SvcLogicContext ctx, String prefix, String fileCategory)
-			throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			String key = "SELECT artifact_content file_content , asdc_artifacts_id config_file_id "
-					+ " FROM ASDC_ARTIFACTS "
-					+ " WHERE asdc_artifacts_id = (SELECT MAX(a.asdc_artifacts_id) configfileid  "
-					+ " FROM ASDC_ARTIFACTS a, ASDC_REFERENCE b " + " WHERE a.artifact_name = b.artifact_name "
-					+ " AND file_category =  '" + fileCategory + "'" + " AND action =  $request-action "
-					+ " AND vnf_type =  $vnf-type ) ; ";
-
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-		}
-		return status;
-	}
-
-	public QueryStatus getTemplateByVnfType(SvcLogicContext ctx, String prefix, String fileCategory)
-			throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			String key = "SELECT artifact_content file_content , asdc_artifacts_id config_file_id "
-					+ " FROM ASDC_ARTIFACTS "
-					+ " WHERE asdc_artifacts_id = (SELECT MAX(a.asdc_artifacts_id) configfileid  "
-					+ " FROM ASDC_ARTIFACTS a, ASDC_REFERENCE b " + " WHERE a.artifact_name = b.artifact_name "
-					+ " AND file_category =  '" + fileCategory + "'" + " AND vnf_type =  $vnf-type ) ; ";
-
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-		}
-		return status;
-	}
-
-	public QueryStatus getTemplateByTemplateName(SvcLogicContext ctx, String prefix, String templateName)
-			throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			String key = "SELECT artifact_content file_content , asdc_artifacts_id config_file_id "
-					+ " FROM ASDC_ARTIFACTS "
-					+ " WHERE asdc_artifacts_id = (SELECT MAX(asdc_artifacts_id) configfileid  "
-					+ " FROM ASDC_ARTIFACTS  " + " WHERE artifact_name = '" + templateName + "' ) ; ";
-
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-		}
-		return status;
-	}
-
-	public QueryStatus getConfigureActionDGByVnfTypeNAction(SvcLogicContext ctx, String prefix)
-			throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			String key = "SELECT * " + " FROM CONFIGURE_ACTION_DG "
-					+ " where vnf_type = $vnf-type and action = $request-action ; ";
-
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-		}
-		return status;
-	}
-
-	public QueryStatus getConfigureActionDGByVnfType(SvcLogicContext ctx, String prefix) throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			String key = "SELECT * " + " FROM CONFIGURE_ACTION_DG "
-					+ " where vnf_type = $vnf-type and action IS NULL ; ";
-
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-		}
-		return status;
-	}
-
-	public QueryStatus getMaxConfigFileId(SvcLogicContext ctx, String prefix, String fileCategory)
-			throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			String key = "SELECT MAX(config_file_id) configfileid " + " FROM CONFIGFILES " + " WHERE file_category = '"
-					+ fileCategory + "'" + " AND vnf_id =  $vnf-id  AND vm_name = $vm-name ; ";
-
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-		}
-		return status;
-	}
-
-	public QueryStatus saveConfigFiles(SvcLogicContext ctx, String prefix) throws SvcLogicException {
-
-		QueryStatus status = null;
-
-		if (serviceLogic != null && ctx != null) {
-			String key = "INSERT INTO CONFIGFILES " + " SET data_source        = $data-source , "
-					+ " service_instance_id =  $service-instance-id ," + " action              =   $request-action ,"
-					+ " vnf_type            = 	$vnf-type ," + " vnfc_type           = 	$vnfc-type ,"
-					+ " vnf_id              =   $vnf-id , " + " vnf_name            =   $vnf-name ,"
-					+ " vm_name            =   $vm-name ," + " file_category 		=  $file-category ,"
-					+ " file_content        =  $file-content ; ";
-
-			status = serviceLogic.save("SQL", false, false, key, null, prefix, ctx);
-
-		}
-		return status;
-
-	}
-
-	public QueryStatus savePrepareRelationship(SvcLogicContext ctx, String prefix, String fileId, String sdcInd)
-			throws SvcLogicException {
-
-		QueryStatus status = null;
-		String key = null;
-
-		if (serviceLogic != null && ctx != null) {
-
-			if ("Y".equals(sdcInd))
-
-				key = "INSERT INTO PREPARE_FILE_RELATIONSHIP " + " SET service_instance_id =  $service-instance-id , "
-						+ "   request_id         = $request-id , " + "  asdc_artifacts_id        =  " + fileId + " ;";
-			else
-				key = "INSERT INTO PREPARE_FILE_RELATIONSHIP " + " SET service_instance_id =  $service-instance-id , "
-						+ "   request_id         = $request-id , " + "  config_file_id        =  " + fileId + " ;";
-
-			status = serviceLogic.save("SQL", false, false, key, null, prefix, ctx);
-
-			log.info("DGGeneralDBService.savePrepareRelationship()" + ctx.getAttributeKeySet());
-		}
-		return status;
-
-	}
-
-	public void cleanContextPropertyByPrefix(SvcLogicContext ctx, String prefix) {
-		if (ctx != null && ctx.getAttributeKeySet() != null && StringUtils.isNotBlank(prefix)) {
-
-			Set<String> keySet = ctx.getAttributeKeySet();
-			for (String key : keySet) {
-				if (StringUtils.isNotBlank(key) && key.startsWith(prefix = ".")) {
-					ctx.getAttributeKeySet().remove(key);
-				}
-			}
-		}
-	}
-
-	public QueryStatus saveUploadConfig(SvcLogicContext ctx, String prefix) throws SvcLogicException {
-
-		QueryStatus status = null;
-
-		if (serviceLogic != null && ctx != null) {
-			String key = "INSERT INTO UPLOAD_CONFIG " + " SET request_id = $request-id , "
-					+ " action = $request-action , " + " originator_id = $originator-id , " + " vnf_id =  $vnf-id , "
-					+ " vnf_name = $vnf-name ,  " + " vm_name =  $vm-name ,  "
-					+ " host_ip_address = $vnf-host-ip-address , " + " vnf_type            = 	$vnf-type , "
-					+ " vnfc_type           = 	$vnfc-type , " + " config_indicator 		=  'Current' , "
-					+ " content        =  $tmp.escaped.devicerunningconfig ; ";
-
-			status = serviceLogic.save("SQL", false, false, key, null, prefix, ctx);
-
-			log.info("DGGeneralDBService.saveUploadConfig()" + ctx.getAttributeKeySet());
-
-		}
-		return status;
-
-	}
-
-	/*public QueryStatus getMaxUploadConfigFileId(SvcLogicContext ctx, String prefix) throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			String key = "SELECT MAX(upload_config_id) uploadconfigid " + " FROM UPLOAD_CONFIG "
-					+ " WHERE vnf_id =  $vnf-id  AND vm_name = $vm-name ; ";
-
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-			log.info("DGGeneralDBService.getMaxUploadConfigFileId()" + ctx.getAttributeKeySet());
-		}
-		return status;
-	}*/
-
-	public QueryStatus updateUploadConfig(SvcLogicContext ctx, String prefix, int maxId) throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			String key = "UPDATE UPLOAD_CONFIG " + " SET  config_indicator 		=  null "
-					+ " WHERE upload_config_id != " + maxId + " AND config_indicator 		=  'Current' "
-					+ " AND vnf_id = $vnf-id " + " AND vm_name =  $vm-name ; ";
-
-			status = serviceLogic.save("SQL", false, false, key, null, prefix, ctx);
-
-			log.info("DGGeneralDBService.updateUploadConfig()" + ctx.getAttributeKeySet());
-
-		}
-		return status;
-
-	}
-
-	
-	public QueryStatus getTemplateByArtifactType(SvcLogicContext ctx, String prefix, String fileCategory, String artifactType)
-			throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			String key = "SELECT artifact_content file_content , asdc_artifacts_id config_file_id "
-					+ " FROM ASDC_ARTIFACTS "
-					+ " WHERE asdc_artifacts_id = (SELECT MAX(a.asdc_artifacts_id) configfileid  "
-					+ " FROM ASDC_ARTIFACTS a, ASDC_REFERENCE b " + " WHERE a.artifact_name = b.artifact_name "
-					+ " AND file_category =  '" + fileCategory + "'" + " AND action =  $request-action "
-					+ " AND artifactType =  '" + artifactType + "'"	+ " AND vnf_type =  $vnf-type ) ; ";
-
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-		}
-		return status;
-	}
-	
-	
-	public QueryStatus getConfigFilesByVnfVmNCategory(SvcLogicContext ctx, String prefix, String fileCategory, String vnfId, String vmName)
-			throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			
-			String key = "SELECT  file_content ,  config_file_id "
-					+ " FROM CONFIGFILES "
-					+ " WHERE config_file_id = ( SELECT MAX(config_file_id) configfileid " + " FROM CONFIGFILES " 
-					+ " WHERE file_category = '"	+ fileCategory + "'" 
-					+ " AND vnf_id =  '" + vnfId + "'" 
-					+ " AND vm_name = '" + vmName + "' ) ; ";
-			
-			
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-		}
-		return status;
-	}
-	
-	
-	public QueryStatus getDownloadConfigTemplateByVnf(SvcLogicContext ctx, String prefix)
-			throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			String key = "SELECT * FROM DOWNLOAD_CONFIG_TEMPLATE  WHERE vnf_type = $vnf-type ; ";
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-		}
-		return status;
-	}
-	
-	
-	
-	public QueryStatus saveConfigTransactionLog(SvcLogicContext ctx, String prefix) throws SvcLogicException {
-
-		QueryStatus status = null;
-
-		if (serviceLogic != null && ctx != null) {
-				
-		
-				String key = "INSERT INTO CONFIG_TRANSACTION_LOG " + " SET request_id = $request-id , "
-				+ " message_type = $log-message-type , "
-				+ " message = $log-message ;";
-
-
-				status = serviceLogic.save("SQL", false, false, key, null, prefix, ctx);
-
-		
-
-		}
-		return status;
-
-	}
-
-	
-	public QueryStatus getVnfcReferenceByVnfcTypeNAction(SvcLogicContext ctx, String prefix)
-			throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			
-			String key = "SELECT  * "
-					+ " FROM VNFC_REFERENCE "
-					+ " WHERE vnf_type =  $vnf-type " 
-					+ " AND vnfc_type = $vnfc-type "
-					+ " AND action =  $request-action "
-					+ " ORDER BY vm_instance, vnfc_instance ; ";
-			
-			
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-		}
-		return status;
-	}
-
-	
-	public QueryStatus getVnfcReferenceByVnfTypeNAction(SvcLogicContext ctx, String prefix)
-			throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			
-			String key = "SELECT  * "
-					+ " FROM VNFC_REFERENCE "
-					+ " WHERE vnf_type =  $vnf-type " 
-					+ " AND action =  $request-action   "
-					+ " ORDER BY vm_instance, vnfc_instance ; ";
-			
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-		}
-		return status;
-	}
-	
-	
-	public QueryStatus getUploadConfigInfo(SvcLogicContext ctx, String prefix)
-			throws SvcLogicException {
-		QueryStatus status = null;
-		if (serviceLogic != null && ctx != null) {
-			
-			String key = "SELECT  * , UNIX_TIMESTAMP(UPLOAD_DATE) UPLOAD_TIMESTAMP "
-					+ " FROM UPLOAD_CONFIG "
-					+ " WHERE upload_config_id = " + 
-					"( SELECT MAX(upload_config_id) uploadconfigid " + " FROM UPLOAD_CONFIG "
-					+ " WHERE vnf_id =  $vnf-id  AND vm_name = $vm-name ) ; ";
-				
-			status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
-		}
-		return status;
-	}
-	 public String getCapability(SvcLogicContext ctx, String vnf_type) throws SvcLogicException {
+    private static final EELFLogger log = EELFManager.getInstance().getLogger(DGGeneralDBService.class);
+    private SvcLogicResource serviceLogic;
+    private static DGGeneralDBService dgGeneralDBService = null;
+
+    public static DGGeneralDBService initialise() {
+        if (dgGeneralDBService == null) {
+            dgGeneralDBService = new DGGeneralDBService();
+        }
+        return dgGeneralDBService;
+    }
+
+    private DGGeneralDBService() {
+        if (serviceLogic == null) {
+            serviceLogic = new SqlResource();
+        }
+    }
+
+    public QueryStatus getDeviceProtocolByVnfType(SvcLogicContext ctx, String prefix) throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            String key = "SELECT * FROM DEVICE_INTERFACE_PROTOCOL WHERE vnf_type = $vnf-type ;";
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+        }
+        return status;
+    }
+
+    public QueryStatus getDeviceAuthenticationByVnfType(SvcLogicContext ctx, String prefix) throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            String key = "SELECT * FROM DEVICE_AUTHENTICATION WHERE vnf_type = $vnf-type ;";
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+
+        }
+        return status;
+    }
+
+    public QueryStatus getConfigFileReferenceByVnfType(SvcLogicContext ctx, String prefix) throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            String key = "SELECT * FROM CONFIG_FILE_REFERENCE WHERE vnf_type = $vnf-type ;";
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+        }
+        return status;
+    }
+
+    public QueryStatus getConfigFileReferenceByFileTypeNVnfType(SvcLogicContext ctx, String prefix, String fileType)
+            throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            String key = "SELECT * FROM CONFIG_FILE_REFERENCE  WHERE file_type = '" + fileType
+                    + "' and vnf_type = $vnf-type ;";
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+        }
+        return status;
+    }
+
+    public QueryStatus getTemplate(SvcLogicContext ctx, String prefix, String fileCategory) throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            String key = "SELECT artifact_content file_content , asdc_artifacts_id config_file_id "
+                    + " FROM ASDC_ARTIFACTS "
+                    + " WHERE asdc_artifacts_id = ( SELECT MAX(a.asdc_artifacts_id) configfileid  "
+                    + " FROM ASDC_ARTIFACTS a, ASDC_REFERENCE b " + " WHERE a.artifact_name = b.artifact_name "
+                    + " AND file_category =  '" + fileCategory + "'" + " AND action =  $request-action "
+                    + " AND vnf_type =  $vnf-type  " + " AND vnfc_type =   $vnfc-type ) ; ";
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+        }
+        return status;
+    }
+
+    public QueryStatus getTemplateByVnfTypeNAction(SvcLogicContext ctx, String prefix, String fileCategory)
+            throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            String key = "SELECT artifact_content file_content , asdc_artifacts_id config_file_id "
+                    + " FROM ASDC_ARTIFACTS "
+                    + " WHERE asdc_artifacts_id = (SELECT MAX(a.asdc_artifacts_id) configfileid  "
+                    + " FROM ASDC_ARTIFACTS a, ASDC_REFERENCE b " + " WHERE a.artifact_name = b.artifact_name "
+                    + " AND file_category =  '" + fileCategory + "'" + " AND action =  $request-action "
+                    + " AND vnf_type =  $vnf-type ) ; ";
+
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+        }
+        return status;
+    }
+
+    public QueryStatus getTemplateByVnfType(SvcLogicContext ctx, String prefix, String fileCategory)
+            throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            String key = "SELECT artifact_content file_content , asdc_artifacts_id config_file_id "
+                    + " FROM ASDC_ARTIFACTS "
+                    + " WHERE asdc_artifacts_id = (SELECT MAX(a.asdc_artifacts_id) configfileid  "
+                    + " FROM ASDC_ARTIFACTS a, ASDC_REFERENCE b " + " WHERE a.artifact_name = b.artifact_name "
+                    + " AND file_category =  '" + fileCategory + "'" + " AND vnf_type =  $vnf-type ) ; ";
+
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+        }
+        return status;
+    }
+
+    public QueryStatus getTemplateByTemplateName(SvcLogicContext ctx, String prefix, String templateName)
+            throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            String key = "SELECT artifact_content file_content , asdc_artifacts_id config_file_id "
+                    + " FROM ASDC_ARTIFACTS "
+                    + " WHERE asdc_artifacts_id = (SELECT MAX(asdc_artifacts_id) configfileid  "
+                    + " FROM ASDC_ARTIFACTS  " + " WHERE artifact_name = '" + templateName + "' ) ; ";
+
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+        }
+        return status;
+    }
+
+    public QueryStatus getConfigureActionDGByVnfTypeNAction(SvcLogicContext ctx, String prefix)
+            throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            String key = "SELECT * " + " FROM CONFIGURE_ACTION_DG "
+                    + " where vnf_type = $vnf-type and action = $request-action ; ";
+
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+        }
+        return status;
+    }
+
+    public QueryStatus getConfigureActionDGByVnfType(SvcLogicContext ctx, String prefix) throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            String key = "SELECT * " + " FROM CONFIGURE_ACTION_DG "
+                    + " where vnf_type = $vnf-type and action IS NULL ; ";
+
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+        }
+        return status;
+    }
+
+    public QueryStatus getMaxConfigFileId(SvcLogicContext ctx, String prefix, String fileCategory)
+            throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            String key = "SELECT MAX(config_file_id) configfileid " + " FROM CONFIGFILES " + " WHERE file_category = '"
+                    + fileCategory + "'" + " AND vnf_id =  $vnf-id  AND vm_name = $vm-name ; ";
+
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+        }
+        return status;
+    }
+
+    public QueryStatus saveConfigFiles(SvcLogicContext ctx, String prefix) throws SvcLogicException {
+
+        QueryStatus status = null;
+
+        if (serviceLogic != null && ctx != null) {
+            String key = "INSERT INTO CONFIGFILES " + " SET data_source        = $data-source , "
+                    + " service_instance_id =  $service-instance-id ," + " action              =   $request-action ,"
+                    + " vnf_type            =     $vnf-type ," + " vnfc_type           =     $vnfc-type ,"
+                    + " vnf_id              =   $vnf-id , " + " vnf_name            =   $vnf-name ,"
+                    + " vm_name            =   $vm-name ," + " file_category         =  $file-category ,"
+                    + " file_content        =  $file-content ; ";
+
+            status = serviceLogic.save("SQL", false, false, key, null, prefix, ctx);
+
+        }
+        return status;
+
+    }
+
+    public QueryStatus savePrepareRelationship(SvcLogicContext ctx, String prefix, String fileId, String sdcInd)
+            throws SvcLogicException {
+
+        QueryStatus status = null;
+        String key = null;
+
+        if (serviceLogic != null && ctx != null) {
+
+            if ("Y".equals(sdcInd))
+
+                key = "INSERT INTO PREPARE_FILE_RELATIONSHIP " + " SET service_instance_id =  $service-instance-id , "
+                        + "   request_id         = $request-id , " + "  asdc_artifacts_id        =  " + fileId + " ;";
+            else
+                key = "INSERT INTO PREPARE_FILE_RELATIONSHIP " + " SET service_instance_id =  $service-instance-id , "
+                        + "   request_id         = $request-id , " + "  config_file_id        =  " + fileId + " ;";
+
+            status = serviceLogic.save("SQL", false, false, key, null, prefix, ctx);
+
+            log.info("DGGeneralDBService.savePrepareRelationship()" + ctx.getAttributeKeySet());
+        }
+        return status;
+
+    }
+
+    public void cleanContextPropertyByPrefix(SvcLogicContext ctx, String prefix) {
+        if (ctx != null && ctx.getAttributeKeySet() != null && StringUtils.isNotBlank(prefix)) {
+
+            Set<String> keySet = ctx.getAttributeKeySet();
+            for (String key : keySet) {
+                if (StringUtils.isNotBlank(key) && key.startsWith(prefix = ".")) {
+                    ctx.getAttributeKeySet().remove(key);
+                }
+            }
+        }
+    }
+
+    public QueryStatus saveUploadConfig(SvcLogicContext ctx, String prefix) throws SvcLogicException {
+
+        QueryStatus status = null;
+
+        if (serviceLogic != null && ctx != null) {
+            String key = "INSERT INTO UPLOAD_CONFIG " + " SET request_id = $request-id , "
+                    + " action = $request-action , " + " originator_id = $originator-id , " + " vnf_id =  $vnf-id , "
+                    + " vnf_name = $vnf-name ,  " + " vm_name =  $vm-name ,  "
+                    + " host_ip_address = $vnf-host-ip-address , " + " vnf_type            =     $vnf-type , "
+                    + " vnfc_type           =     $vnfc-type , " + " config_indicator         =  'Current' , "
+                    + " content        =  $tmp.escaped.devicerunningconfig ; ";
+
+            status = serviceLogic.save("SQL", false, false, key, null, prefix, ctx);
+
+            log.info("DGGeneralDBService.saveUploadConfig()" + ctx.getAttributeKeySet());
+
+        }
+        return status;
+
+    }
+
+    /*public QueryStatus getMaxUploadConfigFileId(SvcLogicContext ctx, String prefix) throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            String key = "SELECT MAX(upload_config_id) uploadconfigid " + " FROM UPLOAD_CONFIG "
+                    + " WHERE vnf_id =  $vnf-id  AND vm_name = $vm-name ; ";
+
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+            log.info("DGGeneralDBService.getMaxUploadConfigFileId()" + ctx.getAttributeKeySet());
+        }
+        return status;
+    }*/
+
+    public QueryStatus updateUploadConfig(SvcLogicContext ctx, String prefix, int maxId) throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            String key = "UPDATE UPLOAD_CONFIG " + " SET  config_indicator         =  null "
+                    + " WHERE upload_config_id != " + maxId + " AND config_indicator         =  'Current' "
+                    + " AND vnf_id = $vnf-id " + " AND vm_name =  $vm-name ; ";
+
+            status = serviceLogic.save("SQL", false, false, key, null, prefix, ctx);
+
+            log.info("DGGeneralDBService.updateUploadConfig()" + ctx.getAttributeKeySet());
+
+        }
+        return status;
+
+    }
+
+    
+    public QueryStatus getTemplateByArtifactType(SvcLogicContext ctx, String prefix, String fileCategory, String artifactType)
+            throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            String key = "SELECT artifact_content file_content , asdc_artifacts_id config_file_id "
+                    + " FROM ASDC_ARTIFACTS "
+                    + " WHERE asdc_artifacts_id = (SELECT MAX(a.asdc_artifacts_id) configfileid  "
+                    + " FROM ASDC_ARTIFACTS a, ASDC_REFERENCE b " + " WHERE a.artifact_name = b.artifact_name "
+                    + " AND file_category =  '" + fileCategory + "'" + " AND action =  $request-action "
+                    + " AND artifactType =  '" + artifactType + "'"    + " AND vnf_type =  $vnf-type ) ; ";
+
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+        }
+        return status;
+    }
+    
+    
+    public QueryStatus getConfigFilesByVnfVmNCategory(SvcLogicContext ctx, String prefix, String fileCategory, String vnfId, String vmName)
+            throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            
+            String key = "SELECT  file_content ,  config_file_id "
+                    + " FROM CONFIGFILES "
+                    + " WHERE config_file_id = ( SELECT MAX(config_file_id) configfileid " + " FROM CONFIGFILES " 
+                    + " WHERE file_category = '"    + fileCategory + "'" 
+                    + " AND vnf_id =  '" + vnfId + "'" 
+                    + " AND vm_name = '" + vmName + "' ) ; ";
+            
+            
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+        }
+        return status;
+    }
+    
+    
+    public QueryStatus getDownloadConfigTemplateByVnf(SvcLogicContext ctx, String prefix)
+            throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            String key = "SELECT * FROM DOWNLOAD_CONFIG_TEMPLATE  WHERE vnf_type = $vnf-type ; ";
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+        }
+        return status;
+    }
+    
+    
+    
+    public QueryStatus saveConfigTransactionLog(SvcLogicContext ctx, String prefix) throws SvcLogicException {
+
+        QueryStatus status = null;
+
+        if (serviceLogic != null && ctx != null) {
+                
+        
+                String key = "INSERT INTO CONFIG_TRANSACTION_LOG " + " SET request_id = $request-id , "
+                + " message_type = $log-message-type , "
+                + " message = $log-message ;";
+
+
+                status = serviceLogic.save("SQL", false, false, key, null, prefix, ctx);
+
+        
+
+        }
+        return status;
+
+    }
+
+    
+    public QueryStatus getVnfcReferenceByVnfcTypeNAction(SvcLogicContext ctx, String prefix)
+            throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            
+            String key = "SELECT  * "
+                    + " FROM VNFC_REFERENCE "
+                    + " WHERE vnf_type =  $vnf-type " 
+                    + " AND vnfc_type = $vnfc-type "
+                    + " AND action =  $request-action "
+                    + " ORDER BY vm_instance, vnfc_instance ; ";
+            
+            
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+        }
+        return status;
+    }
+
+    
+    public QueryStatus getVnfcReferenceByVnfTypeNAction(SvcLogicContext ctx, String prefix)
+            throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            
+            String key = "SELECT  * "
+                    + " FROM VNFC_REFERENCE "
+                    + " WHERE vnf_type =  $vnf-type " 
+                    + " AND action =  $request-action   "
+                    + " ORDER BY vm_instance, vnfc_instance ; ";
+            
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+        }
+        return status;
+    }
+    
+    
+    public QueryStatus getUploadConfigInfo(SvcLogicContext ctx, String prefix)
+            throws SvcLogicException {
+        QueryStatus status = null;
+        if (serviceLogic != null && ctx != null) {
+            
+            String key = "SELECT  * , UNIX_TIMESTAMP(UPLOAD_DATE) UPLOAD_TIMESTAMP "
+                    + " FROM UPLOAD_CONFIG "
+                    + " WHERE upload_config_id = " + 
+                    "( SELECT MAX(upload_config_id) uploadconfigid " + " FROM UPLOAD_CONFIG "
+                    + " WHERE vnf_id =  $vnf-id  AND vm_name = $vm-name ) ; ";
+                
+            status = serviceLogic.query("SQL", false, null, key, prefix, null, ctx);
+        }
+        return status;
+    }
+     public String getCapability(SvcLogicContext ctx, String vnf_type) throws SvcLogicException {
 
          //{"capabilities":{"vnfc":[],"vm":[],"vf-module":[],"vnf":["ConfigureTest","ConfigModify","HealthCheck"]}}
          String fn = "getCapability ";
@@ -433,8 +433,11 @@ public class DGGeneralDBService {
 
                  log.debug(fn + "Query String : " + queryString1);
                  status = serviceLogic.query("SQL", false, null, queryString1, null, null, localContext);
+                 if (status.toString().equals("NOT_FOUND"))
+                     return null;
+
                  if(status.toString().equals("FAILURE"))
-                         throw new SvcLogicException("Error - while getting capabilitiesData ");
+                     throw new SvcLogicException("Error - while getting capabilitiesData ");
          }
 
          return localContext.getAttribute("artifact-content");
diff --git a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/node/ConfigResourceNode.java b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/node/ConfigResourceNode.java
index f59a88749..f389ff8d9 100644
--- a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/node/ConfigResourceNode.java
+++ b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/node/ConfigResourceNode.java
@@ -40,718 +40,687 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
 
 public class ConfigResourceNode implements SvcLogicJavaPlugin {
 
-	private static final EELFLogger log = EELFManager.getInstance().getLogger(ConfigResourceNode.class);
+    private static final EELFLogger log = EELFManager.getInstance().getLogger(ConfigResourceNode.class);
 
-	public void getConfigFileReference(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+    public void getConfigFileReference(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
 
-		log.info("Received getConfigFiles call with params : " + inParams);
+        log.info("Received getConfigFiles call with params : " + inParams);
 
-		String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
+        String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
 
-		try {
+        try {
 
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-			DGGeneralDBService db = DGGeneralDBService.initialise();
-			QueryStatus status = db.getConfigFileReferenceByFileTypeNVnfType(ctx, "configfilereference-deviceconfig",
-					"device_configuration");
+            responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+            DGGeneralDBService db = DGGeneralDBService.initialise();
+            QueryStatus status = db.getConfigFileReferenceByFileTypeNVnfType(ctx, "configfilereference-deviceconfig",
+                    "device_configuration");
 
-			if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
-				throw new Exception("Unable to Read ConfigFileReference:device-configuration");
+            if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
+                throw new Exception("Unable to Read ConfigFileReference:device-configuration");
 
-			status = db.getConfigFileReferenceByFileTypeNVnfType(ctx, "configfilereference-success",
-					"configuration_success");
+            status = db.getConfigFileReferenceByFileTypeNVnfType(ctx, "configfilereference-success",
+                    "configuration_success");
 
-			if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
-				throw new Exception("Unable to Read ConfigFileReference:configuration_success");
+            if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
+                throw new Exception("Unable to Read ConfigFileReference:configuration_success");
 
-			status = db.getConfigFileReferenceByFileTypeNVnfType(ctx, "configfilereference-failure",
-					"configuration_error");
+            status = db.getConfigFileReferenceByFileTypeNVnfType(ctx, "configfilereference-failure",
+                    "configuration_error");
 
-			if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
-				throw new Exception("Unable to Read ConfigFileReference:configuration_error");
+            if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
+                throw new Exception("Unable to Read ConfigFileReference:configuration_error");
 
-			status = db.getConfigFileReferenceByFileTypeNVnfType(ctx, "configfilereference-log", "log");
+            status = db.getConfigFileReferenceByFileTypeNVnfType(ctx, "configfilereference-log", "log");
 
-			if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
-				throw new Exception("Unable to Read ConfigFileReference:configuration_log");
+            if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
+                throw new Exception("Unable to Read ConfigFileReference:configuration_log");
 
 
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
-			log.info("GetConfigFileReference Successful ");
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
-			log.error("Failed in GetConfigFileReference " + e.getMessage());
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
+            log.info("GetConfigFileReference Successful ");
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
+            log.error("Failed in GetConfigFileReference " + e.getMessage());
 
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
 
-	public void getCommonConfigInfo(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+    public void getCommonConfigInfo(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
 
-		log.info("Received getDeviceInfo call with params : " + inParams);
+        log.info("Received getDeviceInfo call with params : " + inParams);
 
-		String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
+        String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
 
-		try {
+        try {
 
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-			DGGeneralDBService db = DGGeneralDBService.initialise();
-			QueryStatus status = db.getDeviceAuthenticationByVnfType(ctx, "device-authentication");
+            responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+            DGGeneralDBService db = DGGeneralDBService.initialise();
+            QueryStatus status = db.getDeviceAuthenticationByVnfType(ctx, "device-authentication");
 
-			if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
-				throw new Exception("Unable to Read device_authentication");
+            if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
+                throw new Exception("Unable to Read device_authentication");
 
-			status = db.getDeviceProtocolByVnfType(ctx, "tmp.deviceinterfaceprotocol");
+            status = db.getDeviceProtocolByVnfType(ctx, "tmp.deviceinterfaceprotocol");
 
-			if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
-				throw new Exception("Unable to Read device_interface_protocol");
+            if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
+                throw new Exception("Unable to Read device_interface_protocol");
 
-			status = db.getConfigureActionDGByVnfTypeNAction(ctx, "tmp.configureactiondg");
-			if (status == QueryStatus.FAILURE)
-				throw new Exception("Unable to Read configure_action_dg");
+            status = db.getConfigureActionDGByVnfTypeNAction(ctx, "tmp.configureactiondg");
+            if (status == QueryStatus.FAILURE)
+                throw new Exception("Unable to Read configure_action_dg");
 
-			if (status == QueryStatus.NOT_FOUND) {
-				status = db.getConfigureActionDGByVnfType(ctx, "tmp.configureactiondg");
+            if (status == QueryStatus.NOT_FOUND) {
+                status = db.getConfigureActionDGByVnfType(ctx, "tmp.configureactiondg");
 
-				if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
-					throw new Exception("Unable to Read configure_action_dg");
-			}
+                if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
+                    throw new Exception("Unable to Read configure_action_dg");
+            }
 
 
 
 
 
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
-			log.info("getCommonConfigInfo Successful ");
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
-			log.error("Failed in getCommonConfigInfo " + e.getMessage());
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
+            log.info("getCommonConfigInfo Successful ");
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
+            log.error("Failed in getCommonConfigInfo " + e.getMessage());
 
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
 
 
-	// fileCategory Can be  config_template, parameter_definitions, parameter_yang
-	public void getTemplate(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+    // fileCategory Can be  config_template, parameter_definitions, parameter_yang
+    public void getTemplate(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
 
-		log.info("Received getTemplate call with params : " + inParams);
+        log.info("Received getTemplate call with params : " + inParams);
 
 
-		String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
-		String fileCategory = inParams.get(AppcDataServiceConstant.INPUT_PARAM_FILE_CATEGORY);
-		String templateName = ctx.getAttribute("template-name");
-		QueryStatus status = null;
-		String responsePrefix1 = "";
+        String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
+        String fileCategory = inParams.get(AppcDataServiceConstant.INPUT_PARAM_FILE_CATEGORY);
+        String templateName = ctx.getAttribute("template-name");
+        QueryStatus status = null;
+        String responsePrefix1 = "";
 
-		try {
+        try {
 
-			responsePrefix1 = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-			log.info("RESPONSEPREFIX : " + responsePrefix);
-			log.info("RESPONSEPREFIX1 : " + responsePrefix1);
+            responsePrefix1 = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+            log.info("RESPONSEPREFIX : " + responsePrefix);
+            log.info("RESPONSEPREFIX1 : " + responsePrefix1);
 
-			DGGeneralDBService db = DGGeneralDBService.initialise();
+            DGGeneralDBService db = DGGeneralDBService.initialise();
 
-			if (StringUtils.isBlank(templateName)) {
+            if (StringUtils.isBlank(templateName)) {
 
-				//if ( !StringUtils.isBlank(ctx.getAttribute("vnfc-type"))) {
+                //if ( !StringUtils.isBlank(ctx.getAttribute("vnfc-type"))) {
 
 
-				status = db.getTemplate(ctx, responsePrefix, fileCategory);
-				if (status == QueryStatus.FAILURE)
-					throw new Exception("Unable to Read " + fileCategory );
-				//}
+                status = db.getTemplate(ctx, responsePrefix, fileCategory);
+                if (status == QueryStatus.FAILURE)
+                    throw new Exception("Unable to Read " + fileCategory );
+                //}
 
-				if (status == QueryStatus.NOT_FOUND) {
+                if (status == QueryStatus.NOT_FOUND) {
 
 
-					status = db.getTemplateByVnfTypeNAction(ctx, responsePrefix, fileCategory);
+                    status = db.getTemplateByVnfTypeNAction(ctx, responsePrefix, fileCategory);
 
-					if (status == QueryStatus.FAILURE)
-						throw new Exception("Unable to Read " + fileCategory );
+                    if (status == QueryStatus.FAILURE)
+                        throw new Exception("Unable to Read " + fileCategory );
 
-					if (status == QueryStatus.NOT_FOUND) {
+                    if (status == QueryStatus.NOT_FOUND) {
 
-						//status = db.getTemplateByVnfType(ctx, responsePrefix, fileCategory);
+                        //status = db.getTemplateByVnfType(ctx, responsePrefix, fileCategory);
 
-						//if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
-							throw new Exception("Unable to Read " + fileCategory );
-					}
-				}
-			} else {
+                        //if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
+                            throw new Exception("Unable to Read " + fileCategory );
+                    }
+                }
+            } else {
 
-				status = db.getTemplateByTemplateName(ctx, responsePrefix, templateName);
+                status = db.getTemplateByTemplateName(ctx, responsePrefix, templateName);
 
-				if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
-					throw new Exception("Unable to Read " + fileCategory + " template");
-			}
+                if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
+                    throw new Exception("Unable to Read " + fileCategory + " template");
+            }
 
 
-			ctx.setAttribute(responsePrefix1 + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
-			log.info("GetTemplate Successful ");
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix1 + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix1 + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
-			log.error("Failed in getTemplate " + e.getMessage());
+            ctx.setAttribute(responsePrefix1 + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
+            log.info("GetTemplate Successful ");
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix1 + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix1 + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
+            log.error("Failed in getTemplate " + e.getMessage());
 
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
 
-	public void saveConfigFiles(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+    public void saveConfigFiles(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
 
-		log.info("Received saveConfigFiles call with params : " + inParams);
+        log.info("Received saveConfigFiles call with params : " + inParams);
 
-		String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
+        String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
 
-		try {
+        try {
 
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-			DGGeneralDBService db = DGGeneralDBService.initialise();
-			QueryStatus status = db.saveConfigFiles(ctx, "tmp.configFiles");
+            responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+            DGGeneralDBService db = DGGeneralDBService.initialise();
+            QueryStatus status = db.saveConfigFiles(ctx, "tmp.configFiles");
 
-			if (status == QueryStatus.FAILURE)
-				throw new Exception("Unable to Save " + ctx.getAttribute("file-category") + " in configfiles");
+            if (status == QueryStatus.FAILURE)
+                throw new Exception("Unable to Save " + ctx.getAttribute("file-category") + " in configfiles");
 
-			status = db.getMaxConfigFileId(ctx, "tmp.configfilesmax", ctx.getAttribute("file-category"));
+            status = db.getMaxConfigFileId(ctx, "tmp.configfilesmax", ctx.getAttribute("file-category"));
 
-			if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
-				throw new Exception("Unable to get " + ctx.getAttribute("file-category") + " from configfiles");
+            if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
+                throw new Exception("Unable to get " + ctx.getAttribute("file-category") + " from configfiles");
 
-			status = db.savePrepareRelationship(ctx, "tmp.preparerel",
-					ctx.getAttribute("tmp.configfilesmax.configfileid"), "N");
-			if (status == QueryStatus.FAILURE)
-				throw new Exception("Unable to save prepare_relationship");
+            status = db.savePrepareRelationship(ctx, "tmp.preparerel",
+                    ctx.getAttribute("tmp.configfilesmax.configfileid"), "N");
+            if (status == QueryStatus.FAILURE)
+                throw new Exception("Unable to save prepare_relationship");
 
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
-			log.info("saveConfigFiles Successful ");
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
-			log.error("Failed in saveConfigFiles " + e.getMessage());
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
+            log.info("saveConfigFiles Successful ");
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
+            log.error("Failed in saveConfigFiles " + e.getMessage());
 
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
 
-	public void updateUploadConfig(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+    public void updateUploadConfig(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
 
-		log.info("Received updateUploadConfig call with params : " + inParams);
+        log.info("Received updateUploadConfig call with params : " + inParams);
 
-		String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
+        String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
 
-		try {
+        try {
 
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-			DGGeneralDBService db = DGGeneralDBService.initialise();
+            responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+            DGGeneralDBService db = DGGeneralDBService.initialise();
 
-			ctx.setAttribute("tmp.escaped.devicerunningconfig",
-					EscapeUtils.escapeSql(ctx.getAttribute("device-running-config")));
+            ctx.setAttribute("tmp.escaped.devicerunningconfig",
+                    EscapeUtils.escapeSql(ctx.getAttribute("device-running-config")));
 
-			QueryStatus status = db.saveUploadConfig(ctx, "tmp.uploadConfig");
+            QueryStatus status = db.saveUploadConfig(ctx, "tmp.uploadConfig");
 
-			if (status == QueryStatus.FAILURE)
-				throw new Exception("Unable to Save configuration in upload_config");
+            if (status == QueryStatus.FAILURE)
+                throw new Exception("Unable to Save configuration in upload_config");
 
-			/*status = db.getMaxUploadConfigFileId(ctx, "tmp.uploadconfigmax");
+            /*status = db.getMaxUploadConfigFileId(ctx, "tmp.uploadconfigmax");
 
-			if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
-				throw new Exception("Unable to get record from upload_config");
+            if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
+                throw new Exception("Unable to get record from upload_config");
 
-			status = db.updateUploadConfig(ctx, "tmp.uploadConfig",
-					Integer.parseInt(ctx.getAttribute("tmp.uploadconfigmax.uploadconfigid")));
-			if (status == QueryStatus.FAILURE)
-				throw new Exception("Unable to upload upload_config");*/
+            status = db.updateUploadConfig(ctx, "tmp.uploadConfig",
+                    Integer.parseInt(ctx.getAttribute("tmp.uploadconfigmax.uploadconfigid")));
+            if (status == QueryStatus.FAILURE)
+                throw new Exception("Unable to upload upload_config");*/
 
-			status = db.getUploadConfigInfo(ctx, "tmp.uploadConfigInfo");
+            status = db.getUploadConfigInfo(ctx, "tmp.uploadConfigInfo");
 
-			if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
-				throw new Exception("Unable to get record from upload_config");
+            if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
+                throw new Exception("Unable to get record from upload_config");
 
-			status = db.updateUploadConfig(ctx, "tmp.uploadConfig",
-					Integer.parseInt(ctx.getAttribute("tmp.uploadConfigInfo.UPLOAD-CONFIG-ID")));
-			if (status == QueryStatus.FAILURE)
-				throw new Exception("Unable to upload upload_config");
+            status = db.updateUploadConfig(ctx, "tmp.uploadConfig",
+                    Integer.parseInt(ctx.getAttribute("tmp.uploadConfigInfo.UPLOAD-CONFIG-ID")));
+            if (status == QueryStatus.FAILURE)
+                throw new Exception("Unable to upload upload_config");
 
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
-			log.info("updateUploadConfig Successful ");
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
-			log.error("Failed in updateUploadConfig  " + e.getMessage());
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
+            log.info("updateUploadConfig Successful ");
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
+            log.error("Failed in updateUploadConfig  " + e.getMessage());
 
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
 
-	public void savePrepareRelationship(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+    public void savePrepareRelationship(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
 
-		log.info("Received savePrepareRelationship call with params : " + inParams);
+        log.info("Received savePrepareRelationship call with params : " + inParams);
 
-		String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
-		String sdcArtifactInd = inParams.get(AppcDataServiceConstant.INPUT_PARAM_SDC_ARTIFACT_IND);
-		String fileId = inParams.get(AppcDataServiceConstant.INPUT_PARAM_FILE_ID);
-		try {
+        String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
+        String sdcArtifactInd = inParams.get(AppcDataServiceConstant.INPUT_PARAM_SDC_ARTIFACT_IND);
+        String fileId = inParams.get(AppcDataServiceConstant.INPUT_PARAM_FILE_ID);
+        try {
 
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-			DGGeneralDBService db = DGGeneralDBService.initialise();
+            responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+            DGGeneralDBService db = DGGeneralDBService.initialise();
 
-			QueryStatus status = db.savePrepareRelationship(ctx, "tmp.preparerel", fileId, sdcArtifactInd);
-			if (status == QueryStatus.FAILURE)
-				throw new Exception("Unable to save prepare_relationship");
+            QueryStatus status = db.savePrepareRelationship(ctx, "tmp.preparerel", fileId, sdcArtifactInd);
+            if (status == QueryStatus.FAILURE)
+                throw new Exception("Unable to save prepare_relationship");
 
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
-			log.info("savePrepareRelationship Successful ");
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
-			log.error("Failed in saveConfigFiles " + e.getMessage());
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
+            log.info("savePrepareRelationship Successful ");
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
+            log.error("Failed in saveConfigFiles " + e.getMessage());
 
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
 
-	public void saveConfigBlock(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+    public void saveConfigBlock(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
 
-		log.info("Received saveConfigBlock call with params : " + inParams);
+        log.info("Received saveConfigBlock call with params : " + inParams);
 
-		String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
+        String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
 
-		try {
+        try {
 
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-			ctx.setAttribute("tmp.convertconfig.escapeData",
-					EscapeUtils.escapeSql(ctx.getAttribute("configuration")));
-			DGGeneralDBService db = DGGeneralDBService.initialise();
+            responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+            ctx.setAttribute("tmp.convertconfig.escapeData",
+                    EscapeUtils.escapeSql(ctx.getAttribute("configuration")));
+            DGGeneralDBService db = DGGeneralDBService.initialise();
 
-			if (StringUtils.isBlank(ctx.getAttribute("configuration-params"))) {
-				saveDeviceConfiguration(inParams, ctx, "Request", ctx.getAttribute("tmp.convertconfig.escapeData"),
-						ctx.getAttribute("configuration"));
-			} else {
+            if (StringUtils.isBlank(ctx.getAttribute("configuration-params"))) {
+                saveDeviceConfiguration(inParams, ctx, "Request", ctx.getAttribute("tmp.convertconfig.escapeData"),
+                        ctx.getAttribute("configuration"));
+            } else {
 
-				saveConfigurationBlock(inParams, ctx);
+                saveConfigurationBlock(inParams, ctx);
 
-				ctx.setAttribute("tmp.convertconfig.escapeData",
-						EscapeUtils.escapeSql(ctx.getAttribute("tmp.merge.mergedData")));
-				saveDeviceConfiguration(inParams, ctx, "Configurator", ctx.getAttribute("tmp.convertconfig.escapeData"),
-						ctx.getAttribute("tmp.merge.mergedData"));
+                ctx.setAttribute("tmp.convertconfig.escapeData",
+                        EscapeUtils.escapeSql(ctx.getAttribute("tmp.merge.mergedData")));
+                saveDeviceConfiguration(inParams, ctx, "Configurator", ctx.getAttribute("tmp.convertconfig.escapeData"),
+                        ctx.getAttribute("tmp.merge.mergedData"));
 
-				saveConfigurationData(inParams, ctx);
-			}
+                saveConfigurationData(inParams, ctx);
+            }
 
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
-			log.info("saveConfigBlock Successful ");
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
-			log.error("Failed in saveConfigBlock " + e.getMessage());
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
+            log.info("saveConfigBlock Successful ");
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
+            log.error("Failed in saveConfigBlock " + e.getMessage());
 
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
 
-	public void saveTemplateConfig(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+    public void saveTemplateConfig(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
 
-		log.info("Received saveTemplateConfig call with params : " + inParams);
+        log.info("Received saveTemplateConfig call with params : " + inParams);
 
-		String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
+        String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
 
-		try {
+        try {
 
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-			DGGeneralDBService db = DGGeneralDBService.initialise();
+            responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+            DGGeneralDBService db = DGGeneralDBService.initialise();
 
-			if (StringUtils.isBlank(ctx.getAttribute("configuration-params"))) {
+            if (StringUtils.isBlank(ctx.getAttribute("configuration-params"))) {
 
-				ctx.setAttribute("tmp.convertconfig.escapeData",
-						EscapeUtils.escapeSql(ctx.getAttribute("config-template.file-content")));
-				saveDeviceConfiguration(inParams, ctx, "Template", ctx.getAttribute("tmp.convertconfig.escapeData"),
-						ctx.getAttribute("config-template.file-content"));
+                ctx.setAttribute("tmp.convertconfig.escapeData",
+                        EscapeUtils.escapeSql(ctx.getAttribute("config-template.file-content")));
+                saveDeviceConfiguration(inParams, ctx, "Template", ctx.getAttribute("tmp.convertconfig.escapeData"),
+                        ctx.getAttribute("config-template.file-content"));
 
-			} else {
-				saveConfigurationData(inParams, ctx);
+            } else {
+                saveConfigurationData(inParams, ctx);
 
-				ctx.setAttribute("tmp.convertconfig.escapeData",
-						EscapeUtils.escapeSql(ctx.getAttribute("tmp.merge.mergedData")));
-				saveDeviceConfiguration(inParams, ctx, "Configurator", ctx.getAttribute("tmp.convertconfig.escapeData"),
-						ctx.getAttribute("tmp.merge.mergedData"));
+                ctx.setAttribute("tmp.convertconfig.escapeData",
+                        EscapeUtils.escapeSql(ctx.getAttribute("tmp.merge.mergedData")));
+                saveDeviceConfiguration(inParams, ctx, "Configurator", ctx.getAttribute("tmp.convertconfig.escapeData"),
+                        ctx.getAttribute("tmp.merge.mergedData"));
 
-			}
+            }
 
-			QueryStatus status = db.savePrepareRelationship(ctx, "tmp.preparerel",
-					ctx.getAttribute("config-template.config-file-id"), "Y");
-			if (status == QueryStatus.FAILURE)
-				throw new Exception("Unable to save prepare_relationship");
+            QueryStatus status = db.savePrepareRelationship(ctx, "tmp.preparerel",
+                    ctx.getAttribute("config-template.config-file-id"), "Y");
+            if (status == QueryStatus.FAILURE)
+                throw new Exception("Unable to save prepare_relationship");
 
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
-			log.info("saveTemplateConfig Successful ");
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
-			log.error("Failed in saveTemplateConfig " + e.getMessage());
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
+            log.info("saveTemplateConfig Successful ");
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
+            log.error("Failed in saveTemplateConfig " + e.getMessage());
 
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
 
 
 
 
-	public void saveStyleSheetConfig(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+    public void saveStyleSheetConfig(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
 
 
-		log.info("Received saveStyleSheet call with params : " + inParams);
+        log.info("Received saveStyleSheet call with params : " + inParams);
 
-		String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
+        String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
 
-		try {
+        try {
 
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-			ctx.setAttribute("tmp.convertconfig.escapeData",
-					EscapeUtils.escapeSql(ctx.getAttribute("tmp.merge.mergedData")));
-			saveDeviceConfiguration(inParams, ctx, "StyleSheet", ctx.getAttribute("tmp.convertconfig.escapeData"),
-					ctx.getAttribute("tmp.merge.mergedData"));
+            responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+            ctx.setAttribute("tmp.convertconfig.escapeData",
+                    EscapeUtils.escapeSql(ctx.getAttribute("tmp.merge.mergedData")));
+            saveDeviceConfiguration(inParams, ctx, "StyleSheet", ctx.getAttribute("tmp.convertconfig.escapeData"),
+                    ctx.getAttribute("tmp.merge.mergedData"));
 
 
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS, AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
-			log.info("saveStyleSheet Successful ");
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS, AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE,e.getMessage());
-			log.error("Failed in saveStyleSheet " + e.getMessage());
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS, AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
+            log.info("saveStyleSheet Successful ");
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS, AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE,e.getMessage());
+            log.error("Failed in saveStyleSheet " + e.getMessage());
 
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
 
 
-	public void getSmmChainKeyFiles(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+    public void getSmmChainKeyFiles(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
 
 
-		log.info("Received saveStyleSheet call with params : " + inParams);
+        log.info("Received saveStyleSheet call with params : " + inParams);
 
-		String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
-		String siteLocation = ctx.getAttribute("site-location");
+        String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
+        String siteLocation = ctx.getAttribute("site-location");
 
-		QueryStatus status = null;
+        QueryStatus status = null;
 
-		try{
+        try{
 
 
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-			DGGeneralDBService db = DGGeneralDBService.initialise();
+            responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+            DGGeneralDBService db = DGGeneralDBService.initialise();
 
 
 
-			status = db.getTemplateByArtifactType(ctx,  "smm", "smm", siteLocation);
+            status = db.getTemplateByArtifactType(ctx,  "smm", "smm", siteLocation);
 
-			if ( status == QueryStatus.FAILURE )
-				throw new Exception("Unable to Read smm file");
+            if ( status == QueryStatus.FAILURE )
+                throw new Exception("Unable to Read smm file");
 
 
-			status = db.getTemplateByArtifactType(ctx,  "intermediate-ca-chain", "intermediate_ca_chain", siteLocation);
+            status = db.getTemplateByArtifactType(ctx,  "intermediate-ca-chain", "intermediate_ca_chain", siteLocation);
 
-			if ( status == QueryStatus.FAILURE )
-				throw new Exception("Unable to Read intermediate_ca_chain file");
+            if ( status == QueryStatus.FAILURE )
+                throw new Exception("Unable to Read intermediate_ca_chain file");
 
 
 
 
-			status = db.getTemplateByArtifactType(ctx,  "server-certificate-and-key", "server_certificate_and_key", siteLocation);
+            status = db.getTemplateByArtifactType(ctx,  "server-certificate-and-key", "server_certificate_and_key", siteLocation);
 
-			if ( status == QueryStatus.FAILURE )
-				throw new Exception("Unable to Read server_certificate_and_key file");
+            if ( status == QueryStatus.FAILURE )
+                throw new Exception("Unable to Read server_certificate_and_key file");
 
 
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS, AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
-			log.info("saveStyleSheet Successful ");
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS, AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE,e.getMessage());
-			log.error("Failed in saveStyleSheet " + e.getMessage());
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS, AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
+            log.info("saveStyleSheet Successful ");
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS, AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE,e.getMessage());
+            log.error("Failed in saveStyleSheet " + e.getMessage());
 
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
 
 
-	public void saveDeviceConfiguration(Map<String, String> inParams, SvcLogicContext ctx, String dataSource,
-			String fileContent, String deviceConfig) throws SvcLogicException {
-		ctx.setAttribute("data-source", dataSource);
-		ctx.setAttribute("file-content", fileContent);
-		ctx.setAttribute("file-category", "device_configuration");
-		ctx.setAttribute("deviceconfig-file-content", deviceConfig);
+    public void saveDeviceConfiguration(Map<String, String> inParams, SvcLogicContext ctx, String dataSource,
+            String fileContent, String deviceConfig) throws SvcLogicException {
+        ctx.setAttribute("data-source", dataSource);
+        ctx.setAttribute("file-content", fileContent);
+        ctx.setAttribute("file-category", "device_configuration");
+        ctx.setAttribute("deviceconfig-file-content", deviceConfig);
 
-		saveConfigFiles(inParams, ctx);
-	}
+        saveConfigFiles(inParams, ctx);
+    }
 
-	public void saveConfigurationBlock(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
-		ctx.setAttribute("data-source", "Request");
-		ctx.setAttribute("file-content", ctx.getAttribute("tmp.convertconfig.escapeData"));
-		ctx.setAttribute("file-category", "configuration_block");
-		saveConfigFiles(inParams, ctx);
-	}
+    public void saveConfigurationBlock(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+        ctx.setAttribute("data-source", "Request");
+        ctx.setAttribute("file-content", ctx.getAttribute("tmp.convertconfig.escapeData"));
+        ctx.setAttribute("file-category", "configuration_block");
+        saveConfigFiles(inParams, ctx);
+    }
 
-	public void saveConfigurationData(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
-		ctx.setAttribute("data-source", ctx.getAttribute("originator-id"));
-		ctx.setAttribute("file-content", ctx.getAttribute("configuration-params"));
-		ctx.setAttribute("file-category", "config_data");
-		saveConfigFiles(inParams, ctx);
-	}
+    public void saveConfigurationData(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+        ctx.setAttribute("data-source", ctx.getAttribute("originator-id"));
+        ctx.setAttribute("file-content", ctx.getAttribute("configuration-params"));
+        ctx.setAttribute("file-category", "config_data");
+        saveConfigFiles(inParams, ctx);
+    }
 
 
-	public void getConfigFilesByVnfVmNCategory(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+    public void getConfigFilesByVnfVmNCategory(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
 
-		log.info("Received getConfigFilesByVnfVmNCategory call with params : " + inParams);
+        log.info("Received getConfigFilesByVnfVmNCategory call with params : " + inParams);
 
-		String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
-		String fileCategory = inParams.get(AppcDataServiceConstant.INPUT_PARAM_FILE_CATEGORY);
-		String vnfId = inParams.get(AppcDataServiceConstant.INPUT_PARAM_VNF_ID);
-		String vmName = inParams.get(AppcDataServiceConstant.INPUT_PARAM_VM_NAME);
-		try {
+        String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
+        String fileCategory = inParams.get(AppcDataServiceConstant.INPUT_PARAM_FILE_CATEGORY);
+        String vnfId = inParams.get(AppcDataServiceConstant.INPUT_PARAM_VNF_ID);
+        String vmName = inParams.get(AppcDataServiceConstant.INPUT_PARAM_VM_NAME);
+        try {
 
 
-			DGGeneralDBService db = DGGeneralDBService.initialise();
+            DGGeneralDBService db = DGGeneralDBService.initialise();
 
-			QueryStatus status = db.getConfigFilesByVnfVmNCategory(ctx, responsePrefix, fileCategory, vnfId, vmName);
+            QueryStatus status = db.getConfigFilesByVnfVmNCategory(ctx, responsePrefix, fileCategory, vnfId, vmName);
 
-			if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
-				throw new Exception("Unable to get " + ctx.getAttribute("fileCategory") + " from configfiles");
+            if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
+                throw new Exception("Unable to get " + ctx.getAttribute("fileCategory") + " from configfiles");
 
 
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
-			log.info("getConfigFilesByVnfVmNCategory Successful " + ctx.getAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS));
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
-			log.error("Failed in getConfigFilesByVnfVmNCategory " + e.getMessage());
+            responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
+            log.info("getConfigFilesByVnfVmNCategory Successful " + ctx.getAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS));
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
+            log.error("Failed in getConfigFilesByVnfVmNCategory " + e.getMessage());
 
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
 
 
-	public void getDownloadConfigTemplateByVnf(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+    public void getDownloadConfigTemplateByVnf(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
 
-		log.info("Received getDownloadConfigTemplateByVnfNProtocol call with params : " + inParams);
+        log.info("Received getDownloadConfigTemplateByVnfNProtocol call with params : " + inParams);
 
-		String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
-		try {
-			DGGeneralDBService db = DGGeneralDBService.initialise();
+        String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
+        try {
+            DGGeneralDBService db = DGGeneralDBService.initialise();
 
-			QueryStatus status = db.getDownloadConfigTemplateByVnf(ctx, responsePrefix);
+            QueryStatus status = db.getDownloadConfigTemplateByVnf(ctx, responsePrefix);
 
-			if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
-				throw new Exception("Unable to get download config template.");
+            if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
+                throw new Exception("Unable to get download config template.");
 
 
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,	AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
-			log.info("getDownloadConfigTemplateByVnf Successful " + ctx.getAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS));
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
-			log.error("Failed in getDownloadConfigTemplateByVnf " + e.getMessage());
+            responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,    AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
+            log.info("getDownloadConfigTemplateByVnf Successful " + ctx.getAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS));
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
+            log.error("Failed in getDownloadConfigTemplateByVnf " + e.getMessage());
 
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
 
 
-	public void saveConfigTransactionLog(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+    public void saveConfigTransactionLog(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
 
 
 
-		String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
+        String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
 
-		String messageType = inParams.get(AppcDataServiceConstant.INPUT_PARAM_MESSAGE_TYPE);
-		String message = inParams.get(AppcDataServiceConstant.INPUT_PARAM_MESSAGE);
+        String messageType = inParams.get(AppcDataServiceConstant.INPUT_PARAM_MESSAGE_TYPE);
+        String message = inParams.get(AppcDataServiceConstant.INPUT_PARAM_MESSAGE);
 
-		try {
+        try {
 
-			SvcLogicContext logctx = new SvcLogicContext();
+            SvcLogicContext logctx = new SvcLogicContext();
 
-			String escapedMessage = EscapeUtils.escapeSql(message);
+            String escapedMessage = EscapeUtils.escapeSql(message);
 
 
-			logctx.setAttribute("request-id", ctx.getAttribute("request-id"));
-			logctx.setAttribute("log-message-type", messageType);
-			logctx.setAttribute("log-message", escapedMessage);
+            logctx.setAttribute("request-id", ctx.getAttribute("request-id"));
+            logctx.setAttribute("log-message-type", messageType);
+            logctx.setAttribute("log-message", escapedMessage);
 
 
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-			DGGeneralDBService db = DGGeneralDBService.initialise();
-			QueryStatus status = db.saveConfigTransactionLog( logctx, responsePrefix);
+            responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+            DGGeneralDBService db = DGGeneralDBService.initialise();
+            QueryStatus status = db.saveConfigTransactionLog( logctx, responsePrefix);
 
-			logctx.setAttribute("log-message", null);
+            logctx.setAttribute("log-message", null);
 
-			if (status == QueryStatus.FAILURE)
-				throw new Exception("Unable to insert into config_transaction_log");
+            if (status == QueryStatus.FAILURE)
+                throw new Exception("Unable to insert into config_transaction_log");
 
 
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
 
 
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
 
 
 
-	public void getVnfcReference(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+    public void getVnfcReference(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
 
-		log.info("Received getVnfcReference call with params : " + inParams);
+        log.info("Received getVnfcReference call with params : " + inParams);
 
-		String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
+        String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
 
 
-		QueryStatus status = null;
+        QueryStatus status = null;
 
-		try {
+        try {
 
 
-			DGGeneralDBService db = DGGeneralDBService.initialise();
+            DGGeneralDBService db = DGGeneralDBService.initialise();
 
-			if ( !StringUtils.isBlank(ctx.getAttribute("vnfc-type"))) {
-				status = db.getVnfcReferenceByVnfcTypeNAction(ctx, responsePrefix);
+            if ( !StringUtils.isBlank(ctx.getAttribute("vnfc-type"))) {
+                status = db.getVnfcReferenceByVnfcTypeNAction(ctx, responsePrefix);
 
-				if ( status == QueryStatus.FAILURE)
-					throw new Exception("Unable to Read vnfc-reference");
-			}
-			//else if (status == QueryStatus.NOT_FOUND ) {
-			status = db.getVnfcReferenceByVnfTypeNAction(ctx, responsePrefix);
+                if ( status == QueryStatus.FAILURE)
+                    throw new Exception("Unable to Read vnfc-reference");
+            }
+            //else if (status == QueryStatus.NOT_FOUND ) {
+            status = db.getVnfcReferenceByVnfTypeNAction(ctx, responsePrefix);
 
-			if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
-				throw new Exception("Unable to Read vnfc reference");
+            if (status == QueryStatus.NOT_FOUND || status == QueryStatus.FAILURE)
+                throw new Exception("Unable to Read vnfc reference");
 
-			//}
+            //}
 
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
-			log.info("getVnfcReference Successful ");
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
-			log.error("Failed in getVnfcReference " + e.getMessage());
+            responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
+            log.info("getVnfcReference Successful ");
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
+            log.error("Failed in getVnfcReference " + e.getMessage());
 
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
 
-	public void getCapability(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
-		log.info("Received getCapability call with params : " + inParams);
-		String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
-		responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-		String caplevel = inParams.get("caplevel");
-		String findCapability = inParams.get("checkCapability");
+    public void getCapability(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+        log.info("Received getCapability call with params : " + inParams);
+        String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
+        responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+        String caplevel = inParams.get("caplevel");
+        String findCapability = inParams.get("checkCapability");
 
-		try {			
-			DGGeneralDBService db = DGGeneralDBService.initialise();			
-			String cap = db.getCapability(ctx, inParams.get("vnf-type"));
-			ObjectMapper mapper = new ObjectMapper();
-			JsonNode caps = mapper.readTree(cap);
-			log.info("From DB =   " + caps);
-			JsonNode capabilities = caps.get("capabilities");
-			log.info("capabilities =   " + capabilities);
-			if(caplevel !=null && !caplevel.isEmpty()){
-				JsonNode subCapabilities = capabilities.get(caplevel);
-				log.info("subCapabilities =  " +  caplevel + " : " + subCapabilities);
-				if(findCapability !=null && !findCapability.isEmpty()){
-					if(subCapabilities != null && subCapabilities.toString().contains(findCapability))
-						ctx.setAttribute(responsePrefix + "capabilities." + caplevel + "." +  findCapability,
-								"Supported");
-					else
-						ctx.setAttribute(responsePrefix + "capabilities." + caplevel + "." +  findCapability,
-								"Not-Supported");
-				}
-				else
-				{
-					ctx.setAttribute(responsePrefix + "capabilities." + caplevel,
-							subCapabilities.toString());
-				}
-			
-			}
-			else
-				ctx.setAttribute(responsePrefix + "capabilities",
-						capabilities.toString());
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
-			log.info("getCapability Successful ");
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
-			log.error("Failed in getCapability " + e.getMessage());
+        try {            
+            DGGeneralDBService db = DGGeneralDBService.initialise();            
+            String cap = db.getCapability(ctx, inParams.get("vnf-type"));
+            log.info("getCapability::returned from DB::+cap");
+            if (StringUtils.isBlank(cap)) {
+                ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
+                log.info("getCapability Successful - No capability blocks found");
+                return;
+            }
 
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
+            ObjectMapper mapper = new ObjectMapper();
+            JsonNode caps = mapper.readTree(cap);
+            log.info("From DB =   " + caps);
+            JsonNode capabilities = caps.get("capabilities");
+            log.info("capabilities =   " + capabilities);
+            if(caplevel !=null && !caplevel.isEmpty()){
+                JsonNode subCapabilities = capabilities.get(caplevel);
+                log.info("subCapabilities =  " +  caplevel + " : " + subCapabilities);
+                if(findCapability !=null && !findCapability.isEmpty()){
+                    if(subCapabilities != null && subCapabilities.toString().contains(findCapability))
+                        ctx.setAttribute(responsePrefix + "capabilities." + caplevel + "." +  findCapability,
+                                "Supported");
+                    else
+                        ctx.setAttribute(responsePrefix + "capabilities." + caplevel + "." +  findCapability,
+                                "Not-Supported");
+                }
+                else
+                {
+                    ctx.setAttribute(responsePrefix + "capabilities." + caplevel,
+                            subCapabilities.toString());
+                }
+            
+            }
+            else
+                ctx.setAttribute(responsePrefix + "capabilities",
+                        capabilities.toString());
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
+            log.info("getCapability Successful ");
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+                    AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
+            log.error("Failed in getCapability " + e.getMessage());
+
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
 
 
-	/*public void getUploadConfigInfo(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
-
-		log.info("Received getUploadConfigInfo call with params : " + inParams);
-
-		String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
-
-		String uploadConfigId = inParams.get(AppcDataServiceConstant.INPUT_PARAM_UPLOAD_CONFIG_ID);
-		QueryStatus status = null;
-
-		int id = 0;
-		try {
-
-
-			DGGeneralDBService db = DGGeneralDBService.initialise();
-
-			if ( uploadConfigId != null )
-				id = Integer.parseInt(uploadConfigId);
-
-			status = db.getUploadConfigInfo(ctx, responsePrefix,id);
-
-			if ( status == QueryStatus.FAILURE || status == QueryStatus.NOT_FOUND)
-				throw new Exception("Unable to Read upload-config");
-
-
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_SUCCESS);
-			log.info("getUploadConfigInfo Successful ");
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-					AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
-			log.error("Failed in getUploadConfigInfo " + e.getMessage());
-
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
-	 */
-
 }