aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakamune Cho <tc012c@att.com>2017-12-19 10:48:02 -0600
committerPatrick Brady <pb071s@att.com>2017-12-19 13:10:56 -0800
commit8491cc3bc012fefe4faf54baf6c74cb20785d5f0 (patch)
treeb761a83d5e6d6872a60e0de2550bb8ef5773ab76
parent9c44fb1cb83f5368fba40438a7b1fa1a45e27b58 (diff)
Update bundle names from openecomp to onap
Change-Id: Ib0cf4edbab87a32c9d83cc9473412feb77b27a0e Issue-ID: APPC-13 Signed-off-by: Takamune Cho <tc012c@att.com>
-rw-r--r--appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java2
-rw-r--r--appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/MigrateServer.java2
-rw-r--r--appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RebuildServer.java2
-rw-r--r--appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RestartServer.java2
-rw-r--r--appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/StartServer.java2
-rw-r--r--appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/StopServer.java2
-rw-r--r--appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/TerminateServer.java2
-rw-r--r--appc-config/appc-config-audit/provider/pom.xml6
-rw-r--r--appc-config/appc-config-generator/provider/pom.xml10
-rw-r--r--appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java2
-rw-r--r--appc-config/appc-config-params/provider/pom.xml10
-rw-r--r--appc-config/appc-data-services/provider/src/test/resources/svclogic.properties24
-rw-r--r--appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/Constants.java2
-rw-r--r--appc-config/appc-flow-controller/provider/src/test/resources/svclogic.properties24
-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
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/ASDC-MESSAGE/ASDC-MESSAGE_2.0.1_method_configuration-document-request.json2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/ASDC-MESSAGE/ASDC-MESSAGE_method_configuration-document-request_3.0.0.json2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-backup.json2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-aai-sbg.json2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-aai.json2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-vnfc-info.json2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-vserver-info.json2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java8
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java12
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java8
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogFail.properties6
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogSuccess.properties6
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Json2DGContextFail.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetInstarParamsFail.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/MergeParamsFail.properties10
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Failure.properties4
-rw-r--r--appc-directed-graph/dg-loader/provider/pom.xml8
-rw-r--r--appc-directed-graph/dg-loader/provider/src/test/resources/dummy.properties24
-rw-r--r--appc-directed-graph/pom.xml2
-rw-r--r--appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/onap/appc/executor/impl/LCMCommandTask.java2
-rw-r--r--appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/resources/org/onap/appc/default.properties40
-rw-r--r--appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/AbstractRequestValidatorImpl.java2
-rw-r--r--appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/onap/appc/default.properties40
-rw-r--r--appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/onap/appc/default.properties40
-rw-r--r--appc-inbound/appc-artifact-handler/provider/src/test/resources/svclogic.properties24
-rw-r--r--appc-inbound/appc-design-services/provider/src/test/resources/svclogic.properties24
-rw-r--r--appc-oam/appc-oam-bundle/src/main/resources/org/onap/appc/default.properties8
-rwxr-xr-xappc-outbound/appc-aai-client/provider/pom.xml1
-rwxr-xr-xappc-outbound/pom.xml6
60 files changed, 215 insertions, 216 deletions
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java
index 7ddcd37e6..5d60ae2af 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java
@@ -138,7 +138,7 @@ public class EvacuateServer extends ProviderServerOperation {
/**
* @see org.onap.appc.adapter.iaas.ProviderAdapter#evacuateServer(java.util.Map,
- * org.openecomp.sdnc.sli.SvcLogicContext)
+ * org.onap.ccsdk.sli.core.sli.SvcLogicContext)
*/
private Server evacuateServer(Map<String, String> params, SvcLogicContext ctx) throws APPCException {
Server server = null;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/MigrateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/MigrateServer.java
index b28918c09..723622eca 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/MigrateServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/MigrateServer.java
@@ -154,7 +154,7 @@ public class MigrateServer extends ProviderServerOperation {
/**
* @see org.onap.appc.adapter.iaas.ProviderAdapter#migrateServer(java.util.Map,
- * org.openecomp.sdnc.sli.SvcLogicContext)
+ * org.onap.ccsdk.sli.core.sli.SvcLogicContext)
*/
private Server migrateServer(Map<String, String> params, SvcLogicContext ctx) throws APPCException {
Server server = null;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RebuildServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RebuildServer.java
index a2b27f29a..bbb4e2c5d 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RebuildServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RebuildServer.java
@@ -329,7 +329,7 @@ public class RebuildServer extends ProviderServerOperation {
/**
* @see org.onap.appc.adapter.iaas.ProviderAdapter#rebuildServer(java.util.Map,
- * org.openecomp.sdnc.sli.SvcLogicContext)
+ * org.onap.ccsdk.sli.core.sli.SvcLogicContext)
*/
@SuppressWarnings("nls")
public Server rebuildServer(Map<String, String> params, SvcLogicContext ctx) throws APPCException {
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RestartServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RestartServer.java
index cc30ca833..71deee403 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RestartServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RestartServer.java
@@ -177,7 +177,7 @@ public class RestartServer extends ProviderServerOperation {
* @throws UnknownProviderException If the provider cannot be found
* @throws IllegalArgumentException if the expected argument(s) are not defined or are invalid
* @see org.onap.appc.adapter.iaas.ProviderAdapter#restartServer(java.util.Map,
- * org.openecomp.sdnc.sli.SvcLogicContext)
+ * org.onap.ccsdk.sli.core.sli.SvcLogicContext)
*/
@SuppressWarnings("nls")
private Server restartServer(Map<String, String> params, SvcLogicContext ctx)
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/StartServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/StartServer.java
index 1dbeacbf3..f5d618fef 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/StartServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/StartServer.java
@@ -53,7 +53,7 @@ public class StartServer extends ProviderServerOperation {
/**
* @see org.onap.appc.adapter.iaas.ProviderAdapter#startServer(java.util.Map,
- * org.openecomp.sdnc.sli.SvcLogicContext)
+ * org.onap.ccsdk.sli.core.sli.SvcLogicContext)
*/
@SuppressWarnings("nls")
public Server startServer(Map<String, String> params, SvcLogicContext ctx) throws APPCException {
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/StopServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/StopServer.java
index df836b77c..15adca90c 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/StopServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/StopServer.java
@@ -54,7 +54,7 @@ public class StopServer extends ProviderServerOperation {
/**
* @see org.onap.appc.adapter.iaas.ProviderAdapter#stopServer(java.util.Map,
- * org.openecomp.sdnc.sli.SvcLogicContext)
+ * org.onap.ccsdk.sli.core.sli.SvcLogicContext)
*/
@SuppressWarnings("nls")
public Server stopServer(Map<String, String> params, SvcLogicContext ctx) throws APPCException {
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/TerminateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/TerminateServer.java
index 73385ee35..6bd7d27f7 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/TerminateServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/TerminateServer.java
@@ -174,7 +174,7 @@ public class TerminateServer extends ProviderServerOperation {
* @throws UnknownProviderException If the provider cannot be found
* @throws IllegalArgumentException if the expected argument(s) are not defined or are invalid
* @see org.onap.appc.adapter.iaas.ProviderAdapter#terminateServer(java.util.Map,
- * org.openecomp.sdnc.sli.SvcLogicContext)
+ * org.onap.ccsdk.sli.core.sli.SvcLogicContext)
*/
@SuppressWarnings("nls")
public Server terminateServer(Map<String, String> params, SvcLogicContext ctx)
diff --git a/appc-config/appc-config-audit/provider/pom.xml b/appc-config/appc-config-audit/provider/pom.xml
index c07a4cd00..6e829da43 100644
--- a/appc-config/appc-config-audit/provider/pom.xml
+++ b/appc-config/appc-config-audit/provider/pom.xml
@@ -67,9 +67,9 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>org.openecomp.sdnc.config.audit</Bundle-SymbolicName>
- <Bundle-Activator>org.openecomp.sdnc.config.audit.SliAuditActivator</Bundle-Activator>
- <Export-Package>org.openecomp.sdnc.config.audit,org.openecomp.sdnc.config.audit.node</Export-Package>
+ <Bundle-SymbolicName>org.onap.sdnc.config.audit</Bundle-SymbolicName>
+ <Bundle-Activator>org.onap.sdnc.config.audit.SliAuditActivator</Bundle-Activator>
+ <Export-Package>org.onap.sdnc.config.audit,org.onap.sdnc.config.audit.node</Export-Package>
<Import-Package>*</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
diff --git a/appc-config/appc-config-generator/provider/pom.xml b/appc-config/appc-config-generator/provider/pom.xml
index d247e1589..af8cdbb5c 100644
--- a/appc-config/appc-config-generator/provider/pom.xml
+++ b/appc-config/appc-config-generator/provider/pom.xml
@@ -87,11 +87,11 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>org.openecomp.sdnc.config.generator</Bundle-SymbolicName>
- <Bundle-Activator>org.openecomp.sdnc.config.generator.ConfigGeneratorActivator</Bundle-Activator>
- <Export-Package>org.openecomp.sdnc.config.generator,org.openecomp.sdnc.config.generator.compare,org.openecomp.sdnc.config.generator.convert,
- org.openecomp.sdnc.config.generator.merge,org.openecomp.sdnc.config.generator.pattern,org.openecomp.sdnc.config.generator.tool,
- org.openecomp.sdnc.config.generator.transform</Export-Package>
+ <Bundle-SymbolicName>org.onap.sdnc.config.generator</Bundle-SymbolicName>
+ <Bundle-Activator>org.onap.sdnc.config.generator.ConfigGeneratorActivator</Bundle-Activator>
+ <Export-Package>org.onap.sdnc.config.generator,org.onap.sdnc.config.generator.compare,org.onap.sdnc.config.generator.convert,
+ org.onap.sdnc.config.generator.merge,org.onap.sdnc.config.generator.pattern,org.onap.sdnc.config.generator.tool,
+ org.onap.sdnc.config.generator.transform</Export-Package>
<Import-Package>*</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java
index c368eb605..4698c8134 100644
--- a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java
+++ b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java
@@ -27,7 +27,7 @@ package org.onap.sdnc.config.generator.tool;
public class Constants {
public static final String DBLIB_SERVICE =
- "org.openecomp.sdnc.sli.resource.dblib.DBResourceManager";
+ "org.onap.ccsdk.sli.core.dblib.DBResourceManager";
public static final String DEVICE_AUTHENTICATION = "DEVICE_AUTHENTICATION";
public static final String SCHEMA_SDNCTL = "SDNCTL";
diff --git a/appc-config/appc-config-params/provider/pom.xml b/appc-config/appc-config-params/provider/pom.xml
index 61b739255..13175221e 100644
--- a/appc-config/appc-config-params/provider/pom.xml
+++ b/appc-config/appc-config-params/provider/pom.xml
@@ -75,11 +75,11 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>org.openecomp.sdnc.config.params</Bundle-SymbolicName>
- <Bundle-Activator>org.openecomp.sdnc.config.params.ParamsHandlerActivator</Bundle-Activator>
- <Export-Package>org.openecomp.sdnc.config.params,org.openecomp.sdnc.config.params.data,
- org.openecomp.sdnc.config.params.parser,org.openecomp.sdnc.config.params.transformer,
- org.openecomp.sdnc.config.params.transformer.tosca,org.openecomp.sdnc.config.params.transformer.tosca.exceptions</Export-Package>
+ <Bundle-SymbolicName>org.onap.sdnc.config.params</Bundle-SymbolicName>
+ <Bundle-Activator>org.onap.sdnc.config.params.ParamsHandlerActivator</Bundle-Activator>
+ <Export-Package>org.onap.sdnc.config.params,org.onap.sdnc.config.params.data,
+ org.onap.sdnc.config.params.parser,org.onap.sdnc.config.params.transformer,
+ org.onap.sdnc.config.params.transformer.tosca,org.onap.sdnc.config.params.transformer.tosca.exceptions</Export-Package>
<Import-Package>*</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
diff --git a/appc-config/appc-data-services/provider/src/test/resources/svclogic.properties b/appc-config/appc-data-services/provider/src/test/resources/svclogic.properties
index 02867302d..809705f50 100644
--- a/appc-config/appc-data-services/provider/src/test/resources/svclogic.properties
+++ b/appc-config/appc-data-services/provider/src/test/resources/svclogic.properties
@@ -18,16 +18,16 @@
# ============LICENSE_END=========================================================
###
=
-org.openecomp.sdnc.sli.dbtype=
-org.openecomp.sdnc.sli.jdbc.hosts=
-org.openecomp.sdnc.sli.jdbc.url=
-org.openecomp.sdnc.sli.jdbc.database=
-org.openecomp.sdnc.sli.jdbc.user=
-org.openecomp.sdnc.sli.jdbc.password=
-org.openecomp.sdnc.sli.jdbc.connection.name=
+org.onap.ccsdk.sli.dbtype=
+org.onap.ccsdk.sli.adaptors.jdbc.hosts=
+org.onap.ccsdk.sli.adaptors.jdbc.url=
+org.onap.ccsdk.sli.adaptors.jdbc.database=
+org.onap.ccsdk.sli.adaptors.jdbc.user=
+org.onap.ccsdk.sli.adaptors.jdbc.password=
+org.onap.ccsdk.sli.adaptors.jdbc.connection.name=
-org.openecomp.sdnc.sli.jdbc.connection.timeout=
-org.openecomp.sdnc.sli.jdbc.request.timeout=
-org.openecomp.sdnc.sli.jdbc.limit.init=
-org.openecomp.sdnc.sli.jdbc.limit.min=
-org.openecomp.sdnc.sli.jdbc.limit.max=
+org.onap.ccsdk.sli.adaptors.jdbc.connection.timeout=
+org.onap.ccsdk.sli.adaptors.jdbc.request.timeout=
+org.onap.ccsdk.sli.adaptors.jdbc.limit.init=
+org.onap.ccsdk.sli.adaptors.jdbc.limit.min=
+org.onap.ccsdk.sli.adaptors.jdbc.limit.max=
diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/Constants.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/Constants.java
index 9289b1be5..e3db30df6 100644
--- a/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/Constants.java
+++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/Constants.java
@@ -23,7 +23,7 @@ package org.onap.appc.encryptiontool.wrapper;
public class Constants
{
- public static final String DBLIB_SERVICE = "org.openecomp.sdnctl.sli.resource.dblib.DBResourceManager";
+ public static final String DBLIB_SERVICE = "org.onap.ccsdk.sli.core.dblib.DBResourceManager";
public static final String DEVICE_AUTHENTICATION="DEVICE_AUTHENTICATION";
public static final String SCHEMA_SDNCTL="SDNCTL";
diff --git a/appc-config/appc-flow-controller/provider/src/test/resources/svclogic.properties b/appc-config/appc-flow-controller/provider/src/test/resources/svclogic.properties
index f6b424136..9d7074417 100644
--- a/appc-config/appc-flow-controller/provider/src/test/resources/svclogic.properties
+++ b/appc-config/appc-flow-controller/provider/src/test/resources/svclogic.properties
@@ -18,16 +18,16 @@
# ============LICENSE_END=========================================================
###
-org.openecomp.sdnc.sli.dbtype=
-org.openecomp.sdnc.sli.jdbc.hosts=
-org.openecomp.sdnc.sli.jdbc.url=
-org.openecomp.sdnc.sli.jdbc.database=
-org.openecomp.sdnc.sli.jdbc.user=
-org.openecomp.sdnc.sli.jdbc.password=
-org.openecomp.sdnc.sli.jdbc.connection.name=
+org.onap.ccsdk.sli.dbtype=
+org.onap.ccsdk.sli.adaptors.jdbc.hosts=
+org.onap.ccsdk.sli.adaptors.jdbc.url=
+org.onap.ccsdk.sli.adaptors.jdbc.database=
+org.onap.ccsdk.sli.adaptors.jdbc.user=
+org.onap.ccsdk.sli.adaptors.jdbc.password=
+org.onap.ccsdk.sli.adaptors.jdbc.connection.name=
-org.openecomp.sdnc.sli.jdbc.connection.timeout=
-org.openecomp.sdnc.sli.jdbc.request.timeout=
-org.openecomp.sdnc.sli.jdbc.limit.init=
-org.openecomp.sdnc.sli.jdbc.limit.min=
-org.openecomp.sdnc.sli.jdbc.limit.max=
+org.onap.ccsdk.sli.adaptors.jdbc.connection.timeout=
+org.onap.ccsdk.sli.adaptors.jdbc.request.timeout=
+org.onap.ccsdk.sli.adaptors.jdbc.limit.init=
+org.onap.ccsdk.sli.adaptors.jdbc.limit.min=
+org.onap.ccsdk.sli.adaptors.jdbc.limit.max=
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"
},
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/ASDC-MESSAGE/ASDC-MESSAGE_2.0.1_method_configuration-document-request.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/ASDC-MESSAGE/ASDC-MESSAGE_2.0.1_method_configuration-document-request.json
index 5141a7df4..e5b54ac1b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/ASDC-MESSAGE/ASDC-MESSAGE_2.0.1_method_configuration-document-request.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/ASDC-MESSAGE/ASDC-MESSAGE_2.0.1_method_configuration-document-request.json
@@ -1 +1 @@
-[{"id":"16b56aca.921305","type":"dgstart","name":"DGSTART","outputs":1,"x":164,"y":68,"z":"c6a88251.aeda8","wires":[["dafab93e.ef6db8"]]},{"id":"71efd50a.f24eec","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":209,"y":199,"z":"c6a88251.aeda8","wires":[["7ab86011.58b3d","51012c63.b2c994","10cfc47.8fe793c","9b276109.1a9f8"]]},{"id":"d686b8ea.8264f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":575,"y":381,"z":"c6a88251.aeda8","wires":[["cce5b362.94661"]]},{"id":"5cf21fe6.ee98e","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"503\"/>\n\t<parameter name=\"error-message\" value=\"Unable to save ASDC artifact\"/>\n\t<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":948,"y":439,"z":"c6a88251.aeda8","wires":[]},{"id":"6a8fcfe.ea99b3","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":280,"y":575,"z":"c6a88251.aeda8","wires":[["62a9108b.dca58"]]},{"id":"62a9108b.dca58","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":438,"y":611,"z":"c6a88251.aeda8","wires":[["9ca441f6.58cd1","995305a7.07ec28","9d8a547b.b434f8"]]},{"id":"9d8a547b.b434f8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='200' />\n","comments":"","x":666,"y":733,"z":"c6a88251.aeda8","wires":[]},{"id":"dafab93e.ef6db8","type":"service-logic","name":"ASDC-MESSAGE 2.0.1","module":"ASDC-MESSAGE","version":"2.0.1","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='ASDC-MESSAGE' version='2.0.1'>","outputs":1,"x":386,"y":68,"z":"c6a88251.aeda8","wires":[["5cb3be39.2d283"]]},{"id":"5cb3be39.2d283","type":"method","name":"configuration-document-request","xml":"<method rpc='configuration-document-request' mode='sync'>\n","comments":"","outputs":1,"x":270,"y":129,"z":"c6a88251.aeda8","wires":[["71efd50a.f24eec"]]},{"id":"7ab86011.58b3d","type":"get-resource","name":"get-resource: asdc-reference SQLResource","xml":"<get-resource\n\tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey=\"SELECT vnf_type, vnfc_type, file_category\n\t FROM ASDC_REFERENCE\n WHERE artifact_name = $configuration-document-request-input.document-parameters.artifact-name ;\"\n force='true'\n\tpfx='asdc-reference'>\n","comments":"","outputs":1,"x":492,"y":192,"z":"c6a88251.aeda8","wires":[["3e5e30f7.7b527","3ce6e169.a2dc8e"]]},{"id":"9b276109.1a9f8","type":"save","name":"save asdc-file SQLResource","xml":"<save \tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey='INSERT INTO CONFIGFILES\n\t SET data_source = \"ASDC\",\n\t vnf_type = $asdc-reference.vnf-type ,\n\t vnfc_type = $asdc-reference.vnfc-type ,\n\t file_category \t= $asdc-reference.file-category ,\n\t file_name = $configuration-document-request-input.document-parameters.artifact-name ,\n\t file_content = $escapedData ;'\n\t \tforce='true'\n\n \tpfx='tmp.config-files'>\n","comments":"","outputs":1,"x":342,"y":389,"z":"c6a88251.aeda8","wires":[["d686b8ea.8264f8","6a8fcfe.ea99b3","de6d6715.fb9568"]]},{"id":"51012c63.b2c994","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=\"vnf-type\" value=\"`$asdc-reference.vnf-type`\"/>\n<parameter name=\"vnfc-type\" value=\"`$asdc-reference.vnfc-type`\"/>\n<parameter name=\"file-category\" value=\"`$asdc-reference.file-category`\"/>\n\n\n\n","comments":"","outputs":1,"x":378,"y":235,"z":"c6a88251.aeda8","wires":[[]]},{"id":"3e5e30f7.7b527","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":750,"y":157,"z":"c6a88251.aeda8","wires":[["568cd496.8a01fc"]]},{"id":"3ce6e169.a2dc8e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":758,"y":223,"z":"c6a88251.aeda8","wires":[["568cd496.8a01fc"]]},{"id":"d8e09650.bf1098","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"502\"/>\n\t<parameter name=\"error-message\" value=\"Unable to retrieve asdc_resource\"/>\n\t<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1226,"y":291,"z":"c6a88251.aeda8","wires":[]},{"id":"9ca441f6.58cd1","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=\"file-contents\" value=\"`$configuration-document-request-input.configuration-document-information.document-parameters[0].artifact-contents`\"/>\n\n","comments":"","outputs":1,"x":643,"y":634,"z":"c6a88251.aeda8","wires":[[]]},{"id":"995305a7.07ec28","type":"set","name":"set deploy-ok","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_OK\" />\n","comments":"","outputs":1,"x":665,"y":681,"z":"c6a88251.aeda8","wires":[[]]},{"id":"cce5b362.94661","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":725,"y":406,"z":"c6a88251.aeda8","wires":[["21e0bdf3.1ca732","c27c40a2.ae31","5cf21fe6.ee98e"]]},{"id":"21e0bdf3.1ca732","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=\"error-code\" value=\"503\"/>\n\n","comments":"","outputs":1,"x":921,"y":324,"z":"c6a88251.aeda8","wires":[[]]},{"id":"c27c40a2.ae31","type":"set","name":"set deploy-error 503","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_ERROR\" />\n\t<parameter name=\"config-document-response.error-reason\" value=\"failure to store artifact\" />\n\n","comments":"","outputs":1,"x":954,"y":373,"z":"c6a88251.aeda8","wires":[[]]},{"id":"568cd496.8a01fc","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":981,"y":166,"z":"c6a88251.aeda8","wires":[["a514a19d.1922e","f8fdb850.32b458","d8e09650.bf1098"]]},{"id":"a514a19d.1922e","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=\"error-code\" value=\"502\"/>","comments":"","outputs":1,"x":1199,"y":140,"z":"c6a88251.aeda8","wires":[[]]},{"id":"f8fdb850.32b458","type":"set","name":"set: deploy-error-502","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_ERROR\" />\n\t<parameter name=\"config-document-response.error-reason\" value=\"missing asdc_reference data for artifact-name\" />\n\n\n","comments":"","outputs":1,"x":1213,"y":195,"z":"c6a88251.aeda8","wires":[[]]},{"id":"de6d6715.fb9568","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":583,"y":440,"z":"c6a88251.aeda8","wires":[["cce5b362.94661"]]},{"id":"10cfc47.8fe793c","type":"configure","name":"configure: escapeSQL","xml":"<configure adaptor='org.onap.appc.ccadaptor.ConfigComponentAdaptor' key='escapeSql' >\n<parameter name=\"artifactContents\" value=\"`$configuration-document-request-input.document-parameters.artifact-contents`\"/>\n\n","comments":"","outputs":1,"x":379,"y":286,"z":"c6a88251.aeda8","wires":[[]]}]
+[{"id":"16b56aca.921305","type":"dgstart","name":"DGSTART","outputs":1,"x":164,"y":68,"z":"c6a88251.aeda8","wires":[["dafab93e.ef6db8"]]},{"id":"71efd50a.f24eec","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":209,"y":199,"z":"c6a88251.aeda8","wires":[["7ab86011.58b3d","51012c63.b2c994","10cfc47.8fe793c","9b276109.1a9f8"]]},{"id":"d686b8ea.8264f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":575,"y":381,"z":"c6a88251.aeda8","wires":[["cce5b362.94661"]]},{"id":"5cf21fe6.ee98e","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"503\"/>\n\t<parameter name=\"error-message\" value=\"Unable to save ASDC artifact\"/>\n\t<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":948,"y":439,"z":"c6a88251.aeda8","wires":[]},{"id":"6a8fcfe.ea99b3","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":280,"y":575,"z":"c6a88251.aeda8","wires":[["62a9108b.dca58"]]},{"id":"62a9108b.dca58","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":438,"y":611,"z":"c6a88251.aeda8","wires":[["9ca441f6.58cd1","995305a7.07ec28","9d8a547b.b434f8"]]},{"id":"9d8a547b.b434f8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='200' />\n","comments":"","x":666,"y":733,"z":"c6a88251.aeda8","wires":[]},{"id":"dafab93e.ef6db8","type":"service-logic","name":"ASDC-MESSAGE 2.0.1","module":"ASDC-MESSAGE","version":"2.0.1","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='ASDC-MESSAGE' version='2.0.1'>","outputs":1,"x":386,"y":68,"z":"c6a88251.aeda8","wires":[["5cb3be39.2d283"]]},{"id":"5cb3be39.2d283","type":"method","name":"configuration-document-request","xml":"<method rpc='configuration-document-request' mode='sync'>\n","comments":"","outputs":1,"x":270,"y":129,"z":"c6a88251.aeda8","wires":[["71efd50a.f24eec"]]},{"id":"7ab86011.58b3d","type":"get-resource","name":"get-resource: asdc-reference SQLResource","xml":"<get-resource\n\tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey=\"SELECT vnf_type, vnfc_type, file_category\n\t FROM ASDC_REFERENCE\n WHERE artifact_name = $configuration-document-request-input.document-parameters.artifact-name ;\"\n force='true'\n\tpfx='asdc-reference'>\n","comments":"","outputs":1,"x":492,"y":192,"z":"c6a88251.aeda8","wires":[["3e5e30f7.7b527","3ce6e169.a2dc8e"]]},{"id":"9b276109.1a9f8","type":"save","name":"save asdc-file SQLResource","xml":"<save \tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey='INSERT INTO CONFIGFILES\n\t SET data_source = \"ASDC\",\n\t vnf_type = $asdc-reference.vnf-type ,\n\t vnfc_type = $asdc-reference.vnfc-type ,\n\t file_category \t= $asdc-reference.file-category ,\n\t file_name = $configuration-document-request-input.document-parameters.artifact-name ,\n\t file_content = $escapedData ;'\n\t \tforce='true'\n\n \tpfx='tmp.config-files'>\n","comments":"","outputs":1,"x":342,"y":389,"z":"c6a88251.aeda8","wires":[["d686b8ea.8264f8","6a8fcfe.ea99b3","de6d6715.fb9568"]]},{"id":"51012c63.b2c994","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=\"vnf-type\" value=\"`$asdc-reference.vnf-type`\"/>\n<parameter name=\"vnfc-type\" value=\"`$asdc-reference.vnfc-type`\"/>\n<parameter name=\"file-category\" value=\"`$asdc-reference.file-category`\"/>\n\n\n\n","comments":"","outputs":1,"x":378,"y":235,"z":"c6a88251.aeda8","wires":[[]]},{"id":"3e5e30f7.7b527","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":750,"y":157,"z":"c6a88251.aeda8","wires":[["568cd496.8a01fc"]]},{"id":"3ce6e169.a2dc8e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":758,"y":223,"z":"c6a88251.aeda8","wires":[["568cd496.8a01fc"]]},{"id":"d8e09650.bf1098","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"502\"/>\n\t<parameter name=\"error-message\" value=\"Unable to retrieve asdc_resource\"/>\n\t<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1226,"y":291,"z":"c6a88251.aeda8","wires":[]},{"id":"9ca441f6.58cd1","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=\"file-contents\" value=\"`$configuration-document-request-input.configuration-document-information.document-parameters[0].artifact-contents`\"/>\n\n","comments":"","outputs":1,"x":643,"y":634,"z":"c6a88251.aeda8","wires":[[]]},{"id":"995305a7.07ec28","type":"set","name":"set deploy-ok","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_OK\" />\n","comments":"","outputs":1,"x":665,"y":681,"z":"c6a88251.aeda8","wires":[[]]},{"id":"cce5b362.94661","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":725,"y":406,"z":"c6a88251.aeda8","wires":[["21e0bdf3.1ca732","c27c40a2.ae31","5cf21fe6.ee98e"]]},{"id":"21e0bdf3.1ca732","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=\"error-code\" value=\"503\"/>\n\n","comments":"","outputs":1,"x":921,"y":324,"z":"c6a88251.aeda8","wires":[[]]},{"id":"c27c40a2.ae31","type":"set","name":"set deploy-error 503","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_ERROR\" />\n\t<parameter name=\"config-document-response.error-reason\" value=\"failure to store artifact\" />\n\n","comments":"","outputs":1,"x":954,"y":373,"z":"c6a88251.aeda8","wires":[[]]},{"id":"568cd496.8a01fc","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":981,"y":166,"z":"c6a88251.aeda8","wires":[["a514a19d.1922e","f8fdb850.32b458","d8e09650.bf1098"]]},{"id":"a514a19d.1922e","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=\"error-code\" value=\"502\"/>","comments":"","outputs":1,"x":1199,"y":140,"z":"c6a88251.aeda8","wires":[[]]},{"id":"f8fdb850.32b458","type":"set","name":"set: deploy-error-502","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_ERROR\" />\n\t<parameter name=\"config-document-response.error-reason\" value=\"missing asdc_reference data for artifact-name\" />\n\n\n","comments":"","outputs":1,"x":1213,"y":195,"z":"c6a88251.aeda8","wires":[[]]},{"id":"de6d6715.fb9568","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":583,"y":440,"z":"c6a88251.aeda8","wires":[["cce5b362.94661"]]},{"id":"10cfc47.8fe793c","type":"configure","name":"configure: escapeSQL","xml":"<configure adaptor='org.onap.appc.ccadaptor.ConfigComponentAdaptor' key='escapeSql' >\n<parameter name=\"artifactContents\" value=\"`$configuration-document-request-input.document-parameters.artifact-contents`\"/>\n\n","comments":"","outputs":1,"x":379,"y":286,"z":"c6a88251.aeda8","wires":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/ASDC-MESSAGE/ASDC-MESSAGE_method_configuration-document-request_3.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/ASDC-MESSAGE/ASDC-MESSAGE_method_configuration-document-request_3.0.0.json
index 05c8c00cf..766a81291 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/ASDC-MESSAGE/ASDC-MESSAGE_method_configuration-document-request_3.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/ASDC-MESSAGE/ASDC-MESSAGE_method_configuration-document-request_3.0.0.json
@@ -1 +1 @@
-[{"id":"8f48883d.679f48","type":"dgstart","name":"DGSTART","outputs":1,"x":109,"y":43.99999713897705,"z":"28a80c95.6f39c4","wires":[["bd600a44.6c6cc8"]]},{"id":"24671a98.3cbfe6","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":444.3333206176758,"y":121.88888263702393,"z":"28a80c95.6f39c4","wires":[["6952f2c1.c8768c"]]},{"id":"92cd7002.19f79","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":780.2222023010254,"y":449.11104583740234,"z":"28a80c95.6f39c4","wires":[["63034f6b.1ca7e"]]},{"id":"b2658f84.2d5dc","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"503\"/>\n\t<parameter name=\"error-message\" value=\"Unable to save ASDC artifact\"/>\n\t<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1154.444320678711,"y":396.3332395553589,"z":"28a80c95.6f39c4","wires":[]},{"id":"369d3bdf.5c54a4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":752.4444885253906,"y":625.7776575088501,"z":"28a80c95.6f39c4","wires":[["ed2c0654.f52c48"]]},{"id":"ed2c0654.f52c48","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":955.1111526489258,"y":625.9999551773071,"z":"28a80c95.6f39c4","wires":[["8de31d68.7e5","7b65641b.dce5cc","4c10cb1c.481084"]]},{"id":"4c10cb1c.481084","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='200' />\n","comments":"","x":1158.000015258789,"y":665.8888864517212,"z":"28a80c95.6f39c4","wires":[]},{"id":"bd600a44.6c6cc8","type":"service-logic","name":"ASDC-MESSAGE 3.0.0","module":"ASDC-MESSAGE","version":"3.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='ASDC-MESSAGE' version='3.0.0'>","outputs":1,"x":368.1111297607422,"y":42,"z":"28a80c95.6f39c4","wires":[["86900238.26815"]]},{"id":"86900238.26815","type":"method","name":"configuration-document-request","xml":"<method rpc='configuration-document-request' mode='sync'>\n","comments":"","outputs":1,"x":179.77781677246094,"y":125.22222995758057,"z":"28a80c95.6f39c4","wires":[["24671a98.3cbfe6"]]},{"id":"6952f2c1.c8768c","type":"get-resource","name":"get-resource: asdc-reference SQLResource","xml":"<get-resource\n\tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey=\"SELECT vnf_type, vnfc_type, file_category\n\t FROM ASDC_REFERENCE\n WHERE artifact_name = $configuration-document-request-input.document-parameters.artifact-name ;\"\n force='true'\n\tpfx='asdc-reference'>\n","comments":"","outputs":1,"x":697.7777709960938,"y":72.33334350585938,"z":"28a80c95.6f39c4","wires":[["d72a70bd.4c03c","c2dec095.61d77","793fb24.a89de4c"]]},{"id":"e03ec3d2.d8db","type":"save","name":"save asdc-file SQLResource","xml":"<save \tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey='INSERT INTO ASDC_ARTIFACTS\n\t SET service_uuid\t= $configuration-document-request-input.document-parameters.service-uuid ,\n\t distribution_id\t= $configuration-document-request-input.document-parameters.distribution-id ,\n\t service_name\t= $configuration-document-request-input.document-parameters.service-name ,\n\t\tservice_description\t= $configuration-document-request-input.document-parameters.service-description ,\n\t\tresource_uuid\t= $configuration-document-request-input.document-parameters.resource-uuid ,\n\t\tresource_instance_name\t= $configuration-document-request-input.document-parameters.resource-instance-name ,\n\t\tresource_name\t= $configuration-document-request-input.document-parameters.resource-name ,\n\t\tresource_version\t= $configuration-document-request-input.document-parameters.resource-version ,\n\t\tresource_type\t= $configuration-document-request-input.document-parameters.resource-type ,\n\t\tartifact_uuid\t= $configuration-document-request-input.document-parameters.artifact-uuid ,\n\t\tartifact_type\t= $configuration-document-request-input.document-parameters.artifact-type ,\n\t\tartifact_version\t= $configuration-document-request-input.document-parameters.artifact-version ,\n\t\tartifact_description\t= $configuration-document-request-input.document-parameters.artifact-description ,\n\t\tinternal_version\t= $asdc-artifacts.internalversion ,\n\t artifact_name = $configuration-document-request-input.document-parameters.artifact-name ,\n\t artifact_content = $convertconfig.escapeData ;'\n\t \tforce='true'\n\n \tpfx='tmp.asdc-artifacts'>\n","comments":"","outputs":1,"x":530.2777900695801,"y":516.6666259765625,"z":"28a80c95.6f39c4","wires":[["92cd7002.19f79","369d3bdf.5c54a4","65ec4b77.655924"]]},{"id":"d72a70bd.4c03c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":978.9999389648438,"y":63.888885498046875,"z":"28a80c95.6f39c4","wires":[["755c0ce1.265bd4"]]},{"id":"c2dec095.61d77","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1021.6666870117188,"y":133,"z":"28a80c95.6f39c4","wires":[["755c0ce1.265bd4"]]},{"id":"194d7eb0.2c5761","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"502\"/>\n\t<parameter name=\"error-message\" value=\"Unable to retrieve asdc_resource\"/>\n\t<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1337,"y":140.33334350585938,"z":"28a80c95.6f39c4","wires":[]},{"id":"8de31d68.7e5","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=\"file-contents\" value=\"`$configuration-document-request-input.configuration-document-information.document-parameters[0].artifact-contents`\"/>\n\n","comments":"","outputs":1,"x":1125.8889656066895,"y":566.6665868759155,"z":"28a80c95.6f39c4","wires":[[]]},{"id":"7b65641b.dce5cc","type":"set","name":"set deploy-ok","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_OK\" />\n","comments":"","x":1150.2222366333008,"y":614.222170829773,"z":"28a80c95.6f39c4","wires":[]},{"id":"63034f6b.1ca7e","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":926.9999694824219,"y":491.1109781265259,"z":"28a80c95.6f39c4","wires":[["d64e50ba.e5739","9b6e24b7.fdfe38","b2658f84.2d5dc"]]},{"id":"d64e50ba.e5739","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=\"error-code\" value=\"503\"/>\n\n","comments":"","outputs":1,"x":1147.4444198608398,"y":519.110951423645,"z":"28a80c95.6f39c4","wires":[[]]},{"id":"9b6e24b7.fdfe38","type":"set","name":"set deploy-error 503","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_ERROR\" />\n\t<parameter name=\"config-document-response.error-reason\" value=\"failure to store artifact\" />\n\n","comments":"","x":1186.5553817749023,"y":459.22210597991943,"z":"28a80c95.6f39c4","wires":[]},{"id":"755c0ce1.265bd4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":1165.333251953125,"y":86.44444274902344,"z":"28a80c95.6f39c4","wires":[["1c294786.e44028","c0456dd5.b1e53","194d7eb0.2c5761"]]},{"id":"1c294786.e44028","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=\"error-code\" value=\"502\"/>","comments":"","outputs":1,"x":1316.2220458984375,"y":20.888885498046875,"z":"28a80c95.6f39c4","wires":[[]]},{"id":"c0456dd5.b1e53","type":"set","name":"set: deploy-error-502","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_ERROR\" />\n\t<parameter name=\"config-document-response.error-reason\" value=\"missing asdc_reference data for artifact-name\" />\n\n\n","comments":"","x":1369.7779541015625,"y":84.22221374511719,"z":"28a80c95.6f39c4","wires":[]},{"id":"65ec4b77.655924","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":772.8888893127441,"y":541.9999313354492,"z":"28a80c95.6f39c4","wires":[["63034f6b.1ca7e"]]},{"id":"f952ccb7.2b199","type":"configure","name":"configure: escapeSQL","xml":"<execute plugin=\"org.openecomp.sdnc.config.generator.convert.ConvertNode\" method=\"escapeData\">\n<parameter name=\"unEscapeData\" value=\"`$configuration-document-request-input.document-parameters.artifact-contents`\" />\n<parameter name=\"dataType\" value=\"SQL\" />\n<parameter name=\"responsePrefix\" value=\"convertconfig\" />\n\n","comments":"","outputs":1,"x":190.22225952148438,"y":426.55548095703125,"z":"28a80c95.6f39c4","wires":[["19da8879.6b1b48","bacd2a00.1e76f8"]]},{"id":"793fb24.a89de4c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":155.11114501953125,"y":200.44439697265625,"z":"28a80c95.6f39c4","wires":[["2de3157d.970b2a"]]},{"id":"980f749f.5434b8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":318.8888931274414,"y":336.33330821990967,"z":"28a80c95.6f39c4","wires":[["f952ccb7.2b199","1d3051dc.9282ce"]]},{"id":"c45cff68.8f337","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":318.88891220092773,"y":515.3332853317261,"z":"28a80c95.6f39c4","wires":[["e03ec3d2.d8db"]]},{"id":"1d3051dc.9282ce","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=\"error-code\" value=\"502\"/>","comments":"","outputs":1,"x":600.3333435058594,"y":284.99993896484375,"z":"28a80c95.6f39c4","wires":[[]]},{"id":"19da8879.6b1b48","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":150.66671752929688,"y":514.5554780960083,"z":"28a80c95.6f39c4","wires":[["c45cff68.8f337"]]},{"id":"d5fde229.a1b3d","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"503\"/>\n\t<parameter name=\"error-message\" value=\"`$convertconfig.error-message`\"/>\n\t<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":922.0000038146973,"y":310.2221803665161,"z":"28a80c95.6f39c4","wires":[]},{"id":"bacd2a00.1e76f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":505.4444885253906,"y":397.7777404785156,"z":"28a80c95.6f39c4","wires":[["fbad77e5.29f018"]]},{"id":"fbad77e5.29f018","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":667.4444808959961,"y":354.4443893432617,"z":"28a80c95.6f39c4","wires":[["d5fde229.a1b3d","fb6cdc78.ae031"]]},{"id":"fb6cdc78.ae031","type":"set","name":"set deploy-error 503","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_ERROR\" />\n\t<parameter name=\"config-document-response.error-reason\" value=\"failure to store artifact\" />\n\n","comments":"","x":952.4444808959961,"y":377.55552768707275,"z":"28a80c95.6f39c4","wires":[]},{"id":"2de3157d.970b2a","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":362,"y":209,"z":"28a80c95.6f39c4","wires":[["f924ea07.11f418"]]},{"id":"f924ea07.11f418","type":"get-resource","name":"get-resource: Internal version SQLResource","xml":"<get-resource\n\tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey=\"select IF(max(INTERNAL_VERSION)>0,max(INTERNAL_VERSION)+1,1) as internalversion\n\t FROM ASDC_ARTIFACTS\n WHERE ARTIFACT_NAME = $configuration-document-request-input.document-parameters.artifact-name ;\"\n force='true'\n\tpfx='asdc-artifacts'>\n\n\n\n","comments":"","outputs":1,"x":648,"y":194,"z":"28a80c95.6f39c4","wires":[["20525a76.581316","26b20401.248fac"]]},{"id":"20525a76.581316","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":132,"y":323,"z":"28a80c95.6f39c4","wires":[["980f749f.5434b8"]]},{"id":"26b20401.248fac","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":983,"y":190,"z":"28a80c95.6f39c4","wires":[["755c0ce1.265bd4"]]}]
+[{"id":"8f48883d.679f48","type":"dgstart","name":"DGSTART","outputs":1,"x":109,"y":43.99999713897705,"z":"28a80c95.6f39c4","wires":[["bd600a44.6c6cc8"]]},{"id":"24671a98.3cbfe6","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":444.3333206176758,"y":121.88888263702393,"z":"28a80c95.6f39c4","wires":[["6952f2c1.c8768c"]]},{"id":"92cd7002.19f79","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":780.2222023010254,"y":449.11104583740234,"z":"28a80c95.6f39c4","wires":[["63034f6b.1ca7e"]]},{"id":"b2658f84.2d5dc","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"503\"/>\n\t<parameter name=\"error-message\" value=\"Unable to save ASDC artifact\"/>\n\t<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1154.444320678711,"y":396.3332395553589,"z":"28a80c95.6f39c4","wires":[]},{"id":"369d3bdf.5c54a4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":752.4444885253906,"y":625.7776575088501,"z":"28a80c95.6f39c4","wires":[["ed2c0654.f52c48"]]},{"id":"ed2c0654.f52c48","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":955.1111526489258,"y":625.9999551773071,"z":"28a80c95.6f39c4","wires":[["8de31d68.7e5","7b65641b.dce5cc","4c10cb1c.481084"]]},{"id":"4c10cb1c.481084","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='200' />\n","comments":"","x":1158.000015258789,"y":665.8888864517212,"z":"28a80c95.6f39c4","wires":[]},{"id":"bd600a44.6c6cc8","type":"service-logic","name":"ASDC-MESSAGE 3.0.0","module":"ASDC-MESSAGE","version":"3.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='ASDC-MESSAGE' version='3.0.0'>","outputs":1,"x":368.1111297607422,"y":42,"z":"28a80c95.6f39c4","wires":[["86900238.26815"]]},{"id":"86900238.26815","type":"method","name":"configuration-document-request","xml":"<method rpc='configuration-document-request' mode='sync'>\n","comments":"","outputs":1,"x":179.77781677246094,"y":125.22222995758057,"z":"28a80c95.6f39c4","wires":[["24671a98.3cbfe6"]]},{"id":"6952f2c1.c8768c","type":"get-resource","name":"get-resource: asdc-reference SQLResource","xml":"<get-resource\n\tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey=\"SELECT vnf_type, vnfc_type, file_category\n\t FROM ASDC_REFERENCE\n WHERE artifact_name = $configuration-document-request-input.document-parameters.artifact-name ;\"\n force='true'\n\tpfx='asdc-reference'>\n","comments":"","outputs":1,"x":697.7777709960938,"y":72.33334350585938,"z":"28a80c95.6f39c4","wires":[["d72a70bd.4c03c","c2dec095.61d77","793fb24.a89de4c"]]},{"id":"e03ec3d2.d8db","type":"save","name":"save asdc-file SQLResource","xml":"<save \tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey='INSERT INTO ASDC_ARTIFACTS\n\t SET service_uuid\t= $configuration-document-request-input.document-parameters.service-uuid ,\n\t distribution_id\t= $configuration-document-request-input.document-parameters.distribution-id ,\n\t service_name\t= $configuration-document-request-input.document-parameters.service-name ,\n\t\tservice_description\t= $configuration-document-request-input.document-parameters.service-description ,\n\t\tresource_uuid\t= $configuration-document-request-input.document-parameters.resource-uuid ,\n\t\tresource_instance_name\t= $configuration-document-request-input.document-parameters.resource-instance-name ,\n\t\tresource_name\t= $configuration-document-request-input.document-parameters.resource-name ,\n\t\tresource_version\t= $configuration-document-request-input.document-parameters.resource-version ,\n\t\tresource_type\t= $configuration-document-request-input.document-parameters.resource-type ,\n\t\tartifact_uuid\t= $configuration-document-request-input.document-parameters.artifact-uuid ,\n\t\tartifact_type\t= $configuration-document-request-input.document-parameters.artifact-type ,\n\t\tartifact_version\t= $configuration-document-request-input.document-parameters.artifact-version ,\n\t\tartifact_description\t= $configuration-document-request-input.document-parameters.artifact-description ,\n\t\tinternal_version\t= $asdc-artifacts.internalversion ,\n\t artifact_name = $configuration-document-request-input.document-parameters.artifact-name ,\n\t artifact_content = $convertconfig.escapeData ;'\n\t \tforce='true'\n\n \tpfx='tmp.asdc-artifacts'>\n","comments":"","outputs":1,"x":530.2777900695801,"y":516.6666259765625,"z":"28a80c95.6f39c4","wires":[["92cd7002.19f79","369d3bdf.5c54a4","65ec4b77.655924"]]},{"id":"d72a70bd.4c03c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":978.9999389648438,"y":63.888885498046875,"z":"28a80c95.6f39c4","wires":[["755c0ce1.265bd4"]]},{"id":"c2dec095.61d77","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1021.6666870117188,"y":133,"z":"28a80c95.6f39c4","wires":[["755c0ce1.265bd4"]]},{"id":"194d7eb0.2c5761","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"502\"/>\n\t<parameter name=\"error-message\" value=\"Unable to retrieve asdc_resource\"/>\n\t<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1337,"y":140.33334350585938,"z":"28a80c95.6f39c4","wires":[]},{"id":"8de31d68.7e5","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=\"file-contents\" value=\"`$configuration-document-request-input.configuration-document-information.document-parameters[0].artifact-contents`\"/>\n\n","comments":"","outputs":1,"x":1125.8889656066895,"y":566.6665868759155,"z":"28a80c95.6f39c4","wires":[[]]},{"id":"7b65641b.dce5cc","type":"set","name":"set deploy-ok","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_OK\" />\n","comments":"","x":1150.2222366333008,"y":614.222170829773,"z":"28a80c95.6f39c4","wires":[]},{"id":"63034f6b.1ca7e","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":926.9999694824219,"y":491.1109781265259,"z":"28a80c95.6f39c4","wires":[["d64e50ba.e5739","9b6e24b7.fdfe38","b2658f84.2d5dc"]]},{"id":"d64e50ba.e5739","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=\"error-code\" value=\"503\"/>\n\n","comments":"","outputs":1,"x":1147.4444198608398,"y":519.110951423645,"z":"28a80c95.6f39c4","wires":[[]]},{"id":"9b6e24b7.fdfe38","type":"set","name":"set deploy-error 503","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_ERROR\" />\n\t<parameter name=\"config-document-response.error-reason\" value=\"failure to store artifact\" />\n\n","comments":"","x":1186.5553817749023,"y":459.22210597991943,"z":"28a80c95.6f39c4","wires":[]},{"id":"755c0ce1.265bd4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":1165.333251953125,"y":86.44444274902344,"z":"28a80c95.6f39c4","wires":[["1c294786.e44028","c0456dd5.b1e53","194d7eb0.2c5761"]]},{"id":"1c294786.e44028","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=\"error-code\" value=\"502\"/>","comments":"","outputs":1,"x":1316.2220458984375,"y":20.888885498046875,"z":"28a80c95.6f39c4","wires":[[]]},{"id":"c0456dd5.b1e53","type":"set","name":"set: deploy-error-502","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_ERROR\" />\n\t<parameter name=\"config-document-response.error-reason\" value=\"missing asdc_reference data for artifact-name\" />\n\n\n","comments":"","x":1369.7779541015625,"y":84.22221374511719,"z":"28a80c95.6f39c4","wires":[]},{"id":"65ec4b77.655924","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":772.8888893127441,"y":541.9999313354492,"z":"28a80c95.6f39c4","wires":[["63034f6b.1ca7e"]]},{"id":"f952ccb7.2b199","type":"configure","name":"configure: escapeSQL","xml":"<execute plugin=\"org.onap.sdnc.config.generator.convert.ConvertNode\" method=\"escapeData\">\n<parameter name=\"unEscapeData\" value=\"`$configuration-document-request-input.document-parameters.artifact-contents`\" />\n<parameter name=\"dataType\" value=\"SQL\" />\n<parameter name=\"responsePrefix\" value=\"convertconfig\" />\n\n","comments":"","outputs":1,"x":190.22225952148438,"y":426.55548095703125,"z":"28a80c95.6f39c4","wires":[["19da8879.6b1b48","bacd2a00.1e76f8"]]},{"id":"793fb24.a89de4c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":155.11114501953125,"y":200.44439697265625,"z":"28a80c95.6f39c4","wires":[["2de3157d.970b2a"]]},{"id":"980f749f.5434b8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":318.8888931274414,"y":336.33330821990967,"z":"28a80c95.6f39c4","wires":[["f952ccb7.2b199","1d3051dc.9282ce"]]},{"id":"c45cff68.8f337","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":318.88891220092773,"y":515.3332853317261,"z":"28a80c95.6f39c4","wires":[["e03ec3d2.d8db"]]},{"id":"1d3051dc.9282ce","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=\"error-code\" value=\"502\"/>","comments":"","outputs":1,"x":600.3333435058594,"y":284.99993896484375,"z":"28a80c95.6f39c4","wires":[[]]},{"id":"19da8879.6b1b48","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":150.66671752929688,"y":514.5554780960083,"z":"28a80c95.6f39c4","wires":[["c45cff68.8f337"]]},{"id":"d5fde229.a1b3d","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"503\"/>\n\t<parameter name=\"error-message\" value=\"`$convertconfig.error-message`\"/>\n\t<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":922.0000038146973,"y":310.2221803665161,"z":"28a80c95.6f39c4","wires":[]},{"id":"bacd2a00.1e76f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":505.4444885253906,"y":397.7777404785156,"z":"28a80c95.6f39c4","wires":[["fbad77e5.29f018"]]},{"id":"fbad77e5.29f018","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":667.4444808959961,"y":354.4443893432617,"z":"28a80c95.6f39c4","wires":[["d5fde229.a1b3d","fb6cdc78.ae031"]]},{"id":"fb6cdc78.ae031","type":"set","name":"set deploy-error 503","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_ERROR\" />\n\t<parameter name=\"config-document-response.error-reason\" value=\"failure to store artifact\" />\n\n","comments":"","x":952.4444808959961,"y":377.55552768707275,"z":"28a80c95.6f39c4","wires":[]},{"id":"2de3157d.970b2a","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":362,"y":209,"z":"28a80c95.6f39c4","wires":[["f924ea07.11f418"]]},{"id":"f924ea07.11f418","type":"get-resource","name":"get-resource: Internal version SQLResource","xml":"<get-resource\n\tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey=\"select IF(max(INTERNAL_VERSION)>0,max(INTERNAL_VERSION)+1,1) as internalversion\n\t FROM ASDC_ARTIFACTS\n WHERE ARTIFACT_NAME = $configuration-document-request-input.document-parameters.artifact-name ;\"\n force='true'\n\tpfx='asdc-artifacts'>\n\n\n\n","comments":"","outputs":1,"x":648,"y":194,"z":"28a80c95.6f39c4","wires":[["20525a76.581316","26b20401.248fac"]]},{"id":"20525a76.581316","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":132,"y":323,"z":"28a80c95.6f39c4","wires":[["980f749f.5434b8"]]},{"id":"26b20401.248fac","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":983,"y":190,"z":"28a80c95.6f39c4","wires":[["755c0ce1.265bd4"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-backup.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-backup.json
index cc531d753..023400057 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-backup.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-backup.json
@@ -1 +1 @@
-[{"id":"72300b6a.d66304","type":"comment","name":"Service-Configuration-Backup","info":"","comments":"","x":1466.25,"y":116,"z":"37e3acc8.561634","wires":[]},{"id":"6f0f1b54.abf674","type":"dgstart","name":"DGSTART","outputs":1,"x":85.5,"y":124.1111068725586,"z":"37e3acc8.561634","wires":[["3306295a.100926"]]},{"id":"3306295a.100926","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","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-API' version='4.0.0'>","outputs":1,"x":254.6667022705078,"y":121.77776336669922,"z":"37e3acc8.561634","wires":[["a625e1b7.68491"]]},{"id":"a625e1b7.68491","type":"method","name":"method service-configuration-backup","xml":"<method rpc='service-configuration-backup' mode='sync'>\n","comments":"","outputs":1,"x":514.0000305175781,"y":116.44442749023438,"z":"37e3acc8.561634","wires":[["7cce1009.b1969"]]},{"id":"50956db6.420d34","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=\"`$service-data.backup-information.service-instance-id`\"/>\n<parameter name=\"SERVICEDATAFILENAME\" value=\"`$service-data.backup-information.file-name`\"/>\n<parameter name=\"field4\" value=\"`$service-data.backup-information.file-type`\"/>\n<parameter name=\"field5\" value=\"`$service-configuration-operation-input.backup-information.service-instance-id`\"/>\n<parameter name=\"INPUTFILENAME\" value=\"`$service-configuration-operation-input.backup-information.file-name`\"/>\n<parameter name=\"field7\" value=\"`$service-configuration-operation-input.backup-information.file-type`\"/>\n<parameter name=\"field8\" value=\"`$service-data.appc-request-header.svc-action`\"/>\n<parameter name=\"field9\" value=\"`$service-data.vnf-config-information.vnf-host-ip-address`\"/>\n<parameter name=\"field10\" value=\"`$service-configuration-operation-input.appc-request-header.svc-action`\"/>\n<parameter name=\"field11\" value=\"`$service-configuration-operation-input.vnf-config-information.vnf-host-ip-address`\"/>\n","comments":"","outputs":1,"x":265.7498779296875,"y":381,"z":"37e3acc8.561634","wires":[[]]},{"id":"792c5a95.fa7b24","type":"GenericXML","name":"set: backup information and host IP","xml":"<set>\n\t<parameter name=\"service-data.backup-information.file-type\" value=\"`$service-configuration-operation-input.backup-information.file-type`\" />\n\t\n\t<parameter name=\"service-data.backup-information.file-name\" value=\"`$service-configuration-operation-input.backup-information.file-name`\" />\n\t\n\t<parameter name=\"service-data.backup-information.service-instance-id\" value=\"`$service-configuration-operation-input.backup-information.service-instance-id`\" />\n\t<parameter name=\"service-data.vnf-config-information.vnf-host-ip-address\" value=\"`$service-configuration-operation-input.vnf-config-information.vnf-host-ip-address`\" />\n\t<parameter name=\"service-data.service-information.service-instance-id\" value=\"`$service-configuration-operation-input.backup-information.service-instance-id`\"/>\n\t<parameter name=\"service-data.vnf-config-information.vendor\" value=\"`$service-configuration-operation-input.vnf-config-information.vendor`\" />\n\t\n\t\n\n","comments":"","outputs":1,"x":356,"y":339,"z":"37e3acc8.561634","wires":[[]]},{"id":"a358039.b124","type":"configure","name":"configure: ConfigComponentAdaptor","xml":"<configure adaptor=\"org.onap.appc.ccadaptor.ConfigComponentAdaptor\" key=\"dummy\">\n\t<parameter name=\"action\" value=\"`$service-data.appc-request-header.svc-action`\"/>\n\t\n\n\t","comments":"","outputs":1,"x":170,"y":1066,"z":"37e3acc8.561634","wires":[["cb278383.f55b3","640f72bc.e9135c"]]},{"id":"cb278383.f55b3","type":"failure","name":"failure","xml":"<outcome value='failure'>","outputs":1,"x":434,"y":1070,"z":"37e3acc8.561634","wires":[["92a5a578.2184b8"]]},{"id":"640f72bc.e9135c","type":"failure","name":"success","xml":"<outcome value='success'>","comments":"","outputs":1,"x":430,"y":1187,"z":"37e3acc8.561634","wires":[["31cc3939.22b816"]]},{"id":"31cc3939.22b816","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":640,"y":1190,"z":"37e3acc8.561634","wires":[]},{"id":"92a5a578.2184b8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":623,"y":1073,"z":"37e3acc8.561634","wires":[]},{"id":"ed24f120.cf4c8","type":"get-resource","name":"get-resource: A&AI Data","xml":"<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-name = $service-configuration-operation-input.service-information.service-instance-id\" pfx=\"tmp.aai-data\" >\n\n","comments":"","outputs":1,"x":821.5,"y":468,"z":"37e3acc8.561634","wires":[["2291f352.f5521c","4f2eb8f2.d537d8","448baa3.3f7e954"]]},{"id":"544d666.8d42598","type":"GenericXML","name":"set: last-action, last-sub-action, last-svc-request-id, last-order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"VsbgServiceBackupRequest\" />\n\t<parameter name=\"service-data.oper-status.last-sub-action\" value=\"`$service-configuration-operation-input.request-information.request-sub-action`\" />\n\t<parameter name=\"service-data.oper-status.last-svc-request-id\" value=\"`$service-configuration-operation-input.sdnc-request-header.svc-request-id`\" />\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\" />\n\n","comments":"","outputs":1,"x":456.5,"y":426,"z":"37e3acc8.561634","wires":[[]]},{"id":"973644f5.342df8","type":"switchNode","name":"switch: request-sub-action","xml":"<switch test=\"`$service-configuration-operation-input.request-information.request-sub-action`\">\n<!--\n leaf request-sub-action {\n type enumeration {\n enum \"PREPARE\";\n enum \"ACTIVATE\";\n }\n }\n} \n-->","comments":"","outputs":1,"x":116.5,"y":645,"z":"37e3acc8.561634","wires":[["f556e104.4b20b","6709c25e.a37b9c"]]},{"id":"f556e104.4b20b","type":"other","name":"RESTOREBACKUP","xml":"<outcome value='RESTOREBACKUP'>","comments":"","outputs":1,"x":350.5,"y":626,"z":"37e3acc8.561634","wires":[["dd64e29e.a7665"]]},{"id":"172a6471.dec2ec","type":"switchNode","name":"switch: A&AI Prov Status","xml":"<switch test=\"`$tmp.aai-data.prov-status`\">\n\n","comments":"","outputs":1,"x":1174.5,"y":733,"z":"37e3acc8.561634","wires":[["359f8600.44336a","7eaece51.99dc2","6d8cd7bb.309a78","7d475d2b.45f914"]]},{"id":"6709c25e.a37b9c","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":325.5,"y":688,"z":"37e3acc8.561634","wires":[["a358039.b124"]]},{"id":"9af828ad.bb9858","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"The SBG is in service and the configuration cannot be restored back to the initial configuration.The SBG should be put in a maintenance state before restoring.\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1613.5,"y":747,"z":"37e3acc8.561634","wires":[]},{"id":"359f8600.44336a","type":"other","name":"PROV","xml":"<outcome value='PROV'>","comments":"","outputs":1,"x":1434.5,"y":749,"z":"37e3acc8.561634","wires":[["9af828ad.bb9858"]]},{"id":"7eaece51.99dc2","type":"other","name":"PREPROV","xml":"<outcome value='PREPROV'>","comments":"","outputs":1,"x":1445.5,"y":798,"z":"37e3acc8.561634","wires":[["a358039.b124"]]},{"id":"6d8cd7bb.309a78","type":"other","name":"NVTPROV","xml":"<outcome value='NVTPROV'>","comments":"","outputs":1,"x":1450.5,"y":851,"z":"37e3acc8.561634","wires":[["a358039.b124"]]},{"id":"7d475d2b.45f914","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1461.5,"y":904,"z":"37e3acc8.561634","wires":[["f2f5f030.526eb"]]},{"id":"f2f5f030.526eb","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"`'Restore configuration is not allowed. SBG Status is' + $tmp.aai-data.prov-status`\"/>\n\n<!--\n<parameter name=\"error-message\" value=\"Restore configuration is not allowed. Invalid A&AI Status\"/>\n-->\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1634.5,"y":903,"z":"37e3acc8.561634","wires":[]},{"id":"7cce1009.b1969","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":67.5,"y":206,"z":"37e3acc8.561634","wires":[["50956db6.420d34","544d666.8d42598","5ea37258.1f5a0c","ed61d3df.d15ae","973644f5.342df8","792c5a95.fa7b24"]]},{"id":"5ea37258.1f5a0c","type":"set","name":"set: last-sub-action-status = InProgress","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"InProgress\" />","comments":"","x":364.5,"y":469,"z":"37e3acc8.561634","wires":[]},{"id":"ed61d3df.d15ae","type":"execute","name":"execute: setTime(modify-timestamp)","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>","comments":"","outputs":1,"x":368.5,"y":516,"z":"37e3acc8.561634","wires":[[]]},{"id":"dd64e29e.a7665","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":571.5,"y":568,"z":"37e3acc8.561634","wires":[["ed24f120.cf4c8"]]},{"id":"4cc5dcc9.9cef84","type":"switchNode","name":"switch: A&AI In-Maint","xml":"<switch test=\"`$tmp.aai-data.in-maint`\">\n\n","comments":"","outputs":1,"x":1167.5,"y":654,"z":"37e3acc8.561634","wires":[["a0194efc.a2f1f"]]},{"id":"2291f352.f5521c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1048.5,"y":467,"z":"37e3acc8.561634","wires":[["685cea94.e1a364"]]},{"id":"4f2eb8f2.d537d8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1044.5,"y":511,"z":"37e3acc8.561634","wires":[["e6099183.cff0e"]]},{"id":"685cea94.e1a364","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"SBG not found in A&amp;AI.\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1243.5,"y":463,"z":"37e3acc8.561634","wires":[]},{"id":"a0194efc.a2f1f","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1346.5,"y":654,"z":"37e3acc8.561634","wires":[["13a83c58.fc2154"]]},{"id":"13a83c58.fc2154","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"The SBG is in service and the configuration cannot be restored back to the initial configuration.The SBG should be put in a maintenance state before restoring.\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1513.5,"y":653,"z":"37e3acc8.561634","wires":[]},{"id":"448baa3.3f7e954","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":776.5,"y":580,"z":"37e3acc8.561634","wires":[["1bc02fac.ed8ea"]]},{"id":"1bc02fac.ed8ea","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":944.5,"y":581,"z":"37e3acc8.561634","wires":[["4cc5dcc9.9cef84","172a6471.dec2ec","3b0ebd45.85a932"]]},{"id":"3b0ebd45.85a932","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=\"PROVSTATUS\" value=\"`$tmp.aai-data.prov-status`\"/>\n<parameter name=\"INMAINT\" value=\"`$tmp.aai-data.in-maint`\"/>\n\n\n","comments":"","outputs":1,"x":1133.5,"y":579,"z":"37e3acc8.561634","wires":[[]]},{"id":"e6099183.cff0e","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"405\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.aai-data.error.message + '.Response code:' + $tmp.aai-data.error.http.response-code`\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1234,"y":511,"z":"37e3acc8.561634","wires":[]}]
+[{"id":"72300b6a.d66304","type":"comment","name":"Service-Configuration-Backup","info":"","comments":"","x":1466.25,"y":116,"z":"37e3acc8.561634","wires":[]},{"id":"6f0f1b54.abf674","type":"dgstart","name":"DGSTART","outputs":1,"x":85.5,"y":124.1111068725586,"z":"37e3acc8.561634","wires":[["3306295a.100926"]]},{"id":"3306295a.100926","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","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-API' version='4.0.0'>","outputs":1,"x":254.6667022705078,"y":121.77776336669922,"z":"37e3acc8.561634","wires":[["a625e1b7.68491"]]},{"id":"a625e1b7.68491","type":"method","name":"method service-configuration-backup","xml":"<method rpc='service-configuration-backup' mode='sync'>\n","comments":"","outputs":1,"x":514.0000305175781,"y":116.44442749023438,"z":"37e3acc8.561634","wires":[["7cce1009.b1969"]]},{"id":"50956db6.420d34","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=\"`$service-data.backup-information.service-instance-id`\"/>\n<parameter name=\"SERVICEDATAFILENAME\" value=\"`$service-data.backup-information.file-name`\"/>\n<parameter name=\"field4\" value=\"`$service-data.backup-information.file-type`\"/>\n<parameter name=\"field5\" value=\"`$service-configuration-operation-input.backup-information.service-instance-id`\"/>\n<parameter name=\"INPUTFILENAME\" value=\"`$service-configuration-operation-input.backup-information.file-name`\"/>\n<parameter name=\"field7\" value=\"`$service-configuration-operation-input.backup-information.file-type`\"/>\n<parameter name=\"field8\" value=\"`$service-data.appc-request-header.svc-action`\"/>\n<parameter name=\"field9\" value=\"`$service-data.vnf-config-information.vnf-host-ip-address`\"/>\n<parameter name=\"field10\" value=\"`$service-configuration-operation-input.appc-request-header.svc-action`\"/>\n<parameter name=\"field11\" value=\"`$service-configuration-operation-input.vnf-config-information.vnf-host-ip-address`\"/>\n","comments":"","outputs":1,"x":265.7498779296875,"y":381,"z":"37e3acc8.561634","wires":[[]]},{"id":"792c5a95.fa7b24","type":"GenericXML","name":"set: backup information and host IP","xml":"<set>\n\t<parameter name=\"service-data.backup-information.file-type\" value=\"`$service-configuration-operation-input.backup-information.file-type`\" />\n\t\n\t<parameter name=\"service-data.backup-information.file-name\" value=\"`$service-configuration-operation-input.backup-information.file-name`\" />\n\t\n\t<parameter name=\"service-data.backup-information.service-instance-id\" value=\"`$service-configuration-operation-input.backup-information.service-instance-id`\" />\n\t<parameter name=\"service-data.vnf-config-information.vnf-host-ip-address\" value=\"`$service-configuration-operation-input.vnf-config-information.vnf-host-ip-address`\" />\n\t<parameter name=\"service-data.service-information.service-instance-id\" value=\"`$service-configuration-operation-input.backup-information.service-instance-id`\"/>\n\t<parameter name=\"service-data.vnf-config-information.vendor\" value=\"`$service-configuration-operation-input.vnf-config-information.vendor`\" />\n\t\n\t\n\n","comments":"","outputs":1,"x":356,"y":339,"z":"37e3acc8.561634","wires":[[]]},{"id":"a358039.b124","type":"configure","name":"configure: ConfigComponentAdaptor","xml":"<configure adaptor=\"org.onap.appc.ccadaptor.ConfigComponentAdaptor\" key=\"dummy\">\n\t<parameter name=\"action\" value=\"`$service-data.appc-request-header.svc-action`\"/>\n\t\n\n\t","comments":"","outputs":1,"x":170,"y":1066,"z":"37e3acc8.561634","wires":[["cb278383.f55b3","640f72bc.e9135c"]]},{"id":"cb278383.f55b3","type":"failure","name":"failure","xml":"<outcome value='failure'>","outputs":1,"x":434,"y":1070,"z":"37e3acc8.561634","wires":[["92a5a578.2184b8"]]},{"id":"640f72bc.e9135c","type":"failure","name":"success","xml":"<outcome value='success'>","comments":"","outputs":1,"x":430,"y":1187,"z":"37e3acc8.561634","wires":[["31cc3939.22b816"]]},{"id":"31cc3939.22b816","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":640,"y":1190,"z":"37e3acc8.561634","wires":[]},{"id":"92a5a578.2184b8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":623,"y":1073,"z":"37e3acc8.561634","wires":[]},{"id":"ed24f120.cf4c8","type":"get-resource","name":"get-resource: A&AI Data","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-name = $service-configuration-operation-input.service-information.service-instance-id\" pfx=\"tmp.aai-data\" >\n\n","comments":"","outputs":1,"x":821.5,"y":468,"z":"37e3acc8.561634","wires":[["2291f352.f5521c","4f2eb8f2.d537d8","448baa3.3f7e954"]]},{"id":"544d666.8d42598","type":"GenericXML","name":"set: last-action, last-sub-action, last-svc-request-id, last-order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"VsbgServiceBackupRequest\" />\n\t<parameter name=\"service-data.oper-status.last-sub-action\" value=\"`$service-configuration-operation-input.request-information.request-sub-action`\" />\n\t<parameter name=\"service-data.oper-status.last-svc-request-id\" value=\"`$service-configuration-operation-input.sdnc-request-header.svc-request-id`\" />\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\" />\n\n","comments":"","outputs":1,"x":456.5,"y":426,"z":"37e3acc8.561634","wires":[[]]},{"id":"973644f5.342df8","type":"switchNode","name":"switch: request-sub-action","xml":"<switch test=\"`$service-configuration-operation-input.request-information.request-sub-action`\">\n<!--\n leaf request-sub-action {\n type enumeration {\n enum \"PREPARE\";\n enum \"ACTIVATE\";\n }\n }\n} \n-->","comments":"","outputs":1,"x":116.5,"y":645,"z":"37e3acc8.561634","wires":[["f556e104.4b20b","6709c25e.a37b9c"]]},{"id":"f556e104.4b20b","type":"other","name":"RESTOREBACKUP","xml":"<outcome value='RESTOREBACKUP'>","comments":"","outputs":1,"x":350.5,"y":626,"z":"37e3acc8.561634","wires":[["dd64e29e.a7665"]]},{"id":"172a6471.dec2ec","type":"switchNode","name":"switch: A&AI Prov Status","xml":"<switch test=\"`$tmp.aai-data.prov-status`\">\n\n","comments":"","outputs":1,"x":1174.5,"y":733,"z":"37e3acc8.561634","wires":[["359f8600.44336a","7eaece51.99dc2","6d8cd7bb.309a78","7d475d2b.45f914"]]},{"id":"6709c25e.a37b9c","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":325.5,"y":688,"z":"37e3acc8.561634","wires":[["a358039.b124"]]},{"id":"9af828ad.bb9858","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"The SBG is in service and the configuration cannot be restored back to the initial configuration.The SBG should be put in a maintenance state before restoring.\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1613.5,"y":747,"z":"37e3acc8.561634","wires":[]},{"id":"359f8600.44336a","type":"other","name":"PROV","xml":"<outcome value='PROV'>","comments":"","outputs":1,"x":1434.5,"y":749,"z":"37e3acc8.561634","wires":[["9af828ad.bb9858"]]},{"id":"7eaece51.99dc2","type":"other","name":"PREPROV","xml":"<outcome value='PREPROV'>","comments":"","outputs":1,"x":1445.5,"y":798,"z":"37e3acc8.561634","wires":[["a358039.b124"]]},{"id":"6d8cd7bb.309a78","type":"other","name":"NVTPROV","xml":"<outcome value='NVTPROV'>","comments":"","outputs":1,"x":1450.5,"y":851,"z":"37e3acc8.561634","wires":[["a358039.b124"]]},{"id":"7d475d2b.45f914","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1461.5,"y":904,"z":"37e3acc8.561634","wires":[["f2f5f030.526eb"]]},{"id":"f2f5f030.526eb","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"`'Restore configuration is not allowed. SBG Status is' + $tmp.aai-data.prov-status`\"/>\n\n<!--\n<parameter name=\"error-message\" value=\"Restore configuration is not allowed. Invalid A&AI Status\"/>\n-->\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1634.5,"y":903,"z":"37e3acc8.561634","wires":[]},{"id":"7cce1009.b1969","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":67.5,"y":206,"z":"37e3acc8.561634","wires":[["50956db6.420d34","544d666.8d42598","5ea37258.1f5a0c","ed61d3df.d15ae","973644f5.342df8","792c5a95.fa7b24"]]},{"id":"5ea37258.1f5a0c","type":"set","name":"set: last-sub-action-status = InProgress","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"InProgress\" />","comments":"","x":364.5,"y":469,"z":"37e3acc8.561634","wires":[]},{"id":"ed61d3df.d15ae","type":"execute","name":"execute: setTime(modify-timestamp)","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>","comments":"","outputs":1,"x":368.5,"y":516,"z":"37e3acc8.561634","wires":[[]]},{"id":"dd64e29e.a7665","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":571.5,"y":568,"z":"37e3acc8.561634","wires":[["ed24f120.cf4c8"]]},{"id":"4cc5dcc9.9cef84","type":"switchNode","name":"switch: A&AI In-Maint","xml":"<switch test=\"`$tmp.aai-data.in-maint`\">\n\n","comments":"","outputs":1,"x":1167.5,"y":654,"z":"37e3acc8.561634","wires":[["a0194efc.a2f1f"]]},{"id":"2291f352.f5521c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1048.5,"y":467,"z":"37e3acc8.561634","wires":[["685cea94.e1a364"]]},{"id":"4f2eb8f2.d537d8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1044.5,"y":511,"z":"37e3acc8.561634","wires":[["e6099183.cff0e"]]},{"id":"685cea94.e1a364","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"SBG not found in A&amp;AI.\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1243.5,"y":463,"z":"37e3acc8.561634","wires":[]},{"id":"a0194efc.a2f1f","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1346.5,"y":654,"z":"37e3acc8.561634","wires":[["13a83c58.fc2154"]]},{"id":"13a83c58.fc2154","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"The SBG is in service and the configuration cannot be restored back to the initial configuration.The SBG should be put in a maintenance state before restoring.\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1513.5,"y":653,"z":"37e3acc8.561634","wires":[]},{"id":"448baa3.3f7e954","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":776.5,"y":580,"z":"37e3acc8.561634","wires":[["1bc02fac.ed8ea"]]},{"id":"1bc02fac.ed8ea","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":944.5,"y":581,"z":"37e3acc8.561634","wires":[["4cc5dcc9.9cef84","172a6471.dec2ec","3b0ebd45.85a932"]]},{"id":"3b0ebd45.85a932","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=\"PROVSTATUS\" value=\"`$tmp.aai-data.prov-status`\"/>\n<parameter name=\"INMAINT\" value=\"`$tmp.aai-data.in-maint`\"/>\n\n\n","comments":"","outputs":1,"x":1133.5,"y":579,"z":"37e3acc8.561634","wires":[[]]},{"id":"e6099183.cff0e","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"405\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.aai-data.error.message + '.Response code:' + $tmp.aai-data.error.http.response-code`\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1234,"y":511,"z":"37e3acc8.561634","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-aai-sbg.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-aai-sbg.json
index 1bb2a338c..fd666491b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-aai-sbg.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-aai-sbg.json
@@ -1 +1 @@
-[{"id":"934ee5c1.ed026","type":"dgstart","name":"DGSTART","outputs":1,"x":209.88333129882812,"y":102.88333129882812,"z":"51183e72.be2d18","wires":[["fd1d6346.a4f578"]]},{"id":"fd1d6346.a4f578","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","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-API' version='4.0.0'>","outputs":1,"x":382.0500183105469,"y":100.54998779296875,"z":"51183e72.be2d18","wires":[["89009f89.dec4f"]]},{"id":"89009f89.dec4f","type":"method","name":"method update-aai-sbg","xml":"<method rpc='update-aai-sbg' mode='sync'>\n","comments":"","outputs":1,"x":608.3833923339844,"y":97.2166519165039,"z":"51183e72.be2d18","wires":[["2759b8e1.1e787"]]},{"id":"e67da642.e668e8","type":"get-resource","name":"get-resource: A&AI Data for VNF","xml":"<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-name = $service-configuration-notification-input.service-information.service-instance-id\" pfx=\"tmp.aai-data-vnf\" >\n\n\n","comments":"","outputs":1,"x":547.8833312988281,"y":489.8833312988281,"z":"51183e72.be2d18","wires":[["fcbbc896.fdb958","93ee0e04.43d5e","59a4d66a.fc329"]]},{"id":"2759b8e1.1e787","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":221.88333129882812,"y":447.772216796875,"z":"51183e72.be2d18","wires":[["7d7db087.62a4d","81e07f1f.fa7d5","e67da642.e668e8"]]},{"id":"6a5df891.756878","type":"save","name":"update: A&AI ( VNF)","xml":"<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-id = $tmp.aai-data-vnf.vnf-id\" force=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n\t","comments":"","outputs":1,"x":1175.8833312988281,"y":554.8833312988281,"z":"51183e72.be2d18","wires":[["b0d535db.58fd8"]]},{"id":"b0d535db.58fd8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1380.8833312988281,"y":554.8833312988281,"z":"51183e72.be2d18","wires":[["48f5b2f2.8d33a4"]]},{"id":"fcbbc896.fdb958","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":812.8833312988281,"y":272.772216796875,"z":"51183e72.be2d18","wires":[["55cd3331.f4719c"]]},{"id":"59a4d66a.fc329","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":807.8833312988281,"y":419.772216796875,"z":"51183e72.be2d18","wires":[["be26fd.216171"]]},{"id":"55cd3331.f4719c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":992.8833312988281,"y":269.772216796875,"z":"51183e72.be2d18","wires":[["97afe3e.6d45e2","2669d4e7.6bbd74"]]},{"id":"2669d4e7.6bbd74","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-configuration-notification-input.service-information.service-instance-id + '.' + $error-message`\"/>","comments":"","x":1242.8833312988281,"y":293.772216796875,"z":"51183e72.be2d18","wires":[]},{"id":"97afe3e.6d45e2","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=\"Get Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n\n","comments":"","outputs":1,"x":1192.8833312988281,"y":220.772216796875,"z":"51183e72.be2d18","wires":[[]]},{"id":"7d7db087.62a4d","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=\"CALLING Get fOR SERVICEINSTANCEID\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n<parameter name=\"RESPONSEMSG\" value=\"`$response-message`\"/>\n","comments":"","outputs":1,"x":461.8833312988281,"y":411.772216796875,"z":"51183e72.be2d18","wires":[[]]},{"id":"93ee0e04.43d5e","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":806.8833312988281,"y":535.8833312988281,"z":"51183e72.be2d18","wires":[["db96e9ae.c9a468"]]},{"id":"db96e9ae.c9a468","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":969.8833312988281,"y":535.8833312988281,"z":"51183e72.be2d18","wires":[["6a5df891.756878","4d1f5900.c09c1","f05d5abf.7be1b","bc824889.58ce48"]]},{"id":"4d1f5900.c09c1","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=\"VNFID\" value=\"`$tmp.aai-data-vnf.vnf-id`\"/>\n<parameter name=\"RELATIONSHIPLEN\" value=\"`$tmp.aai-data-vnf.relationship-list.relationship_length`\"/>\n<parameter name=\"RELATIONSHIPVALUE\" value=\"`$tmp.aai-data-vnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\"/>\n","comments":"","outputs":1,"x":1141.8833312988281,"y":506.88330078125,"z":"51183e72.be2d18","wires":[[]]},{"id":"48f5b2f2.8d33a4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1551.8833312988281,"y":551.8833312988281,"z":"51183e72.be2d18","wires":[["7b9ada6b.ea15b4","bb08d771.8208c8"]]},{"id":"7b9ada6b.ea15b4","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $tmp.aai-data-vnf.vnf-id + '.' + $error-message`\"/>","comments":"","x":1812.8833312988281,"y":559.8833312988281,"z":"51183e72.be2d18","wires":[]},{"id":"bb08d771.8208c8","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=\"Update Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$tmp.aai-data-vnf.vnf-id`\"/>\n\n","comments":"","outputs":1,"x":1740.8833312988281,"y":510.88330078125,"z":"51183e72.be2d18","wires":[[]]},{"id":"81e07f1f.fa7d5","type":"set","name":"set: Append to response-message","xml":"<set>\n\t <parameter name=\"response-message\" value=\"`$error-message + '.' + $response-message`\"/>","comments":"","x":530.8833312988281,"y":582.7722473144531,"z":"51183e72.be2d18","wires":[]},{"id":"be26fd.216171","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":973.8833312988281,"y":421.8833312988281,"z":"51183e72.be2d18","wires":[["ec7fb69b.7e148","691d3d4e.256624"]]},{"id":"ec7fb69b.7e148","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=\"Get Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n<parameter name=\"ErrorMessage\" value=\"`$tmp.aai-data-vnf.error-message`\"/>\n<parameter name=\"HTTP Code\" value=\"`$tmp.aai-data-vnf.error.http.response-code`\"/>","comments":"","outputs":1,"x":1142.8833312988281,"y":385.8833312988281,"z":"51183e72.be2d18","wires":[[]]},{"id":"691d3d4e.256624","type":"set","name":"set: Append to error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-configuration-notification-input.service-information.service-instance-id + '.' + $tmp.aai-data-vnf.error-message + '.HTTP Code:' + $tmp.aai-data-vnf.error.http.response-code + '.' + $error-message `\"/>\n","comments":"","x":1204.8833312988281,"y":437.8833312988281,"z":"51183e72.be2d18","wires":[]},{"id":"f05d5abf.7be1b","type":"call","name":"call: update-vserver-info","xml":"<call module=\"Appc-API\" rpc=\"update-vserver-info\" mode=\"sync\">","comments":"","outputs":1,"x":1182.8833312988281,"y":604.9944152832031,"z":"51183e72.be2d18","wires":[[]]},{"id":"bc824889.58ce48","type":"call","name":"call: update-vnfc-info","xml":"<call module=\"Appc-API\" rpc=\"update-vnfc-info\" mode=\"sync\">","comments":"","outputs":1,"x":1158.8833312988281,"y":656.9944152832031,"z":"51183e72.be2d18","wires":[[]]}]
+[{"id":"934ee5c1.ed026","type":"dgstart","name":"DGSTART","outputs":1,"x":209.88333129882812,"y":102.88333129882812,"z":"51183e72.be2d18","wires":[["fd1d6346.a4f578"]]},{"id":"fd1d6346.a4f578","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","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-API' version='4.0.0'>","outputs":1,"x":382.0500183105469,"y":100.54998779296875,"z":"51183e72.be2d18","wires":[["89009f89.dec4f"]]},{"id":"89009f89.dec4f","type":"method","name":"method update-aai-sbg","xml":"<method rpc='update-aai-sbg' mode='sync'>\n","comments":"","outputs":1,"x":608.3833923339844,"y":97.2166519165039,"z":"51183e72.be2d18","wires":[["2759b8e1.1e787"]]},{"id":"e67da642.e668e8","type":"get-resource","name":"get-resource: A&AI Data for VNF","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-name = $service-configuration-notification-input.service-information.service-instance-id\" pfx=\"tmp.aai-data-vnf\" >\n\n\n","comments":"","outputs":1,"x":547.8833312988281,"y":489.8833312988281,"z":"51183e72.be2d18","wires":[["fcbbc896.fdb958","93ee0e04.43d5e","59a4d66a.fc329"]]},{"id":"2759b8e1.1e787","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":221.88333129882812,"y":447.772216796875,"z":"51183e72.be2d18","wires":[["7d7db087.62a4d","81e07f1f.fa7d5","e67da642.e668e8"]]},{"id":"6a5df891.756878","type":"save","name":"update: A&AI ( VNF)","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-id = $tmp.aai-data-vnf.vnf-id\" force=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n\t","comments":"","outputs":1,"x":1175.8833312988281,"y":554.8833312988281,"z":"51183e72.be2d18","wires":[["b0d535db.58fd8"]]},{"id":"b0d535db.58fd8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1380.8833312988281,"y":554.8833312988281,"z":"51183e72.be2d18","wires":[["48f5b2f2.8d33a4"]]},{"id":"fcbbc896.fdb958","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":812.8833312988281,"y":272.772216796875,"z":"51183e72.be2d18","wires":[["55cd3331.f4719c"]]},{"id":"59a4d66a.fc329","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":807.8833312988281,"y":419.772216796875,"z":"51183e72.be2d18","wires":[["be26fd.216171"]]},{"id":"55cd3331.f4719c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":992.8833312988281,"y":269.772216796875,"z":"51183e72.be2d18","wires":[["97afe3e.6d45e2","2669d4e7.6bbd74"]]},{"id":"2669d4e7.6bbd74","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-configuration-notification-input.service-information.service-instance-id + '.' + $error-message`\"/>","comments":"","x":1242.8833312988281,"y":293.772216796875,"z":"51183e72.be2d18","wires":[]},{"id":"97afe3e.6d45e2","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=\"Get Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n\n","comments":"","outputs":1,"x":1192.8833312988281,"y":220.772216796875,"z":"51183e72.be2d18","wires":[[]]},{"id":"7d7db087.62a4d","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=\"CALLING Get fOR SERVICEINSTANCEID\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n<parameter name=\"RESPONSEMSG\" value=\"`$response-message`\"/>\n","comments":"","outputs":1,"x":461.8833312988281,"y":411.772216796875,"z":"51183e72.be2d18","wires":[[]]},{"id":"93ee0e04.43d5e","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":806.8833312988281,"y":535.8833312988281,"z":"51183e72.be2d18","wires":[["db96e9ae.c9a468"]]},{"id":"db96e9ae.c9a468","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":969.8833312988281,"y":535.8833312988281,"z":"51183e72.be2d18","wires":[["6a5df891.756878","4d1f5900.c09c1","f05d5abf.7be1b","bc824889.58ce48"]]},{"id":"4d1f5900.c09c1","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=\"VNFID\" value=\"`$tmp.aai-data-vnf.vnf-id`\"/>\n<parameter name=\"RELATIONSHIPLEN\" value=\"`$tmp.aai-data-vnf.relationship-list.relationship_length`\"/>\n<parameter name=\"RELATIONSHIPVALUE\" value=\"`$tmp.aai-data-vnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\"/>\n","comments":"","outputs":1,"x":1141.8833312988281,"y":506.88330078125,"z":"51183e72.be2d18","wires":[[]]},{"id":"48f5b2f2.8d33a4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1551.8833312988281,"y":551.8833312988281,"z":"51183e72.be2d18","wires":[["7b9ada6b.ea15b4","bb08d771.8208c8"]]},{"id":"7b9ada6b.ea15b4","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $tmp.aai-data-vnf.vnf-id + '.' + $error-message`\"/>","comments":"","x":1812.8833312988281,"y":559.8833312988281,"z":"51183e72.be2d18","wires":[]},{"id":"bb08d771.8208c8","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=\"Update Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$tmp.aai-data-vnf.vnf-id`\"/>\n\n","comments":"","outputs":1,"x":1740.8833312988281,"y":510.88330078125,"z":"51183e72.be2d18","wires":[[]]},{"id":"81e07f1f.fa7d5","type":"set","name":"set: Append to response-message","xml":"<set>\n\t <parameter name=\"response-message\" value=\"`$error-message + '.' + $response-message`\"/>","comments":"","x":530.8833312988281,"y":582.7722473144531,"z":"51183e72.be2d18","wires":[]},{"id":"be26fd.216171","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":973.8833312988281,"y":421.8833312988281,"z":"51183e72.be2d18","wires":[["ec7fb69b.7e148","691d3d4e.256624"]]},{"id":"ec7fb69b.7e148","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=\"Get Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n<parameter name=\"ErrorMessage\" value=\"`$tmp.aai-data-vnf.error-message`\"/>\n<parameter name=\"HTTP Code\" value=\"`$tmp.aai-data-vnf.error.http.response-code`\"/>","comments":"","outputs":1,"x":1142.8833312988281,"y":385.8833312988281,"z":"51183e72.be2d18","wires":[[]]},{"id":"691d3d4e.256624","type":"set","name":"set: Append to error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-configuration-notification-input.service-information.service-instance-id + '.' + $tmp.aai-data-vnf.error-message + '.HTTP Code:' + $tmp.aai-data-vnf.error.http.response-code + '.' + $error-message `\"/>\n","comments":"","x":1204.8833312988281,"y":437.8833312988281,"z":"51183e72.be2d18","wires":[]},{"id":"f05d5abf.7be1b","type":"call","name":"call: update-vserver-info","xml":"<call module=\"Appc-API\" rpc=\"update-vserver-info\" mode=\"sync\">","comments":"","outputs":1,"x":1182.8833312988281,"y":604.9944152832031,"z":"51183e72.be2d18","wires":[[]]},{"id":"bc824889.58ce48","type":"call","name":"call: update-vnfc-info","xml":"<call module=\"Appc-API\" rpc=\"update-vnfc-info\" mode=\"sync\">","comments":"","outputs":1,"x":1158.8833312988281,"y":656.9944152832031,"z":"51183e72.be2d18","wires":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-aai.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-aai.json
index 32000fece..b3fd85fa5 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-aai.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-aai.json
@@ -1 +1 @@
-[{"id":"c0f51dc8.101b5","type":"dgstart","name":"DGSTART","outputs":1,"x":121.88333129882812,"y":66.88333129882812,"z":"f4b8442.0fb85b8","wires":[["5b4f1a30.f05d0c"]]},{"id":"5b4f1a30.f05d0c","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","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-API' version='4.0.0'>","outputs":1,"x":282.0500183105469,"y":68.54998779296875,"z":"f4b8442.0fb85b8","wires":[["772060.d25c87a"]]},{"id":"772060.d25c87a","type":"method","name":"method update-aai","xml":"<method rpc='update-aai' mode='sync'>\n","comments":"","outputs":1,"x":474.3833923339844,"y":70.2166519165039,"z":"f4b8442.0fb85b8","wires":[["467329f1.60b6d8"]]},{"id":"8f46f427.916b28","type":"get-resource","name":"get-resource: A&AI Data for VNF","xml":"<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-name = $service-configuration-notification-input.service-information.service-instance-id\" pfx=\"tmp.aai-data-vnf\" >\n\n\n","comments":"","outputs":1,"x":407.8833312988281,"y":171.772216796875,"z":"f4b8442.0fb85b8","wires":[["44304e59.3bc55","2f765229.4761fe","6ecd659b.76cea4"]]},{"id":"3d2bf799.9f116","type":"get-resource","name":"get-resource: A&AI Data for VM Name","xml":"<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" resource=\"vserver\" key=\"vserver.vserver-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vm-name\" pfx=\"tmp.aai-data-vm\" >\n\n","comments":"","outputs":1,"x":1504.8833312988281,"y":465.772216796875,"z":"f4b8442.0fb85b8","wires":[["9b245605.84f748","27de335a.86c014","5e5954df.b3da24"]]},{"id":"22c57ca4.f5ae0c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":644.8833312988281,"y":414.7722473144531,"z":"f4b8442.0fb85b8","wires":[["13419e55.a341c2"]]},{"id":"24deeccb.be1d7c","type":"get-resource","name":"get-resource: A&AI Data for VM Name","xml":"<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" resource=\"vserver\" key=\"vserver.vserver-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name\" pfx=\"tmp.aai-data-vm\" >\n\n\n","comments":"","outputs":1,"x":1395.8833312988281,"y":1069.7722473144531,"z":"f4b8442.0fb85b8","wires":[["4e85a946.01f12","6c8fb30.49c2b4c","143f5af6.ccb0d5"]]},{"id":"b14ec23a.f5b1c8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":646.8833312988281,"y":975.7722473144531,"z":"f4b8442.0fb85b8","wires":[["2200faf8.6ff19e"]]},{"id":"467329f1.60b6d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":130.88333129882812,"y":129.772216796875,"z":"f4b8442.0fb85b8","wires":[["8f46f427.916b28","60b5221b.b51ed4","bf464434.9b9188","a0358bc1.4f2e98","78560055.675858"]]},{"id":"fc179dae.0a925","type":"save","name":"update: A&AI ( VNF)","xml":"<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-id = $tmp.aai-data-vnf.vnf-id\" force=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n\t","comments":"","outputs":1,"x":980.8833312988281,"y":252.77224731445312,"z":"f4b8442.0fb85b8","wires":[["ade15db9.d9e358"]]},{"id":"ade15db9.d9e358","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1153.8833312988281,"y":254.77224731445312,"z":"f4b8442.0fb85b8","wires":[["57d1d045.81e0e8"]]},{"id":"29bfefae.5a7748","type":"save","name":"update: A&AI ( VM)","xml":"<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" resource=\"vserver\" \nkey=\"vserver.vserver-id = $tmp.aai-data-vm.vserver-id AND \ntenant.tenant-id = $tmp.aai-data-vm.tenant-id AND\ncloud-region.cloud-owner = 'att-aic' AND\ncloud-region.cloud-region-id = $tmp.aai-data-vm.cloud-region-id\"\nforce=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n","comments":"","outputs":1,"x":1986.8833312988281,"y":541.772216796875,"z":"f4b8442.0fb85b8","wires":[["dfd718cc.1c6ab"]]},{"id":"dfd718cc.1c6ab","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2166.883331298828,"y":538.772216796875,"z":"f4b8442.0fb85b8","wires":[["4de83cd2.84ecac"]]},{"id":"a34e98d9.f45ed8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2017.8833312988281,"y":1128.7722473144531,"z":"f4b8442.0fb85b8","wires":[["4983c83b.88014"]]},{"id":"58ca3986.4a71d8","type":"save","name":"update: A&AI ( VM)","xml":"<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" resource=\"vserver\" \nkey=\"vserver.vserver-id = $tmp.aai-data-vm.vserver-id AND \ntenant.tenant-id = $tmp.aai-data-vm.tenant-id AND\ncloud-region.cloud-owner = $tmp.aai-data-vm.cloud-owner AND\ncloud-region.cloud-region-id = $tmp.aai-data-vm.cloud-region-id\"\nforce=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>","comments":"","outputs":1,"x":1833.3833312988281,"y":1132.7722473144531,"z":"f4b8442.0fb85b8","wires":[["a34e98d9.f45ed8"]]},{"id":"28bcdf63.918a08","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=\"Get AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vm-name`\"/>\n\n","comments":"","outputs":1,"x":2163.883331298828,"y":362.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"9b245605.84f748","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1793.8833312988281,"y":386.772216796875,"z":"f4b8442.0fb85b8","wires":[["9b6cab7d.997098"]]},{"id":"27de335a.86c014","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1767.8833312988281,"y":461.772216796875,"z":"f4b8442.0fb85b8","wires":[["9b6cab7d.997098"]]},{"id":"9b6cab7d.997098","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1971.8833312988281,"y":424.772216796875,"z":"f4b8442.0fb85b8","wires":[["28bcdf63.918a08","5311e5a9.4fa464"]]},{"id":"a6d2ceb6.01d71","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=\"AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name`\"/>\n\n","comments":"","outputs":1,"x":2006.8833312988281,"y":988.7722473144531,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"4e85a946.01f12","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1649.8833312988281,"y":993.7722473144531,"z":"f4b8442.0fb85b8","wires":[["178c51ad.e112ae"]]},{"id":"6c8fb30.49c2b4c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1651.8833312988281,"y":1063.7722473144531,"z":"f4b8442.0fb85b8","wires":[["178c51ad.e112ae"]]},{"id":"178c51ad.e112ae","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1834.8833312988281,"y":1006.7722473144531,"z":"f4b8442.0fb85b8","wires":[["a6d2ceb6.01d71","c946205b.f6ca3"]]},{"id":"6ecd659b.76cea4","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":701.8833312988281,"y":80.772216796875,"z":"f4b8442.0fb85b8","wires":[["ff266133.3d2d18"]]},{"id":"44304e59.3bc55","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":645.8833312988281,"y":148.772216796875,"z":"f4b8442.0fb85b8","wires":[["f043b65d.df114"]]},{"id":"ff266133.3d2d18","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":863.8833312988281,"y":66.772216796875,"z":"f4b8442.0fb85b8","wires":[["f67029f1.15e53","9155ecda.9c9088"]]},{"id":"9155ecda.9c9088","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-configuration-notification-input.service-information.service-instance-id + '.' + $error-message`\"/>","comments":"","x":1151.8833312988281,"y":90.772216796875,"z":"f4b8442.0fb85b8","wires":[]},{"id":"f67029f1.15e53","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=\"Get Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n\n","comments":"","outputs":1,"x":1066.8833312988281,"y":51.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"5311e5a9.4fa464","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vm-name + '.' + $error-message`\"/>","comments":"","x":2222.883331298828,"y":422.772216796875,"z":"f4b8442.0fb85b8","wires":[]},{"id":"66e5357a.c3e564","type":"for","name":"for: vnf-config-parameters-list","xml":"<for index=\"i\" start=\"0\" end=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters_length`\">","comments":"","outputs":1,"x":414.8833312988281,"y":414.7722473144531,"z":"f4b8442.0fb85b8","wires":[["22c57ca4.f5ae0c"]]},{"id":"f013923f.8ff4c8","type":"for","name":"for: vnf-config-parameters-list","xml":"<for index=\"i\" start=\"0\" end=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters_length`\" >","comments":"","outputs":1,"x":416.8833312988281,"y":973.7722473144531,"z":"f4b8442.0fb85b8","wires":[["b14ec23a.f5b1c8"]]},{"id":"c7ca81f5.584878","type":"for","name":"for: vnf-config-parameters-list.system-controller","xml":"<for index=\"j\" start=\"0\" end=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller_length`\" >","comments":"","outputs":1,"x":911.8833312988281,"y":536.7722473144531,"z":"f4b8442.0fb85b8","wires":[["267d83bc.359cd4"]]},{"id":"f6bd5a4d.edb528","type":"for","name":"for: vnf-config-parameters-list.payload","xml":"<for index=\"j\" start=\"0\" end=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload_length`\" >","comments":"","outputs":1,"x":864.8833312988281,"y":1074.7722473144531,"z":"f4b8442.0fb85b8","wires":[["32cf2348.780e2c"]]},{"id":"267d83bc.359cd4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1216.8833312988281,"y":536.7722473144531,"z":"f4b8442.0fb85b8","wires":[["ca00e322.7a457","3d2bf799.9f116"]]},{"id":"ca00e322.7a457","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=\"VNFCNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name`\"/>\n<parameter name=\"VMNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vm-name`\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.backup-information.service-instance-id`\"/>","comments":"","outputs":1,"x":1402.8833312988281,"y":416.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"6cf10415.3db5f4","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=\"VNFCNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name`\"/>\n<parameter name=\"VMNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name`\"/>\n\n","comments":"","outputs":1,"x":1325.8833312988281,"y":1011.7722473144531,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"32cf2348.780e2c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1133.8833312988281,"y":1079.7722473144531,"z":"f4b8442.0fb85b8","wires":[["6cf10415.3db5f4","24deeccb.be1d7c"]]},{"id":"dc845fa1.861eb","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=\"SYSCONTRVSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n\n<parameter name=\"SYSCONTRLTENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n<parameter name=\"SYSCONTRLCLOUDREGION\" value=\"`$tmp.aai-data-vm.cloud-region-id`\"/>\n<parameter name=\"SYSCONTRLCLOUDOWNER\" value=\"`$tmp.aai-data-vm.cloud-owner`\"/>","comments":"","outputs":1,"x":1980.8833312988281,"y":496.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"be3a649.92a8298","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=\"PAYLDVSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n\n<parameter name=\"PAYLDTENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n<parameter name=\"PAYLDCLOUDREGION\" value=\"`$tmp.aai-data-vm.cloud-region-id`\"/>","comments":"","outputs":1,"x":1809.8833312988281,"y":1073.7722473144531,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"60b5221b.b51ed4","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=\"CALLING Get fOR SERVICEINSTANCEID\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n<parameter name=\"RESPONSEMSG\" value=\"`$response-message`\"/>\n","comments":"","outputs":1,"x":334.8833312988281,"y":126.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"2f765229.4761fe","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":644.8833312988281,"y":196.77224731445312,"z":"f4b8442.0fb85b8","wires":[["e003b6d1.c077e8"]]},{"id":"e003b6d1.c077e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":792.8833312988281,"y":200.77224731445312,"z":"f4b8442.0fb85b8","wires":[["fc179dae.0a925","5bfbd468.92001c"]]},{"id":"5e5954df.b3da24","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1643.8833312988281,"y":518.7722778320312,"z":"f4b8442.0fb85b8","wires":[["2654c4ca.7ead04"]]},{"id":"143f5af6.ccb0d5","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1452.8833312988281,"y":1141.7722473144531,"z":"f4b8442.0fb85b8","wires":[["a50cc54f.09ab9"]]},{"id":"2654c4ca.7ead04","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1799.8833312988281,"y":515.7722778320312,"z":"f4b8442.0fb85b8","wires":[["dc845fa1.861eb","29bfefae.5a7748","8496bab.f61c148"]]},{"id":"a50cc54f.09ab9","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1621.8833312988281,"y":1134.7722473144531,"z":"f4b8442.0fb85b8","wires":[["be3a649.92a8298","58ca3986.4a71d8","ead40740.d1b23"]]},{"id":"5bfbd468.92001c","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=\"VNFID\" value=\"`$tmp.aai-data-vnf.vnf-id`\"/>\n\n","comments":"","outputs":1,"x":957.8833312988281,"y":205.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"57d1d045.81e0e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1306.8833312988281,"y":256.7722473144531,"z":"f4b8442.0fb85b8","wires":[["477e8b0f.ff62c4","c9598522.b5021"]]},{"id":"477e8b0f.ff62c4","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $tmp.aai-data-vnf.vnf-id + '.' + $error-message`\"/>","comments":"","x":1531.8833312988281,"y":272.7722473144531,"z":"f4b8442.0fb85b8","wires":[]},{"id":"4de83cd2.84ecac","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2321.883331298828,"y":534.772216796875,"z":"f4b8442.0fb85b8","wires":[["7c7c5c09.263cc4","8f9d540b.6eaf78"]]},{"id":"7c7c5c09.263cc4","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $tmp.aai-data-vm.vserver-id + ' and ' + $tmp.aai-data-vm.tenant-id + '.' + $error-message`\"/>","comments":"","x":2579.883331298828,"y":526.772216796875,"z":"f4b8442.0fb85b8","wires":[]},{"id":"c946205b.f6ca3","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name + '.' + $error-message`\"/>","comments":"","x":2063.883331298828,"y":1040.7722473144531,"z":"f4b8442.0fb85b8","wires":[]},{"id":"4983c83b.88014","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2172.883331298828,"y":1128.7722473144531,"z":"f4b8442.0fb85b8","wires":[["2fd2a1ea.86ecc6","33e73c2c.e10484"]]},{"id":"2fd2a1ea.86ecc6","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name + ' and ' + $tmp.aai-data-vm.vserver-id + ' and ' + $tmp.aai-data-vm.tenant-id + '.' + $error-message`\"/>","comments":"","x":2431.883331298828,"y":1134.7722473144531,"z":"f4b8442.0fb85b8","wires":[]},{"id":"c9598522.b5021","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=\"Update Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$tmp.aai-data-vnf.vnf-id`\"/>\n\n","comments":"","outputs":1,"x":1455.8833312988281,"y":213.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"8f9d540b.6eaf78","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=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n<parameter name=\"TENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n\n","comments":"","outputs":1,"x":2521.883331298828,"y":461.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"33e73c2c.e10484","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=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n<parameter name=\"TENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n<parameter name=\"VNFCNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":2372.883331298828,"y":1079.7722473144531,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"bf464434.9b9188","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=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"RETURNED RESPONSEMESSAGE\"/>\n<parameter name=\"RESPONSEMSG\" value=\"`$response-message`\"/>\n<parameter name=\"ERRORMSG\" value=\"`$error-message`\"/>\n\n","comments":"","outputs":1,"x":184.88333129882812,"y":1151.7722473144531,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"a0358bc1.4f2e98","type":"set","name":"set: Append to response-message","xml":"<set>\n\t <parameter name=\"response-message\" value=\"`$error-message + '.' + $response-message`\"/>","comments":"","x":323.8833312988281,"y":1079.7722473144531,"z":"f4b8442.0fb85b8","wires":[]},{"id":"8496bab.f61c148","type":"get-resource","name":"get-resource: A&AI Data for VNFC Name ","xml":"<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" resource=\"vnfc\" key=\"vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name\" pfx=\"tmp.aai-data-vnfc\" >\n\n\n","comments":"","outputs":1,"x":1325.8833312988281,"y":727.8833312988281,"z":"f4b8442.0fb85b8","wires":[["c81a3f16.23e79","8ac07d6d.14c18","41789484.81275c"]]},{"id":"c81a3f16.23e79","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1613.8833312988281,"y":727.8833312988281,"z":"f4b8442.0fb85b8","wires":[["b0afd80f.959b8"]]},{"id":"8ac07d6d.14c18","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1613.8833312988281,"y":771.8833312988281,"z":"f4b8442.0fb85b8","wires":[["7ee37ca7.a378d4"]]},{"id":"41789484.81275c","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1574.8833312988281,"y":843.8833312988281,"z":"f4b8442.0fb85b8","wires":[["2e5147af.8c502"]]},{"id":"7ee37ca7.a378d4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1785.8833312988281,"y":772.8833312988281,"z":"f4b8442.0fb85b8","wires":[["2310ad0.71ba6d4","2f6809a1.5e9c2e"]]},{"id":"2310ad0.71ba6d4","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=\"Get AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":1958.8833312988281,"y":773.8833312988281,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"2f6809a1.5e9c2e","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name + '.' + $error-message`\"/>","comments":"","x":2035.8833312988281,"y":825.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"85ceea54.89cff8","type":"save","name":"update: A&AI VNFC","xml":"<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" resource=\"vnfc\" \nkey=\"vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name and \nvserver.vserver-id = $tmp.aai-data-vm.vserver-id AND \ntenant.tenant-id = $tmp.aai-data-vm.tenant-id AND\ncloud-region.cloud-owner = $tmp.aai-data-vm.cloud-owner AND\ncloud-region.region-id = $tmp.aai-data-vm.cloud-region-id \" \nforce=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n<parameter name=\"orchestration-status\" value=\"`$tmp.aai-orch-status`\"/>\n","comments":"","outputs":1,"x":1972.8833312988281,"y":884.8833312988281,"z":"f4b8442.0fb85b8","wires":[["a8b24e73.4ee988"]]},{"id":"a8b24e73.4ee988","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2157.883331298828,"y":882.8833312988281,"z":"f4b8442.0fb85b8","wires":[["c879f837.bac108"]]},{"id":"c879f837.bac108","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2316.883331298828,"y":881.8833312988281,"z":"f4b8442.0fb85b8","wires":[["556dfd9c.657114","b3f09d6d.b550b8"]]},{"id":"556dfd9c.657114","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=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n<parameter name=\"TENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n<parameter name=\"VNFCNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":2482.883331298828,"y":874.8833312988281,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"b3f09d6d.b550b8","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name + ' and ' + $tmp.aai-data-vm.vserver-id + ' and ' + $tmp.aai-data-vm.tenant-id + '.' + $error-message`\"/>","comments":"","x":2550.883331298828,"y":949.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"2e5147af.8c502","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1741.8833312988281,"y":850.8833312988281,"z":"f4b8442.0fb85b8","wires":[["85ceea54.89cff8"]]},{"id":"b0afd80f.959b8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1777.8833312988281,"y":729.8833312988281,"z":"f4b8442.0fb85b8","wires":[["49a48a4e.19f34c"]]},{"id":"ead40740.d1b23","type":"get-resource","name":"get-resource: A&AI Data for VNFC Name ","xml":"<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" resource=\"vnfc\" key=\"vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name\" pfx=\"tmp.aai-data-vnfc\" >\n\n\n","comments":"","outputs":1,"x":1336.8833312988281,"y":1266.8833312988281,"z":"f4b8442.0fb85b8","wires":[["549cc3e0.c9dea4","5258b27.a79774c","6ccdd521.4c3d74"]]},{"id":"549cc3e0.c9dea4","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1659.8833312988281,"y":1210.8833312988281,"z":"f4b8442.0fb85b8","wires":[["4ac698fc.12ef8"]]},{"id":"4ac698fc.12ef8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1828.8833312988281,"y":1211.8833312988281,"z":"f4b8442.0fb85b8","wires":[["9cd69d90.4ab5e","ab0a4f4f.4f2b6","368e0e52.df43ea","823a01a9.fa859"]]},{"id":"5258b27.a79774c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1325.8833312988281,"y":1681.88330078125,"z":"f4b8442.0fb85b8","wires":[["37e6ac9f.881974"]]},{"id":"37e6ac9f.881974","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1493.3833312988281,"y":1672.38330078125,"z":"f4b8442.0fb85b8","wires":[["a5e4a430.a1dae8","ba1f3312.90a09"]]},{"id":"a5e4a430.a1dae8","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=\"Get AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":1683.8833312988281,"y":1647.1334228515625,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"ba1f3312.90a09","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name + '.' + $error-message`\"/>","comments":"","x":1747.8833312988281,"y":1709.6334228515625,"z":"f4b8442.0fb85b8","wires":[]},{"id":"6ccdd521.4c3d74","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1271.8833312988281,"y":1772.88330078125,"z":"f4b8442.0fb85b8","wires":[["3f437625.64f4a2"]]},{"id":"3f437625.64f4a2","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1432.8833312988281,"y":1769.88330078125,"z":"f4b8442.0fb85b8","wires":[["c322e2ca.cc10c8"]]},{"id":"c322e2ca.cc10c8","type":"save","name":"update: A&AI VNFC","xml":"<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" resource=\"vnfc\" \nkey=\"vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name and \nvserver.vserver-id = $tmp.aai-data-vm.vserver-id AND \ntenant.tenant-id = $tmp.aai-data-vm.tenant-id AND \ncloud-region.region-id = $tmp.aai-data-vm.cloud-region-id \" \nforce=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n<parameter name=\"orchestration-status\" value=\"`$tmp.aai-orch-status`\"/>","comments":"","outputs":1,"x":1651.6333312988281,"y":1766.38330078125,"z":"f4b8442.0fb85b8","wires":[["f36135db.fdc948"]]},{"id":"f36135db.fdc948","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1842.8833312988281,"y":1758.88330078125,"z":"f4b8442.0fb85b8","wires":[["92615a3d.bc7a9"]]},{"id":"92615a3d.bc7a9","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2014.6333312988281,"y":1761.3834228515625,"z":"f4b8442.0fb85b8","wires":[["cb2d609f.88cab","94b652f5.e7a418"]]},{"id":"cb2d609f.88cab","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=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n<parameter name=\"TENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n<parameter name=\"VNFCNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":2225.883331298828,"y":1757.8834533691406,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"94b652f5.e7a418","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name + ' and ' + $tmp.aai-data-vm.vserver-id + ' and ' + $tmp.aai-data-vm.tenant-id + '.' + $error-message`\"/>","comments":"","x":2279.883331298828,"y":1818.63330078125,"z":"f4b8442.0fb85b8","wires":[]},{"id":"37dca69b.66ac62","type":"save","name":"save Put VNFC","xml":"<save plugin='org.openecomp.sdnc.sli.aai.AAIService' resource='vnfc' key='vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name' force='true' pfx='tmp.vnfc-payload'>\n<parameter name='nfc-naming-code' value='`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-function-code`'/>\n<parameter name='nfc-function' value='`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-type`'/>\n<parameter name='prov-status' value='`$tmp.aai-prov-status`'/>\n<parameter name='orchestration-status' value='`$tmp.aai-orch-status`'/>\n<parameter name='group-notation' value='`$tmp.group-notation`'/>\n<parameter name='in-maint' value = 'false'/>\n<parameter name='is-closed-loop' value = 'false'/>\n\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"vserver\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"vserver.vserver-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vm.vserver-id`'/>\n\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\" value=\"tenant.tenant-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value='`$tmp.aai-data-vm.tenant-id`'/>\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-key\" value=\"cloud-region.cloud-owner\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-value\" value=\"att-aic\"/>\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[3].relationship-key\" value=\"cloud-region.cloud-region-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[3].relationship-value\" value='`$tmp.aai-data-vm.cloud-region-id`'/>\n\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vnf.vnf-id`'/>\n\n<parameter name=\"relationship-list.relationship[2].related-to\" value=\"vf-module\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vnf.vnf-id`'/>\n\n<parameter name=\"relationship-list.relationship[2].relationship-data[1].relationship-key\" value=\"vf-module.vf-module-id\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[1].relationship-value\" value='`$tmp.vf-module-id`'/>\n\n","comments":"","outputs":1,"x":1819.8833312988281,"y":1568.772216796875,"z":"f4b8442.0fb85b8","wires":[["15433db9.df194a"]]},{"id":"15433db9.df194a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2012.3833312988281,"y":1569.272216796875,"z":"f4b8442.0fb85b8","wires":[["b83ce7.4ec9b318"]]},{"id":"b83ce7.4ec9b318","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2178.633331298828,"y":1571.772216796875,"z":"f4b8442.0fb85b8","wires":[["c4e01cc9.cc4588","2f357b42.686584"]]},{"id":"c4e01cc9.cc4588","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=\"Insert to AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":2383.133331298828,"y":1543.272216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"2f357b42.686584","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Insert to A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name + '.' + $error-message`\"/>","comments":"","x":2447.133331298828,"y":1608.272216796875,"z":"f4b8442.0fb85b8","wires":[]},{"id":"847918b3.b0aa9","type":"save","name":"save Put VNFC","xml":"<save plugin='org.openecomp.sdnc.sli.aai.AAIService' resource='vnfc' key='vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name' force='true' pfx='tmp.vnfc-sys-controller'>\n<parameter name='nfc-naming-code' value='`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-function-code`'/>\n<parameter name='nfc-function' value='`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-type`'/>\n<parameter name='prov-status' value='`$tmp.aai-prov-status`'/>\n<parameter name='orchestration-status' value='`$tmp.aai-orch-status`'/>\n<parameter name='in-maint' value = 'false'/>\n<parameter name='is-closed-loop' value = 'false'/>\n<parameter name='ipaddress-v4-oam-vip' value='`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].ipaddress-v4-oam-vip`'/>\n\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"vserver\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"vserver.vserver-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vm.vserver-id`'/>\n\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\" value=\"tenant.tenant-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value='`$tmp.aai-data-vm.tenant-id`'/>\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-key\" value=\"cloud-region.cloud-owner\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-value\" value=\"att-aic\"/>\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[3].relationship-key\" value=\"cloud-region.cloud-region-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[3].relationship-value\" value='`$tmp.aai-data-vm.cloud-region-id`'/>\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vnf.vnf-id`'/>\n\n<parameter name=\"relationship-list.relationship[2].related-to\" value=\"vf-module\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vnf.vnf-id`'/>\n\n<parameter name=\"relationship-list.relationship[2].relationship-data[1].relationship-key\" value=\"vf-module.vf-module-id\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[1].relationship-value\" value='`$tmp.vf-module-id`'/>\n\n\n\n\n","comments":"","outputs":1,"x":2108.883331298828,"y":719.88330078125,"z":"f4b8442.0fb85b8","wires":[["b3c3c3d0.4d379"]]},{"id":"b3c3c3d0.4d379","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2279.883331298828,"y":722.88330078125,"z":"f4b8442.0fb85b8","wires":[["86981ca7.0f486"]]},{"id":"86981ca7.0f486","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2429.883331298828,"y":725.88330078125,"z":"f4b8442.0fb85b8","wires":[["fb7984a3.2a359","473192dd.1f183c"]]},{"id":"fb7984a3.2a359","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=\"Insert to AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":2636.883331298828,"y":716.88330078125,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"473192dd.1f183c","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Insert to A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name + '.' + $error-message`\"/>","comments":"","x":2607.883331298828,"y":776.88330078125,"z":"f4b8442.0fb85b8","wires":[]},{"id":"78560055.675858","type":"switchNode","name":"switch: vnf config parameters length","xml":"<switch test=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters_length`\">","comments":"","outputs":1,"x":427.8833312988281,"y":308.8833312988281,"z":"f4b8442.0fb85b8","wires":[["cdd9fcc9.e2fd58","8cd6d147.ae0218","34c2463.cf0b8ba"]]},{"id":"cdd9fcc9.e2fd58","type":"other","name":"outcome: Length=0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":700.8833312988281,"y":262.8833312988281,"z":"f4b8442.0fb85b8","wires":[["42a9f090.5576b"]]},{"id":"8cd6d147.ae0218","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":692.8833312988281,"y":305.8833312988281,"z":"f4b8442.0fb85b8","wires":[["42a9f090.5576b"]]},{"id":"42a9f090.5576b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":901.8833312988281,"y":323.8833312988281,"z":"f4b8442.0fb85b8","wires":[["fac19019.555ba","69639e79.b60028"]]},{"id":"13419e55.a341c2","type":"switchNode","name":"switch: vnf config parameters length","xml":"<switch test=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller_length`\">","comments":"","outputs":1,"x":892.8833312988281,"y":417.8833312988281,"z":"f4b8442.0fb85b8","wires":[["2b70f3b6.70ab34","1cfb5f7f.146ea9","4bbed44c.48958c"]]},{"id":"2b70f3b6.70ab34","type":"other","name":"outcome: Length=0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1177.8833312988281,"y":397.8833312988281,"z":"f4b8442.0fb85b8","wires":[["dfc67bfa.c70f28"]]},{"id":"1cfb5f7f.146ea9","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1175.8833312988281,"y":433.8833312988281,"z":"f4b8442.0fb85b8","wires":[["dfc67bfa.c70f28"]]},{"id":"dfc67bfa.c70f28","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1383.8833312988281,"y":341.8833312988281,"z":"f4b8442.0fb85b8","wires":[["38f7f12.d30130e","538b5769.d570d"]]},{"id":"38f7f12.d30130e","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=\"System Controller VM and VNFC data not in config tree\"/>\n\n\n","comments":"","outputs":1,"x":1548.8833312988281,"y":362.8833312988281,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"2200faf8.6ff19e","type":"switchNode","name":"switch: vnf config parameters length","xml":"<switch test=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload_length`\">","comments":"","outputs":1,"x":913.8833312988281,"y":931.8833312988281,"z":"f4b8442.0fb85b8","wires":[["578b3fc6.dfebe","ab715923.f11558","4ea5e5a.72a741c"]]},{"id":"578b3fc6.dfebe","type":"other","name":"outcome: Length=0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1186.8833312988281,"y":843.8833312988281,"z":"f4b8442.0fb85b8","wires":[["3426556e.ca5e6a"]]},{"id":"ab715923.f11558","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1175.8833312988281,"y":896.8833312988281,"z":"f4b8442.0fb85b8","wires":[["3426556e.ca5e6a"]]},{"id":"3426556e.ca5e6a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1370.8833312988281,"y":867.8833312988281,"z":"f4b8442.0fb85b8","wires":[["f79a2016.ec9188","a39acb97.4339d8"]]},{"id":"f79a2016.ec9188","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=\"Payload VM and VNFC data not in config tree\"/>\n\n\n","comments":"","outputs":1,"x":1550.8833312988281,"y":940.8833312988281,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"fac19019.555ba","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=\"RETURNED RESPONSEMESSAGE\"/>\n<parameter name=\"RESPONSEMSG\" value=\"`$response-message`\"/>\n<parameter name=\"ERRORMSG\" value=\"`$error-message`\"/>\n<parameter name=\"field3\" value=\"VM and VNFC data not in config tree.Stop the flow\"/>\n\n","comments":"","outputs":1,"x":1085.8833312988281,"y":355.8833312988281,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"f043b65d.df114","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":811.8833312988281,"y":150.88333129882812,"z":"f4b8442.0fb85b8","wires":[["7133566.c86f728","e6574c9f.d7f28"]]},{"id":"7133566.c86f728","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=\"Get Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n<parameter name=\"ErrorMessage\" value=\"`$tmp.aai-data-vnf.error-message`\"/>\n<parameter name=\"HTTP Code\" value=\"`$tmp.aai-data-vnf.error.http.response-code`\"/>","comments":"","outputs":1,"x":984.8833312988281,"y":128.88333129882812,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"e6574c9f.d7f28","type":"set","name":"set: Append to error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-configuration-notification-input.service-information.service-instance-id + '.' + $tmp.aai-data-vnf.error-message + '.HTTP Code:' + $tmp.aai-data-vnf.error.http.response-code + '.' + $error-message `\"/>\n","comments":"","x":1042.8833312988281,"y":166.88333129882812,"z":"f4b8442.0fb85b8","wires":[]},{"id":"69639e79.b60028","type":"set","name":"set: Append to error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'VM and VNFC Data not found in config tree.' + $error-message `\"/>\n","comments":"","x":1143.8833312988281,"y":310.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"538b5769.d570d","type":"set","name":"set: Append to error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'System Controller VM and VNFC Data not found in config tree.' + $error-message `\"/>\n","comments":"","x":1616.8833312988281,"y":320.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"a39acb97.4339d8","type":"set","name":"set: Append to error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'Payload VM and VNFC Data not found in config tree.' + $error-message `\"/>\n","comments":"","x":1618.8833312988281,"y":892.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"34c2463.cf0b8ba","type":"other","name":"outcome: Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":685.8833312988281,"y":351.8833312988281,"z":"f4b8442.0fb85b8","wires":[["ae635f4d.64e9d8"]]},{"id":"ae635f4d.64e9d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":164.88333129882812,"y":414.8833312988281,"z":"f4b8442.0fb85b8","wires":[["66e5357a.c3e564","f013923f.8ff4c8"]]},{"id":"4bbed44c.48958c","type":"other","name":"outcome: Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1175.8833312988281,"y":476.8833312988281,"z":"f4b8442.0fb85b8","wires":[["753d2624.a03b78"]]},{"id":"753d2624.a03b78","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":637.8833312988281,"y":536.8833312988281,"z":"f4b8442.0fb85b8","wires":[["c7ca81f5.584878"]]},{"id":"4ea5e5a.72a741c","type":"other","name":"outcome: Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1176.8833312988281,"y":948.8833312988281,"z":"f4b8442.0fb85b8","wires":[["9c636d62.83d92"]]},{"id":"9c636d62.83d92","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1080.8833312988281,"y":995.8833312988281,"z":"f4b8442.0fb85b8","wires":[["f6bd5a4d.edb528"]]},{"id":"ab0a4f4f.4f2b6","type":"switchNode","name":"Check Odd or Even VM Name","xml":"<switch test=\"`((( $tmp.vm_last_number / 2 ) * 2 ) == $tmp.vm_last_number )`\">\n","comments":"","outputs":1,"x":2131.1332092285156,"y":1283.3833312988281,"z":"f4b8442.0fb85b8","wires":[["43163cb2.20f664","62bb1ac8.becec4"]]},{"id":"9cd69d90.4ab5e","type":"set","name":"Set VM Name & Mated Pair","xml":"<set>\n<parameter name ='tmp.vm-name' value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name`\"/>\n<parameter name ='tmp.vm-name-length' value=\"`length($service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name)`\"/>\n<parameter name='tmp.mated-pair-number' value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].mated-pair-number`\"/>\n\n\n","comments":"","x":2116.133087158203,"y":1179.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"96796fac.e80f8","type":"set","name":"Set Even Group Notation","xml":"<set>\n<parameter name='tmp.group-notation' value=\"`$tmp.odd-group-notation`\"/>\n","comments":"","x":2600.383331298828,"y":1306.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"43163cb2.20f664","type":"outcomeFalse","name":"Odd Pair","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2393.133331298828,"y":1216.8833312988281,"z":"f4b8442.0fb85b8","wires":[["5da8532.413e72c"]]},{"id":"62bb1ac8.becec4","type":"other","name":"Even Pair","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2396.883331298828,"y":1306.8833312988281,"z":"f4b8442.0fb85b8","wires":[["96796fac.e80f8"]]},{"id":"5da8532.413e72c","type":"set","name":"Set Odd Group Notation","xml":"<set>\n<parameter name='tmp.odd-group-notation' value=\"`$tmp.mated-pair-number`\"/>\n<parameter name='tmp.group-notation' value=\"`$tmp.mated-pair-number`\"/>\n","comments":"","x":2586.883331298828,"y":1215.6333312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"368e0e52.df43ea","type":"set","name":"Get VM Name last digit","xml":"<set>\n<parameter name='tmp.vm_last_number' value='`substr($tmp.vm-name, $tmp.vm-name-length - 1, $tmp.vm-name-length)`' />\n","comments":"","x":2100.5162658691406,"y":1232.5166320800781,"z":"f4b8442.0fb85b8","wires":[]},{"id":"49a48a4e.19f34c","type":"call","name":"call: GetVfModuleInfo","xml":"<call module=\"APPC\" rpc=\"GetVfModuleInfo\" mode=\"sync\">","comments":"","outputs":1,"x":1694.8833312988281,"y":633.772216796875,"z":"f4b8442.0fb85b8","wires":[["8bed42ae.eb616"]]},{"id":"8bed42ae.eb616","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1867.8833312988281,"y":634.772216796875,"z":"f4b8442.0fb85b8","wires":[["3a57ec9f.7eae7c"]]},{"id":"3a57ec9f.7eae7c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2021.8833312988281,"y":635.772216796875,"z":"f4b8442.0fb85b8","wires":[["7166bf9.bf9e3c"]]},{"id":"7166bf9.bf9e3c","type":"switchNode","name":"switch: tmp.vf-module-id","xml":"<switch test=\"`$tmp.vf-module-id`\">","comments":"","outputs":1,"x":2234.883331298828,"y":624.772216796875,"z":"f4b8442.0fb85b8","wires":[["7d0fbd67.81486c","39dae372.2d7164"]]},{"id":"7d0fbd67.81486c","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2436.883331298828,"y":625.772216796875,"z":"f4b8442.0fb85b8","wires":[["78903187.23f99"]]},{"id":"78903187.23f99","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2589.883331298828,"y":624.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"39dae372.2d7164","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":2299.883331298828,"y":666.772216796875,"z":"f4b8442.0fb85b8","wires":[["847918b3.b0aa9"]]},{"id":"823a01a9.fa859","type":"call","name":"call: GetVfModuleInfo","xml":"<call module=\"APPC\" rpc=\"GetVfModuleInfo\" mode=\"sync\">","comments":"","outputs":1,"x":2034.8833312988281,"y":1374.772216796875,"z":"f4b8442.0fb85b8","wires":[["9376c1dd.d71158","b37aa195.39825"]]},{"id":"9376c1dd.d71158","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2236.883331298828,"y":1369.772216796875,"z":"f4b8442.0fb85b8","wires":[["db84adc3.3cb7b"]]},{"id":"db84adc3.3cb7b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2394.883331298828,"y":1369.772216796875,"z":"f4b8442.0fb85b8","wires":[["1a92d485.722c43"]]},{"id":"1a92d485.722c43","type":"switchNode","name":"switch: tmp.vf-module-id","xml":"<switch test=\"`$tmp.vf-module-id`\">","comments":"","outputs":1,"x":2611.883331298828,"y":1372.772216796875,"z":"f4b8442.0fb85b8","wires":[["46fe9440.3d5704"]]},{"id":"1f39adc9.664c52","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2588.883331298828,"y":1432.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"46fe9440.3d5704","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2421.883331298828,"y":1430.772216796875,"z":"f4b8442.0fb85b8","wires":[["1f39adc9.664c52"]]},{"id":"b37aa195.39825","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":2242.883331298828,"y":1461.772216796875,"z":"f4b8442.0fb85b8","wires":[["37dca69b.66ac62"]]}]
+[{"id":"c0f51dc8.101b5","type":"dgstart","name":"DGSTART","outputs":1,"x":121.88333129882812,"y":66.88333129882812,"z":"f4b8442.0fb85b8","wires":[["5b4f1a30.f05d0c"]]},{"id":"5b4f1a30.f05d0c","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","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-API' version='4.0.0'>","outputs":1,"x":282.0500183105469,"y":68.54998779296875,"z":"f4b8442.0fb85b8","wires":[["772060.d25c87a"]]},{"id":"772060.d25c87a","type":"method","name":"method update-aai","xml":"<method rpc='update-aai' mode='sync'>\n","comments":"","outputs":1,"x":474.3833923339844,"y":70.2166519165039,"z":"f4b8442.0fb85b8","wires":[["467329f1.60b6d8"]]},{"id":"8f46f427.916b28","type":"get-resource","name":"get-resource: A&AI Data for VNF","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-name = $service-configuration-notification-input.service-information.service-instance-id\" pfx=\"tmp.aai-data-vnf\" >\n\n\n","comments":"","outputs":1,"x":407.8833312988281,"y":171.772216796875,"z":"f4b8442.0fb85b8","wires":[["44304e59.3bc55","2f765229.4761fe","6ecd659b.76cea4"]]},{"id":"3d2bf799.9f116","type":"get-resource","name":"get-resource: A&AI Data for VM Name","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vserver\" key=\"vserver.vserver-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vm-name\" pfx=\"tmp.aai-data-vm\" >\n\n","comments":"","outputs":1,"x":1504.8833312988281,"y":465.772216796875,"z":"f4b8442.0fb85b8","wires":[["9b245605.84f748","27de335a.86c014","5e5954df.b3da24"]]},{"id":"22c57ca4.f5ae0c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":644.8833312988281,"y":414.7722473144531,"z":"f4b8442.0fb85b8","wires":[["13419e55.a341c2"]]},{"id":"24deeccb.be1d7c","type":"get-resource","name":"get-resource: A&AI Data for VM Name","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vserver\" key=\"vserver.vserver-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name\" pfx=\"tmp.aai-data-vm\" >\n\n\n","comments":"","outputs":1,"x":1395.8833312988281,"y":1069.7722473144531,"z":"f4b8442.0fb85b8","wires":[["4e85a946.01f12","6c8fb30.49c2b4c","143f5af6.ccb0d5"]]},{"id":"b14ec23a.f5b1c8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":646.8833312988281,"y":975.7722473144531,"z":"f4b8442.0fb85b8","wires":[["2200faf8.6ff19e"]]},{"id":"467329f1.60b6d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":130.88333129882812,"y":129.772216796875,"z":"f4b8442.0fb85b8","wires":[["8f46f427.916b28","60b5221b.b51ed4","bf464434.9b9188","a0358bc1.4f2e98","78560055.675858"]]},{"id":"fc179dae.0a925","type":"save","name":"update: A&AI ( VNF)","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-id = $tmp.aai-data-vnf.vnf-id\" force=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n\t","comments":"","outputs":1,"x":980.8833312988281,"y":252.77224731445312,"z":"f4b8442.0fb85b8","wires":[["ade15db9.d9e358"]]},{"id":"ade15db9.d9e358","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1153.8833312988281,"y":254.77224731445312,"z":"f4b8442.0fb85b8","wires":[["57d1d045.81e0e8"]]},{"id":"29bfefae.5a7748","type":"save","name":"update: A&AI ( VM)","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vserver\" \nkey=\"vserver.vserver-id = $tmp.aai-data-vm.vserver-id AND \ntenant.tenant-id = $tmp.aai-data-vm.tenant-id AND\ncloud-region.cloud-owner = 'att-aic' AND\ncloud-region.cloud-region-id = $tmp.aai-data-vm.cloud-region-id\"\nforce=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n","comments":"","outputs":1,"x":1986.8833312988281,"y":541.772216796875,"z":"f4b8442.0fb85b8","wires":[["dfd718cc.1c6ab"]]},{"id":"dfd718cc.1c6ab","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2166.883331298828,"y":538.772216796875,"z":"f4b8442.0fb85b8","wires":[["4de83cd2.84ecac"]]},{"id":"a34e98d9.f45ed8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2017.8833312988281,"y":1128.7722473144531,"z":"f4b8442.0fb85b8","wires":[["4983c83b.88014"]]},{"id":"58ca3986.4a71d8","type":"save","name":"update: A&AI ( VM)","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vserver\" \nkey=\"vserver.vserver-id = $tmp.aai-data-vm.vserver-id AND \ntenant.tenant-id = $tmp.aai-data-vm.tenant-id AND\ncloud-region.cloud-owner = $tmp.aai-data-vm.cloud-owner AND\ncloud-region.cloud-region-id = $tmp.aai-data-vm.cloud-region-id\"\nforce=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>","comments":"","outputs":1,"x":1833.3833312988281,"y":1132.7722473144531,"z":"f4b8442.0fb85b8","wires":[["a34e98d9.f45ed8"]]},{"id":"28bcdf63.918a08","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=\"Get AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vm-name`\"/>\n\n","comments":"","outputs":1,"x":2163.883331298828,"y":362.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"9b245605.84f748","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1793.8833312988281,"y":386.772216796875,"z":"f4b8442.0fb85b8","wires":[["9b6cab7d.997098"]]},{"id":"27de335a.86c014","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1767.8833312988281,"y":461.772216796875,"z":"f4b8442.0fb85b8","wires":[["9b6cab7d.997098"]]},{"id":"9b6cab7d.997098","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1971.8833312988281,"y":424.772216796875,"z":"f4b8442.0fb85b8","wires":[["28bcdf63.918a08","5311e5a9.4fa464"]]},{"id":"a6d2ceb6.01d71","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=\"AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name`\"/>\n\n","comments":"","outputs":1,"x":2006.8833312988281,"y":988.7722473144531,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"4e85a946.01f12","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1649.8833312988281,"y":993.7722473144531,"z":"f4b8442.0fb85b8","wires":[["178c51ad.e112ae"]]},{"id":"6c8fb30.49c2b4c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1651.8833312988281,"y":1063.7722473144531,"z":"f4b8442.0fb85b8","wires":[["178c51ad.e112ae"]]},{"id":"178c51ad.e112ae","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1834.8833312988281,"y":1006.7722473144531,"z":"f4b8442.0fb85b8","wires":[["a6d2ceb6.01d71","c946205b.f6ca3"]]},{"id":"6ecd659b.76cea4","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":701.8833312988281,"y":80.772216796875,"z":"f4b8442.0fb85b8","wires":[["ff266133.3d2d18"]]},{"id":"44304e59.3bc55","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":645.8833312988281,"y":148.772216796875,"z":"f4b8442.0fb85b8","wires":[["f043b65d.df114"]]},{"id":"ff266133.3d2d18","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":863.8833312988281,"y":66.772216796875,"z":"f4b8442.0fb85b8","wires":[["f67029f1.15e53","9155ecda.9c9088"]]},{"id":"9155ecda.9c9088","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-configuration-notification-input.service-information.service-instance-id + '.' + $error-message`\"/>","comments":"","x":1151.8833312988281,"y":90.772216796875,"z":"f4b8442.0fb85b8","wires":[]},{"id":"f67029f1.15e53","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=\"Get Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n\n","comments":"","outputs":1,"x":1066.8833312988281,"y":51.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"5311e5a9.4fa464","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vm-name + '.' + $error-message`\"/>","comments":"","x":2222.883331298828,"y":422.772216796875,"z":"f4b8442.0fb85b8","wires":[]},{"id":"66e5357a.c3e564","type":"for","name":"for: vnf-config-parameters-list","xml":"<for index=\"i\" start=\"0\" end=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters_length`\">","comments":"","outputs":1,"x":414.8833312988281,"y":414.7722473144531,"z":"f4b8442.0fb85b8","wires":[["22c57ca4.f5ae0c"]]},{"id":"f013923f.8ff4c8","type":"for","name":"for: vnf-config-parameters-list","xml":"<for index=\"i\" start=\"0\" end=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters_length`\" >","comments":"","outputs":1,"x":416.8833312988281,"y":973.7722473144531,"z":"f4b8442.0fb85b8","wires":[["b14ec23a.f5b1c8"]]},{"id":"c7ca81f5.584878","type":"for","name":"for: vnf-config-parameters-list.system-controller","xml":"<for index=\"j\" start=\"0\" end=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller_length`\" >","comments":"","outputs":1,"x":911.8833312988281,"y":536.7722473144531,"z":"f4b8442.0fb85b8","wires":[["267d83bc.359cd4"]]},{"id":"f6bd5a4d.edb528","type":"for","name":"for: vnf-config-parameters-list.payload","xml":"<for index=\"j\" start=\"0\" end=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload_length`\" >","comments":"","outputs":1,"x":864.8833312988281,"y":1074.7722473144531,"z":"f4b8442.0fb85b8","wires":[["32cf2348.780e2c"]]},{"id":"267d83bc.359cd4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1216.8833312988281,"y":536.7722473144531,"z":"f4b8442.0fb85b8","wires":[["ca00e322.7a457","3d2bf799.9f116"]]},{"id":"ca00e322.7a457","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=\"VNFCNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name`\"/>\n<parameter name=\"VMNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vm-name`\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.backup-information.service-instance-id`\"/>","comments":"","outputs":1,"x":1402.8833312988281,"y":416.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"6cf10415.3db5f4","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=\"VNFCNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name`\"/>\n<parameter name=\"VMNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name`\"/>\n\n","comments":"","outputs":1,"x":1325.8833312988281,"y":1011.7722473144531,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"32cf2348.780e2c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1133.8833312988281,"y":1079.7722473144531,"z":"f4b8442.0fb85b8","wires":[["6cf10415.3db5f4","24deeccb.be1d7c"]]},{"id":"dc845fa1.861eb","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=\"SYSCONTRVSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n\n<parameter name=\"SYSCONTRLTENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n<parameter name=\"SYSCONTRLCLOUDREGION\" value=\"`$tmp.aai-data-vm.cloud-region-id`\"/>\n<parameter name=\"SYSCONTRLCLOUDOWNER\" value=\"`$tmp.aai-data-vm.cloud-owner`\"/>","comments":"","outputs":1,"x":1980.8833312988281,"y":496.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"be3a649.92a8298","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=\"PAYLDVSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n\n<parameter name=\"PAYLDTENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n<parameter name=\"PAYLDCLOUDREGION\" value=\"`$tmp.aai-data-vm.cloud-region-id`\"/>","comments":"","outputs":1,"x":1809.8833312988281,"y":1073.7722473144531,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"60b5221b.b51ed4","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=\"CALLING Get fOR SERVICEINSTANCEID\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n<parameter name=\"RESPONSEMSG\" value=\"`$response-message`\"/>\n","comments":"","outputs":1,"x":334.8833312988281,"y":126.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"2f765229.4761fe","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":644.8833312988281,"y":196.77224731445312,"z":"f4b8442.0fb85b8","wires":[["e003b6d1.c077e8"]]},{"id":"e003b6d1.c077e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":792.8833312988281,"y":200.77224731445312,"z":"f4b8442.0fb85b8","wires":[["fc179dae.0a925","5bfbd468.92001c"]]},{"id":"5e5954df.b3da24","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1643.8833312988281,"y":518.7722778320312,"z":"f4b8442.0fb85b8","wires":[["2654c4ca.7ead04"]]},{"id":"143f5af6.ccb0d5","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1452.8833312988281,"y":1141.7722473144531,"z":"f4b8442.0fb85b8","wires":[["a50cc54f.09ab9"]]},{"id":"2654c4ca.7ead04","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1799.8833312988281,"y":515.7722778320312,"z":"f4b8442.0fb85b8","wires":[["dc845fa1.861eb","29bfefae.5a7748","8496bab.f61c148"]]},{"id":"a50cc54f.09ab9","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1621.8833312988281,"y":1134.7722473144531,"z":"f4b8442.0fb85b8","wires":[["be3a649.92a8298","58ca3986.4a71d8","ead40740.d1b23"]]},{"id":"5bfbd468.92001c","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=\"VNFID\" value=\"`$tmp.aai-data-vnf.vnf-id`\"/>\n\n","comments":"","outputs":1,"x":957.8833312988281,"y":205.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"57d1d045.81e0e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1306.8833312988281,"y":256.7722473144531,"z":"f4b8442.0fb85b8","wires":[["477e8b0f.ff62c4","c9598522.b5021"]]},{"id":"477e8b0f.ff62c4","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $tmp.aai-data-vnf.vnf-id + '.' + $error-message`\"/>","comments":"","x":1531.8833312988281,"y":272.7722473144531,"z":"f4b8442.0fb85b8","wires":[]},{"id":"4de83cd2.84ecac","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2321.883331298828,"y":534.772216796875,"z":"f4b8442.0fb85b8","wires":[["7c7c5c09.263cc4","8f9d540b.6eaf78"]]},{"id":"7c7c5c09.263cc4","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $tmp.aai-data-vm.vserver-id + ' and ' + $tmp.aai-data-vm.tenant-id + '.' + $error-message`\"/>","comments":"","x":2579.883331298828,"y":526.772216796875,"z":"f4b8442.0fb85b8","wires":[]},{"id":"c946205b.f6ca3","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name + '.' + $error-message`\"/>","comments":"","x":2063.883331298828,"y":1040.7722473144531,"z":"f4b8442.0fb85b8","wires":[]},{"id":"4983c83b.88014","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2172.883331298828,"y":1128.7722473144531,"z":"f4b8442.0fb85b8","wires":[["2fd2a1ea.86ecc6","33e73c2c.e10484"]]},{"id":"2fd2a1ea.86ecc6","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name + ' and ' + $tmp.aai-data-vm.vserver-id + ' and ' + $tmp.aai-data-vm.tenant-id + '.' + $error-message`\"/>","comments":"","x":2431.883331298828,"y":1134.7722473144531,"z":"f4b8442.0fb85b8","wires":[]},{"id":"c9598522.b5021","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=\"Update Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$tmp.aai-data-vnf.vnf-id`\"/>\n\n","comments":"","outputs":1,"x":1455.8833312988281,"y":213.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"8f9d540b.6eaf78","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=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n<parameter name=\"TENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n\n","comments":"","outputs":1,"x":2521.883331298828,"y":461.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"33e73c2c.e10484","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=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n<parameter name=\"TENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n<parameter name=\"VNFCNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":2372.883331298828,"y":1079.7722473144531,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"bf464434.9b9188","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=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"RETURNED RESPONSEMESSAGE\"/>\n<parameter name=\"RESPONSEMSG\" value=\"`$response-message`\"/>\n<parameter name=\"ERRORMSG\" value=\"`$error-message`\"/>\n\n","comments":"","outputs":1,"x":184.88333129882812,"y":1151.7722473144531,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"a0358bc1.4f2e98","type":"set","name":"set: Append to response-message","xml":"<set>\n\t <parameter name=\"response-message\" value=\"`$error-message + '.' + $response-message`\"/>","comments":"","x":323.8833312988281,"y":1079.7722473144531,"z":"f4b8442.0fb85b8","wires":[]},{"id":"8496bab.f61c148","type":"get-resource","name":"get-resource: A&AI Data for VNFC Name ","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vnfc\" key=\"vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name\" pfx=\"tmp.aai-data-vnfc\" >\n\n\n","comments":"","outputs":1,"x":1325.8833312988281,"y":727.8833312988281,"z":"f4b8442.0fb85b8","wires":[["c81a3f16.23e79","8ac07d6d.14c18","41789484.81275c"]]},{"id":"c81a3f16.23e79","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1613.8833312988281,"y":727.8833312988281,"z":"f4b8442.0fb85b8","wires":[["b0afd80f.959b8"]]},{"id":"8ac07d6d.14c18","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1613.8833312988281,"y":771.8833312988281,"z":"f4b8442.0fb85b8","wires":[["7ee37ca7.a378d4"]]},{"id":"41789484.81275c","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1574.8833312988281,"y":843.8833312988281,"z":"f4b8442.0fb85b8","wires":[["2e5147af.8c502"]]},{"id":"7ee37ca7.a378d4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1785.8833312988281,"y":772.8833312988281,"z":"f4b8442.0fb85b8","wires":[["2310ad0.71ba6d4","2f6809a1.5e9c2e"]]},{"id":"2310ad0.71ba6d4","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=\"Get AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":1958.8833312988281,"y":773.8833312988281,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"2f6809a1.5e9c2e","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name + '.' + $error-message`\"/>","comments":"","x":2035.8833312988281,"y":825.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"85ceea54.89cff8","type":"save","name":"update: A&AI VNFC","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vnfc\" \nkey=\"vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name and \nvserver.vserver-id = $tmp.aai-data-vm.vserver-id AND \ntenant.tenant-id = $tmp.aai-data-vm.tenant-id AND\ncloud-region.cloud-owner = $tmp.aai-data-vm.cloud-owner AND\ncloud-region.region-id = $tmp.aai-data-vm.cloud-region-id \" \nforce=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n<parameter name=\"orchestration-status\" value=\"`$tmp.aai-orch-status`\"/>\n","comments":"","outputs":1,"x":1972.8833312988281,"y":884.8833312988281,"z":"f4b8442.0fb85b8","wires":[["a8b24e73.4ee988"]]},{"id":"a8b24e73.4ee988","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2157.883331298828,"y":882.8833312988281,"z":"f4b8442.0fb85b8","wires":[["c879f837.bac108"]]},{"id":"c879f837.bac108","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2316.883331298828,"y":881.8833312988281,"z":"f4b8442.0fb85b8","wires":[["556dfd9c.657114","b3f09d6d.b550b8"]]},{"id":"556dfd9c.657114","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=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n<parameter name=\"TENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n<parameter name=\"VNFCNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":2482.883331298828,"y":874.8833312988281,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"b3f09d6d.b550b8","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name + ' and ' + $tmp.aai-data-vm.vserver-id + ' and ' + $tmp.aai-data-vm.tenant-id + '.' + $error-message`\"/>","comments":"","x":2550.883331298828,"y":949.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"2e5147af.8c502","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1741.8833312988281,"y":850.8833312988281,"z":"f4b8442.0fb85b8","wires":[["85ceea54.89cff8"]]},{"id":"b0afd80f.959b8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1777.8833312988281,"y":729.8833312988281,"z":"f4b8442.0fb85b8","wires":[["49a48a4e.19f34c"]]},{"id":"ead40740.d1b23","type":"get-resource","name":"get-resource: A&AI Data for VNFC Name ","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vnfc\" key=\"vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name\" pfx=\"tmp.aai-data-vnfc\" >\n\n\n","comments":"","outputs":1,"x":1336.8833312988281,"y":1266.8833312988281,"z":"f4b8442.0fb85b8","wires":[["549cc3e0.c9dea4","5258b27.a79774c","6ccdd521.4c3d74"]]},{"id":"549cc3e0.c9dea4","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1659.8833312988281,"y":1210.8833312988281,"z":"f4b8442.0fb85b8","wires":[["4ac698fc.12ef8"]]},{"id":"4ac698fc.12ef8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1828.8833312988281,"y":1211.8833312988281,"z":"f4b8442.0fb85b8","wires":[["9cd69d90.4ab5e","ab0a4f4f.4f2b6","368e0e52.df43ea","823a01a9.fa859"]]},{"id":"5258b27.a79774c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1325.8833312988281,"y":1681.88330078125,"z":"f4b8442.0fb85b8","wires":[["37e6ac9f.881974"]]},{"id":"37e6ac9f.881974","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1493.3833312988281,"y":1672.38330078125,"z":"f4b8442.0fb85b8","wires":[["a5e4a430.a1dae8","ba1f3312.90a09"]]},{"id":"a5e4a430.a1dae8","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=\"Get AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":1683.8833312988281,"y":1647.1334228515625,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"ba1f3312.90a09","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name + '.' + $error-message`\"/>","comments":"","x":1747.8833312988281,"y":1709.6334228515625,"z":"f4b8442.0fb85b8","wires":[]},{"id":"6ccdd521.4c3d74","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1271.8833312988281,"y":1772.88330078125,"z":"f4b8442.0fb85b8","wires":[["3f437625.64f4a2"]]},{"id":"3f437625.64f4a2","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1432.8833312988281,"y":1769.88330078125,"z":"f4b8442.0fb85b8","wires":[["c322e2ca.cc10c8"]]},{"id":"c322e2ca.cc10c8","type":"save","name":"update: A&AI VNFC","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vnfc\" \nkey=\"vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name and \nvserver.vserver-id = $tmp.aai-data-vm.vserver-id AND \ntenant.tenant-id = $tmp.aai-data-vm.tenant-id AND \ncloud-region.region-id = $tmp.aai-data-vm.cloud-region-id \" \nforce=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n<parameter name=\"orchestration-status\" value=\"`$tmp.aai-orch-status`\"/>","comments":"","outputs":1,"x":1651.6333312988281,"y":1766.38330078125,"z":"f4b8442.0fb85b8","wires":[["f36135db.fdc948"]]},{"id":"f36135db.fdc948","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1842.8833312988281,"y":1758.88330078125,"z":"f4b8442.0fb85b8","wires":[["92615a3d.bc7a9"]]},{"id":"92615a3d.bc7a9","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2014.6333312988281,"y":1761.3834228515625,"z":"f4b8442.0fb85b8","wires":[["cb2d609f.88cab","94b652f5.e7a418"]]},{"id":"cb2d609f.88cab","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=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n<parameter name=\"TENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n<parameter name=\"VNFCNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":2225.883331298828,"y":1757.8834533691406,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"94b652f5.e7a418","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name + ' and ' + $tmp.aai-data-vm.vserver-id + ' and ' + $tmp.aai-data-vm.tenant-id + '.' + $error-message`\"/>","comments":"","x":2279.883331298828,"y":1818.63330078125,"z":"f4b8442.0fb85b8","wires":[]},{"id":"37dca69b.66ac62","type":"save","name":"save Put VNFC","xml":"<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vnfc' key='vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name' force='true' pfx='tmp.vnfc-payload'>\n<parameter name='nfc-naming-code' value='`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-function-code`'/>\n<parameter name='nfc-function' value='`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-type`'/>\n<parameter name='prov-status' value='`$tmp.aai-prov-status`'/>\n<parameter name='orchestration-status' value='`$tmp.aai-orch-status`'/>\n<parameter name='group-notation' value='`$tmp.group-notation`'/>\n<parameter name='in-maint' value = 'false'/>\n<parameter name='is-closed-loop' value = 'false'/>\n\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"vserver\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"vserver.vserver-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vm.vserver-id`'/>\n\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\" value=\"tenant.tenant-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value='`$tmp.aai-data-vm.tenant-id`'/>\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-key\" value=\"cloud-region.cloud-owner\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-value\" value=\"att-aic\"/>\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[3].relationship-key\" value=\"cloud-region.cloud-region-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[3].relationship-value\" value='`$tmp.aai-data-vm.cloud-region-id`'/>\n\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vnf.vnf-id`'/>\n\n<parameter name=\"relationship-list.relationship[2].related-to\" value=\"vf-module\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vnf.vnf-id`'/>\n\n<parameter name=\"relationship-list.relationship[2].relationship-data[1].relationship-key\" value=\"vf-module.vf-module-id\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[1].relationship-value\" value='`$tmp.vf-module-id`'/>\n\n","comments":"","outputs":1,"x":1819.8833312988281,"y":1568.772216796875,"z":"f4b8442.0fb85b8","wires":[["15433db9.df194a"]]},{"id":"15433db9.df194a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2012.3833312988281,"y":1569.272216796875,"z":"f4b8442.0fb85b8","wires":[["b83ce7.4ec9b318"]]},{"id":"b83ce7.4ec9b318","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2178.633331298828,"y":1571.772216796875,"z":"f4b8442.0fb85b8","wires":[["c4e01cc9.cc4588","2f357b42.686584"]]},{"id":"c4e01cc9.cc4588","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=\"Insert to AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":2383.133331298828,"y":1543.272216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"2f357b42.686584","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Insert to A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name + '.' + $error-message`\"/>","comments":"","x":2447.133331298828,"y":1608.272216796875,"z":"f4b8442.0fb85b8","wires":[]},{"id":"847918b3.b0aa9","type":"save","name":"save Put VNFC","xml":"<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vnfc' key='vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name' force='true' pfx='tmp.vnfc-sys-controller'>\n<parameter name='nfc-naming-code' value='`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-function-code`'/>\n<parameter name='nfc-function' value='`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-type`'/>\n<parameter name='prov-status' value='`$tmp.aai-prov-status`'/>\n<parameter name='orchestration-status' value='`$tmp.aai-orch-status`'/>\n<parameter name='in-maint' value = 'false'/>\n<parameter name='is-closed-loop' value = 'false'/>\n<parameter name='ipaddress-v4-oam-vip' value='`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].ipaddress-v4-oam-vip`'/>\n\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"vserver\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"vserver.vserver-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vm.vserver-id`'/>\n\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\" value=\"tenant.tenant-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value='`$tmp.aai-data-vm.tenant-id`'/>\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-key\" value=\"cloud-region.cloud-owner\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-value\" value=\"att-aic\"/>\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[3].relationship-key\" value=\"cloud-region.cloud-region-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[3].relationship-value\" value='`$tmp.aai-data-vm.cloud-region-id`'/>\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vnf.vnf-id`'/>\n\n<parameter name=\"relationship-list.relationship[2].related-to\" value=\"vf-module\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vnf.vnf-id`'/>\n\n<parameter name=\"relationship-list.relationship[2].relationship-data[1].relationship-key\" value=\"vf-module.vf-module-id\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[1].relationship-value\" value='`$tmp.vf-module-id`'/>\n\n\n\n\n","comments":"","outputs":1,"x":2108.883331298828,"y":719.88330078125,"z":"f4b8442.0fb85b8","wires":[["b3c3c3d0.4d379"]]},{"id":"b3c3c3d0.4d379","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2279.883331298828,"y":722.88330078125,"z":"f4b8442.0fb85b8","wires":[["86981ca7.0f486"]]},{"id":"86981ca7.0f486","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2429.883331298828,"y":725.88330078125,"z":"f4b8442.0fb85b8","wires":[["fb7984a3.2a359","473192dd.1f183c"]]},{"id":"fb7984a3.2a359","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=\"Insert to AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":2636.883331298828,"y":716.88330078125,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"473192dd.1f183c","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Insert to A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name + '.' + $error-message`\"/>","comments":"","x":2607.883331298828,"y":776.88330078125,"z":"f4b8442.0fb85b8","wires":[]},{"id":"78560055.675858","type":"switchNode","name":"switch: vnf config parameters length","xml":"<switch test=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters_length`\">","comments":"","outputs":1,"x":427.8833312988281,"y":308.8833312988281,"z":"f4b8442.0fb85b8","wires":[["cdd9fcc9.e2fd58","8cd6d147.ae0218","34c2463.cf0b8ba"]]},{"id":"cdd9fcc9.e2fd58","type":"other","name":"outcome: Length=0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":700.8833312988281,"y":262.8833312988281,"z":"f4b8442.0fb85b8","wires":[["42a9f090.5576b"]]},{"id":"8cd6d147.ae0218","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":692.8833312988281,"y":305.8833312988281,"z":"f4b8442.0fb85b8","wires":[["42a9f090.5576b"]]},{"id":"42a9f090.5576b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":901.8833312988281,"y":323.8833312988281,"z":"f4b8442.0fb85b8","wires":[["fac19019.555ba","69639e79.b60028"]]},{"id":"13419e55.a341c2","type":"switchNode","name":"switch: vnf config parameters length","xml":"<switch test=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller_length`\">","comments":"","outputs":1,"x":892.8833312988281,"y":417.8833312988281,"z":"f4b8442.0fb85b8","wires":[["2b70f3b6.70ab34","1cfb5f7f.146ea9","4bbed44c.48958c"]]},{"id":"2b70f3b6.70ab34","type":"other","name":"outcome: Length=0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1177.8833312988281,"y":397.8833312988281,"z":"f4b8442.0fb85b8","wires":[["dfc67bfa.c70f28"]]},{"id":"1cfb5f7f.146ea9","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1175.8833312988281,"y":433.8833312988281,"z":"f4b8442.0fb85b8","wires":[["dfc67bfa.c70f28"]]},{"id":"dfc67bfa.c70f28","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1383.8833312988281,"y":341.8833312988281,"z":"f4b8442.0fb85b8","wires":[["38f7f12.d30130e","538b5769.d570d"]]},{"id":"38f7f12.d30130e","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=\"System Controller VM and VNFC data not in config tree\"/>\n\n\n","comments":"","outputs":1,"x":1548.8833312988281,"y":362.8833312988281,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"2200faf8.6ff19e","type":"switchNode","name":"switch: vnf config parameters length","xml":"<switch test=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload_length`\">","comments":"","outputs":1,"x":913.8833312988281,"y":931.8833312988281,"z":"f4b8442.0fb85b8","wires":[["578b3fc6.dfebe","ab715923.f11558","4ea5e5a.72a741c"]]},{"id":"578b3fc6.dfebe","type":"other","name":"outcome: Length=0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1186.8833312988281,"y":843.8833312988281,"z":"f4b8442.0fb85b8","wires":[["3426556e.ca5e6a"]]},{"id":"ab715923.f11558","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1175.8833312988281,"y":896.8833312988281,"z":"f4b8442.0fb85b8","wires":[["3426556e.ca5e6a"]]},{"id":"3426556e.ca5e6a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1370.8833312988281,"y":867.8833312988281,"z":"f4b8442.0fb85b8","wires":[["f79a2016.ec9188","a39acb97.4339d8"]]},{"id":"f79a2016.ec9188","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=\"Payload VM and VNFC data not in config tree\"/>\n\n\n","comments":"","outputs":1,"x":1550.8833312988281,"y":940.8833312988281,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"fac19019.555ba","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=\"RETURNED RESPONSEMESSAGE\"/>\n<parameter name=\"RESPONSEMSG\" value=\"`$response-message`\"/>\n<parameter name=\"ERRORMSG\" value=\"`$error-message`\"/>\n<parameter name=\"field3\" value=\"VM and VNFC data not in config tree.Stop the flow\"/>\n\n","comments":"","outputs":1,"x":1085.8833312988281,"y":355.8833312988281,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"f043b65d.df114","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":811.8833312988281,"y":150.88333129882812,"z":"f4b8442.0fb85b8","wires":[["7133566.c86f728","e6574c9f.d7f28"]]},{"id":"7133566.c86f728","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=\"Get Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n<parameter name=\"ErrorMessage\" value=\"`$tmp.aai-data-vnf.error-message`\"/>\n<parameter name=\"HTTP Code\" value=\"`$tmp.aai-data-vnf.error.http.response-code`\"/>","comments":"","outputs":1,"x":984.8833312988281,"y":128.88333129882812,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"e6574c9f.d7f28","type":"set","name":"set: Append to error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-configuration-notification-input.service-information.service-instance-id + '.' + $tmp.aai-data-vnf.error-message + '.HTTP Code:' + $tmp.aai-data-vnf.error.http.response-code + '.' + $error-message `\"/>\n","comments":"","x":1042.8833312988281,"y":166.88333129882812,"z":"f4b8442.0fb85b8","wires":[]},{"id":"69639e79.b60028","type":"set","name":"set: Append to error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'VM and VNFC Data not found in config tree.' + $error-message `\"/>\n","comments":"","x":1143.8833312988281,"y":310.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"538b5769.d570d","type":"set","name":"set: Append to error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'System Controller VM and VNFC Data not found in config tree.' + $error-message `\"/>\n","comments":"","x":1616.8833312988281,"y":320.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"a39acb97.4339d8","type":"set","name":"set: Append to error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'Payload VM and VNFC Data not found in config tree.' + $error-message `\"/>\n","comments":"","x":1618.8833312988281,"y":892.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"34c2463.cf0b8ba","type":"other","name":"outcome: Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":685.8833312988281,"y":351.8833312988281,"z":"f4b8442.0fb85b8","wires":[["ae635f4d.64e9d8"]]},{"id":"ae635f4d.64e9d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":164.88333129882812,"y":414.8833312988281,"z":"f4b8442.0fb85b8","wires":[["66e5357a.c3e564","f013923f.8ff4c8"]]},{"id":"4bbed44c.48958c","type":"other","name":"outcome: Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1175.8833312988281,"y":476.8833312988281,"z":"f4b8442.0fb85b8","wires":[["753d2624.a03b78"]]},{"id":"753d2624.a03b78","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":637.8833312988281,"y":536.8833312988281,"z":"f4b8442.0fb85b8","wires":[["c7ca81f5.584878"]]},{"id":"4ea5e5a.72a741c","type":"other","name":"outcome: Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1176.8833312988281,"y":948.8833312988281,"z":"f4b8442.0fb85b8","wires":[["9c636d62.83d92"]]},{"id":"9c636d62.83d92","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1080.8833312988281,"y":995.8833312988281,"z":"f4b8442.0fb85b8","wires":[["f6bd5a4d.edb528"]]},{"id":"ab0a4f4f.4f2b6","type":"switchNode","name":"Check Odd or Even VM Name","xml":"<switch test=\"`((( $tmp.vm_last_number / 2 ) * 2 ) == $tmp.vm_last_number )`\">\n","comments":"","outputs":1,"x":2131.1332092285156,"y":1283.3833312988281,"z":"f4b8442.0fb85b8","wires":[["43163cb2.20f664","62bb1ac8.becec4"]]},{"id":"9cd69d90.4ab5e","type":"set","name":"Set VM Name & Mated Pair","xml":"<set>\n<parameter name ='tmp.vm-name' value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name`\"/>\n<parameter name ='tmp.vm-name-length' value=\"`length($service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name)`\"/>\n<parameter name='tmp.mated-pair-number' value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].mated-pair-number`\"/>\n\n\n","comments":"","x":2116.133087158203,"y":1179.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"96796fac.e80f8","type":"set","name":"Set Even Group Notation","xml":"<set>\n<parameter name='tmp.group-notation' value=\"`$tmp.odd-group-notation`\"/>\n","comments":"","x":2600.383331298828,"y":1306.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"43163cb2.20f664","type":"outcomeFalse","name":"Odd Pair","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2393.133331298828,"y":1216.8833312988281,"z":"f4b8442.0fb85b8","wires":[["5da8532.413e72c"]]},{"id":"62bb1ac8.becec4","type":"other","name":"Even Pair","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2396.883331298828,"y":1306.8833312988281,"z":"f4b8442.0fb85b8","wires":[["96796fac.e80f8"]]},{"id":"5da8532.413e72c","type":"set","name":"Set Odd Group Notation","xml":"<set>\n<parameter name='tmp.odd-group-notation' value=\"`$tmp.mated-pair-number`\"/>\n<parameter name='tmp.group-notation' value=\"`$tmp.mated-pair-number`\"/>\n","comments":"","x":2586.883331298828,"y":1215.6333312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"368e0e52.df43ea","type":"set","name":"Get VM Name last digit","xml":"<set>\n<parameter name='tmp.vm_last_number' value='`substr($tmp.vm-name, $tmp.vm-name-length - 1, $tmp.vm-name-length)`' />\n","comments":"","x":2100.5162658691406,"y":1232.5166320800781,"z":"f4b8442.0fb85b8","wires":[]},{"id":"49a48a4e.19f34c","type":"call","name":"call: GetVfModuleInfo","xml":"<call module=\"APPC\" rpc=\"GetVfModuleInfo\" mode=\"sync\">","comments":"","outputs":1,"x":1694.8833312988281,"y":633.772216796875,"z":"f4b8442.0fb85b8","wires":[["8bed42ae.eb616"]]},{"id":"8bed42ae.eb616","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1867.8833312988281,"y":634.772216796875,"z":"f4b8442.0fb85b8","wires":[["3a57ec9f.7eae7c"]]},{"id":"3a57ec9f.7eae7c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2021.8833312988281,"y":635.772216796875,"z":"f4b8442.0fb85b8","wires":[["7166bf9.bf9e3c"]]},{"id":"7166bf9.bf9e3c","type":"switchNode","name":"switch: tmp.vf-module-id","xml":"<switch test=\"`$tmp.vf-module-id`\">","comments":"","outputs":1,"x":2234.883331298828,"y":624.772216796875,"z":"f4b8442.0fb85b8","wires":[["7d0fbd67.81486c","39dae372.2d7164"]]},{"id":"7d0fbd67.81486c","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2436.883331298828,"y":625.772216796875,"z":"f4b8442.0fb85b8","wires":[["78903187.23f99"]]},{"id":"78903187.23f99","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2589.883331298828,"y":624.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"39dae372.2d7164","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":2299.883331298828,"y":666.772216796875,"z":"f4b8442.0fb85b8","wires":[["847918b3.b0aa9"]]},{"id":"823a01a9.fa859","type":"call","name":"call: GetVfModuleInfo","xml":"<call module=\"APPC\" rpc=\"GetVfModuleInfo\" mode=\"sync\">","comments":"","outputs":1,"x":2034.8833312988281,"y":1374.772216796875,"z":"f4b8442.0fb85b8","wires":[["9376c1dd.d71158","b37aa195.39825"]]},{"id":"9376c1dd.d71158","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2236.883331298828,"y":1369.772216796875,"z":"f4b8442.0fb85b8","wires":[["db84adc3.3cb7b"]]},{"id":"db84adc3.3cb7b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2394.883331298828,"y":1369.772216796875,"z":"f4b8442.0fb85b8","wires":[["1a92d485.722c43"]]},{"id":"1a92d485.722c43","type":"switchNode","name":"switch: tmp.vf-module-id","xml":"<switch test=\"`$tmp.vf-module-id`\">","comments":"","outputs":1,"x":2611.883331298828,"y":1372.772216796875,"z":"f4b8442.0fb85b8","wires":[["46fe9440.3d5704"]]},{"id":"1f39adc9.664c52","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2588.883331298828,"y":1432.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"46fe9440.3d5704","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2421.883331298828,"y":1430.772216796875,"z":"f4b8442.0fb85b8","wires":[["1f39adc9.664c52"]]},{"id":"b37aa195.39825","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":2242.883331298828,"y":1461.772216796875,"z":"f4b8442.0fb85b8","wires":[["37dca69b.66ac62"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-vnfc-info.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-vnfc-info.json
index 468851dc0..89623f36d 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-vnfc-info.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-vnfc-info.json
@@ -1 +1 @@
-[{"id":"ca99a786.1adf8","type":"get-resource","name":"get-resource: A&AI Data for VServer","xml":"<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" resource=\"vserver\" \nkey=\"vserver.vserver-id = $aaiinfo[$k].vserverid AND \ntenant.tenant-id = $aaiinfo[$k].tenantid AND\ncloud-region.cloud-owner = $aaiinfo[$k].cloudowner AND\ncloud-region.cloud-region-id = $aaiinfo[$k].cloudregionid\"\npfx=\"tmp.vserver\" >\n\n","comments":"","outputs":1,"x":709.88330078125,"y":246,"z":"c52d74c3.6a173","wires":[["fde2a23.0ae856","2217ca10.f4dbfe","45df48e.32abe38"]]},{"id":"68770954.89e85","type":"dgstart","name":"DGSTART","outputs":1,"x":204.88330078125,"y":92,"z":"c52d74c3.6a173","wires":[["57a94af7.1d52e4"]]},{"id":"57a94af7.1d52e4","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","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-API' version='4.0.0'>","outputs":1,"x":375.88330078125,"y":92,"z":"c52d74c3.6a173","wires":[["d80de510.a9535"]]},{"id":"d80de510.a9535","type":"method","name":"method update-vnfc-info","xml":"<method rpc='update-vnfc-info' mode='sync'>\n","comments":"","outputs":1,"x":593.88330078125,"y":91,"z":"c52d74c3.6a173","wires":[["36ef9227.2f9f7e"]]},{"id":"36ef9227.2f9f7e","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":213.88330078125,"y":173,"z":"c52d74c3.6a173","wires":[["e4367acb.1fb978","ec095f59.d1d65"]]},{"id":"e4367acb.1fb978","type":"set","name":"set vnfclistlen=0","xml":"<set>\n<parameter name='vnfclistlen' value='0' />\n","comments":"","x":411.88330078125,"y":173,"z":"c52d74c3.6a173","wires":[]},{"id":"ec095f59.d1d65","type":"for","name":"for: ...aaiinfo[]","xml":"<for atomic=\"true\" index=\"k\" start=\"0\" end=\"`$listlen`\" >","comments":"","outputs":1,"x":243.88330078125,"y":246,"z":"c52d74c3.6a173","wires":[["6b34e3c9.27ea34"]]},{"id":"6b34e3c9.27ea34","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":447.88330078125,"y":246,"z":"c52d74c3.6a173","wires":[["ca99a786.1adf8"]]},{"id":"fde2a23.0ae856","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":972.88330078125,"y":204,"z":"c52d74c3.6a173","wires":[["d8eb874c.b59238"]]},{"id":"2217ca10.f4dbfe","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":954.88330078125,"y":266,"z":"c52d74c3.6a173","wires":[["d8eb874c.b59238"]]},{"id":"45df48e.32abe38","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":197.88330078125,"y":365,"z":"c52d74c3.6a173","wires":[["9c9021bc.b88fa8"]]},{"id":"d8eb874c.b59238","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1132.88330078125,"y":235,"z":"c52d74c3.6a173","wires":[["4590c797.1fa088","aed133a2.2225f8"]]},{"id":"9c9021bc.b88fa8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":367.88330078125,"y":363,"z":"c52d74c3.6a173","wires":[["5baeb97d.8be528"]]},{"id":"5baeb97d.8be528","type":"switchNode","name":"switch: relationship length","xml":"<switch test=\"`$tmp.vserver.relationship-list.relationship_length`\">","comments":"","outputs":1,"x":614.88330078125,"y":360,"z":"c52d74c3.6a173","wires":[["6c48093.1fa56f8","a039aec1.91e03"]]},{"id":"a039aec1.91e03","type":"other","name":"Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":170.88330078125,"y":474,"z":"c52d74c3.6a173","wires":[["b8d7820d.5420b"]]},{"id":"6c48093.1fa56f8","type":"outcome","name":"NULL","xml":"<outcome value=\"\">","comments":"","outputs":1,"x":859.88330078125,"y":364,"z":"c52d74c3.6a173","wires":[["6cb2d58.62be52c"]]},{"id":"6cb2d58.62be52c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1022.88330078125,"y":366,"z":"c52d74c3.6a173","wires":[[]]},{"id":"b8d7820d.5420b","type":"for","name":"for: ...relationship[]","xml":"<for atomic=\"true\" index=\"i\" start=\"0\" end=\"`$tmp.vserver.relationship-list.relationship_length`\" >","comments":"","outputs":1,"x":333.88330078125,"y":476,"z":"c52d74c3.6a173","wires":[["584bee63.5ef69"]]},{"id":"a801b938.dfe4","type":"switchNode","name":"switch: ...related-to","xml":"<switch test=\"`$tmp.vserver.relationship-list.relationship[$i].related-to`\">","comments":"","outputs":1,"x":438.88330078125,"y":538,"z":"c52d74c3.6a173","wires":[["f69424a2.0350d"]]},{"id":"f69424a2.0350d","type":"outcome","name":"vnfc","xml":"<outcome value=\"vnfc\">","comments":"","outputs":1,"x":628.88330078125,"y":535,"z":"c52d74c3.6a173","wires":[["e43d220d.0c97f"]]},{"id":"e43d220d.0c97f","type":"for","name":"for: ...relationship-data[]","xml":"<for atomic=\"true\" index=\"j\" start=\"0\" end=\"`$tmp.vserver.relationship-list.relationship[$i].relationship-data_length`\" >","comments":"","outputs":1,"x":832.88330078125,"y":528,"z":"c52d74c3.6a173","wires":[["5f70befc.28273"]]},{"id":"5f70befc.28273","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":227.88330078125,"y":631,"z":"c52d74c3.6a173","wires":[["b03df48b.fe3f4"]]},{"id":"b03df48b.fe3f4","type":"switchNode","name":"switch: ...relationship-key","xml":"<switch test=\"`$tmp.vserver.relationship-list.relationship[$i].relationship-data[$j].relationship-key`\">","comments":"","outputs":1,"x":450.88330078125,"y":631,"z":"c52d74c3.6a173","wires":[["d0c0b651.ef1c58"]]},{"id":"d0c0b651.ef1c58","type":"outcome","name":"vnfc-name","xml":"<outcome value=\"vnfc.vnfc-name\">","comments":"","outputs":1,"x":658.88330078125,"y":630,"z":"c52d74c3.6a173","wires":[["b7f0009.11cd18"]]},{"id":"584bee63.5ef69","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":221.88330078125,"y":543,"z":"c52d74c3.6a173","wires":[["a801b938.dfe4"]]},{"id":"aed133a2.2225f8","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $aaiinfo[$k].vserverid + '.' + $error-message`\"/>","comments":"","x":1372.88330078125,"y":256,"z":"c52d74c3.6a173","wires":[]},{"id":"4590c797.1fa088","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=\"Get Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n\n","comments":"","outputs":1,"x":1301.88330078125,"y":187,"z":"c52d74c3.6a173","wires":[[]]},{"id":"44fa882d.37258","type":"save","name":"update: A&AI VNFC","xml":"<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" resource=\"vnfc\" \nkey=\"vnfc.vnfc-name = $tmp.vserver.relationship-list.relationship[$i].relationship-data[$j].relationship-value and \nvserver.vserver-id = $aaiinfo[$k].vserverid AND \ntenant.tenant-id = $aaiinfo[$k].tenantid AND \ncloud-region.region-id = $aaiinfo[$k].cloudregionid \" \nforce=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n<parameter name=\"orchestration-status\" value=\"`$tmp.aai-orch-status`\"/>","comments":"","outputs":1,"x":1056.88330078125,"y":636,"z":"c52d74c3.6a173","wires":[["ac6f0c46.257ed8"]]},{"id":"ac6f0c46.257ed8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1239.88330078125,"y":637,"z":"c52d74c3.6a173","wires":[["51900e55.4456b"]]},{"id":"51900e55.4456b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1398.88330078125,"y":639,"z":"c52d74c3.6a173","wires":[["bf4d5312.a11fc","42ec4cbb.ffb7ec"]]},{"id":"bf4d5312.a11fc","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=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VNFCNAME\" value=\"`$vnfcinfo[$vnfclistlen].vnfcname`\"/>\n<parameter name=\"VSERVERID\" value=\"`$vnfcinfo[$vnfclistlen].vserverid`\"/>\n<parameter name=\"TENANTID\" value=\"`$vnfcinfo[$vnfclistlen].tenantid`\"/>\n\n","comments":"","outputs":1,"x":1581.88330078125,"y":596,"z":"c52d74c3.6a173","wires":[[]]},{"id":"42ec4cbb.ffb7ec","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for VNFC ' + $vnfcinfo[$vnfclistlen].vnfcname + '.' + $error-message`\"/>","comments":"","x":1643.88330078125,"y":668,"z":"c52d74c3.6a173","wires":[]},{"id":"b7f0009.11cd18","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":834.88330078125,"y":632,"z":"c52d74c3.6a173","wires":[["44fa882d.37258","6309de41.c6ea18"]]},{"id":"6309de41.c6ea18","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=\"VNFCNAME\" value=\"`$tmp.vserver.relationship-list.relationship[$i].relationship-data[$j].relationship-value`\"/>\n<parameter name=\"VSERVERID\" value=\"`$aaiinfo[$k].vserverid`\"/>\n<parameter name=\"TENANTID\" value=\"`$aaiinfo[$k].tenantid`\"/>\n<parameter name=\"CLOUDOWNER\" value=\"`$aaiinfo[$k].cloudowner`\"/>\n<parameter name=\"CLOUDREGIONID\" value=\"`$aaiinfo[$k].cloudregionid`\"/>\n","comments":"","outputs":1,"x":1027.88330078125,"y":581,"z":"c52d74c3.6a173","wires":[[]]}]
+[{"id":"ca99a786.1adf8","type":"get-resource","name":"get-resource: A&AI Data for VServer","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vserver\" \nkey=\"vserver.vserver-id = $aaiinfo[$k].vserverid AND \ntenant.tenant-id = $aaiinfo[$k].tenantid AND\ncloud-region.cloud-owner = $aaiinfo[$k].cloudowner AND\ncloud-region.cloud-region-id = $aaiinfo[$k].cloudregionid\"\npfx=\"tmp.vserver\" >\n\n","comments":"","outputs":1,"x":709.88330078125,"y":246,"z":"c52d74c3.6a173","wires":[["fde2a23.0ae856","2217ca10.f4dbfe","45df48e.32abe38"]]},{"id":"68770954.89e85","type":"dgstart","name":"DGSTART","outputs":1,"x":204.88330078125,"y":92,"z":"c52d74c3.6a173","wires":[["57a94af7.1d52e4"]]},{"id":"57a94af7.1d52e4","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","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-API' version='4.0.0'>","outputs":1,"x":375.88330078125,"y":92,"z":"c52d74c3.6a173","wires":[["d80de510.a9535"]]},{"id":"d80de510.a9535","type":"method","name":"method update-vnfc-info","xml":"<method rpc='update-vnfc-info' mode='sync'>\n","comments":"","outputs":1,"x":593.88330078125,"y":91,"z":"c52d74c3.6a173","wires":[["36ef9227.2f9f7e"]]},{"id":"36ef9227.2f9f7e","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":213.88330078125,"y":173,"z":"c52d74c3.6a173","wires":[["e4367acb.1fb978","ec095f59.d1d65"]]},{"id":"e4367acb.1fb978","type":"set","name":"set vnfclistlen=0","xml":"<set>\n<parameter name='vnfclistlen' value='0' />\n","comments":"","x":411.88330078125,"y":173,"z":"c52d74c3.6a173","wires":[]},{"id":"ec095f59.d1d65","type":"for","name":"for: ...aaiinfo[]","xml":"<for atomic=\"true\" index=\"k\" start=\"0\" end=\"`$listlen`\" >","comments":"","outputs":1,"x":243.88330078125,"y":246,"z":"c52d74c3.6a173","wires":[["6b34e3c9.27ea34"]]},{"id":"6b34e3c9.27ea34","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":447.88330078125,"y":246,"z":"c52d74c3.6a173","wires":[["ca99a786.1adf8"]]},{"id":"fde2a23.0ae856","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":972.88330078125,"y":204,"z":"c52d74c3.6a173","wires":[["d8eb874c.b59238"]]},{"id":"2217ca10.f4dbfe","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":954.88330078125,"y":266,"z":"c52d74c3.6a173","wires":[["d8eb874c.b59238"]]},{"id":"45df48e.32abe38","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":197.88330078125,"y":365,"z":"c52d74c3.6a173","wires":[["9c9021bc.b88fa8"]]},{"id":"d8eb874c.b59238","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1132.88330078125,"y":235,"z":"c52d74c3.6a173","wires":[["4590c797.1fa088","aed133a2.2225f8"]]},{"id":"9c9021bc.b88fa8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":367.88330078125,"y":363,"z":"c52d74c3.6a173","wires":[["5baeb97d.8be528"]]},{"id":"5baeb97d.8be528","type":"switchNode","name":"switch: relationship length","xml":"<switch test=\"`$tmp.vserver.relationship-list.relationship_length`\">","comments":"","outputs":1,"x":614.88330078125,"y":360,"z":"c52d74c3.6a173","wires":[["6c48093.1fa56f8","a039aec1.91e03"]]},{"id":"a039aec1.91e03","type":"other","name":"Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":170.88330078125,"y":474,"z":"c52d74c3.6a173","wires":[["b8d7820d.5420b"]]},{"id":"6c48093.1fa56f8","type":"outcome","name":"NULL","xml":"<outcome value=\"\">","comments":"","outputs":1,"x":859.88330078125,"y":364,"z":"c52d74c3.6a173","wires":[["6cb2d58.62be52c"]]},{"id":"6cb2d58.62be52c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1022.88330078125,"y":366,"z":"c52d74c3.6a173","wires":[[]]},{"id":"b8d7820d.5420b","type":"for","name":"for: ...relationship[]","xml":"<for atomic=\"true\" index=\"i\" start=\"0\" end=\"`$tmp.vserver.relationship-list.relationship_length`\" >","comments":"","outputs":1,"x":333.88330078125,"y":476,"z":"c52d74c3.6a173","wires":[["584bee63.5ef69"]]},{"id":"a801b938.dfe4","type":"switchNode","name":"switch: ...related-to","xml":"<switch test=\"`$tmp.vserver.relationship-list.relationship[$i].related-to`\">","comments":"","outputs":1,"x":438.88330078125,"y":538,"z":"c52d74c3.6a173","wires":[["f69424a2.0350d"]]},{"id":"f69424a2.0350d","type":"outcome","name":"vnfc","xml":"<outcome value=\"vnfc\">","comments":"","outputs":1,"x":628.88330078125,"y":535,"z":"c52d74c3.6a173","wires":[["e43d220d.0c97f"]]},{"id":"e43d220d.0c97f","type":"for","name":"for: ...relationship-data[]","xml":"<for atomic=\"true\" index=\"j\" start=\"0\" end=\"`$tmp.vserver.relationship-list.relationship[$i].relationship-data_length`\" >","comments":"","outputs":1,"x":832.88330078125,"y":528,"z":"c52d74c3.6a173","wires":[["5f70befc.28273"]]},{"id":"5f70befc.28273","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":227.88330078125,"y":631,"z":"c52d74c3.6a173","wires":[["b03df48b.fe3f4"]]},{"id":"b03df48b.fe3f4","type":"switchNode","name":"switch: ...relationship-key","xml":"<switch test=\"`$tmp.vserver.relationship-list.relationship[$i].relationship-data[$j].relationship-key`\">","comments":"","outputs":1,"x":450.88330078125,"y":631,"z":"c52d74c3.6a173","wires":[["d0c0b651.ef1c58"]]},{"id":"d0c0b651.ef1c58","type":"outcome","name":"vnfc-name","xml":"<outcome value=\"vnfc.vnfc-name\">","comments":"","outputs":1,"x":658.88330078125,"y":630,"z":"c52d74c3.6a173","wires":[["b7f0009.11cd18"]]},{"id":"584bee63.5ef69","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":221.88330078125,"y":543,"z":"c52d74c3.6a173","wires":[["a801b938.dfe4"]]},{"id":"aed133a2.2225f8","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $aaiinfo[$k].vserverid + '.' + $error-message`\"/>","comments":"","x":1372.88330078125,"y":256,"z":"c52d74c3.6a173","wires":[]},{"id":"4590c797.1fa088","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=\"Get Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n\n","comments":"","outputs":1,"x":1301.88330078125,"y":187,"z":"c52d74c3.6a173","wires":[[]]},{"id":"44fa882d.37258","type":"save","name":"update: A&AI VNFC","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vnfc\" \nkey=\"vnfc.vnfc-name = $tmp.vserver.relationship-list.relationship[$i].relationship-data[$j].relationship-value and \nvserver.vserver-id = $aaiinfo[$k].vserverid AND \ntenant.tenant-id = $aaiinfo[$k].tenantid AND \ncloud-region.region-id = $aaiinfo[$k].cloudregionid \" \nforce=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n<parameter name=\"orchestration-status\" value=\"`$tmp.aai-orch-status`\"/>","comments":"","outputs":1,"x":1056.88330078125,"y":636,"z":"c52d74c3.6a173","wires":[["ac6f0c46.257ed8"]]},{"id":"ac6f0c46.257ed8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1239.88330078125,"y":637,"z":"c52d74c3.6a173","wires":[["51900e55.4456b"]]},{"id":"51900e55.4456b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1398.88330078125,"y":639,"z":"c52d74c3.6a173","wires":[["bf4d5312.a11fc","42ec4cbb.ffb7ec"]]},{"id":"bf4d5312.a11fc","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=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VNFCNAME\" value=\"`$vnfcinfo[$vnfclistlen].vnfcname`\"/>\n<parameter name=\"VSERVERID\" value=\"`$vnfcinfo[$vnfclistlen].vserverid`\"/>\n<parameter name=\"TENANTID\" value=\"`$vnfcinfo[$vnfclistlen].tenantid`\"/>\n\n","comments":"","outputs":1,"x":1581.88330078125,"y":596,"z":"c52d74c3.6a173","wires":[[]]},{"id":"42ec4cbb.ffb7ec","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for VNFC ' + $vnfcinfo[$vnfclistlen].vnfcname + '.' + $error-message`\"/>","comments":"","x":1643.88330078125,"y":668,"z":"c52d74c3.6a173","wires":[]},{"id":"b7f0009.11cd18","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":834.88330078125,"y":632,"z":"c52d74c3.6a173","wires":[["44fa882d.37258","6309de41.c6ea18"]]},{"id":"6309de41.c6ea18","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=\"VNFCNAME\" value=\"`$tmp.vserver.relationship-list.relationship[$i].relationship-data[$j].relationship-value`\"/>\n<parameter name=\"VSERVERID\" value=\"`$aaiinfo[$k].vserverid`\"/>\n<parameter name=\"TENANTID\" value=\"`$aaiinfo[$k].tenantid`\"/>\n<parameter name=\"CLOUDOWNER\" value=\"`$aaiinfo[$k].cloudowner`\"/>\n<parameter name=\"CLOUDREGIONID\" value=\"`$aaiinfo[$k].cloudregionid`\"/>\n","comments":"","outputs":1,"x":1027.88330078125,"y":581,"z":"c52d74c3.6a173","wires":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-vserver-info.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-vserver-info.json
index 59e3973b3..bc1d49d66 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-vserver-info.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_update-vserver-info.json
@@ -1 +1 @@
-[{"id":"fb57c265.1ba01","type":"dgstart","name":"DGSTART","outputs":1,"x":219,"y":54,"z":"7ec136e2.e63208","wires":[["185188b4.36cb77"]]},{"id":"185188b4.36cb77","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","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-API' version='4.0.0'>","outputs":1,"x":390,"y":52,"z":"7ec136e2.e63208","wires":[["d3b34772.6e59f8"]]},{"id":"d3b34772.6e59f8","type":"method","name":"method update-vserver-info","xml":"<method rpc='update-vserver-info' mode='sync'>\n","comments":"","outputs":1,"x":618,"y":54,"z":"7ec136e2.e63208","wires":[["531cec36.49f504"]]},{"id":"531cec36.49f504","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":208,"y":108,"z":"7ec136e2.e63208","wires":[["875b1407.c421d8","41c061d8.a53ca","73a4109.f924ef"]]},{"id":"875b1407.c421d8","type":"set","name":"set listlen=0","xml":"<set>\n<parameter name='listlen' value='0' />\n","comments":"","x":386,"y":110,"z":"7ec136e2.e63208","wires":[]},{"id":"41c061d8.a53ca","type":"switchNode","name":"switch: relationship length","xml":"<switch test=\"`$tmp.aai-data-vnf.relationship-list.relationship_length`\">","comments":"","outputs":1,"x":240,"y":182,"z":"7ec136e2.e63208","wires":[["abcca544.fa55e8","4d4625e4.11b96c"]]},{"id":"4d4625e4.11b96c","type":"other","name":"Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":441,"y":263,"z":"7ec136e2.e63208","wires":[["782291d7.96aa1"]]},{"id":"abcca544.fa55e8","type":"outcome","name":"NULL","xml":"<outcome value=\"\">","comments":"","outputs":1,"x":448,"y":181,"z":"7ec136e2.e63208","wires":[["53fc41ee.f2a9f"]]},{"id":"53fc41ee.f2a9f","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":584,"y":180,"z":"7ec136e2.e63208","wires":[["f7e3690.45d8a98"]]},{"id":"4d016af.3128194","type":"for","name":"for: ...relationship[]","xml":"<for atomic=\"true\" index=\"i\" start=\"0\" end=\"`$tmp.aai-data-vnf.relationship-list.relationship_length`\" >","comments":"","outputs":1,"x":779,"y":269,"z":"7ec136e2.e63208","wires":[["1a71448.22d60bc"]]},{"id":"9b3225cd.90bf18","type":"switchNode","name":"switch: ...related-to","xml":"<switch test=\"`$tmp.aai-data-vnf.relationship-list.relationship[$i].related-to`\">","comments":"","outputs":1,"x":651,"y":343,"z":"7ec136e2.e63208","wires":[["df84265d.f084a8"]]},{"id":"df84265d.f084a8","type":"outcome","name":"vserver","xml":"<outcome value=\"vserver\">","comments":"","outputs":1,"x":376,"y":433,"z":"7ec136e2.e63208","wires":[["53e2f95c.eafab8"]]},{"id":"96f6935c.60847","type":"for","name":"for: ...relationship-data[]","xml":"<for atomic=\"true\" index=\"j\" start=\"0\" end=\"`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data_length`\" >","comments":"","outputs":1,"x":774,"y":429,"z":"7ec136e2.e63208","wires":[["f4ad596a.fd0f58"]]},{"id":"7255506e.be107","type":"switchNode","name":"switch: ...relationship-key","xml":"<switch test=\"`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data[$j].relationship-key`\">","comments":"","outputs":1,"x":1281,"y":406,"z":"7ec136e2.e63208","wires":[["93748d51.43dc5","d91de34.d004d2","8770a1e7.506fc","205912c3.6a437e"]]},{"id":"93748d51.43dc5","type":"outcome","name":"vserver-id","xml":"<outcome value=\"vserver.vserver-id\">","comments":"","outputs":1,"x":1515.5,"y":340,"z":"7ec136e2.e63208","wires":[["a9a68c63.9d993"]]},{"id":"d91de34.d004d2","type":"outcome","name":"tenant-id","xml":"<outcome value=\"tenant.tenant-id\">","comments":"","outputs":1,"x":1509,"y":413,"z":"7ec136e2.e63208","wires":[["bcb84af7.25e408"]]},{"id":"8770a1e7.506fc","type":"outcome","name":"cloud-owner","xml":"<outcome value=\"cloud-region.cloud-owner\">","comments":"","outputs":1,"x":1518,"y":502,"z":"7ec136e2.e63208","wires":[["b647ebc2.e53768"]]},{"id":"205912c3.6a437e","type":"outcome","name":"cloud-region-id","xml":"<outcome value=\"cloud-region.cloud-region-id\">","comments":"","outputs":1,"x":1518,"y":591,"z":"7ec136e2.e63208","wires":[["14d7bb26.c3cfd5"]]},{"id":"a9a68c63.9d993","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1698,"y":339,"z":"7ec136e2.e63208","wires":[["699f0edf.474f4"]]},{"id":"bcb84af7.25e408","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1699,"y":413,"z":"7ec136e2.e63208","wires":[["cb69969f.96fd98"]]},{"id":"b647ebc2.e53768","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1711,"y":503,"z":"7ec136e2.e63208","wires":[["1fc1517e.50999f"]]},{"id":"14d7bb26.c3cfd5","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1719,"y":582,"z":"7ec136e2.e63208","wires":[["c95c710e.e3083"]]},{"id":"699f0edf.474f4","type":"set","name":"set vserverid","xml":"<set>\n<parameter name=\"aaiinfo[$listlen].vserverid\" value=\"`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data[$j].relationship-value`\" />\n","comments":"","x":1940,"y":346,"z":"7ec136e2.e63208","wires":[]},{"id":"cb69969f.96fd98","type":"set","name":"set tenantid","xml":"<set>\n<parameter name='aaiinfo[$listlen].tenantid' value='`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data[$j].relationship-value`' />\n","comments":"","x":1947,"y":413,"z":"7ec136e2.e63208","wires":[]},{"id":"1fc1517e.50999f","type":"set","name":"set cloudowner","xml":"<set>\n<parameter name='aaiinfo[$listlen].cloudowner' value='`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data[$j].relationship-value`' />\n","comments":"","x":1946,"y":498,"z":"7ec136e2.e63208","wires":[]},{"id":"c95c710e.e3083","type":"set","name":"set cloudregion","xml":"<set>\n<parameter name='aaiinfo[$listlen].cloudregionid' value='`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data[$j].relationship-value`' />\n","comments":"","x":1933,"y":571,"z":"7ec136e2.e63208","wires":[]},{"id":"f4ad596a.fd0f58","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":994,"y":430,"z":"7ec136e2.e63208","wires":[["7255506e.be107"]]},{"id":"6ede6908.924968","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=\"VSERVERID\" value=\"`$aaiinfo[$listlen].vserverid`\"/>\n<parameter name=\"TENANTID\" value=\"`$aaiinfo[$listlen].tenantid`\"/>\n<parameter name=\"CLOUDOWNER\" value=\"`$aaiinfo[$listlen].cloudowner`\"/>\n<parameter name=\"CLOUDREGIONID\" value=\"`$aaiinfo[$listlen].cloudregionid`\"/>\n","comments":"","outputs":1,"x":740,"y":590,"z":"7ec136e2.e63208","wires":[[]]},{"id":"f7e3690.45d8a98","type":"set","name":"set listlen=0","xml":"<set>\n<parameter name='listlen' value='0' />\n","comments":"","x":736,"y":177,"z":"7ec136e2.e63208","wires":[]},{"id":"9efd4b8.e1f9eb8","type":"set","name":"increment listlen","xml":"<set>\n\t<parameter name='listlen' value='`$listlen + 1`' />\n\n","comments":"","x":763,"y":778,"z":"7ec136e2.e63208","wires":[]},{"id":"8701a0e1.96a92","type":"save","name":"update: A&AI ( VM)","xml":"<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" resource=\"vserver\" \nkey=\"vserver.vserver-id = $aaiinfo[$listlen].vserverid AND \ntenant.tenant-id = $aaiinfo[$listlen].tenantid AND\ncloud-region.cloud-owner = $aaiinfo[$listlen].cloudowner AND\ncloud-region.cloud-region-id = $aaiinfo[$listlen].cloudregionid\"\n force=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n","comments":"","outputs":1,"x":769.5,"y":654,"z":"7ec136e2.e63208","wires":[["37951ea8.1137b2"]]},{"id":"37951ea8.1137b2","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":963.5,"y":654,"z":"7ec136e2.e63208","wires":[["b793f606.57c9d8"]]},{"id":"b793f606.57c9d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1132.5,"y":655,"z":"7ec136e2.e63208","wires":[["40a42380.b197ac","e7af383f.fc57f8"]]},{"id":"40a42380.b197ac","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=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VSERVERID\" value=\"`$aaiinfo[$i].vserverid`\"/>\n<parameter name=\"TENANTID\" value=\"`$aaiinfo[$i].tenantid`\"/>\n\n","comments":"","outputs":1,"x":1331.5,"y":635,"z":"7ec136e2.e63208","wires":[[]]},{"id":"e7af383f.fc57f8","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $aaiinfo[$i].vserverid + ' and ' + $aaiinfo[$i].tenantid + '.' + $error-message`\"/>","comments":"","x":1406.5,"y":696,"z":"7ec136e2.e63208","wires":[]},{"id":"53e2f95c.eafab8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":552,"y":431,"z":"7ec136e2.e63208","wires":[["96f6935c.60847","8701a0e1.96a92","9efd4b8.e1f9eb8","6ede6908.924968"]]},{"id":"782291d7.96aa1","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":599,"y":267,"z":"7ec136e2.e63208","wires":[["4d016af.3128194"]]},{"id":"1a71448.22d60bc","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":453,"y":343,"z":"7ec136e2.e63208","wires":[["9b3225cd.90bf18"]]},{"id":"73a4109.f924ef","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=\"RELATIONSHIPLEN\" value=\"`$tmp.aai-data-vnf.relationship-list.relationship_length`\"/>\n\n","comments":"","outputs":1,"x":375,"y":145,"z":"7ec136e2.e63208","wires":[[]]}]
+[{"id":"fb57c265.1ba01","type":"dgstart","name":"DGSTART","outputs":1,"x":219,"y":54,"z":"7ec136e2.e63208","wires":[["185188b4.36cb77"]]},{"id":"185188b4.36cb77","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","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-API' version='4.0.0'>","outputs":1,"x":390,"y":52,"z":"7ec136e2.e63208","wires":[["d3b34772.6e59f8"]]},{"id":"d3b34772.6e59f8","type":"method","name":"method update-vserver-info","xml":"<method rpc='update-vserver-info' mode='sync'>\n","comments":"","outputs":1,"x":618,"y":54,"z":"7ec136e2.e63208","wires":[["531cec36.49f504"]]},{"id":"531cec36.49f504","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":208,"y":108,"z":"7ec136e2.e63208","wires":[["875b1407.c421d8","41c061d8.a53ca","73a4109.f924ef"]]},{"id":"875b1407.c421d8","type":"set","name":"set listlen=0","xml":"<set>\n<parameter name='listlen' value='0' />\n","comments":"","x":386,"y":110,"z":"7ec136e2.e63208","wires":[]},{"id":"41c061d8.a53ca","type":"switchNode","name":"switch: relationship length","xml":"<switch test=\"`$tmp.aai-data-vnf.relationship-list.relationship_length`\">","comments":"","outputs":1,"x":240,"y":182,"z":"7ec136e2.e63208","wires":[["abcca544.fa55e8","4d4625e4.11b96c"]]},{"id":"4d4625e4.11b96c","type":"other","name":"Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":441,"y":263,"z":"7ec136e2.e63208","wires":[["782291d7.96aa1"]]},{"id":"abcca544.fa55e8","type":"outcome","name":"NULL","xml":"<outcome value=\"\">","comments":"","outputs":1,"x":448,"y":181,"z":"7ec136e2.e63208","wires":[["53fc41ee.f2a9f"]]},{"id":"53fc41ee.f2a9f","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":584,"y":180,"z":"7ec136e2.e63208","wires":[["f7e3690.45d8a98"]]},{"id":"4d016af.3128194","type":"for","name":"for: ...relationship[]","xml":"<for atomic=\"true\" index=\"i\" start=\"0\" end=\"`$tmp.aai-data-vnf.relationship-list.relationship_length`\" >","comments":"","outputs":1,"x":779,"y":269,"z":"7ec136e2.e63208","wires":[["1a71448.22d60bc"]]},{"id":"9b3225cd.90bf18","type":"switchNode","name":"switch: ...related-to","xml":"<switch test=\"`$tmp.aai-data-vnf.relationship-list.relationship[$i].related-to`\">","comments":"","outputs":1,"x":651,"y":343,"z":"7ec136e2.e63208","wires":[["df84265d.f084a8"]]},{"id":"df84265d.f084a8","type":"outcome","name":"vserver","xml":"<outcome value=\"vserver\">","comments":"","outputs":1,"x":376,"y":433,"z":"7ec136e2.e63208","wires":[["53e2f95c.eafab8"]]},{"id":"96f6935c.60847","type":"for","name":"for: ...relationship-data[]","xml":"<for atomic=\"true\" index=\"j\" start=\"0\" end=\"`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data_length`\" >","comments":"","outputs":1,"x":774,"y":429,"z":"7ec136e2.e63208","wires":[["f4ad596a.fd0f58"]]},{"id":"7255506e.be107","type":"switchNode","name":"switch: ...relationship-key","xml":"<switch test=\"`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data[$j].relationship-key`\">","comments":"","outputs":1,"x":1281,"y":406,"z":"7ec136e2.e63208","wires":[["93748d51.43dc5","d91de34.d004d2","8770a1e7.506fc","205912c3.6a437e"]]},{"id":"93748d51.43dc5","type":"outcome","name":"vserver-id","xml":"<outcome value=\"vserver.vserver-id\">","comments":"","outputs":1,"x":1515.5,"y":340,"z":"7ec136e2.e63208","wires":[["a9a68c63.9d993"]]},{"id":"d91de34.d004d2","type":"outcome","name":"tenant-id","xml":"<outcome value=\"tenant.tenant-id\">","comments":"","outputs":1,"x":1509,"y":413,"z":"7ec136e2.e63208","wires":[["bcb84af7.25e408"]]},{"id":"8770a1e7.506fc","type":"outcome","name":"cloud-owner","xml":"<outcome value=\"cloud-region.cloud-owner\">","comments":"","outputs":1,"x":1518,"y":502,"z":"7ec136e2.e63208","wires":[["b647ebc2.e53768"]]},{"id":"205912c3.6a437e","type":"outcome","name":"cloud-region-id","xml":"<outcome value=\"cloud-region.cloud-region-id\">","comments":"","outputs":1,"x":1518,"y":591,"z":"7ec136e2.e63208","wires":[["14d7bb26.c3cfd5"]]},{"id":"a9a68c63.9d993","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1698,"y":339,"z":"7ec136e2.e63208","wires":[["699f0edf.474f4"]]},{"id":"bcb84af7.25e408","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1699,"y":413,"z":"7ec136e2.e63208","wires":[["cb69969f.96fd98"]]},{"id":"b647ebc2.e53768","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1711,"y":503,"z":"7ec136e2.e63208","wires":[["1fc1517e.50999f"]]},{"id":"14d7bb26.c3cfd5","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1719,"y":582,"z":"7ec136e2.e63208","wires":[["c95c710e.e3083"]]},{"id":"699f0edf.474f4","type":"set","name":"set vserverid","xml":"<set>\n<parameter name=\"aaiinfo[$listlen].vserverid\" value=\"`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data[$j].relationship-value`\" />\n","comments":"","x":1940,"y":346,"z":"7ec136e2.e63208","wires":[]},{"id":"cb69969f.96fd98","type":"set","name":"set tenantid","xml":"<set>\n<parameter name='aaiinfo[$listlen].tenantid' value='`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data[$j].relationship-value`' />\n","comments":"","x":1947,"y":413,"z":"7ec136e2.e63208","wires":[]},{"id":"1fc1517e.50999f","type":"set","name":"set cloudowner","xml":"<set>\n<parameter name='aaiinfo[$listlen].cloudowner' value='`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data[$j].relationship-value`' />\n","comments":"","x":1946,"y":498,"z":"7ec136e2.e63208","wires":[]},{"id":"c95c710e.e3083","type":"set","name":"set cloudregion","xml":"<set>\n<parameter name='aaiinfo[$listlen].cloudregionid' value='`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data[$j].relationship-value`' />\n","comments":"","x":1933,"y":571,"z":"7ec136e2.e63208","wires":[]},{"id":"f4ad596a.fd0f58","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":994,"y":430,"z":"7ec136e2.e63208","wires":[["7255506e.be107"]]},{"id":"6ede6908.924968","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=\"VSERVERID\" value=\"`$aaiinfo[$listlen].vserverid`\"/>\n<parameter name=\"TENANTID\" value=\"`$aaiinfo[$listlen].tenantid`\"/>\n<parameter name=\"CLOUDOWNER\" value=\"`$aaiinfo[$listlen].cloudowner`\"/>\n<parameter name=\"CLOUDREGIONID\" value=\"`$aaiinfo[$listlen].cloudregionid`\"/>\n","comments":"","outputs":1,"x":740,"y":590,"z":"7ec136e2.e63208","wires":[[]]},{"id":"f7e3690.45d8a98","type":"set","name":"set listlen=0","xml":"<set>\n<parameter name='listlen' value='0' />\n","comments":"","x":736,"y":177,"z":"7ec136e2.e63208","wires":[]},{"id":"9efd4b8.e1f9eb8","type":"set","name":"increment listlen","xml":"<set>\n\t<parameter name='listlen' value='`$listlen + 1`' />\n\n","comments":"","x":763,"y":778,"z":"7ec136e2.e63208","wires":[]},{"id":"8701a0e1.96a92","type":"save","name":"update: A&AI ( VM)","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vserver\" \nkey=\"vserver.vserver-id = $aaiinfo[$listlen].vserverid AND \ntenant.tenant-id = $aaiinfo[$listlen].tenantid AND\ncloud-region.cloud-owner = $aaiinfo[$listlen].cloudowner AND\ncloud-region.cloud-region-id = $aaiinfo[$listlen].cloudregionid\"\n force=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n","comments":"","outputs":1,"x":769.5,"y":654,"z":"7ec136e2.e63208","wires":[["37951ea8.1137b2"]]},{"id":"37951ea8.1137b2","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":963.5,"y":654,"z":"7ec136e2.e63208","wires":[["b793f606.57c9d8"]]},{"id":"b793f606.57c9d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1132.5,"y":655,"z":"7ec136e2.e63208","wires":[["40a42380.b197ac","e7af383f.fc57f8"]]},{"id":"40a42380.b197ac","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=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VSERVERID\" value=\"`$aaiinfo[$i].vserverid`\"/>\n<parameter name=\"TENANTID\" value=\"`$aaiinfo[$i].tenantid`\"/>\n\n","comments":"","outputs":1,"x":1331.5,"y":635,"z":"7ec136e2.e63208","wires":[[]]},{"id":"e7af383f.fc57f8","type":"set","name":"set: Append to error message","xml":"<set>\n\t <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $aaiinfo[$i].vserverid + ' and ' + $aaiinfo[$i].tenantid + '.' + $error-message`\"/>","comments":"","x":1406.5,"y":696,"z":"7ec136e2.e63208","wires":[]},{"id":"53e2f95c.eafab8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":552,"y":431,"z":"7ec136e2.e63208","wires":[["96f6935c.60847","8701a0e1.96a92","9efd4b8.e1f9eb8","6ede6908.924968"]]},{"id":"782291d7.96aa1","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":599,"y":267,"z":"7ec136e2.e63208","wires":[["4d016af.3128194"]]},{"id":"1a71448.22d60bc","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":453,"y":343,"z":"7ec136e2.e63208","wires":[["9b3225cd.90bf18"]]},{"id":"73a4109.f924ef","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=\"RELATIONSHIPLEN\" value=\"`$tmp.aai-data-vnf.relationship-list.relationship_length`\"/>\n\n","comments":"","outputs":1,"x":375,"y":145,"z":"7ec136e2.e63208","wires":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json
index a08bde568..6e9925b14 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json
@@ -583,7 +583,7 @@
"id": "1a5aec1c.ab3e44",
"type": "execute",
"name": "Compare",
- "xml": "<execute plugin='org.openecomp.sdnc.config.audit.node.CompareNode' method='compare' >\n<parameter name='sourceDataType' value=\"Current\" />\n<parameter name='sourceData' value=\"`$current-config`\" />\n<parameter name='targetDataType' value=\"Running\" />\n<parameter name='targetData' value=\"`$running-config.content`\" />\n<parameter name='compareDataType' value=\"`$protocol`\" />",
+ "xml": "<execute plugin='org.onap.sdnc.config.audit.node.CompareNode' method='compare' >\n<parameter name='sourceDataType' value=\"Current\" />\n<parameter name='sourceData' value=\"`$current-config`\" />\n<parameter name='targetDataType' value=\"Running\" />\n<parameter name='targetData' value=\"`$running-config.content`\" />\n<parameter name='compareDataType' value=\"`$protocol`\" />",
"comments": "",
"outputs": 1,
"x": 769.6667098999023,
@@ -1072,7 +1072,7 @@
"id": "17c3243e.6f760c",
"type": "record",
"name": "record cvass",
- "xml": "<record plugin=\"org.openecomp.sdnc.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"`$cvaas-file-name`\"/>\n<parameter name=\"record\" value=\"`$cvaas-file-content`\"/>",
+ "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"`$cvaas-file-name`\"/>\n<parameter name=\"record\" value=\"`$cvaas-file-content`\"/>",
"comments": "",
"outputs": 1,
"x": 2219.349090576172,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json
index 8296c5eaa..3a4c7aa83 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json
@@ -1014,7 +1014,7 @@
"id": "694c898b.ddbd58",
"type": "record",
"name": "record cvass",
- "xml": "<record plugin=\"org.openecomp.sdnc.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"`$cvaas-file-name`\"/>\n<parameter name=\"record\" value=\"`$cvaas-file-content`\"/>",
+ "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"`$cvaas-file-name`\"/>\n<parameter name=\"record\" value=\"`$cvaas-file-content`\"/>",
"comments": "",
"outputs": 1,
"x": 2417.917697906494,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java
index ca8dbdff1..f7ee5abaa 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java
@@ -69,8 +69,8 @@ public class TestCommonConfig /* extends AbstractDGTestCase */ {
Map<String, Object> serviceReferences = new HashMap<String, Object>();
- serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode",new org.openecomp.sdnc.config.generator.convert.ConvertNode());
- serviceReferences.put("org.openecomp.sdnc.config.generator.merge.MergeNode", new org.openecomp.sdnc.config.generator.merge.MergeNode());
+ serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode",new org.onap.sdnc.config.generator.convert.ConvertNode());
+ serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
//serviceReferences.put("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode());
serviceReferences.put("org.onap.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor());
@@ -198,8 +198,8 @@ public class TestCommonConfig /* extends AbstractDGTestCase */ {
callGraph10XML };
Map<String, Object> serviceReferences = new HashMap<String, Object>();
- serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode",new org.openecomp.sdnc.config.generator.convert.ConvertNode());
- serviceReferences.put("org.openecomp.sdnc.config.generator.merge.MergeNode", new org.openecomp.sdnc.config.generator.merge.MergeNode());
+ serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode",new org.onap.sdnc.config.generator.convert.ConvertNode());
+ serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java
index a4592e72e..801b61097 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java
@@ -47,8 +47,8 @@ public class TestConfigurationDocumentRequest /* extends AbstractDGTestCase */ {
String injectGraphXmls[] = new String[] { configurationDocumentRequestXML};
Map<String, Object> serviceReferences = new HashMap<String, Object>();
- serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode",new org.openecomp.sdnc.config.generator.convert.ConvertNode());
- serviceReferences.put("org.openecomp.sdnc.config.generator.merge.MergeNode", new org.openecomp.sdnc.config.generator.merge.MergeNode());
+ serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode",new org.onap.sdnc.config.generator.convert.ConvertNode());
+ serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
GraphKey graphKey = new GraphKey("SDC-MESSAGE", null, "configuration-document-request", null);
DGTestCase tc = new DGTestCase(graphKey);
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java
index f329d6b6c..8ead2afef 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java
@@ -68,7 +68,7 @@ public class TestGenerateConfig /* extends AbstractDGTestCase */ {
Map<String, Object> serviceReferences = new HashMap<String, Object>();
- serviceReferences.put("org.openecomp.sdnc.config.generator.merge.MergeNode", new org.openecomp.sdnc.config.generator.merge.MergeNode());
+ serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
//serviceReferences.put("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode());
serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
@@ -105,7 +105,7 @@ public class TestGenerateConfig /* extends AbstractDGTestCase */ {
Map<String, Object> serviceReferences = new HashMap<String, Object>();
- serviceReferences.put("org.openecomp.sdnc.config.generator.merge.MergeNode", new org.openecomp.sdnc.config.generator.merge.MergeNode());
+ serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
//serviceReferences.put("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode());
serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java
index 250e4ac30..cd279f326 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java
@@ -53,7 +53,7 @@ public class TestGenerateTemplateConfig /* extends AbstractDGTestCase */ {
serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
- serviceReferences.put("org.openecomp.sdnc.config.generator.merge.MergeNode", new org.openecomp.sdnc.config.generator.merge.MergeNode());
+ serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
// Register Call graphs
String injectGraphXmls[] = new String[] { generateConfigXML };
@@ -85,7 +85,7 @@ public class TestGenerateTemplateConfig /* extends AbstractDGTestCase */ {
serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
- serviceReferences.put("org.openecomp.sdnc.config.generator.merge.MergeNode", new org.openecomp.sdnc.config.generator.merge.MergeNode());
+ serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
// Register Call graphs
String injectGraphXmls[] = new String[] { generateConfigXML };
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java
index fd219b013..d14bb8339 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java
@@ -53,7 +53,7 @@ public class TestGetConfigParams /* extends AbstractDGTestCase */ {
Map<String, Object> serviceReferences = new HashMap<String, Object>();
- serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode", new org.openecomp.sdnc.config.generator.convert.ConvertNode());
+ serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
// Register Call graphs
String injectGraphXmls[] = new String[] { getConfigParamsXML };
@@ -87,7 +87,7 @@ public class TestGetConfigParams /* extends AbstractDGTestCase */ {
String propertyfileName = "APPC/GetConfigParams/TemplateName.properties";
Map<String, Object> serviceReferences = new HashMap<String, Object>();
- serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode", new org.openecomp.sdnc.config.generator.convert.ConvertNode());
+ serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
// Register Call graphs
String injectGraphXmls[] = new String[] { getConfigParamsXML };
@@ -118,7 +118,7 @@ public class TestGetConfigParams /* extends AbstractDGTestCase */ {
String propertyfileName = "APPC/GetConfigParams/CliString.properties";
Map<String, Object> serviceReferences = new HashMap<String, Object>();
- serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode", new org.openecomp.sdnc.config.generator.convert.ConvertNode());
+ serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
// Register Call graphs
@@ -152,7 +152,7 @@ public class TestGetConfigParams /* extends AbstractDGTestCase */ {
- serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode", new org.openecomp.sdnc.config.generator.convert.ConvertNode());
+ serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
// Register Call graphs
String injectGraphXmls[] = new String[] { getConfigParamsXML };
@@ -186,7 +186,7 @@ public class TestGetConfigParams /* extends AbstractDGTestCase */ {
- serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode", new org.openecomp.sdnc.config.generator.convert.ConvertNode());
+ serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
// Register Call graphs
String injectGraphXmls[] = new String[] { getConfigParamsXML };
@@ -216,7 +216,7 @@ public class TestGetConfigParams /* extends AbstractDGTestCase */ {
Map<String, Object> serviceReferences = new HashMap<String, Object>();
- serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode", new org.openecomp.sdnc.config.generator.convert.ConvertNode());
+ serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
// Register Call graphs
String injectGraphXmls[] = new String[] { getConfigParamsXML };
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java
index f638c00c9..fd14d83cd 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java
@@ -56,7 +56,7 @@ public class TestProcessParameterDefinition /* extends AbstractDGTestCase */ {
- serviceReferences.put("org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode", new org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode());
+ serviceReferences.put("org.onap.sdnc.config.params.parser.PropertyDefinitionNode", new org.onap.sdnc.config.params.parser.PropertyDefinitionNode());
@@ -92,7 +92,7 @@ public class TestProcessParameterDefinition /* extends AbstractDGTestCase */ {
- serviceReferences.put("org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode", new org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode());
+ serviceReferences.put("org.onap.sdnc.config.params.parser.PropertyDefinitionNode", new org.onap.sdnc.config.params.parser.PropertyDefinitionNode());
@@ -125,7 +125,7 @@ public class TestProcessParameterDefinition /* extends AbstractDGTestCase */ {
- serviceReferences.put("org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode", new org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode());
+ serviceReferences.put("org.onap.sdnc.config.params.parser.PropertyDefinitionNode", new org.onap.sdnc.config.params.parser.PropertyDefinitionNode());
@@ -223,7 +223,7 @@ public class TestProcessParameterDefinition /* extends AbstractDGTestCase */ {
- serviceReferences.put("org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode", new org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode());
+ serviceReferences.put("org.onap.sdnc.config.params.parser.PropertyDefinitionNode", new org.onap.sdnc.config.params.parser.PropertyDefinitionNode());
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java
index 05e7fa5cd..e8733b54e 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java
@@ -72,7 +72,7 @@ public class TestUpdateAaiInfo /* extends AbstractDGTestCase */ {
Map<String, Object> resourceReferences = new HashMap<String, Object>();
- resourceReferences.put("org.openecomp.sdnc.sli.aai.AAIService", new MockAaiResource());
+ resourceReferences.put("org.onap.ccsdk.sli.adaptors.aai.AAIService", new MockAaiResource());
GraphKey graphKey = new GraphKey("APPC", null, "UpdateAaiInfo", null);
DGTestCase tc = new DGTestCase(graphKey);
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogFail.properties
index 2f5d42c94..300010200 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogFail.properties
@@ -23,10 +23,10 @@ input.configfilereference-failure.TARGET-FILE-PATH=FailureFile
input.configfilereference-log.TARGET-FILE-PATH=FailureLogFile
input.vnf-host-ip-address=135.1.1.1
input.fileContents=ERRORLOG
-org.openecomp.sdnc.config.generator.pattern.PatternNode.parseErrorLog.outCome=failure
-org.openecomp.sdnc.config.generator.pattern.PatternNode.parseErrorLog.params.assertEquals.logData=ERRORLOG
+org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.outCome=failure
+org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.params.assertEquals.logData=ERRORLOG
-org.openecomp.sdnc.config.generator.pattern.PatternNode.parseErrorLog.tmp.patternNode.error-message=Unable to parse Error Log
+org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.tmp.patternNode.error-message=Unable to parse Error Log
assertEquals.error-code=401
assertEquals.error-message=Unable to parse Error Log
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogSuccess.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogSuccess.properties
index c40d93f96..ee2d47f11 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogSuccess.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogSuccess.properties
@@ -24,9 +24,9 @@ input.configfilereference-log.TARGET-FILE-PATH=FailureLogFile
input.vnf-host-ip-address=135.1.1.1
input.fileContents=ERRORLOG
-org.openecomp.sdnc.config.generator.pattern.PatternNode.parseErrorLog.outCome=success
-org.openecomp.sdnc.config.generator.pattern.PatternNode.parseErrorLog.tmp.patternNode.parsedError=Download Failure
-org.openecomp.sdnc.config.generator.pattern.PatternNode.parseErrorLog.params.assertEquals.logData=ERRORLOG
+org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.outCome=success
+org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.tmp.patternNode.parsedError=Download Failure
+org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.params.assertEquals.logData=ERRORLOG
assertEquals.error-code=401
assertEquals.error-message=Configuration has failed.Download Failure
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties
index a4d40f257..fd682a90f 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties
@@ -31,7 +31,7 @@ input.device-config=tcfile:///cli_config_content.txt
# SQL Resource Node
#----------------------------
#<get-resource
-# plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource'
+# plugin='org.onap.ccsdk.sli.resource.sql.SqlResource'
# resource='SQL'
# key="SELECT TEMPLATE FROM DOWNLOAD_CONFIG_TEMPLATE WHERE vnf_type = $vnf-type ;"
# force='true'
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Json2DGContextFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Json2DGContextFail.properties
index 915f08d2a..b6dea196b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Json2DGContextFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Json2DGContextFail.properties
@@ -28,8 +28,8 @@ input.input.payload=tcfile://payload_restore_config.json
-org.openecomp.sdnc.config.generator.convert.ConvertNode.convertJson2DGContext.outCome=failure
-org.openecomp.sdnc.config.generator.convert.ConvertNode.convertJson2DGContext.tmp.convertnode.error-message=Conversion to DG Context Failed
+org.onap.sdnc.config.generator.convert.ConvertNode.convertJson2DGContext.outCome=failure
+org.onap.sdnc.config.generator.convert.ConvertNode.convertJson2DGContext.tmp.convertnode.error-message=Conversion to DG Context Failed
assertEquals.error-code=401
assertEquals.error-message=Conversion to DG Context Failed
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetInstarParamsFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetInstarParamsFail.properties
index 0173ed1a0..593a88c68 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetInstarParamsFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetInstarParamsFail.properties
@@ -22,8 +22,8 @@ input.configuration-params=tcfile://request-param.json
org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success
org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-definitions.file-content=tcfile://pd.yaml
-org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode.processExternalSystemParamKeys.outCome=failure
-org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode.processExternalSystemParamKeys.tmp.instarParams.error-message=Unable to get Instar Params
+org.onap.sdnc.config.params.parser.PropertyDefinitionNode.processExternalSystemParamKeys.outCome=failure
+org.onap.sdnc.config.params.parser.PropertyDefinitionNode.processExternalSystemParamKeys.tmp.instarParams.error-message=Unable to get Instar Params
assertEquals.error-code=401
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/MergeParamsFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/MergeParamsFail.properties
index 6318f092c..7428353ce 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/MergeParamsFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/MergeParamsFail.properties
@@ -22,14 +22,14 @@ input.configuration-params=tcfile://request-param.json
org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success
org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-definitions.file-content=tcfile://pd.yaml
-org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode.processExternalSystemParamKeys.outCome=success
+org.onap.sdnc.config.params.parser.PropertyDefinitionNode.processExternalSystemParamKeys.outCome=success
org.onap.appc.instar.node.InstarClientNode.getInstarInfo.outCome=success
-org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode.processExternalSystemParamKeys.outCome=success
-org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode.processExternalSystemParamKeys.INSTAR.keys=["LOCAL_CORE_ALT_IP_ADDR","REMOTE_ACCESS_IP_ADDR"]
-org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode.mergeJsonData.outCome=failure
-org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode.mergeJsonData.tmp.allParams.error-message=Unable to Merge Params
+org.onap.sdnc.config.params.parser.PropertyDefinitionNode.processExternalSystemParamKeys.outCome=success
+org.onap.sdnc.config.params.parser.PropertyDefinitionNode.processExternalSystemParamKeys.INSTAR.keys=["LOCAL_CORE_ALT_IP_ADDR","REMOTE_ACCESS_IP_ADDR"]
+org.onap.sdnc.config.params.parser.PropertyDefinitionNode.mergeJsonData.outCome=failure
+org.onap.sdnc.config.params.parser.PropertyDefinitionNode.mergeJsonData.tmp.allParams.error-message=Unable to Merge Params
assertEquals.error-code=401
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Failure.properties
index e9d563380..da4160121 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Failure.properties
@@ -25,8 +25,8 @@ input.tmp.uploadConfigInfo.FILE-CONTENT=configData
input.tmp.uploadConfigInfo.tmStamp=567890
-org.openecomp.sdnc.config.generator.convert.ConvertNode.convertContextToJson.outCome=failure
-org.openecomp.sdnc.config.generator.convert.ConvertNode.convertContextToJson.tmp.jsonConversion.error-message=Conversion Error
+org.onap.sdnc.config.generator.convert.ConvertNode.convertContextToJson.outCome=failure
+org.onap.sdnc.config.generator.convert.ConvertNode.convertContextToJson.tmp.jsonConversion.error-message=Conversion Error
org.onap.appc.dg.common.JsonDgUtil.generateOutputPayloadFromContext.outCome=success
org.onap.appc.dg.common.JsonDgUtil.generateOutputPayloadFromContext.output.payload={ \\"upload-config-id\\" : [100] }
diff --git a/appc-directed-graph/dg-loader/provider/pom.xml b/appc-directed-graph/dg-loader/provider/pom.xml
index b688eb457..8e124c70b 100644
--- a/appc-directed-graph/dg-loader/provider/pom.xml
+++ b/appc-directed-graph/dg-loader/provider/pom.xml
@@ -95,9 +95,9 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>org.openecomp.sdnc.dg.loader</Bundle-SymbolicName>
- <Bundle-Activator>org.openecomp.sdnc.dg.loader.DGLoaderActivator</Bundle-Activator>
- <Export-Package>org.openecomp.sdnc.dg.loader</Export-Package>
+ <Bundle-SymbolicName>org.onap.sdnc.dg.loader</Bundle-SymbolicName>
+ <Bundle-Activator>org.onap.sdnc.dg.loader.DGLoaderActivator</Bundle-Activator>
+ <Export-Package>org.onap.sdnc.dg.loader</Export-Package>
<Import-Package>*</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
@@ -117,7 +117,7 @@
<finalName>dg-loader</finalName>
<archive>
<manifest>
- <mainClass>org.openecomp.sdnc.dg.loader.DGXMLLoadNActivate</mainClass>
+ <mainClass>org.onap.sdnc.dg.loader.DGXMLLoadNActivate</mainClass>
</manifest>
</archive>
<attach>false</attach>
diff --git a/appc-directed-graph/dg-loader/provider/src/test/resources/dummy.properties b/appc-directed-graph/dg-loader/provider/src/test/resources/dummy.properties
index 4545f89af..51de13b5f 100644
--- a/appc-directed-graph/dg-loader/provider/src/test/resources/dummy.properties
+++ b/appc-directed-graph/dg-loader/provider/src/test/resources/dummy.properties
@@ -22,17 +22,17 @@
# ============LICENSE_END=========================================================
###
-org.openecomp.sdnc.sli.dbtype=jdbc
+org.onap.ccsdk.sli.dbtype=jdbc
-org.openecomp.sdnc.sli.jdbc.hosts=
-org.openecomp.sdnc.sli.jdbc.url=
-org.openecomp.sdnc.sli.jdbc.database=
-org.openecomp.sdnc.sli.jdbc.user=
-org.openecomp.sdnc.sli.jdbc.password=
-org.openecomp.sdnc.sli.jdbc.connection.name=
+org.onap.ccsdk.sli.adaptors.jdbc.hosts=
+org.onap.ccsdk.sli.adaptors.jdbc.url=
+org.onap.ccsdk.sli.adaptors.jdbc.database=
+org.onap.ccsdk.sli.adaptors.jdbc.user=
+org.onap.ccsdk.sli.adaptors.jdbc.password=
+org.onap.ccsdk.sli.adaptors.jdbc.connection.name=
-org.openecomp.sdnc.sli.jdbc.connection.timeout=50
-org.openecomp.sdnc.sli.jdbc.request.timeout=100
-org.openecomp.sdnc.sli.jdbc.limit.init=10
-org.openecomp.sdnc.sli.jdbc.limit.min=10
-org.openecomp.sdnc.sli.jdbc.limit.max=20
+org.onap.ccsdk.sli.adaptors.jdbc.connection.timeout=50
+org.onap.ccsdk.sli.adaptors.jdbc.request.timeout=100
+org.onap.ccsdk.sli.adaptors.jdbc.limit.init=10
+org.onap.ccsdk.sli.adaptors.jdbc.limit.min=10
+org.onap.ccsdk.sli.adaptors.jdbc.limit.max=20
diff --git a/appc-directed-graph/pom.xml b/appc-directed-graph/pom.xml
index 2af2a9c3f..567e6e880 100644
--- a/appc-directed-graph/pom.xml
+++ b/appc-directed-graph/pom.xml
@@ -53,7 +53,7 @@
<dependencies>
<dependency>
- <groupId>org.openecomp.sdnc.adaptors</groupId>
+ <groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>sql-resource-provider</artifactId>
<version>${ccsdk.sli.adaptors.version}</version>
</dependency>
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/onap/appc/executor/impl/LCMCommandTask.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/onap/appc/executor/impl/LCMCommandTask.java
index 999957fc8..13642ba36 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/onap/appc/executor/impl/LCMCommandTask.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/onap/appc/executor/impl/LCMCommandTask.java
@@ -85,7 +85,7 @@ public class LCMCommandTask extends CommandTask {
} else {
logger.info("AAIService error from bundlecontext");
- logger.warn("Cannot find service reference for org.openecomp.sdnc.sli.aai.AAIService");
+ logger.warn("Cannot find service reference for org.onap.ccsdk.sli.adaptors.aai.AAIService");
aaiService = null;
}
}
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/resources/org/onap/appc/default.properties b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/resources/org/onap/appc/default.properties
index 45b762c05..671d8b0b2 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/resources/org/onap/appc/default.properties
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/resources/org/onap/appc/default.properties
@@ -31,12 +31,12 @@ org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
#
# Certificate keystore and truststore
#
-#org.openecomp.sdnc.sli.aai.ssl.trust=<jks_FILE_HERE>
-#org.openecomp.sdnc.sli.aai.ssl.trust.psswd=adminadmin
-#org.openecomp.sdnc.sli.aai.ssl.key=<p12_FILE_HERE>
-#org.openecomp.sdnc.sli.aai.ssl.key.psswd=adminadmin
-org.openecomp.sdnc.sli.aai.host.certificate.ignore=true
-org.openecomp.sdnc.sli.aai.certificate.trust.all=true
+#org.onap.ccsdk.sli.adaptors.aai.ssl.trust=<jks_FILE_HERE>
+#org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=adminadmin
+#org.onap.ccsdk.sli.adaptors.aai.ssl.key=<p12_FILE_HERE>
+#org.onap.ccsdk.sli.adaptors.aai.ssl.key.psswd=adminadmin
+org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true
+org.onap.ccsdk.sli.adaptors.aai.certificate.trust.all=true
#
@@ -44,33 +44,33 @@ org.openecomp.sdnc.sli.aai.certificate.trust.all=true
#
# OPEN SOURCE - EXTERNAL A&AI INSTANCE IN TEST ENVIRONMENT
-org.openecomp.sdnc.sli.aai.uri=https://10.0.1.1:8443
+org.onap.ccsdk.sli.adaptors.aai.uri=https://10.0.1.1:8443
-org.openecomp.sdnc.sli.aai.path.query=/aai/v8/search/sdn-zone-query
+org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v8/search/sdn-zone-query
# service instance
-org.openecomp.sdnc.sli.aai.path.svcinst=/aai/v8/business/customers/customer/{customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances
-org.openecomp.sdnc.sli.aai.path.svcinst.query=/aai/v8/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance
+org.onap.ccsdk.sli.adaptors.aai.path.svcinst=/aai/v8/business/customers/customer/{customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances
+org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v8/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance
# complex
-org.openecomp.sdnc.sli.aai.path.complexes=/aai/v8/cloud-infrastructure/complexes
-org.openecomp.sdnc.sli.aai.path.complex=/aai/v8/cloud-infrastructure/complexes/complex/{physical-location-id}
+org.onap.ccsdk.sli.adaptors.aai.path.complexes=/aai/v8/cloud-infrastructure/complexes
+org.onap.ccsdk.sli.adaptors.aai.path.complex=/aai/v8/cloud-infrastructure/complexes/complex/{physical-location-id}
# vservers
-org.openecomp.sdnc.sli.aai.path.vservers=/aai/v8/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers
-org.openecomp.sdnc.sli.aai.path.vserver =/aai/v8/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}
+org.onap.ccsdk.sli.adaptors.aai.path.vservers=/aai/v8/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers
+org.onap.ccsdk.sli.adaptors.aai.path.vserver =/aai/v8/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}
# generic-vnf
-org.openecomp.sdnc.sli.aai.path.generic.vnfs=/aai/v8/network/generic-vnfs/generic-vnf/
-org.openecomp.sdnc.sli.aai.path.generic.vnf=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}
+org.onap.ccsdk.sli.adaptors.aai.path.generic.vnfs=/aai/v8/network/generic-vnfs/generic-vnf/
+org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}
#
# Formatting
#
-org.openecomp.sdnc.sli.aai.param.format=filter=%s:%s
-org.openecomp.sdnc.sli.aai.param.vnf_type=vnf-type
-org.openecomp.sdnc.sli.aai.param.physical.location.id=physical-location-id
-org.openecomp.sdnc.sli.aai.param.service.type=service-type
+org.onap.ccsdk.sli.adaptors.aai.param.format=filter=%s:%s
+org.onap.ccsdk.sli.adaptors.aai.param.vnf_type=vnf-type
+org.onap.ccsdk.sli.adaptors.aai.param.physical.location.id=physical-location-id
+org.onap.ccsdk.sli.adaptors.aai.param.service.type=service-type
org.onap.appc.logging.path=${user.home},etc,../etc,.
org.onap.appc.logging.file=logback.xml
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/AbstractRequestValidatorImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/AbstractRequestValidatorImpl.java
index 4f4942b8a..5b9e48615 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/AbstractRequestValidatorImpl.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/AbstractRequestValidatorImpl.java
@@ -127,7 +127,7 @@ public abstract class AbstractRequestValidatorImpl implements RequestValidator {
} else {
logger.info("AAIService error from bundlecontext");
- logger.warn("Cannot find service reference for org.openecomp.sdnc.sli.aai.AAIService");
+ logger.warn("Cannot find service reference for org.onap.ccsdk.sli.adaptors.aai.AAIService");
}
}
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/onap/appc/default.properties b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/onap/appc/default.properties
index e42d7ef74..6d17c3f2b 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/onap/appc/default.properties
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/onap/appc/default.properties
@@ -30,45 +30,45 @@ org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
#
# Certificate keystore and truststore
#
-#org.openecomp.sdnc.sli.aai.ssl.trust=<jks_FILE_HERE>
-#org.openecomp.sdnc.sli.aai.ssl.trust.psswd=adminadmin
-#org.openecomp.sdnc.sli.aai.ssl.key=<p12_FILE_HERE>
-#org.openecomp.sdnc.sli.aai.ssl.key.psswd=adminadmin
-org.openecomp.sdnc.sli.aai.host.certificate.ignore=true
-org.openecomp.sdnc.sli.aai.certificate.trust.all=true
+#org.onap.ccsdk.sli.adaptors.aai.ssl.trust=<jks_FILE_HERE>
+#org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=adminadmin
+#org.onap.ccsdk.sli.adaptors.aai.ssl.key=<p12_FILE_HERE>
+#org.onap.ccsdk.sli.adaptors.aai.ssl.key.psswd=adminadmin
+org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true
+org.onap.ccsdk.sli.adaptors.aai.certificate.trust.all=true
#
# Configuration file for A&AI Adapter
#
# OPEN SOURCE - EXTERNAL A&AI INSTANCE IN TEST ENVIRONMENT
-org.openecomp.sdnc.sli.aai.uri=https://10.0.1.1:8443
+org.onap.ccsdk.sli.adaptors.aai.uri=https://10.0.1.1:8443
-org.openecomp.sdnc.sli.aai.path.query=/aai/v8/search/sdn-zone-query
+org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v8/search/sdn-zone-query
# service instance
-org.openecomp.sdnc.sli.aai.path.svcinst=/aai/v8/business/customers/customer/{customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances
-org.openecomp.sdnc.sli.aai.path.svcinst.query=/aai/v8/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance
+org.onap.ccsdk.sli.adaptors.aai.path.svcinst=/aai/v8/business/customers/customer/{customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances
+org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v8/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance
# complex
-org.openecomp.sdnc.sli.aai.path.complexes=/aai/v8/cloud-infrastructure/complexes
-org.openecomp.sdnc.sli.aai.path.complex=/aai/v8/cloud-infrastructure/complexes/complex/{physical-location-id}
+org.onap.ccsdk.sli.adaptors.aai.path.complexes=/aai/v8/cloud-infrastructure/complexes
+org.onap.ccsdk.sli.adaptors.aai.path.complex=/aai/v8/cloud-infrastructure/complexes/complex/{physical-location-id}
# vservers
-org.openecomp.sdnc.sli.aai.path.vservers=/aai/v8/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers
-org.openecomp.sdnc.sli.aai.path.vserver =/aai/v8/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}
+org.onap.ccsdk.sli.adaptors.aai.path.vservers=/aai/v8/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers
+org.onap.ccsdk.sli.adaptors.aai.path.vserver =/aai/v8/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}
# generic-vnf
-org.openecomp.sdnc.sli.aai.path.generic.vnfs=/aai/v8/network/generic-vnfs/generic-vnf/
-org.openecomp.sdnc.sli.aai.path.generic.vnf=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}
+org.onap.ccsdk.sli.adaptors.aai.path.generic.vnfs=/aai/v8/network/generic-vnfs/generic-vnf/
+org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}
#
# Formatting
#
-org.openecomp.sdnc.sli.aai.param.format=filter=%s:%s
-org.openecomp.sdnc.sli.aai.param.vnf_type=vnf-type
-org.openecomp.sdnc.sli.aai.param.physical.location.id=physical-location-id
-org.openecomp.sdnc.sli.aai.param.service.type=service-type
+org.onap.ccsdk.sli.adaptors.aai.param.format=filter=%s:%s
+org.onap.ccsdk.sli.adaptors.aai.param.vnf_type=vnf-type
+org.onap.ccsdk.sli.adaptors.aai.param.physical.location.id=physical-location-id
+org.onap.ccsdk.sli.adaptors.aai.param.service.type=service-type
org.onap.appc.logging.path=${user.home},etc,../etc,.
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/onap/appc/default.properties b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/onap/appc/default.properties
index 9848f618f..e48b7b66a 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/onap/appc/default.properties
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/onap/appc/default.properties
@@ -31,45 +31,45 @@ org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
#
# Certificate keystore and truststore
#
-#org.openecomp.sdnc.sli.aai.ssl.trust=<jks_FILE_HERE>
-#org.openecomp.sdnc.sli.aai.ssl.trust.psswd=adminadmin
-#org.openecomp.sdnc.sli.aai.ssl.key=<p12_FILE_HERE>
-#org.openecomp.sdnc.sli.aai.ssl.key.psswd=adminadmin
-org.openecomp.sdnc.sli.aai.host.certificate.ignore=true
-org.openecomp.sdnc.sli.aai.certificate.trust.all=true
+#org.onap.ccsdk.sli.adaptors.aai.ssl.trust=<jks_FILE_HERE>
+#org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=adminadmin
+#org.onap.ccsdk.sli.adaptors.aai.ssl.key=<p12_FILE_HERE>
+#org.onap.ccsdk.sli.adaptors.aai.ssl.key.psswd=adminadmin
+org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true
+org.onap.ccsdk.sli.adaptors.aai.certificate.trust.all=true
#
# Configuration file for A&AI Adapter
#
# OPEN SOURCE - EXTERNAL A&AI INSTANCE IN TEST ENVIRONMENT
-org.openecomp.sdnc.sli.aai.uri=https://10.0.1.1:8443
+org.onap.ccsdk.sli.adaptors.aai.uri=https://10.0.1.1:8443
-org.openecomp.sdnc.sli.aai.path.query=/aai/v8/search/sdn-zone-query
+org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v8/search/sdn-zone-query
# service instance
-org.openecomp.sdnc.sli.aai.path.svcinst=/aai/v8/business/customers/customer/{customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances
-org.openecomp.sdnc.sli.aai.path.svcinst.query=/aai/v8/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance
+org.onap.ccsdk.sli.adaptors.aai.path.svcinst=/aai/v8/business/customers/customer/{customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances
+org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v8/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance
# complex
-org.openecomp.sdnc.sli.aai.path.complexes=/aai/v8/cloud-infrastructure/complexes
-org.openecomp.sdnc.sli.aai.path.complex=/aai/v8/cloud-infrastructure/complexes/complex/{physical-location-id}
+org.onap.ccsdk.sli.adaptors.aai.path.complexes=/aai/v8/cloud-infrastructure/complexes
+org.onap.ccsdk.sli.adaptors.aai.path.complex=/aai/v8/cloud-infrastructure/complexes/complex/{physical-location-id}
# vservers
-org.openecomp.sdnc.sli.aai.path.vservers=/aai/v8/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers
-org.openecomp.sdnc.sli.aai.path.vserver =/aai/v8/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}
+org.onap.ccsdk.sli.adaptors.aai.path.vservers=/aai/v8/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers
+org.onap.ccsdk.sli.adaptors.aai.path.vserver =/aai/v8/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}
# generic-vnf
-org.openecomp.sdnc.sli.aai.path.generic.vnfs=/aai/v8/network/generic-vnfs/generic-vnf/
-org.openecomp.sdnc.sli.aai.path.generic.vnf=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}
+org.onap.ccsdk.sli.adaptors.aai.path.generic.vnfs=/aai/v8/network/generic-vnfs/generic-vnf/
+org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}
#
# Formatting
#
-org.openecomp.sdnc.sli.aai.param.format=filter=%s:%s
-org.openecomp.sdnc.sli.aai.param.vnf_type=vnf-type
-org.openecomp.sdnc.sli.aai.param.physical.location.id=physical-location-id
-org.openecomp.sdnc.sli.aai.param.service.type=service-type
+org.onap.ccsdk.sli.adaptors.aai.param.format=filter=%s:%s
+org.onap.ccsdk.sli.adaptors.aai.param.vnf_type=vnf-type
+org.onap.ccsdk.sli.adaptors.aai.param.physical.location.id=physical-location-id
+org.onap.ccsdk.sli.adaptors.aai.param.service.type=service-type
org.onap.appc.logging.path=${user.home},etc,../etc,.
diff --git a/appc-inbound/appc-artifact-handler/provider/src/test/resources/svclogic.properties b/appc-inbound/appc-artifact-handler/provider/src/test/resources/svclogic.properties
index ae595f73b..538aae4e0 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/test/resources/svclogic.properties
+++ b/appc-inbound/appc-artifact-handler/provider/src/test/resources/svclogic.properties
@@ -22,16 +22,16 @@
# ============LICENSE_END=========================================================
###
-org.openecomp.sdnc.sli.dbtype=
-org.openecomp.sdnc.sli.jdbc.hosts=
-org.openecomp.sdnc.sli.jdbc.url=
-org.openecomp.sdnc.sli.jdbc.database=
-org.openecomp.sdnc.sli.jdbc.user=
-org.openecomp.sdnc.sli.jdbc.password=
-org.openecomp.sdnc.sli.jdbc.connection.name=
+org.onap.ccsdk.sli.dbtype=
+org.onap.ccsdk.sli.adaptors.jdbc.hosts=
+org.onap.ccsdk.sli.adaptors.jdbc.url=
+org.onap.ccsdk.sli.adaptors.jdbc.database=
+org.onap.ccsdk.sli.adaptors.jdbc.user=
+org.onap.ccsdk.sli.adaptors.jdbc.password=
+org.onap.ccsdk.sli.adaptors.jdbc.connection.name=
-org.openecomp.sdnc.sli.jdbc.connection.timeout=
-org.openecomp.sdnc.sli.jdbc.request.timeout=
-org.openecomp.sdnc.sli.jdbc.limit.init=
-org.openecomp.sdnc.sli.jdbc.limit.min=
-org.openecomp.sdnc.sli.jdbc.limit.max=
+org.onap.ccsdk.sli.adaptors.jdbc.connection.timeout=
+org.onap.ccsdk.sli.adaptors.jdbc.request.timeout=
+org.onap.ccsdk.sli.adaptors.jdbc.limit.init=
+org.onap.ccsdk.sli.adaptors.jdbc.limit.min=
+org.onap.ccsdk.sli.adaptors.jdbc.limit.max=
diff --git a/appc-inbound/appc-design-services/provider/src/test/resources/svclogic.properties b/appc-inbound/appc-design-services/provider/src/test/resources/svclogic.properties
index ae595f73b..538aae4e0 100644
--- a/appc-inbound/appc-design-services/provider/src/test/resources/svclogic.properties
+++ b/appc-inbound/appc-design-services/provider/src/test/resources/svclogic.properties
@@ -22,16 +22,16 @@
# ============LICENSE_END=========================================================
###
-org.openecomp.sdnc.sli.dbtype=
-org.openecomp.sdnc.sli.jdbc.hosts=
-org.openecomp.sdnc.sli.jdbc.url=
-org.openecomp.sdnc.sli.jdbc.database=
-org.openecomp.sdnc.sli.jdbc.user=
-org.openecomp.sdnc.sli.jdbc.password=
-org.openecomp.sdnc.sli.jdbc.connection.name=
+org.onap.ccsdk.sli.dbtype=
+org.onap.ccsdk.sli.adaptors.jdbc.hosts=
+org.onap.ccsdk.sli.adaptors.jdbc.url=
+org.onap.ccsdk.sli.adaptors.jdbc.database=
+org.onap.ccsdk.sli.adaptors.jdbc.user=
+org.onap.ccsdk.sli.adaptors.jdbc.password=
+org.onap.ccsdk.sli.adaptors.jdbc.connection.name=
-org.openecomp.sdnc.sli.jdbc.connection.timeout=
-org.openecomp.sdnc.sli.jdbc.request.timeout=
-org.openecomp.sdnc.sli.jdbc.limit.init=
-org.openecomp.sdnc.sli.jdbc.limit.min=
-org.openecomp.sdnc.sli.jdbc.limit.max=
+org.onap.ccsdk.sli.adaptors.jdbc.connection.timeout=
+org.onap.ccsdk.sli.adaptors.jdbc.request.timeout=
+org.onap.ccsdk.sli.adaptors.jdbc.limit.init=
+org.onap.ccsdk.sli.adaptors.jdbc.limit.min=
+org.onap.ccsdk.sli.adaptors.jdbc.limit.max=
diff --git a/appc-oam/appc-oam-bundle/src/main/resources/org/onap/appc/default.properties b/appc-oam/appc-oam-bundle/src/main/resources/org/onap/appc/default.properties
index e7091b191..1913038e3 100644
--- a/appc-oam/appc-oam-bundle/src/main/resources/org/onap/appc/default.properties
+++ b/appc-oam/appc-oam-bundle/src/main/resources/org/onap/appc/default.properties
@@ -68,10 +68,10 @@ appc.OAM.AppcBundlesToStop=.*appc.*\
,domain-model-lib\
,execution-queue-management-lib\
,lock-manager-impl\
-,org.openecomp.sdnc.config.params\
-,org.openecomp.sdnc.config.audit\
-,org.openecomp.sdnc.config.generator\
-,org.openecomp.sdnc.dg.loader\
+,org.onap.sdnc.config.params\
+,org.onap.sdnc.config.audit\
+,org.onap.sdnc.config.generator\
+,org.onap.sdnc.dg.loader\
,transaction-recorder
appc.OAM.OtherBundlesToStop=.*app-cntrl.*\
diff --git a/appc-outbound/appc-aai-client/provider/pom.xml b/appc-outbound/appc-aai-client/provider/pom.xml
index 3484e4b79..18b4840f3 100755
--- a/appc-outbound/appc-aai-client/provider/pom.xml
+++ b/appc-outbound/appc-aai-client/provider/pom.xml
@@ -29,7 +29,6 @@
<dependency>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>aai-service-provider</artifactId>
- <version>${ccsdk.sli.plugins.version}</version>
<scope>compile</scope>
</dependency>
diff --git a/appc-outbound/pom.xml b/appc-outbound/pom.xml
index 835684933..13dee4889 100755
--- a/appc-outbound/pom.xml
+++ b/appc-outbound/pom.xml
@@ -12,20 +12,20 @@
<description>Application Controller Outbound</description>
<properties>
- <sdnc.aai.version>1.1.2</sdnc.aai.version>
+ <sdnc.aai.version>${ccsdk.sli.adaptors.version}</sdnc.aai.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.openecomp.sdnc.adaptors</groupId>
+ <groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>sql-resource-provider</artifactId>
<version>${ccsdk.sli.adaptors.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.sdnc.adaptors</groupId>
+ <groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>aai-service-provider</artifactId>
<version>${sdnc.aai.version}</version>
</dependency>