aboutsummaryrefslogtreecommitdiffstats
path: root/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC
diff options
context:
space:
mode:
Diffstat (limited to 'appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC')
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_CheckConfigStatus.json2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GenerateConfig.json2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GenerateTemplateConfig.json2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_AnsibleDG.json2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_ChefDG.json2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetConfigParams.json2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_PublishConfiguration.json2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_SaveRunningConfig.json2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_setInputParams.json2
10 files changed, 10 insertions, 10 deletions
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_CheckConfigStatus.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_CheckConfigStatus.json
index 5ee11c39e..dd0739259 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_CheckConfigStatus.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_CheckConfigStatus.json
@@ -1 +1 @@
-[{"id":"106f1811.00d7f8","type":"not-found","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":541.6666259765625,"y":274,"z":"fcbb9888.37da88","wires":[["aa91d71.164a828"]]},{"id":"ba538e68.3fffc","type":"dgstart","name":"DGSTART","outputs":1,"x":191.6666259765625,"y":103,"z":"fcbb9888.37da88","wires":[["99bedc14.e0ea6"]]},{"id":"99bedc14.e0ea6","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":367.6666259765625,"y":100,"z":"fcbb9888.37da88","wires":[["9569d318.33ae1"]]},{"id":"9569d318.33ae1","type":"method","name":"method CheckConfigStatus","xml":"<method rpc='CheckConfigStatus' mode='sync'>\n","comments":"","outputs":1,"x":595.6666259765625,"y":101,"z":"fcbb9888.37da88","wires":[["1d7bf2cd.2246ad"]]},{"id":"beea047c.66a218","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":191.6666259765625,"y":231,"z":"fcbb9888.37da88","wires":[["c1a4aa3d.35dfa8","498b7be.6025a84"]]},{"id":"813ad4a9.666118","type":"failure","name":"Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":529.6666259765625,"y":459.3333349227905,"z":"fcbb9888.37da88","wires":[["20644748.1c68c8"]]},{"id":"20644748.1c68c8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":679.6666259765625,"y":461.3333349227905,"z":"fcbb9888.37da88","wires":[["1813e90b.add1c7"]]},{"id":"c1a4aa3d.35dfa8","type":"configure","name":"configure: SftpAdaptor: GetConfig Success ","xml":"<configure adaptor=\"org.onap.appc.ccadaptor.ConfigComponentAdaptor\" key=\"get\">\n<parameter name=\"host\" value=\"`$vnf-host-ip-address`\"/>\n<parameter name=\"loginId\" value=\"`$device-authentication.USER-NAME`\"/>\n<parameter name=\"password\" value=\"`$device-authentication.PASSWORD`\"/>\n<parameter name=\"fullPathFileName\" value=\"`$configfilereference-success.TARGET-FILE-PATH`\"/>\t\n\n","comments":"","outputs":1,"x":262.3332824707031,"y":367.33333015441895,"z":"fcbb9888.37da88","wires":[["106f1811.00d7f8","813ad4a9.666118","44876ee3.fc9e2"]]},{"id":"1813e90b.add1c7","type":"configure","name":"configure: SftpAdaptor: GetConfig Failure","xml":"<configure adaptor=\"org.onap.appc.ccadaptor.ConfigComponentAdaptor\" key=\"get\">\n<parameter name=\"host\" value=\"`$vnf-host-ip-address`\"/>\n<parameter name=\"loginId\" value=\"`$device-authentication.USER-NAME`\"/>\n<parameter name=\"password\" value=\"`$device-authentication.PASSWORD`\"/>\n<parameter name=\"fullPathFileName\" value=\"`$configfilereference-failure.TARGET-FILE-PATH`\"/>\n","comments":"","outputs":1,"x":934.6666259765625,"y":461.3333349227905,"z":"fcbb9888.37da88","wires":[["c9e9d49f.3027a8","215ca65e.28efea","54a1451e.6ee1bc"]]},{"id":"c9e9d49f.3027a8","type":"not-found","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":618.6666259765625,"y":571,"z":"fcbb9888.37da88","wires":[["9e7471e8.24d1d"]]},{"id":"9e7471e8.24d1d","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":785.6666259765625,"y":574,"z":"fcbb9888.37da88","wires":[["9e02dd6f.a11ce"]]},{"id":"9e02dd6f.a11ce","type":"configure","name":"configure: SftpAdaptor: GetConfig FailureLog","xml":"<configure adaptor=\"org.onap.appc.ccadaptor.ConfigComponentAdaptor\" key=\"get\">\n<parameter name=\"host\" value=\"`$vnf-host-ip-address`\"/>\n<parameter name=\"loginId\" value=\"`$device-authentication.USER-NAME`\"/>\n<parameter name=\"password\" value=\"`$device-authentication.PASSWORD`\"/>\n<parameter name=\"fullPathFileName\" value=\"`$configfilereference-log.TARGET-FILE-PATH`\"/>\n\n","comments":"","outputs":1,"x":1065.6666259765625,"y":578,"z":"fcbb9888.37da88","wires":[["f57ae80d.b71178","d8f1078c.618768"]]},{"id":"f57ae80d.b71178","type":"not-found","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1366.6666259765625,"y":533,"z":"fcbb9888.37da88","wires":[["13117340.32ae0d"]]},{"id":"215ca65e.28efea","type":"failure","name":"Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":641.6666259765625,"y":910,"z":"fcbb9888.37da88","wires":[["bc8232f9.8eda9"]]},{"id":"c6e699ae.8aa998","type":"comment","name":"No Success or Failure found","info":"","comments":"","x":298.1666259765625,"y":775,"z":"fcbb9888.37da88","wires":[]},{"id":"9e84d5f0.0dfc98","type":"for","name":"for: check status 10 times","xml":"<for index=\"i\" start=\"0\" end=\"10\" >","comments":"","outputs":1,"x":428.6666259765625,"y":158,"z":"fcbb9888.37da88","wires":[["beea047c.66a218"]]},{"id":"1d7bf2cd.2246ad","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":198.6666259765625,"y":160,"z":"fcbb9888.37da88","wires":[["9e84d5f0.0dfc98"]]},{"id":"1e2c906.043db7","type":"switchNode","name":"switch: Max retries done?","xml":"<switch test=\"`$i`\">\n","comments":"","outputs":1,"x":1012.6666259765625,"y":903,"z":"fcbb9888.37da88","wires":[["e551d9.3207ee28","45310507.9bc52c"]]},{"id":"e551d9.3207ee28","type":"other","name":"outcome: 9","xml":"<outcome value='9'>\n","comments":"","outputs":1,"x":1264.6666259765625,"y":891,"z":"fcbb9888.37da88","wires":[["395a778a.a9c948"]]},{"id":"395a778a.a9c948","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1450.6666259765625,"y":885,"z":"fcbb9888.37da88","wires":[["3ad5063d.6732ea"]]},{"id":"bc8232f9.8eda9","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":805.6666259765625,"y":909,"z":"fcbb9888.37da88","wires":[["1e2c906.043db7"]]},{"id":"d7e4f931.ffe0d8","type":"comment","name":"Return Failure so that it exits immediately","info":"Error Code and message reflect the status\nReturning success doesnt exit the loop","comments":"","x":918.1666259765625,"y":227,"z":"fcbb9888.37da88","wires":[]},{"id":"3ad5063d.6732ea","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"Configuration Failed. No configuration success or error file found on the device\" />\n<parameter name=\"error-code\" value=\"401\" />\n\n","comments":"","x":1641.6666259765625,"y":882,"z":"fcbb9888.37da88","wires":[]},{"id":"498b7be.6025a84","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"RETRY ATTEMPT START\" value=\"`$i`\"/>\n","comments":"","outputs":1,"x":376.6666259765625,"y":225,"z":"fcbb9888.37da88","wires":[[]]},{"id":"45310507.9bc52c","type":"other","name":"outcome: Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1262.6666259765625,"y":969,"z":"fcbb9888.37da88","wires":[["9504b9a.138f348"]]},{"id":"9504b9a.138f348","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1445.6666259765625,"y":967,"z":"fcbb9888.37da88","wires":[["dc1f4ff5.d695c"]]},{"id":"dc1f4ff5.d695c","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"RETRYATTEMPT DONE\"/>\n<parameter name=\"field3\" value=\"`$i`\"/>\n\n\n\n","comments":"","outputs":1,"x":1622.6666259765625,"y":963,"z":"fcbb9888.37da88","wires":[[]]},{"id":"44876ee3.fc9e2","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":547.9999313354492,"y":366.66668224334717,"z":"fcbb9888.37da88","wires":[["5067f82d.014248"]]},{"id":"5067f82d.014248","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":715.9999313354492,"y":370.66668224334717,"z":"fcbb9888.37da88","wires":[["13159be6.000524"]]},{"id":"13159be6.000524","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"Unable to call SftpAdaptor\" />\n<parameter name=\"error-code\" value=\"401\" />\n ","comments":"","x":894.9999313354492,"y":376.66668224334717,"z":"fcbb9888.37da88","wires":[]},{"id":"54a1451e.6ee1bc","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":651.6666259765625,"y":732,"z":"fcbb9888.37da88","wires":[["4093e936.3c4fd8"]]},{"id":"4093e936.3c4fd8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":851.6666259765625,"y":728,"z":"fcbb9888.37da88","wires":[["5f93d2f8.23ba5c"]]},{"id":"5f93d2f8.23ba5c","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"Configuration request Failed. Unable to get Failure Log\" />\n<parameter name=\"error-code\" value=\"401\" />","comments":"","x":1078.6666259765625,"y":729,"z":"fcbb9888.37da88","wires":[]},{"id":"d8f1078c.618768","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1365.6666259765625,"y":605,"z":"fcbb9888.37da88","wires":[["4093e936.3c4fd8"]]},{"id":"9bcbe24b.484ad","type":"comment","name":"Set Success Code","info":"","comments":"","x":1088.6666259765625,"y":278,"z":"fcbb9888.37da88","wires":[]},{"id":"aa91d71.164a828","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":704.6666259765625,"y":274,"z":"fcbb9888.37da88","wires":[["f1c9a647.703908"]]},{"id":"42eefa18.fd8294","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"SUCCESS - request has been processed successfully\" />\n<parameter name=\"error-code\" value=\"400\" />\n","comments":"","x":905.3333358764648,"y":277.6667184829712,"z":"fcbb9888.37da88","wires":[]},{"id":"13117340.32ae0d","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1556.6666259765625,"y":531,"z":"fcbb9888.37da88","wires":[["f54b4753.162b58"]]},{"id":"f54b4753.162b58","type":"execute","name":"execute ParseErrorLog","xml":"<execute plugin=\"org.openecomp.sdnc.config.generator.pattern.PatternNode\" method=\"parseErrorLog\">\n<parameter name=\"logData\" value=\"`$fileContents`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.patternNode\" />","comments":"","outputs":1,"x":1801.3332748413086,"y":532.9999961853027,"z":"fcbb9888.37da88","wires":[["ffed95c2.8361f8","10080deb.35a4d2","8dbc2d9f.45dd7"]]},{"id":"ffed95c2.8361f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2040.6666259765625,"y":504,"z":"fcbb9888.37da88","wires":[["64039324.913e5c"]]},{"id":"10080deb.35a4d2","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2045.6666259765625,"y":565,"z":"fcbb9888.37da88","wires":[["b56b07c0.65d7e8"]]},{"id":"64039324.913e5c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2201.6666259765625,"y":505,"z":"fcbb9888.37da88","wires":[["54c6aeea.1f039"]]},{"id":"b56b07c0.65d7e8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2197.6666259765625,"y":568,"z":"fcbb9888.37da88","wires":[["9836fa6f.ef13b8"]]},{"id":"9836fa6f.ef13b8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Configuration has failed.Unable to process error log\"/>\n\t","comments":"","x":2379.6666259765625,"y":569,"z":"fcbb9888.37da88","wires":[]},{"id":"54c6aeea.1f039","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.patternNode.error-message`\"/>\n\t\n\t","comments":"","x":2399.6666259765625,"y":506,"z":"fcbb9888.37da88","wires":[]},{"id":"8dbc2d9f.45dd7","type":"not-found","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2024.6666259765625,"y":633,"z":"fcbb9888.37da88","wires":[["c39b08ed.61c138"]]},{"id":"c39b08ed.61c138","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2180.6666259765625,"y":635,"z":"fcbb9888.37da88","wires":[["e69fed9f.542e7"]]},{"id":"e69fed9f.542e7","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`'Configuration has failed.' + $tmp.patternNode.parsedError`\"/>\n\t","comments":"","x":2352.6666259765625,"y":633,"z":"fcbb9888.37da88","wires":[]},{"id":"f1c9a647.703908","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name=\"error-message\" value=\"SUCCESS - request has been processed successfully\" />\n<parameter name=\"error-code\" value=\"400\" />\n\n","comments":"","x":895.333251953125,"y":319.99999141693115,"z":"fcbb9888.37da88","wires":[]}]
+[{"id":"106f1811.00d7f8","type":"not-found","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":541.6666259765625,"y":274,"z":"fcbb9888.37da88","wires":[["aa91d71.164a828"]]},{"id":"ba538e68.3fffc","type":"dgstart","name":"DGSTART","outputs":1,"x":191.6666259765625,"y":103,"z":"fcbb9888.37da88","wires":[["99bedc14.e0ea6"]]},{"id":"99bedc14.e0ea6","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":367.6666259765625,"y":100,"z":"fcbb9888.37da88","wires":[["9569d318.33ae1"]]},{"id":"9569d318.33ae1","type":"method","name":"method CheckConfigStatus","xml":"<method rpc='CheckConfigStatus' mode='sync'>\n","comments":"","outputs":1,"x":595.6666259765625,"y":101,"z":"fcbb9888.37da88","wires":[["1d7bf2cd.2246ad"]]},{"id":"beea047c.66a218","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":191.6666259765625,"y":231,"z":"fcbb9888.37da88","wires":[["c1a4aa3d.35dfa8","498b7be.6025a84"]]},{"id":"813ad4a9.666118","type":"failure","name":"Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":529.6666259765625,"y":459.3333349227905,"z":"fcbb9888.37da88","wires":[["20644748.1c68c8"]]},{"id":"20644748.1c68c8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":679.6666259765625,"y":461.3333349227905,"z":"fcbb9888.37da88","wires":[["1813e90b.add1c7"]]},{"id":"c1a4aa3d.35dfa8","type":"configure","name":"configure: SftpAdaptor: GetConfig Success ","xml":"<configure adaptor=\"org.onap.appc.ccadaptor.ConfigComponentAdaptor\" key=\"get\">\n<parameter name=\"host\" value=\"`$vnf-host-ip-address`\"/>\n<parameter name=\"loginId\" value=\"`$device-authentication.USER-NAME`\"/>\n<parameter name=\"password\" value=\"`$device-authentication.PASSWORD`\"/>\n<parameter name=\"fullPathFileName\" value=\"`$configfilereference-success.TARGET-FILE-PATH`\"/>\t\n\n","comments":"","outputs":1,"x":262.3332824707031,"y":367.33333015441895,"z":"fcbb9888.37da88","wires":[["106f1811.00d7f8","813ad4a9.666118","44876ee3.fc9e2"]]},{"id":"1813e90b.add1c7","type":"configure","name":"configure: SftpAdaptor: GetConfig Failure","xml":"<configure adaptor=\"org.onap.appc.ccadaptor.ConfigComponentAdaptor\" key=\"get\">\n<parameter name=\"host\" value=\"`$vnf-host-ip-address`\"/>\n<parameter name=\"loginId\" value=\"`$device-authentication.USER-NAME`\"/>\n<parameter name=\"password\" value=\"`$device-authentication.PASSWORD`\"/>\n<parameter name=\"fullPathFileName\" value=\"`$configfilereference-failure.TARGET-FILE-PATH`\"/>\n","comments":"","outputs":1,"x":934.6666259765625,"y":461.3333349227905,"z":"fcbb9888.37da88","wires":[["c9e9d49f.3027a8","215ca65e.28efea","54a1451e.6ee1bc"]]},{"id":"c9e9d49f.3027a8","type":"not-found","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":618.6666259765625,"y":571,"z":"fcbb9888.37da88","wires":[["9e7471e8.24d1d"]]},{"id":"9e7471e8.24d1d","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":785.6666259765625,"y":574,"z":"fcbb9888.37da88","wires":[["9e02dd6f.a11ce"]]},{"id":"9e02dd6f.a11ce","type":"configure","name":"configure: SftpAdaptor: GetConfig FailureLog","xml":"<configure adaptor=\"org.onap.appc.ccadaptor.ConfigComponentAdaptor\" key=\"get\">\n<parameter name=\"host\" value=\"`$vnf-host-ip-address`\"/>\n<parameter name=\"loginId\" value=\"`$device-authentication.USER-NAME`\"/>\n<parameter name=\"password\" value=\"`$device-authentication.PASSWORD`\"/>\n<parameter name=\"fullPathFileName\" value=\"`$configfilereference-log.TARGET-FILE-PATH`\"/>\n\n","comments":"","outputs":1,"x":1065.6666259765625,"y":578,"z":"fcbb9888.37da88","wires":[["f57ae80d.b71178","d8f1078c.618768"]]},{"id":"f57ae80d.b71178","type":"not-found","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1366.6666259765625,"y":533,"z":"fcbb9888.37da88","wires":[["13117340.32ae0d"]]},{"id":"215ca65e.28efea","type":"failure","name":"Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":641.6666259765625,"y":910,"z":"fcbb9888.37da88","wires":[["bc8232f9.8eda9"]]},{"id":"c6e699ae.8aa998","type":"comment","name":"No Success or Failure found","info":"","comments":"","x":298.1666259765625,"y":775,"z":"fcbb9888.37da88","wires":[]},{"id":"9e84d5f0.0dfc98","type":"for","name":"for: check status 10 times","xml":"<for index=\"i\" start=\"0\" end=\"10\" >","comments":"","outputs":1,"x":428.6666259765625,"y":158,"z":"fcbb9888.37da88","wires":[["beea047c.66a218"]]},{"id":"1d7bf2cd.2246ad","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":198.6666259765625,"y":160,"z":"fcbb9888.37da88","wires":[["9e84d5f0.0dfc98"]]},{"id":"1e2c906.043db7","type":"switchNode","name":"switch: Max retries done?","xml":"<switch test=\"`$i`\">\n","comments":"","outputs":1,"x":1012.6666259765625,"y":903,"z":"fcbb9888.37da88","wires":[["e551d9.3207ee28","45310507.9bc52c"]]},{"id":"e551d9.3207ee28","type":"other","name":"outcome: 9","xml":"<outcome value='9'>\n","comments":"","outputs":1,"x":1264.6666259765625,"y":891,"z":"fcbb9888.37da88","wires":[["395a778a.a9c948"]]},{"id":"395a778a.a9c948","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1450.6666259765625,"y":885,"z":"fcbb9888.37da88","wires":[["3ad5063d.6732ea"]]},{"id":"bc8232f9.8eda9","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":805.6666259765625,"y":909,"z":"fcbb9888.37da88","wires":[["1e2c906.043db7"]]},{"id":"d7e4f931.ffe0d8","type":"comment","name":"Return Failure so that it exits immediately","info":"Error Code and message reflect the status\nReturning success doesnt exit the loop","comments":"","x":918.1666259765625,"y":227,"z":"fcbb9888.37da88","wires":[]},{"id":"3ad5063d.6732ea","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"Configuration Failed. No configuration success or error file found on the device\" />\n<parameter name=\"error-code\" value=\"401\" />\n\n","comments":"","x":1641.6666259765625,"y":882,"z":"fcbb9888.37da88","wires":[]},{"id":"498b7be.6025a84","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"RETRY ATTEMPT START\" value=\"`$i`\"/>\n","comments":"","outputs":1,"x":376.6666259765625,"y":225,"z":"fcbb9888.37da88","wires":[[]]},{"id":"45310507.9bc52c","type":"other","name":"outcome: Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1262.6666259765625,"y":969,"z":"fcbb9888.37da88","wires":[["9504b9a.138f348"]]},{"id":"9504b9a.138f348","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1445.6666259765625,"y":967,"z":"fcbb9888.37da88","wires":[["dc1f4ff5.d695c"]]},{"id":"dc1f4ff5.d695c","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"RETRYATTEMPT DONE\"/>\n<parameter name=\"field3\" value=\"`$i`\"/>\n\n\n\n","comments":"","outputs":1,"x":1622.6666259765625,"y":963,"z":"fcbb9888.37da88","wires":[[]]},{"id":"44876ee3.fc9e2","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":547.9999313354492,"y":366.66668224334717,"z":"fcbb9888.37da88","wires":[["5067f82d.014248"]]},{"id":"5067f82d.014248","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":715.9999313354492,"y":370.66668224334717,"z":"fcbb9888.37da88","wires":[["13159be6.000524"]]},{"id":"13159be6.000524","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"Unable to call SftpAdaptor\" />\n<parameter name=\"error-code\" value=\"401\" />\n ","comments":"","x":894.9999313354492,"y":376.66668224334717,"z":"fcbb9888.37da88","wires":[]},{"id":"54a1451e.6ee1bc","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":651.6666259765625,"y":732,"z":"fcbb9888.37da88","wires":[["4093e936.3c4fd8"]]},{"id":"4093e936.3c4fd8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":851.6666259765625,"y":728,"z":"fcbb9888.37da88","wires":[["5f93d2f8.23ba5c"]]},{"id":"5f93d2f8.23ba5c","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"Configuration request Failed. Unable to get Failure Log\" />\n<parameter name=\"error-code\" value=\"401\" />","comments":"","x":1078.6666259765625,"y":729,"z":"fcbb9888.37da88","wires":[]},{"id":"d8f1078c.618768","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1365.6666259765625,"y":605,"z":"fcbb9888.37da88","wires":[["4093e936.3c4fd8"]]},{"id":"9bcbe24b.484ad","type":"comment","name":"Set Success Code","info":"","comments":"","x":1088.6666259765625,"y":278,"z":"fcbb9888.37da88","wires":[]},{"id":"aa91d71.164a828","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":704.6666259765625,"y":274,"z":"fcbb9888.37da88","wires":[["f1c9a647.703908"]]},{"id":"42eefa18.fd8294","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"SUCCESS - request has been processed successfully\" />\n<parameter name=\"error-code\" value=\"400\" />\n","comments":"","x":905.3333358764648,"y":277.6667184829712,"z":"fcbb9888.37da88","wires":[]},{"id":"13117340.32ae0d","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1556.6666259765625,"y":531,"z":"fcbb9888.37da88","wires":[["f54b4753.162b58"]]},{"id":"f54b4753.162b58","type":"execute","name":"execute ParseErrorLog","xml":"<execute plugin=\"org.onap.sdnc.config.generator.pattern.PatternNode\" method=\"parseErrorLog\">\n<parameter name=\"logData\" value=\"`$fileContents`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.patternNode\" />","comments":"","outputs":1,"x":1801.3332748413086,"y":532.9999961853027,"z":"fcbb9888.37da88","wires":[["ffed95c2.8361f8","10080deb.35a4d2","8dbc2d9f.45dd7"]]},{"id":"ffed95c2.8361f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2040.6666259765625,"y":504,"z":"fcbb9888.37da88","wires":[["64039324.913e5c"]]},{"id":"10080deb.35a4d2","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2045.6666259765625,"y":565,"z":"fcbb9888.37da88","wires":[["b56b07c0.65d7e8"]]},{"id":"64039324.913e5c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2201.6666259765625,"y":505,"z":"fcbb9888.37da88","wires":[["54c6aeea.1f039"]]},{"id":"b56b07c0.65d7e8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2197.6666259765625,"y":568,"z":"fcbb9888.37da88","wires":[["9836fa6f.ef13b8"]]},{"id":"9836fa6f.ef13b8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Configuration has failed.Unable to process error log\"/>\n\t","comments":"","x":2379.6666259765625,"y":569,"z":"fcbb9888.37da88","wires":[]},{"id":"54c6aeea.1f039","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.patternNode.error-message`\"/>\n\t\n\t","comments":"","x":2399.6666259765625,"y":506,"z":"fcbb9888.37da88","wires":[]},{"id":"8dbc2d9f.45dd7","type":"not-found","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2024.6666259765625,"y":633,"z":"fcbb9888.37da88","wires":[["c39b08ed.61c138"]]},{"id":"c39b08ed.61c138","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2180.6666259765625,"y":635,"z":"fcbb9888.37da88","wires":[["e69fed9f.542e7"]]},{"id":"e69fed9f.542e7","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`'Configuration has failed.' + $tmp.patternNode.parsedError`\"/>\n\t","comments":"","x":2352.6666259765625,"y":633,"z":"fcbb9888.37da88","wires":[]},{"id":"f1c9a647.703908","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name=\"error-message\" value=\"SUCCESS - request has been processed successfully\" />\n<parameter name=\"error-code\" value=\"400\" />\n\n","comments":"","x":895.333251953125,"y":319.99999141693115,"z":"fcbb9888.37da88","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GenerateConfig.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GenerateConfig.json
index 1d3e98389..61d315798 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GenerateConfig.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GenerateConfig.json
@@ -1 +1 @@
-[{"id":"8dc92cef.af16","type":"switchNode","name":"switch configuration Exist","xml":"<switch test='`$configuration`'>\n","comments":"","outputs":1,"x":230,"y":273,"z":"bcb112aa.3df3","wires":[["51b66afb.732cb4","ac78286.04e5ad8"]]},{"id":"51b66afb.732cb4","type":"success","name":" Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":200,"y":356,"z":"bcb112aa.3df3","wires":[["19efef28.113271"]]},{"id":"ac78286.04e5ad8","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":460,"y":278,"z":"bcb112aa.3df3","wires":[["e08c0360.b78d7"]]},{"id":"19efef28.113271","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":355,"y":357,"z":"bcb112aa.3df3","wires":[["bd4ca811.1bbf98","f05dc8ea.7c8f98"]]},{"id":"e08c0360.b78d7","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":651,"y":275,"z":"bcb112aa.3df3","wires":[[]]},{"id":"bd4ca811.1bbf98","type":"switchNode","name":"switch Config Params Exist","xml":"<switch test='`$configuration-params`'>\n","comments":"","outputs":1,"x":580,"y":359,"z":"bcb112aa.3df3","wires":[["4ceaa5cd.c473ac","cba86ee2.90b7e"]]},{"id":"f05dc8ea.7c8f98","type":"execute","name":"execute saveConfigBlock","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigBlock\">\n<parameter name=\"responsePrefix\" value=\"tmp.saveConfigBlock\" />","comments":"","outputs":1,"x":541,"y":594,"z":"bcb112aa.3df3","wires":[["c2734f72.66207"]]},{"id":"4ceaa5cd.c473ac","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":812,"y":312,"z":"bcb112aa.3df3","wires":[["30855e94.828402"]]},{"id":"cba86ee2.90b7e","type":"success","name":" Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":582,"y":423,"z":"bcb112aa.3df3","wires":[["3c1de74c.ceb898"]]},{"id":"c2734f72.66207","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":751,"y":594,"z":"bcb112aa.3df3","wires":[["b2137289.1cf87"]]},{"id":"3c1de74c.ceb898","type":"execute","name":"execute Merge Data with Template","xml":"<execute plugin=\"org.openecomp.sdnc.config.generator.merge.MergeNode\" method=\"mergeJsonDataOnTemplate\">\n<parameter name=\"jsonData\" value=\"`$configuration-params`\" />\n<parameter name=\"templateData\" value=\"`$configuration`\" />\n<parameter name=\"templateType\" value=\"json\" />\n<parameter name=\"responsePrefix\" value=\"tmp.merge\" />","comments":"","outputs":1,"x":813,"y":425,"z":"bcb112aa.3df3","wires":[["806b8a1a.10a928","fb85739e.97635"]]},{"id":"b2137289.1cf87","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":918,"y":596,"z":"bcb112aa.3df3","wires":[["9cc87fc8.c131"]]},{"id":"806b8a1a.10a928","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1064,"y":386,"z":"bcb112aa.3df3","wires":[["f0bb9ae5.225b08"]]},{"id":"fb85739e.97635","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1053,"y":445,"z":"bcb112aa.3df3","wires":[["f70cd59a.466288"]]},{"id":"9cc87fc8.c131","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.saveConfigBlock.error-message`\"/>\n\t\n\t\n\t","comments":"","x":1117,"y":593,"z":"bcb112aa.3df3","wires":[]},{"id":"f0bb9ae5.225b08","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1220,"y":389,"z":"bcb112aa.3df3","wires":[["cc1dc434.2e9558"]]},{"id":"f70cd59a.466288","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1209,"y":447,"z":"bcb112aa.3df3","wires":[["bbfbfcbd.81a6b"]]},{"id":"cc1dc434.2e9558","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 merge template with data\"/>\n\t","comments":"","x":1398,"y":392,"z":"bcb112aa.3df3","wires":[]},{"id":"bbfbfcbd.81a6b","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.merge.error-message`\"/>\n\t","comments":"","x":1382,"y":454,"z":"bcb112aa.3df3","wires":[]},{"id":"f2019004.80993","type":"dgstart","name":"DGSTART","outputs":1,"x":146,"y":118,"z":"bcb112aa.3df3","wires":[["f02b838f.96f26"]]},{"id":"f02b838f.96f26","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":313,"y":118,"z":"bcb112aa.3df3","wires":[["6f7e3ed4.df123"]]},{"id":"6f7e3ed4.df123","type":"method","name":"method GenerateConfig","xml":"<method rpc='GenerateConfig' mode='sync'>\n","comments":"","outputs":1,"x":559,"y":117,"z":"bcb112aa.3df3","wires":[["52decd8e.01dd24"]]},{"id":"52decd8e.01dd24","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":155,"y":186,"z":"bcb112aa.3df3","wires":[["8dc92cef.af16"]]},{"id":"30855e94.828402","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1026,"y":312,"z":"bcb112aa.3df3","wires":[[]]}]
+[{"id":"8dc92cef.af16","type":"switchNode","name":"switch configuration Exist","xml":"<switch test='`$configuration`'>\n","comments":"","outputs":1,"x":230,"y":273,"z":"bcb112aa.3df3","wires":[["51b66afb.732cb4","ac78286.04e5ad8"]]},{"id":"51b66afb.732cb4","type":"success","name":" Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":200,"y":356,"z":"bcb112aa.3df3","wires":[["19efef28.113271"]]},{"id":"ac78286.04e5ad8","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":460,"y":278,"z":"bcb112aa.3df3","wires":[["e08c0360.b78d7"]]},{"id":"19efef28.113271","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":355,"y":357,"z":"bcb112aa.3df3","wires":[["bd4ca811.1bbf98","f05dc8ea.7c8f98"]]},{"id":"e08c0360.b78d7","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":651,"y":275,"z":"bcb112aa.3df3","wires":[[]]},{"id":"bd4ca811.1bbf98","type":"switchNode","name":"switch Config Params Exist","xml":"<switch test='`$configuration-params`'>\n","comments":"","outputs":1,"x":580,"y":359,"z":"bcb112aa.3df3","wires":[["4ceaa5cd.c473ac","cba86ee2.90b7e"]]},{"id":"f05dc8ea.7c8f98","type":"execute","name":"execute saveConfigBlock","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigBlock\">\n<parameter name=\"responsePrefix\" value=\"tmp.saveConfigBlock\" />","comments":"","outputs":1,"x":541,"y":594,"z":"bcb112aa.3df3","wires":[["c2734f72.66207"]]},{"id":"4ceaa5cd.c473ac","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":812,"y":312,"z":"bcb112aa.3df3","wires":[["30855e94.828402"]]},{"id":"cba86ee2.90b7e","type":"success","name":" Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":582,"y":423,"z":"bcb112aa.3df3","wires":[["3c1de74c.ceb898"]]},{"id":"c2734f72.66207","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":751,"y":594,"z":"bcb112aa.3df3","wires":[["b2137289.1cf87"]]},{"id":"3c1de74c.ceb898","type":"execute","name":"execute Merge Data with Template","xml":"<execute plugin=\"org.onap.sdnc.config.generator.merge.MergeNode\" method=\"mergeJsonDataOnTemplate\">\n<parameter name=\"jsonData\" value=\"`$configuration-params`\" />\n<parameter name=\"templateData\" value=\"`$configuration`\" />\n<parameter name=\"templateType\" value=\"json\" />\n<parameter name=\"responsePrefix\" value=\"tmp.merge\" />","comments":"","outputs":1,"x":813,"y":425,"z":"bcb112aa.3df3","wires":[["806b8a1a.10a928","fb85739e.97635"]]},{"id":"b2137289.1cf87","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":918,"y":596,"z":"bcb112aa.3df3","wires":[["9cc87fc8.c131"]]},{"id":"806b8a1a.10a928","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1064,"y":386,"z":"bcb112aa.3df3","wires":[["f0bb9ae5.225b08"]]},{"id":"fb85739e.97635","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1053,"y":445,"z":"bcb112aa.3df3","wires":[["f70cd59a.466288"]]},{"id":"9cc87fc8.c131","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.saveConfigBlock.error-message`\"/>\n\t\n\t\n\t","comments":"","x":1117,"y":593,"z":"bcb112aa.3df3","wires":[]},{"id":"f0bb9ae5.225b08","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1220,"y":389,"z":"bcb112aa.3df3","wires":[["cc1dc434.2e9558"]]},{"id":"f70cd59a.466288","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1209,"y":447,"z":"bcb112aa.3df3","wires":[["bbfbfcbd.81a6b"]]},{"id":"cc1dc434.2e9558","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 merge template with data\"/>\n\t","comments":"","x":1398,"y":392,"z":"bcb112aa.3df3","wires":[]},{"id":"bbfbfcbd.81a6b","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.merge.error-message`\"/>\n\t","comments":"","x":1382,"y":454,"z":"bcb112aa.3df3","wires":[]},{"id":"f2019004.80993","type":"dgstart","name":"DGSTART","outputs":1,"x":146,"y":118,"z":"bcb112aa.3df3","wires":[["f02b838f.96f26"]]},{"id":"f02b838f.96f26","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":313,"y":118,"z":"bcb112aa.3df3","wires":[["6f7e3ed4.df123"]]},{"id":"6f7e3ed4.df123","type":"method","name":"method GenerateConfig","xml":"<method rpc='GenerateConfig' mode='sync'>\n","comments":"","outputs":1,"x":559,"y":117,"z":"bcb112aa.3df3","wires":[["52decd8e.01dd24"]]},{"id":"52decd8e.01dd24","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":155,"y":186,"z":"bcb112aa.3df3","wires":[["8dc92cef.af16"]]},{"id":"30855e94.828402","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1026,"y":312,"z":"bcb112aa.3df3","wires":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GenerateTemplateConfig.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GenerateTemplateConfig.json
index 756c0f63f..efdc91a62 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GenerateTemplateConfig.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GenerateTemplateConfig.json
@@ -1 +1 @@
-[{"id":"42b2dfc0.a5c5e","type":"dgstart","name":"DGSTART","outputs":1,"x":168,"y":108,"z":"d7c523d9.040c","wires":[["d9d88d2e.06e01"]]},{"id":"d9d88d2e.06e01","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":320,"y":107,"z":"d7c523d9.040c","wires":[["f1a68f7c.b0fd1"]]},{"id":"f1a68f7c.b0fd1","type":"method","name":"method GenerateTemplateConfig","xml":"<method rpc='GenerateTemplateConfig' mode='sync'>\n","comments":"","outputs":1,"x":560,"y":110,"z":"d7c523d9.040c","wires":[["2975bd2f.022512"]]},{"id":"2975bd2f.022512","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":180,"y":171,"z":"d7c523d9.040c","wires":[["718c80aa.91b87","cac9421d.229c9"]]},{"id":"458ebbd8.86b484","type":"execute","name":"execute Merge Data with Template","xml":"<execute plugin=\"org.openecomp.sdnc.config.generator.merge.MergeNode\" method=\"mergeJsonDataOnTemplate\">\n<parameter name=\"jsonData\" value=\"`$configuration-params`\" />\n<parameter name=\"templateData\" value=\"`$config-template.file-content`\" />\n<parameter name=\"templateType\" value=\"json\" />\n<parameter name=\"responsePrefix\" value=\"tmp.merge\" />","comments":"","outputs":1,"x":680.5,"y":378,"z":"d7c523d9.040c","wires":[["b61648ca.231c98","95b9fc11.efc86"]]},{"id":"b61648ca.231c98","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":929.5,"y":346,"z":"d7c523d9.040c","wires":[["ad78434b.53b5e"]]},{"id":"ad78434b.53b5e","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1077.5,"y":347,"z":"d7c523d9.040c","wires":[["39a12381.5bf87c"]]},{"id":"39a12381.5bf87c","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 merge template with data\"/>\n\t","comments":"","x":1251.5,"y":348,"z":"d7c523d9.040c","wires":[]},{"id":"95b9fc11.efc86","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":924.5,"y":422,"z":"d7c523d9.040c","wires":[["3e2c957.50e086a"]]},{"id":"3e2c957.50e086a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1072.5,"y":424,"z":"d7c523d9.040c","wires":[["4d72da43.0cfe14"]]},{"id":"4d72da43.0cfe14","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.merge.error-message`\"/>\n\t","comments":"","x":1263.5,"y":423,"z":"d7c523d9.040c","wires":[]},{"id":"718c80aa.91b87","type":"switchNode","name":"switch Configuration params exists","xml":"<switch test='`$configuration-params`'>\n","comments":"","outputs":1,"x":425,"y":170,"z":"d7c523d9.040c","wires":[["8f31c08f.9dbb2","4be7f151.48d7f"]]},{"id":"baa4370e.36b778","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":664,"y":237,"z":"d7c523d9.040c","wires":[["458ebbd8.86b484"]]},{"id":"8f31c08f.9dbb2","type":"success","name":"outcome:Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":472,"y":234,"z":"d7c523d9.040c","wires":[["baa4370e.36b778"]]},{"id":"4be7f151.48d7f","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":765,"y":165,"z":"d7c523d9.040c","wires":[["a55c78ed.34cc38"]]},{"id":"cac9421d.229c9","type":"execute","name":"execute saveTemplateConfig","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveTemplateConfig\">\n<parameter name=\"responsePrefix\" value=\"tmp.saveTemplateConfig\" />","comments":"","outputs":1,"x":248,"y":623,"z":"d7c523d9.040c","wires":[["6a63d2a.0f3ba2c"]]},{"id":"6a63d2a.0f3ba2c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":458,"y":623,"z":"d7c523d9.040c","wires":[["f2ef42ef.faf2a"]]},{"id":"f2ef42ef.faf2a","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":625,"y":625,"z":"d7c523d9.040c","wires":[["2fab99ac.fc2306"]]},{"id":"2fab99ac.fc2306","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.saveConfigBlock.error-message`\"/>\n\t\n\t\n\t","comments":"","x":816,"y":628,"z":"d7c523d9.040c","wires":[]},{"id":"a55c78ed.34cc38","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":955,"y":167,"z":"d7c523d9.040c","wires":[[]]}]
+[{"id":"42b2dfc0.a5c5e","type":"dgstart","name":"DGSTART","outputs":1,"x":168,"y":108,"z":"d7c523d9.040c","wires":[["d9d88d2e.06e01"]]},{"id":"d9d88d2e.06e01","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":320,"y":107,"z":"d7c523d9.040c","wires":[["f1a68f7c.b0fd1"]]},{"id":"f1a68f7c.b0fd1","type":"method","name":"method GenerateTemplateConfig","xml":"<method rpc='GenerateTemplateConfig' mode='sync'>\n","comments":"","outputs":1,"x":560,"y":110,"z":"d7c523d9.040c","wires":[["2975bd2f.022512"]]},{"id":"2975bd2f.022512","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":180,"y":171,"z":"d7c523d9.040c","wires":[["718c80aa.91b87","cac9421d.229c9"]]},{"id":"458ebbd8.86b484","type":"execute","name":"execute Merge Data with Template","xml":"<execute plugin=\"org.onap.sdnc.config.generator.merge.MergeNode\" method=\"mergeJsonDataOnTemplate\">\n<parameter name=\"jsonData\" value=\"`$configuration-params`\" />\n<parameter name=\"templateData\" value=\"`$config-template.file-content`\" />\n<parameter name=\"templateType\" value=\"json\" />\n<parameter name=\"responsePrefix\" value=\"tmp.merge\" />","comments":"","outputs":1,"x":680.5,"y":378,"z":"d7c523d9.040c","wires":[["b61648ca.231c98","95b9fc11.efc86"]]},{"id":"b61648ca.231c98","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":929.5,"y":346,"z":"d7c523d9.040c","wires":[["ad78434b.53b5e"]]},{"id":"ad78434b.53b5e","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1077.5,"y":347,"z":"d7c523d9.040c","wires":[["39a12381.5bf87c"]]},{"id":"39a12381.5bf87c","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 merge template with data\"/>\n\t","comments":"","x":1251.5,"y":348,"z":"d7c523d9.040c","wires":[]},{"id":"95b9fc11.efc86","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":924.5,"y":422,"z":"d7c523d9.040c","wires":[["3e2c957.50e086a"]]},{"id":"3e2c957.50e086a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1072.5,"y":424,"z":"d7c523d9.040c","wires":[["4d72da43.0cfe14"]]},{"id":"4d72da43.0cfe14","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.merge.error-message`\"/>\n\t","comments":"","x":1263.5,"y":423,"z":"d7c523d9.040c","wires":[]},{"id":"718c80aa.91b87","type":"switchNode","name":"switch Configuration params exists","xml":"<switch test='`$configuration-params`'>\n","comments":"","outputs":1,"x":425,"y":170,"z":"d7c523d9.040c","wires":[["8f31c08f.9dbb2","4be7f151.48d7f"]]},{"id":"baa4370e.36b778","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":664,"y":237,"z":"d7c523d9.040c","wires":[["458ebbd8.86b484"]]},{"id":"8f31c08f.9dbb2","type":"success","name":"outcome:Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":472,"y":234,"z":"d7c523d9.040c","wires":[["baa4370e.36b778"]]},{"id":"4be7f151.48d7f","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":765,"y":165,"z":"d7c523d9.040c","wires":[["a55c78ed.34cc38"]]},{"id":"cac9421d.229c9","type":"execute","name":"execute saveTemplateConfig","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveTemplateConfig\">\n<parameter name=\"responsePrefix\" value=\"tmp.saveTemplateConfig\" />","comments":"","outputs":1,"x":248,"y":623,"z":"d7c523d9.040c","wires":[["6a63d2a.0f3ba2c"]]},{"id":"6a63d2a.0f3ba2c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":458,"y":623,"z":"d7c523d9.040c","wires":[["f2ef42ef.faf2a"]]},{"id":"f2ef42ef.faf2a","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":625,"y":625,"z":"d7c523d9.040c","wires":[["2fab99ac.fc2306"]]},{"id":"2fab99ac.fc2306","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.saveConfigBlock.error-message`\"/>\n\t\n\t\n\t","comments":"","x":816,"y":628,"z":"d7c523d9.040c","wires":[]},{"id":"a55c78ed.34cc38","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":955,"y":167,"z":"d7c523d9.040c","wires":[[]]}]
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 b5b3076ee..501e55cd0 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":"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.onap.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.onap.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.onap.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.onap.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
+[{"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.onap.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.onap.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.onap.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.onap.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.onap.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.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='`$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.onap.ccsdk.sli.core.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 3b2ea55d4..ffff09a51 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":"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
+[{"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.onap.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.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":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
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetConfigParams.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetConfigParams.json
index 3b7e70584..feac4da89 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetConfigParams.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetConfigParams.json
@@ -1 +1 @@
-[{"id":"bdadd291.e9b62","type":"dgstart","name":"DGSTART","outputs":1,"x":132,"y":77,"z":"9846523.9a152b","wires":[["5d2edae1.6fda04"]]},{"id":"85304d9c.535d2","type":"set","name":"set params based on Dispatcher Input","xml":"<set>\n<parameter name='vnf-id' value='`$input.action-identifiers.vnf-id`' /> \n<parameter name='service-instance-id' value='`$input.action-identifiers.service-instance-id`' /> \n\n\n<parameter name='request-id' value='`$input.common-header.request-id`' />\n<parameter name='originator-id' value='`$input.common-header.originator-id`' /> \n\n<parameter name='payload' value='`$input.payload`' /> \n<parameter name='api-ver' value='`$input.api-ver`' /> \n<parameter name='request-action' value='`$input.action`' />\n","comments":"","x":536,"y":120,"z":"9846523.9a152b","wires":[]},{"id":"5d2edae1.6fda04","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":283,"y":75,"z":"9846523.9a152b","wires":[["331e3f73.fe7c3"]]},{"id":"331e3f73.fe7c3","type":"method","name":"method GetConfigParams","xml":"<method rpc='GetConfigParams' mode='sync'>\n","comments":"","outputs":1,"x":490,"y":75,"z":"9846523.9a152b","wires":[["a78f2b9a.c49888"]]},{"id":"a78f2b9a.c49888","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":160,"y":587,"z":"9846523.9a152b","wires":[["85304d9c.535d2","34ff61f8.fd8f5e","8fc43feb.9a60c","c28019f8.afc3f8","9a0af1ec.da4f7","a77c9d6b.957d5","a05db48f.4a8cf8","b07d6e08.66999","877a53e3.29072","2e4ac4fe.4eb5bc","67ff975f.230538"]]},{"id":"877a53e3.29072","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=\"`$input.payload`\" />\n<parameter name=\"isEscaped\" value=\"N\" />\n<parameter name=\"blockKeys\" value=\"configuration-parameters,configuration.configuration-string,configuration.configuration-json\" />\n<parameter name=\"responsePrefix\" value=\"tmp.convertnode\" />","comments":"","outputs":1,"x":533.5,"y":275,"z":"9846523.9a152b","wires":[["a8121e8f.60cb8","2f277cc.c7f9f84"]]},{"id":"a8121e8f.60cb8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":777.5,"y":261,"z":"9846523.9a152b","wires":[["d0b0f72c.1ef9b8"]]},{"id":"2f277cc.c7f9f84","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":769.5,"y":311,"z":"9846523.9a152b","wires":[["85134164.cff61"]]},{"id":"d0b0f72c.1ef9b8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":920.5,"y":259,"z":"9846523.9a152b","wires":[["4130df1b.21a72"]]},{"id":"85134164.cff61","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":928.5,"y":307,"z":"9846523.9a152b","wires":[["c604dbab.f04f18"]]},{"id":"2e4ac4fe.4eb5bc","type":"set","name":"set Payload params ","xml":"<set>\n<!-- vnf type, name is from A&AI \n<parameter name='vnf-type' value='`$tmp.vnfInfo.vnf.vnf-type`' />\n<parameter name='vnf-name' value='`$tmp.vnfInfo.vnf.vnf-name`' />\n-->\n<!-- 17.07 Parameters from request -->\n<parameter name='template-name' value='`$request-parameters.template-name`' />\n<parameter name='vnf-host-ip-address' value='`$request-parameters.vnf-host-ip-address`' />\n<parameter name='vnfc-type' value='`$request-parameters.vnfc-type`' /> \n\n<parameter name='configurationblock' value='`$block_configuration`' />\n\n\n<!-- parameters to be merged with template provided as input-->\n<parameter name='configuration-params' value='`$block_configuration-parameters`' /> \n\n<!-- Get from AAI \n<parameter name='vnf-type' value='`$request-parameters.vnf-type`' />\n\n<parameter name='vnf-name' value='`$request-parameters.vnf-name`' />\n\n<parameter name='vnfc-type' value='`$request-parameters.vm[0].vnfc[0].vnfc-type`' />\n<parameter name='vm-name' value='`$request-parameters.vm[0].vm-name`' />\n-->\n\n<!-- Not Used?\n<parameter name='site-location' value='`$request-parameters.site-location`' />\n<parameter name='file-name' value='`$request-parameters.file-name`' />\n-->\n\n\n\n\n","comments":"","x":468,"y":350,"z":"9846523.9a152b","wires":[]},{"id":"4130df1b.21a72","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":1081.5,"y":258,"z":"9846523.9a152b","wires":[]},{"id":"c604dbab.f04f18","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 input parameters\"/>\n\t","comments":"","x":1090.5,"y":305,"z":"9846523.9a152b","wires":[]},{"id":"8fc43feb.9a60c","type":"switchNode","name":"switch configuration.configuration-string","xml":"<switch test='`$block_configuration.configuration-string`'>\n","comments":"","outputs":1,"x":482,"y":657,"z":"9846523.9a152b","wires":[["e2cb4e10.aec7a","c1e6d145.7f735"]]},{"id":"88df205a.bdea6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":921,"y":627,"z":"9846523.9a152b","wires":[[]]},{"id":"e2cb4e10.aec7a","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":757,"y":667,"z":"9846523.9a152b","wires":[["af9b29c9.310518"]]},{"id":"af9b29c9.310518","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":930,"y":666,"z":"9846523.9a152b","wires":[["d0db7df9.24bf"]]},{"id":"d0db7df9.24bf","type":"set","name":"set configuration","xml":"<set>\n<parameter name='configuration' value='`$block_configuration.configuration-string`' />\n","comments":"","x":1103,"y":667,"z":"9846523.9a152b","wires":[]},{"id":"93037cd8.f1eec","type":"comment","name":"CLI/XML","info":"","comments":"","x":1273,"y":644,"z":"9846523.9a152b","wires":[]},{"id":"c28019f8.afc3f8","type":"switchNode","name":"switch configuration.configuration-json","xml":"<switch test='`$block_configuration.configuration-json`'>\n","comments":"","outputs":1,"x":464.5,"y":720,"z":"9846523.9a152b","wires":[["68f64c8a.f2e724","6f982910.0c0b78"]]},{"id":"68f64c8a.f2e724","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":747.5,"y":764,"z":"9846523.9a152b","wires":[["3146e363.49402c"]]},{"id":"6e42dc89.a22324","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":923.5,"y":722,"z":"9846523.9a152b","wires":[[]]},{"id":"3146e363.49402c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":920.5,"y":761,"z":"9846523.9a152b","wires":[["94b621aa.d0b4b"]]},{"id":"94b621aa.d0b4b","type":"set","name":"set configuration","xml":"<set>\n<parameter name='configuration' value='`$block_configuration.configuration-json`' />\n","comments":"","x":1093.5,"y":761,"z":"9846523.9a152b","wires":[]},{"id":"cf21af62.b238b","type":"comment","name":"JSON","info":"","comments":"","x":1249,"y":758,"z":"9846523.9a152b","wires":[]},{"id":"34ff61f8.fd8f5e","type":"switchNode","name":"switch template-name","xml":"<switch test='`$template-name`'>\n","comments":"","outputs":1,"x":454,"y":554,"z":"9846523.9a152b","wires":[["bd1f9c68.27e6f","73d2981e.49fe78"]]},{"id":"bd1f9c68.27e6f","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":674,"y":533,"z":"9846523.9a152b","wires":[["5bb89cd3.40ca14"]]},{"id":"73d2981e.49fe78","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":679,"y":575,"z":"9846523.9a152b","wires":[["6f45286f.ee3fd8"]]},{"id":"6f45286f.ee3fd8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":852,"y":572,"z":"9846523.9a152b","wires":[["4e555f4.07e51a"]]},{"id":"4e555f4.07e51a","type":"set","name":"set config-type","xml":"<set>\n<parameter name='config-type' value='template' />\n","comments":"","x":1024,"y":574,"z":"9846523.9a152b","wires":[]},{"id":"9a0af1ec.da4f7","type":"switchNode","name":"switch configuration","xml":"<switch test='`$configuration`'>\n","comments":"","outputs":1,"x":434,"y":814,"z":"9846523.9a152b","wires":[["cd56d572.bb8218","5573ad8.e2dad54"]]},{"id":"cd56d572.bb8218","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":532,"y":897,"z":"9846523.9a152b","wires":[["77b23a98.d7bfa4"]]},{"id":"4b809017.42d3d","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":834,"y":823,"z":"9846523.9a152b","wires":[["e1702e21.a8c9a"]]},{"id":"8cd17825.b965d8","type":"set","name":"set config-type","xml":"<set>\n<parameter name='config-type' value='template' />\n","comments":"","x":1321,"y":912,"z":"9846523.9a152b","wires":[]},{"id":"82b1b984.79d688","type":"comment","name":"Template","info":"","comments":"","x":1301,"y":954,"z":"9846523.9a152b","wires":[]},{"id":"e1702e21.a8c9a","type":"switchNode","name":"switch Configuration params exists","xml":"<switch test='`$configuration-params`'>\n","comments":"","outputs":1,"x":1072,"y":823,"z":"9846523.9a152b","wires":[["f4c11152.2c21f","ad5ffddd.7bb23"]]},{"id":"f4c11152.2c21f","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":995,"y":910,"z":"9846523.9a152b","wires":[["432bcf96.ea922"]]},{"id":"432bcf96.ea922","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1159,"y":912,"z":"9846523.9a152b","wires":[["8cd17825.b965d8"]]},{"id":"2d36c832.da5f58","type":"comment","name":"Specific Template","info":"","comments":"","x":1215,"y":566,"z":"9846523.9a152b","wires":[]},{"id":"5bb89cd3.40ca14","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":863,"y":528,"z":"9846523.9a152b","wires":[[]]},{"id":"77b23a98.d7bfa4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":691,"y":900,"z":"9846523.9a152b","wires":[[]]},{"id":"11aca9f7.f168c6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1500,"y":806,"z":"9846523.9a152b","wires":[["d0d253e5.fc042"]]},{"id":"d0d253e5.fc042","type":"switchNode","name":"switch template-name","xml":"<switch test='`$template-name`'>\n","comments":"","outputs":1,"x":1690,"y":807,"z":"9846523.9a152b","wires":[["5a278bf.16fda74"]]},{"id":"6012a2aa.a432ec","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1718,"y":857,"z":"9846523.9a152b","wires":[["b3766c28.ca798"]]},{"id":"b3766c28.ca798","type":"set","name":"set config-type","xml":"<set>\n<parameter name='config-type' value='template' />\n","comments":"","x":1903,"y":859,"z":"9846523.9a152b","wires":[]},{"id":"dcb50714.1aaec8","type":"comment","name":"Restore scenario:ASDC Template to be directly donwloaded - no params","info":"","comments":"","x":1844,"y":905,"z":"9846523.9a152b","wires":[]},{"id":"c1e6d145.7f735","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":759,"y":623,"z":"9846523.9a152b","wires":[["88df205a.bdea6"]]},{"id":"6f982910.0c0b78","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":752,"y":715,"z":"9846523.9a152b","wires":[["6e42dc89.a22324"]]},{"id":"5573ad8.e2dad54","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":644,"y":818,"z":"9846523.9a152b","wires":[["4b809017.42d3d"]]},{"id":"ad5ffddd.7bb23","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":1337,"y":813,"z":"9846523.9a152b","wires":[["11aca9f7.f168c6"]]},{"id":"5a278bf.16fda74","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":1897,"y":811,"z":"9846523.9a152b","wires":[["6012a2aa.a432ec"]]},{"id":"a77c9d6b.957d5","type":"execute","name":"execute getCommonConfigInfo","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getCommonConfigInfo\">\n<parameter name=\"responsePrefix\" value=\"tmp.commonConfigInfo\" />\n","comments":"","outputs":1,"x":530,"y":1094,"z":"9846523.9a152b","wires":[["d7c8eaa0.3ee748","3cfaba11.b14c06","52458f74.54ba4"]]},{"id":"d7c8eaa0.3ee748","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":761,"y":1079,"z":"9846523.9a152b","wires":[["1a62b176.c364af"]]},{"id":"3cfaba11.b14c06","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":753,"y":1126,"z":"9846523.9a152b","wires":[["1fb56fbd.d2396"]]},{"id":"1a62b176.c364af","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":944,"y":1082,"z":"9846523.9a152b","wires":[["a0790e89.65e41"]]},{"id":"a0790e89.65e41","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Unable to Read Device Info\"/>\n\t\n","comments":"","x":1128,"y":1081,"z":"9846523.9a152b","wires":[]},{"id":"1fb56fbd.d2396","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":930,"y":1129,"z":"9846523.9a152b","wires":[["cca280e3.53bd6"]]},{"id":"cca280e3.53bd6","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.commonConfigInfo.error-message`\"/>\n\t\n\t\n\t\n","comments":"","x":1116,"y":1127,"z":"9846523.9a152b","wires":[]},{"id":"b07d6e08.66999","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"request\" />\n<parameter name=\"message\" value=\"`$tmp.message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":467,"y":194,"z":"9846523.9a152b","wires":[["c9769ad8.507058"]]},{"id":"a05db48f.4a8cf8","type":"set","name":"set tmp.message","xml":"<set>\n<parameter name=\"tmp.message\" value=\"`$vnf-id + ' : ' + $request-action + ': ' + $payload`\" />\n","comments":"","x":467,"y":155,"z":"9846523.9a152b","wires":[]},{"id":"c9769ad8.507058","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":651,"y":193,"z":"9846523.9a152b","wires":[["9f2b34ef.449da8"]]},{"id":"9f2b34ef.449da8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":808,"y":190,"z":"9846523.9a152b","wires":[[]]},{"id":"67ff975f.230538","type":"call","name":"call: getAAIInfo","xml":"<call module=\"APPC\" rpc=\"GetAaiInfo\" mode=\"sync\">","comments":"","outputs":1,"x":455,"y":435,"z":"9846523.9a152b","wires":[["2f57b512.b0b9ba"]]},{"id":"2f57b512.b0b9ba","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":631,"y":435,"z":"9846523.9a152b","wires":[["88e62d7d.4f67f"]]},{"id":"88e62d7d.4f67f","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":800,"y":440,"z":"9846523.9a152b","wires":[["adb46ab4.46b038"]]},{"id":"adb46ab4.46b038","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"DG Workflow GetAaiInfo not found\"/>\n\t","comments":"","x":983,"y":442,"z":"9846523.9a152b","wires":[]},{"id":"52458f74.54ba4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":757,"y":1185,"z":"9846523.9a152b","wires":[["8a5d9bf6.d965a8"]]},{"id":"8a5d9bf6.d965a8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":920,"y":1189,"z":"9846523.9a152b","wires":[["f0e76d61.b35cf"]]},{"id":"f0e76d61.b35cf","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=\"`$request-action`\"/>\n<parameter name=\"field3\" value=\"`$input.action`\"/>\n\n","comments":"","outputs":1,"x":1088,"y":1188,"z":"9846523.9a152b","wires":[[]]}]
+[{"id":"bdadd291.e9b62","type":"dgstart","name":"DGSTART","outputs":1,"x":132,"y":77,"z":"9846523.9a152b","wires":[["5d2edae1.6fda04"]]},{"id":"85304d9c.535d2","type":"set","name":"set params based on Dispatcher Input","xml":"<set>\n<parameter name='vnf-id' value='`$input.action-identifiers.vnf-id`' /> \n<parameter name='service-instance-id' value='`$input.action-identifiers.service-instance-id`' /> \n\n\n<parameter name='request-id' value='`$input.common-header.request-id`' />\n<parameter name='originator-id' value='`$input.common-header.originator-id`' /> \n\n<parameter name='payload' value='`$input.payload`' /> \n<parameter name='api-ver' value='`$input.api-ver`' /> \n<parameter name='request-action' value='`$input.action`' />\n","comments":"","x":536,"y":120,"z":"9846523.9a152b","wires":[]},{"id":"5d2edae1.6fda04","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":283,"y":75,"z":"9846523.9a152b","wires":[["331e3f73.fe7c3"]]},{"id":"331e3f73.fe7c3","type":"method","name":"method GetConfigParams","xml":"<method rpc='GetConfigParams' mode='sync'>\n","comments":"","outputs":1,"x":490,"y":75,"z":"9846523.9a152b","wires":[["a78f2b9a.c49888"]]},{"id":"a78f2b9a.c49888","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":160,"y":587,"z":"9846523.9a152b","wires":[["85304d9c.535d2","34ff61f8.fd8f5e","8fc43feb.9a60c","c28019f8.afc3f8","9a0af1ec.da4f7","a77c9d6b.957d5","a05db48f.4a8cf8","b07d6e08.66999","877a53e3.29072","2e4ac4fe.4eb5bc","67ff975f.230538"]]},{"id":"877a53e3.29072","type":"execute","name":"execute Convert payload to DG Context ","xml":"<execute plugin=\"org.onap.sdnc.config.generator.convert.ConvertNode\" method=\"convertJson2DGContext\">\n<parameter name=\"jsonData\" value=\"`$input.payload`\" />\n<parameter name=\"isEscaped\" value=\"N\" />\n<parameter name=\"blockKeys\" value=\"configuration-parameters,configuration.configuration-string,configuration.configuration-json\" />\n<parameter name=\"responsePrefix\" value=\"tmp.convertnode\" />","comments":"","outputs":1,"x":533.5,"y":275,"z":"9846523.9a152b","wires":[["a8121e8f.60cb8","2f277cc.c7f9f84"]]},{"id":"a8121e8f.60cb8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":777.5,"y":261,"z":"9846523.9a152b","wires":[["d0b0f72c.1ef9b8"]]},{"id":"2f277cc.c7f9f84","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":769.5,"y":311,"z":"9846523.9a152b","wires":[["85134164.cff61"]]},{"id":"d0b0f72c.1ef9b8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":920.5,"y":259,"z":"9846523.9a152b","wires":[["4130df1b.21a72"]]},{"id":"85134164.cff61","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":928.5,"y":307,"z":"9846523.9a152b","wires":[["c604dbab.f04f18"]]},{"id":"2e4ac4fe.4eb5bc","type":"set","name":"set Payload params ","xml":"<set>\n<!-- vnf type, name is from A&AI \n<parameter name='vnf-type' value='`$tmp.vnfInfo.vnf.vnf-type`' />\n<parameter name='vnf-name' value='`$tmp.vnfInfo.vnf.vnf-name`' />\n-->\n<!-- 17.07 Parameters from request -->\n<parameter name='template-name' value='`$request-parameters.template-name`' />\n<parameter name='vnf-host-ip-address' value='`$request-parameters.vnf-host-ip-address`' />\n<parameter name='vnfc-type' value='`$request-parameters.vnfc-type`' /> \n\n<parameter name='configurationblock' value='`$block_configuration`' />\n\n\n<!-- parameters to be merged with template provided as input-->\n<parameter name='configuration-params' value='`$block_configuration-parameters`' /> \n\n<!-- Get from AAI \n<parameter name='vnf-type' value='`$request-parameters.vnf-type`' />\n\n<parameter name='vnf-name' value='`$request-parameters.vnf-name`' />\n\n<parameter name='vnfc-type' value='`$request-parameters.vm[0].vnfc[0].vnfc-type`' />\n<parameter name='vm-name' value='`$request-parameters.vm[0].vm-name`' />\n-->\n\n<!-- Not Used?\n<parameter name='site-location' value='`$request-parameters.site-location`' />\n<parameter name='file-name' value='`$request-parameters.file-name`' />\n-->\n\n\n\n\n","comments":"","x":468,"y":350,"z":"9846523.9a152b","wires":[]},{"id":"4130df1b.21a72","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":1081.5,"y":258,"z":"9846523.9a152b","wires":[]},{"id":"c604dbab.f04f18","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 input parameters\"/>\n\t","comments":"","x":1090.5,"y":305,"z":"9846523.9a152b","wires":[]},{"id":"8fc43feb.9a60c","type":"switchNode","name":"switch configuration.configuration-string","xml":"<switch test='`$block_configuration.configuration-string`'>\n","comments":"","outputs":1,"x":482,"y":657,"z":"9846523.9a152b","wires":[["e2cb4e10.aec7a","c1e6d145.7f735"]]},{"id":"88df205a.bdea6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":921,"y":627,"z":"9846523.9a152b","wires":[[]]},{"id":"e2cb4e10.aec7a","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":757,"y":667,"z":"9846523.9a152b","wires":[["af9b29c9.310518"]]},{"id":"af9b29c9.310518","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":930,"y":666,"z":"9846523.9a152b","wires":[["d0db7df9.24bf"]]},{"id":"d0db7df9.24bf","type":"set","name":"set configuration","xml":"<set>\n<parameter name='configuration' value='`$block_configuration.configuration-string`' />\n","comments":"","x":1103,"y":667,"z":"9846523.9a152b","wires":[]},{"id":"93037cd8.f1eec","type":"comment","name":"CLI/XML","info":"","comments":"","x":1273,"y":644,"z":"9846523.9a152b","wires":[]},{"id":"c28019f8.afc3f8","type":"switchNode","name":"switch configuration.configuration-json","xml":"<switch test='`$block_configuration.configuration-json`'>\n","comments":"","outputs":1,"x":464.5,"y":720,"z":"9846523.9a152b","wires":[["68f64c8a.f2e724","6f982910.0c0b78"]]},{"id":"68f64c8a.f2e724","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":747.5,"y":764,"z":"9846523.9a152b","wires":[["3146e363.49402c"]]},{"id":"6e42dc89.a22324","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":923.5,"y":722,"z":"9846523.9a152b","wires":[[]]},{"id":"3146e363.49402c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":920.5,"y":761,"z":"9846523.9a152b","wires":[["94b621aa.d0b4b"]]},{"id":"94b621aa.d0b4b","type":"set","name":"set configuration","xml":"<set>\n<parameter name='configuration' value='`$block_configuration.configuration-json`' />\n","comments":"","x":1093.5,"y":761,"z":"9846523.9a152b","wires":[]},{"id":"cf21af62.b238b","type":"comment","name":"JSON","info":"","comments":"","x":1249,"y":758,"z":"9846523.9a152b","wires":[]},{"id":"34ff61f8.fd8f5e","type":"switchNode","name":"switch template-name","xml":"<switch test='`$template-name`'>\n","comments":"","outputs":1,"x":454,"y":554,"z":"9846523.9a152b","wires":[["bd1f9c68.27e6f","73d2981e.49fe78"]]},{"id":"bd1f9c68.27e6f","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":674,"y":533,"z":"9846523.9a152b","wires":[["5bb89cd3.40ca14"]]},{"id":"73d2981e.49fe78","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":679,"y":575,"z":"9846523.9a152b","wires":[["6f45286f.ee3fd8"]]},{"id":"6f45286f.ee3fd8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":852,"y":572,"z":"9846523.9a152b","wires":[["4e555f4.07e51a"]]},{"id":"4e555f4.07e51a","type":"set","name":"set config-type","xml":"<set>\n<parameter name='config-type' value='template' />\n","comments":"","x":1024,"y":574,"z":"9846523.9a152b","wires":[]},{"id":"9a0af1ec.da4f7","type":"switchNode","name":"switch configuration","xml":"<switch test='`$configuration`'>\n","comments":"","outputs":1,"x":434,"y":814,"z":"9846523.9a152b","wires":[["cd56d572.bb8218","5573ad8.e2dad54"]]},{"id":"cd56d572.bb8218","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":532,"y":897,"z":"9846523.9a152b","wires":[["77b23a98.d7bfa4"]]},{"id":"4b809017.42d3d","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":834,"y":823,"z":"9846523.9a152b","wires":[["e1702e21.a8c9a"]]},{"id":"8cd17825.b965d8","type":"set","name":"set config-type","xml":"<set>\n<parameter name='config-type' value='template' />\n","comments":"","x":1321,"y":912,"z":"9846523.9a152b","wires":[]},{"id":"82b1b984.79d688","type":"comment","name":"Template","info":"","comments":"","x":1301,"y":954,"z":"9846523.9a152b","wires":[]},{"id":"e1702e21.a8c9a","type":"switchNode","name":"switch Configuration params exists","xml":"<switch test='`$configuration-params`'>\n","comments":"","outputs":1,"x":1072,"y":823,"z":"9846523.9a152b","wires":[["f4c11152.2c21f","ad5ffddd.7bb23"]]},{"id":"f4c11152.2c21f","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":995,"y":910,"z":"9846523.9a152b","wires":[["432bcf96.ea922"]]},{"id":"432bcf96.ea922","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1159,"y":912,"z":"9846523.9a152b","wires":[["8cd17825.b965d8"]]},{"id":"2d36c832.da5f58","type":"comment","name":"Specific Template","info":"","comments":"","x":1215,"y":566,"z":"9846523.9a152b","wires":[]},{"id":"5bb89cd3.40ca14","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":863,"y":528,"z":"9846523.9a152b","wires":[[]]},{"id":"77b23a98.d7bfa4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":691,"y":900,"z":"9846523.9a152b","wires":[[]]},{"id":"11aca9f7.f168c6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1500,"y":806,"z":"9846523.9a152b","wires":[["d0d253e5.fc042"]]},{"id":"d0d253e5.fc042","type":"switchNode","name":"switch template-name","xml":"<switch test='`$template-name`'>\n","comments":"","outputs":1,"x":1690,"y":807,"z":"9846523.9a152b","wires":[["5a278bf.16fda74"]]},{"id":"6012a2aa.a432ec","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1718,"y":857,"z":"9846523.9a152b","wires":[["b3766c28.ca798"]]},{"id":"b3766c28.ca798","type":"set","name":"set config-type","xml":"<set>\n<parameter name='config-type' value='template' />\n","comments":"","x":1903,"y":859,"z":"9846523.9a152b","wires":[]},{"id":"dcb50714.1aaec8","type":"comment","name":"Restore scenario:ASDC Template to be directly donwloaded - no params","info":"","comments":"","x":1844,"y":905,"z":"9846523.9a152b","wires":[]},{"id":"c1e6d145.7f735","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":759,"y":623,"z":"9846523.9a152b","wires":[["88df205a.bdea6"]]},{"id":"6f982910.0c0b78","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":752,"y":715,"z":"9846523.9a152b","wires":[["6e42dc89.a22324"]]},{"id":"5573ad8.e2dad54","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":644,"y":818,"z":"9846523.9a152b","wires":[["4b809017.42d3d"]]},{"id":"ad5ffddd.7bb23","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":1337,"y":813,"z":"9846523.9a152b","wires":[["11aca9f7.f168c6"]]},{"id":"5a278bf.16fda74","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":1897,"y":811,"z":"9846523.9a152b","wires":[["6012a2aa.a432ec"]]},{"id":"a77c9d6b.957d5","type":"execute","name":"execute getCommonConfigInfo","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getCommonConfigInfo\">\n<parameter name=\"responsePrefix\" value=\"tmp.commonConfigInfo\" />\n","comments":"","outputs":1,"x":530,"y":1094,"z":"9846523.9a152b","wires":[["d7c8eaa0.3ee748","3cfaba11.b14c06","52458f74.54ba4"]]},{"id":"d7c8eaa0.3ee748","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":761,"y":1079,"z":"9846523.9a152b","wires":[["1a62b176.c364af"]]},{"id":"3cfaba11.b14c06","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":753,"y":1126,"z":"9846523.9a152b","wires":[["1fb56fbd.d2396"]]},{"id":"1a62b176.c364af","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":944,"y":1082,"z":"9846523.9a152b","wires":[["a0790e89.65e41"]]},{"id":"a0790e89.65e41","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Unable to Read Device Info\"/>\n\t\n","comments":"","x":1128,"y":1081,"z":"9846523.9a152b","wires":[]},{"id":"1fb56fbd.d2396","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":930,"y":1129,"z":"9846523.9a152b","wires":[["cca280e3.53bd6"]]},{"id":"cca280e3.53bd6","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.commonConfigInfo.error-message`\"/>\n\t\n\t\n\t\n","comments":"","x":1116,"y":1127,"z":"9846523.9a152b","wires":[]},{"id":"b07d6e08.66999","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"request\" />\n<parameter name=\"message\" value=\"`$tmp.message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":467,"y":194,"z":"9846523.9a152b","wires":[["c9769ad8.507058"]]},{"id":"a05db48f.4a8cf8","type":"set","name":"set tmp.message","xml":"<set>\n<parameter name=\"tmp.message\" value=\"`$vnf-id + ' : ' + $request-action + ': ' + $payload`\" />\n","comments":"","x":467,"y":155,"z":"9846523.9a152b","wires":[]},{"id":"c9769ad8.507058","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":651,"y":193,"z":"9846523.9a152b","wires":[["9f2b34ef.449da8"]]},{"id":"9f2b34ef.449da8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":808,"y":190,"z":"9846523.9a152b","wires":[[]]},{"id":"67ff975f.230538","type":"call","name":"call: getAAIInfo","xml":"<call module=\"APPC\" rpc=\"GetAaiInfo\" mode=\"sync\">","comments":"","outputs":1,"x":455,"y":435,"z":"9846523.9a152b","wires":[["2f57b512.b0b9ba"]]},{"id":"2f57b512.b0b9ba","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":631,"y":435,"z":"9846523.9a152b","wires":[["88e62d7d.4f67f"]]},{"id":"88e62d7d.4f67f","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":800,"y":440,"z":"9846523.9a152b","wires":[["adb46ab4.46b038"]]},{"id":"adb46ab4.46b038","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"DG Workflow GetAaiInfo not found\"/>\n\t","comments":"","x":983,"y":442,"z":"9846523.9a152b","wires":[]},{"id":"52458f74.54ba4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":757,"y":1185,"z":"9846523.9a152b","wires":[["8a5d9bf6.d965a8"]]},{"id":"8a5d9bf6.d965a8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":920,"y":1189,"z":"9846523.9a152b","wires":[["f0e76d61.b35cf"]]},{"id":"f0e76d61.b35cf","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=\"`$request-action`\"/>\n<parameter name=\"field3\" value=\"`$input.action`\"/>\n\n","comments":"","outputs":1,"x":1088,"y":1188,"z":"9846523.9a152b","wires":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json
index 562a1a75d..1bb7a88ee 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json
@@ -1 +1 @@
-[{"id":"2158a194.1f194e","type":"dgstart","name":"DGSTART","outputs":1,"x":210,"y":82,"z":"1d62f09b.653dff","wires":[["d50915e2.c462a8"]]},{"id":"d50915e2.c462a8","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":362,"y":85,"z":"1d62f09b.653dff","wires":[["69400c59.f5b5b4"]]},{"id":"69400c59.f5b5b4","type":"method","name":"method ProcessParametersDefinition","xml":"<method rpc='ProcessParameterDefinition' mode='sync'>\n","comments":"","outputs":1,"x":617,"y":84,"z":"1d62f09b.653dff","wires":[["e4aa58e0.4cf328"]]},{"id":"e4aa58e0.4cf328","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":238,"y":144,"z":"1d62f09b.653dff","wires":[["666a8fd4.8ffd8"]]},{"id":"666a8fd4.8ffd8","type":"execute","name":"execute getTemplate Parameter_definition","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getTemplate\">\n<parameter name=\"fileCategory\" value=\"parameter_definitions\" />\n<parameter name=\"responsePrefix\" value=\"parameter-definitions\" />","comments":"","outputs":1,"x":553,"y":142,"z":"1d62f09b.653dff","wires":[["a5091352.53d75","98e0dc66.4938a","8c1764db.08e568"]]},{"id":"a5091352.53d75","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":872,"y":135,"z":"1d62f09b.653dff","wires":[["fc420e10.a4535"]]},{"id":"8c1764db.08e568","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":864,"y":174,"z":"1d62f09b.653dff","wires":[["3372dc74.357bb4"]]},{"id":"fc420e10.a4535","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1024,"y":131,"z":"1d62f09b.653dff","wires":[["351359fa.9d4f26"]]},{"id":"3372dc74.357bb4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1018,"y":181,"z":"1d62f09b.653dff","wires":[["811b2688.0dcd18"]]},{"id":"351359fa.9d4f26","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Unable to get parameter definitions\"/>\n\t\n\t\n\t","comments":"","x":1194,"y":133,"z":"1d62f09b.653dff","wires":[]},{"id":"3f6dcf76.40da4","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$parameter-definitions.error-message`\"/>\n\t\n\t\n\t","comments":"","x":1182,"y":231,"z":"1d62f09b.653dff","wires":[]},{"id":"86037f00.c7dc5","type":"execute","name":"execute Get Instar Params","xml":"<execute plugin=\"org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode\" method=\"processExternalSystemParamKeys\">\n<parameter name=\"systemName\" value=\"INSTAR\" />\n<parameter name=\"pdContent\" value=\"`$parameter-definitions.file-content`\" />\n<parameter name=\"jsonData\" value=\"`$configuration-params`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.instarParams\" />","comments":"","outputs":1,"x":298,"y":289,"z":"1d62f09b.653dff","wires":[["6d835a53.6595c4","66d08efa.e628b"]]},{"id":"6d835a53.6595c4","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":552,"y":271,"z":"1d62f09b.653dff","wires":[["e032c80c.ba08a8"]]},{"id":"66d08efa.e628b","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":540,"y":334,"z":"1d62f09b.653dff","wires":[["e88e851b.315d38"]]},{"id":"e032c80c.ba08a8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":715,"y":273,"z":"1d62f09b.653dff","wires":[["70028148.74044"]]},{"id":"e88e851b.315d38","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":688,"y":332,"z":"1d62f09b.653dff","wires":[["52ccb0b.e0de95"]]},{"id":"70028148.74044","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Unable to get Instar parameter definitions\"/>\n\t\n\t\n\t","comments":"","x":893,"y":270,"z":"1d62f09b.653dff","wires":[]},{"id":"52ccb0b.e0de95","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.instarParams.error-message`\"/>\n\t\n\t\n\t","comments":"","x":861,"y":331,"z":"1d62f09b.653dff","wires":[]},{"id":"33e8a0b7.d58be","type":"execute","name":"execute getTemplate Parameter_yang","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getTemplate\">\n<parameter name=\"fileCategory\" value=\"parameter_yang\" />\n<parameter name=\"responsePrefix\" value=\"parameter-yang\" />","comments":"","outputs":1,"x":326,"y":738,"z":"1d62f09b.653dff","wires":[["5411882c.030498","b0439127.fa374","39fe603c.f8171"]]},{"id":"5411882c.030498","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":582.5,"y":708,"z":"1d62f09b.653dff","wires":[["15ab6272.d3333e"]]},{"id":"b0439127.fa374","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":575.5,"y":766,"z":"1d62f09b.653dff","wires":[["6ed77220.53ab6c"]]},{"id":"15ab6272.d3333e","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":728.5,"y":707,"z":"1d62f09b.653dff","wires":[["5abbbddd.2fdd84","7f07065c.21aa58","dc62f036.1a331"]]},{"id":"6ed77220.53ab6c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":719.5,"y":768,"z":"1d62f09b.653dff","wires":[["8e93eb26.7e0988","7f07065c.21aa58","dc62f036.1a331"]]},{"id":"6a3156b.ee952a8","type":"comment","name":"INSTAR keys","info":"Result: [INSTAR.LOCAL_CORE_ALT_IP_ADDR.request-logic, INSTAR.LOCAL_CORE_ALT_IP_ADDR_MOD.request-logic, test.status, INSTAR.LOCAL_CORE_ALT_IP_ADDR_MOD.response-logic, INSTAR.LOCAL_CORE_ALT_IP_ADDR.response-logic, INSTAR.keys]\nINSTAR.keys : [\"LOCAL_CORE_ALT_IP_ADDR\",\"LOCAL_CORE_ALT_IP_ADDR_MOD\"]\nINSTAR.LOCAL_CORE_ALT_IP_ADDR.request-logic : null\nINSTAR.LOCAL_CORE_ALT_IP_ADDR.response-logic : null","comments":"","x":1465.5,"y":432,"z":"1d62f09b.653dff","wires":[]},{"id":"e5e7d1ac.76bb7","type":"execute","name":"execute Get Instar Data","xml":"<execute plugin=\"org.onap.appc.instar.node.InstarClientNode\" method=\"getInstarInfo\">\n<parameter name=\"instarKeys\" value=\"`$INSTAR.keys`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.instarValues\" />\n","comments":"","outputs":1,"x":881.5,"y":491,"z":"1d62f09b.653dff","wires":[["93afed75.efdb3"]]},{"id":"93afed75.efdb3","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1138.5,"y":489,"z":"1d62f09b.653dff","wires":[["70f1ba7e.3d82f4"]]},{"id":"70f1ba7e.3d82f4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1298.5,"y":491,"z":"1d62f09b.653dff","wires":[["2b90ad9a.211d22"]]},{"id":"2b90ad9a.211d22","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.instarValues.error-message`\"/>\n\t\n\t\n\t","comments":"","x":1467.5,"y":488,"z":"1d62f09b.653dff","wires":[]},{"id":"ca662853.446ed8","type":"execute","name":"execute read PD file","xml":"<execute plugin=\"org.openecomp.sdnc.config.generator.reader.ReaderNode\" method=\"getFileData\">\n<parameter name=\"fileName\" value=\"/opt/app/bvc/templates/pd.yaml\" />\n<parameter name=\"responsePrefix\" value=\"tmpFileData\" />","comments":"","outputs":1,"x":1477.5,"y":96,"z":"1d62f09b.653dff","wires":[[]]},{"id":"e6b2c683.cca4e8","type":"execute","name":"execute Get Complete Set of Params","xml":"<execute plugin=\"org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode\" method=\"mergeJsonData\">\n<parameter name=\"jsonData\" value=\"`$configuration-params`\" />\n<parameter name=\"mergeJsonData\" value=\"`$tmp.instarValues.INSTAR-KEY-VALUES`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.allParams\" />","comments":"","outputs":1,"x":895.5,"y":566,"z":"1d62f09b.653dff","wires":[["e087477f.d4f878"]]},{"id":"e087477f.d4f878","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1153,"y":569,"z":"1d62f09b.653dff","wires":[["20063435.aecd9c"]]},{"id":"20063435.aecd9c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1305,"y":566,"z":"1d62f09b.653dff","wires":[["5761a3cf.c4dc4c"]]},{"id":"5761a3cf.c4dc4c","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.allParams.error-message`\"/>\n\t\n\t\n\t","comments":"","x":1456,"y":571,"z":"1d62f09b.653dff","wires":[]},{"id":"4577a98f.9f9c28","type":"set","name":"set","xml":"<set>\n<parameter name='parameter-definitions.file-content' value='`$tmpFileData.fileData`' />\n","comments":"","x":1457.5,"y":169,"z":"1d62f09b.653dff","wires":[]},{"id":"7d1276d9.b854e8","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=\"`$INSTAR.keys`\" />\n","comments":"","outputs":1,"x":820,"y":443,"z":"1d62f09b.653dff","wires":[[]]},{"id":"a56b5f50.f6b18","type":"switchNode","name":"switch Instar Keys exists","xml":"<switch test='`$INSTAR.keys`'>\n","comments":"","outputs":1,"x":262,"y":438,"z":"1d62f09b.653dff","wires":[["35618876.01a2a8","bb3b56aa.fca5a8","285829ff.5ef416"]]},{"id":"35618876.01a2a8","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":481,"y":441,"z":"1d62f09b.653dff","wires":[["bb0994f5.44ccc8"]]},{"id":"bb0994f5.44ccc8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":662,"y":442,"z":"1d62f09b.653dff","wires":[[]]},{"id":"bb3b56aa.fca5a8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":466,"y":492,"z":"1d62f09b.653dff","wires":[["686e1d0f.ea0634"]]},{"id":"686e1d0f.ea0634","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":632,"y":492,"z":"1d62f09b.653dff","wires":[["e5e7d1ac.76bb7","e6b2c683.cca4e8","41045718.d06e28","7d1276d9.b854e8"]]},{"id":"41045718.d06e28","type":"set","name":"set configuration-params","xml":"<set>\n<parameter name='configuration-params' value='`$tmp.allParams.configuration-parameters`' />\n\n","comments":"","x":851,"y":630,"z":"1d62f09b.653dff","wires":[]},{"id":"39fe603c.f8171","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":257.5,"y":828,"z":"1d62f09b.653dff","wires":[["547d62bf.0b6c4c"]]},{"id":"547d62bf.0b6c4c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":420.5,"y":831,"z":"1d62f09b.653dff","wires":[["6d22c69f.2abc38"]]},{"id":"6d22c69f.2abc38","type":"execute","name":"execute Save in MDSal","xml":"<execute plugin='org.onap.appc.dg.common.VNFConfigurator' method='storeConfig' >\n<parameter name=\"uniqueId\" value=\"`$parameter-yang.config-file-id`\" />\n<parameter name=\"yang\" value=\"`$parameter-yang.file-content`\" />\n<parameter name=\"requestId\" value=\"`$request-id`\" />\n<parameter name=\"configJSON\" value=\"`'{&quot;vnf-config&quot;:' + $configuration-params + '}'`\" />\n<parameter name=\"prefix\" value=\"tmp.mdSalSave\" />\n\n<!--\n<parameter name=\"configJSON\" value=\"`$configuration-params`\" /> -->\n","comments":"","outputs":1,"x":643.5,"y":834,"z":"1d62f09b.653dff","wires":[["24f7581c.4787f8"]]},{"id":"24f7581c.4787f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":840.5,"y":838,"z":"1d62f09b.653dff","wires":[["729cb57e.d7997c"]]},{"id":"729cb57e.d7997c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":984.5,"y":837,"z":"1d62f09b.653dff","wires":[["1591ce44.e43822","7f07065c.21aa58","dc62f036.1a331"]]},{"id":"5abbbddd.2fdd84","type":"set","name":"set: dcae-error message","xml":"<set>\n <parameter name=\"dcae-error-message\" value=\"Unable to get Yang Model\"/>","comments":"","x":944.5,"y":708,"z":"1d62f09b.653dff","wires":[]},{"id":"8e93eb26.7e0988","type":"set","name":"set: dcae-error message","xml":"<set>\n <parameter name=\"dcae-error-message\" value=\"`$parameter-yang.error-message`\"/>","comments":"","x":922.5,"y":769,"z":"1d62f09b.653dff","wires":[]},{"id":"1591ce44.e43822","type":"set","name":"set: dcae-error message","xml":"<set>\n <parameter name=\"dcae-error-message\" value=\"`$tmp.mdSalSave.ERROR_MESSAGE`\"/>","comments":"","x":1194.5,"y":836,"z":"1d62f09b.653dff","wires":[]},{"id":"7f07065c.21aa58","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"`'501:' + $dcae-error-message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":735.5,"y":934,"z":"1d62f09b.653dff","wires":[["f8490268.c930e"]]},{"id":"3c5625a1.eec71a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1108.5,"y":935,"z":"1d62f09b.653dff","wires":[[]]},{"id":"f8490268.c930e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":937.5,"y":936,"z":"1d62f09b.653dff","wires":[["3c5625a1.eec71a"]]},{"id":"dc62f036.1a331","type":"execute","name":"execute IntermediateMessageSender","xml":"<execute plugin='org.onap.appc.dg.common.IntermediateMessageSender' method='sendMessage' >\n<parameter name='code' value=\"501\" />\n<parameter name='message' value=\"`$dcae-error-message`\" />\n<parameter name='prefix' value=\"tmp.intermediateerror\"/>","comments":"","outputs":1,"x":766.5,"y":1008,"z":"1d62f09b.653dff","wires":[["c105074b.328e78","4f55c02f.e48f3"]]},{"id":"c105074b.328e78","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1002.5,"y":1006,"z":"1d62f09b.653dff","wires":[["1ad124f3.55337b"]]},{"id":"4f55c02f.e48f3","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":987.5,"y":1069,"z":"1d62f09b.653dff","wires":[["1ad124f3.55337b"]]},{"id":"f4496313.24acc","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=\"MSGSENDERERERROR\" value=\"Unable to call IntermediateErrorMessageSender\"/>\n","comments":"","outputs":1,"x":1310.5,"y":1041,"z":"1d62f09b.653dff","wires":[[]]},{"id":"98e0dc66.4938a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":159,"y":206,"z":"1d62f09b.653dff","wires":[["55593da7.06c544"]]},{"id":"55593da7.06c544","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":320,"y":211,"z":"1d62f09b.653dff","wires":[["86037f00.c7dc5","a56b5f50.f6b18","33e8a0b7.d58be"]]},{"id":"811b2688.0dcd18","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=\"`'PD FILE NOTFOUND ' + $parameter-definitions.error-message`\" />\n","comments":"","outputs":1,"x":1153,"y":182,"z":"1d62f09b.653dff","wires":[[]]},{"id":"285829ff.5ef416","type":"success","name":"outcome: []","xml":"<outcome value='[]'>","comments":"","outputs":1,"x":486,"y":396,"z":"1d62f09b.653dff","wires":[["392efcf6.e32734"]]},{"id":"392efcf6.e32734","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":647,"y":397,"z":"1d62f09b.653dff","wires":[[]]},{"id":"1ad124f3.55337b","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1158,"y":1038,"z":"1d62f09b.653dff","wires":[["f4496313.24acc"]]}]
+[{"id":"2158a194.1f194e","type":"dgstart","name":"DGSTART","outputs":1,"x":210,"y":82,"z":"1d62f09b.653dff","wires":[["d50915e2.c462a8"]]},{"id":"d50915e2.c462a8","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":362,"y":85,"z":"1d62f09b.653dff","wires":[["69400c59.f5b5b4"]]},{"id":"69400c59.f5b5b4","type":"method","name":"method ProcessParametersDefinition","xml":"<method rpc='ProcessParameterDefinition' mode='sync'>\n","comments":"","outputs":1,"x":617,"y":84,"z":"1d62f09b.653dff","wires":[["e4aa58e0.4cf328"]]},{"id":"e4aa58e0.4cf328","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":238,"y":144,"z":"1d62f09b.653dff","wires":[["666a8fd4.8ffd8"]]},{"id":"666a8fd4.8ffd8","type":"execute","name":"execute getTemplate Parameter_definition","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getTemplate\">\n<parameter name=\"fileCategory\" value=\"parameter_definitions\" />\n<parameter name=\"responsePrefix\" value=\"parameter-definitions\" />","comments":"","outputs":1,"x":553,"y":142,"z":"1d62f09b.653dff","wires":[["a5091352.53d75","98e0dc66.4938a","8c1764db.08e568"]]},{"id":"a5091352.53d75","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":872,"y":135,"z":"1d62f09b.653dff","wires":[["fc420e10.a4535"]]},{"id":"8c1764db.08e568","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":864,"y":174,"z":"1d62f09b.653dff","wires":[["3372dc74.357bb4"]]},{"id":"fc420e10.a4535","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1024,"y":131,"z":"1d62f09b.653dff","wires":[["351359fa.9d4f26"]]},{"id":"3372dc74.357bb4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1018,"y":181,"z":"1d62f09b.653dff","wires":[["811b2688.0dcd18"]]},{"id":"351359fa.9d4f26","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Unable to get parameter definitions\"/>\n\t\n\t\n\t","comments":"","x":1194,"y":133,"z":"1d62f09b.653dff","wires":[]},{"id":"3f6dcf76.40da4","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$parameter-definitions.error-message`\"/>\n\t\n\t\n\t","comments":"","x":1182,"y":231,"z":"1d62f09b.653dff","wires":[]},{"id":"86037f00.c7dc5","type":"execute","name":"execute Get Instar Params","xml":"<execute plugin=\"org.onap.sdnc.config.params.parser.PropertyDefinitionNode\" method=\"processExternalSystemParamKeys\">\n<parameter name=\"systemName\" value=\"INSTAR\" />\n<parameter name=\"pdContent\" value=\"`$parameter-definitions.file-content`\" />\n<parameter name=\"jsonData\" value=\"`$configuration-params`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.instarParams\" />","comments":"","outputs":1,"x":298,"y":289,"z":"1d62f09b.653dff","wires":[["6d835a53.6595c4","66d08efa.e628b"]]},{"id":"6d835a53.6595c4","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":552,"y":271,"z":"1d62f09b.653dff","wires":[["e032c80c.ba08a8"]]},{"id":"66d08efa.e628b","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":540,"y":334,"z":"1d62f09b.653dff","wires":[["e88e851b.315d38"]]},{"id":"e032c80c.ba08a8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":715,"y":273,"z":"1d62f09b.653dff","wires":[["70028148.74044"]]},{"id":"e88e851b.315d38","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":688,"y":332,"z":"1d62f09b.653dff","wires":[["52ccb0b.e0de95"]]},{"id":"70028148.74044","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Unable to get Instar parameter definitions\"/>\n\t\n\t\n\t","comments":"","x":893,"y":270,"z":"1d62f09b.653dff","wires":[]},{"id":"52ccb0b.e0de95","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.instarParams.error-message`\"/>\n\t\n\t\n\t","comments":"","x":861,"y":331,"z":"1d62f09b.653dff","wires":[]},{"id":"33e8a0b7.d58be","type":"execute","name":"execute getTemplate Parameter_yang","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getTemplate\">\n<parameter name=\"fileCategory\" value=\"parameter_yang\" />\n<parameter name=\"responsePrefix\" value=\"parameter-yang\" />","comments":"","outputs":1,"x":326,"y":738,"z":"1d62f09b.653dff","wires":[["5411882c.030498","b0439127.fa374","39fe603c.f8171"]]},{"id":"5411882c.030498","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":582.5,"y":708,"z":"1d62f09b.653dff","wires":[["15ab6272.d3333e"]]},{"id":"b0439127.fa374","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":575.5,"y":766,"z":"1d62f09b.653dff","wires":[["6ed77220.53ab6c"]]},{"id":"15ab6272.d3333e","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":728.5,"y":707,"z":"1d62f09b.653dff","wires":[["5abbbddd.2fdd84","7f07065c.21aa58","dc62f036.1a331"]]},{"id":"6ed77220.53ab6c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":719.5,"y":768,"z":"1d62f09b.653dff","wires":[["8e93eb26.7e0988","7f07065c.21aa58","dc62f036.1a331"]]},{"id":"6a3156b.ee952a8","type":"comment","name":"INSTAR keys","info":"Result: [INSTAR.LOCAL_CORE_ALT_IP_ADDR.request-logic, INSTAR.LOCAL_CORE_ALT_IP_ADDR_MOD.request-logic, test.status, INSTAR.LOCAL_CORE_ALT_IP_ADDR_MOD.response-logic, INSTAR.LOCAL_CORE_ALT_IP_ADDR.response-logic, INSTAR.keys]\nINSTAR.keys : [\"LOCAL_CORE_ALT_IP_ADDR\",\"LOCAL_CORE_ALT_IP_ADDR_MOD\"]\nINSTAR.LOCAL_CORE_ALT_IP_ADDR.request-logic : null\nINSTAR.LOCAL_CORE_ALT_IP_ADDR.response-logic : null","comments":"","x":1465.5,"y":432,"z":"1d62f09b.653dff","wires":[]},{"id":"e5e7d1ac.76bb7","type":"execute","name":"execute Get Instar Data","xml":"<execute plugin=\"org.onap.appc.instar.node.InstarClientNode\" method=\"getInstarInfo\">\n<parameter name=\"instarKeys\" value=\"`$INSTAR.keys`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.instarValues\" />\n","comments":"","outputs":1,"x":881.5,"y":491,"z":"1d62f09b.653dff","wires":[["93afed75.efdb3"]]},{"id":"93afed75.efdb3","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1138.5,"y":489,"z":"1d62f09b.653dff","wires":[["70f1ba7e.3d82f4"]]},{"id":"70f1ba7e.3d82f4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1298.5,"y":491,"z":"1d62f09b.653dff","wires":[["2b90ad9a.211d22"]]},{"id":"2b90ad9a.211d22","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.instarValues.error-message`\"/>\n\t\n\t\n\t","comments":"","x":1467.5,"y":488,"z":"1d62f09b.653dff","wires":[]},{"id":"ca662853.446ed8","type":"execute","name":"execute read PD file","xml":"<execute plugin=\"org.onap.sdnc.config.generator.reader.ReaderNode\" method=\"getFileData\">\n<parameter name=\"fileName\" value=\"/opt/app/bvc/templates/pd.yaml\" />\n<parameter name=\"responsePrefix\" value=\"tmpFileData\" />","comments":"","outputs":1,"x":1477.5,"y":96,"z":"1d62f09b.653dff","wires":[[]]},{"id":"e6b2c683.cca4e8","type":"execute","name":"execute Get Complete Set of Params","xml":"<execute plugin=\"org.onap.sdnc.config.params.parser.PropertyDefinitionNode\" method=\"mergeJsonData\">\n<parameter name=\"jsonData\" value=\"`$configuration-params`\" />\n<parameter name=\"mergeJsonData\" value=\"`$tmp.instarValues.INSTAR-KEY-VALUES`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.allParams\" />","comments":"","outputs":1,"x":895.5,"y":566,"z":"1d62f09b.653dff","wires":[["e087477f.d4f878"]]},{"id":"e087477f.d4f878","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1153,"y":569,"z":"1d62f09b.653dff","wires":[["20063435.aecd9c"]]},{"id":"20063435.aecd9c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1305,"y":566,"z":"1d62f09b.653dff","wires":[["5761a3cf.c4dc4c"]]},{"id":"5761a3cf.c4dc4c","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.allParams.error-message`\"/>\n\t\n\t\n\t","comments":"","x":1456,"y":571,"z":"1d62f09b.653dff","wires":[]},{"id":"4577a98f.9f9c28","type":"set","name":"set","xml":"<set>\n<parameter name='parameter-definitions.file-content' value='`$tmpFileData.fileData`' />\n","comments":"","x":1457.5,"y":169,"z":"1d62f09b.653dff","wires":[]},{"id":"7d1276d9.b854e8","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=\"`$INSTAR.keys`\" />\n","comments":"","outputs":1,"x":820,"y":443,"z":"1d62f09b.653dff","wires":[[]]},{"id":"a56b5f50.f6b18","type":"switchNode","name":"switch Instar Keys exists","xml":"<switch test='`$INSTAR.keys`'>\n","comments":"","outputs":1,"x":262,"y":438,"z":"1d62f09b.653dff","wires":[["35618876.01a2a8","bb3b56aa.fca5a8","285829ff.5ef416"]]},{"id":"35618876.01a2a8","type":"success","name":"outcome: null","xml":"<outcome value=''>","comments":"","outputs":1,"x":481,"y":441,"z":"1d62f09b.653dff","wires":[["bb0994f5.44ccc8"]]},{"id":"bb0994f5.44ccc8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":662,"y":442,"z":"1d62f09b.653dff","wires":[[]]},{"id":"bb3b56aa.fca5a8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":466,"y":492,"z":"1d62f09b.653dff","wires":[["686e1d0f.ea0634"]]},{"id":"686e1d0f.ea0634","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":632,"y":492,"z":"1d62f09b.653dff","wires":[["e5e7d1ac.76bb7","e6b2c683.cca4e8","41045718.d06e28","7d1276d9.b854e8"]]},{"id":"41045718.d06e28","type":"set","name":"set configuration-params","xml":"<set>\n<parameter name='configuration-params' value='`$tmp.allParams.configuration-parameters`' />\n\n","comments":"","x":851,"y":630,"z":"1d62f09b.653dff","wires":[]},{"id":"39fe603c.f8171","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":257.5,"y":828,"z":"1d62f09b.653dff","wires":[["547d62bf.0b6c4c"]]},{"id":"547d62bf.0b6c4c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":420.5,"y":831,"z":"1d62f09b.653dff","wires":[["6d22c69f.2abc38"]]},{"id":"6d22c69f.2abc38","type":"execute","name":"execute Save in MDSal","xml":"<execute plugin='org.onap.appc.dg.common.VNFConfigurator' method='storeConfig' >\n<parameter name=\"uniqueId\" value=\"`$parameter-yang.config-file-id`\" />\n<parameter name=\"yang\" value=\"`$parameter-yang.file-content`\" />\n<parameter name=\"requestId\" value=\"`$request-id`\" />\n<parameter name=\"configJSON\" value=\"`'{&quot;vnf-config&quot;:' + $configuration-params + '}'`\" />\n<parameter name=\"prefix\" value=\"tmp.mdSalSave\" />\n\n<!--\n<parameter name=\"configJSON\" value=\"`$configuration-params`\" /> -->\n","comments":"","outputs":1,"x":643.5,"y":834,"z":"1d62f09b.653dff","wires":[["24f7581c.4787f8"]]},{"id":"24f7581c.4787f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":840.5,"y":838,"z":"1d62f09b.653dff","wires":[["729cb57e.d7997c"]]},{"id":"729cb57e.d7997c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":984.5,"y":837,"z":"1d62f09b.653dff","wires":[["1591ce44.e43822","7f07065c.21aa58","dc62f036.1a331"]]},{"id":"5abbbddd.2fdd84","type":"set","name":"set: dcae-error message","xml":"<set>\n <parameter name=\"dcae-error-message\" value=\"Unable to get Yang Model\"/>","comments":"","x":944.5,"y":708,"z":"1d62f09b.653dff","wires":[]},{"id":"8e93eb26.7e0988","type":"set","name":"set: dcae-error message","xml":"<set>\n <parameter name=\"dcae-error-message\" value=\"`$parameter-yang.error-message`\"/>","comments":"","x":922.5,"y":769,"z":"1d62f09b.653dff","wires":[]},{"id":"1591ce44.e43822","type":"set","name":"set: dcae-error message","xml":"<set>\n <parameter name=\"dcae-error-message\" value=\"`$tmp.mdSalSave.ERROR_MESSAGE`\"/>","comments":"","x":1194.5,"y":836,"z":"1d62f09b.653dff","wires":[]},{"id":"7f07065c.21aa58","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"`'501:' + $dcae-error-message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":735.5,"y":934,"z":"1d62f09b.653dff","wires":[["f8490268.c930e"]]},{"id":"3c5625a1.eec71a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1108.5,"y":935,"z":"1d62f09b.653dff","wires":[[]]},{"id":"f8490268.c930e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":937.5,"y":936,"z":"1d62f09b.653dff","wires":[["3c5625a1.eec71a"]]},{"id":"dc62f036.1a331","type":"execute","name":"execute IntermediateMessageSender","xml":"<execute plugin='org.onap.appc.dg.common.IntermediateMessageSender' method='sendMessage' >\n<parameter name='code' value=\"501\" />\n<parameter name='message' value=\"`$dcae-error-message`\" />\n<parameter name='prefix' value=\"tmp.intermediateerror\"/>","comments":"","outputs":1,"x":766.5,"y":1008,"z":"1d62f09b.653dff","wires":[["c105074b.328e78","4f55c02f.e48f3"]]},{"id":"c105074b.328e78","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1002.5,"y":1006,"z":"1d62f09b.653dff","wires":[["1ad124f3.55337b"]]},{"id":"4f55c02f.e48f3","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":987.5,"y":1069,"z":"1d62f09b.653dff","wires":[["1ad124f3.55337b"]]},{"id":"f4496313.24acc","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=\"MSGSENDERERERROR\" value=\"Unable to call IntermediateErrorMessageSender\"/>\n","comments":"","outputs":1,"x":1310.5,"y":1041,"z":"1d62f09b.653dff","wires":[[]]},{"id":"98e0dc66.4938a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":159,"y":206,"z":"1d62f09b.653dff","wires":[["55593da7.06c544"]]},{"id":"55593da7.06c544","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":320,"y":211,"z":"1d62f09b.653dff","wires":[["86037f00.c7dc5","a56b5f50.f6b18","33e8a0b7.d58be"]]},{"id":"811b2688.0dcd18","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=\"`'PD FILE NOTFOUND ' + $parameter-definitions.error-message`\" />\n","comments":"","outputs":1,"x":1153,"y":182,"z":"1d62f09b.653dff","wires":[[]]},{"id":"285829ff.5ef416","type":"success","name":"outcome: []","xml":"<outcome value='[]'>","comments":"","outputs":1,"x":486,"y":396,"z":"1d62f09b.653dff","wires":[["392efcf6.e32734"]]},{"id":"392efcf6.e32734","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":647,"y":397,"z":"1d62f09b.653dff","wires":[[]]},{"id":"1ad124f3.55337b","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1158,"y":1038,"z":"1d62f09b.653dff","wires":[["f4496313.24acc"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_PublishConfiguration.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_PublishConfiguration.json
index 1b4970a4f..a73d21a55 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_PublishConfiguration.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_PublishConfiguration.json
@@ -1 +1 @@
-[{"id":"390ce99d.bf5d96","type":"dgstart","name":"DGSTART","outputs":1,"x":143,"y":95,"z":"ba18d0da.6b53d","wires":[["644628c3.2d9d28"]]},{"id":"644628c3.2d9d28","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":344,"y":87,"z":"ba18d0da.6b53d","wires":[["1413fa79.66a72e"]]},{"id":"1413fa79.66a72e","type":"method","name":"method PublishConfiguration","xml":"<method rpc='PublishConfiguration' mode='sync'>\n","comments":"","outputs":1,"x":582,"y":87,"z":"ba18d0da.6b53d","wires":[["4fe4cc0b.026be4"]]},{"id":"4fe4cc0b.026be4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":181,"y":182,"z":"ba18d0da.6b53d","wires":[["7f8c2a55.61673c","29662869.84a628","949cd4f7.5ed8f","7dba4e1.da4afb","2572109c.9829f8"]]},{"id":"7f8c2a55.61673c","type":"set","name":"set uploadconfigid for dispatcher","xml":"<set>\n<parameter name='output.payload.upload-config-id[0]' value='`$tmp.uploadConfigInfo.UPLOAD-CONFIG-ID`' />\n<!--\n<parameter name='output.payload.upload-config-id[0]' value='`$tmp.uploadconfigmax.uploadconfigid`' />\n-->\n\n","comments":"","x":446,"y":650,"z":"ba18d0da.6b53d","wires":[]},{"id":"29662869.84a628","type":"execute","name":"generateOutputPayloadFromContext","xml":"<execute plugin=\"org.onap.appc.dg.common.JsonDgUtil\" method=\"generateOutputPayloadFromContext\">\n\n<!-- this will set output.payload DG Context var with all vars that start with output.payload -->\n\n\n","comments":"","outputs":1,"x":460,"y":713,"z":"ba18d0da.6b53d","wires":[["93c26b79.ac00e8","ef5b9ce6.17dda"]]},{"id":"7dba4e1.da4afb","type":"execute","name":"execute Create Json for CVaas","xml":"<execute plugin=\"org.openecomp.sdnc.config.generator.convert.ConvertNode\" method=\"convertContextToJson\">\n<parameter name=\"contextKey\" value=\"tmp.config\" />\n<parameter name=\"responsePrefix\" value=\"tmp.jsonConversion\" />\n","comments":"","outputs":1,"x":495,"y":310,"z":"ba18d0da.6b53d","wires":[["68503e8b.6e9178","b9d5cca5.f26868","90ad3c4d.8e0db8"]]},{"id":"93c26b79.ac00e8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":726,"y":701,"z":"ba18d0da.6b53d","wires":[["9cb7432e.9c7e88"]]},{"id":"ef5b9ce6.17dda","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":727,"y":753,"z":"ba18d0da.6b53d","wires":[["136bd85.d652728"]]},{"id":"9cb7432e.9c7e88","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":885,"y":698,"z":"ba18d0da.6b53d","wires":[["cde3fbd5.e1f268"]]},{"id":"136bd85.d652728","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":897,"y":747,"z":"ba18d0da.6b53d","wires":[["9106d080.5bc63"]]},{"id":"cde3fbd5.e1f268","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=\"`'Error from generateOutputPayloadFromContext = ' + $output.status.message`\" />\n","comments":"","outputs":1,"x":1066,"y":699,"z":"ba18d0da.6b53d","wires":[[]]},{"id":"9106d080.5bc63","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=\"`'PAYLOAD from generateOutputPayloadFromContext = ' + $output.payload`\" />\n","comments":"","outputs":1,"x":1070,"y":747,"z":"ba18d0da.6b53d","wires":[[]]},{"id":"b9d5cca5.f26868","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":718,"y":310,"z":"ba18d0da.6b53d","wires":[["b4e79a48.cfd848"]]},{"id":"68503e8b.6e9178","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":717,"y":270,"z":"ba18d0da.6b53d","wires":[["5e0da89f.a9c5f8"]]},{"id":"5e0da89f.a9c5f8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":895,"y":269,"z":"ba18d0da.6b53d","wires":[["d8910515.c8984","92ad96ed.dc0f98","b5be72d3.4c2378"]]},{"id":"b4e79a48.cfd848","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":887,"y":316,"z":"ba18d0da.6b53d","wires":[["50458cf4.1d3894","92ad96ed.dc0f98","b5be72d3.4c2378"]]},{"id":"a485e3e3.6f9708","type":"record","name":"execute Write Config Details for Cvaas ","xml":"<execute plugin=\"org.openecomp.sdnc.config.generator.writer.FileWriterNode\" method=\"writeFile\">\n<parameter name=\"fileName\" value=\"`$tmp.fileName`\"/>\n<parameter name=\"requestData\" value=\"`$tmp.jsonConversion.jsonContent`\"/>\n\n","comments":"","outputs":1,"x":951,"y":375,"z":"ba18d0da.6b53d","wires":[["e0da83aa.86dc2"]]},{"id":"949cd4f7.5ed8f","type":"set","name":"set fileName","xml":"<set>\n<parameter name='tmp.fileName' value=\"`'/opt/app/bvc/cvaas/' + $vnf-id + '_' + $tmp.uploadConfigInfo.UPLOAD-TIMESTAMP + '_appc001' + '.json'`\"/>\n","comments":"","x":457,"y":164,"z":"ba18d0da.6b53d","wires":[]},{"id":"e0da83aa.86dc2","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1194,"y":377,"z":"ba18d0da.6b53d","wires":[["cf25c291.eeaac"]]},{"id":"cf25c291.eeaac","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1364,"y":383,"z":"ba18d0da.6b53d","wires":[["38f8974.498d2e8","92ad96ed.dc0f98","b5be72d3.4c2378"]]},{"id":"d8910515.c8984","type":"set","name":"set dcae-error-message","xml":"<set>\n<parameter name='dcae-error-message' value=\"'ConvertContextToJson not found\" />\n","comments":"","x":1121,"y":269,"z":"ba18d0da.6b53d","wires":[]},{"id":"50458cf4.1d3894","type":"set","name":"set dcae-error-message","xml":"<set>\n<parameter name='dcae-error-message' value=\"`'Error from convertContextToJson - ' + $tmp.jsonConversion.error-message`\" />\n","comments":"","x":1122,"y":316,"z":"ba18d0da.6b53d","wires":[]},{"id":"90ad3c4d.8e0db8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":506,"y":368,"z":"ba18d0da.6b53d","wires":[["c9826355.de2d88"]]},{"id":"c9826355.de2d88","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":674,"y":370,"z":"ba18d0da.6b53d","wires":[["a485e3e3.6f9708"]]},{"id":"38f8974.498d2e8","type":"set","name":"set dcae-error-message","xml":"<set>\n<parameter name='dcae-error-message' value=\"Unable to write file to /opt/app/bvc/cvaas\" />\n","comments":"","x":1596,"y":376,"z":"ba18d0da.6b53d","wires":[]},{"id":"92ad96ed.dc0f98","type":"execute","name":"execute IntermediateMessageSender","xml":"<execute plugin='org.onap.appc.dg.common.IntermediateMessageSender' method='sendMessage' >\n<parameter name='code' value=\"501\" />\n<parameter name='message' value=\"`$dcae-error-message`\" />\n<parameter name='prefix' value=\"tmp.intermediateerror\"/>","comments":"","outputs":1,"x":936,"y":449,"z":"ba18d0da.6b53d","wires":[["58b7c48d.5cbf0c","3db6580c.06a818"]]},{"id":"58b7c48d.5cbf0c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1175,"y":448,"z":"ba18d0da.6b53d","wires":[["1b264e03.1285a2"]]},{"id":"3db6580c.06a818","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1172,"y":507,"z":"ba18d0da.6b53d","wires":[["1b264e03.1285a2"]]},{"id":"1b264e03.1285a2","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1335,"y":472,"z":"ba18d0da.6b53d","wires":[["d1436755.fdf6a8"]]},{"id":"d1436755.fdf6a8","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"MSGSENDERERERROR\" value=\"Unable to call IntermediateErrorMessageSender\"/>\n","comments":"","outputs":1,"x":1500,"y":473,"z":"ba18d0da.6b53d","wires":[[]]},{"id":"b5be72d3.4c2378","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"`'501:' + $dcae-error-message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":916,"y":549,"z":"ba18d0da.6b53d","wires":[["c81e7770.18ce18"]]},{"id":"c81e7770.18ce18","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1102,"y":551,"z":"ba18d0da.6b53d","wires":[["b5ce7da8.febb3"]]},{"id":"b5ce7da8.febb3","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1276,"y":553,"z":"ba18d0da.6b53d","wires":[[]]},{"id":"2572109c.9829f8","type":"set","name":"set payload parameters","xml":"<set>\n<parameter name='tmp.config.UPLOAD_CONFIG_ID' value=\"`$tmp.uploadConfigInfo.UPLOAD-CONFIG-ID`\" />\n<parameter name='tmp.config.REQUEST_ID' value=\"`$tmp.uploadConfigInfo.REQUEST-ID`\" />\n<parameter name='tmp.config.ORIGINATOR_ID' value=\"`$tmp.uploadConfigInfo.ORIGINATOR-ID`\" />\n<parameter name='tmp.config.SERVICE_DESCRIPTION' value=\"`$tmp.uploadConfigInfo.SERVICE-DESCRIPTION`\" />\n<parameter name='tmp.config.ACTION' value=\"`$tmp.uploadConfigInfo.ACTION`\" />\n<parameter name='tmp.config.UPLOAD_TIMESTAMP' value=\"`$tmp.uploadConfigInfo.UPLOAD-TIMESTAMP`\" />\n<parameter name='tmp.config.UPLOAD_DATE' value=\"`$tmp.uploadConfigInfo.UPLOAD-DATE`\" />\n<parameter name='tmp.config.VNF_ID' value=\"`$tmp.uploadConfigInfo.VNF-ID`\" />\n<parameter name='tmp.config.VNF_NAME' value=\"`$tmp.uploadConfigInfo.VNF-NAME`\" />\n<parameter name='tmp.config.VM_NAME' value=\"`$tmp.uploadConfigInfo.VM-NAME`\" />\n<parameter name='tmp.config.VNF_TYPE' value=\"`$tmp.uploadConfigInfo.VNF-TYPE`\" />\n<parameter name='tmp.config.VNFC_TYPE' value=\"`$tmp.uploadConfigInfo.VNFC-TYPE`\" />\n<parameter name='tmp.config.HOST_IP_ADDRESS' value=\"`$tmp.uploadConfigInfo.HOST-IP-ADDRESS`\" />\n<parameter name='tmp.config.CONFIG_INDICATOR' value=\"`$tmp.uploadConfigInfo.CONFIG-INDICATOR`\" />\n<parameter name='tmp.config.PENDING_DELETE' value=\"`$tmp.uploadConfigInfo.PENDING-DELETE`\" />\n<parameter name='tmp.config.CONTENT' value=\"`$tmp.uploadConfigInfo.CONTENT`\" />\n\n","comments":"","x":481,"y":227,"z":"ba18d0da.6b53d","wires":[]}]
+[{"id":"390ce99d.bf5d96","type":"dgstart","name":"DGSTART","outputs":1,"x":143,"y":95,"z":"ba18d0da.6b53d","wires":[["644628c3.2d9d28"]]},{"id":"644628c3.2d9d28","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":344,"y":87,"z":"ba18d0da.6b53d","wires":[["1413fa79.66a72e"]]},{"id":"1413fa79.66a72e","type":"method","name":"method PublishConfiguration","xml":"<method rpc='PublishConfiguration' mode='sync'>\n","comments":"","outputs":1,"x":582,"y":87,"z":"ba18d0da.6b53d","wires":[["4fe4cc0b.026be4"]]},{"id":"4fe4cc0b.026be4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":181,"y":182,"z":"ba18d0da.6b53d","wires":[["7f8c2a55.61673c","29662869.84a628","949cd4f7.5ed8f","7dba4e1.da4afb","2572109c.9829f8"]]},{"id":"7f8c2a55.61673c","type":"set","name":"set uploadconfigid for dispatcher","xml":"<set>\n<parameter name='output.payload.upload-config-id[0]' value='`$tmp.uploadConfigInfo.UPLOAD-CONFIG-ID`' />\n<!--\n<parameter name='output.payload.upload-config-id[0]' value='`$tmp.uploadconfigmax.uploadconfigid`' />\n-->\n\n","comments":"","x":446,"y":650,"z":"ba18d0da.6b53d","wires":[]},{"id":"29662869.84a628","type":"execute","name":"generateOutputPayloadFromContext","xml":"<execute plugin=\"org.onap.appc.dg.common.JsonDgUtil\" method=\"generateOutputPayloadFromContext\">\n\n<!-- this will set output.payload DG Context var with all vars that start with output.payload -->\n\n\n","comments":"","outputs":1,"x":460,"y":713,"z":"ba18d0da.6b53d","wires":[["93c26b79.ac00e8","ef5b9ce6.17dda"]]},{"id":"7dba4e1.da4afb","type":"execute","name":"execute Create Json for CVaas","xml":"<execute plugin=\"org.onap.sdnc.config.generator.convert.ConvertNode\" method=\"convertContextToJson\">\n<parameter name=\"contextKey\" value=\"tmp.config\" />\n<parameter name=\"responsePrefix\" value=\"tmp.jsonConversion\" />\n","comments":"","outputs":1,"x":495,"y":310,"z":"ba18d0da.6b53d","wires":[["68503e8b.6e9178","b9d5cca5.f26868","90ad3c4d.8e0db8"]]},{"id":"93c26b79.ac00e8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":726,"y":701,"z":"ba18d0da.6b53d","wires":[["9cb7432e.9c7e88"]]},{"id":"ef5b9ce6.17dda","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":727,"y":753,"z":"ba18d0da.6b53d","wires":[["136bd85.d652728"]]},{"id":"9cb7432e.9c7e88","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":885,"y":698,"z":"ba18d0da.6b53d","wires":[["cde3fbd5.e1f268"]]},{"id":"136bd85.d652728","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":897,"y":747,"z":"ba18d0da.6b53d","wires":[["9106d080.5bc63"]]},{"id":"cde3fbd5.e1f268","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=\"`'Error from generateOutputPayloadFromContext = ' + $output.status.message`\" />\n","comments":"","outputs":1,"x":1066,"y":699,"z":"ba18d0da.6b53d","wires":[[]]},{"id":"9106d080.5bc63","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=\"`'PAYLOAD from generateOutputPayloadFromContext = ' + $output.payload`\" />\n","comments":"","outputs":1,"x":1070,"y":747,"z":"ba18d0da.6b53d","wires":[[]]},{"id":"b9d5cca5.f26868","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":718,"y":310,"z":"ba18d0da.6b53d","wires":[["b4e79a48.cfd848"]]},{"id":"68503e8b.6e9178","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":717,"y":270,"z":"ba18d0da.6b53d","wires":[["5e0da89f.a9c5f8"]]},{"id":"5e0da89f.a9c5f8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":895,"y":269,"z":"ba18d0da.6b53d","wires":[["d8910515.c8984","92ad96ed.dc0f98","b5be72d3.4c2378"]]},{"id":"b4e79a48.cfd848","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":887,"y":316,"z":"ba18d0da.6b53d","wires":[["50458cf4.1d3894","92ad96ed.dc0f98","b5be72d3.4c2378"]]},{"id":"a485e3e3.6f9708","type":"record","name":"execute Write Config Details for Cvaas ","xml":"<execute plugin=\"org.onap.sdnc.config.generator.writer.FileWriterNode\" method=\"writeFile\">\n<parameter name=\"fileName\" value=\"`$tmp.fileName`\"/>\n<parameter name=\"requestData\" value=\"`$tmp.jsonConversion.jsonContent`\"/>\n\n","comments":"","outputs":1,"x":951,"y":375,"z":"ba18d0da.6b53d","wires":[["e0da83aa.86dc2"]]},{"id":"949cd4f7.5ed8f","type":"set","name":"set fileName","xml":"<set>\n<parameter name='tmp.fileName' value=\"`'/opt/app/bvc/cvaas/' + $vnf-id + '_' + $tmp.uploadConfigInfo.UPLOAD-TIMESTAMP + '_appc001' + '.json'`\"/>\n","comments":"","x":457,"y":164,"z":"ba18d0da.6b53d","wires":[]},{"id":"e0da83aa.86dc2","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1194,"y":377,"z":"ba18d0da.6b53d","wires":[["cf25c291.eeaac"]]},{"id":"cf25c291.eeaac","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1364,"y":383,"z":"ba18d0da.6b53d","wires":[["38f8974.498d2e8","92ad96ed.dc0f98","b5be72d3.4c2378"]]},{"id":"d8910515.c8984","type":"set","name":"set dcae-error-message","xml":"<set>\n<parameter name='dcae-error-message' value=\"'ConvertContextToJson not found\" />\n","comments":"","x":1121,"y":269,"z":"ba18d0da.6b53d","wires":[]},{"id":"50458cf4.1d3894","type":"set","name":"set dcae-error-message","xml":"<set>\n<parameter name='dcae-error-message' value=\"`'Error from convertContextToJson - ' + $tmp.jsonConversion.error-message`\" />\n","comments":"","x":1122,"y":316,"z":"ba18d0da.6b53d","wires":[]},{"id":"90ad3c4d.8e0db8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":506,"y":368,"z":"ba18d0da.6b53d","wires":[["c9826355.de2d88"]]},{"id":"c9826355.de2d88","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":674,"y":370,"z":"ba18d0da.6b53d","wires":[["a485e3e3.6f9708"]]},{"id":"38f8974.498d2e8","type":"set","name":"set dcae-error-message","xml":"<set>\n<parameter name='dcae-error-message' value=\"Unable to write file to /opt/app/bvc/cvaas\" />\n","comments":"","x":1596,"y":376,"z":"ba18d0da.6b53d","wires":[]},{"id":"92ad96ed.dc0f98","type":"execute","name":"execute IntermediateMessageSender","xml":"<execute plugin='org.onap.appc.dg.common.IntermediateMessageSender' method='sendMessage' >\n<parameter name='code' value=\"501\" />\n<parameter name='message' value=\"`$dcae-error-message`\" />\n<parameter name='prefix' value=\"tmp.intermediateerror\"/>","comments":"","outputs":1,"x":936,"y":449,"z":"ba18d0da.6b53d","wires":[["58b7c48d.5cbf0c","3db6580c.06a818"]]},{"id":"58b7c48d.5cbf0c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1175,"y":448,"z":"ba18d0da.6b53d","wires":[["1b264e03.1285a2"]]},{"id":"3db6580c.06a818","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1172,"y":507,"z":"ba18d0da.6b53d","wires":[["1b264e03.1285a2"]]},{"id":"1b264e03.1285a2","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1335,"y":472,"z":"ba18d0da.6b53d","wires":[["d1436755.fdf6a8"]]},{"id":"d1436755.fdf6a8","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"MSGSENDERERERROR\" value=\"Unable to call IntermediateErrorMessageSender\"/>\n","comments":"","outputs":1,"x":1500,"y":473,"z":"ba18d0da.6b53d","wires":[[]]},{"id":"b5be72d3.4c2378","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"`'501:' + $dcae-error-message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":916,"y":549,"z":"ba18d0da.6b53d","wires":[["c81e7770.18ce18"]]},{"id":"c81e7770.18ce18","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1102,"y":551,"z":"ba18d0da.6b53d","wires":[["b5ce7da8.febb3"]]},{"id":"b5ce7da8.febb3","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1276,"y":553,"z":"ba18d0da.6b53d","wires":[[]]},{"id":"2572109c.9829f8","type":"set","name":"set payload parameters","xml":"<set>\n<parameter name='tmp.config.UPLOAD_CONFIG_ID' value=\"`$tmp.uploadConfigInfo.UPLOAD-CONFIG-ID`\" />\n<parameter name='tmp.config.REQUEST_ID' value=\"`$tmp.uploadConfigInfo.REQUEST-ID`\" />\n<parameter name='tmp.config.ORIGINATOR_ID' value=\"`$tmp.uploadConfigInfo.ORIGINATOR-ID`\" />\n<parameter name='tmp.config.SERVICE_DESCRIPTION' value=\"`$tmp.uploadConfigInfo.SERVICE-DESCRIPTION`\" />\n<parameter name='tmp.config.ACTION' value=\"`$tmp.uploadConfigInfo.ACTION`\" />\n<parameter name='tmp.config.UPLOAD_TIMESTAMP' value=\"`$tmp.uploadConfigInfo.UPLOAD-TIMESTAMP`\" />\n<parameter name='tmp.config.UPLOAD_DATE' value=\"`$tmp.uploadConfigInfo.UPLOAD-DATE`\" />\n<parameter name='tmp.config.VNF_ID' value=\"`$tmp.uploadConfigInfo.VNF-ID`\" />\n<parameter name='tmp.config.VNF_NAME' value=\"`$tmp.uploadConfigInfo.VNF-NAME`\" />\n<parameter name='tmp.config.VM_NAME' value=\"`$tmp.uploadConfigInfo.VM-NAME`\" />\n<parameter name='tmp.config.VNF_TYPE' value=\"`$tmp.uploadConfigInfo.VNF-TYPE`\" />\n<parameter name='tmp.config.VNFC_TYPE' value=\"`$tmp.uploadConfigInfo.VNFC-TYPE`\" />\n<parameter name='tmp.config.HOST_IP_ADDRESS' value=\"`$tmp.uploadConfigInfo.HOST-IP-ADDRESS`\" />\n<parameter name='tmp.config.CONFIG_INDICATOR' value=\"`$tmp.uploadConfigInfo.CONFIG-INDICATOR`\" />\n<parameter name='tmp.config.PENDING_DELETE' value=\"`$tmp.uploadConfigInfo.PENDING-DELETE`\" />\n<parameter name='tmp.config.CONTENT' value=\"`$tmp.uploadConfigInfo.CONTENT`\" />\n\n","comments":"","x":481,"y":227,"z":"ba18d0da.6b53d","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_SaveRunningConfig.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_SaveRunningConfig.json
index 7e620c9c7..45ea7adbb 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_SaveRunningConfig.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_SaveRunningConfig.json
@@ -1 +1 @@
-[{"id":"f7089b6e.27e52","type":"dgstart","name":"DGSTART","outputs":1,"x":138,"y":98,"z":"30436ccd.4adc14","wires":[["a81660a2.acdb6"]]},{"id":"a81660a2.acdb6","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":292,"y":97,"z":"30436ccd.4adc14","wires":[["6912640f.71411c"]]},{"id":"6912640f.71411c","type":"method","name":"method SaveRunningConfig","xml":"<method rpc='SaveRunningConfig' mode='sync'>\n","comments":"","outputs":1,"x":520,"y":100,"z":"30436ccd.4adc14","wires":[["33c4539f.9dc64c"]]},{"id":"94be0ae2.28833","type":"set","name":"set call DG Parameters","xml":"<set>\n<parameter name='config.vnf-id' value=\"`$vnf-id`\" />\n<parameter name='config.vm-name' value=\"`$vm-name`\" />\n<parameter name='config.vnf-type' value=\"`$vnf-type`\" />\n<parameter name='config.vnf-name' value=\"`$vnf-name`\" />\n<parameter name='config.protocol' value=\"`$tmp.deviceinterfaceprotocol.PROTOCOL`\" />\n<parameter name='config.host-ip-address' value=\"`$vnf-host-ip-address`\" />\n<parameter name='config.user-name' value=\"`$device-authentication.USER-NAME`\" />\n<parameter name='config.password' value=\"`$device-authentication.PASSWORD`\" />\n<parameter name='config.port-number' value=\"`$device-authentication.PORT-NUMBER`\" />\n","comments":"","x":426,"y":154,"z":"30436ccd.4adc14","wires":[]},{"id":"33c4539f.9dc64c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":167,"y":154,"z":"30436ccd.4adc14","wires":[["94be0ae2.28833","c2d0c3c1.33fe58","efc0edd.6d55e1"]]},{"id":"efc0edd.6d55e1","type":"call","name":"call: GetDeviceRunningConfig","xml":"<call module='APPC' rpc='GetDeviceRunningConfig' mode='sync' >\n","comments":"","outputs":1,"x":224,"y":575,"z":"30436ccd.4adc14","wires":[["2b84bd3f.c43e22","8e9e97db.0c6f3","c67b35a7.d90cc"]]},{"id":"2b84bd3f.c43e22","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":484,"y":594,"z":"30436ccd.4adc14","wires":[["4793b4e7.03b284"]]},{"id":"8e9e97db.0c6f3","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":479,"y":659,"z":"30436ccd.4adc14","wires":[["4793b4e7.03b284"]]},{"id":"c67b35a7.d90cc","type":"not-found","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":489,"y":539,"z":"30436ccd.4adc14","wires":[["b634a873.25805"]]},{"id":"4793b4e7.03b284","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":660,"y":629,"z":"30436ccd.4adc14","wires":[["815c662d.84ab88","e44ffe63.65498","67e0c003.fc637"]]},{"id":"b634a873.25805","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":654,"y":541,"z":"30436ccd.4adc14","wires":[["10d69be.e94b2e4"]]},{"id":"e44ffe63.65498","type":"execute","name":"execute IntermediateMessageSender","xml":"<execute plugin='org.onap.appc.dg.common.IntermediateMessageSender' method='sendMessage' >\n<parameter name='code' value=\"501\" />\n<parameter name='message' value=\"`$dcae-error-message`\" />\n<parameter name='prefix' value=\"tmp.intermediateerror\"/>","comments":"","outputs":1,"x":1389,"y":676,"z":"30436ccd.4adc14","wires":[["860f3f46.08ddc","72f4d895.e59d38"]]},{"id":"860f3f46.08ddc","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1618,"y":642,"z":"30436ccd.4adc14","wires":[["1f235b69.85d695"]]},{"id":"72f4d895.e59d38","type":"failure","name":"failure","xml":"<outcome value='failure'>","comments":"","outputs":1,"x":1610,"y":710,"z":"30436ccd.4adc14","wires":[["1f235b69.85d695"]]},{"id":"1f235b69.85d695","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1789,"y":642,"z":"30436ccd.4adc14","wires":[["cf2797ac.14177"]]},{"id":"2032452c.51d42a","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1314,"y":548,"z":"30436ccd.4adc14","wires":[["dec2c7fd.e23a58","e44ffe63.65498","67e0c003.fc637"]]},{"id":"cf2797ac.14177","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"MSGSENDERERERROR\" value=\"Unable to call IntermediateErrorMessageSender\"/>\n","comments":"","outputs":1,"x":1960,"y":642,"z":"30436ccd.4adc14","wires":[[]]},{"id":"10d69be.e94b2e4","type":"execute","name":"execute updateUploadConfig","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"updateUploadConfig\">\n<parameter name=\"responsePrefix\" value=\"tmp.uploadconfig\" />\n\n","comments":"","outputs":1,"x":896,"y":536,"z":"30436ccd.4adc14","wires":[["60922c75.3eea14","bf243306.adc27","a2c86ad3.ec63f8"]]},{"id":"60922c75.3eea14","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1110,"y":537,"z":"30436ccd.4adc14","wires":[["2032452c.51d42a"]]},{"id":"bf243306.adc27","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1111,"y":571,"z":"30436ccd.4adc14","wires":[["2032452c.51d42a"]]},{"id":"a2c86ad3.ec63f8","type":"not-found","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1081,"y":296,"z":"30436ccd.4adc14","wires":[["eac20556.00c348"]]},{"id":"67e0c003.fc637","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"`'501:' + $dcae-error-message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":1357.5,"y":776,"z":"30436ccd.4adc14","wires":[["26fc329c.a59e4e"]]},{"id":"26fc329c.a59e4e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1553.5,"y":776,"z":"30436ccd.4adc14","wires":[["bb8dff26.bccd28"]]},{"id":"bb8dff26.bccd28","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1725.5,"y":778,"z":"30436ccd.4adc14","wires":[[]]},{"id":"c2d0c3c1.33fe58","type":"execute","name":"execute Read Properties","xml":"<execute plugin='org.openecomp.sdnc.prop.PropertiesNode' method='readProperties' >\n\t<parameter name=\"fileName\" value=\"%SDNC_CONFIG_DIR%/appc.properties\"/>\n\t<parameter name=\"contextPrefix\" value=\"prop\"/>\n\n","comments":"","outputs":1,"x":400,"y":202,"z":"30436ccd.4adc14","wires":[["9bfb70c8.4c792","b78d6023.fd1328"]]},{"id":"9bfb70c8.4c792","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":625,"y":175,"z":"30436ccd.4adc14","wires":[["7501ba71.939a9c"]]},{"id":"b78d6023.fd1328","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":600,"y":216,"z":"30436ccd.4adc14","wires":[["7501ba71.939a9c"]]},{"id":"7501ba71.939a9c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":787,"y":189,"z":"30436ccd.4adc14","wires":[["ccc94347.bf78e","9cef9dac.6442d"]]},{"id":"ccc94347.bf78e","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=\"DCAEREPORTERERROR\" value=\"Unable to read appc.properties File\"/>\n","comments":"","outputs":1,"x":947,"y":156,"z":"30436ccd.4adc14","wires":[[]]},{"id":"9cef9dac.6442d","type":"set","name":"set topic name to null","xml":"<set>\n<parameter name='prop.appc.LCM.topic.write' value=\"\" />\n","comments":"","x":999,"y":215,"z":"30436ccd.4adc14","wires":[]},{"id":"eac20556.00c348","type":"call","name":"call: PublishConfiguration","xml":"<call module=\"APPC\" rpc=\"PublishConfiguration\" mode=\"sync\">","comments":"","outputs":1,"x":1298,"y":294,"z":"30436ccd.4adc14","wires":[["a15a38a7.876bc"]]},{"id":"a15a38a7.876bc","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1512,"y":298,"z":"30436ccd.4adc14","wires":[["4f5647e3.e12ca"]]},{"id":"4f5647e3.e12ca","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1694,"y":300,"z":"30436ccd.4adc14","wires":[["a2df8d58.688c38","e44ffe63.65498","67e0c003.fc637"]]},{"id":"dec2c7fd.e23a58","type":"set","name":"set dcae-error-message","xml":"<set>\n<parameter name='dcae-error-message' value=\"`'Configuration is successful but unable to save the running config.' + $tmp.uploadconfig.error-message`\" />\n","comments":"","x":1581,"y":542,"z":"30436ccd.4adc14","wires":[]},{"id":"815c662d.84ab88","type":"set","name":"set dcae-error-message","xml":"<set>\n<parameter name='dcae-error-message' value=\"Configuration is successful but unable to get the running config.\" />\n","comments":"","x":896,"y":605,"z":"30436ccd.4adc14","wires":[]},{"id":"a2df8d58.688c38","type":"set","name":"set dcae-error-message","xml":"<set>\n<parameter name='dcae-error-message' value='Configuration is successful.DG Workflow PublishConfiguration not found' />\n","comments":"","x":1924,"y":301,"z":"30436ccd.4adc14","wires":[]}]
+[{"id":"f7089b6e.27e52","type":"dgstart","name":"DGSTART","outputs":1,"x":138,"y":98,"z":"30436ccd.4adc14","wires":[["a81660a2.acdb6"]]},{"id":"a81660a2.acdb6","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":292,"y":97,"z":"30436ccd.4adc14","wires":[["6912640f.71411c"]]},{"id":"6912640f.71411c","type":"method","name":"method SaveRunningConfig","xml":"<method rpc='SaveRunningConfig' mode='sync'>\n","comments":"","outputs":1,"x":520,"y":100,"z":"30436ccd.4adc14","wires":[["33c4539f.9dc64c"]]},{"id":"94be0ae2.28833","type":"set","name":"set call DG Parameters","xml":"<set>\n<parameter name='config.vnf-id' value=\"`$vnf-id`\" />\n<parameter name='config.vm-name' value=\"`$vm-name`\" />\n<parameter name='config.vnf-type' value=\"`$vnf-type`\" />\n<parameter name='config.vnf-name' value=\"`$vnf-name`\" />\n<parameter name='config.protocol' value=\"`$tmp.deviceinterfaceprotocol.PROTOCOL`\" />\n<parameter name='config.host-ip-address' value=\"`$vnf-host-ip-address`\" />\n<parameter name='config.user-name' value=\"`$device-authentication.USER-NAME`\" />\n<parameter name='config.password' value=\"`$device-authentication.PASSWORD`\" />\n<parameter name='config.port-number' value=\"`$device-authentication.PORT-NUMBER`\" />\n","comments":"","x":426,"y":154,"z":"30436ccd.4adc14","wires":[]},{"id":"33c4539f.9dc64c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":167,"y":154,"z":"30436ccd.4adc14","wires":[["94be0ae2.28833","c2d0c3c1.33fe58","efc0edd.6d55e1"]]},{"id":"efc0edd.6d55e1","type":"call","name":"call: GetDeviceRunningConfig","xml":"<call module='APPC' rpc='GetDeviceRunningConfig' mode='sync' >\n","comments":"","outputs":1,"x":224,"y":575,"z":"30436ccd.4adc14","wires":[["2b84bd3f.c43e22","8e9e97db.0c6f3","c67b35a7.d90cc"]]},{"id":"2b84bd3f.c43e22","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":484,"y":594,"z":"30436ccd.4adc14","wires":[["4793b4e7.03b284"]]},{"id":"8e9e97db.0c6f3","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":479,"y":659,"z":"30436ccd.4adc14","wires":[["4793b4e7.03b284"]]},{"id":"c67b35a7.d90cc","type":"not-found","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":489,"y":539,"z":"30436ccd.4adc14","wires":[["b634a873.25805"]]},{"id":"4793b4e7.03b284","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":660,"y":629,"z":"30436ccd.4adc14","wires":[["815c662d.84ab88","e44ffe63.65498","67e0c003.fc637"]]},{"id":"b634a873.25805","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":654,"y":541,"z":"30436ccd.4adc14","wires":[["10d69be.e94b2e4"]]},{"id":"e44ffe63.65498","type":"execute","name":"execute IntermediateMessageSender","xml":"<execute plugin='org.onap.appc.dg.common.IntermediateMessageSender' method='sendMessage' >\n<parameter name='code' value=\"501\" />\n<parameter name='message' value=\"`$dcae-error-message`\" />\n<parameter name='prefix' value=\"tmp.intermediateerror\"/>","comments":"","outputs":1,"x":1389,"y":676,"z":"30436ccd.4adc14","wires":[["860f3f46.08ddc","72f4d895.e59d38"]]},{"id":"860f3f46.08ddc","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1618,"y":642,"z":"30436ccd.4adc14","wires":[["1f235b69.85d695"]]},{"id":"72f4d895.e59d38","type":"failure","name":"failure","xml":"<outcome value='failure'>","comments":"","outputs":1,"x":1610,"y":710,"z":"30436ccd.4adc14","wires":[["1f235b69.85d695"]]},{"id":"1f235b69.85d695","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1789,"y":642,"z":"30436ccd.4adc14","wires":[["cf2797ac.14177"]]},{"id":"2032452c.51d42a","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1314,"y":548,"z":"30436ccd.4adc14","wires":[["dec2c7fd.e23a58","e44ffe63.65498","67e0c003.fc637"]]},{"id":"cf2797ac.14177","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"MSGSENDERERERROR\" value=\"Unable to call IntermediateErrorMessageSender\"/>\n","comments":"","outputs":1,"x":1960,"y":642,"z":"30436ccd.4adc14","wires":[[]]},{"id":"10d69be.e94b2e4","type":"execute","name":"execute updateUploadConfig","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"updateUploadConfig\">\n<parameter name=\"responsePrefix\" value=\"tmp.uploadconfig\" />\n\n","comments":"","outputs":1,"x":896,"y":536,"z":"30436ccd.4adc14","wires":[["60922c75.3eea14","bf243306.adc27","a2c86ad3.ec63f8"]]},{"id":"60922c75.3eea14","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1110,"y":537,"z":"30436ccd.4adc14","wires":[["2032452c.51d42a"]]},{"id":"bf243306.adc27","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1111,"y":571,"z":"30436ccd.4adc14","wires":[["2032452c.51d42a"]]},{"id":"a2c86ad3.ec63f8","type":"not-found","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1081,"y":296,"z":"30436ccd.4adc14","wires":[["eac20556.00c348"]]},{"id":"67e0c003.fc637","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"`'501:' + $dcae-error-message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":1357.5,"y":776,"z":"30436ccd.4adc14","wires":[["26fc329c.a59e4e"]]},{"id":"26fc329c.a59e4e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1553.5,"y":776,"z":"30436ccd.4adc14","wires":[["bb8dff26.bccd28"]]},{"id":"bb8dff26.bccd28","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1725.5,"y":778,"z":"30436ccd.4adc14","wires":[[]]},{"id":"c2d0c3c1.33fe58","type":"execute","name":"execute Read Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n\t<parameter name=\"fileName\" value=\"%SDNC_CONFIG_DIR%/appc.properties\"/>\n\t<parameter name=\"contextPrefix\" value=\"prop\"/>\n\n","comments":"","outputs":1,"x":400,"y":202,"z":"30436ccd.4adc14","wires":[["9bfb70c8.4c792","b78d6023.fd1328"]]},{"id":"9bfb70c8.4c792","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":625,"y":175,"z":"30436ccd.4adc14","wires":[["7501ba71.939a9c"]]},{"id":"b78d6023.fd1328","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":600,"y":216,"z":"30436ccd.4adc14","wires":[["7501ba71.939a9c"]]},{"id":"7501ba71.939a9c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":787,"y":189,"z":"30436ccd.4adc14","wires":[["ccc94347.bf78e","9cef9dac.6442d"]]},{"id":"ccc94347.bf78e","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=\"DCAEREPORTERERROR\" value=\"Unable to read appc.properties File\"/>\n","comments":"","outputs":1,"x":947,"y":156,"z":"30436ccd.4adc14","wires":[[]]},{"id":"9cef9dac.6442d","type":"set","name":"set topic name to null","xml":"<set>\n<parameter name='prop.appc.LCM.topic.write' value=\"\" />\n","comments":"","x":999,"y":215,"z":"30436ccd.4adc14","wires":[]},{"id":"eac20556.00c348","type":"call","name":"call: PublishConfiguration","xml":"<call module=\"APPC\" rpc=\"PublishConfiguration\" mode=\"sync\">","comments":"","outputs":1,"x":1298,"y":294,"z":"30436ccd.4adc14","wires":[["a15a38a7.876bc"]]},{"id":"a15a38a7.876bc","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1512,"y":298,"z":"30436ccd.4adc14","wires":[["4f5647e3.e12ca"]]},{"id":"4f5647e3.e12ca","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1694,"y":300,"z":"30436ccd.4adc14","wires":[["a2df8d58.688c38","e44ffe63.65498","67e0c003.fc637"]]},{"id":"dec2c7fd.e23a58","type":"set","name":"set dcae-error-message","xml":"<set>\n<parameter name='dcae-error-message' value=\"`'Configuration is successful but unable to save the running config.' + $tmp.uploadconfig.error-message`\" />\n","comments":"","x":1581,"y":542,"z":"30436ccd.4adc14","wires":[]},{"id":"815c662d.84ab88","type":"set","name":"set dcae-error-message","xml":"<set>\n<parameter name='dcae-error-message' value=\"Configuration is successful but unable to get the running config.\" />\n","comments":"","x":896,"y":605,"z":"30436ccd.4adc14","wires":[]},{"id":"a2df8d58.688c38","type":"set","name":"set dcae-error-message","xml":"<set>\n<parameter name='dcae-error-message' value='Configuration is successful.DG Workflow PublishConfiguration not found' />\n","comments":"","x":1924,"y":301,"z":"30436ccd.4adc14","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_setInputParams.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_setInputParams.json
index 77cc2c896..12752ff87 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_setInputParams.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_setInputParams.json
@@ -147,7 +147,7 @@
]
],
"x": 537.4167098999023,
- "xml": "<execute plugin=\"org.openecomp.sdnc.config.generator.convert.ConvertNode\" method=\"convertJson2DGContext\">\n<parameter name=\"jsonData\" value=\"`$input.payload`\" />\n<parameter name=\"isEscaped\" value=\"N\" />\n<parameter name=\"blockKeys\" value=\"configuration-parameters,configuration.configuration-string,configuration.configuration-json\" />\n<parameter name=\"responsePrefix\" value=\"tmp.convertnode\" />",
+ "xml": "<execute plugin=\"org.onap.sdnc.config.generator.convert.ConvertNode\" method=\"convertJson2DGContext\">\n<parameter name=\"jsonData\" value=\"`$input.payload`\" />\n<parameter name=\"isEscaped\" value=\"N\" />\n<parameter name=\"blockKeys\" value=\"configuration-parameters,configuration.configuration-string,configuration.configuration-json\" />\n<parameter name=\"responsePrefix\" value=\"tmp.convertnode\" />",
"y": 183.0555534362793,
"z": "5ad64f3a.c3774"
},