Bug Fixes in DG's chef ,Ansible and Encry tool

Issue-ID: APPC-320
Change-Id: I7ba57aa0018fa415987dee98d8d4d8a21453dbd0
Signed-off-by: kusuma kumari M <km583p@att.com>

4 files changed, 200 insertions, 200 deletions

diff --git a/appc-config/appc-config-params/provider/src/main/java/org/openecomp/sdnc/config/params/parser/PropertyDefinitionNode.java b/appc-config/appc-config-params/provider/src/main/java/org/openecomp/sdnc/config/params/parser/PropertyDefinitionNode.java
index 8948e02e1..4916c46a8 100644
--- a/appc-config/appc-config-params/provider/src/main/java/org/openecomp/sdnc/config/params/parser/PropertyDefinitionNode.java
+++ b/appc-config/appc-config-params/provider/src/main/java/org/openecomp/sdnc/config/params/parser/PropertyDefinitionNode.java
@@ -48,202 +48,202 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 public class PropertyDefinitionNode implements SvcLogicJavaPlugin{
 
 
-	private static final  EELFLogger log = EELFManager.getInstance().getLogger(PropertyDefinitionNode.class);
-
-	public void processMissingParamKeys(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
-		log.info("Received processParamKeys call with params : " + inParams);
-		String responsePrefix = inParams.get(ParamsHandlerConstant.INPUT_PARAM_RESPONSE_PRIFIX);		
-		try{
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-
-			String requestParamJson = inParams.get(ParamsHandlerConstant.INPUT_PARAM_JSON_DATA);	
-			String pdContent = inParams.get(ParamsHandlerConstant.INPUT_PARAM_PD_CONTENT);	
-
-			if(StringUtils.isBlank(pdContent)){
-				throw new Exception("Request Param (pdContent) is Missing ..");
-			}
-
-			if(StringUtils.isBlank(requestParamJson)){
-				throw new Exception("Request Param (jsonData) is Missing ..");
-			}
-
-			PropertyDefinition propertyDefinition = parsePDContent(pdContent);
-			if(propertyDefinition != null){
-				requestParamJson = mergeMissingRequestParamFromPD(propertyDefinition, requestParamJson);
-				ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_CONFIGURATION_PARAMETER, requestParamJson);
-			}
-			
-			ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_STATUS, ParamsHandlerConstant.OUTPUT_STATUS_SUCCESS);
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_STATUS, ParamsHandlerConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_ERROR_MESSAGE,e.getMessage());
-			log.error("Failed in merging data to template " + e.getMessage());
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
-
-	public void processExternalSystemParamKeys(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
-		log.info("Received processExternalSystemParamKeys call with params : " + inParams);
-		String responsePrefix = inParams.get(ParamsHandlerConstant.INPUT_PARAM_RESPONSE_PRIFIX);		
-		try{
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-
-			String requestParamJson = inParams.get(ParamsHandlerConstant.INPUT_PARAM_JSON_DATA);	
-			String pdContent = inParams.get(ParamsHandlerConstant.INPUT_PARAM_PD_CONTENT);	
-			String systemName = inParams.get(ParamsHandlerConstant.INPUT_PARAM_SYSTEM_NAME);	
-
-
-			if(StringUtils.isBlank(pdContent)){
-				throw new Exception("Request Param (pdContent) is Missing ..");
-			}
-
-			if(StringUtils.isBlank(requestParamJson)){
-				throw new Exception("Request Param (jsonData) is Missing ..");
-			}
-
-			if(StringUtils.isBlank(systemName)){
-				throw new Exception("Request Param (systemName) is Missing ..");
-			}
-
-			PropertyDefinition propertyDefinition = parsePDContent(pdContent);
-			if(propertyDefinition != null){
-				getSystemRequestParamInfoFromPD(propertyDefinition, requestParamJson, systemName, ctx);
-			}
-
-			ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_STATUS, ParamsHandlerConstant.OUTPUT_STATUS_SUCCESS);
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_STATUS, ParamsHandlerConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_ERROR_MESSAGE,e.getMessage());
-			log.error("Failed in merging data to template " + e.getMessage());
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
-
-
-	public void mergeJsonData(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
-		log.info("Received mergeJsonData call with params : " + inParams);
-		String responsePrefix = inParams.get(ParamsHandlerConstant.INPUT_PARAM_RESPONSE_PRIFIX);		
-		try{
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-
-			String requestParamJson = inParams.get(ParamsHandlerConstant.INPUT_PARAM_JSON_DATA);	
-			String mergeJsonData = inParams.get(ParamsHandlerConstant.INPUT_PARAM_MERGE__JSON_DATA);			
-
-			if(StringUtils.isBlank(requestParamJson)){
-				throw new Exception("Request Param (jsonData) is Missing ..");
-			}
-
-			if(StringUtils.isBlank(mergeJsonData)){
-				throw new Exception("Request Param (mergeJsonData) is Missing ..");
-			}
-
-			requestParamJson = mergeJson(requestParamJson, mergeJsonData);
-			ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_CONFIGURATION_PARAMETER, requestParamJson);
-			ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_STATUS, ParamsHandlerConstant.OUTPUT_STATUS_SUCCESS);
-		} catch (Exception e) {
-			ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_STATUS, ParamsHandlerConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_ERROR_MESSAGE,e.getMessage());
-			log.error("Failed in merging data to template " + e.getMessage());
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
-
-
-	/* */
-
-	private PropertyDefinition parsePDContent(String pdContent) throws JsonParseException, JsonMappingException, IOException{
-		PropertyDefinition propertyDefinition = null;
-		if(StringUtils.isNotBlank(pdContent)){
-			ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
-			propertyDefinition = mapper.readValue(pdContent, PropertyDefinition.class);
-		}
-		return propertyDefinition;
-	}
-
-
-	private String mergeMissingRequestParamFromPD(PropertyDefinition propertyDefinition, String requestParamJson) throws Exception{
-
-		if(propertyDefinition == null){
-			throw new Exception("PropertyDefinition is Missing ..");
-		}
-
-		if(StringUtils.isBlank(requestParamJson)){
-			throw new Exception("Request Param is Missing ..");
-		}
-
-		ObjectMapper mapper = new ObjectMapper();
-		Map<String, String> requestParamMap = mapper.readValue(requestParamJson, HashMap.class);
-		if(requestParamMap != null){
-			List<Parameter> parameters = propertyDefinition.getParameters();
-			for (Parameter parameter : parameters) {
-				if(parameter != null){
-					
-					log.info("Checking Key " + parameter.getName() + ":: Source :" +parameter.getSource());	
-					// Add Only non external system keys,If it is not present in request Params
-					if( !requestParamMap.containsKey(parameter.getName()) 
-							&& StringUtils.isBlank(parameter.getSource())
-							){
-						log.info("Adding New Key " + parameter.getName());	
-						requestParamMap.put(parameter.getName(), parameter.getDefaultValue());
-					}					
-				}				
-			}			
-			requestParamJson = mapper.writeValueAsString(requestParamMap);
-			log.info("Processed Request Param " + requestParamJson);	
-		}
-
-		return requestParamJson;
-	}
-
-	private void getSystemRequestParamInfoFromPD(PropertyDefinition propertyDefinition, String requestParamJson, String systemName, SvcLogicContext ctx) throws Exception{
-
-		if(propertyDefinition == null){
-			throw new Exception("PropertyDefinition is Missing ..");
-		}
-
-		if(StringUtils.isBlank(requestParamJson)){
-			throw new Exception("Request Param is Missing ..");
-		}
-
-		ObjectMapper mapper = new ObjectMapper();
-		Map<String, String> requestParamMap = mapper.readValue(requestParamJson, HashMap.class);
-		if(requestParamMap != null){
-			List<Parameter> parameters = propertyDefinition.getParameters();
-
-			List<String> externalSystemKeys = new ArrayList<String>();
-			for (Parameter parameter : parameters) {
-				if(parameter != null){
-					if( !requestParamMap.containsKey(parameter.getName()) && StringUtils.isNotBlank(parameter.getSource()) ){
-						log.info("Adding New System Key " + parameter.getName() + ":"+ mapper.writeValueAsString(parameter));
-						externalSystemKeys.add(parameter.getName());
-						ctx.setAttribute(systemName +"."+parameter.getName(), mapper.writeValueAsString(parameter));
-					}					
-				}				
-			}	
-
-			String systemKeys = systemName+".keys";
-			ctx.setAttribute(systemKeys, mapper.writeValueAsString(externalSystemKeys));
-		}
-	}
-
-
-	private String mergeJson(String requestParamJson, String systemParamJson) throws Exception {
-		ObjectMapper mapper = new ObjectMapper();
-		Map<String, String> requestParamMap = mapper.readValue(requestParamJson, HashMap.class);
-		if(requestParamMap != null){
-			Map<String, String> systemParamMap = mapper.readValue(systemParamJson, HashMap.class);
-			if(systemParamMap != null){
-				for (String systemParamKey : systemParamMap.keySet()) {
-					log.trace("Megging System Key Values " + systemParamKey);	
-					requestParamMap.put( systemParamKey , systemParamMap.get(systemParamKey));		
-				}	
-			}
-			requestParamJson = mapper.writeValueAsString(requestParamMap);
-			log.info("Processed Request Param " + requestParamJson);	
-		}
-
-		return requestParamJson;
-	}
+    private static final  EELFLogger log = EELFManager.getInstance().getLogger(PropertyDefinitionNode.class);
+
+    public void processMissingParamKeys(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+        log.info("Received processParamKeys call with params : " + inParams);
+        String responsePrefix = inParams.get(ParamsHandlerConstant.INPUT_PARAM_RESPONSE_PRIFIX);        
+        try{
+            responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+
+            String requestParamJson = inParams.get(ParamsHandlerConstant.INPUT_PARAM_JSON_DATA);    
+            String pdContent = inParams.get(ParamsHandlerConstant.INPUT_PARAM_PD_CONTENT);    
+
+            if(StringUtils.isBlank(pdContent)){
+                throw new Exception("Request Param (pdContent) is Missing ..");
+            }
+
+            if(StringUtils.isBlank(requestParamJson)){
+                throw new Exception("Request Param (jsonData) is Missing ..");
+            }
+
+            PropertyDefinition propertyDefinition = parsePDContent(pdContent);
+            if(propertyDefinition != null){
+                requestParamJson = mergeMissingRequestParamFromPD(propertyDefinition, requestParamJson);
+                ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_CONFIGURATION_PARAMETER, requestParamJson);
+            }
+            
+            ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_STATUS, ParamsHandlerConstant.OUTPUT_STATUS_SUCCESS);
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_STATUS, ParamsHandlerConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_ERROR_MESSAGE,e.getMessage());
+            log.error("Failed in merging data to template " + e.getMessage());
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
+
+    public void processExternalSystemParamKeys(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+        log.info("Received processExternalSystemParamKeys call with params : " + inParams);
+        String responsePrefix = inParams.get(ParamsHandlerConstant.INPUT_PARAM_RESPONSE_PRIFIX);        
+        try{
+            responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+
+            String requestParamJson = inParams.get(ParamsHandlerConstant.INPUT_PARAM_JSON_DATA);    
+            String pdContent = inParams.get(ParamsHandlerConstant.INPUT_PARAM_PD_CONTENT);    
+            String systemName = inParams.get(ParamsHandlerConstant.INPUT_PARAM_SYSTEM_NAME);    
+
+
+            if(StringUtils.isBlank(pdContent)){
+                throw new Exception("Request Param (pdContent) is Missing ..");
+            }
+
+            if(StringUtils.isBlank(requestParamJson)){
+                throw new Exception("Request Param (jsonData) is Missing ..");
+            }
+
+            if(StringUtils.isBlank(systemName)){
+                throw new Exception("Request Param (systemName) is Missing ..");
+            }
+
+            PropertyDefinition propertyDefinition = parsePDContent(pdContent);
+            if(propertyDefinition != null){
+                getSystemRequestParamInfoFromPD(propertyDefinition, requestParamJson, systemName, ctx);
+            }
+
+            ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_STATUS, ParamsHandlerConstant.OUTPUT_STATUS_SUCCESS);
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_STATUS, ParamsHandlerConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_ERROR_MESSAGE,e.getMessage());
+            log.error("Failed in merging data to template " + e.getMessage());
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
+
+
+    public void mergeJsonData(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException {
+        log.info("Received mergeJsonData call with params : " + inParams);
+        String responsePrefix = inParams.get(ParamsHandlerConstant.INPUT_PARAM_RESPONSE_PRIFIX);        
+        try{
+            responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+
+            String requestParamJson = inParams.get(ParamsHandlerConstant.INPUT_PARAM_JSON_DATA);    
+            String mergeJsonData = inParams.get(ParamsHandlerConstant.INPUT_PARAM_MERGE__JSON_DATA);            
+
+            if(StringUtils.isBlank(requestParamJson)){
+                throw new Exception("Request Param (jsonData) is Missing ..");
+            }
+
+            if(StringUtils.isBlank(mergeJsonData)){
+                throw new Exception("Request Param (mergeJsonData) is Missing ..");
+            }
+
+            requestParamJson = mergeJson(requestParamJson, mergeJsonData);
+            ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_CONFIGURATION_PARAMETER, requestParamJson);
+            ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_STATUS, ParamsHandlerConstant.OUTPUT_STATUS_SUCCESS);
+        } catch (Exception e) {
+            ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_STATUS, ParamsHandlerConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + ParamsHandlerConstant.OUTPUT_PARAM_ERROR_MESSAGE,e.getMessage());
+            log.error("Failed in merging data to template " + e.getMessage());
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
+
+
+    /* */
+
+    private PropertyDefinition parsePDContent(String pdContent) throws JsonParseException, JsonMappingException, IOException{
+        PropertyDefinition propertyDefinition = null;
+        if(StringUtils.isNotBlank(pdContent)){
+            ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
+            propertyDefinition = mapper.readValue(pdContent, PropertyDefinition.class);
+        }
+        return propertyDefinition;
+    }
+
+
+    private String mergeMissingRequestParamFromPD(PropertyDefinition propertyDefinition, String requestParamJson) throws Exception{
+
+        if(propertyDefinition == null){
+            throw new Exception("PropertyDefinition is Missing ..");
+        }
+
+        if(StringUtils.isBlank(requestParamJson)){
+            throw new Exception("Request Param is Missing ..");
+        }
+
+        ObjectMapper mapper = new ObjectMapper();
+        Map<String, String> requestParamMap = mapper.readValue(requestParamJson, HashMap.class);
+        if(requestParamMap != null){
+            List<Parameter> parameters = propertyDefinition.getParameters();
+            for (Parameter parameter : parameters) {
+                if(parameter != null){
+                    
+                    log.info("Checking Key " + parameter.getName() + ":: Source :" +parameter.getSource());    
+                    // Add Only non external system keys,If it is not present in request Params
+                    if( !requestParamMap.containsKey(parameter.getName()) 
+                            && StringUtils.isBlank(parameter.getSource())
+                            ){
+                        log.info("Adding New Key " + parameter.getName());    
+                        requestParamMap.put(parameter.getName(), parameter.getDefaultValue());
+                    }                    
+                }                
+            }            
+            requestParamJson = mapper.writeValueAsString(requestParamMap);
+            log.info("Processed Request Param " + requestParamJson);    
+        }
+
+        return requestParamJson;
+    }
+
+    private void getSystemRequestParamInfoFromPD(PropertyDefinition propertyDefinition, String requestParamJson, String systemName, SvcLogicContext ctx) throws Exception{
+
+        if(propertyDefinition == null){
+            throw new Exception("PropertyDefinition is Missing ..");
+        }
+
+        if(StringUtils.isBlank(requestParamJson)){
+            throw new Exception("Request Param is Missing ..");
+        }
+
+        ObjectMapper mapper = new ObjectMapper();
+        Map<String, String> requestParamMap = mapper.readValue(requestParamJson, HashMap.class);
+        if(requestParamMap != null){
+            List<Parameter> parameters = propertyDefinition.getParameters();
+
+            List<String> externalSystemKeys = new ArrayList<String>();
+            for (Parameter parameter : parameters) {
+                if(parameter != null){
+                    if( !requestParamMap.containsKey(parameter.getName()) && StringUtils.isNotBlank(parameter.getSource())  && !StringUtils.equalsIgnoreCase(parameter.getSource(),"Manual") ){
+                        log.info("Adding New System Key " + parameter.getName() + ":"+ mapper.writeValueAsString(parameter));
+                        externalSystemKeys.add(parameter.getName());
+                        ctx.setAttribute(systemName +"."+parameter.getName(), mapper.writeValueAsString(parameter));
+                    }                    
+                }                
+            }    
+
+            String systemKeys = systemName+".keys";
+            ctx.setAttribute(systemKeys, mapper.writeValueAsString(externalSystemKeys));
+        }
+    }
+
+
+    private String mergeJson(String requestParamJson, String systemParamJson) throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        Map<String, String> requestParamMap = mapper.readValue(requestParamJson, HashMap.class);
+        if(requestParamMap != null){
+            Map<String, String> systemParamMap = mapper.readValue(systemParamJson, HashMap.class);
+            if(systemParamMap != null){
+                for (String systemParamKey : systemParamMap.keySet()) {
+                    log.trace("Megging System Key Values " + systemParamKey);    
+                    requestParamMap.put( systemParamKey , systemParamMap.get(systemParamKey));        
+                }    
+            }
+            requestParamJson = mapper.writeValueAsString(requestParamMap);
+            log.info("Processed Request Param " + requestParamJson);    
+        }
+
+        return requestParamJson;
+    }
 
 
 
diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/WrapperEncryptionTool.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/WrapperEncryptionTool.java
index cf596e99e..37e362511 100644
--- a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/WrapperEncryptionTool.java
+++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/WrapperEncryptionTool.java
@@ -74,9 +74,9 @@ public class WrapperEncryptionTool {
         String setClause = " password = ? ";
         String getselectData = " * ";
         DBResourceManager dbResourceManager = null;
-        try (CachedRowSet data = DbServiceUtil.getData(Constants.DEVICE_AUTHENTICATION, argList,
-                Constants.SCHEMA_SDNCTL, getselectData, clause);) {
+        try {
             dbResourceManager = DbServiceUtil.initDbLibService();
+            CachedRowSet data = DbServiceUtil.getData(Constants.DEVICE_AUTHENTICATION, argList,Constants.SCHEMA_SDNCTL, getselectData, clause);
 
             while (data.next()) {
                 rowCount++;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_AnsibleDG.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_AnsibleDG.json
index a5255c671..b83ae7488 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_AnsibleDG.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_AnsibleDG.json
@@ -1 +1 @@
-[{"id":"f9d2eb85.dfd418","type":"dgstart","name":"DGSTART","outputs":1,"x":168.66665649414062,"y":148.66665649414062,"z":"8d979a23.6d826","wires":[["5d68bca4.0159fc"]]},{"id":"5d68bca4.0159fc","type":"service-logic","name":"APPC 4.0.0","module":"APPC","version":"4.0.0","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='4.0.0'>","outputs":1,"x":373.3541564941406,"y":137.72915649414062,"z":"8d979a23.6d826","wires":[["a55d1227.45f05"]]},{"id":"a55d1227.45f05","type":"method","name":"method Generic_AnsibleDG","xml":"<method rpc='Generic_AnsibleDG' mode='sync'>\n","comments":"","outputs":1,"x":624.9166564941406,"y":137.72915649414062,"z":"8d979a23.6d826","wires":[["8b9ca10a.ec99c8"]]},{"id":"b99a5f9d.0955d","type":"call","name":"call: ansible-adapter-1.0","xml":"<call module=\"APPC\" rpc=\"ansible-adapter-1.0\" mode=\"sync\">","comments":"","outputs":1,"x":380.5211181640625,"y":862.491455078125,"z":"8d979a23.6d826","wires":[["27eb5717.7f1578","97eba8a5.6f26e8"]]},{"id":"2b1c8824.a9a448","type":"execute","name":"execute getDecrytedpassword","xml":" <execute plugin='org.openecomp.appc.encryptiontool.wrapper.EncryptionToolDGWrapper' method = 'getProperty'>\n   <parameter name='propertyName' value=\"`$tmp.prefix+'.'+$password`\"/>\n  <parameter name='responsePrefix' value =\"prefix\"/>","comments":"","outputs":1,"x":655.687255859375,"y":493.1387023925781,"z":"8d979a23.6d826","wires":[["f54d4be5.982b6","3ec9dca0.23308c"]]},{"id":"3d4634cd.056774","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"Unable to decrypt the password.\" />\n","comments":"","x":1319.7084197998047,"y":705.6582336425781,"z":"8d979a23.6d826","wires":[]},{"id":"1ebdbd5c.8a46e3","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1150.9790725708008,"y":705.8374347686768,"z":"8d979a23.6d826","wires":[["3d4634cd.056774"]]},{"id":"3ec9dca0.23308c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":952.9166259765625,"y":703.458251953125,"z":"8d979a23.6d826","wires":[["1ebdbd5c.8a46e3"]]},{"id":"f54d4be5.982b6","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":933.9293212890625,"y":637.3124389648438,"z":"8d979a23.6d826","wires":[["1ebdbd5c.8a46e3"]]},{"id":"859dc462.b013c","type":"execute","name":"execute Convert payload to DG Context ","xml":"<execute plugin=\"org.openecomp.sdnc.config.generator.convert.ConvertNode\" method=\"convertJson2DGContext\">\n<parameter name=\"jsonData\" value=\"`$tmp.merge.mergedData`\" />\n<parameter name=\"isEscaped\" value=\"Y\" />\n<parameter name=\"blockKeys\" value=\"EnvParameters,PlaybookName,Timeout,vnf-host-ip-address,NodeList\" />\n<parameter name=\"responsePrefix\" value=\"tmp.convertnode\" />","comments":"","outputs":1,"x":733.5034103393555,"y":256.72020721435547,"z":"8d979a23.6d826","wires":[["24835a8e.df2746","33e209ac.94f7b6"]]},{"id":"a2f9c928.6ad4f8","type":"set","name":"set Payload params ","xml":"<set>\n<parameter name='PlaybookName' value='`$PlaybookName`' />\n<parameter name='NodeList' value='`$NodeList`'/>\n<parameter name='vnf_id' value='`$vnf-id`' />\n<parameter name='AgentUrl' value='`$vnf-host-ip-address`'/>\n <parameter name='User' value='`$propertyName`'/>\n  <parameter name='Password' value='`$password`'/>\n  <parameter name='EnvParameters' value='`$EnvParameters`'/>\n  <parameter name='Timeout' value='`$Timeout`'/>\n\n\n\n","comments":"","x":449.31097412109375,"y":765.8724365234375,"z":"8d979a23.6d826","wires":[]},{"id":"33e209ac.94f7b6","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":952.7416076660156,"y":452.375,"z":"8d979a23.6d826","wires":[["216294d5.a7fb94"]]},{"id":"24835a8e.df2746","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":949.574951171875,"y":539.6583318710327,"z":"8d979a23.6d826","wires":[["b7ce4425.f48f58"]]},{"id":"216294d5.a7fb94","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1119.4083557128906,"y":455.5416564941406,"z":"8d979a23.6d826","wires":[["9067e852.5bfff8"]]},{"id":"b7ce4425.f48f58","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1125.7415237426758,"y":519.0249500274658,"z":"8d979a23.6d826","wires":[["4a3e995a.4273c"]]},{"id":"4a3e995a.4273c","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Unable to process convert payload to context.\"/>\n\t\n","comments":"","x":1328.9415168762207,"y":522.2083377838135,"z":"8d979a23.6d826","wires":[]},{"id":"8b9ca10a.ec99c8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":421.0082550048828,"y":250.30825805664062,"z":"8d979a23.6d826","wires":[["859dc462.b013c","2b1c8824.a9a448","b99a5f9d.0955d","a2f9c928.6ad4f8","6192438.689873c","1ccfd19d.b184de","e1684642.0ecd8","5e29f749.55b95","dd3c902f.08a6a","db0f7de5.7f4038"]]},{"id":"9067e852.5bfff8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.convertnode.error-message`\"/>\n\t\n\t","comments":"","x":1347.9748840332031,"y":457.9416198730469,"z":"8d979a23.6d826","wires":[]},{"id":"a262ae5f.96344","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t","comments":"","x":1149.5749816894531,"y":894.4582824707031,"z":"8d979a23.6d826","wires":[]},{"id":"27eb5717.7f1578","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":887.6582336425781,"y":838.8916931152344,"z":"8d979a23.6d826","wires":[["a262ae5f.96344"]]},{"id":"97eba8a5.6f26e8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":863.8583068847656,"y":921.4416198730469,"z":"8d979a23.6d826","wires":[["a262ae5f.96344"]]},{"id":"6192438.689873c","type":"set","name":"set tmp.prefix","xml":"<set>\n<parameter name=\"tmp.prefix\" value=\"`$vnf-type + '.' + $input.action`\"/>\n<parameter name=\"password\" value=\"password\"/>\n<parameter name=\"user\" value=\"user\"/>\n\n","comments":"","x":727.5115356445312,"y":345.95501708984375,"z":"8d979a23.6d826","wires":[]},{"id":"1ccfd19d.b184de","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`$input.action`\"/>\n<parameter name=\"field3\" value =\"`$tmp.merge.mergedData`\"/>\n<parameter name=\"field4\" value =\"`$tmp.merge`\"/>","comments":"","outputs":1,"x":821.6116638183594,"y":183.46163940429688,"z":"8d979a23.6d826","wires":[[]]},{"id":"e1684642.0ecd8","type":"execute","name":"execute getUser","xml":" <execute plugin='org.openecomp.appc.encryptiontool.wrapper.EncryptionToolDGWrapper' method = 'getProperty'>\n  <parameter name='responsePrefix' value =\"prefix\"/>\n  <parameter name='propertyName' value=\"`$tmp.prefix+'.'+$user`\"/>","comments":"","outputs":1,"x":550.3334350585938,"y":631.3333740234375,"z":"8d979a23.6d826","wires":[[]]},{"id":"5e29f749.55b95","type":"set","name":"set password","xml":"<set>\n<parameter name=\"tmp.prefix\" value=\"`$vnf-type + '.' + $input.action`\"/>\n<parameter name=\"password\" value=\"$propertyName\"/>\n\n\n","comments":"","x":638.66650390625,"y":570.3333129882812,"z":"8d979a23.6d826","wires":[]},{"id":"db0f7de5.7f4038","type":"set","name":"set user","xml":"<set>\n<parameter name=\"user\" value=\"$propertyName\"/>\n\n\n","comments":"","x":527,"y":690.6666259765625,"z":"8d979a23.6d826","wires":[]},{"id":"dd3c902f.08a6a","type":"set","name":"set Payload params ","xml":"<set>\n<parameter name='PlaybookName' value='`$block_PlaybookName`' />\n<parameter name='NodeList' value ='`$block_NodeList`'/>\n<parameter name='vnf_id' value='`$vnf-id`' />\n<parameter name='AgentUrl' value='`$vnf-host-ip-address`'/>\n<parameter name='EnvParameters' value='`$block_EnvParameters`'/>\n<parameter name='Timeout' value='`$block_Timeout`'/>\n\n\n\n","comments":"","x":735.3333129882812,"y":303.3333435058594,"z":"8d979a23.6d826","wires":[]}]
+[{"id":"11dc623d.901f0e","type":"dgstart","name":"DGSTART","outputs":1,"x":141.33331298828125,"y":68.86665344238281,"z":"3a255785.10924","wires":[["1bdcf000.f7bf48"]]},{"id":"1bdcf000.f7bf48","type":"service-logic","name":"APPC 4.0.0","module":"APPC","version":"4.0.0","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='4.0.0'>","outputs":1,"x":267.6875,"y":46.26249694824219,"z":"3a255785.10924","wires":[["e8ebe4d2.47629"]]},{"id":"e8ebe4d2.47629","type":"method","name":"method Generic_AnsibleDG","xml":"<method rpc='Generic_AnsibleDG' mode='sync'>\n","comments":"","outputs":1,"x":519.25,"y":46.26249694824219,"z":"3a255785.10924","wires":[["b9fa92db.ae801"]]},{"id":"cdba2626.e4f0e","type":"call","name":"call: ansible-adapter-1.0","xml":"<call module=\"APPC\" rpc=\"ansible-adapter-1.0\" mode=\"sync\">","comments":"","outputs":1,"x":274.8544616699219,"y":771.0247955322266,"z":"3a255785.10924","wires":[["246043c5.f9790c","1f2fd774.7f32f1","5c1a8e53.1df84"]]},{"id":"5c57c6d8.9af2d","type":"execute","name":"execute getDecrytedpassword","xml":" <execute plugin=\"org.openecomp.appc.encryptiontool.wrapper.EncryptionToolDGWrapper\" method =\"getProperty\">\n <parameter name=\"responsePrefix\" value =\"prefix\"/>\n   <parameter name=\"propertyName\" value=\"`$tmp.prefix+'.'+$password`\"/>\n   <parameter name =\"password\" value=\"`$propertyName`\"/>\n  ","comments":"","outputs":1,"x":550.0205993652344,"y":401.6720428466797,"z":"3a255785.10924","wires":[["b214d4c8.55cc38","96a663b3.997758"]]},{"id":"b2bbc50f.ea54b8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"Unable to decrypt the password.\" />\n","comments":"","x":1214.041763305664,"y":614.1915740966797,"z":"3a255785.10924","wires":[]},{"id":"c1a9c1c9.fed838","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1045.3124160766602,"y":614.3707752227783,"z":"3a255785.10924","wires":[["b2bbc50f.ea54b8"]]},{"id":"96a663b3.997758","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":847.2499694824219,"y":611.9915924072266,"z":"3a255785.10924","wires":[["c1a9c1c9.fed838"]]},{"id":"b214d4c8.55cc38","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":828.2626647949219,"y":545.8457794189453,"z":"3a255785.10924","wires":[["c1a9c1c9.fed838"]]},{"id":"c09f3d41.277fb8","type":"execute","name":"execute Convert payload to DG Context ","xml":"<execute plugin=\"org.openecomp.sdnc.config.generator.convert.ConvertNode\" method=\"convertJson2DGContext\">\n<parameter name=\"jsonData\" value=\"`$tmp.merge.mergedData`\" />\n<parameter name=\"isEscaped\" value=\"Y\" />\n<parameter name=\"blockKeys\" value=\"EnvParameters,PlaybookName,Timeout,vnf-host-ip-address,NodeList\" />\n<parameter name=\"responsePrefix\" value=\"tmp.convertnode\" />","comments":"","outputs":1,"x":627.8367538452148,"y":165.25354766845703,"z":"3a255785.10924","wires":[["99d1509f.18583","9e943dc.ae89e4"]]},{"id":"2a5268ba.0741d","type":"set","name":"set Payload params ","xml":"<set>\n<parameter name='PlaybookName' value='`$PlaybookName`' />\n<parameter name='NodeList' value='`$NodeList`'/>\n<parameter name='vnf_id' value='`$vnf-id`' />\n<parameter name='AgentUrl' value='`$vnf-host-ip-address`'/>\n <parameter name='User' value='`$propertyName`'/>\n  <parameter name='Password' value='`$password`'/>\n  <parameter name='EnvParameters' value='`$EnvParameters`'/>\n  <parameter name='Timeout' value='`$Timeout`'/>\n\n\n\n","comments":"","x":343.6443176269531,"y":674.4057769775391,"z":"3a255785.10924","wires":[]},{"id":"9e943dc.ae89e4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":847.074951171875,"y":360.90834045410156,"z":"3a255785.10924","wires":[["7fea6668.af3de8"]]},{"id":"99d1509f.18583","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":843.9082946777344,"y":448.1916723251343,"z":"3a255785.10924","wires":[["93cf0cd6.d0a4c8"]]},{"id":"7fea6668.af3de8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1013.74169921875,"y":364.0749969482422,"z":"3a255785.10924","wires":[["c8734633.74013"]]},{"id":"93cf0cd6.d0a4c8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1020.0748672485352,"y":427.5582904815674,"z":"3a255785.10924","wires":[["e76811f1.a807c8"]]},{"id":"e76811f1.a807c8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Unable to process convert payload to context.\"/>\n\t\n","comments":"","x":1223.27486038208,"y":430.74167823791504,"z":"3a255785.10924","wires":[]},{"id":"b9fa92db.ae801","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":315.3415985107422,"y":158.8415985107422,"z":"3a255785.10924","wires":[["c09f3d41.277fb8","5c57c6d8.9af2d","cdba2626.e4f0e","2a5268ba.0741d","16bf6e4e.95f3ea","4c298c19.5899dc","32880258.268d3e","d4dec4aa.f06728","c671c44b.c97d8","e3f37288.1de128","2c0d811a.49430e"]]},{"id":"c8734633.74013","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.convertnode.error-message`\"/>\n\t\n\t","comments":"","x":1242.3082275390625,"y":366.47496032714844,"z":"3a255785.10924","wires":[]},{"id":"42dbe00.4a7a1a","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`'/>","comments":"","x":1068.1939392089844,"y":765.8487701416016,"z":"3a255785.10924","wires":[]},{"id":"246043c5.f9790c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":781.9915771484375,"y":747.4250335693359,"z":"3a255785.10924","wires":[["42dbe00.4a7a1a"]]},{"id":"1f2fd774.7f32f1","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":758.191650390625,"y":829.9749603271484,"z":"3a255785.10924","wires":[["b0cf78a8.2fb77"]]},{"id":"16bf6e4e.95f3ea","type":"set","name":"set tmp.prefix","xml":"<set>\n<parameter name=\"tmp.prefix\" value=\"`$vnf-type + '.' + $input.action`\"/>\n<parameter name=\"password\" value=\"password\"/>\n<parameter name=\"user\" value=\"user\"/>\n\n","comments":"","x":587.5591125488281,"y":304.48838806152344,"z":"3a255785.10924","wires":[]},{"id":"4c298c19.5899dc","type":"execute","name":"execute getUser","xml":" <execute plugin='org.openecomp.appc.encryptiontool.wrapper.EncryptionToolDGWrapper' method = 'getProperty'>\n  <parameter name='responsePrefix' value =\"prefix\"/>\n  <parameter name='propertyName' value=\"`$tmp.prefix+'.'+$user`\"/>","comments":"","outputs":1,"x":444.6667785644531,"y":539.8667144775391,"z":"3a255785.10924","wires":[[]]},{"id":"e3f37288.1de128","type":"set","name":"set password","xml":"<set>\n<parameter name=\"tmp.prefix\" value=\"`$vnf-type + '.' + $input.action`\"/>\n<parameter name=\"password\" value=\"`$propertyName`\"/>\n\n\n","comments":"","x":542.9998168945312,"y":455.5333251953125,"z":"3a255785.10924","wires":[]},{"id":"d4dec4aa.f06728","type":"set","name":"set user","xml":"<set>\n<parameter name=\"user\" value=\"$propertyName\"/>\n\n\n","comments":"","x":421.33331298828125,"y":599.2000122070312,"z":"3a255785.10924","wires":[]},{"id":"32880258.268d3e","type":"set","name":"set Payload params ","xml":"<set>\n<parameter name='PlaybookName' value='`$block_PlaybookName`' />\n<parameter name='NodeList' value ='`$block_NodeList`'/>\n<parameter name='vnf_id' value='`$vnf-id`' />\n<parameter name='AgentUrl' value='`$vnf-host-ip-address`'/>\n<parameter name='EnvParameters' value='`$block_EnvParameters`'/>\n<parameter name='Timeout' value='`$block_Timeout`'/>\n\n\n\n","comments":"","x":629.6666564941406,"y":211.86668395996094,"z":"3a255785.10924","wires":[]},{"id":"b0cf78a8.2fb77","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value='ansible-adapter-1.0.0 Dg not found'/>","comments":"","x":1012.8333435058594,"y":873.8905181884766,"z":"3a255785.10924","wires":[]},{"id":"bbc9b301.642c68","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='400' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`'/>\n","comments":"","x":797.1191101074219,"y":971.0333404541016,"z":"3a255785.10924","wires":[]},{"id":"5c1a8e53.1df84","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":555.6905212402344,"y":911.8429107666016,"z":"3a255785.10924","wires":[["bbc9b301.642c68"]]},{"id":"c671c44b.c97d8","type":"record","name":"record","xml":"<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name='field2' value='`$propertyName`'/>\n  <parameter name='field3' value='`$password`'/>","comments":"","outputs":1,"x":476.3999938964844,"y":638,"z":"3a255785.10924","wires":[[]]},{"id":"2c0d811a.49430e","type":"record","name":"record","xml":"<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log1\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name='field2' value='`$propertyName`'/>\n  <parameter name='field3' value='`$password`'/>","comments":"","outputs":1,"x":533.6666259765625,"y":511.0000305175781,"z":"3a255785.10924","wires":[[]]}]
\ No newline at end of file
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_ChefDG.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_ChefDG.json
index 414de1ec6..3b2ea55d4 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_ChefDG.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_ChefDG.json
@@ -1 +1 @@
-[{"id":"545e04ed.181234","type":"dgstart","name":"DGSTART","outputs":1,"x":287,"y":237,"z":"68fff755.a3d4d8","wires":[["a62bd6e0.096bd"]]},{"id":"a62bd6e0.096bd","type":"service-logic","name":"APPC 4.0.0","module":"APPC","version":"4.0.0","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='4.0.0'>","outputs":1,"x":491.6875,"y":226.0625,"z":"68fff755.a3d4d8","wires":[["259194f2.96ff6c"]]},{"id":"259194f2.96ff6c","type":"method","name":"method Generic_AnsibleDG","xml":"<method rpc='Generic_ChefDG' mode='sync'>\n","comments":"","outputs":1,"x":743.25,"y":226.0625,"z":"68fff755.a3d4d8","wires":[["98cbebaf.59b978"]]},{"id":"50578aed.59d2e4","type":"call","name":"call:chef","xml":"<call module=\"APPC\" rpc=\"chef\" mode=\"sync\">","comments":"","outputs":1,"x":498.8544616699219,"y":950.8247985839844,"z":"68fff755.a3d4d8","wires":[["cca3d157.3b8d9","f54a112b.e09388"]]},{"id":"b4ccce5b.25a54","type":"execute","name":"execute getDecrytedpassword","xml":" <execute plugin='org.openecomp.appc.encryptiontool.wrapper.EncryptionToolDGWrapper' method = 'getProperty'>\n   <parameter name='propertyName' value=\"`$tmp.prefix+'.'+$password`\"/>\n  <parameter name='responsePrefix' value =\"prefix\"/>","comments":"","outputs":1,"x":774.0205993652344,"y":581.4720458984375,"z":"68fff755.a3d4d8","wires":[["1ad509ac.6bde56","397377f2.2fc3b"]]},{"id":"d6fa1f8e.f2501","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"Unable to decrypt the password.\" />\n","comments":"","x":1438.041763305664,"y":793.9915771484375,"z":"68fff755.a3d4d8","wires":[]},{"id":"46252d4b.e7dacc","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1269.3124160766602,"y":794.1707782745361,"z":"68fff755.a3d4d8","wires":[["d6fa1f8e.f2501"]]},{"id":"397377f2.2fc3b","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1071.2499694824219,"y":791.7915954589844,"z":"68fff755.a3d4d8","wires":[["46252d4b.e7dacc"]]},{"id":"1ad509ac.6bde56","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1052.2626647949219,"y":725.6457824707031,"z":"68fff755.a3d4d8","wires":[["46252d4b.e7dacc"]]},{"id":"198ce026.c13188","type":"execute","name":"execute Convert payload to DG Context ","xml":"<execute plugin=\"org.openecomp.sdnc.config.generator.convert.ConvertNode\" method=\"convertJson2DGContext\">\n<parameter name=\"jsonData\" value=\"`$tmp.merge.mergedData`\" />\n<parameter name=\"isEscaped\" value=\"Y\" />\n<parameter name=\"blockKeys\" value=\"chef-server-address,chef-organization,chef-username,Node,NodeList,retryTimes,retryInterval,GetOutputFlag,PushJobFlag\" />\n<parameter name=\"responsePrefix\" value=\"tmp.convertnode\" />","comments":"","outputs":1,"x":851.8367538452148,"y":345.05355072021484,"z":"68fff755.a3d4d8","wires":[["cf425802.a48338","5a1e43db.08bb24"]]},{"id":"5a1e43db.08bb24","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1071.074951171875,"y":540.7083435058594,"z":"68fff755.a3d4d8","wires":[["27290e05.4a4002"]]},{"id":"cf425802.a48338","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1067.9082946777344,"y":627.9916753768921,"z":"68fff755.a3d4d8","wires":[["5ce0dfaf.34fb"]]},{"id":"27290e05.4a4002","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1237.74169921875,"y":543.875,"z":"68fff755.a3d4d8","wires":[["434c1e87.e2ea78"]]},{"id":"5ce0dfaf.34fb","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1244.0748672485352,"y":607.3582935333252,"z":"68fff755.a3d4d8","wires":[["2aaefdf8.b727ba"]]},{"id":"2aaefdf8.b727ba","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Unable to process convert payload to context.\"/>\n\t\n","comments":"","x":1447.27486038208,"y":610.5416812896729,"z":"68fff755.a3d4d8","wires":[]},{"id":"98cbebaf.59b978","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":539.3415985107422,"y":338.6416015625,"z":"68fff755.a3d4d8","wires":[["198ce026.c13188","b4ccce5b.25a54","50578aed.59d2e4","82d5bd4e.2c94c8","33125b1.c4e57a4","e26c3001.6fd098","c887d74a.9f71","bfab8738.483068","5cd2bf9c.adbe38"]]},{"id":"434c1e87.e2ea78","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.convertnode.error-message`\"/>\n\t\n\t","comments":"","x":1466.3082275390625,"y":546.2749633789062,"z":"68fff755.a3d4d8","wires":[]},{"id":"50834eee.47b698","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t","comments":"","x":1267.9083251953125,"y":982.7916259765625,"z":"68fff755.a3d4d8","wires":[]},{"id":"cca3d157.3b8d9","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1005.9915771484375,"y":927.2250366210938,"z":"68fff755.a3d4d8","wires":[["50834eee.47b698"]]},{"id":"f54a112b.e09388","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":982.191650390625,"y":1009.7749633789062,"z":"68fff755.a3d4d8","wires":[["50834eee.47b698"]]},{"id":"82d5bd4e.2c94c8","type":"set","name":"set tmp.prefix","xml":"<set>\n<parameter name=\"tmp.prefix\" value=\"`$vnf-type + '.' + $input.action`\"/>\n<parameter name=\"password\" value=\"password\"/>\n<parameter name=\"user\" value=\"user\"/>\n\n","comments":"","x":845.8448791503906,"y":434.2883605957031,"z":"68fff755.a3d4d8","wires":[]},{"id":"33125b1.c4e57a4","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`$input.action`\"/>\n<parameter name=\"field3\" value =\"`$tmp.merge.mergedData`\"/>\n<parameter name=\"field4\" value =\"`$tmp.merge`\"/>","comments":"","outputs":1,"x":939.9450073242188,"y":271.79498291015625,"z":"68fff755.a3d4d8","wires":[[]]},{"id":"e26c3001.6fd098","type":"execute","name":"execute getUser","xml":" <execute plugin='org.openecomp.appc.encryptiontool.wrapper.EncryptionToolDGWrapper' method = 'getProperty'>\n  <parameter name='responsePrefix' value =\"prefix\"/>\n  <parameter name='propertyName' value=\"`$tmp.prefix+'.'+$user`\"/>","comments":"","outputs":1,"x":668.6667785644531,"y":719.6667175292969,"z":"68fff755.a3d4d8","wires":[[]]},{"id":"c887d74a.9f71","type":"set","name":"set password","xml":"<set>\n<parameter name=\"tmp.prefix\" value=\"`$vnf-type + '.' + $input.action`\"/>\n<parameter name=\"password\" value=\"$propertyName\"/>\n\n\n","comments":"","x":756.9998474121094,"y":658.6666564941406,"z":"68fff755.a3d4d8","wires":[]},{"id":"bfab8738.483068","type":"set","name":"set Payload params ","xml":"<set>\n<parameter name='Node' value='`$block_Node`' />\n<parameter name='NodeList' value ='`$block_NodeList`'/>\n<parameter name='vnf_id' value='`$vnf-id`' />\n<parameter name='chef-server-address' value='`$vnf-host-ip-address`'/>\n<parameter name='chef-organization' value='`$block_chef-organization`'/>\n<parameter name='retryTimes' value='`$block_retryTimes`'/>\n<parameter name='retryInterval' value='`$block_retryInterval`'/>\n<parameter name='GetOutputFlag' value='`$block_GetOutputFlag`'/>\n<parameter name='PushJobFlag' value='`$block_PushJobFlag`'/>\n\n\n\n","comments":"","x":853.6666564941406,"y":391.66668701171875,"z":"68fff755.a3d4d8","wires":[]},{"id":"5cd2bf9c.adbe38","type":"set","name":"set user ","xml":"<set>\n<parameter name='chef-username' value='`$propertyName`'/>\n<parameter name='Password' value='`$password`'/>\n \n\n\n\n","comments":"","x":567.6443176269531,"y":854.2057800292969,"z":"68fff755.a3d4d8","wires":[]}]
+[{"id":"af62cfe8.d06c7","type":"dgstart","name":"DGSTART","outputs":1,"x":98.39999389648438,"y":112.39999389648438,"z":"922f234d.03b82","wires":[["d53599d4.fa8888"]]},{"id":"d53599d4.fa8888","type":"service-logic","name":"APPC 4.0.0","module":"APPC","version":"4.0.0","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='4.0.0'>","outputs":1,"x":303.0874938964844,"y":101.46249389648438,"z":"922f234d.03b82","wires":[["1f725d37.b5b63b"]]},{"id":"1f725d37.b5b63b","type":"method","name":"method Generic_ChefDG","xml":"<method rpc='Generic_ChefDG' mode='sync'>\n","comments":"","outputs":1,"x":554.6499938964844,"y":101.46249389648438,"z":"922f234d.03b82","wires":[["301e18f6.5bf2c"]]},{"id":"9cbcf01a.7b6c8","type":"call","name":"call:chef","xml":"<call module=\"APPC\" rpc=\"chef\" mode=\"sync\">","comments":"","outputs":1,"x":310.25445556640625,"y":826.2247924804688,"z":"922f234d.03b82","wires":[["286a2dcf.6d5c9a","41f4404b.f67f58","39b897.ee15e76a"]]},{"id":"16699aa1.065e85","type":"execute","name":"execute Convert payload to DG Context ","xml":"<execute plugin=\"org.openecomp.sdnc.config.generator.convert.ConvertNode\" method=\"convertJson2DGContext\">\n<parameter name=\"jsonData\" value=\"`$tmp.merge.mergedData`\" />\n<parameter name=\"isEscaped\" value=\"Y\" />\n<parameter name=\"blockKeys\" value=\"chef-server-address,chef-organization,chef-username,Node,NodeList,retryTimes,retryInterval,GetOutputFlag,PushJobFlag\" />\n<parameter name=\"responsePrefix\" value=\"tmp.convertnode\" />","comments":"","outputs":1,"x":663.2367477416992,"y":220.45354461669922,"z":"922f234d.03b82","wires":[["6859fe6b.08acc8","b0b97ff0.6f4dd8"]]},{"id":"b0b97ff0.6f4dd8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":902.4751892089844,"y":221.10848999023438,"z":"922f234d.03b82","wires":[["af82968f.49db48"]]},{"id":"6859fe6b.08acc8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":914.3081970214844,"y":266.3916931152344,"z":"922f234d.03b82","wires":[["9627ab8e.d2e4c"]]},{"id":"af82968f.49db48","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1065.1417236328125,"y":225.27499389648438,"z":"922f234d.03b82","wires":[["e7190222.9c13d"]]},{"id":"9627ab8e.d2e4c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1063.474853515625,"y":272.7582702636719,"z":"922f234d.03b82","wires":[["3e3a73d6.8ffe4c"]]},{"id":"3e3a73d6.8ffe4c","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Unable to process convert payload to context.\"/>\n\t\n","comments":"","x":1226.6748046875,"y":277.9416809082031,"z":"922f234d.03b82","wires":[]},{"id":"301e18f6.5bf2c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":213.74179077148438,"y":238.04159545898438,"z":"922f234d.03b82","wires":[["9cbcf01a.7b6c8","16699aa1.065e85","b1fb79d0.545c8","471fb391.1eb4c4","5eb2232d.af26f4","93115621.c19948","a89dc926.5af0c","85dd8d.02b41a7"]]},{"id":"e7190222.9c13d","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.convertnode.error-message`\"/>\n\t\n\t","comments":"","x":1231.708251953125,"y":227.67495727539062,"z":"922f234d.03b82","wires":[]},{"id":"3c9bbe97.c9bce2","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value='`$chefServerResult.message`'/>","comments":"","x":1079.3083190917969,"y":858.1916198730469,"z":"922f234d.03b82","wires":[]},{"id":"286a2dcf.6d5c9a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":817.3915710449219,"y":802.6250305175781,"z":"922f234d.03b82","wires":[["3c9bbe97.c9bce2"]]},{"id":"41f4404b.f67f58","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":793.5916442871094,"y":885.1749572753906,"z":"922f234d.03b82","wires":[["45bf5d7c.68ad74"]]},{"id":"b1fb79d0.545c8","type":"record","name":"record","xml":"<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`$input.action`\"/>\n<parameter name=\"field3\" value =\"`$tmp.merge.mergedData`\"/>\n<parameter name=\"field4\" value =\"`$tmp.merge`\"/>","comments":"","outputs":1,"x":751.3450012207031,"y":147.19497680664062,"z":"922f234d.03b82","wires":[[]]},{"id":"471fb391.1eb4c4","type":"set","name":"set Payload params ","xml":"<set>\n<parameter name='Node' value='`$block_Node`' />\n<parameter name='NodeList' value ='`$block_NodeList`'/>\n<parameter name='vnf_id' value='`$vnf-id`' />\n<parameter name='chef-server-address' value='`$vnf-host-ip-address`'/>\n<parameter name='chef-username' value='`$block_chef-username`'/>\n<parameter name='chef-organization' value='`$block_chef-organization`'/>\n<parameter name='retryTimes' value='`$block_retryTimes`'/>\n<parameter name='retryInterval' value='`$block_retryInterval`'/>\n<parameter name='GetOutputFlag' value='`$block_GetOutputFlag`'/>\n<parameter name='PushJobFlag' value='`$block_PushJobFlag`'/>\n<parameter name='CallbackCapable' value='`$CallbackCapable`'/>\n<parameter name='RequestId' value='`$RequestId`'/>\n<parameter name='CallbackUrl' value='`$CallbackUrl`'/>\n<parameter name='Environment' value='`$Environment`'/>\n\n\n\n\n","comments":"","x":433.0666198730469,"y":697.0667114257812,"z":"922f234d.03b82","wires":[]},{"id":"39b897.ee15e76a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":558.3722229003906,"y":977.4832458496094,"z":"922f234d.03b82","wires":[["f2715dd7.d7631"]]},{"id":"f2715dd7.d7631","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='400' />\n<parameter name='error-message' value='`$chefServerResult.message`' />","comments":"","x":821.7055358886719,"y":1072.4832458496094,"z":"922f234d.03b82","wires":[]},{"id":"45bf5d7c.68ad74","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value='Chef DG not found or Activated'/>","comments":"","x":1113.3721618652344,"y":932.9555358886719,"z":"922f234d.03b82","wires":[]},{"id":"5eb2232d.af26f4","type":"switchNode","name":"switch environment","xml":"<switch test='`$Environment`'>\n","comments":"","outputs":1,"x":436.0000915527344,"y":338.1997985839844,"z":"922f234d.03b82","wires":[["5ed73365.2196ac","2d8ed1b9.75ada6"]]},{"id":"5ed73365.2196ac","type":"success","name":"outcome: Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":669.0000915527344,"y":357.1997985839844,"z":"922f234d.03b82","wires":[["9eb4370f.9e9cd8"]]},{"id":"2d8ed1b9.75ada6","type":"success","name":"outcome: ''","xml":"<outcome value=''>","comments":"","outputs":1,"x":682.0000915527344,"y":404.1997985839844,"z":"922f234d.03b82","wires":[["8ccf4ed1.742448"]]},{"id":"9eb4370f.9e9cd8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":null,"outputs":1,"x":864.0000915527344,"y":354.5997009277344,"z":"922f234d.03b82","wires":[[]]},{"id":"8ccf4ed1.742448","type":"set","name":"set Environment","xml":"<set>\n<parameter name='Environment' value='`$Environment`' />\n\n\n\n\n\n\n\n\n\n\n\n","comments":"","x":847.0000915527344,"y":402.7998962402344,"z":"922f234d.03b82","wires":[]},{"id":"93115621.c19948","type":"switchNode","name":"switch CallbackCapable","xml":"<switch test='`$CallbackCapable`'>\n","comments":"","outputs":1,"x":430.1997985839844,"y":426.5997009277344,"z":"922f234d.03b82","wires":[["5ed73365.2196ac","c2bdf572.9b59d8"]]},{"id":"a89dc926.5af0c","type":"switchNode","name":"switch RequestId","xml":"<switch test='`$RequestId`'>\n","comments":"","outputs":1,"x":439.1997985839844,"y":537.5997009277344,"z":"922f234d.03b82","wires":[["5ed73365.2196ac","43e94a2.02e0b34"]]},{"id":"85dd8d.02b41a7","type":"switchNode","name":"switch CallbackUrl","xml":"<switch test='`$CallbackUrl`'>\n","comments":"","outputs":1,"x":466.1997985839844,"y":617.7998962402344,"z":"922f234d.03b82","wires":[["5ed73365.2196ac","fae8b86a.be3db8"]]},{"id":"c2bdf572.9b59d8","type":"success","name":"outcome: ''","xml":"<outcome value=''>","comments":"","outputs":1,"x":699.1997985839844,"y":483.9996032714844,"z":"922f234d.03b82","wires":[["a419f989.59fe6"]]},{"id":"43e94a2.02e0b34","type":"success","name":"outcome: ''","xml":"<outcome value=''>","comments":"","outputs":1,"x":691.1997985839844,"y":542.5997009277344,"z":"922f234d.03b82","wires":[["3b82b153.726046"]]},{"id":"fae8b86a.be3db8","type":"success","name":"outcome: ''","xml":"<outcome value=''>","comments":"","outputs":1,"x":685.1997985839844,"y":603.5997009277344,"z":"922f234d.03b82","wires":[["5ce8dd14.a17be4"]]},{"id":"a419f989.59fe6","type":"set","name":"set CallbackCapable","xml":"<set>\n<parameter name='CallbackCapable' value='`$CallbackCapable`' />\n\n\n\n\n\n\n\n\n\n\n\n","comments":"","x":885.1998291015625,"y":484.5997009277344,"z":"922f234d.03b82","wires":[]},{"id":"3b82b153.726046","type":"set","name":"set RequestId","xml":"<set>\n<parameter name='RequestId' value='`$RequestId`' />\n\n\n\n\n\n\n\n\n\n\n\n","comments":"","x":886.1998291015625,"y":548.5997314453125,"z":"922f234d.03b82","wires":[]},{"id":"5ce8dd14.a17be4","type":"set","name":"set Environment","xml":"<set>\n<parameter name='Environment' value='`$Environment`' />\n\n\n\n\n\n\n\n\n\n\n\n","comments":"","x":873.1998291015625,"y":610.5997314453125,"z":"922f234d.03b82","wires":[]}]
\ No newline at end of file