First part of onap rename

This is the first commit of the rename. This commit changes
refereces to org.openecomp.appc > org.onap.appc that occur within
files. The package folder structure is not changed in this commit.

Change-Id: Ic95d749eb99d8a6f4f2b9ee9b06eb41c5cfa7e1c
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-13

1457 files changed, 5540 insertions, 5540 deletions

diff --git a/README.md b/README.md
index 6dc797485..d409e1575 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ APPC (structured as a Maven project) uses the Maven tool to help compile, build,
 In order to deploy APPC, a Docker-ready machine needs to be available in order to deploy the APPC Docker Containers. The following will help explain the requirements in order to run Docker to deploy these containers.
 
 ### APPC Docker Containers
-ONAP APPC docker images are currently stored on the Rackspace Nexus Docker Registry (Maven Repository). The deployment code can be found in the Maven Project that builds and deploys the Docker Images to be deployed in the Nexus Repository (current approach is by using Jenkins). These Docker Images are composed of the APPC Artifacts (org.openecomp.appc.*) compiled and packaged in the "appc" git repository.
+ONAP APPC docker images are currently stored on the Rackspace Nexus Docker Registry (Maven Repository). The deployment code can be found in the Maven Project that builds and deploys the Docker Images to be deployed in the Nexus Repository (current approach is by using Jenkins). These Docker Images are composed of the APPC Artifacts (org.onap.appc.*) compiled and packaged in the "appc" git repository.
 
 The following Docker images are the actual deployment images used for running APPC:
 - **APPC Container**: This Docker container carries the APPC Core Framework (OpenDaylight, Karaf, OSGI Bundles, ODL Functions/APIs, and APPC specific features). This image is built on top of the SDN-C Docker Image, which contains core features (such as dblib as the Database Connector, SLI - the Service Logic Interpreter, and the Active & Available Inventory (A&AI) Listener). Some of these inherited SDN-C features/artifacts are necessary dependencies to build and compile APPC features/artifacts.
@@ -169,7 +169,7 @@ In order to access this GUI, you need to go to the following website which will
 
 # APPC Configuration Model
 
-APPC Configuration model involves using "default.properties" files (which are usually located in each of the APPC Features - ../<APPC_FEATURE_BUNDLE>/src/<MAIN_OR_TEST>/resources/org/openecomp/appc/default.properties) for APPC Feature that have default (or null) property values inside the core APPC code. These default (or null) properties should be overwritten in the properties file called "appc.properties" located in the APPC Deployment code (../installation/src/main/appc-properties/appc.properties).
+APPC Configuration model involves using "default.properties" files (which are usually located in each of the APPC Features - ../<APPC_FEATURE_BUNDLE>/src/<MAIN_OR_TEST>/resources/org/onap/appc/default.properties) for APPC Feature that have default (or null) property values inside the core APPC code. These default (or null) properties should be overwritten in the properties file called "appc.properties" located in the APPC Deployment code (../installation/src/main/appc-properties/appc.properties).
 
 Each APPC component depends on the property values that are defined for them in order to function properly. For example, the APPC Feature "appc-rest-adapter" located in the APPC Core repo is used to listen to events that are being sent and received in the form of DMaaP Messages through a DMaaP Server Instance (which is usually defined as a RESTful API Layer over the Apache Kafka Framework). The properties for this feature need to be defined to point to the right DMaaP set of events to make sure that we are sending and receiving the proper messages on DMaaP.
 
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml
index 4e2577135..ef7896ae0 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml
@@ -25,7 +25,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-ansible-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -54,7 +54,7 @@
 
 		<!-- http://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -195,8 +195,8 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>appc-ansible-adapter</Bundle-SymbolicName>
-						<Bundle-Activator>org.openecomp.appc.adapter.ansible.AnsibleActivator</Bundle-Activator>
-						<Export-Package>org.openecomp.appc.adapter.ansible</Export-Package>
+						<Bundle-Activator>org.onap.appc.adapter.ansible.AnsibleActivator</Bundle-Activator>
+						<Export-Package>org.onap.appc.adapter.ansible</Export-Package>
 						<Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*, javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*, javax.security.*</Import-Package>
 						<Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleActivator.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleActivator.java
index 865841db2..d76cd50f1 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleActivator.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleActivator.java
@@ -22,17 +22,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ansible;
+package org.onap.appc.adapter.ansible;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.ansible.impl.AnsibleAdapterImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.ansible.impl.AnsibleAdapterImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.i18n.Msg;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleAdapter.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleAdapter.java
index da710f34f..7bff184bc 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleAdapter.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleAdapter.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ansible;
+package org.onap.appc.adapter.ansible;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/AnsibleAdapterImpl.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/AnsibleAdapterImpl.java
index 434fbe673..0b426bb26 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/AnsibleAdapterImpl.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/AnsibleAdapterImpl.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ansible.impl;
+package org.onap.appc.adapter.ansible.impl;
 
 import java.util.Map;
 import java.util.Properties;
 import java.lang.*;
     
 
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
 
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
@@ -44,12 +44,12 @@ import org.json.JSONException;
 
 
 
-import org.openecomp.appc.adapter.ansible.AnsibleAdapter;
+import org.onap.appc.adapter.ansible.AnsibleAdapter;
 
-import org.openecomp.appc.adapter.ansible.model.AnsibleResult;
-import org.openecomp.appc.adapter.ansible.model.AnsibleMessageParser;
-import org.openecomp.appc.adapter.ansible.model.AnsibleResultCodes;
-import org.openecomp.appc.adapter.ansible.model.AnsibleServerEmulator;
+import org.onap.appc.adapter.ansible.model.AnsibleResult;
+import org.onap.appc.adapter.ansible.model.AnsibleMessageParser;
+import org.onap.appc.adapter.ansible.model.AnsibleResultCodes;
+import org.onap.appc.adapter.ansible.model.AnsibleServerEmulator;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -166,7 +166,7 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
      * Returns the symbolic name of the adapter
      * 
      * @return The adapter name
-     * @see org.openecomp.appc.adapter.rest.AnsibleAdapter#getAdapterName()
+     * @see org.onap.appc.adapter.rest.AnsibleAdapter#getAdapterName()
      */
     @Override
     public String getAdapterName() {
@@ -184,8 +184,8 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
     private void doFailure(SvcLogicContext svcLogic,  int code, String message)  throws SvcLogicException {
 
 	svcLogic.setStatus(OUTCOME_FAILURE);
-	svcLogic.setAttribute("org.openecomp.appc.adapter.ansible.result.code",Integer.toString(code));
-	svcLogic.setAttribute("org.openecomp.appc.adapter.ansible.message",message);
+	svcLogic.setAttribute("org.onap.appc.adapter.ansible.result.code",Integer.toString(code));
+	svcLogic.setAttribute("org.onap.appc.adapter.ansible.message",message);
 	
 	throw new SvcLogicException("Ansible Adapter Error = " + message );
     }
@@ -204,7 +204,7 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
 
         // Create the http client instance
         // type of client is extracted from the property file parameter
-        // org.openecomp.appc.adapter.ansible.clientType
+        // org.onap.appc.adapter.ansible.clientType
         // It can be :
         //     1. TRUST_ALL  (trust all SSL certs). To be used ONLY in dev
         //     2. TRUST_CERT (trust only those whose certificates have been stored in the trustStore file)
@@ -212,7 +212,7 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
         //     revert. To be used in PROD
 
         try{
-            String clientType = props.getProperty("org.openecomp.appc.adapter.ansible.clientType");
+            String clientType = props.getProperty("org.onap.appc.adapter.ansible.clientType");
 	    logger.info("Ansible http client type set to " + clientType);
 
             if (clientType.equals("TRUST_ALL")){
@@ -221,8 +221,8 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
             }
             else if (clientType.equals("TRUST_CERT")){
                 // set path to keystore file
-                String trustStoreFile = props.getProperty("org.openecomp.appc.adapter.ansible.trustStore");
-                String key  = props.getProperty("org.openecomp.appc.adapter.ansible.trustStore.trustPasswd");
+                String trustStoreFile = props.getProperty("org.onap.appc.adapter.ansible.trustStore");
+                String key  = props.getProperty("org.onap.appc.adapter.ansible.trustStore.trustPasswd");
                 char [] trustStorePasswd = key.toCharArray();
                 String trustStoreType = "JKS";
                 logger.info("Creating http client with trustmanager from " + trustStoreFile);
@@ -251,9 +251,9 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
 
     // Public Method to post request to execute playbook. Posts the following back
     // to Svc context memory
-    //  org.openecomp.appc.adapter.ansible.req.code : 100 if successful
-    //  org.openecomp.appc.adapter.ansible.req.messge : any message
-    //  org.openecomp.appc.adapter.ansible.req.Id : a unique uuid to reference the request
+    //  org.onap.appc.adapter.ansible.req.code : 100 if successful
+    //  org.onap.appc.adapter.ansible.req.messge : any message
+    //  org.onap.appc.adapter.ansible.req.Id : a unique uuid to reference the request
 
     public void reqExec(Map <String, String> params, SvcLogicContext ctx) throws SvcLogicException {
 
@@ -329,9 +329,9 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
 	}
 
 
-	ctx.setAttribute("org.openecomp.appc.adapter.ansible.result.code", Integer.toString(code));
-	ctx.setAttribute("org.openecomp.appc.adapter.ansible.message", message );
-	ctx.setAttribute("org.openecomp.appc.adapter.ansible.Id", Id);
+	ctx.setAttribute("org.onap.appc.adapter.ansible.result.code", Integer.toString(code));
+	ctx.setAttribute("org.onap.appc.adapter.ansible.message", message );
+	ctx.setAttribute("org.onap.appc.adapter.ansible.Id", Id);
 	
     }
 
@@ -394,15 +394,15 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
 	}
 	else {
 	    logger.info(String.format("Ansible Request  %s finished with Result %s, Message = %s", params.get("Id"), OUTCOME_FAILURE, message));
-	    ctx.setAttribute("org.openecomp.appc.adapter.ansible.results", results);
+	    ctx.setAttribute("org.onap.appc.adapter.ansible.results", results);
 	    doFailure(ctx, code, message );
 	    return;	    
 	}
 	
       
-	ctx.setAttribute("org.openecomp.appc.adapter.ansible.result.code", Integer.toString(400));
-	ctx.setAttribute("org.openecomp.appc.adapter.ansible.message",message);
-	ctx.setAttribute("org.openecomp.appc.adapter.ansible.results", results);
+	ctx.setAttribute("org.onap.appc.adapter.ansible.result.code", Integer.toString(400));
+	ctx.setAttribute("org.onap.appc.adapter.ansible.message",message);
+	ctx.setAttribute("org.onap.appc.adapter.ansible.results", results);
 	ctx.setStatus(OUTCOME_SUCCESS);
     }
     
@@ -410,7 +410,7 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
     // Public method to get logs  from plyabook execution for a  specifcic request
     // It blocks till the Ansible Server responds or the session times out
     // very similar to reqExecResult
-    // logs are returned in the DG context variable org.openecomp.appc.adapter.ansible.log
+    // logs are returned in the DG context variable org.onap.appc.adapter.ansible.log
     
     public void reqExecLog(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException{
 
@@ -442,7 +442,7 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
 	    doFailure(ctx, AnsibleResultCodes.UNKNOWN_EXCEPTION.getValue(), "Exception encountered retreiving output : " + e.getMessage());
 	}
 	
-	ctx.setAttribute("org.openecomp.appc.adapter.ansible.log",message);
+	ctx.setAttribute("org.onap.appc.adapter.ansible.log",message);
 	ctx.setStatus(OUTCOME_SUCCESS);
     }
     
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/ConnectionBuilder.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/ConnectionBuilder.java
index b3d1d4c02..e84a85a0c 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/ConnectionBuilder.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/ConnectionBuilder.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ansible.impl;
+package org.onap.appc.adapter.ansible.impl;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -56,9 +56,9 @@ import org.apache.http.conn.ssl.SSLContexts;
 import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
 
 
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.adapter.ansible.model.AnsibleResult;
-import org.openecomp.appc.adapter.ansible.model.AnsibleResultCodes;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.adapter.ansible.model.AnsibleResult;
+import org.onap.appc.adapter.ansible.model.AnsibleResultCodes;
 
 
 /** 
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleMessageParser.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleMessageParser.java
index a1798e164..6bebd73fe 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleMessageParser.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleMessageParser.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ansible.model;
+package org.onap.appc.adapter.ansible.model;
 
 /**
  * This module imples the APP-C/Ansible Server interface
@@ -36,8 +36,8 @@ import com.google.common.base.Strings;
 import org.json.JSONObject;
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.adapter.ansible.model.AnsibleResult;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.adapter.ansible.model.AnsibleResult;
 
 
 /**
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResult.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResult.java
index 29228e574..a4bbcbef8 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResult.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResult.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ansible.model;
+package org.onap.appc.adapter.ansible.model;
 
 
 /* Simple class to store code and message returned by POST/GET to an Ansible Server */
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResultCodes.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResultCodes.java
index dbcdb75ee..986ad3e6a 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResultCodes.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResultCodes.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ansible.model;
+package org.onap.appc.adapter.ansible.model;
 
 
 import java.util.*;
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleServerEmulator.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleServerEmulator.java
index aabced364..c430743ad 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleServerEmulator.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleServerEmulator.java
@@ -30,7 +30,7 @@
    as a replacement for methods from ConnectionBuilder class
 */
 
-package org.openecomp.appc.adapter.ansible.model;
+package org.onap.appc.adapter.ansible.model;
 
 import java.util.*;
 import java.util.regex.Pattern;
@@ -40,8 +40,8 @@ import com.google.common.base.Strings;
 import org.json.JSONObject;
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.adapter.ansible.model.AnsibleResult;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.adapter.ansible.model.AnsibleResult;
 
 public class AnsibleServerEmulator {
 
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
index 0736b963a..d49c0396c 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -29,20 +29,20 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=${user.home},/opt/opendaylight/current/properties
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=${user.home},/opt/opendaylight/current/properties
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org.openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org.onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_ansible_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_ansible_adapter
 
 
 # Default truststore path and password
-org.openecomp.appc.adapter.ansible.trustStore=/opt/opendaylight/tls-client/mykeystore.js
-org.openecomp.appc.adapter.ansible.trustStore.trustPasswd=changeit
-org.openecomp.appc.adapter.ansible.clientType=DEFAULT
+org.onap.appc.adapter.ansible.trustStore=/opt/opendaylight/tls-client/mykeystore.js
+org.onap.appc.adapter.ansible.trustStore.trustPasswd=changeit
+org.onap.appc.adapter.ansible.clientType=DEFAULT
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java
index a4e49643a..88425700e 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ansible.impl;
+package org.onap.appc.adapter.ansible.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -42,15 +42,15 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.slf4j.MDC;
 
-import org.openecomp.appc.adapter.ansible.AnsibleAdapter;
-import org.openecomp.appc.adapter.ansible.impl.AnsibleAdapterImpl;
+import org.onap.appc.adapter.ansible.AnsibleAdapter;
+import org.onap.appc.adapter.ansible.impl.AnsibleAdapterImpl;
 
 public class TestAnsibleAdapterImpl {
 
@@ -85,14 +85,14 @@ public class TestAnsibleAdapterImpl {
             try{
 		String Pending = "100";
 		adapter.reqExec(params, svcContext);
-		String status=svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.code");
-		TestId=svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.Id");
+		String status=svcContext.getAttribute("org.onap.appc.adapter.ansible.result.code");
+		TestId=svcContext.getAttribute("org.onap.appc.adapter.ansible.result.Id");
 		System.out.println("Comparing " + Pending + " and " + status);
 		assertEquals(Pending,status);
 	    }
 	    catch(SvcLogicException e){
-	        String message  =svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.message");	
-		String status=svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.code");
+	        String message  =svcContext.getAttribute("org.onap.appc.adapter.ansible.result.message");	
+		String status=svcContext.getAttribute("org.onap.appc.adapter.ansible.result.code");
 		fail(e.getMessage() + " Code = " + status);
 	    }
 	    catch(Exception e){
@@ -120,12 +120,12 @@ public class TestAnsibleAdapterImpl {
 
             try{
 		adapter.reqExecResult(params, svcContext);
-		String status=svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.code");
+		String status=svcContext.getAttribute("org.onap.appc.adapter.ansible.result.code");
 		assertEquals("400",status);
 	    }
 	    catch(SvcLogicException e){
-	        String message  = svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.message");	
-		String status=svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.code");
+	        String message  = svcContext.getAttribute("org.onap.appc.adapter.ansible.result.message");	
+		String status=svcContext.getAttribute("org.onap.appc.adapter.ansible.result.code");
 		fail(e.getMessage()  + " Code = " + status);
 	    }
 	    catch(Exception e){
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
index 62470cc01..13b5fdfb3 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -32,7 +32,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.appc.test.InterceptLogger;
+import org.onap.appc.test.InterceptLogger;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
index 8a06b31be..b101ecee4 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
index c781956d7..bb888132a 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,12 +70,12 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
 # The connection information to connect to the provider we are using.  These properties 
 # are "structured" properties, in that the name is a compound name, where the nodes 
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml
index 32511435d..16d41128d 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml
@@ -26,7 +26,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-ansible-adapter</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>appc-ansible-adapter-features</artifactId>
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-ansible-adapter-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml
index 64587b5c2..69d3b9b07 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml
@@ -33,8 +33,8 @@
     <feature name='appc-ansible-adapter' description="appc-ansible-adapter" version='${project.version}'>
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
         <feature>sdnc-sli</feature>
-         <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-ansible-adapter-bundle/${project.version}</bundle>
+         <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-ansible-adapter-bundle/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml
index 29ccc06ca..75fde2a63 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml
@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>appc-ansible-adapter</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>appc-ansible-adapter-installer</artifactId>
@@ -35,12 +35,12 @@
     <properties>
         <application.name>appc-ansible-adapter</application.name>
         <features.boot>appc-ansible-adapter</features.boot>
-        <features.repositories>mvn:org.openecomp.appc/appc-ansible-adapter-features/${project.version}/xml/features</features.repositories>
+        <features.repositories>mvn:org.onap.appc/appc-ansible-adapter-features/${project.version}/xml/features</features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-ansible-adapter-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -52,7 +52,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-ansible-adapter-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-adapters/appc-ansible-adapter/pom.xml b/appc-adapters/appc-ansible-adapter/pom.xml
index fd91e620a..c1766bd50 100644
--- a/appc-adapters/appc-ansible-adapter/pom.xml
+++ b/appc-adapters/appc-ansible-adapter/pom.xml
@@ -26,7 +26,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-adapters</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
@@ -150,7 +150,7 @@
     <dependencies>
 
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-ansible-adapter-features</artifactId>
         <classifier>features</classifier>
         <type>xml</type>
@@ -158,7 +158,7 @@
       </dependency>
 
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-ansible-adapter-provider</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml
index 743a90ecc..8f2674d10 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml
@@ -27,7 +27,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-chef-adapter</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -78,7 +78,7 @@
             <version>1.55</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-common</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -224,8 +224,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>appc-chef-adapter</Bundle-SymbolicName>
-                        <Bundle-Activator>org.openecomp.appc.adapter.chef.ChefActivator</Bundle-Activator>
-                        <Export-Package>org.openecomp.appc.adapter.chef</Export-Package>
+                        <Bundle-Activator>org.onap.appc.adapter.chef.ChefActivator</Bundle-Activator>
+                        <Export-Package>org.onap.appc.adapter.chef</Export-Package>
                         <Import-Package>
                             org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*
                         </Import-Package>
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefActivator.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefActivator.java
index c6f4c6589..6c798b4b2 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefActivator.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefActivator.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef;
+package org.onap.appc.adapter.chef;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.chef.impl.ChefAdapterImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.chef.impl.ChefAdapterImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.i18n.Msg;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.osgi.framework.BundleActivator;
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefAdapter.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefAdapter.java
index 4793ee708..d11db1c14 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefAdapter.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefAdapter.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef;
+package org.onap.appc.adapter.chef;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import com.att.cdp.zones.model.Server;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
@@ -47,24 +47,24 @@ public interface ChefAdapter extends SvcLogicJavaPlugin {
      * correct provider support through the CDP IaaS abstraction layer and can be OpenStackProvider, BareMetalProvider,
      * or any other supported provider type.
      */
-    static final String PROPERTY_PROVIDER_TYPE = "org.openecomp.appc.provider.type";
+    static final String PROPERTY_PROVIDER_TYPE = "org.onap.appc.provider.type";
 
     /**
      * The adapter maintains a cache of providers organized by the name of the provider, not its type. This is
      * equivalent to the system or installation name. All regions within the same installation are assumed to be the
      * same type.
      */
-    static final String PROPERTY_PROVIDER_NAME = "org.openecomp.appc.provider.name";
+    static final String PROPERTY_PROVIDER_NAME = "org.onap.appc.provider.name";
 
     /**
      * The fully-qualified URL of the instance to be manipulated as it is known to the provider.
      */
-    static final String PROPERTY_INSTANCE_URL = "org.openecomp.appc.instance.url";
+    static final String PROPERTY_INSTANCE_URL = "org.onap.appc.instance.url";
 
     /**
      * The fully-qualified URL of the instance to be manipulated as it is known to the provider.
      */
-    static final String PROPERTY_IDENTITY_URL = "org.openecomp.appc.identity.url";
+    static final String PROPERTY_IDENTITY_URL = "org.onap.appc.identity.url";
 
     /**
      * This method is used to restart an existing virtual machine given the fully qualified URL of the machine.
@@ -73,11 +73,11 @@ public interface ChefAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be restarted, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -103,11 +103,11 @@ public interface ChefAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be stopped, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -133,11 +133,11 @@ public interface ChefAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be started, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -163,11 +163,11 @@ public interface ChefAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be rebuilt, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/ApiMethod.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/ApiMethod.java
index de4f31a04..38c4dd354 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/ApiMethod.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/ApiMethod.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.chefapi;
+package org.onap.appc.adapter.chef.chefapi;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -33,7 +33,7 @@ import org.apache.http.Header;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.util.EntityUtils;
-import org.openecomp.appc.adapter.chef.chefclient.Utils;
+import org.onap.appc.adapter.chef.chefclient.Utils;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.impl.client.HttpClients;
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Delete.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Delete.java
index 85206af36..5fa8a3fae 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Delete.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Delete.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.chefapi;
+package org.onap.appc.adapter.chef.chefapi;
 
 import org.apache.http.client.methods.HttpDelete;
 
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Get.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Get.java
index 948bff6af..da37236a7 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Get.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Get.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.chefapi;
+package org.onap.appc.adapter.chef.chefapi;
 
 import org.apache.http.client.methods.HttpGet;
 
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Post.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Post.java
index 5e00b09a4..3234eeefa 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Post.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Post.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.chefapi;
+package org.onap.appc.adapter.chef.chefapi;
 
 import org.apache.http.client.methods.*;
 import org.apache.http.entity.StringEntity;
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Put.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Put.java
index fa57c1117..c96fc64d1 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Put.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Put.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.chefapi;
+package org.onap.appc.adapter.chef.chefapi;
 
 import org.apache.http.client.methods.*;
 import org.apache.http.entity.StringEntity;
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/ChefApiClient.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/ChefApiClient.java
index 7aa63193b..d7080fc12 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/ChefApiClient.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/ChefApiClient.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.chefclient;
+package org.onap.appc.adapter.chef.chefclient;
 import org.apache.http.client.methods.*;
-import org.openecomp.appc.adapter.chef.chefapi.*;
+import org.onap.appc.adapter.chef.chefapi.*;
 
 public class ChefApiClient {
     private String endpoint;
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java
index 393069dfd..71182c497 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.chefclient;
+package org.onap.appc.adapter.chef.chefclient;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/ChefAdapterImpl.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/ChefAdapterImpl.java
index ab853dcc4..824a6af95 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/ChefAdapterImpl.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/ChefAdapterImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.impl;
+package org.onap.appc.adapter.chef.impl;
 
 import java.io.File;
 import java.util.Map;
@@ -34,12 +34,12 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.json.JSONObject;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.chef.ChefAdapter;
-import org.openecomp.appc.adapter.chef.chefapi.ApiMethod;
-import org.openecomp.appc.adapter.chef.chefclient.ChefApiClient;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.chef.ChefAdapter;
+import org.onap.appc.adapter.chef.chefapi.ApiMethod;
+import org.onap.appc.adapter.chef.chefclient.ChefApiClient;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import com.att.eelf.configuration.EELFLogger;
@@ -69,7 +69,7 @@ public class ChefAdapterImpl implements ChefAdapter {
     private final EELFLogger logger = EELFManager.getInstance().getLogger(ChefAdapterImpl.class);
 
     private final String CANNOT_FIND_PRIVATE_KEY_STR = "Cannot find the private key in the APPC file system, please load the private key to ";
-    private final String CHEF_ACTION_STR = "org.openecomp.appc.instance.chefAction";
+    private final String CHEF_ACTION_STR = "org.onap.appc.instance.chefAction";
     private final String ORGANIZATIONS_STR = "/organizations/";
     /**
      * A reference to the adapter configuration object.
@@ -106,7 +106,7 @@ public class ChefAdapterImpl implements ChefAdapter {
      * Returns the symbolic name of the adapter
      *
      * @return The adapter name
-     * @see org.openecomp.appc.adapter.chef.ChefAdapter#getAdapterName()
+     * @see org.onap.appc.adapter.chef.ChefAdapter#getAdapterName()
      */
     @Override
     public String getAdapterName() {
@@ -119,12 +119,12 @@ public class ChefAdapterImpl implements ChefAdapter {
     @Override
     public void nodeObejctBuilder(Map<String, String> params, SvcLogicContext ctx) {
         logger.info("nodeObejctBuilder");
-        String name = params.get("org.openecomp.appc.instance.nodeobject.name");
-        String normal = params.get("org.openecomp.appc.instance.nodeobject.normal");
-        String overrides = params.get("org.openecomp.appc.instance.nodeobject.overrides");
-        String defaults = params.get("org.openecomp.appc.instance.nodeobject.defaults");
-        String runList = params.get("org.openecomp.appc.instance.nodeobject.run_list");
-        String chefEnvironment = params.get("org.openecomp.appc.instance.nodeobject.chef_environment");
+        String name = params.get("org.onap.appc.instance.nodeobject.name");
+        String normal = params.get("org.onap.appc.instance.nodeobject.normal");
+        String overrides = params.get("org.onap.appc.instance.nodeobject.overrides");
+        String defaults = params.get("org.onap.appc.instance.nodeobject.defaults");
+        String runList = params.get("org.onap.appc.instance.nodeobject.run_list");
+        String chefEnvironment = params.get("org.onap.appc.instance.nodeobject.chef_environment");
         String nodeObject = "{\"json_class\":\"Chef::Node\",\"default\":{" + defaults
                 + "},\"chef_type\":\"node\",\"run_list\":[" + runList + "],\"override\":{" + overrides
                 + "},\"normal\": {" + normal + "},\"automatic\":{},\"name\":\"" + name + "\",\"chef_environment\":\""
@@ -134,19 +134,19 @@ public class ChefAdapterImpl implements ChefAdapter {
         RequestContext rc = new RequestContext(ctx);
         rc.isAlive();
         SvcLogicContext svcLogic = rc.getSvcLogicContext();
-        svcLogic.setAttribute("org.openecomp.appc.chef.nodeObject", nodeObject);
+        svcLogic.setAttribute("org.onap.appc.chef.nodeObject", nodeObject);
     }
 
     /**
      * send get request to chef server
      */
     public void chefInfo(Map<String, String> params) {
-        clientName = params.get("org.openecomp.appc.instance.username");
-        serverAddress = params.get("org.openecomp.appc.instance.serverAddress");
-        organizations = params.get("org.openecomp.appc.instance.organizations");
+        clientName = params.get("org.onap.appc.instance.username");
+        serverAddress = params.get("org.onap.appc.instance.serverAddress");
+        organizations = params.get("org.onap.appc.instance.organizations");
         chefserver = "https://" + serverAddress + ORGANIZATIONS_STR + organizations;
-        if (params.containsKey("org.openecomp.appc.instance.pemPath")) {
-            clientPrivatekey = params.get("org.openecomp.appc.instance.pemPath");
+        if (params.containsKey("org.onap.appc.instance.pemPath")) {
+            clientPrivatekey = params.get("org.onap.appc.instance.pemPath");
         } else {
             clientPrivatekey = "/opt/app/bvc/chef/" + serverAddress + "/" + organizations + "/" + clientName + ".pem";
         }
@@ -159,9 +159,9 @@ public class ChefAdapterImpl implements ChefAdapter {
 
     @Override
     public void retrieveData(Map<String, String> params, SvcLogicContext ctx) {
-        String allConfigData = params.get("org.openecomp.appc.instance.allConfig");
-        String key = params.get("org.openecomp.appc.instance.key");
-        String dgContext = params.get("org.openecomp.appc.instance.dgContext");
+        String allConfigData = params.get("org.onap.appc.instance.allConfig");
+        String key = params.get("org.onap.appc.instance.key");
+        String dgContext = params.get("org.onap.appc.instance.dgContext");
         JSONObject josnConfig = new JSONObject(allConfigData);
 
         String contextData;
@@ -184,9 +184,9 @@ public class ChefAdapterImpl implements ChefAdapter {
     @Override
     public void combineStrings(Map<String, String> params, SvcLogicContext ctx) {
 
-        String string1 = params.get("org.openecomp.appc.instance.String1");
-        String string2 = params.get("org.openecomp.appc.instance.String2");
-        String dgContext = params.get("org.openecomp.appc.instance.dgContext");
+        String string1 = params.get("org.onap.appc.instance.String1");
+        String string2 = params.get("org.onap.appc.instance.String2");
+        String dgContext = params.get("org.onap.appc.instance.dgContext");
         String contextData = string1 + string2;
         RequestContext rc = new RequestContext(ctx);
         rc.isAlive();
@@ -226,7 +226,7 @@ public class ChefAdapterImpl implements ChefAdapter {
     public void chefPut(Map<String, String> params, SvcLogicContext ctx) {
         chefInfo(params);
         String chefAction = params.get(CHEF_ACTION_STR);
-        String chefNodeStr = params.get("org.openecomp.appc.instance.chefRequestBody");
+        String chefNodeStr = params.get("org.onap.appc.instance.chefRequestBody");
         RequestContext rc = new RequestContext(ctx);
         rc.isAlive();
         int code;
@@ -254,7 +254,7 @@ public class ChefAdapterImpl implements ChefAdapter {
         chefInfo(params);
         logger.info("chef Post method");
         logger.info(clientName + " " + clientPrivatekey + " " + chefserver + " " + organizations);
-        String chefNodeStr = params.get("org.openecomp.appc.instance.chefRequestBody");
+        String chefNodeStr = params.get("org.onap.appc.instance.chefRequestBody");
         String chefAction = params.get(CHEF_ACTION_STR);
 
         RequestContext rc = new RequestContext(ctx);
@@ -311,7 +311,7 @@ public class ChefAdapterImpl implements ChefAdapter {
     @Override
     public void trigger(Map<String, String> params, SvcLogicContext ctx) {
         logger.info("Run trigger method");
-        String tVmIp = params.get("org.openecomp.appc.instance.ip");
+        String tVmIp = params.get("org.onap.appc.instance.ip");
         RequestContext rc = new RequestContext(ctx);
         rc.isAlive();
 
@@ -332,9 +332,9 @@ public class ChefAdapterImpl implements ChefAdapter {
     @Override
     public void checkPushJob(Map<String, String> params, SvcLogicContext ctx) {
         chefInfo(params);
-        String jobID = params.get("org.openecomp.appc.instance.jobid");
-        int retryTimes = Integer.parseInt(params.get("org.openecomp.appc.instance.retryTimes"));
-        int retryInterval = Integer.parseInt(params.get("org.openecomp.appc.instance.retryInterval"));
+        String jobID = params.get("org.onap.appc.instance.jobid");
+        int retryTimes = Integer.parseInt(params.get("org.onap.appc.instance.retryTimes"));
+        int retryInterval = Integer.parseInt(params.get("org.onap.appc.instance.retryInterval"));
         String chefAction = "/pushy/jobs/" + jobID;
 
         RequestContext rc = new RequestContext(ctx);
@@ -362,15 +362,15 @@ public class ChefAdapterImpl implements ChefAdapter {
 
         }
         if ("complete".equals(status)) {
-            svcLogic.setAttribute("org.openecomp.appc.chefServerResult.code", "200");
-            svcLogic.setAttribute("org.openecomp.appc.chefServerResult.message", message);
+            svcLogic.setAttribute("org.onap.appc.chefServerResult.code", "200");
+            svcLogic.setAttribute("org.onap.appc.chefServerResult.message", message);
         } else {
             if ("running".equals(status)) {
-                svcLogic.setAttribute("org.openecomp.appc.chefServerResult.code", "202");
-                svcLogic.setAttribute("org.openecomp.appc.chefServerResult.message", "chef client runtime out");
+                svcLogic.setAttribute("org.onap.appc.chefServerResult.code", "202");
+                svcLogic.setAttribute("org.onap.appc.chefServerResult.message", "chef client runtime out");
             } else {
-                svcLogic.setAttribute("org.openecomp.appc.chefServerResult.code", "500");
-                svcLogic.setAttribute("org.openecomp.appc.chefServerResult.message", message);
+                svcLogic.setAttribute("org.onap.appc.chefServerResult.code", "500");
+                svcLogic.setAttribute("org.onap.appc.chefServerResult.message", message);
             }
         }
     }
@@ -378,7 +378,7 @@ public class ChefAdapterImpl implements ChefAdapter {
     @Override
     public void pushJob(Map<String, String> params, SvcLogicContext ctx) {
         chefInfo(params);
-        String pushRequest = params.get("org.openecomp.appc.instance.pushRequest");
+        String pushRequest = params.get("org.onap.appc.instance.pushRequest");
         String chefAction = "/pushy/jobs";
         RequestContext rc = new RequestContext(ctx);
         rc.isAlive();
@@ -393,7 +393,7 @@ public class ChefAdapterImpl implements ChefAdapter {
             int startIndex = message.indexOf("jobs") + 6;
             int endIndex = message.length() - 2;
             String jobID = message.substring(startIndex, endIndex);
-            svcLogic.setAttribute("org.openecomp.appc.jobID", jobID);
+            svcLogic.setAttribute("org.onap.appc.jobID", jobID);
             logger.info(jobID);
         }
         chefServerResult(rc, Integer.toString(code), message);
@@ -413,8 +413,8 @@ public class ChefAdapterImpl implements ChefAdapter {
             logger.info("Couldn't covert " + code + " to an Integer, defaulting status to 500", e);
             status = "500";
         }
-        svcLogic.setAttribute("org.openecomp.appc.chefAgent.code", status);
-        svcLogic.setAttribute("org.openecomp.appc.chefAgent.message", msg);
+        svcLogic.setAttribute("org.onap.appc.chefAgent.code", status);
+        svcLogic.setAttribute("org.onap.appc.chefAgent.message", msg);
     }
 
     /**
@@ -424,21 +424,21 @@ public class ChefAdapterImpl implements ChefAdapter {
      */
     private void doSuccess(RequestContext rc) {
         SvcLogicContext svcLogic = rc.getSvcLogicContext();
-        svcLogic.setAttribute("org.openecomp.appc.chefAgent.code", "200");
+        svcLogic.setAttribute("org.onap.appc.chefAgent.code", "200");
     }
 
     private void chefServerResult(RequestContext rc, String code, String message) {
         SvcLogicContext svcLogic = rc.getSvcLogicContext();
         svcLogic.setStatus(OUTCOME_SUCCESS);
-        svcLogic.setAttribute("org.openecomp.appc.chefServerResult.code", code);
-        svcLogic.setAttribute("org.openecomp.appc.chefServerResult.message", message);
+        svcLogic.setAttribute("org.onap.appc.chefServerResult.code", code);
+        svcLogic.setAttribute("org.onap.appc.chefServerResult.message", message);
     }
 
     private void chefClientResult(RequestContext rc, String code, String message) {
         SvcLogicContext svcLogic = rc.getSvcLogicContext();
         svcLogic.setStatus(OUTCOME_SUCCESS);
-        svcLogic.setAttribute("org.openecomp.appc.chefClientResult.code", code);
-        svcLogic.setAttribute("org.openecomp.appc.chefClientResult.message", message);
+        svcLogic.setAttribute("org.onap.appc.chefClientResult.code", code);
+        svcLogic.setAttribute("org.onap.appc.chefClientResult.message", message);
     }
 
     /**
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/RequestContext.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/RequestContext.java
index a3ecf857c..3c0e00a6a 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/RequestContext.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/RequestContext.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.impl;
+package org.onap.appc.adapter.chef.impl;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 /**
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
index 6b3ca8d5a..c00220dd6 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,12 +70,12 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
 # The connection information to connect to the provider we are using.  These properties 
 # are "structured" properties, in that the name is a compound name, where the nodes 
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/chefclient/TestChefApiClient.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/chefclient/TestChefApiClient.java
index 3dc9ff20d..5ea152a8d 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/chefclient/TestChefApiClient.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/chefclient/TestChefApiClient.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.adapter.chef.chefclient;
+package org.onap.appc.adapter.chef.chefclient;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -14,11 +14,11 @@ import java.util.regex.Pattern;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.adapter.chef.chefapi.ApiMethod;
-import org.openecomp.appc.adapter.chef.chefapi.Delete;
-import org.openecomp.appc.adapter.chef.chefapi.Get;
-import org.openecomp.appc.adapter.chef.chefapi.Post;
-import org.openecomp.appc.adapter.chef.chefapi.Put;
+import org.onap.appc.adapter.chef.chefapi.ApiMethod;
+import org.onap.appc.adapter.chef.chefapi.Delete;
+import org.onap.appc.adapter.chef.chefapi.Get;
+import org.onap.appc.adapter.chef.chefapi.Post;
+import org.onap.appc.adapter.chef.chefapi.Put;
 
 public class TestChefApiClient {
 
@@ -41,16 +41,16 @@ public class TestChefApiClient {
             fail("Could not initialize properties");
         }
         client = new ChefApiClient(
-                props.getProperty("org.openecomp.appc.adapter.chef.chefclient.userId"),
+                props.getProperty("org.onap.appc.adapter.chef.chefclient.userId"),
                 System.getProperty("user.dir") +
-                        props.getProperty("org.openecomp.appc.adapter.chef.chefclient.pemPath"),
-                props.getProperty("org.openecomp.appc.adapter.chef.chefclient.endPoint"),
-                props.getProperty("org.openecomp.appc.adapter.chef.chefclient.organizations"));
+                        props.getProperty("org.onap.appc.adapter.chef.chefclient.pemPath"),
+                props.getProperty("org.onap.appc.adapter.chef.chefclient.endPoint"),
+                props.getProperty("org.onap.appc.adapter.chef.chefclient.organizations"));
     }
 
     @Test
     public void testGet(){
-        Get get = client.get(props.getProperty("org.openecomp.appc.adapter.chef.chefclient.path"));
+        Get get = client.get(props.getProperty("org.onap.appc.adapter.chef.chefclient.path"));
         ApiMethod method = get.createRequest();
         String[] response = method.test.split("\n");
 
@@ -59,7 +59,7 @@ public class TestChefApiClient {
 
     @Test
     public void testPut(){
-        Put put = client.put(props.getProperty("org.openecomp.appc.adapter.chef.chefclient.path"));
+        Put put = client.put(props.getProperty("org.onap.appc.adapter.chef.chefclient.path"));
         ApiMethod method = put.createRequest();
         String[] response = method.test.split("\n");
 
@@ -68,7 +68,7 @@ public class TestChefApiClient {
 
     @Test
     public void testPost() {
-        Post post = client.post(props.getProperty("org.openecomp.appc.adapter.chef.chefclient.path"));
+        Post post = client.post(props.getProperty("org.onap.appc.adapter.chef.chefclient.path"));
         ApiMethod method = post.createRequest();
         String[] response = method.test.split("\n");
 
@@ -77,7 +77,7 @@ public class TestChefApiClient {
 
     @Test
     public void testDelete(){
-        Delete delete = client.delete(props.getProperty("org.openecomp.appc.adapter.chef.chefclient.path"));
+        Delete delete = client.delete(props.getProperty("org.onap.appc.adapter.chef.chefclient.path"));
         ApiMethod method = delete.createRequest();
         String[] response = method.test.split("\n");
 
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java
index bb63d342c..687ba8338 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.impl;
+package org.onap.appc.adapter.chef.impl;
 
 import static org.junit.Assert.assertEquals;
 
@@ -33,7 +33,7 @@ import java.util.Map;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import com.att.cdp.exceptions.ZoneException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
@@ -49,7 +49,7 @@ public class TestChefAdapterImpl {
     public void setup() {
         adapter = new ChefAdapterImpl(Boolean.TRUE);
         params = new HashMap<>();
-        params.put("org.openecomp.appc.instance.pemPath",
+        params.put("org.onap.appc.instance.pemPath",
                 "/src/test/resources/testclient.pem");
     }
 
@@ -63,7 +63,7 @@ public class TestChefAdapterImpl {
     @Test
     public void testChefGetFail() throws IOException, IllegalStateException, IllegalArgumentException,
             ZoneException, APPCException {
-        params.put("org.openecomp.appc.instance.chefAction", "/nodes");
+        params.put("org.onap.appc.instance.chefAction", "/nodes");
 
         givenParams(params, "chefGet");
         thenResponseShouldFail();
@@ -72,10 +72,10 @@ public class TestChefAdapterImpl {
     @Test
     public void testChefPutFail() throws IOException, IllegalStateException, IllegalArgumentException,
             ZoneException, APPCException {
-        params.put("org.openecomp.appc.instance.chefAction", "/nodes/testnode");
-        params.put("org.openecomp.appc.instance.runList", "recipe[commandtest]");
-        params.put("org.openecomp.appc.instance.attributes", "");
-        params.put("org.openecomp.appc.instance.chefRequestBody", "Test Body");
+        params.put("org.onap.appc.instance.chefAction", "/nodes/testnode");
+        params.put("org.onap.appc.instance.runList", "recipe[commandtest]");
+        params.put("org.onap.appc.instance.attributes", "");
+        params.put("org.onap.appc.instance.chefRequestBody", "Test Body");
 
         givenParams(params, "chefPut");
         thenResponseShouldFail();
@@ -84,7 +84,7 @@ public class TestChefAdapterImpl {
     @Test
     public void testTriggerFail() throws IOException, IllegalStateException, IllegalArgumentException,
             ZoneException, APPCException {
-        params.put("org.openecomp.appc.instance.ip", "");
+        params.put("org.onap.appc.instance.ip", "");
 
         givenParams(params, "trigger");
         thenResponseShouldFail();
@@ -94,15 +94,15 @@ public class TestChefAdapterImpl {
         svcContext = new SvcLogicContext();
         if (method == "chefGet"){
             adapter.chefGet(adapterParams, svcContext);
-            getAttribute = "org.openecomp.appc.chefServerResult.code";
+            getAttribute = "org.onap.appc.chefServerResult.code";
         }
         if (method == "chefPut"){
             adapter.chefPut(adapterParams, svcContext);
-            getAttribute = "org.openecomp.appc.chefServerResult.code";
+            getAttribute = "org.onap.appc.chefServerResult.code";
         }
         if (method == "trigger"){
             adapter.trigger(adapterParams, svcContext);
-            getAttribute = "org.openecomp.appc.chefAgent.code";
+            getAttribute = "org.onap.appc.chefAgent.code";
         }
     }
 
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
index 62470cc01..13b5fdfb3 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -32,7 +32,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.appc.test.InterceptLogger;
+import org.onap.appc.test.InterceptLogger;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
index 8a06b31be..b101ecee4 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
index c781956d7..bb888132a 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,12 +70,12 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
 # The connection information to connect to the provider we are using.  These properties 
 # are "structured" properties, in that the name is a compound name, where the nodes 
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties
index 4805e4316..2623f283a 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties
@@ -1,5 +1,5 @@
-org.openecomp.appc.adapter.chef.chefclient.userId=test
-org.openecomp.appc.adapter.chef.chefclient.pemPath=/src/test/resources/testclient.pem
-org.openecomp.appc.adapter.chef.chefclient.endPoint=http://test.com
-org.openecomp.appc.adapter.chef.chefclient.organizations=onap
-org.openecomp.appc.adapter.chef.chefclient.path=/test/path
+org.onap.appc.adapter.chef.chefclient.userId=test
+org.onap.appc.adapter.chef.chefclient.pemPath=/src/test/resources/testclient.pem
+org.onap.appc.adapter.chef.chefclient.endPoint=http://test.com
+org.onap.appc.adapter.chef.chefclient.organizations=onap
+org.onap.appc.adapter.chef.chefclient.path=/test/path
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/pom.xml
index 8028ac163..98f78ffca 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/pom.xml
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/pom.xml
@@ -28,7 +28,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>appc-chef-adapter</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
@@ -42,7 +42,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-chef-adapter-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml
index 81795cf70..e3cd710b6 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml
@@ -34,8 +34,8 @@
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
         <feature>sdnc-sli</feature>
-        <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-chef-adapter-bundle/${project.version}</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-chef-adapter-bundle/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/pom.xml
index 803117722..f272bd123 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/pom.xml
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/pom.xml
@@ -28,7 +28,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>appc-chef-adapter</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>appc-chef-adapter-installer</artifactId>
@@ -38,14 +38,14 @@
         <application.name>appc-chef-adapter</application.name>
         <features.boot>appc-chef-adapter</features.boot>
         <features.repositories>
-            mvn:org.openecomp.appc/appc-chef-adapter-features/${project.version}/xml/features
+            mvn:org.onap.appc/appc-chef-adapter-features/${project.version}/xml/features
         </features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
         <licenseDir>${project.parent.parent.parent.basedir}</licenseDir>
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-chef-adapter-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -57,7 +57,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-chef-adapter-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-adapters/appc-chef-adapter/pom.xml b/appc-adapters/appc-chef-adapter/pom.xml
index 2905603b2..4a870aca4 100644
--- a/appc-adapters/appc-chef-adapter/pom.xml
+++ b/appc-adapters/appc-chef-adapter/pom.xml
@@ -27,7 +27,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-adapters</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -131,7 +131,7 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-chef-adapter-features</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
@@ -139,7 +139,7 @@
             </dependency>
 
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-chef-adapter-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml
index f03ff62be..cc9e040f9 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-dmaap-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -13,17 +13,17 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-message-adapter-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-metric-bundle</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -153,10 +153,10 @@
 					<instructions>
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Version>${project.version}</Bundle-Version>
-						<!--<Bundle-SymbolicName>org.openecomp.appc.adapter.messaging.dmaap</Bundle-SymbolicName>-->
-						<Bundle-Activator>org.openecomp.appc.adapter.messaging.dmaap.AppcDmaapAdapterActivator</Bundle-Activator>
-						<Export-Package>org.openecomp.appc.adapter.messaging.*</Export-Package>
-						<Import-Package>!org.slf4j.event,org.openecomp.appc.adapter.message.*,org.openecomp.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets</Import-Package>
+						<!--<Bundle-SymbolicName>org.onap.appc.adapter.messaging.dmaap</Bundle-SymbolicName>-->
+						<Bundle-Activator>org.onap.appc.adapter.messaging.dmaap.AppcDmaapAdapterActivator</Bundle-Activator>
+						<Export-Package>org.onap.appc.adapter.messaging.*</Export-Package>
+						<Import-Package>!org.slf4j.event,org.onap.appc.adapter.message.*,org.onap.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets</Import-Package>
 						<Embed-Dependency>*;scope=compile|runtime;artifactId=!appc-metric-bundle|appc-message-adapter-api|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|pax-*</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
 						<Bundle-Blueprint>OSGI-INF/blueprint/blueprint.xml</Bundle-Blueprint>
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/AppcDmaapAdapterActivator.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/AppcDmaapAdapterActivator.java
index 03910222c..812f80121 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/AppcDmaapAdapterActivator.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/AppcDmaapAdapterActivator.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap;
+package org.onap.appc.adapter.messaging.dmaap;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/CommonHttpClient.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/CommonHttpClient.java
index cd42e9dc6..76b050d8e 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/CommonHttpClient.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/CommonHttpClient.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap.http;
+package org.onap.appc.adapter.messaging.dmaap.http;
 
 import java.net.URI;
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/HttpDmaapConsumerImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/HttpDmaapConsumerImpl.java
index cc775a803..df81e9718 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/HttpDmaapConsumerImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/HttpDmaapConsumerImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap.http;
+package org.onap.appc.adapter.messaging.dmaap.http;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -40,7 +40,7 @@ import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 import org.json.JSONArray;
-import org.openecomp.appc.adapter.message.Consumer;
+import org.onap.appc.adapter.message.Consumer;
 
 public class HttpDmaapConsumerImpl extends CommonHttpClient implements Consumer {
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/HttpDmaapProducerImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/HttpDmaapProducerImpl.java
index aeb248c9b..560c09be4 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/HttpDmaapProducerImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/HttpDmaapProducerImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap.http;
+package org.onap.appc.adapter.messaging.dmaap.http;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -37,7 +37,7 @@ import com.att.eelf.configuration.EELFManager;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
-import org.openecomp.appc.adapter.message.Producer;
+import org.onap.appc.adapter.message.Producer;
 
 public class HttpDmaapProducerImpl extends CommonHttpClient implements Producer {
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapConsumerImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapConsumerImpl.java
index 6ffd65b93..ddf630545 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapConsumerImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapConsumerImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap.impl;
+package org.onap.appc.adapter.messaging.dmaap.impl;
 
 import java.io.IOException;
 import java.util.*;
@@ -36,17 +36,17 @@ import com.att.eelf.configuration.EELFManager;
 import com.att.nsa.mr.client.MRClientFactory;
 import com.att.nsa.mr.client.MRConsumer;
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.adapter.message.Consumer;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.metricservice.MetricRegistry;
-import org.openecomp.appc.metricservice.MetricService;
-import org.openecomp.appc.metricservice.impl.MetricServiceImpl;
-import org.openecomp.appc.metricservice.metric.Metric;
-import org.openecomp.appc.metricservice.metric.MetricType;
-import org.openecomp.appc.metricservice.metric.DmaapRequestCounterMetric;
-import org.openecomp.appc.metricservice.policy.PublishingPolicy;
-import org.openecomp.appc.metricservice.publisher.LogPublisher;
+import org.onap.appc.adapter.message.Consumer;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.metricservice.MetricRegistry;
+import org.onap.appc.metricservice.MetricService;
+import org.onap.appc.metricservice.impl.MetricServiceImpl;
+import org.onap.appc.metricservice.metric.Metric;
+import org.onap.appc.metricservice.metric.MetricType;
+import org.onap.appc.metricservice.metric.DmaapRequestCounterMetric;
+import org.onap.appc.metricservice.policy.PublishingPolicy;
+import org.onap.appc.metricservice.publisher.LogPublisher;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
@@ -222,7 +222,7 @@ public class DmaapConsumerImpl implements Consumer {
 
         } else {
             LOG.info("Metric Service error from bundlecontext");
-            LOG.warn("Cannot find service reference for org.openecomp.appc.metricservice.MetricService");
+            LOG.warn("Cannot find service reference for org.onap.appc.metricservice.MetricService");
             return null;
 
         }
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapProducerImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapProducerImpl.java
index a3f9bd542..7ed06a9e3 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapProducerImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapProducerImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap.impl;
+package org.onap.appc.adapter.messaging.dmaap.impl;
 
 import java.io.*;
 import java.util.*;
@@ -37,17 +37,17 @@ import com.att.eelf.configuration.EELFManager;
 import com.att.nsa.mr.client.MRBatchingPublisher;
 import com.att.nsa.mr.client.MRClientFactory;
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.adapter.message.Producer;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapUtil;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.metricservice.MetricRegistry;
-import org.openecomp.appc.metricservice.MetricService;
-import org.openecomp.appc.metricservice.metric.Metric;
-import org.openecomp.appc.metricservice.metric.MetricType;
-import org.openecomp.appc.metricservice.metric.DmaapRequestCounterMetric;
-import org.openecomp.appc.metricservice.policy.PublishingPolicy;
-import org.openecomp.appc.metricservice.publisher.LogPublisher;
+import org.onap.appc.adapter.message.Producer;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapUtil;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.metricservice.MetricRegistry;
+import org.onap.appc.metricservice.MetricService;
+import org.onap.appc.metricservice.metric.Metric;
+import org.onap.appc.metricservice.metric.MetricType;
+import org.onap.appc.metricservice.metric.DmaapRequestCounterMetric;
+import org.onap.appc.metricservice.policy.PublishingPolicy;
+import org.onap.appc.metricservice.publisher.LogPublisher;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
@@ -211,7 +211,7 @@ public class DmaapProducerImpl implements Producer {
 
         } else {
             LOG.info("Metric Service error from bundlecontext");
-            LOG.warn("Cannot find service reference for org.openecomp.appc.metricservice.MetricService");
+            LOG.warn("Cannot find service reference for org.onap.appc.metricservice.MetricService");
             return null;
 
         }
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapUtil.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapUtil.java
index ead13dd1b..da1b0fa38 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapUtil.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapUtil.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap.impl;
+package org.onap.appc.adapter.messaging.dmaap.impl;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/EventSenderDmaapImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/EventSenderDmaapImpl.java
index ee491d227..bf7649026 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/EventSenderDmaapImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/EventSenderDmaapImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap.impl;
+package org.onap.appc.adapter.messaging.dmaap.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -31,16 +31,16 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.adapter.message.MessageDestination;
-import org.openecomp.appc.adapter.message.Producer;
-import org.openecomp.appc.adapter.message.event.EventHeader;
-import org.openecomp.appc.adapter.message.event.EventMessage;
-import org.openecomp.appc.adapter.message.event.EventStatus;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.adapter.message.MessageDestination;
+import org.onap.appc.adapter.message.Producer;
+import org.onap.appc.adapter.message.event.EventHeader;
+import org.onap.appc.adapter.message.event.EventMessage;
+import org.onap.appc.adapter.message.event.EventStatus;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
 
 public class EventSenderDmaapImpl implements EventSender
 {
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 81300714f..063041832 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -27,10 +27,10 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
-    <bean id="eventSenderBean" class="org.openecomp.appc.adapter.messaging.dmaap.impl.EventSenderDmaapImpl"
+    <bean id="eventSenderBean" class="org.onap.appc.adapter.messaging.dmaap.impl.EventSenderDmaapImpl"
           init-method="initialize" scope="singleton">
     </bean>
 
-    <service id="eventSenderService" interface="org.openecomp.appc.adapter.message.EventSender" ref="eventSenderBean" />
+    <service id="eventSenderService" interface="org.onap.appc.adapter.message.EventSender" ref="eventSenderBean" />
 
 </blueprint>
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/consumer.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/consumer.properties
index 169026aa6..39506fce1 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/consumer.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/consumer.properties
@@ -40,7 +40,7 @@ contenttype =application/json
 authKey=01234567890abcde:01234567890abcdefghijklmn
 authDate=2016-02-18T13:57:37-0800
 host=127.0.0.1
-topic=org.openecomp.appc.UNIT-TEST
+topic=org.onap.appc.UNIT-TEST
 group=jmsgrp
 id=2
 timeout=15000
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
index ed3c22430..280b85c00 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -24,5 +24,5 @@
 
 # ${user.home} usually goes to /root if instantiation uses the appc-docker approach
 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/producer.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/producer.properties
index 8050648f9..eb8417891 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/producer.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/producer.properties
@@ -39,7 +39,7 @@ contenttype = application/json
 authKey=01234567890abcde:01234567890abcdefghijklmn
 authDate=2016-07-20T11:30:56-0700
 host=127.0.0.1
-topic=org.openecomp.appc.UNIT-TEST
+topic=org.onap.appc.UNIT-TEST
 partition=2
 maxBatchSize=100
 maxAgeMs=250
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/SimpleExamplePublisher.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/SimpleExamplePublisher.java
index 2b8747a9b..8c07c0b4a 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/SimpleExamplePublisher.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/SimpleExamplePublisher.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap;
+package org.onap.appc.adapter.messaging.dmaap;
 
 import java.io.*;
 import java.util.List;
@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit;
 
 import com.att.nsa.mr.client.MRConsumer;
 import org.json.JSONObject;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapUtil;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapUtil;
 
 import com.att.nsa.mr.client.MRBatchingPublisher;
 import com.att.nsa.mr.client.MRClientFactory;
@@ -51,7 +51,7 @@ public class SimpleExamplePublisher
 
         int i=0;
 
-        String topicProducerPropFileName = DmaapUtil.createProducerPropFile("org.openecomp.appc.UNIT-TEST", null);
+        String topicProducerPropFileName = DmaapUtil.createProducerPropFile("org.onap.appc.UNIT-TEST", null);
         while (i< msgCount)
         {
             publisher.publishMessage(topicProducerPropFileName,i);
@@ -93,7 +93,7 @@ public class SimpleExamplePublisher
 
         try
         {
-            String topic = "org.openecomp.appc.UNIT-TEST";
+            String topic = "org.onap.appc.UNIT-TEST";
             Properties props = new Properties();
             props.put("id", "1");
             props.put("group", "group1");
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestAppcDmaapAdapterActivator.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestAppcDmaapAdapterActivator.java
index d588336a5..5473bf7e0 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestAppcDmaapAdapterActivator.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestAppcDmaapAdapterActivator.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap;
+package org.onap.appc.adapter.messaging.dmaap;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 
 import org.junit.Test;
-import org.openecomp.appc.adapter.messaging.dmaap.AppcDmaapAdapterActivator;
+import org.onap.appc.adapter.messaging.dmaap.AppcDmaapAdapterActivator;
 
 public class TestAppcDmaapAdapterActivator {
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapConsuming.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapConsuming.java
index 0bf305ce0..28c2bc4e2 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapConsuming.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapConsuming.java
@@ -22,17 +22,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap;
+package org.onap.appc.adapter.messaging.dmaap;
 
 
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openecomp.appc.adapter.message.Consumer;
-import org.openecomp.appc.adapter.messaging.dmaap.http.HttpDmaapConsumerImpl;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapConsumerImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.adapter.message.Consumer;
+import org.onap.appc.adapter.messaging.dmaap.http.HttpDmaapConsumerImpl;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapConsumerImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.junit.Ignore;
 
 import java.util.Arrays;
@@ -41,7 +41,7 @@ import java.util.List;
 /**
  * Must have a DMaaP cluster or simulator up and running
  * Update the hostname, topic, client properties in
- * resources/org/openecomp/appc/default.properties
+ * resources/org/onap/appc/default.properties
  *
  */
 public class TestDmaapConsuming {
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapEventSender.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapEventSender.java
index e12da25ef..bdc786337 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapEventSender.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapEventSender.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap;
+package org.onap.appc.adapter.messaging.dmaap;
 
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.junit.Assert;
@@ -31,16 +31,16 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
-import org.openecomp.appc.adapter.message.MessageDestination;
-import org.openecomp.appc.adapter.message.Producer;
-import org.openecomp.appc.adapter.message.event.EventHeader;
-import org.openecomp.appc.adapter.message.event.EventMessage;
-import org.openecomp.appc.adapter.message.event.EventStatus;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.EventSenderDmaapImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.message.MessageDestination;
+import org.onap.appc.adapter.message.Producer;
+import org.onap.appc.adapter.message.event.EventHeader;
+import org.onap.appc.adapter.message.event.EventMessage;
+import org.onap.appc.adapter.message.event.EventStatus;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
+import org.onap.appc.adapter.messaging.dmaap.impl.EventSenderDmaapImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapProducing.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapProducing.java
index dc80580aa..bdfa93726 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapProducing.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapProducing.java
@@ -22,18 +22,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap;
+package org.onap.appc.adapter.messaging.dmaap;
 
 
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.appc.adapter.message.Producer;
-import org.openecomp.appc.adapter.messaging.dmaap.http.HttpDmaapProducerImpl;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.adapter.message.Producer;
+import org.onap.appc.adapter.messaging.dmaap.http.HttpDmaapProducerImpl;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 
 import java.util.Arrays;
 import java.util.List;
@@ -41,7 +41,7 @@ import java.util.List;
 /**
  * Must have a DMaaP cluster or simulator up and running
  * Update the hostname, topic, client properties in
- * resources/org/openecomp/appc/default.properties
+ * resources/org/onap/appc/default.properties
  *
  */
 public class TestDmaapProducing {
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/impl/TestConsumerProducerImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/impl/TestConsumerProducerImpl.java
index 5af5e60ae..cb318dc4e 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/impl/TestConsumerProducerImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/impl/TestConsumerProducerImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap.impl;
+package org.onap.appc.adapter.messaging.dmaap.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -34,12 +34,12 @@ import java.util.*;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.appc.adapter.message.Consumer;
-import org.openecomp.appc.adapter.message.Producer;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapConsumerImpl;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.adapter.message.Consumer;
+import org.onap.appc.adapter.message.Producer;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapConsumerImpl;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 
 public class TestConsumerProducerImpl {
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
index 868e512a6..dd594515c 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
@@ -22,8 +22,8 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.bootstrap.file=test.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=test.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 # Properties commented out below are provided in appc.properties
 #poolMembers=<DMAAP_IP>:3904
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml
index c937256d9..7870fcfe9 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-dmaap-adapter</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>appc-dmaap-adapter-features</artifactId>
@@ -13,13 +13,13 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dmaap-adapter-bundle</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-message-adapter-factory</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml
index afa1d31e3..576214089 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml
@@ -36,9 +36,9 @@
 <!--         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
 <!--         <feature version="${sdnctl.sli.version}">sdnc-sli</feature> -->
-        <bundle>mvn:org.openecomp.appc/appc-dmaap-adapter-bundle/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-message-adapter-factory/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-message-adapter-api/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-dmaap-adapter-bundle/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-message-adapter-factory/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-message-adapter-api/${project.version}</bundle>
         
     </feature>
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml
index 6cf369b4e..4308cf77f 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-dmaap-adapter</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>appc-dmaap-adapter-installer</artifactId>
@@ -13,13 +13,13 @@
   <properties>
     <application.name>appc-dmaap-adapter</application.name>
     <features.boot>appc-dmaap-adapter</features.boot>
-    <features.repositories>mvn:org.openecomp.appc/appc-dmaap-adapter-features/${project.version}/xml/features</features.repositories>
+    <features.repositories>mvn:org.onap.appc/appc-dmaap-adapter-features/${project.version}/xml/features</features.repositories>
     <include.transitive.dependencies>false</include.transitive.dependencies>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-dmaap-adapter-features</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -33,17 +33,17 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-dmaap-adapter-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-message-adapter-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-message-adapter-factory</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml
index f0f61f927..2056ed6b3 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-dmaap-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -13,12 +13,12 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-metric-bundle</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -121,9 +121,9 @@
 					<instructions>
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Version>${project.version}</Bundle-Version>
-						<Export-Package>org.openecomp.appc.adapter.message.*</Export-Package>
-						<!--<Export-Serice>org.openecomp.appc.adapter.message.EventSender</Export-Serice>-->
-						<Import-Package>org.openecomp.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets</Import-Package>
+						<Export-Package>org.onap.appc.adapter.message.*</Export-Package>
+						<!--<Export-Serice>org.onap.appc.adapter.message.EventSender</Export-Serice>-->
+						<Import-Package>org.onap.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets</Import-Package>
 						<!--<Embed-Dependency>appc-common</Embed-Dependency>-->
 						<Embed-Dependency>*;scope=compile|runtime;artifactId=!appc-metric-bundle|sli-common|sli-provider|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|pax-*</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/CallableConsumer.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/CallableConsumer.java
index 25555e3da..1f6bb50fc 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/CallableConsumer.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/CallableConsumer.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message;
+package org.onap.appc.adapter.message;
 
 import java.util.List;
 import java.util.concurrent.Callable;
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Consumer.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Consumer.java
index abd2babbd..92033064c 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Consumer.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Consumer.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message;
+package org.onap.appc.adapter.message;
 
 import java.util.List;
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/EventSender.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/EventSender.java
index 2b96396dd..962f14774 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/EventSender.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/EventSender.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message;
+package org.onap.appc.adapter.message;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
 import java.util.Map;
 
-import org.openecomp.appc.adapter.message.event.EventMessage;
+import org.onap.appc.adapter.message.event.EventMessage;
 
 public interface EventSender  extends SvcLogicJavaPlugin{
     boolean sendEvent(MessageDestination destination, EventMessage msg);
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Manager.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Manager.java
index 620543c45..aea2fddce 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Manager.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Manager.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message;
+package org.onap.appc.adapter.message;
 
 import java.util.Set;
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/MessageAdapterFactory.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/MessageAdapterFactory.java
index 89c88d172..d7507dc85 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/MessageAdapterFactory.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/MessageAdapterFactory.java
@@ -21,13 +21,13 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.appc.adapter.message;
+package org.onap.appc.adapter.message;
 
 import java.util.Collection;
 import java.util.Set;
 
-import org.openecomp.appc.adapter.message.Consumer;
-import org.openecomp.appc.adapter.message.Producer;
+import org.onap.appc.adapter.message.Consumer;
+import org.onap.appc.adapter.message.Producer;
 
 public interface MessageAdapterFactory {
 	
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/MessageDestination.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/MessageDestination.java
index 557d9b9ae..cb84b5c4c 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/MessageDestination.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/MessageDestination.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message;
+package org.onap.appc.adapter.message;
 
 public enum MessageDestination {
     DCAE
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Producer.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Producer.java
index 3911555cd..52ead0253 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Producer.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Producer.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message;
+package org.onap.appc.adapter.message;
 
 public interface Producer {
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventHeader.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventHeader.java
index 65cfb1a33..2c4ab1fbf 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventHeader.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventHeader.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message.event;
+package org.onap.appc.adapter.message.event;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventMessage.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventMessage.java
index 75fe92729..d64d6d0ce 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventMessage.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventMessage.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message.event;
+package org.onap.appc.adapter.message.event;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventStatus.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventStatus.java
index fd5788450..a5ac44e0b 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventStatus.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventStatus.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message.event;
+package org.onap.appc.adapter.message.event;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/resources/org/openecomp/appc/default.properties
index 2505a41ce..a326faada 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/resources/org/openecomp/appc/default.properties
@@ -22,5 +22,5 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml
index b82040c1f..231b11bd7 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-dmaap-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -13,20 +13,20 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dmaap-adapter-bundle</artifactId>
 			<version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-message-adapter-api</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
@@ -130,10 +130,10 @@
 					<instructions>
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Version>${project.version}</Bundle-Version>
-						<Export-Package>org.openecomp.appc.adapter.factory</Export-Package>
-						<Bundle-Activator>org.openecomp.appc.adapter.factory.DmaapMessageAdapterFactoryActivator</Bundle-Activator>
-						<Export-Service>org.openecomp.appc.adapter.message.MessageAdapterFactory</Export-Service>
-						<Import-Package>org.openecomp.appc.adapter.messaging.*,org.openecomp.appc.adapter.message.*,org.openecomp.appc.metricservice.*,com.att.nsa.*org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets</Import-Package>
+						<Export-Package>org.onap.appc.adapter.factory</Export-Package>
+						<Bundle-Activator>org.onap.appc.adapter.factory.DmaapMessageAdapterFactoryActivator</Bundle-Activator>
+						<Export-Service>org.onap.appc.adapter.message.MessageAdapterFactory</Export-Service>
+						<Import-Package>org.onap.appc.adapter.messaging.*,org.onap.appc.adapter.message.*,org.onap.appc.metricservice.*,com.att.nsa.*org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets</Import-Package>
 						<Embed-Dependency>*;scope=compile|runtime;artifactId=!appc-metric-bundle|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|pax-*</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
 						<Bundle-Blueprint>OSGI-INF/blueprint/blueprint.xml</Bundle-Blueprint>
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryActivator.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryActivator.java
index 5d8c62d4f..1597c4256 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryActivator.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryActivator.java
@@ -21,9 +21,9 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.appc.adapter.factory;
+package org.onap.appc.adapter.factory;
 
-import org.openecomp.appc.adapter.message.MessageAdapterFactory;
+import org.onap.appc.adapter.message.MessageAdapterFactory;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryImpl.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryImpl.java
index d555f3952..19eb4cea8 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryImpl.java
@@ -22,20 +22,20 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.factory;
+package org.onap.appc.adapter.factory;
 
 import java.util.Collection;
 import java.util.Set;
 
-import org.openecomp.appc.adapter.message.Consumer;
-import org.openecomp.appc.adapter.message.MessageAdapterFactory;
-import org.openecomp.appc.adapter.message.Producer;
+import org.onap.appc.adapter.message.Consumer;
+import org.onap.appc.adapter.message.MessageAdapterFactory;
+import org.onap.appc.adapter.message.Producer;
 
-import org.openecomp.appc.adapter.messaging.dmaap.http.HttpDmaapConsumerImpl;
-import org.openecomp.appc.adapter.messaging.dmaap.http.HttpDmaapProducerImpl;
+import org.onap.appc.adapter.messaging.dmaap.http.HttpDmaapConsumerImpl;
+import org.onap.appc.adapter.messaging.dmaap.http.HttpDmaapProducerImpl;
 
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapConsumerImpl;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapConsumerImpl;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
 
 public class DmaapMessageAdapterFactoryImpl implements MessageAdapterFactory {
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/MessageService.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/MessageService.java
index c96ec33fb..952f903b1 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/MessageService.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/MessageService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.factory;
+package org.onap.appc.adapter.factory;
 /**
  * The message service types that are available. Only DMaaP available
  **/
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/resources/org/openecomp/appc/default.properties
index 2505a41ce..a326faada 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/resources/org/openecomp/appc/default.properties
@@ -22,5 +22,5 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
diff --git a/appc-adapters/appc-dmaap-adapter/pom.xml b/appc-adapters/appc-dmaap-adapter/pom.xml
index 9cb74c4dc..0956ce175 100644
--- a/appc-adapters/appc-dmaap-adapter/pom.xml
+++ b/appc-adapters/appc-dmaap-adapter/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-adapters</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
index 2fbd23398..fba72c9bc 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-iaas-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -13,7 +13,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 			<scope>compile</scope>
@@ -201,8 +201,8 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>appc-iaas-adapter</Bundle-SymbolicName>
-						<Bundle-Activator>org.openecomp.appc.adapter.iaas.AppcProviderAdapterActivator</Bundle-Activator>
-						<Export-Package>org.openecomp.appc.adapter.iaas,com.att.cdp.zones.model</Export-Package>
+						<Bundle-Activator>org.onap.appc.adapter.iaas.AppcProviderAdapterActivator</Bundle-Activator>
+						<Export-Package>org.onap.appc.adapter.iaas,com.att.cdp.zones.model</Export-Package>
                         <DynamicImport-Package>javax.*</DynamicImport-Package>
                         <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,javax.net.ssl,org.xml.sax</Import-Package>
 <!--                         <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,javax.ws.rs.*,javax.net.*,javax.xml.*,org.xml.*</Import-Package> -->
@@ -228,7 +228,7 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-surefire-plugin</artifactId>
 						<configuration>
-							<excludedGroups>org.openecomp.appc.adapter.iaas.impl.TestProviderAdapterImpl</excludedGroups>
+							<excludedGroups>org.onap.appc.adapter.iaas.impl.TestProviderAdapterImpl</excludedGroups>
 						</configuration>
 					</plugin>
 				</plugins>
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java
index f17584e2a..fbd650c39 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas;
+package org.onap.appc.adapter.iaas;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.impl.ProviderAdapterImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.impl.ProviderAdapterImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.i18n.Msg;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/ProviderAdapter.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/ProviderAdapter.java
index 06a190cf3..c14c936e0 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/ProviderAdapter.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/ProviderAdapter.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas;
+package org.onap.appc.adapter.iaas;
 
 import java.util.Map;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.exceptions.UnknownProviderException;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.UnknownProviderException;
 import com.att.cdp.zones.model.Image;
 import com.att.cdp.zones.model.Server;
 import com.att.cdp.zones.model.Stack;
@@ -49,47 +49,47 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin {
      * correct provider support through the CDP IaaS abstraction layer and can be OpenStackProvider, BareMetalProvider,
      * or any other supported provider type.
      */
-    static final String PROPERTY_PROVIDER_TYPE = "org.openecomp.appc.provider.type";
+    static final String PROPERTY_PROVIDER_TYPE = "org.onap.appc.provider.type";
 
     /**
      * The adapter maintains a cache of providers organized by the name of the provider, not its type. This is
      * equivalent to the system or installation name. All regions within the same installation are assumed to be the
      * same type.
      */
-    static final String PROPERTY_PROVIDER_NAME = "org.openecomp.appc.provider.name";
+    static final String PROPERTY_PROVIDER_NAME = "org.onap.appc.provider.name";
 
     /**
      * The fully-qualified URL of the instance to be manipulated as it is known to the provider.
      */
-    static final String PROPERTY_INSTANCE_URL = "org.openecomp.appc.instance.url";
+    static final String PROPERTY_INSTANCE_URL = "org.onap.appc.instance.url";
 
     /**
      * The fully-qualified URL of the instance to be manipulated as it is known to the provider.
      */
-    static final String PROPERTY_IDENTITY_URL = "org.openecomp.appc.identity.url";
+    static final String PROPERTY_IDENTITY_URL = "org.onap.appc.identity.url";
 
     /**
      * The Rebuild VM flag is an optional payload parameter for the Evacuate API.
      */
-    static final String PROPERTY_REBUILD_VM = "org.openecomp.appc.rebuildvm";
+    static final String PROPERTY_REBUILD_VM = "org.onap.appc.rebuildvm";
 
     /**
      * The target host id is an optional payload parameter for the Evacuate API.
      */
-    static final String PROPERTY_TARGETHOST_ID = "org.openecomp.appc.targethost.id";
+    static final String PROPERTY_TARGETHOST_ID = "org.onap.appc.targethost.id";
 
     /**
      * heat stack id to perform operation on stack
      */
-    static final String PROPERTY_STACK_ID = "org.openecomp.appc.stack.id";
+    static final String PROPERTY_STACK_ID = "org.onap.appc.stack.id";
 
     static final String PROPERTY_SNAPSHOT_ID = "snapshot.id";
 
-    static final String PROPERTY_INPUT_SNAPSHOT_ID = "org.openecomp.appc.snapshot.id";
+    static final String PROPERTY_INPUT_SNAPSHOT_ID = "org.onap.appc.snapshot.id";
 
     static final String DG_OUTPUT_PARAM_NAMESPACE = "output.";
 
-    static final String SKIP_HYPERVISOR_CHECK = "org.openecomp.appc.skiphypervisorcheck";
+    static final String SKIP_HYPERVISOR_CHECK = "org.onap.appc.skiphypervisorcheck";
 
     /**
      * This method is used to restart an existing virtual machine given the fully qualified URL of the machine.
@@ -98,11 +98,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be restarted, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -125,11 +125,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be stopped, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -152,11 +152,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be started, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -179,11 +179,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be rebuilt, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -206,11 +206,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be terminate, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -252,11 +252,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be lookup, as it is known to the provider (i.e., the self-link URL
      * of the server)</dd>
      * </dl>
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/IdentityURL.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/IdentityURL.java
index 038b8de84..c98edc410 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/IdentityURL.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/IdentityURL.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderAdapterImpl.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderAdapterImpl.java
index 95e8e27f4..ba6c8c678 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderAdapterImpl.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderAdapterImpl.java
@@ -23,20 +23,20 @@
  */
 
 
-package org.openecomp.appc.adapter.iaas.impl;
-
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.provider.operation.api.IProviderOperation;
-import org.openecomp.appc.adapter.iaas.provider.operation.api.ProviderOperationFactory;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Property;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.EvacuateServer;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.util.StructuredPropertyHelper;
-import org.openecomp.appc.util.StructuredPropertyHelper.Node;
+package org.onap.appc.adapter.iaas.impl;
+
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.provider.operation.api.IProviderOperation;
+import org.onap.appc.adapter.iaas.provider.operation.api.ProviderOperationFactory;
+import org.onap.appc.adapter.iaas.provider.operation.common.constants.Property;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.EvacuateServer;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.util.StructuredPropertyHelper;
+import org.onap.appc.util.StructuredPropertyHelper.Node;
 import com.att.cdp.zones.model.Image;
 import com.att.cdp.zones.model.Server;
 import com.att.cdp.zones.model.Stack;
@@ -269,7 +269,7 @@ public class ProviderAdapterImpl implements ProviderAdapter {
      * Returns the symbolic name of the adapter
      *
      * @return The adapter name
-     * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#getAdapterName()
+     * @see org.onap.appc.adapter.iaas.ProviderAdapter#getAdapterName()
      */
     @Override
     public String getAdapterName() {
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderCache.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderCache.java
index bbf85a71a..5453a9ec1 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderCache.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderCache.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestContext.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestContext.java
index cec09266a..ef237f96d 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestContext.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestContext.java
@@ -23,11 +23,11 @@
  */
 
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 /**
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestFailedException.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestFailedException.java
index 614f4bb1e..13df3900c 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestFailedException.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestFailedException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import org.glassfish.grizzly.http.util.HttpStatus;
 import com.att.cdp.zones.model.Server;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalog.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalog.java
index b04814c32..c078eb7b3 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalog.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalog.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import java.util.HashSet;
 import java.util.List;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogFactory.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogFactory.java
index c6624e8b1..4c759b2c6 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogFactory.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogFactory.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================

  */

 

-package org.openecomp.appc.adapter.iaas.impl;

+package org.onap.appc.adapter.iaas.impl;

 

 import java.util.Properties;

 

@@ -31,7 +31,7 @@ import com.att.eelf.configuration.EELFManager;
 

 public class ServiceCatalogFactory {

 	

-	private static EELFLogger logger= EELFManager.getInstance().getLogger(org.openecomp.appc.adapter.iaas.impl.ServiceCatalogFactory.class);

+	private static EELFLogger logger= EELFManager.getInstance().getLogger(org.onap.appc.adapter.iaas.impl.ServiceCatalogFactory.class);

 

     /**

      * This method accepts a fully qualified identity service URL and uses that to determine which version of the

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV2.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV2.java
index 889035510..1e7112cd3 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV2.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV2.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================

  */

 

-package org.openecomp.appc.adapter.iaas.impl;

+package org.onap.appc.adapter.iaas.impl;

 

 import com.att.cdp.exceptions.ContextConnectionException;

 import com.att.cdp.exceptions.ZoneException;

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV3.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV3.java
index 9cd67995e..b1c47e5d5 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV3.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV3.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================

  */

 

-package org.openecomp.appc.adapter.iaas.impl;

+package org.onap.appc.adapter.iaas.impl;

 

 import com.att.cdp.exceptions.ContextConnectionException;

 import com.att.cdp.exceptions.ZoneException;

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/TenantCache.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/TenantCache.java
index ff349c76b..659202d1c 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/TenantCache.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/TenantCache.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -30,14 +30,14 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.pool.Allocator;
-import org.openecomp.appc.pool.Destructor;
-import org.openecomp.appc.pool.Pool;
-import org.openecomp.appc.pool.PoolSpecificationException;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.pool.Allocator;
+import org.onap.appc.pool.Destructor;
+import org.onap.appc.pool.Pool;
+import org.onap.appc.pool.PoolSpecificationException;
 import com.att.cdp.exceptions.ContextConnectionException;
 import com.att.cdp.exceptions.ZoneException;
 import com.att.cdp.zones.Context;
@@ -339,7 +339,7 @@ public class TenantCache implements Allocator<Context>, Destructor<Context> {
     }
 
     /**
-     * @see org.openecomp.appc.pool.Allocator#allocate(org.openecomp.appc.pool.Pool)
+     * @see org.onap.appc.pool.Allocator#allocate(org.onap.appc.pool.Pool)
      */
     @SuppressWarnings("unchecked")
     @Override
@@ -362,7 +362,7 @@ public class TenantCache implements Allocator<Context>, Destructor<Context> {
     }
 
     /**
-     * @see org.openecomp.appc.pool.Destructor#destroy(java.lang.Object, org.openecomp.appc.pool.Pool)
+     * @see org.onap.appc.pool.Destructor#destroy(java.lang.Object, org.onap.appc.pool.Pool)
      */
     @Override
     public void destroy(Context context, Pool<Context> pool) {
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/VMURL.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/VMURL.java
index 2860b5aea..777327cad 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/VMURL.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/VMURL.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/IProviderOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/IProviderOperation.java
index 6a1459772..3417762d1 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/IProviderOperation.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/IProviderOperation.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.api;
+package org.onap.appc.adapter.iaas.provider.operation.api;
 
-import org.openecomp.appc.adapter.iaas.impl.ProviderCache;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.iaas.impl.ProviderCache;
+import org.onap.appc.exceptions.APPCException;
 import com.att.cdp.zones.model.ModelObject;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import java.util.Map;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/ProviderOperationFactory.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/ProviderOperationFactory.java
index 39ef4a8ae..1eed4ef90 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/ProviderOperationFactory.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/ProviderOperationFactory.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.api;
+package org.onap.appc.adapter.iaas.provider.operation.api;
 
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.*;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.iaas.provider.operation.impl.*;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.exceptions.APPCException;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Constants.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Constants.java
index 5100602de..503cb1ae8 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Constants.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Constants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.common.constants;
+package org.onap.appc.adapter.iaas.provider.operation.common.constants;
 
 /**
  * @since September 26, 2016
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Property.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Property.java
index 23676a0c8..90532b92d 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Property.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Property.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.common.constants;
+package org.onap.appc.adapter.iaas.provider.operation.common.constants;
 
 /**
  * @since September 26, 2016
@@ -37,5 +37,5 @@ public class Property {
     public static final String PROVIDER_TENANT_PASSWORD = "password";
     public static final String PROVIDER_TENANT_USERID = "userid";
     public static final String PROVIDER_TYPE = "type";
-    public static final String SKIP_HYPERVISOR_CHECK = "org.openecomp.appc.iaas.skiphypervisorcheck";
+    public static final String SKIP_HYPERVISOR_CHECK = "org.onap.appc.iaas.skiphypervisorcheck";
 }
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Operation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Operation.java
index 857c7a7f0..2f81fab9c 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Operation.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Operation.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.common.enums;
+package org.onap.appc.adapter.iaas.provider.operation.common.enums;
 
 /**
  * @since September 26, 2016
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Outcome.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Outcome.java
index c62c1b25d..972409174 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Outcome.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Outcome.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.common.enums;
+package org.onap.appc.adapter.iaas.provider.operation.common.enums;
 
 /**
  * @since September 26, 2016
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/CreateSnapshot.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/CreateSnapshot.java
index b4c55253d..5165b0ce0 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/CreateSnapshot.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/CreateSnapshot.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
 import com.att.cdp.exceptions.ContextConnectionException;
 import com.att.cdp.exceptions.ResourceNotFoundException;
@@ -38,26 +38,26 @@ import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.glassfish.grizzly.http.util.HttpStatus;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import org.slf4j.MDC;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
 import java.util.TimeZone;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Constants.DATE_FORMAT;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.iaas.provider.operation.common.constants.Constants.DATE_FORMAT;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class CreateSnapshot extends ProviderServerOperation {
 
@@ -228,6 +228,6 @@ public class CreateSnapshot extends ProviderServerOperation {
         MDC.put("ElapsedTime", durationStr);
         MDC.put("TargetEntity", "cdp");
         MDC.put("TargetServiceName", "create snapshot");
-        MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.CreateSnapshot");
+        MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.CreateSnapshot");
     }
 }
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java
index 45473e349..7ddcd37e6 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java
@@ -22,21 +22,21 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
-
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.ProviderAdapterImpl;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
+
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.ProviderAdapterImpl;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import com.att.cdp.exceptions.ContextConnectionException;
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.exceptions.ZoneException;
@@ -62,7 +62,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class EvacuateServer extends ProviderServerOperation {
 
@@ -137,7 +137,7 @@ public class EvacuateServer extends ProviderServerOperation {
 
 
     /**
-     * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#evacuateServer(java.util.Map,
+     * @see org.onap.appc.adapter.iaas.ProviderAdapter#evacuateServer(java.util.Map,
      *      org.openecomp.sdnc.sli.SvcLogicContext)
      */
     private Server evacuateServer(Map<String, String> params, SvcLogicContext ctx) throws APPCException {
@@ -233,17 +233,17 @@ public class EvacuateServer extends ProviderServerOperation {
                             // Check error code for rebuild errors. Evacuate had set it to 200 after
                             // a successful evacuate. Rebuild updates the error code.
                             String rebuildErrorCode =
-                                    ctx.getAttribute(org.openecomp.appc.Constants.ATTRIBUTE_ERROR_CODE);
+                                    ctx.getAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_CODE);
                             if (rebuildErrorCode != null) {
                                 try {
                                     int error_code = Integer.parseInt(rebuildErrorCode);
                                     if (error_code != HttpStatus.OK_200.getStatusCode()) {
                                         logger.debug("Rebuild after evacuate failed - error code=" + error_code
                                                 + ", message=" + ctx.getAttribute(
-                                                        org.openecomp.appc.Constants.ATTRIBUTE_ERROR_MESSAGE));
+                                                        org.onap.appc.Constants.ATTRIBUTE_ERROR_MESSAGE));
                                         msg = EELFResourceManager.format(Msg.EVACUATE_SERVER_REBUILD_FAILED,
                                                 server.getName(), hypervisor, hypervisor_after_evacuate,
-                                                ctx.getAttribute(org.openecomp.appc.Constants.ATTRIBUTE_ERROR_MESSAGE));
+                                                ctx.getAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_MESSAGE));
                                         logger.error(msg);
                                         metricsLogger.error(msg);
                                         ctx.setAttribute("EVACUATE_STATUS", "ERROR");
@@ -346,7 +346,7 @@ public class EvacuateServer extends ProviderServerOperation {
         MDC.put("ElapsedTime", durationStr);
         MDC.put("TargetEntity", "cdp");
         MDC.put("TargetServiceName", "evacuate server");
-        MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.EvacuateServer");
+        MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.EvacuateServer");
     }
 
     public void setProvideAdapterRef(ProviderAdapterImpl pai) {
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/LookupServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/LookupServer.java
index 4c5c61670..924322d1f 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/LookupServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/LookupServer.java
@@ -22,19 +22,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import com.att.cdp.exceptions.ZoneException;
 import com.att.cdp.zones.Context;
 import com.att.cdp.zones.model.ModelObject;
@@ -46,7 +46,7 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.glassfish.grizzly.http.util.HttpStatus;
 import java.io.IOException;
 import java.util.Map;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class LookupServer extends ProviderServerOperation {
 
@@ -81,7 +81,7 @@ public class LookupServer extends ProviderServerOperation {
                     logger.debug(Msg.SERVER_FOUND, vm_url, context.getTenantName(), server.getStatus().toString());
                     ctx.setAttribute("serverFound", "success");
                     String msg = EELFResourceManager.format(Msg.SUCCESS_EVENT_MESSAGE, "LookupServer", vm_url);
-                    ctx.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
+                    ctx.setAttribute(org.onap.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
                     doSuccess(rc);
                 }
             } catch (ZoneException e) {
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java
index 919562cd5..b28918c09 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
 import com.att.cdp.exceptions.ContextConnectionException;
 import com.att.cdp.exceptions.ResourceNotFoundException;
@@ -35,19 +35,19 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
 import org.glassfish.grizzly.http.util.HttpStatus;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Property;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.constants.Property;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.slf4j.MDC;
 import java.text.DateFormat;
@@ -57,8 +57,8 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.Map;
 import java.util.TimeZone;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.MIGRATE_SERVICE;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.MIGRATE_SERVICE;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class MigrateServer extends ProviderServerOperation {
 
@@ -153,7 +153,7 @@ public class MigrateServer extends ProviderServerOperation {
     }
 
     /**
-     * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#migrateServer(java.util.Map,
+     * @see org.onap.appc.adapter.iaas.ProviderAdapter#migrateServer(java.util.Map,
      *      org.openecomp.sdnc.sli.SvcLogicContext)
      */
     private Server migrateServer(Map<String, String> params, SvcLogicContext ctx) throws APPCException {
@@ -235,6 +235,6 @@ public class MigrateServer extends ProviderServerOperation {
         MDC.put("ElapsedTime", durationStr);
         MDC.put("TargetEntity", "cdp");
         MDC.put("TargetServiceName", "migrate server");
-        MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.MigrateServer");
+        MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.MigrateServer");
     }
 }
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java
index 9a185ffeb..a2b27f29a 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
 import com.att.cdp.exceptions.ContextConnectionException;
 import com.att.cdp.exceptions.ResourceNotFoundException;
@@ -39,20 +39,20 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
 import org.glassfish.grizzly.http.util.HttpStatus;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Property;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.constants.Property;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.slf4j.MDC;
 import java.text.DateFormat;
@@ -61,8 +61,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.STOP_SERVICE;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.STOP_SERVICE;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class RebuildServer extends ProviderServerOperation {
 
@@ -328,7 +328,7 @@ public class RebuildServer extends ProviderServerOperation {
     }
 
     /**
-     * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#rebuildServer(java.util.Map,
+     * @see org.onap.appc.adapter.iaas.ProviderAdapter#rebuildServer(java.util.Map,
      *      org.openecomp.sdnc.sli.SvcLogicContext)
      */
     @SuppressWarnings("nls")
@@ -429,6 +429,6 @@ public class RebuildServer extends ProviderServerOperation {
         MDC.put("ElapsedTime", durationStr);
         MDC.put("TargetEntity", "cdp");
         MDC.put("TargetServiceName", "rebuild server");
-        MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.RebuildServer");
+        MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.RebuildServer");
     }
 }
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java
index 7d191a3d9..cc30ca833 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.exceptions.ZoneException;
@@ -33,17 +33,17 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
 import org.glassfish.grizzly.http.util.HttpStatus;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Property;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.exceptions.UnknownProviderException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.constants.Property;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.exceptions.UnknownProviderException;
+import org.onap.appc.i18n.Msg;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.slf4j.MDC;
 import java.text.DateFormat;
@@ -51,8 +51,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
 import java.util.TimeZone;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class RestartServer extends ProviderServerOperation {
 
@@ -176,7 +176,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.openecomp.appc.adapter.iaas.ProviderAdapter#restartServer(java.util.Map,
+     * @see org.onap.appc.adapter.iaas.ProviderAdapter#restartServer(java.util.Map,
      *      org.openecomp.sdnc.sli.SvcLogicContext)
      */
     @SuppressWarnings("nls")
@@ -220,7 +220,7 @@ public class RestartServer extends ProviderServerOperation {
                     doSuccess(rc);
                     ctx.setAttribute("RESTART_STATUS", "SUCCESS");
                     String msg = EELFResourceManager.format(Msg.SUCCESS_EVENT_MESSAGE, "RestartServer", vm_url);
-                    ctx.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
+                    ctx.setAttribute(org.onap.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
                 }
             } catch (RequestFailedException e) {
                 doFailure(rc, e.getStatus(), e.getMessage());
@@ -270,6 +270,6 @@ public class RestartServer extends ProviderServerOperation {
         MDC.put("ElapsedTime", durationStr);
         MDC.put("TargetEntity", "cdp");
         MDC.put("TargetServiceName", targetServiceName);
-        MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.RestartServer");
+        MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.RestartServer");
     }
 }
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestoreStack.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestoreStack.java
index 397f63a56..7eeb23783 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestoreStack.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestoreStack.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.exceptions.ZoneException;
@@ -39,19 +39,19 @@ import com.att.eelf.i18n.EELFResourceManager;
 import com.woorea.openstack.base.client.OpenStackBaseException;
 import com.woorea.openstack.heat.Heat;
 import org.glassfish.grizzly.http.util.HttpStatus;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation;
-import org.openecomp.appc.adapter.openstack.heat.SnapshotResource;
-import org.openecomp.appc.adapter.openstack.heat.StackResource;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation;
+import org.onap.appc.adapter.openstack.heat.SnapshotResource;
+import org.onap.appc.adapter.openstack.heat.StackResource;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import java.util.Map;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class RestoreStack extends ProviderStackOperation {
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/SnapshotStack.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/SnapshotStack.java
index 97ac5c80a..bf7ebc755 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/SnapshotStack.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/SnapshotStack.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.exceptions.ZoneException;
@@ -39,18 +39,18 @@ import com.att.eelf.i18n.EELFResourceManager;
 import com.woorea.openstack.base.client.OpenStackBaseException;
 import com.woorea.openstack.heat.Heat;
 import org.glassfish.grizzly.http.util.HttpStatus;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation;
-import org.openecomp.appc.adapter.openstack.heat.SnapshotResource;
-import org.openecomp.appc.adapter.openstack.heat.StackResource;
-import org.openecomp.appc.adapter.openstack.heat.model.CreateSnapshotParams;
-import org.openecomp.appc.adapter.openstack.heat.model.Snapshot;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation;
+import org.onap.appc.adapter.openstack.heat.SnapshotResource;
+import org.onap.appc.adapter.openstack.heat.StackResource;
+import org.onap.appc.adapter.openstack.heat.model.CreateSnapshotParams;
+import org.onap.appc.adapter.openstack.heat.model.Snapshot;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.slf4j.MDC;
 import java.text.DateFormat;
@@ -58,7 +58,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
 import java.util.TimeZone;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class SnapshotStack extends ProviderStackOperation {
 
@@ -188,6 +188,6 @@ public class SnapshotStack extends ProviderStackOperation {
         MDC.put("ElapsedTime", durationStr);
         MDC.put("TargetEntity", "cdp");
         MDC.put("TargetServiceName", "snapshot stack");
-        MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.SnapshotStack");
+        MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.SnapshotStack");
     }
 }
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StartServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StartServer.java
index 09781a254..1dbeacbf3 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StartServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StartServer.java
@@ -22,18 +22,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
-
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
+
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.zones.Context;
 import com.att.cdp.zones.model.ModelObject;
@@ -44,15 +44,15 @@ import com.att.eelf.i18n.EELFResourceManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.glassfish.grizzly.http.util.HttpStatus;
 import java.util.Map;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.START_SERVICE;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.START_SERVICE;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class StartServer extends ProviderServerOperation {
 
     private static final EELFLogger logger = EELFManager.getInstance().getLogger(StartServer.class);
 
     /**
-     * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#startServer(java.util.Map,
+     * @see org.onap.appc.adapter.iaas.ProviderAdapter#startServer(java.util.Map,
      *      org.openecomp.sdnc.sli.SvcLogicContext)
      */
     @SuppressWarnings("nls")
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StopServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StopServer.java
index 0587061c7..df836b77c 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StopServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StopServer.java
@@ -22,18 +22,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
-
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
+
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.zones.Context;
 import com.att.cdp.zones.model.ModelObject;
@@ -44,8 +44,8 @@ import com.att.eelf.i18n.EELFResourceManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.glassfish.grizzly.http.util.HttpStatus;
 import java.util.Map;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.STOP_SERVICE;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.STOP_SERVICE;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class StopServer extends ProviderServerOperation {
 
@@ -53,7 +53,7 @@ public class StopServer extends ProviderServerOperation {
     private static EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();
 
     /**
-     * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#stopServer(java.util.Map,
+     * @see org.onap.appc.adapter.iaas.ProviderAdapter#stopServer(java.util.Map,
      *      org.openecomp.sdnc.sli.SvcLogicContext)
      */
     @SuppressWarnings("nls")
@@ -168,7 +168,7 @@ public class StopServer extends ProviderServerOperation {
                     doSuccess(rc);
                     ctx.setAttribute("STOP_STATUS", "SUCCESS");
                     msg = EELFResourceManager.format(Msg.SUCCESS_EVENT_MESSAGE, "StopServer", vm_url);
-                    ctx.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
+                    ctx.setAttribute(org.onap.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
 
                 } else {
                     ctx.setAttribute("STOP_STATUS", "CONTEXT_NOT_FOUND");
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateServer.java
index 51000601a..73385ee35 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateServer.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
 import com.att.cdp.exceptions.ContextConnectionException;
 import com.att.cdp.exceptions.ResourceNotFoundException;
@@ -36,21 +36,21 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
 import org.glassfish.grizzly.http.util.HttpStatus;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.exceptions.UnknownProviderException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.exceptions.UnknownProviderException;
+import org.onap.appc.i18n.Msg;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import java.util.Map;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.TERMINATE_SERVICE;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE;
+import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.TERMINATE_SERVICE;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class TerminateServer extends ProviderServerOperation {
 
@@ -173,7 +173,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.openecomp.appc.adapter.iaas.ProviderAdapter#terminateServer(java.util.Map,
+     * @see org.onap.appc.adapter.iaas.ProviderAdapter#terminateServer(java.util.Map,
      *      org.openecomp.sdnc.sli.SvcLogicContext)
      */
     @SuppressWarnings("nls")
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateStack.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateStack.java
index a9ee122db..1e3ce1e68 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateStack.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateStack.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.exceptions.ZoneException;
 import com.att.cdp.zones.Context;
@@ -44,7 +44,7 @@ import com.att.eelf.i18n.EELFResourceManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.glassfish.grizzly.http.util.HttpStatus;
 import java.util.Map;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class TerminateStack extends ProviderStackOperation {
 
@@ -98,7 +98,7 @@ public class TerminateStack extends ProviderStackOperation {
                     context.close();
                     doSuccess(rc);
                     String msg = EELFResourceManager.format(Msg.SUCCESS_EVENT_MESSAGE, "TerminateStack", vm_url);
-                    ctx.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
+                    ctx.setAttribute(org.onap.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
                 }
             } catch (ResourceNotFoundException e) {
                 String msg = EELFResourceManager.format(Msg.STACK_NOT_FOUND, e, vm_url);
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/VmStatuschecker.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/VmStatuschecker.java
index 8175a14f5..9185e35fc 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/VmStatuschecker.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/VmStatuschecker.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.zones.Context;
@@ -32,23 +32,23 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
 import org.glassfish.grizzly.http.util.HttpStatus;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.UnknownProviderException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.UnknownProviderException;
+import org.onap.appc.i18n.Msg;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import java.util.Map;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class VmStatuschecker extends ProviderServerOperation {
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderOperation.java
index 02226bbc9..2b50dbe8a 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderOperation.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderOperation.java
@@ -22,19 +22,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl.base;
-
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.*;
-import org.openecomp.appc.adapter.iaas.provider.operation.api.IProviderOperation;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Constants;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.pool.Pool;
-import org.openecomp.appc.pool.PoolExtensionException;
+package org.onap.appc.adapter.iaas.provider.operation.impl.base;
+
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.*;
+import org.onap.appc.adapter.iaas.provider.operation.api.IProviderOperation;
+import org.onap.appc.adapter.iaas.provider.operation.common.constants.Constants;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.pool.Pool;
+import org.onap.appc.pool.PoolExtensionException;
 import com.att.cdp.zones.Context;
 import com.att.cdp.zones.model.ModelObject;
 import com.att.cdp.zones.model.Server;
@@ -48,8 +48,8 @@ import java.net.URI;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Constants.MDC_ADAPTER;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Constants.MDC_SERVICE;
+import static org.onap.appc.adapter.iaas.provider.operation.common.constants.Constants.MDC_ADAPTER;
+import static org.onap.appc.adapter.iaas.provider.operation.common.constants.Constants.MDC_SERVICE;
 import static com.att.eelf.configuration.Configuration.MDC_SERVICE_NAME;
 
 public abstract class ProviderOperation implements IProviderOperation {
@@ -110,7 +110,7 @@ public abstract class ProviderOperation implements IProviderOperation {
      */
     protected void logOperation(Msg msg, Map<String, String> params, SvcLogicContext context) {
 
-        String appName = configuration.getProperty(org.openecomp.appc.Constants.PROPERTY_APPLICATION_NAME);
+        String appName = configuration.getProperty(org.onap.appc.Constants.PROPERTY_APPLICATION_NAME);
         logger.info(msg, appName);
 
         debugParameters(params);
@@ -223,8 +223,8 @@ public abstract class ProviderOperation implements IProviderOperation {
             status = "500";
         }
         svcLogic.setStatus(Outcome.FAILURE.toString());
-        svcLogic.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_ERROR_CODE, status);
-        svcLogic.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_ERROR_MESSAGE, msg);
+        svcLogic.setAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_CODE, status);
+        svcLogic.setAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_MESSAGE, msg);
 
         if (null != cause)
             throw new APPCException(cause);
@@ -237,7 +237,7 @@ public abstract class ProviderOperation implements IProviderOperation {
     protected void doSuccess(RequestContext rc) {
         SvcLogicContext svcLogic = rc.getSvcLogicContext();
         svcLogic.setStatus(Outcome.SUCCESS.toString());
-        svcLogic.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_ERROR_CODE,
+        svcLogic.setAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_CODE,
                 Integer.toString(HttpStatus.OK_200.getStatusCode()));
     }
 
@@ -317,7 +317,7 @@ public abstract class ProviderOperation implements IProviderOperation {
     protected Context getContext(RequestContext rc, String selfLinkURL, String providerName) {
         VMURL vm = VMURL.parseURL(selfLinkURL);
         IdentityURL ident = IdentityURL.parseURL(providerName);
-        String appName = configuration.getProperty(org.openecomp.appc.Constants.PROPERTY_APPLICATION_NAME);
+        String appName = configuration.getProperty(org.onap.appc.Constants.PROPERTY_APPLICATION_NAME);
 
         if (vm == null) {
             String msg = EELFResourceManager.format(Msg.INVALID_SELF_LINK_URL, appName, selfLinkURL);
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderServerOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderServerOperation.java
index e503e05fd..9ef82aea2 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderServerOperation.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderServerOperation.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl.base;
+package org.onap.appc.adapter.iaas.provider.operation.impl.base;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.impl.*;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.impl.*;
+import org.onap.appc.i18n.Msg;
 import com.att.cdp.exceptions.ContextConnectionException;
 import com.att.cdp.exceptions.NotLoggedInException;
 import com.att.cdp.exceptions.TimeoutException;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderStackOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderStackOperation.java
index fa59ffbae..cbf620230 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderStackOperation.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderStackOperation.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl.base;
+package org.onap.appc.adapter.iaas.provider.operation.impl.base;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.openstack.heat.StackResource;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.openstack.heat.StackResource;
+import org.onap.appc.i18n.Msg;
 import com.att.cdp.exceptions.ContextConnectionException;
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.exceptions.TimeoutException;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/SnapshotResource.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/SnapshotResource.java
index 04468187c..549c7b93b 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/SnapshotResource.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/SnapshotResource.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat;
+package org.onap.appc.adapter.openstack.heat;
 
-import org.openecomp.appc.adapter.openstack.heat.model.CreateSnapshotParams;
-import org.openecomp.appc.adapter.openstack.heat.model.Snapshot;
+import org.onap.appc.adapter.openstack.heat.model.CreateSnapshotParams;
+import org.onap.appc.adapter.openstack.heat.model.Snapshot;
 import com.woorea.openstack.base.client.Entity;
 import com.woorea.openstack.base.client.HttpMethod;
 import com.woorea.openstack.base.client.OpenStackClient;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/StackResource.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/StackResource.java
index a559b04a8..5add047f7 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/StackResource.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/StackResource.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat;
+package org.onap.appc.adapter.openstack.heat;
 
-import org.openecomp.appc.adapter.openstack.heat.model.CreateSnapshotParams;
-import org.openecomp.appc.adapter.openstack.heat.model.Snapshot;
+import org.onap.appc.adapter.openstack.heat.model.CreateSnapshotParams;
+import org.onap.appc.adapter.openstack.heat.model.Snapshot;
 import com.woorea.openstack.base.client.Entity;
 import com.woorea.openstack.base.client.HttpMethod;
 import com.woorea.openstack.base.client.OpenStackClient;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/CreateSnapshotParams.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/CreateSnapshotParams.java
index 4d8901cf2..642b85367 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/CreateSnapshotParams.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/CreateSnapshotParams.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Data.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Data.java
index 3581818e0..df662013a 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Data.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Data.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Environment.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Environment.java
index 10adaedbd..b5a9ddcad 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Environment.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Environment.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Metadata.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Metadata.java
index b6402d7d1..08e44b725 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Metadata.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Metadata.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Parameters.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Parameters.java
index 480b74450..8adc97a4f 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Parameters.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Parameters.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Properties.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Properties.java
index 3be9461f4..0a7605268 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Properties.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Properties.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceData.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceData.java
index 8ac70e3ea..fea775c71 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceData.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceData.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceRegistry.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceRegistry.java
index c214c41ea..d15c1c339 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceRegistry.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceRegistry.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources.java
index 6545479c4..ffa9f0d1a 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources_.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources_.java
index cbacd77d9..e6889b0a7 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources_.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources_.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources__.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources__.java
index b389c2d83..c34310556 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources__.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources__.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Snapshot.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Snapshot.java
index 548035635..57c7d5439 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Snapshot.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Snapshot.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotDetails.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotDetails.java
index 172072d5a..f121ddd70 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotDetails.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotDetails.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotRestoreResponse.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotRestoreResponse.java
index 5e829bad9..482a29f3b 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotRestoreResponse.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotRestoreResponse.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Template.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Template.java
index fd762dc2a..310d711f5 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Template.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Template.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume.java
index 9173fe832..5943ba71b 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume_.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume_.java
index abad08f98..a8df4a7dc 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume_.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume_.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/utils/Constants.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/utils/Constants.java
index 9cde695d8..6b9602a62 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/utils/Constants.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/utils/Constants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.utils;
+package org.onap.appc.adapter.utils;
 
 
 public class Constants {
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/com/att/cdp/default.properties b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/com/att/cdp/default.properties
index c91796a3d..ca971a33e 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/com/att/cdp/default.properties
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/com/att/cdp/default.properties
@@ -56,13 +56,13 @@ com.att.cdp.resources=com/att/cdp/StrategyServiceMessages
 #
 # Logger names used in the application 
 #
-com.att.cdp.logger=org.openecomp.appc
-com.att.cdp.security.logger=org.openecomp.appc.security
-com.att.cdp.perf.logger=org.openecomp.appc.perf
-com.att.cdp.gui.logger=org.openecomp.appc.gui
-com.att.cdp.server.logger=org.openecomp.appc.server
-com.att.cdp.coordinator.logger=org.openecomp.appc.coordinator
-com.att.cdp.policy.logger=org.openecomp.appc.policy
+com.att.cdp.logger=org.onap.appc
+com.att.cdp.security.logger=org.onap.appc.security
+com.att.cdp.perf.logger=org.onap.appc.perf
+com.att.cdp.gui.logger=org.onap.appc.gui
+com.att.cdp.server.logger=org.onap.appc.server
+com.att.cdp.coordinator.logger=org.onap.appc.coordinator
+com.att.cdp.policy.logger=org.onap.appc.policy
 
 #
 # This property allows to 'simulate' SSH processes within engine.
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
index 21f96d9ee..1ecb98c01 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,18 +70,18 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 
     #
      #The amount of time, in seconds, that the application waits for a change of state of a stacj to a known valid
      #sate before giving up and failing the request.
      #
-org.openecomp.appc.stack.state.change.timeout=100
+org.onap.appc.stack.state.change.timeout=100
 
 
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestIdentityUrl.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestIdentityUrl.java
index d7dc2a8dc..dac22eadb 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestIdentityUrl.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestIdentityUrl.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -31,8 +31,8 @@ import static org.junit.Assert.assertTrue;
 import java.util.Properties;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.configuration.ConfigurationFactory;
 
 public class TestIdentityUrl {
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderAdapterImpl.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderAdapterImpl.java
index cbca170e0..386c1115b 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderAdapterImpl.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderAdapterImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -41,16 +41,16 @@ import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.ProviderAdapterImpl;
-import org.openecomp.appc.adapter.iaas.impl.ProviderCache;
-import org.openecomp.appc.adapter.iaas.impl.ServiceCatalog;
-import org.openecomp.appc.adapter.iaas.impl.TenantCache;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.exceptions.UnknownProviderException;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.ProviderAdapterImpl;
+import org.onap.appc.adapter.iaas.impl.ProviderCache;
+import org.onap.appc.adapter.iaas.impl.ServiceCatalog;
+import org.onap.appc.adapter.iaas.impl.TenantCache;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.UnknownProviderException;
 import com.att.cdp.exceptions.ZoneException;
 import com.att.cdp.zones.ComputeService;
 import com.att.cdp.zones.Context;
@@ -64,7 +64,7 @@ import com.woorea.openstack.keystone.model.Access.Service.Endpoint;
 /**
  * Test the ProviderAdapter implementation.
  */
-@Category(org.openecomp.appc.adapter.iaas.impl.TestProviderAdapterImpl.class)
+@Category(org.onap.appc.adapter.iaas.impl.TestProviderAdapterImpl.class)
 public class TestProviderAdapterImpl {
 
     @SuppressWarnings("nls")
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderOperation.java
index 56c67ddd9..c080cf953 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderOperation.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderOperation.java
@@ -22,20 +22,20 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import java.lang.reflect.Field;
 import java.util.Map;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderOperation;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderOperation;
+import org.onap.appc.exceptions.APPCException;
 import com.att.cdp.zones.model.ModelObject;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.MDC;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Constants.MDC_SERVICE;
+import static org.onap.appc.adapter.iaas.provider.operation.common.constants.Constants.MDC_SERVICE;
 
 /**
  * This class is used to test methods and functions of the adapter implementation that do not
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestRequestContext.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestRequestContext.java
index efb40dfac..7ea30635c 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestRequestContext.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestRequestContext.java
@@ -23,15 +23,15 @@
  */
 
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 
 /**
  * Test the RequestContext object
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalog.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalog.java
index be769a066..c1a41f209 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalog.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalog.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -40,7 +40,7 @@ import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.configuration.ConfigurationFactory;
 import com.att.cdp.exceptions.ZoneException;
 import com.woorea.openstack.keystone.model.Access.Service;
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogFactory.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogFactory.java
index e97e64d10..e974d27ba 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogFactory.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogFactory.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================

  */

 

-package org.openecomp.appc.adapter.iaas.impl;

+package org.onap.appc.adapter.iaas.impl;

 

 import java.util.Properties;

 import org.junit.Assert;

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV2.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV2.java
index c26b3bee1..58b56e06f 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV2.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV2.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================

  */

 

-package org.openecomp.appc.adapter.iaas.impl;

+package org.onap.appc.adapter.iaas.impl;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -36,7 +36,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;

 import org.junit.Ignore;

 import org.junit.Test;

-import org.openecomp.appc.configuration.ConfigurationFactory;

+import org.onap.appc.configuration.ConfigurationFactory;

 

 /**

  * This class tests the service catalog against a known provider.

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV3.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV3.java
index 14f44d10c..26a4d7dbf 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV3.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV3.java
@@ -24,7 +24,7 @@
 

 

 

-package org.openecomp.appc.adapter.iaas.impl;

+package org.onap.appc.adapter.iaas.impl;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -38,7 +38,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;

 import org.junit.Ignore;

 import org.junit.Test;

-import org.openecomp.appc.configuration.ConfigurationFactory;

+import org.onap.appc.configuration.ConfigurationFactory;

 

 /**

  * This class tests the service catalog against a known provider.

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestVMURL.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestVMURL.java
index 5986fdd64..d433afb64 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestVMURL.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestVMURL.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -32,8 +32,8 @@ import static org.junit.Assert.assertNull;
 import java.util.Properties;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.configuration.ConfigurationFactory;
 
 public class TestVMURL {
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
index a05474a34..7a03a8d84 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -32,7 +32,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.openecomp.appc.test.InterceptLogger;
+import org.onap.appc.test.InterceptLogger;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
index efc84a1e4..6c81a6c6e 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
index 0c171a99c..d63c49143 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,12 +70,12 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
 # The connection information to connect to the provider we are using.  These properties 
 # are "structured" properties, in that the name is a compound name, where the nodes 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/pom.xml
index b5bd687e8..2797bee68 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/pom.xml
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-iaas-adapter</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>appc-iaas-adapter-features</artifactId>
@@ -13,7 +13,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-iaas-adapter-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/src/main/resources/features.xml
index 158d67b5a..7a081c0e2 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/src/main/resources/features.xml
@@ -38,7 +38,7 @@
 <!--         <feature>pax-jetty</feature> -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
         <feature>sdnc-sli</feature>
-        <bundle>mvn:org.openecomp.appc/appc-iaas-adapter-bundle/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-iaas-adapter-bundle/${project.version}</bundle>
 
     </feature>
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/pom.xml
index 60f4ca8ec..e28bb8128 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/pom.xml
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-iaas-adapter</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>appc-iaas-adapter-installer</artifactId>
@@ -13,13 +13,13 @@
   <properties>
     <application.name>appc-iaas-adapter</application.name>
     <features.boot>appc-iaas-adapter</features.boot>
-    <features.repositories>mvn:org.openecomp.appc/appc-iaas-adapter-features/${project.version}/xml/features</features.repositories>
+    <features.repositories>mvn:org.onap.appc/appc-iaas-adapter-features/${project.version}/xml/features</features.repositories>
     <include.transitive.dependencies>false</include.transitive.dependencies>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-iaas-adapter-features</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
@@ -32,7 +32,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-iaas-adapter-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-adapters/appc-iaas-adapter/pom.xml b/appc-adapters/appc-iaas-adapter/pom.xml
index 3846612ed..ad3c0cf20 100644
--- a/appc-adapters/appc-iaas-adapter/pom.xml
+++ b/appc-adapters/appc-iaas-adapter/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-adapters</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
@@ -100,7 +100,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-iaas-adapter-features</artifactId>
         <classifier>features</classifier>
         <type>xml</type>
@@ -108,7 +108,7 @@
       </dependency>
 
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-iaas-adapter-provider</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
index 1725489da..422c593e8 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-netconf-adapter</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -18,7 +18,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-common</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -166,10 +166,10 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>appc-netconf-adapter</Bundle-SymbolicName>
-                        <Bundle-Activator>org.openecomp.appc.adapter.netconf.AppcNetconfAdapterActivator</Bundle-Activator>
-                        <Export-Package>org.openecomp.appc.adapter.netconf,org.openecomp.appc.adapter.netconf.dao,org.openecomp.appc.adapter.netconf.util,org.openecomp.appc.adapter.netconf.exception</Export-Package>
+                        <Bundle-Activator>org.onap.appc.adapter.netconf.AppcNetconfAdapterActivator</Bundle-Activator>
+                        <Export-Package>org.onap.appc.adapter.netconf,org.onap.appc.adapter.netconf.dao,org.onap.appc.adapter.netconf.util,org.onap.appc.adapter.netconf.exception</Export-Package>
                         <Import-Package>
-                            !org.slf4j.event,org.w3c.dom.*,com.sun.org.apache.xerces.*,javax.sql.*,javax.sql.rowset.*,javax.xml.*,org.openecomp.appc.adapter.messaging.*,javax.crypto.*,org.openecomp.appc.common.exception.*,org.mariadb.*,org.onap.ccsdk.sli.core.sli.*,org.onap.ccsdk.sli.core.dblib,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*
+                            !org.slf4j.event,org.w3c.dom.*,com.sun.org.apache.xerces.*,javax.sql.*,javax.sql.rowset.*,javax.xml.*,org.onap.appc.adapter.messaging.*,javax.crypto.*,org.onap.appc.common.exception.*,org.mariadb.*,org.onap.ccsdk.sli.core.sli.*,org.onap.ccsdk.sli.core.dblib,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*
                         </Import-Package>
                         <Embed-Dependency>*;scope=compile|runtime;artifactId=!dblib-provider|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|appc-dmaap-adapter-bundle</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/AppcNetconfAdapterActivator.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/AppcNetconfAdapterActivator.java
index c64fe8c80..bae220d13 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/AppcNetconfAdapterActivator.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/AppcNetconfAdapterActivator.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
-import org.openecomp.appc.adapter.netconf.internal.NetconfDataAccessServiceImpl;
+import org.onap.appc.adapter.netconf.internal.NetconfDataAccessServiceImpl;
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.i18n.Msg;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.osgi.framework.BundleActivator;
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/ConnectionDetails.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/ConnectionDetails.java
index a9a49aa9b..7536f9655 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/ConnectionDetails.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/ConnectionDetails.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
 
 public class ConnectionDetails {
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/MockOperationalStateValidatorImpl.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/MockOperationalStateValidatorImpl.java
index dd616694c..079ae76a4 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/MockOperationalStateValidatorImpl.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/MockOperationalStateValidatorImpl.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 
 
 public class MockOperationalStateValidatorImpl implements OperationalStateValidator {
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClient.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClient.java
index 95b17ddc3..eaed60fc0 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClient.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClient.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 
 
 
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientFactory.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientFactory.java
index aded8b643..45c8fb0ed 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientFactory.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientFactory.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
-import org.openecomp.appc.adapter.netconf.jsch.NetconfClientJsch;
-import org.openecomp.appc.adapter.netconf.odlconnector.NetconfClientRestconfImpl;
+import org.onap.appc.adapter.netconf.jsch.NetconfClientJsch;
+import org.onap.appc.adapter.netconf.odlconnector.NetconfClientRestconfImpl;
 
 
 public class NetconfClientFactory {
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientRestconf.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientRestconf.java
index f28552a1c..a23a16797 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientRestconf.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientRestconf.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 
 
 
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientType.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientType.java
index eddc40e46..bf7512456 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientType.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientType.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
 
 public enum NetconfClientType {
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfConnectionDetails.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfConnectionDetails.java
index bdf6e8f48..e7c0cc44d 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfConnectionDetails.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfConnectionDetails.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
 import java.util.List;
 import java.util.Properties;
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfDataAccessService.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfDataAccessService.java
index 2167c9289..f831541da 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfDataAccessService.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfDataAccessService.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
-import org.openecomp.appc.adapter.netconf.exception.DataAccessException;
+import org.onap.appc.adapter.netconf.exception.DataAccessException;
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
 
 
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/OperationalStateValidator.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/OperationalStateValidator.java
index 92d136398..ffa3862e8 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/OperationalStateValidator.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/OperationalStateValidator.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 
 
 public interface OperationalStateValidator {
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/OperationalStateValidatorFactory.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/OperationalStateValidatorFactory.java
index b4954aaf5..37e96917d 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/OperationalStateValidatorFactory.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/OperationalStateValidatorFactory.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
 import org.apache.commons.lang3.NotImplementedException;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 
 public class OperationalStateValidatorFactory {
     protected static final Configuration configuration = ConfigurationFactory.getConfiguration();
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/VNFOperationalStateValidatorImpl.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/VNFOperationalStateValidatorImpl.java
index 6bb3b57d3..4bb5ab238 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/VNFOperationalStateValidatorImpl.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/VNFOperationalStateValidatorImpl.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/VnfType.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/VnfType.java
index 06d7bcb84..19edc2fd3 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/VnfType.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/VnfType.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
 public enum VnfType {
     VNF("VNF"),
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/exception/DataAccessException.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/exception/DataAccessException.java
index 7a62be6a5..0c4964da0 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/exception/DataAccessException.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/exception/DataAccessException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.exception;
+package org.onap.appc.adapter.netconf.exception;
 
 
 public class DataAccessException extends RuntimeException {
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/exception/NetconfDAOException.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/exception/NetconfDAOException.java
index 3b0a28dbf..5ff1a331e 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/exception/NetconfDAOException.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/exception/NetconfDAOException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.exception;
+package org.onap.appc.adapter.netconf.exception;
 
 public class NetconfDAOException extends RuntimeException {
 
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfAdapter.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfAdapter.java
index c7c70e4f3..2d8c6f417 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfAdapter.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfAdapter.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.internal;
+package org.onap.appc.adapter.netconf.internal;
 
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,7 +46,7 @@ public class NetconfAdapter {
     private InputStream in;
     // device output stream
     private OutputStream out;
-    private long maxWaitingTime = ConfigurationFactory.getConfiguration().getLongProperty("org.openecomp.appc.netconf.recv.timeout", MAX_WAITING_TIME);
+    private long maxWaitingTime = ConfigurationFactory.getConfiguration().getLongProperty("org.onap.appc.netconf.recv.timeout", MAX_WAITING_TIME);
 
     /**
      * Constructor.
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfAdapter2.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfAdapter2.java
index a735222a9..928d77470 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfAdapter2.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfAdapter2.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.internal;
+package org.onap.appc.adapter.netconf.internal;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfConstMessages.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfConstMessages.java
index e90b27b7d..c7ad9bc50 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfConstMessages.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfConstMessages.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.internal;
+package org.onap.appc.adapter.netconf.internal;
 
 public class NetconfConstMessages {
 
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfDataAccessServiceImpl.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfDataAccessServiceImpl.java
index a85ac13c8..f3cca8597 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfDataAccessServiceImpl.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfDataAccessServiceImpl.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.internal;
+package org.onap.appc.adapter.netconf.internal;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.adapter.netconf.ConnectionDetails;
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.NetconfDataAccessService;
-import org.openecomp.appc.adapter.netconf.exception.DataAccessException;
-import org.openecomp.appc.adapter.netconf.util.Constants;
+import org.onap.appc.adapter.netconf.ConnectionDetails;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.NetconfDataAccessService;
+import org.onap.appc.adapter.netconf.exception.DataAccessException;
+import org.onap.appc.adapter.netconf.util.Constants;
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
 
 import javax.sql.rowset.CachedRowSet;
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfMessage.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfMessage.java
index 3bba628e5..700a51b9f 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfMessage.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfMessage.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.internal;
+package org.onap.appc.adapter.netconf.internal;
 
 import java.io.ByteArrayOutputStream;
 
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/jsch/JSchLogger.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/jsch/JSchLogger.java
index d9b3a9f5c..37bb3b2f2 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/jsch/JSchLogger.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/jsch/JSchLogger.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.jsch;
+package org.onap.appc.adapter.netconf.jsch;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/jsch/NetconfClientJsch.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/jsch/NetconfClientJsch.java
index 96726f1dc..7b9d7a4ae 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/jsch/NetconfClientJsch.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/jsch/NetconfClientJsch.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.jsch;
+package org.onap.appc.adapter.netconf.jsch;
 
 import com.jcraft.jsch.Channel;
 import com.jcraft.jsch.ChannelSubsystem;
@@ -33,13 +33,13 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.appc.adapter.netconf.NetconfClient;
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.internal.NetconfAdapter;
-import org.openecomp.appc.adapter.netconf.internal.NetconfConstMessages;
-import org.openecomp.appc.encryption.EncryptionTool;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.adapter.netconf.NetconfClient;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.internal.NetconfAdapter;
+import org.onap.appc.adapter.netconf.internal.NetconfConstMessages;
+import org.onap.appc.encryption.EncryptionTool;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import com.att.eelf.i18n.EELFResourceManager;
 
 /**
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/odlconnector/NetconfClientRestconfImpl.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/odlconnector/NetconfClientRestconfImpl.java
index 1b67a1b33..bc89551a8 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/odlconnector/NetconfClientRestconfImpl.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/odlconnector/NetconfClientRestconfImpl.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.odlconnector;
+package org.onap.appc.adapter.netconf.odlconnector;
 
 import org.apache.http.HttpStatus;
-import org.openecomp.appc.adapter.netconf.NetconfClient;
-import org.openecomp.appc.adapter.netconf.NetconfClientRestconf;
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.util.Constants;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.util.httpClient;
+import org.onap.appc.adapter.netconf.NetconfClient;
+import org.onap.appc.adapter.netconf.NetconfClientRestconf;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.util.Constants;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.util.httpClient;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/util/Constants.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/util/Constants.java
index 21d3373db..e8b8e9378 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/util/Constants.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/util/Constants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.util;
+package org.onap.appc.adapter.netconf.util;
 
 public class Constants {
 
@@ -54,13 +54,13 @@ public class Constants {
     public static final String LOG_FIELD_NAME = "LOG";
 
     // input fields names
-    public static final String VNF_TYPE_FIELD_NAME = "org.openecomp.appc.vftype";
+    public static final String VNF_TYPE_FIELD_NAME = "org.onap.appc.vftype";
     public static final String TARGET_VNF_TYPE = "target-vnf-type";
     public static final String FILE_CONTENT_FIELD_NAME = "file-content";
     public static final String CONNECTION_DETAILS_FIELD_NAME = "connection-details";
     public static final String CONFIGURATION_FILE_FIELD_NAME = "configuration-file-name";
     public static final String VNF_HOST_IP_ADDRESS_FIELD_NAME = "vnf-host-ip-address";
-    public static final String DG_ERROR_FIELD_NAME = "org.openecomp.appc.dg.error";
+    public static final String DG_ERROR_FIELD_NAME = "org.onap.appc.dg.error";
     public static final String RESOURCEKEY = "resourceKey";
     public static final String ATTRIBUTE_ERROR_MESSAGE = "error-message";
     public static final String DG_OUTPUT_STATUS_MESSAGE = "output.status.message";
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
index 70736798d..5e4516a3b 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -22,14 +22,14 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
-org.openecomp.appc.netconf.db.jdbc.driver=netconfctl
-org.openecomp.appc.netconf.db.url.netconfctl=jdbc:mysql://127.0.0.1:3306/test
-org.openecomp.appc.netconf.db.user.netconfctl=test
-org.openecomp.appc.netconf.db.pass.netconfctl=123456
-org.openecomp.appc.netconf.recv.timeout=1800000
+org.onap.appc.netconf.db.jdbc.driver=netconfctl
+org.onap.appc.netconf.db.url.netconfctl=jdbc:mysql://127.0.0.1:3306/test
+org.onap.appc.netconf.db.user.netconfctl=test
+org.onap.appc.netconf.db.pass.netconfctl=123456
+org.onap.appc.netconf.recv.timeout=1800000
 
 ###																###
 ### Properties commented out below provided in appc.properties  ###
@@ -41,4 +41,4 @@ event.client.secret=64AG2hF4pYeG2pq7CT6XwUOT
 #restconf.user=<RESTCONF_USER>
 #restconf.pass=<RESTCONF_PASSWORD>
 
-org.openecomp.appc.adapter.netconf.VNFOperationalStateValidatorImpl-CONFIG_FILE=VnfGetOperationalStates
+org.onap.appc.adapter.netconf.VNFOperationalStateValidatorImpl-CONFIG_FILE=VnfGetOperationalStates
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/OperationalStateValidatorTest.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/OperationalStateValidatorTest.java
index 8a6a794a5..11f6f818b 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/OperationalStateValidatorTest.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/OperationalStateValidatorTest.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.junit.Test;
-import org.openecomp.appc.adapter.netconf.OperationalStateValidator;
-import org.openecomp.appc.adapter.netconf.OperationalStateValidatorFactory;
-import org.openecomp.appc.adapter.netconf.VnfType;
+import org.onap.appc.adapter.netconf.OperationalStateValidator;
+import org.onap.appc.adapter.netconf.OperationalStateValidatorFactory;
+import org.onap.appc.adapter.netconf.VnfType;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
@@ -39,9 +39,9 @@ public class OperationalStateValidatorTest {
         String validResponse = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                 "<rpc-reply xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" message-id=\"101\">\n" +
                 "    <data>\n" +
-                "        <ManagedElement xmlns=\"urn:org:openecomp:appc:Test\">\n" +
+                "        <ManagedElement xmlns=\"urn:org:onap:appc:Test\">\n" +
                 "            <managedElementId>1</managedElementId>\n" +
-                "            <VnfFunction xmlns=\"urn:org:openecomp:appc:Test\">\n" +
+                "            <VnfFunction xmlns=\"urn:org:onap:appc:Test\">\n" +
                 "                <id>1</id>\n" +
                 "                <ProcessorManagement>\n" +
                 "                    <id>1</id>\n" +
@@ -102,9 +102,9 @@ public class OperationalStateValidatorTest {
         response = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                 "<rpc-reply xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" message-id=\"101\">\n" +
                 "    <data>\n" +
-                "        <ManagedElement xmlns=\"urn:org:openecomp:appc:Test\">\n" +
+                "        <ManagedElement xmlns=\"urn:org:onap:appc:Test\">\n" +
                 "            <managedElementId>1</managedElementId>\n" +
-                "            <VnfFunction xmlns=\"urn:org:openecomp:appc:Test\">\n" +
+                "            <VnfFunction xmlns=\"urn:org:onap:appc:Test\">\n" +
                 "                <id>1</id>\n" +
                 "                <ProcessorManagement>\n" +
                 "                    <id>1</id>\n" +
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/internal/TestNetconfAdapter.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/internal/TestNetconfAdapter.java
index f3b9d53b6..cb20cbdb5 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/internal/TestNetconfAdapter.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/internal/TestNetconfAdapter.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.internal;
+package org.onap.appc.adapter.netconf.internal;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.adapter.netconf.internal.NetconfAdapter;
+import org.onap.appc.adapter.netconf.internal.NetconfAdapter;
 
 import java.io.IOException;
 import java.io.PipedInputStream;
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestGetRunningConfig.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestGetRunningConfig.java
index b695b0448..b559bc749 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestGetRunningConfig.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestGetRunningConfig.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.jsch;
+package org.onap.appc.adapter.netconf.jsch;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.jsch.NetconfClientJsch;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.jsch.NetconfClientJsch;
+import org.onap.appc.exceptions.APPCException;
 
 public class TestGetRunningConfig {
 
@@ -37,7 +37,7 @@ public class TestGetRunningConfig {
     private static final String USER = "test";
     private static final String PSWD = "test123";
     private static final int PORT = 830;
-    private static final List<String> CAPABILITIES = Collections.singletonList("<capability>urn:org:openecomp:appc:capability:1.1.0</capability>");
+    private static final List<String> CAPABILITIES = Collections.singletonList("<capability>urn:org:onap:appc:capability:1.1.0</capability>");
 
     public static void main(String[] args) throws APPCException {
         try {
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfig.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfig.java
index c4ee0e25a..809625333 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfig.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfig.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.jsch;
+package org.onap.appc.adapter.netconf.jsch;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.jsch.NetconfClientJsch;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.jsch.NetconfClientJsch;
+import org.onap.appc.exceptions.APPCException;
 
 public class TestModifyConfig {
 
@@ -37,7 +37,7 @@ public class TestModifyConfig {
     private static final String USER = "test";
     private static final String PSWD = "test123";
     private static final int PORT = 830;
-    private static final List<String> CAPABILITIES = Collections.singletonList("<capability>urn:org:openecomp:appc:capability:1.1.0</capability>");
+    private static final List<String> CAPABILITIES = Collections.singletonList("<capability>urn:org:onap:appc:capability:1.1.0</capability>");
     private static final String CONFIG =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
             "<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" message-id=\"1\">\n" +
@@ -47,9 +47,9 @@ public class TestModifyConfig {
             "    </target>\n" +
             "    <default-operation>merge</default-operation>\n" +
             "    <config xmlns:xc=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n" +
-            "      <ManagedElement xmlns=\"urn:org.openecomp.appc:Test\">\n" +
+            "      <ManagedElement xmlns=\"urn:org.onap.appc:Test\">\n" +
             "        <managedElementId>1</managedElementId>\n" +
-            "        <VnfFunction xmlns=\"urn:org:openecomp:appc:VnfFunction\">\n" +
+            "        <VnfFunction xmlns=\"urn:org:onap:appc:VnfFunction\">\n" +
             "          <id>1</id>\n" +
             "          <Interfaces>\n" +
             "            <id>1</id>\n" +
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfigMock.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfigMock.java
index 1a6a0e501..915721d51 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfigMock.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfigMock.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.jsch;
+package org.onap.appc.adapter.netconf.jsch;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.jsch.NetconfClientJsch;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.jsch.NetconfClientJsch;
+import org.onap.appc.exceptions.APPCException;
 
 public class TestModifyConfigMock {
 
@@ -37,7 +37,7 @@ public class TestModifyConfigMock {
     private static final String USER = "test";
     private static final String PSWD = "test123";
     private static final int PORT = 830;
-    private static final List<String> CAPABILITIES = Collections.singletonList("<capability>urn:org:openecomp:appc:capability:1.1.0</capability>");
+    private static final List<String> CAPABILITIES = Collections.singletonList("<capability>urn:org:onap:appc:capability:1.1.0</capability>");
     private static final String CONFIG =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
             "<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" message-id=\"1\">\n" +
@@ -47,9 +47,9 @@ public class TestModifyConfigMock {
             "    </target>\n" +
             "    <default-operation>merge</default-operation>\n" +
             "    <config xmlns:xc=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n" +
-            "      <ManagedElement xmlns=\"urn:org.openecomp.appc:Test\">\n" +
+            "      <ManagedElement xmlns=\"urn:org.onap.appc:Test\">\n" +
             "        <managedElementId>1</managedElementId>\n" +
-            "        <VnfFunction xmlns=\"urn:org:openecomp:appc:VnfFunction\">\n" +
+            "        <VnfFunction xmlns=\"urn:org:onap:appc:VnfFunction\">\n" +
             "          <id>1</id>\n" +
             "          <Interfaces>\n" +
             "            <id>1</id>\n" +
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfigRouterMock.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfigRouterMock.java
index eeaf2b21f..83e62bc9f 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfigRouterMock.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfigRouterMock.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.jsch;
+package org.onap.appc.adapter.netconf.jsch;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.jsch.NetconfClientJsch;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.jsch.NetconfClientJsch;
+import org.onap.appc.exceptions.APPCException;
 
 public class TestModifyConfigRouterMock {
 
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestOperationalStates.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestOperationalStates.java
index d5eaaedf3..263dd5a8f 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestOperationalStates.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestOperationalStates.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.jsch;
+package org.onap.appc.adapter.netconf.jsch;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.jsch.NetconfClientJsch;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.jsch.NetconfClientJsch;
+import org.onap.appc.exceptions.APPCException;
 
 public class TestOperationalStates {
 
@@ -37,14 +37,14 @@ public class TestOperationalStates {
     private static final String USER = "test";
     private static final String PSWD = "test123";
     private static final int PORT = 830;
-    private static final List<String> CAPABILITIES = Collections.singletonList("<capability>urn:org:openecomp:appc:capability:1.1.0</capability>");
+    private static final List<String> CAPABILITIES = Collections.singletonList("<capability>urn:org:onap:appc:capability:1.1.0</capability>");
     private static final String GET_OPERATIONAL_STATES =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
             "<rpc message-id=\"101\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n" +
             "       <get>\n" +
             "              <filter>\n" +
-            "                     <ManagedElement xmlns=\"urn:org:openecomp:appc:Test\">\n" +
-            "                           <VnfFunction xmlns=\"urn:org:openecomp:appc:Test\">\n" +
+            "                     <ManagedElement xmlns=\"urn:org:onap:appc:Test\">\n" +
+            "                           <VnfFunction xmlns=\"urn:org:onap:appc:Test\">\n" +
             "                                  <ProcessorManagement>\n" +
             "                                         <MatedPair>\n" +
             "                                                <operationalState/>\n" +
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml
index 2963fab97..c9faa98ff 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>appc-netconf-adapter</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -12,7 +12,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-netconf-adapter-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml
index 9c878839a..61d9a0a1f 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml
@@ -33,10 +33,10 @@
     <feature name='appc-netconf-adapter' description="appc-netconf-adapter" version='${project.version}'>
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-<!--         <bundle>mvn:org.openecomp.appc/appc-dmaap-adapter-bundle/${project.version}</bundle> -->
-        <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
+<!--         <bundle>mvn:org.onap.appc/appc-dmaap-adapter-bundle/${project.version}</bundle> -->
+        <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
         <bundle start-level="75">mvn:org.onap.ccsdk.sli.core/dblib-provider/${sdnctl.dblib.version}</bundle>
-        <bundle start-level="83" start="true">mvn:org.openecomp.appc/appc-netconf-adapter-bundle/${project.version}</bundle>
+        <bundle start-level="83" start="true">mvn:org.onap.appc/appc-netconf-adapter-bundle/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml
index 687c6270b..27c129f86 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>appc-netconf-adapter</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>appc-netconf-adapter-installer</artifactId>
@@ -13,13 +13,13 @@
     <properties>
         <application.name>appc-netconf-adapter</application.name>
         <features.boot>appc-netconf-adapter</features.boot>
-        <features.repositories>mvn:org.openecomp.appc/appc-netconf-adapter-features/${project.version}/xml/features</features.repositories>
+        <features.repositories>mvn:org.onap.appc/appc-netconf-adapter-features/${project.version}/xml/features</features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-netconf-adapter-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -32,7 +32,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-netconf-adapter-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-adapters/appc-netconf-adapter/pom.xml b/appc-adapters/appc-netconf-adapter/pom.xml
index 53f3742d4..81e3765f8 100644
--- a/appc-adapters/appc-netconf-adapter/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>appc-adapters</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -103,14 +103,14 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-netconf-adapter-features</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-netconf-adapter-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
index 29dc9820a..c8735640a 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-rest-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -31,12 +31,12 @@
 			<artifactId>bcprov-jdk15on</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 			<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 			<classifier>jar-with-dependencies</classifier>
@@ -194,8 +194,8 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>appc-rest-adapter</Bundle-SymbolicName>
-						<Bundle-Activator>org.openecomp.appc.adapter.rest.RestActivator</Bundle-Activator>
-						<Export-Package>org.openecomp.appc.adapter.rest</Export-Package>
+						<Bundle-Activator>org.onap.appc.adapter.rest.RestActivator</Bundle-Activator>
+						<Export-Package>org.onap.appc.adapter.rest</Export-Package>
 						<Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*</Import-Package>
 						<Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|jaxp-api</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RequestFactory.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RequestFactory.java
index b273a5de4..685ae13a9 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RequestFactory.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RequestFactory.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.openecomp.appc.adapter.rest;
+package org.onap.appc.adapter.rest;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestActivator.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestActivator.java
index 3cabd959d..3e224b923 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestActivator.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestActivator.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.rest;
+package org.onap.appc.adapter.rest;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.rest.impl.RestAdapterImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.rest.impl.RestAdapterImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.i18n.Msg;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestAdapter.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestAdapter.java
index 3acab7bc5..8542f105a 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestAdapter.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestAdapter.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.rest;
+package org.onap.appc.adapter.rest;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import com.att.cdp.zones.model.Server;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
@@ -47,24 +47,24 @@ public interface RestAdapter extends SvcLogicJavaPlugin {
      * correct provider support through the CDP IaaS abstraction layer and can be OpenStackProvider, BareMetalProvider,
      * or any other supported provider type.
      */
-    static final String PROPERTY_PROVIDER_TYPE = "org.openecomp.appc.provider.type";
+    static final String PROPERTY_PROVIDER_TYPE = "org.onap.appc.provider.type";
 
     /**
      * The adapter maintains a cache of providers organized by the name of the provider, not its type. This is
      * equivalent to the system or installation name. All regions within the same installation are assumed to be the
      * same type.
      */
-    static final String PROPERTY_PROVIDER_NAME = "org.openecomp.appc.provider.name";
+    static final String PROPERTY_PROVIDER_NAME = "org.onap.appc.provider.name";
 
     /**
      * The fully-qualified URL of the instance to be manipulated as it is known to the provider.
      */
-    static final String PROPERTY_INSTANCE_URL = "org.openecomp.appc.instance.url";
+    static final String PROPERTY_INSTANCE_URL = "org.onap.appc.instance.url";
 
     /**
      * The fully-qualified URL of the instance to be manipulated as it is known to the provider.
      */
-    static final String PROPERTY_IDENTITY_URL = "org.openecomp.appc.identity.url";
+    static final String PROPERTY_IDENTITY_URL = "org.onap.appc.identity.url";
 
     /**
      * This method is used to restart an existing virtual machine given the fully qualified URL of the machine.
@@ -73,11 +73,11 @@ public interface RestAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be restarted, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -103,11 +103,11 @@ public interface RestAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be stopped, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -133,11 +133,11 @@ public interface RestAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be started, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -163,11 +163,11 @@ public interface RestAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be rebuilt, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestContext.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestContext.java
index 38c1238cc..a3e6b1db4 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestContext.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestContext.java
@@ -24,11 +24,11 @@
 
 
 
-package org.openecomp.appc.adapter.rest.impl;
+package org.onap.appc.adapter.rest.impl;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 /**
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestFailedException.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestFailedException.java
index 4fa3c7bf2..3d3f35985 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestFailedException.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestFailedException.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.adapter.rest.impl;
+package org.onap.appc.adapter.rest.impl;
 
 import org.glassfish.grizzly.http.util.HttpStatus;
 import com.att.cdp.zones.model.Server;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RestAdapterImpl.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RestAdapterImpl.java
index fae0bd955..bbb37f4cf 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RestAdapterImpl.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RestAdapterImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.rest.impl;
+package org.onap.appc.adapter.rest.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -39,11 +39,11 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.glassfish.grizzly.http.util.HttpStatus;
 import org.json.JSONObject;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.rest.RestAdapter;
-import org.openecomp.appc.adapter.rest.RequestFactory;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.rest.RestAdapter;
+import org.onap.appc.adapter.rest.RequestFactory;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import java.util.Iterator;
@@ -91,7 +91,7 @@ public class RestAdapterImpl implements RestAdapter {
      * Returns the symbolic name of the adapter
      *
      * @return The adapter name
-     * @see org.openecomp.appc.adapter.rest.RestAdapter#getAdapterName()
+     * @see org.onap.appc.adapter.rest.RestAdapter#getAdapterName()
      */
     @Override
     public String getAdapterName() {
@@ -197,9 +197,9 @@ public class RestAdapterImpl implements RestAdapter {
     public HttpRequestBase createHttpRequest(String method, Map<String, String> params, RequestContext rc){
         HttpRequestBase httpRequest = null;
         try {
-            String tUrl = params.get("org.openecomp.appc.instance.URI");
-            String haveHeader = params.get("org.openecomp.appc.instance.haveHeader");
-            String headers = params.get("org.openecomp.appc.instance.headers");
+            String tUrl = params.get("org.onap.appc.instance.URI");
+            String haveHeader = params.get("org.onap.appc.instance.haveHeader");
+            String headers = params.get("org.onap.appc.instance.headers");
 
             Supplier<RequestFactory> requestFactory =  RequestFactory::new;
             httpRequest = requestFactory.get().getHttpRequest(method, tUrl);
@@ -213,8 +213,8 @@ public class RestAdapterImpl implements RestAdapter {
                     httpRequest.addHeader(String1, String2);
                 }
             }
-            if (params.containsKey("org.openecomp.appc.instance.requestBody")) {
-                String body = params.get("org.openecomp.appc.instance.requestBody");
+            if (params.containsKey("org.onap.appc.instance.requestBody")) {
+                String body = params.get("org.onap.appc.instance.requestBody");
                 StringEntity bodyParams = new StringEntity (body,"UTF-8");
                 if (method.equals("PUT")){
                     HttpPut httpPut = (HttpPut) httpRequest;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
index 6b3ca8d5a..c00220dd6 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,12 +70,12 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
 # The connection information to connect to the provider we are using.  These properties 
 # are "structured" properties, in that the name is a compound name, where the nodes 
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/adapter/rest/impl/TestRestAdapterImpl.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/adapter/rest/impl/TestRestAdapterImpl.java
index 5c027f5bf..65ff0d8f4 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/adapter/rest/impl/TestRestAdapterImpl.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/adapter/rest/impl/TestRestAdapterImpl.java
@@ -24,7 +24,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.rest.impl;
+package org.onap.appc.adapter.rest.impl;
 
 import static org.junit.Assert.assertEquals;
 
@@ -42,7 +42,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import com.att.cdp.exceptions.ZoneException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
@@ -71,8 +71,8 @@ public class TestRestAdapterImpl {
         ZoneException, APPCException {
 
         Map<String, String> params = new HashMap<>();
-        params.put("org.openecomp.appc.instance.URI", "http://example.com:8080/about/health");
-        params.put("org.openecomp.appc.instance.haveHeader","false");
+        params.put("org.onap.appc.instance.URI", "http://example.com:8080/about/health");
+        params.put("org.onap.appc.instance.haveHeader","false");
 
         HttpGet httpGet = ((HttpGet) givenParams(params, "GET"));
 
@@ -85,9 +85,9 @@ public class TestRestAdapterImpl {
         ZoneException, APPCException {    
 
         Map<String, String> params = new HashMap<>();
-        params.put("org.openecomp.appc.instance.URI", "http://example.com:8081/posttest");
-        params.put("org.openecomp.appc.instance.haveHeader","false");
-        params.put("org.openecomp.appc.instance.requestBody", "{\"name\":\"MyNode\", \"width\":200, \"height\":100}");
+        params.put("org.onap.appc.instance.URI", "http://example.com:8081/posttest");
+        params.put("org.onap.appc.instance.haveHeader","false");
+        params.put("org.onap.appc.instance.requestBody", "{\"name\":\"MyNode\", \"width\":200, \"height\":100}");
 
         HttpPost httpPost = ((HttpPost) givenParams(params, "POST"));
 
@@ -101,9 +101,9 @@ public class TestRestAdapterImpl {
         ZoneException, APPCException {    
 
         Map<String, String> params = new HashMap<>();
-        params.put("org.openecomp.appc.instance.URI", "http://example.com:8081/puttest");
-        params.put("org.openecomp.appc.instance.haveHeader","false");
-        params.put("org.openecomp.appc.instance.requestBody", "{\"name\":\"MyNode2\", \"width\":300, \"height\":300}");
+        params.put("org.onap.appc.instance.URI", "http://example.com:8081/puttest");
+        params.put("org.onap.appc.instance.haveHeader","false");
+        params.put("org.onap.appc.instance.requestBody", "{\"name\":\"MyNode2\", \"width\":300, \"height\":300}");
 
         HttpPut httpPut = ((HttpPut) givenParams(params, "PUT"));
         //Header headers[] = httpPut.getAllHeaders();
@@ -118,8 +118,8 @@ public class TestRestAdapterImpl {
         ZoneException, APPCException {    
 
         Map<String, String> params = new HashMap<>();
-        params.put("org.openecomp.appc.instance.URI", "http://example.com:8081/deletetest");
-        params.put("org.openecomp.appc.instance.haveHeader","false");
+        params.put("org.onap.appc.instance.URI", "http://example.com:8081/deletetest");
+        params.put("org.onap.appc.instance.haveHeader","false");
 
         HttpDelete httpDelete = ((HttpDelete) givenParams(params, "DELETE"));
 
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
index a9da29b99..7e0154e68 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -32,7 +32,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.appc.test.InterceptLogger;
+import org.onap.appc.test.InterceptLogger;
 
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
index 6181726f7..c67f0cc8b 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
index 2726adc6d..84cd0beb6 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,12 +70,12 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
 # The connection information to connect to the provider we are using.  These properties 
 # are "structured" properties, in that the name is a compound name, where the nodes 
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml
index 39a6d2d13..9a0fd3cc1 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-rest-adapter</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>appc-rest-adapter-features</artifactId>
@@ -13,7 +13,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-rest-adapter-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/src/main/resources/features.xml
index 2148dbb16..8ab5825ac 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/src/main/resources/features.xml
@@ -34,7 +34,7 @@
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
         <feature>sdnc-sli</feature>
-        <bundle>mvn:org.openecomp.appc/appc-rest-adapter-bundle/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-rest-adapter-bundle/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml
index 9afb640b4..11a75d662 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-rest-adapter</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>appc-rest-adapter-installer</artifactId>
@@ -13,13 +13,13 @@
   <properties>
     <application.name>appc-rest-adapter</application.name>
     <features.boot>appc-rest-adapter</features.boot>
-    <features.repositories>mvn:org.openecomp.appc/appc-rest-adapter-features/${project.version}/xml/features</features.repositories>
+    <features.repositories>mvn:org.onap.appc/appc-rest-adapter-features/${project.version}/xml/features</features.repositories>
     <include.transitive.dependencies>false</include.transitive.dependencies>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-rest-adapter-features</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
@@ -32,7 +32,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-rest-adapter-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-adapters/appc-rest-adapter/pom.xml b/appc-adapters/appc-rest-adapter/pom.xml
index 1d5a0177e..47841c151 100644
--- a/appc-adapters/appc-rest-adapter/pom.xml
+++ b/appc-adapters/appc-rest-adapter/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-adapters</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
@@ -100,7 +100,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-rest-adapter-features</artifactId>
         <classifier>features</classifier>
         <type>xml</type>
@@ -108,7 +108,7 @@
       </dependency>
 
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-rest-adapter-provider</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml
index 3f1256c2e..b5d60c11c 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-rest-healthcheck-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -45,7 +45,7 @@
 			<version>1.47</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 			<scope>compile</scope>
@@ -189,8 +189,8 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>appc-rest-healthcheck-adapter</Bundle-SymbolicName>
-						<Bundle-Activator>org.openecomp.appc.adapter.restHealthcheck.RestHealthcheckActivator</Bundle-Activator>
-						<Export-Package>org.openecomp.appc.adapter.restHealthcheck</Export-Package>
+						<Bundle-Activator>org.onap.appc.adapter.restHealthcheck.RestHealthcheckActivator</Bundle-Activator>
+						<Export-Package>org.onap.appc.adapter.restHealthcheck</Export-Package>
 						<Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*,javax.security.auth.*
 						</Import-Package>
 						<Embed-Dependency>
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckActivator.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckActivator.java
index facfb9c88..acd9d013b 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckActivator.java
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckActivator.java
@@ -22,13 +22,13 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.appc.adapter.restHealthcheck;
+package org.onap.appc.adapter.restHealthcheck;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.restHealthcheck.impl.RestHealthcheckAdapterImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.restHealthcheck.impl.RestHealthcheckAdapterImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.i18n.Msg;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.osgi.framework.BundleActivator;
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckAdapter.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckAdapter.java
index 201315caa..6413ec415 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckAdapter.java
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckAdapter.java
@@ -21,11 +21,11 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.appc.adapter.restHealthcheck;
+package org.onap.appc.adapter.restHealthcheck;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import com.att.cdp.zones.model.Server;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
@@ -34,15 +34,15 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 public interface RestHealthcheckAdapter extends SvcLogicJavaPlugin {
 
 
-    static final String PROPERTY_PROVIDER_TYPE = "org.openecomp.appc.provider.type";
+    static final String PROPERTY_PROVIDER_TYPE = "org.onap.appc.provider.type";
 
 
-    static final String PROPERTY_PROVIDER_NAME = "org.openecomp.appc.provider.name";
+    static final String PROPERTY_PROVIDER_NAME = "org.onap.appc.provider.name";
 
-    static final String PROPERTY_INSTANCE_URL = "org.openecomp.appc.instance.url";
+    static final String PROPERTY_INSTANCE_URL = "org.onap.appc.instance.url";
 
 
-    static final String PROPERTY_IDENTITY_URL = "org.openecomp.appc.identity.url";
+    static final String PROPERTY_IDENTITY_URL = "org.onap.appc.identity.url";
 
     String getAdapterName();
 
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestContext.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestContext.java
index b7bb47640..7114f5524 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestContext.java
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestContext.java
@@ -24,10 +24,10 @@
 
 
 
-package org.openecomp.appc.adapter.restHealthcheck.impl;
+package org.onap.appc.adapter.restHealthcheck.impl;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.Configuration;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.Configuration;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 public class RequestContext {
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestFailedException.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestFailedException.java
index c3cdc5103..07ed295ef 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestFailedException.java
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestFailedException.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.adapter.restHealthcheck.impl;
+package org.onap.appc.adapter.restHealthcheck.impl;
 
 import org.glassfish.grizzly.http.util.HttpStatus;
 
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RestHealthcheckAdapterImpl.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RestHealthcheckAdapterImpl.java
index 72c153cb5..37820a63d 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RestHealthcheckAdapterImpl.java
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RestHealthcheckAdapterImpl.java
@@ -22,17 +22,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.restHealthcheck.impl;
+package org.onap.appc.adapter.restHealthcheck.impl;
 
 import java.util.Map;
 import java.util.Properties;
 import org.apache.http.impl.client.CloseableHttpClient;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.restHealthcheck.RestHealthcheckAdapter;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.pool.PoolExtensionException;
-import org.openecomp.appc.util.StructuredPropertyHelper;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.restHealthcheck.RestHealthcheckAdapter;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.pool.PoolExtensionException;
+import org.onap.appc.util.StructuredPropertyHelper;
 
 
 import com.att.cdp.zones.ImageService;
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
index d979ea86d..248aabbd8 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,10 +70,10 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/adapter/restHealthcheck/impl/TestRestHealthcheckAdapterImpl.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/adapter/restHealthcheck/impl/TestRestHealthcheckAdapterImpl.java
index 106c44db9..e100a8a01 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/adapter/restHealthcheck/impl/TestRestHealthcheckAdapterImpl.java
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/adapter/restHealthcheck/impl/TestRestHealthcheckAdapterImpl.java
@@ -21,7 +21,7 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.appc.adapter.restHealthcheck.impl;
+package org.onap.appc.adapter.restHealthcheck.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -42,11 +42,11 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.MDC;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.restHealthcheck.*;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.exceptions.UnknownProviderException;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.restHealthcheck.*;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.UnknownProviderException;
 import com.att.cdp.exceptions.ZoneException;
 import com.att.cdp.zones.ComputeService;
 import com.att.cdp.zones.Context;
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
index a9da29b99..7e0154e68 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -32,7 +32,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.appc.test.InterceptLogger;
+import org.onap.appc.test.InterceptLogger;
 
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
index 6181726f7..c67f0cc8b 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
index 89078d15e..881ceab82 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded
 # to supply configuration options
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded
-org.openecomp.appc.resources=/opt/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=/opt/openecomp/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=/opt/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=/opt/openecomp/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0
 # means that the upper bound on the pool is unbounded.
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,12 +70,12 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
 # The connection information to connect to the provider we are using.  These properties
 # are "structured" properties, in that the name is a compound name, where the nodes
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/pom.xml
index 023a5dfa0..f57a7e646 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/pom.xml
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-rest-healthcheck-adapter</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>appc-rest-healthcheck-adapter-features</artifactId>
@@ -13,7 +13,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-rest-healthcheck-adapter-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/src/main/resources/features.xml
index e60076de3..0b9d73601 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/src/main/resources/features.xml
@@ -34,7 +34,7 @@
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
         <feature>sdnc-sli</feature>
-        <bundle>mvn:org.openecomp.appc/appc-rest-healthcheck-adapter-bundle/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-rest-healthcheck-adapter-bundle/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/pom.xml
index 04412b340..7b045584b 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/pom.xml
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>appc-rest-healthcheck-adapter</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>appc-rest-healthcheck-adapter-installer</artifactId>
@@ -12,12 +12,12 @@
     <properties>
         <application.name>appc-rest-healthcheck-adapter</application.name>
         <features.boot>appc-rest-healthcheck-adapter</features.boot>
-        <features.repositories>mvn:org.openecomp.appc/appc-rest-healthcheck-adapter-features/${project.version}/xml/features</features.repositories>
+        <features.repositories>mvn:org.onap.appc/appc-rest-healthcheck-adapter-features/${project.version}/xml/features</features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-rest-healthcheck-adapter-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -29,7 +29,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-rest-healthcheck-adapter-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/pom.xml
index 745bd7703..dc29ddbee 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/pom.xml
+++ b/appc-adapters/appc-rest-healthcheck-adapter/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-adapters</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
@@ -100,7 +100,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-rest-healthcheck-adapter-features</artifactId>
         <classifier>features</classifier>
         <type>xml</type>
@@ -108,7 +108,7 @@
       </dependency>
 
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-rest-healthcheck-adapter-provider</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml
index d6d321ddb..d35aeba70 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-ssh-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -25,7 +25,7 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
-						<Export-Package>org.openecomp.appc.adapter.ssh</Export-Package>
+						<Export-Package>org.onap.appc.adapter.ssh</Export-Package>
 						<Embed-Dependency>!dblib-provider</Embed-Dependency>
                         <Import-Package>!org.slf4j.impl,*;resolution:=optional</Import-Package>
 					</instructions>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/Constants.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/Constants.java
index 2fc01705d..d3ed28a75 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/Constants.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/Constants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 public class Constants {
 
@@ -49,8 +49,8 @@ public class Constants {
     // input fields names
     public static final String PAYLOAD = "payload";
 
-    public static final String CONNECTION_RETRY_DELAY = "org.openecomp.appc.ssh.connection.retry.delay";
-    public static final String CONNECTION_RETRY_COUNT = "org.openecomp.appc.ssh.connection.retry.count";
+    public static final String CONNECTION_RETRY_DELAY = "org.onap.appc.ssh.connection.retry.delay";
+    public static final String CONNECTION_RETRY_COUNT = "org.onap.appc.ssh.connection.retry.count";
     public static final int DEFAULT_CONNECTION_RETRY_DELAY = 60;
     public static final int DEFAULT_CONNECTION_RETRY_COUNT = 5;
 
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshAdapter.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshAdapter.java
index ecfd0238a..768a7d317 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshAdapter.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshAdapter.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 /**
  * Factory class for creating SshConnection instances.
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshConnection.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshConnection.java
index 6d8acae6e..68d98575b 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshConnection.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshConnection.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 import java.io.OutputStream;
 
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshConnectionDetails.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshConnectionDetails.java
index 5e56003d8..de1b301bc 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshConnectionDetails.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshConnectionDetails.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 /**
  * Provides details required for connecting to device.
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessException.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessException.java
index 463dc7174..cb18375d4 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessException.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 
 
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessService.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessService.java
index 08d66aaa6..d932faa78 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessService.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
 
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshException.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshException.java
index 01e349028..6c906c7f7 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshException.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 public class SshException extends RuntimeException {
 
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml
index f1ea1555e..51a643fc0 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
 		<artifactId>appc-ssh-adapter</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -12,13 +12,13 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-ssh-adapter-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-ssh-adapter-sshd</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/src/main/resources/features.xml
index ec7096434..124346814 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/src/main/resources/features.xml
@@ -29,8 +29,8 @@
 		  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 	<feature name='appc-ssh-adapter' description="appc-ssh-adapter" version='${project.version}'>
 <!--         <feature version='${sdnctl.dblib.version}'>sdnc-dblib</feature> -->
-        <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-ssh-adapter-api/${project.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-ssh-adapter-sshd/${project.version}</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-ssh-adapter-api/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-ssh-adapter-sshd/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml
index 395dbfe4d..7fee5e54f 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-ssh-adapter</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -13,7 +13,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-ssh-adapter-api</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
@@ -33,7 +33,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-common</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -51,8 +51,8 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Export-Service>org.openecomp.appc.adapter.ssh.SshAdapter</Export-Service>
-                        <Private-Package>org.openecomp.appc.adapter.ssh.impl.*</Private-Package>
+                        <Export-Service>org.onap.appc.adapter.ssh.SshAdapter</Export-Service>
+                        <Private-Package>org.onap.appc.adapter.ssh.impl.*</Private-Package>
                         <Import-Package>!org.apache.log,!org.apache.commons.logging,!groovy.lang,!javax.jms,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.codehaus.janino,!com.ibm.icu.*,!com.sun.faces.*,!org.jasypt.*,*</Import-Package>
                         <Embed-Dependency>!dblib-provider,jasypt,eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSshd.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSshd.java
index 4a277a013..a5bbe34e2 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSshd.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSshd.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh.sshd;
+package org.onap.appc.adapter.ssh.sshd;
 
-import org.openecomp.appc.adapter.ssh.SshAdapter;
-import org.openecomp.appc.adapter.ssh.SshConnection;
+import org.onap.appc.adapter.ssh.SshAdapter;
+import org.onap.appc.adapter.ssh.SshConnection;
 
 public class SshAdapterSshd implements SshAdapter {
 
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshConnectionSshd.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshConnectionSshd.java
index fae4fd9fe..c35c58798 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshConnectionSshd.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshConnectionSshd.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh.sshd;
-
-import org.openecomp.appc.adapter.ssh.Constants;
-import org.openecomp.appc.adapter.ssh.SshConnection;
-import org.openecomp.appc.adapter.ssh.SshException;
-import org.openecomp.appc.encryption.EncryptionTool;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+package org.onap.appc.adapter.ssh.sshd;
+
+import org.onap.appc.adapter.ssh.Constants;
+import org.onap.appc.adapter.ssh.SshConnection;
+import org.onap.appc.adapter.ssh.SshException;
+import org.onap.appc.encryption.EncryptionTool;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.apache.sshd.ClientChannel;
 import org.apache.sshd.ClientSession;
 import org.apache.sshd.SshClient;
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshdDataAccessService.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshdDataAccessService.java
index 87d85faef..07a814083 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshdDataAccessService.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshdDataAccessService.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh.sshd;
+package org.onap.appc.adapter.ssh.sshd;
 
 import javax.sql.rowset.CachedRowSet;
 
-import org.openecomp.appc.adapter.ssh.Constants;
-import org.openecomp.appc.adapter.ssh.SshConnectionDetails;
-import org.openecomp.appc.adapter.ssh.SshDataAccessException;
-import org.openecomp.appc.adapter.ssh.SshDataAccessService;
+import org.onap.appc.adapter.ssh.Constants;
+import org.onap.appc.adapter.ssh.SshConnectionDetails;
+import org.onap.appc.adapter.ssh.SshDataAccessException;
+import org.onap.appc.adapter.ssh.SshDataAccessService;
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
 
 import java.sql.SQLException;
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 2482c6828..98867c614 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -28,14 +28,14 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
-    <bean id="sshdBean" class="org.openecomp.appc.adapter.ssh.sshd.SshAdapterSshd" scope="singleton"/>
-    <service id="sshAdapter" interface="org.openecomp.appc.adapter.ssh.SshAdapter" ref="sshdBean"/>
+    <bean id="sshdBean" class="org.onap.appc.adapter.ssh.sshd.SshAdapterSshd" scope="singleton"/>
+    <service id="sshAdapter" interface="org.onap.appc.adapter.ssh.SshAdapter" ref="sshdBean"/>
 
     <reference id="dbLibServiceRef" availability="mandatory" activation="eager" interface="org.onap.ccsdk.sli.core.dblib.DbLibService" />
-    <bean id="sshdDAServiceBean" class="org.openecomp.appc.adapter.ssh.sshd.SshdDataAccessService" scope="singleton">
+    <bean id="sshdDAServiceBean" class="org.onap.appc.adapter.ssh.sshd.SshdDataAccessService" scope="singleton">
         <property name="dbLibService" ref="dbLibServiceRef" />
     </bean>
 
-    <service id="sshDAService" interface="org.openecomp.appc.adapter.ssh.SshDataAccessService" ref="sshdDAServiceBean"/>
+    <service id="sshDAService" interface="org.onap.appc.adapter.ssh.SshDataAccessService" ref="sshdDAServiceBean"/>
 
 </blueprint>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/test/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSample.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/test/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSample.java
index d7d45dc04..f79a81856 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/test/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSample.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/test/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSample.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh.sshd;
+package org.onap.appc.adapter.ssh.sshd;
 
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 
-import org.openecomp.appc.adapter.ssh.SshAdapter;
-import org.openecomp.appc.adapter.ssh.SshConnection;
-import org.openecomp.appc.adapter.ssh.sshd.SshAdapterSshd;
+import org.onap.appc.adapter.ssh.SshAdapter;
+import org.onap.appc.adapter.ssh.SshConnection;
+import org.onap.appc.adapter.ssh.sshd.SshAdapterSshd;
 
 public class SshAdapterSample {
 
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/test/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterTest.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/test/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterTest.java
index f35312fe0..12b2258d0 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/test/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterTest.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/test/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh.sshd;
+package org.onap.appc.adapter.ssh.sshd;
 
 import org.apache.sshd.SshServer;
 import org.apache.sshd.common.NamedFactory;
@@ -39,10 +39,10 @@ import org.apache.sshd.server.shell.ProcessShellFactory;
 import org.hamcrest.CoreMatchers;
 import org.junit.*;
 import org.junit.rules.ExpectedException;
-import org.openecomp.appc.adapter.ssh.SshAdapter;
-import org.openecomp.appc.adapter.ssh.SshConnection;
-import org.openecomp.appc.adapter.ssh.SshException;
-import org.openecomp.appc.adapter.ssh.sshd.SshAdapterSshd;
+import org.onap.appc.adapter.ssh.SshAdapter;
+import org.onap.appc.adapter.ssh.SshConnection;
+import org.onap.appc.adapter.ssh.SshException;
+import org.onap.appc.adapter.ssh.sshd.SshAdapterSshd;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml
index 704df4fed..c2a4dccc5 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-ssh-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -10,7 +10,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-ssh-adapter-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/openecomp/appc/adapter/ssh/SshAdapterMock.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/openecomp/appc/adapter/ssh/SshAdapterMock.java
index f0bc0284c..4b5cc4ef2 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/openecomp/appc/adapter/ssh/SshAdapterMock.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/openecomp/appc/adapter/ssh/SshAdapterMock.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/openecomp/appc/adapter/ssh/SshConnectionMock.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/openecomp/appc/adapter/ssh/SshConnectionMock.java
index caf40738c..f8fa1621e 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/openecomp/appc/adapter/ssh/SshConnectionMock.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/openecomp/appc/adapter/ssh/SshConnectionMock.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.appc.adapter.ssh.SshConnection;
+import org.onap.appc.adapter.ssh.SshConnection;
 
 public class SshConnectionMock implements SshConnection {
 
diff --git a/appc-adapters/appc-ssh-adapter/pom.xml b/appc-adapters/appc-ssh-adapter/pom.xml
index 1777b9b54..4f543bd1e 100644
--- a/appc-adapters/appc-ssh-adapter/pom.xml
+++ b/appc-adapters/appc-ssh-adapter/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
 		<artifactId>appc-adapters</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/appc-adapters/pom.xml b/appc-adapters/pom.xml
index 111f3b7ca..58733da1b 100644
--- a/appc-adapters/pom.xml
+++ b/appc-adapters/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
diff --git a/appc-client/client-kit/pom.xml b/appc-client/client-kit/pom.xml
index 7462a2cbd..cc21d0401 100644
--- a/appc-client/client-kit/pom.xml
+++ b/appc-client/client-kit/pom.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <artifactId>appc-java-client</artifactId>

-        <groupId>org.openecomp.appc.client</groupId>

+        <groupId>org.onap.appc.client</groupId>

         <version>1.3.0-SNAPSHOT</version>

     </parent>

 

@@ -40,7 +40,7 @@
 

     <dependencies>

         <dependency>

-            <groupId>org.openecomp.appc.client</groupId>

+            <groupId>org.onap.appc.client</groupId>

             <artifactId>client-lib</artifactId>

             <version>${project.parent.version}</version>

         </dependency>

diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/RPC.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/RPC.java
index 001a3035e..2b2c5220a 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/RPC.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/RPC.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc;
+package org.onap.appc;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcClientServiceFactoryProvider.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcClientServiceFactoryProvider.java
index ba6284ecd..0ae23f19a 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcClientServiceFactoryProvider.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcClientServiceFactoryProvider.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.lcm.api;
+package org.onap.appc.client.lcm.api;
 
-import org.openecomp.appc.client.lcm.impl.business.AppcLifeCycleManagerServiceFactoryImpl;
+import org.onap.appc.client.lcm.impl.business.AppcLifeCycleManagerServiceFactoryImpl;
 
 public class AppcClientServiceFactoryProvider {
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcLifeCycleManagerServiceFactory.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcLifeCycleManagerServiceFactory.java
index 7bf97907e..c0d2daa01 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcLifeCycleManagerServiceFactory.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcLifeCycleManagerServiceFactory.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.lcm.api;
+package org.onap.appc.client.lcm.api;
 
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
 
 import java.util.Properties;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ApplicationContext.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ApplicationContext.java
index 5829b0f92..b0877ef55 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ApplicationContext.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ApplicationContext.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.lcm.api;
+package org.onap.appc.client.lcm.api;
 
 /**
  * Created by gital on 11/27/2016.
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/LifeCycleManagerStateful.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/LifeCycleManagerStateful.java
index 3a2aeb0dc..5600f137f 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/LifeCycleManagerStateful.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/LifeCycleManagerStateful.java
@@ -25,60 +25,60 @@
 /*
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.api;
-
-import org.openecomp.appc.client.lcm.model.AuditOutput;
-import org.openecomp.appc.client.lcm.model.AuditInput;
-import org.openecomp.appc.client.lcm.model.CheckLockOutput;
-import org.openecomp.appc.client.lcm.model.CheckLockInput;
-import org.openecomp.appc.client.lcm.model.ConfigBackupOutput;
-import org.openecomp.appc.client.lcm.model.ConfigBackupInput;
-import org.openecomp.appc.client.lcm.model.ConfigBackupDeleteOutput;
-import org.openecomp.appc.client.lcm.model.ConfigBackupDeleteInput;
-import org.openecomp.appc.client.lcm.model.ConfigExportOutput;
-import org.openecomp.appc.client.lcm.model.ConfigExportInput;
-import org.openecomp.appc.client.lcm.model.ConfigModifyOutput;
-import org.openecomp.appc.client.lcm.model.ConfigModifyInput;
-import org.openecomp.appc.client.lcm.model.ConfigRestoreOutput;
-import org.openecomp.appc.client.lcm.model.ConfigRestoreInput;
-import org.openecomp.appc.client.lcm.model.ConfigScaleoutOutput;
-import org.openecomp.appc.client.lcm.model.ConfigScaleoutInput;
-import org.openecomp.appc.client.lcm.model.ConfigureOutput;
-import org.openecomp.appc.client.lcm.model.ConfigureInput;
-import org.openecomp.appc.client.lcm.model.EvacuateOutput;
-import org.openecomp.appc.client.lcm.model.EvacuateInput;
-import org.openecomp.appc.client.lcm.model.HealthCheckOutput;
-import org.openecomp.appc.client.lcm.model.HealthCheckInput;
-import org.openecomp.appc.client.lcm.model.LiveUpgradeOutput;
-import org.openecomp.appc.client.lcm.model.LiveUpgradeInput;
-import org.openecomp.appc.client.lcm.model.LockOutput;
-import org.openecomp.appc.client.lcm.model.LockInput;
-import org.openecomp.appc.client.lcm.model.MigrateOutput;
-import org.openecomp.appc.client.lcm.model.MigrateInput;
-import org.openecomp.appc.client.lcm.model.RebuildOutput;
-import org.openecomp.appc.client.lcm.model.RebuildInput;
-import org.openecomp.appc.client.lcm.model.RestartOutput;
-import org.openecomp.appc.client.lcm.model.RestartInput;
-import org.openecomp.appc.client.lcm.model.RollbackOutput;
-import org.openecomp.appc.client.lcm.model.RollbackInput;
-import org.openecomp.appc.client.lcm.model.SnapshotOutput;
-import org.openecomp.appc.client.lcm.model.SnapshotInput;
-import org.openecomp.appc.client.lcm.model.SoftwareUploadOutput;
-import org.openecomp.appc.client.lcm.model.SoftwareUploadInput;
-import org.openecomp.appc.client.lcm.model.StartOutput;
-import org.openecomp.appc.client.lcm.model.StartInput;
-import org.openecomp.appc.client.lcm.model.StopOutput;
-import org.openecomp.appc.client.lcm.model.StopInput;
-import org.openecomp.appc.client.lcm.model.SyncOutput;
-import org.openecomp.appc.client.lcm.model.SyncInput;
-import org.openecomp.appc.client.lcm.model.TerminateOutput;
-import org.openecomp.appc.client.lcm.model.TerminateInput;
-import org.openecomp.appc.client.lcm.model.TestOutput;
-import org.openecomp.appc.client.lcm.model.TestInput;
-import org.openecomp.appc.client.lcm.model.UnlockOutput;
-import org.openecomp.appc.client.lcm.model.UnlockInput;
-import org.openecomp.appc.RPC;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
+package org.onap.appc.client.lcm.api;
+
+import org.onap.appc.client.lcm.model.AuditOutput;
+import org.onap.appc.client.lcm.model.AuditInput;
+import org.onap.appc.client.lcm.model.CheckLockOutput;
+import org.onap.appc.client.lcm.model.CheckLockInput;
+import org.onap.appc.client.lcm.model.ConfigBackupOutput;
+import org.onap.appc.client.lcm.model.ConfigBackupInput;
+import org.onap.appc.client.lcm.model.ConfigBackupDeleteOutput;
+import org.onap.appc.client.lcm.model.ConfigBackupDeleteInput;
+import org.onap.appc.client.lcm.model.ConfigExportOutput;
+import org.onap.appc.client.lcm.model.ConfigExportInput;
+import org.onap.appc.client.lcm.model.ConfigModifyOutput;
+import org.onap.appc.client.lcm.model.ConfigModifyInput;
+import org.onap.appc.client.lcm.model.ConfigRestoreOutput;
+import org.onap.appc.client.lcm.model.ConfigRestoreInput;
+import org.onap.appc.client.lcm.model.ConfigScaleoutOutput;
+import org.onap.appc.client.lcm.model.ConfigScaleoutInput;
+import org.onap.appc.client.lcm.model.ConfigureOutput;
+import org.onap.appc.client.lcm.model.ConfigureInput;
+import org.onap.appc.client.lcm.model.EvacuateOutput;
+import org.onap.appc.client.lcm.model.EvacuateInput;
+import org.onap.appc.client.lcm.model.HealthCheckOutput;
+import org.onap.appc.client.lcm.model.HealthCheckInput;
+import org.onap.appc.client.lcm.model.LiveUpgradeOutput;
+import org.onap.appc.client.lcm.model.LiveUpgradeInput;
+import org.onap.appc.client.lcm.model.LockOutput;
+import org.onap.appc.client.lcm.model.LockInput;
+import org.onap.appc.client.lcm.model.MigrateOutput;
+import org.onap.appc.client.lcm.model.MigrateInput;
+import org.onap.appc.client.lcm.model.RebuildOutput;
+import org.onap.appc.client.lcm.model.RebuildInput;
+import org.onap.appc.client.lcm.model.RestartOutput;
+import org.onap.appc.client.lcm.model.RestartInput;
+import org.onap.appc.client.lcm.model.RollbackOutput;
+import org.onap.appc.client.lcm.model.RollbackInput;
+import org.onap.appc.client.lcm.model.SnapshotOutput;
+import org.onap.appc.client.lcm.model.SnapshotInput;
+import org.onap.appc.client.lcm.model.SoftwareUploadOutput;
+import org.onap.appc.client.lcm.model.SoftwareUploadInput;
+import org.onap.appc.client.lcm.model.StartOutput;
+import org.onap.appc.client.lcm.model.StartInput;
+import org.onap.appc.client.lcm.model.StopOutput;
+import org.onap.appc.client.lcm.model.StopInput;
+import org.onap.appc.client.lcm.model.SyncOutput;
+import org.onap.appc.client.lcm.model.SyncInput;
+import org.onap.appc.client.lcm.model.TerminateOutput;
+import org.onap.appc.client.lcm.model.TerminateInput;
+import org.onap.appc.client.lcm.model.TestOutput;
+import org.onap.appc.client.lcm.model.TestInput;
+import org.onap.appc.client.lcm.model.UnlockOutput;
+import org.onap.appc.client.lcm.model.UnlockInput;
+import org.onap.appc.RPC;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
 
 /**
  * Defines the services and request/response requirements for the ECOMP APP-C
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ResponseHandler.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ResponseHandler.java
index f762dea2c..68459925f 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ResponseHandler.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ResponseHandler.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.lcm.api;
+package org.onap.appc.client.lcm.api;
 
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
 
 public interface ResponseHandler<T> {
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientBusinessException.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientBusinessException.java
index 054dcc1ec..7d91f39e5 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientBusinessException.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientBusinessException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.lcm.exceptions;
+package org.onap.appc.client.lcm.exceptions;
 
 public class AppcClientBusinessException extends AppcClientException {
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientException.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientException.java
index aad22ee38..c72f6150e 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientException.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.lcm.exceptions;
+package org.onap.appc.client.lcm.exceptions;
 
 public class AppcClientException extends Exception {
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientInternalException.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientInternalException.java
index a92eb5562..9b6dfed7b 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientInternalException.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientInternalException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.lcm.exceptions;
+package org.onap.appc.client.lcm.exceptions;
 
 public class AppcClientInternalException extends AppcClientException {
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/AppcLifeCycleManagerServiceFactoryImpl.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/AppcLifeCycleManagerServiceFactoryImpl.java
index 2cd671153..b8ab36bbe 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/AppcLifeCycleManagerServiceFactoryImpl.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/AppcLifeCycleManagerServiceFactoryImpl.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.lcm.impl.business;
+package org.onap.appc.client.lcm.impl.business;
 
-import org.openecomp.appc.client.lcm.api.AppcLifeCycleManagerServiceFactory;
-import org.openecomp.appc.client.lcm.api.ApplicationContext;
-import org.openecomp.appc.client.lcm.api.LifeCycleManagerStateful;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.client.lcm.api.AppcLifeCycleManagerServiceFactory;
+import org.onap.appc.client.lcm.api.ApplicationContext;
+import org.onap.appc.client.lcm.api.LifeCycleManagerStateful;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
 
 import java.lang.reflect.Proxy;
 import java.util.Properties;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreAsyncResponseHandlerImpl.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreAsyncResponseHandlerImpl.java
index c01199e58..96e21d8f8 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreAsyncResponseHandlerImpl.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreAsyncResponseHandlerImpl.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.lcm.impl.business;
+package org.onap.appc.client.lcm.impl.business;
 
-import org.openecomp.appc.client.impl.core.CoreException;
-import org.openecomp.appc.client.impl.core.ICoreAsyncResponseHandler;
-import org.openecomp.appc.client.lcm.api.ResponseHandler;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.client.impl.core.CoreException;
+import org.onap.appc.client.impl.core.ICoreAsyncResponseHandler;
+import org.onap.appc.client.lcm.api.ResponseHandler;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 class CoreAsyncResponseHandlerImpl<T> extends CoreResponseHandler implements ICoreAsyncResponseHandler {
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreResponseHandler.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreResponseHandler.java
index 7a04251c8..3d4786862 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreResponseHandler.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreResponseHandler.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.lcm.impl.business;
+package org.onap.appc.client.lcm.impl.business;
 
-import org.openecomp.appc.client.lcm.exceptions.AppcClientInternalException;
+import org.onap.appc.client.lcm.exceptions.AppcClientInternalException;
 
-import org.openecomp.appc.client.lcm.model.Status;
+import org.onap.appc.client.lcm.model.Status;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreSyncResponseHandlerImpl.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreSyncResponseHandlerImpl.java
index 34aae4723..66da8fbe2 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreSyncResponseHandlerImpl.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreSyncResponseHandlerImpl.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.lcm.impl.business;
+package org.onap.appc.client.lcm.impl.business;
 
-import org.openecomp.appc.client.impl.core.CoreException;
-import org.openecomp.appc.client.impl.core.ICoreSyncResponseHandler;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientInternalException;
+import org.onap.appc.client.impl.core.CoreException;
+import org.onap.appc.client.impl.core.ICoreSyncResponseHandler;
+import org.onap.appc.client.lcm.exceptions.AppcClientInternalException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 class CoreSyncResponseHandlerImpl<T> extends CoreResponseHandler implements ICoreSyncResponseHandler {
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/LCMRequestProcessor.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/LCMRequestProcessor.java
index 941e74dce..b718c1ac9 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/LCMRequestProcessor.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/LCMRequestProcessor.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.lcm.impl.business;
+package org.onap.appc.client.lcm.impl.business;
 
-import org.openecomp.appc.client.impl.core.*;
-import org.openecomp.appc.client.lcm.api.ApplicationContext;
-import org.openecomp.appc.client.lcm.api.ResponseHandler;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientBusinessException;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientInternalException;
-import org.openecomp.appc.client.lcm.model.CommonHeader;
+import org.onap.appc.client.impl.core.*;
+import org.onap.appc.client.lcm.api.ApplicationContext;
+import org.onap.appc.client.lcm.api.ResponseHandler;
+import org.onap.appc.client.lcm.exceptions.AppcClientBusinessException;
+import org.onap.appc.client.lcm.exceptions.AppcClientInternalException;
+import org.onap.appc.client.lcm.model.CommonHeader;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/RPCInvocator.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/RPCInvocator.java
index 97ff1c46f..525700d62 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/RPCInvocator.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/RPCInvocator.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.lcm.impl.business;
+package org.onap.appc.client.lcm.impl.business;
 
-import org.openecomp.appc.RPC;
-import org.openecomp.appc.client.lcm.api.ResponseHandler;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientBusinessException;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientInternalException;
+import org.onap.appc.RPC;
+import org.onap.appc.client.lcm.api.ResponseHandler;
+import org.onap.appc.client.lcm.exceptions.AppcClientBusinessException;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.client.lcm.exceptions.AppcClientInternalException;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Action.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Action.java
index 3884428ff..d43a61c92 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Action.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Action.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ActionIdentifiers.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ActionIdentifiers.java
index 54bd9a627..bff2c44cb 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ActionIdentifiers.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ActionIdentifiers.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditInput.java
index b5f15e00f..2301913a9 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditOutput.java
index 975c01b8f..00f4244ba 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockInput.java
index a0fdfee87..840aad615 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockOutput.java
index b72ac0491..2bfdea0fe 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CommonHeader.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CommonHeader.java
index e71ad1294..43320d333 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CommonHeader.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CommonHeader.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteInput.java
index 96a87666d..c5f14b6ae 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteOutput.java
index 4edcfdb69..730240276 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupInput.java
index 8f6f64f39..26f799cb4 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupOutput.java
index 14f872192..1768ea74d 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportInput.java
index e42e2dfe2..5c2d98d19 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportOutput.java
index 25984aa1f..bbfe27af1 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyInput.java
index c4c16d602..c1a9e6be6 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyOutput.java
index bc7e249da..356299d77 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreInput.java
index bfda83030..ec26bae34 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreOutput.java
index 788c973a3..0646d670b 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutInput.java
index a81904472..14c62689a 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutOutput.java
index 553d72644..fb3f1973a 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureInput.java
index a1fe98964..b56d692b8 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureOutput.java
index 3de081468..fcf32bf2d 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateInput.java
index b7908cdbd..85c36e8a4 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateOutput.java
index dd1dc0e03..2c73a5b84 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Flags.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Flags.java
index f0fa8f093..01d2652dd 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Flags.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Flags.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckInput.java
index 2124d3cfe..7bd3207cb 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckOutput.java
index 6c2f5cc08..41a907c71 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeInput.java
index 980bcae3e..82a971bc7 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeOutput.java
index 3b40bde58..809adcd8f 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockInput.java
index cb6bbe517..f6f68d2c6 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockOutput.java
index 8c08002af..0f77bced6 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateInput.java
index 89504a950..5877aab07 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateOutput.java
index 38a439389..4d804db9a 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Payload.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Payload.java
index 23a15ce4b..56ce6c529 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Payload.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Payload.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildInput.java
index 1041d515a..ecd199dee 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildOutput.java
index 48ade9328..0816c5b87 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartInput.java
index 49a4a7ccb..4df2184c4 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartOutput.java
index 69fc9def3..8c44631dd 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackInput.java
index 576954c99..db688c0ec 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackOutput.java
index ae8bbd068..21aa1f08f 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotInput.java
index fe13e9842..b3492c2dd 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotOutput.java
index 931f09db3..9036b2607 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadInput.java
index 286b351d2..270121a96 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadOutput.java
index 02bf80cdb..8e32dd3a2 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationInput.java
index a37228759..dca0bc47b 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationOutput.java
index 7b3c193f4..061f2476e 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartInput.java
index cfcf46384..3e0829b52 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartOutput.java
index c3e58644d..1efcae95d 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Status.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Status.java
index c70d8646c..85f64c790 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Status.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Status.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationInput.java
index 56e828216..dc9bf4840 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationOutput.java
index 071276d36..d0193a16d 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopInput.java
index 1cc7af4c3..f5477405e 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopOutput.java
index 2fb0b7110..9160a98f7 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncInput.java
index c9b861355..2928c76a2 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncOutput.java
index 0fbe7e9f4..82347d295 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateInput.java
index 44b0b8ef7..de45dddda 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateOutput.java
index f3740c4ea..1a78f0e3f 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestInput.java
index 27507d9d1..33dab668e 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestOutput.java
index 5c2090183..283a92d7e 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockInput.java
index e073c2dcf..b03c683b7 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockInput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockOutput.java
index fb7cfeecb..9830c8f87 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockOutput.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ZULU.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ZULU.java
index 0517a906e..416b56a20 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ZULU.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ZULU.java
@@ -25,7 +25,7 @@
 /**
  * NOTE: This file is auto-generated and should not be changed manually.
  */
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/appc-client/client-kit/src/test/java/client/lcm/api/AppcClientServiceFactoryProviderTest.java b/appc-client/client-kit/src/test/java/client/lcm/api/AppcClientServiceFactoryProviderTest.java
index 74c7046c6..9c06f5aa3 100644
--- a/appc-client/client-kit/src/test/java/client/lcm/api/AppcClientServiceFactoryProviderTest.java
+++ b/appc-client/client-kit/src/test/java/client/lcm/api/AppcClientServiceFactoryProviderTest.java
@@ -26,8 +26,8 @@ package client.lcm.api;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.client.lcm.api.AppcClientServiceFactoryProvider;
-import org.openecomp.appc.client.lcm.api.AppcLifeCycleManagerServiceFactory;
+import org.onap.appc.client.lcm.api.AppcClientServiceFactoryProvider;
+import org.onap.appc.client.lcm.api.AppcLifeCycleManagerServiceFactory;
 
 public class AppcClientServiceFactoryProviderTest {
 
diff --git a/appc-client/client-kit/src/test/java/client/lcm/api/ApplicationContextTest.java b/appc-client/client-kit/src/test/java/client/lcm/api/ApplicationContextTest.java
index c56172798..5bfad74dd 100644
--- a/appc-client/client-kit/src/test/java/client/lcm/api/ApplicationContextTest.java
+++ b/appc-client/client-kit/src/test/java/client/lcm/api/ApplicationContextTest.java
@@ -2,7 +2,7 @@ package client.lcm.api;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.client.lcm.api.ApplicationContext;
+import org.onap.appc.client.lcm.api.ApplicationContext;
 
 
 public class ApplicationContextTest {
diff --git a/appc-client/client-kit/src/test/java/json2java/Json2JavaGeneratorTest.java b/appc-client/client-kit/src/test/java/json2java/Json2JavaGeneratorTest.java
index b5ded0283..e9ed8ec13 100644
--- a/appc-client/client-kit/src/test/java/json2java/Json2JavaGeneratorTest.java
+++ b/appc-client/client-kit/src/test/java/json2java/Json2JavaGeneratorTest.java
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.generator.JsonHelper;
+import org.onap.appc.generator.JsonHelper;
 
 import java.io.File;
 import java.io.IOException;
@@ -41,8 +41,8 @@ import java.util.regex.Pattern;
 public class Json2JavaGeneratorTest {
 
     private static JsonNode jsonNode = null;
-    private static final String MODEL_PACKAGE = "org.openecomp.appc.client.lcm.model";
-    private static final String GENERATED_LCM_API_CLASS = "org.openecomp.appc.client.lcm.api.LifeCycleManagerStateful";
+    private static final String MODEL_PACKAGE = "org.onap.appc.client.lcm.model";
+    private static final String GENERATED_LCM_API_CLASS = "org.onap.appc.client.lcm.api.LifeCycleManagerStateful";
 
     //@Before
     public void readIOfiles() throws IOException{
diff --git a/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/impl/business/TestAppcLifeCycleManagerServiceFactoryImpl.java b/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/impl/business/TestAppcLifeCycleManagerServiceFactoryImpl.java
index 865110180..6b24b0a83 100644
--- a/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/impl/business/TestAppcLifeCycleManagerServiceFactoryImpl.java
+++ b/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/impl/business/TestAppcLifeCycleManagerServiceFactoryImpl.java
@@ -1,13 +1,13 @@
-package org.openecomp.appc.client.lcm.impl.business;
+package org.onap.appc.client.lcm.impl.business;
 
 
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.appc.client.lcm.api.ApplicationContext;
-import org.openecomp.appc.client.lcm.api.LifeCycleManagerStateful;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
-import org.openecomp.appc.client.lcm.impl.business.LCMRequestProcessor;
+import org.onap.appc.client.lcm.api.ApplicationContext;
+import org.onap.appc.client.lcm.api.LifeCycleManagerStateful;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.client.lcm.impl.business.LCMRequestProcessor;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/model/TestModelPOJO.java b/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/model/TestModelPOJO.java
index 9aab1c334..9cb3b9f56 100644
--- a/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/model/TestModelPOJO.java
+++ b/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/model/TestModelPOJO.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/JsonHelper.java b/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/JsonHelper.java
index 6d9bf628f..e75a44e65 100644
--- a/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/JsonHelper.java
+++ b/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/JsonHelper.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.generator;
+package org.onap.appc.generator;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
diff --git a/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/yang2json/Yang2JsonGeneratorTest.java b/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/yang2json/Yang2JsonGeneratorTest.java
index 2e8ef9577..ff3a4ccb6 100644
--- a/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/yang2json/Yang2JsonGeneratorTest.java
+++ b/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/yang2json/Yang2JsonGeneratorTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.generator.yang2json;
+package org.onap.appc.generator.yang2json;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -36,7 +36,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException;
 import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceException;
 import org.opendaylight.yangtools.yang.parser.repo.YangTextSchemaContextResolver;
-import org.openecomp.appc.generator.JsonHelper;
+import org.onap.appc.generator.JsonHelper;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/appc-client/client-lib/pom.xml b/appc-client/client-lib/pom.xml
index c153555a2..ad86c0b3a 100644
--- a/appc-client/client-lib/pom.xml
+++ b/appc-client/client-lib/pom.xml
@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <artifactId>appc-java-client</artifactId>

-        <groupId>org.openecomp.appc.client</groupId>

+        <groupId>org.onap.appc.client</groupId>

         <version>1.3.0-SNAPSHOT</version>

     </parent>

 

diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AbstractRequestResponseHandler.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AbstractRequestResponseHandler.java
index 82d631965..c5d6120f0 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AbstractRequestResponseHandler.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AbstractRequestResponseHandler.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AsyncRequestResponseHandler.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AsyncRequestResponseHandler.java
index 86756e6b2..1bcf0af99 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AsyncRequestResponseHandler.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AsyncRequestResponseHandler.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreException.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreException.java
index 009a1f42e..a2bf6e250 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreException.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 
 public class CoreException extends Exception {
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreManager.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreManager.java
index f299dc748..c1c23890e 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreManager.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreManager.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
-import org.openecomp.appc.client.impl.protocol.*;
+import org.onap.appc.client.impl.protocol.*;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreRegistry.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreRegistry.java
index 8d5d0b729..e0a0c5b34 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreRegistry.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreRegistry.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreAsyncResponseHandler.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreAsyncResponseHandler.java
index 23fce28dc..862d56dc3 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreAsyncResponseHandler.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreAsyncResponseHandler.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 public interface ICoreAsyncResponseHandler extends  ICoreResponseHandler{
 
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreResponseHandler.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreResponseHandler.java
index 4f0cb8a8c..555640dfd 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreResponseHandler.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreResponseHandler.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 public interface ICoreResponseHandler {
 }
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreSyncResponseHandler.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreSyncResponseHandler.java
index 332986733..996d3d8d2 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreSyncResponseHandler.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreSyncResponseHandler.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 public interface ICoreSyncResponseHandler extends ICoreResponseHandler{
 
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/IInvocationManager.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/IInvocationManager.java
index 831263aad..93cf20b3f 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/IInvocationManager.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/IInvocationManager.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 import java.util.Properties;
 import java.util.concurrent.TimeoutException;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimeoutHandler.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimeoutHandler.java
index e2ec1d6cc..0f3b81a6f 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimeoutHandler.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimeoutHandler.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 interface ITimeoutHandler {
 
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimerService.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimerService.java
index c5a4145f9..96b06033f 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimerService.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimerService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 interface ITimerService {
 
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManager.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManager.java
index 0582244ff..8179da107 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManager.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManager.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 import java.util.Properties;
 import java.util.concurrent.TimeoutException;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManagerFactory.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManagerFactory.java
index 32b3ff22f..c9face762 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManagerFactory.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManagerFactory.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 public abstract class InvocationManagerFactory {
     private static IInvocationManager invocationManager = null;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/MessageContext.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/MessageContext.java
index abd644cea..6fab66bb3 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/MessageContext.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/MessageContext.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 /** Helper class for wrapping request/response information.
  */
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/RequestResponseHandler.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/RequestResponseHandler.java
index 7264e35f8..8e05a2974 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/RequestResponseHandler.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/RequestResponseHandler.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 interface RequestResponseHandler {
 
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/SyncRequestResponseHandler.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/SyncRequestResponseHandler.java
index e7a65766e..90b0a9926 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/SyncRequestResponseHandler.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/SyncRequestResponseHandler.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueue.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueue.java
index e75d33f91..4ceeb3f08 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueue.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueue.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueueManager.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueueManager.java
index 1d1fc1533..b87349411 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueueManager.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueueManager.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TimerServiceImpl.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TimerServiceImpl.java
index 10f664c65..fa2d0804d 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TimerServiceImpl.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TimerServiceImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriter.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriter.java
index 1415514ac..a76f0a90b 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriter.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriter.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
-import org.openecomp.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.core.MessageContext;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocol.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocol.java
index 6d42d7cf4..94d2d6b85 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocol.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocol.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
-import org.openecomp.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.core.MessageContext;
 
 public interface AsyncProtocol extends Protocol {
 
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocolImpl.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocolImpl.java
index a20c2a0cb..82626d802 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocolImpl.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocolImpl.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
-import org.openecomp.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.core.MessageContext;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Consumer.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Consumer.java
index ec9606c19..4765a58ef 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Consumer.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Consumer.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ConsumerImpl.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ConsumerImpl.java
index 99d884e98..913f80f44 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ConsumerImpl.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ConsumerImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
 import com.att.nsa.cambria.client.CambriaClientBuilders.ConsumerBuilder;
 import com.att.nsa.cambria.client.CambriaConsumer;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageReader.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageReader.java
index 682220a2d..19688d696 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageReader.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageReader.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
-import org.openecomp.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.core.MessageContext;
 
 public interface MessageReader {
 
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageWriter.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageWriter.java
index a19fd3fb4..0849bc4a4 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageWriter.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageWriter.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
-import org.openecomp.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.core.MessageContext;
 import com.fasterxml.jackson.databind.JsonNode;
 
 public interface MessageWriter {
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessagingService.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessagingService.java
index 791e1224b..029378931 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessagingService.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessagingService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Producer.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Producer.java
index 2f2490a54..f290e8a89 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Producer.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Producer.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
 import java.io.IOException;
 
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProducerImpl.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProducerImpl.java
index 1455fd922..7729db98d 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProducerImpl.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProducerImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
 import com.att.nsa.cambria.client.CambriaBatchingPublisher;
 import com.att.nsa.cambria.client.CambriaClientBuilders.PublisherBuilder;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Protocol.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Protocol.java
index 19e7d6024..eaa21d857 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Protocol.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Protocol.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
 import java.util.Properties;
 
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolException.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolException.java
index 87e1318ee..eb0537b80 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolException.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
 public class ProtocolException extends Exception {
 
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolFactory.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolFactory.java
index f9364e192..98e7d669b 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolFactory.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolFactory.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolMessage.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolMessage.java
index 161a590a0..c02ea5607 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolMessage.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolMessage.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolType.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolType.java
index 133fbf8ad..cc2eca447 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolType.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolType.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
 public enum ProtocolType {
 
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/RetrieveMessageCallback.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/RetrieveMessageCallback.java
index 46105553a..8fc486bb8 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/RetrieveMessageCallback.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/RetrieveMessageCallback.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
 
-import org.openecomp.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.core.MessageContext;
 
 public interface RetrieveMessageCallback {
 
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBMessagingService.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBMessagingService.java
index 22563f68a..df51861b8 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBMessagingService.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBMessagingService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBPropertiesKeys.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBPropertiesKeys.java
index 8bbcaf404..5c1916f2b 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBPropertiesKeys.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBPropertiesKeys.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
 class UEBPropertiesKeys {
 
diff --git a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/ResponseManagerTest.java b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/ResponseManagerTest.java
index d1720f03b..cc157e5c4 100644
--- a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/ResponseManagerTest.java
+++ b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/ResponseManagerTest.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
-
-import org.openecomp.appc.client.impl.core.AsyncRequestResponseHandler;
-import org.openecomp.appc.client.impl.core.CoreException;
-import org.openecomp.appc.client.impl.core.CoreManager;
-import org.openecomp.appc.client.impl.core.ICoreAsyncResponseHandler;
-import org.openecomp.appc.client.impl.core.MessageContext;
-import org.openecomp.appc.client.impl.protocol.AsyncProtocol;
-import org.openecomp.appc.client.impl.protocol.ProtocolException;
-import org.openecomp.appc.client.impl.protocol.RetrieveMessageCallback;
+package org.onap.appc.client.impl.core;
+
+import org.onap.appc.client.impl.core.AsyncRequestResponseHandler;
+import org.onap.appc.client.impl.core.CoreException;
+import org.onap.appc.client.impl.core.CoreManager;
+import org.onap.appc.client.impl.core.ICoreAsyncResponseHandler;
+import org.onap.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.protocol.AsyncProtocol;
+import org.onap.appc.client.impl.protocol.ProtocolException;
+import org.onap.appc.client.impl.protocol.RetrieveMessageCallback;
 import org.junit.Before;
 
 import java.util.Properties;
diff --git a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/SyncFlowTest.java b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/SyncFlowTest.java
index 4b4bce578..2e69369b9 100644
--- a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/SyncFlowTest.java
+++ b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/SyncFlowTest.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.core;
-
-import org.openecomp.appc.client.impl.core.CoreException;
-import org.openecomp.appc.client.impl.core.CoreManager;
-import org.openecomp.appc.client.impl.core.ICoreSyncResponseHandler;
-import org.openecomp.appc.client.impl.core.MessageContext;
-import org.openecomp.appc.client.impl.core.SyncRequestResponseHandler;
-import org.openecomp.appc.client.impl.protocol.AsyncProtocol;
-import org.openecomp.appc.client.impl.protocol.ProtocolException;
-import org.openecomp.appc.client.impl.protocol.RetrieveMessageCallback;
+package org.onap.appc.client.impl.core;
+
+import org.onap.appc.client.impl.core.CoreException;
+import org.onap.appc.client.impl.core.CoreManager;
+import org.onap.appc.client.impl.core.ICoreSyncResponseHandler;
+import org.onap.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.core.SyncRequestResponseHandler;
+import org.onap.appc.client.impl.protocol.AsyncProtocol;
+import org.onap.appc.client.impl.protocol.ProtocolException;
+import org.onap.appc.client.impl.protocol.RetrieveMessageCallback;
 import org.junit.Assert;
 import org.junit.Before;
 
diff --git a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriterTest.java b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriterTest.java
index 91f615720..1d41a52f8 100644
--- a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriterTest.java
+++ b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriterTest.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
-import org.openecomp.appc.client.impl.core.MessageContext;
-import org.openecomp.appc.client.impl.protocol.APPCMessageReaderWriter;
-import org.openecomp.appc.client.impl.protocol.ProtocolException;
+import org.onap.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.protocol.APPCMessageReaderWriter;
+import org.onap.appc.client.impl.protocol.ProtocolException;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
diff --git a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImpl.java b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImpl.java
index 046f5a814..ceba10b58 100644
--- a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImpl.java
+++ b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImpl.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
-
-import org.openecomp.appc.client.impl.core.MessageContext;
-import org.openecomp.appc.client.impl.protocol.AsyncProtocol;
-import org.openecomp.appc.client.impl.protocol.AsyncProtocolImpl;
-import org.openecomp.appc.client.impl.protocol.ProtocolException;
-import org.openecomp.appc.client.impl.protocol.RetrieveMessageCallback;
-import org.openecomp.appc.client.impl.protocol.UEBPropertiesKeys;
+package org.onap.appc.client.impl.protocol;
+
+import org.onap.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.protocol.AsyncProtocol;
+import org.onap.appc.client.impl.protocol.AsyncProtocolImpl;
+import org.onap.appc.client.impl.protocol.ProtocolException;
+import org.onap.appc.client.impl.protocol.RetrieveMessageCallback;
+import org.onap.appc.client.impl.protocol.UEBPropertiesKeys;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplMissingProps.java b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplMissingProps.java
index 9611a7900..267282abd 100644
--- a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplMissingProps.java
+++ b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplMissingProps.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
-import org.openecomp.appc.client.impl.core.MessageContext;
-import org.openecomp.appc.client.impl.protocol.AsyncProtocol;
-import org.openecomp.appc.client.impl.protocol.AsyncProtocolImpl;
-import org.openecomp.appc.client.impl.protocol.RetrieveMessageCallback;
+import org.onap.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.protocol.AsyncProtocol;
+import org.onap.appc.client.impl.protocol.AsyncProtocolImpl;
+import org.onap.appc.client.impl.protocol.RetrieveMessageCallback;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplNullCallback.java b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplNullCallback.java
index e537037f7..22954cd75 100644
--- a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplNullCallback.java
+++ b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplNullCallback.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.client.impl.protocol.AsyncProtocol;
-import org.openecomp.appc.client.impl.protocol.AsyncProtocolImpl;
-import org.openecomp.appc.client.impl.protocol.ProtocolException;
+import org.onap.appc.client.impl.protocol.AsyncProtocol;
+import org.onap.appc.client.impl.protocol.AsyncProtocolImpl;
+import org.onap.appc.client.impl.protocol.ProtocolException;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestUEBMessagingService.java b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestUEBMessagingService.java
index 109065ab4..de192ab12 100644
--- a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestUEBMessagingService.java
+++ b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestUEBMessagingService.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
 
 import org.junit.*;
 import org.junit.runners.MethodSorters;
-import org.openecomp.appc.client.impl.protocol.MessagingService;
-import org.openecomp.appc.client.impl.protocol.UEBMessagingService;
+import org.onap.appc.client.impl.protocol.MessagingService;
+import org.onap.appc.client.impl.protocol.UEBMessagingService;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/appc-client/client-simulator/pom.xml b/appc-client/client-simulator/pom.xml
index c6383a3ef..cb6b2b051 100644
--- a/appc-client/client-simulator/pom.xml
+++ b/appc-client/client-simulator/pom.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>appc-java-client</artifactId>
-        <groupId>org.openecomp.appc.client</groupId>
+        <groupId>org.onap.appc.client</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>client-simulator</artifactId>
@@ -51,7 +51,7 @@
                         <configuration>
                             <archive>
                                 <manifest>
-                                    <mainClass>org.openecomp.appc.simulator.client.main.ClientRunner</mainClass>
+                                    <mainClass>org.onap.appc.simulator.client.main.ClientRunner</mainClass>
                                 </manifest>
                             </archive>
                             <descriptors>
@@ -96,7 +96,7 @@
             <version>${jackson.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc.client</groupId>
+            <groupId>org.onap.appc.client</groupId>
             <artifactId>client-kit</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/RequestHandler.java b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/RequestHandler.java
index 225f6bba9..293b72f89 100644
--- a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/RequestHandler.java
+++ b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/RequestHandler.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.simulator.client;
+package org.onap.appc.simulator.client;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/ResponseHandler.java b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/ResponseHandler.java
index 459804aaa..5a24028e8 100644
--- a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/ResponseHandler.java
+++ b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/ResponseHandler.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.simulator.client;
+package org.onap.appc.simulator.client;
 
 import java.io.File;
 
diff --git a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonRequestHandler.java b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonRequestHandler.java
index e3a86e01a..243136d0e 100644
--- a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonRequestHandler.java
+++ b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonRequestHandler.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.simulator.client.impl;
+package org.onap.appc.simulator.client.impl;
 
-import org.openecomp.appc.client.lcm.api.AppcClientServiceFactoryProvider;
-import org.openecomp.appc.client.lcm.api.AppcLifeCycleManagerServiceFactory;
-import org.openecomp.appc.client.lcm.api.ApplicationContext;
-import org.openecomp.appc.client.lcm.api.LifeCycleManagerStateful;
-import org.openecomp.appc.client.lcm.api.ResponseHandler;
+import org.onap.appc.client.lcm.api.AppcClientServiceFactoryProvider;
+import org.onap.appc.client.lcm.api.AppcLifeCycleManagerServiceFactory;
+import org.onap.appc.client.lcm.api.ApplicationContext;
+import org.onap.appc.client.lcm.api.LifeCycleManagerStateful;
+import org.onap.appc.client.lcm.api.ResponseHandler;
 
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
-import org.openecomp.appc.simulator.client.RequestHandler;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.simulator.client.RequestHandler;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonResponseHandler.java b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonResponseHandler.java
index 5f14bb849..c19abb2fb 100644
--- a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonResponseHandler.java
+++ b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonResponseHandler.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.simulator.client.impl;
+package org.onap.appc.simulator.client.impl;
 
-import org.openecomp.appc.client.lcm.api.ResponseHandler;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.client.lcm.api.ResponseHandler;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/main/ClientRunner.java b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/main/ClientRunner.java
index 704fbee80..c8da17e79 100644
--- a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/main/ClientRunner.java
+++ b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/main/ClientRunner.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.simulator.client.main;
+package org.onap.appc.simulator.client.main;
 
 import org.apache.commons.io.filefilter.WildcardFileFilter;
-import org.openecomp.appc.simulator.client.RequestHandler;
-import org.openecomp.appc.simulator.client.impl.JsonRequestHandler;
+import org.onap.appc.simulator.client.RequestHandler;
+import org.onap.appc.simulator.client.impl.JsonRequestHandler;
 
 import java.io.*;
 import java.nio.file.Path;
diff --git a/appc-client/client-simulator/src/main/resources/client-simulator.properties b/appc-client/client-simulator/src/main/resources/client-simulator.properties
index 242b34f93..fec61a2f2 100644
--- a/appc-client/client-simulator/src/main/resources/client-simulator.properties
+++ b/appc-client/client-simulator/src/main/resources/client-simulator.properties
@@ -26,7 +26,7 @@
 # Default Properties - Configured for client simulator
 #
 #--------------------------------------------------------------------------------------------
-ctx.model.package=org.openecomp.appc.client.lcm.model
+ctx.model.package=org.onap.appc.client.lcm.model
 
 client.pool.size=10
 client.rpc.exceptions.map.file=C:\\test\\test1\\exceptions.txt
diff --git a/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonRequestHandler.java b/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonRequestHandler.java
index 417b98d64..ba3696f26 100644
--- a/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonRequestHandler.java
+++ b/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonRequestHandler.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.simulator.client.impl;
+package org.onap.appc.simulator.client.impl;
 
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.junit.Assert;
@@ -7,8 +7,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
-import org.openecomp.appc.client.lcm.api.LifeCycleManagerStateful;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.client.lcm.api.LifeCycleManagerStateful;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
diff --git a/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonResponseHandler.java b/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonResponseHandler.java
index b477b8a61..59ffe1b31 100644
--- a/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonResponseHandler.java
+++ b/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonResponseHandler.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.simulator.client.impl;
+package org.onap.appc.simulator.client.impl;
 
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.junit.Assert;
diff --git a/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/main/TestClientRunner.java b/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/main/TestClientRunner.java
index d0de0cd49..db648f957 100644
--- a/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/main/TestClientRunner.java
+++ b/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/main/TestClientRunner.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.simulator.client.main;
+package org.onap.appc.simulator.client.main;
 
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.junit.After;
@@ -8,8 +8,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
-import org.openecomp.appc.simulator.client.impl.JsonRequestHandler;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.simulator.client.impl.JsonRequestHandler;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
diff --git a/appc-client/client-simulator/src/test/java/run.java b/appc-client/client-simulator/src/test/java/run.java
index 62f12acbb..1ef241848 100644
--- a/appc-client/client-simulator/src/test/java/run.java
+++ b/appc-client/client-simulator/src/test/java/run.java
@@ -25,7 +25,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
-import org.openecomp.appc.simulator.client.main.ClientRunner;
+import org.onap.appc.simulator.client.main.ClientRunner;
 
 public class run {
     public static void main(String ... args) throws Exception, IOException, RuntimeException, FileNotFoundException {
diff --git a/appc-client/code-generator/pom.xml b/appc-client/code-generator/pom.xml
index 4b762cb55..bdce0af71 100644
--- a/appc-client/code-generator/pom.xml
+++ b/appc-client/code-generator/pom.xml
@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <artifactId>appc-java-client</artifactId>

-        <groupId>org.openecomp.appc.client</groupId>

+        <groupId>org.onap.appc.client</groupId>

         <version>1.3.0-SNAPSHOT</version>

     </parent>

 

diff --git a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/CLI.java b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/CLI.java
index c748b7cca..e28b3706a 100644
--- a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/CLI.java
+++ b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/CLI.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.tools.generator.api;
+package org.onap.appc.tools.generator.api;
 
-import org.openecomp.appc.tools.generator.impl.ModelGenerator;
+import org.onap.appc.tools.generator.impl.ModelGenerator;
 
 public class CLI {
     public static void main(String... args) throws Exception {
diff --git a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/ContextBuilder.java b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/ContextBuilder.java
index 7e0bbe15a..a1826f270 100644
--- a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/ContextBuilder.java
+++ b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/ContextBuilder.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.tools.generator.api;
+package org.onap.appc.tools.generator.api;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/MavenPlugin.java b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/MavenPlugin.java
index f031dd666..9e160eed2 100644
--- a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/MavenPlugin.java
+++ b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/MavenPlugin.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.tools.generator.api;
+package org.onap.appc.tools.generator.api;
 
-import org.openecomp.appc.tools.generator.impl.ModelGenerator;
+import org.onap.appc.tools.generator.impl.ModelGenerator;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
diff --git a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/JsonContextBuilderImpl.java b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/JsonContextBuilderImpl.java
index 6a3d13bf5..6c408dd1d 100644
--- a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/JsonContextBuilderImpl.java
+++ b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/JsonContextBuilderImpl.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.tools.generator.extensions;
+package org.onap.appc.tools.generator.extensions;
 
-import org.openecomp.appc.tools.generator.api.ContextBuilder;
+import org.onap.appc.tools.generator.api.ContextBuilder;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/YangContextBuilderImpl.java b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/YangContextBuilderImpl.java
index 8325ecb6d..67055c757 100644
--- a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/YangContextBuilderImpl.java
+++ b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/YangContextBuilderImpl.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.tools.generator.extensions;
+package org.onap.appc.tools.generator.extensions;
 
-import org.openecomp.appc.tools.generator.api.ContextBuilder;
+import org.onap.appc.tools.generator.api.ContextBuilder;
 import com.google.common.base.Optional;
 
 import org.opendaylight.yangtools.yang.model.api.Module;
diff --git a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/CodeGenWriter.java b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/CodeGenWriter.java
index 15498c83d..347c24c06 100644
--- a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/CodeGenWriter.java
+++ b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/CodeGenWriter.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.tools.generator.impl;
+package org.onap.appc.tools.generator.impl;
 
 import java.io.*;
 import java.nio.file.Files;
diff --git a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/ModelGenerator.java b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/ModelGenerator.java
index bdaa3a29d..2275fdac7 100644
--- a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/ModelGenerator.java
+++ b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/ModelGenerator.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.tools.generator.impl;
+package org.onap.appc.tools.generator.impl;
 
-import org.openecomp.appc.tools.generator.api.ContextBuilder;
+import org.onap.appc.tools.generator.api.ContextBuilder;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
diff --git a/appc-client/code-generator/src/main/resources/configuration/client-kit.properties b/appc-client/code-generator/src/main/resources/configuration/client-kit.properties
index 047915e44..a0097c9fa 100644
--- a/appc-client/code-generator/src/main/resources/configuration/client-kit.properties
+++ b/appc-client/code-generator/src/main/resources/configuration/client-kit.properties
@@ -26,9 +26,9 @@
 # Default Properties - Configured for code generator
 #
 #--------------------------------------------------------------------------------------------
-ctx.model.package=org.openecomp.appc.client.lcm.model
-ctx.api.package=org.openecomp.appc.client.lcm.api
-ctx.utils.package=org.openecomp.appc.client.lcm.utils
-ctx.exceptions.package=org.openecomp.appc.client.lcm.exceptions
+ctx.model.package=org.onap.appc.client.lcm.model
+ctx.api.package=org.onap.appc.client.lcm.api
+ctx.utils.package=org.onap.appc.client.lcm.utils
+ctx.exceptions.package=org.onap.appc.client.lcm.exceptions
 ctx.interface.classname=LifeCycleManagerStateful
 
diff --git a/appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/api/CLITest.java b/appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/api/CLITest.java
index 3d6eb1bf3..4cd6bb5f5 100644
--- a/appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/api/CLITest.java
+++ b/appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/api/CLITest.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.tools.generator.api;
+package org.onap.appc.tools.generator.api;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/impl/CodeGenWriterTest.java b/appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/impl/CodeGenWriterTest.java
index 84cca9337..e0669b836 100644
--- a/appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/impl/CodeGenWriterTest.java
+++ b/appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/impl/CodeGenWriterTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.tools.generator.impl;
+package org.onap.appc.tools.generator.impl;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/appc-client/pom.xml b/appc-client/pom.xml
index 8f7a93dbe..abd27216e 100644
--- a/appc-client/pom.xml
+++ b/appc-client/pom.xml
@@ -27,13 +27,13 @@
 

     <modelVersion>4.0.0</modelVersion>

     <parent>

-        <groupId>org.openecomp.appc</groupId>

+        <groupId>org.onap.appc</groupId>

         <artifactId>appc</artifactId>

         <version>1.3.0-SNAPSHOT</version>

     </parent>

 

     <artifactId>appc-java-client</artifactId>

-    <groupId>org.openecomp.appc.client</groupId>

+    <groupId>org.onap.appc.client</groupId>

     <version>1.3.0-SNAPSHOT</version>

 

     <name>appc-java-client</name>

diff --git a/appc-common/pom.xml b/appc-common/pom.xml
index e0182b307..26f4d6bdb 100644
--- a/appc-common/pom.xml
+++ b/appc-common/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
   </parent>
@@ -130,7 +130,7 @@
           <instructions>
             <Bundle-SymbolicName>appc-common</Bundle-SymbolicName>
             <Export-Package>
-              org.openecomp.appc.*, com.att.eelf.*, ch.qos.logback.*, org.jasypt.*
+              org.onap.appc.*, com.att.eelf.*, ch.qos.logback.*, org.jasypt.*
             </Export-Package>
             <Import-Package>*;resolution:=optional</Import-Package>
             <Embed-Dependency>eelf-core, logback-core, logback-classic, jasypt</Embed-Dependency>
@@ -153,7 +153,7 @@
             <configuration>
               <resources>
                 <resource>
-                  <messageClass>org.openecomp.appc.i18n.Msg</messageClass>
+                  <messageClass>org.onap.appc.i18n.Msg</messageClass>
                 </resource>
               </resources>
             </configuration>
@@ -169,7 +169,7 @@
               <outputFile>messages.html</outputFile>
               <resources>
                 <resource>
-                  <messageClass>org.openecomp.appc.i18n.Msg</messageClass>
+                  <messageClass>org.onap.appc.i18n.Msg</messageClass>
                   <header><![CDATA[<p> <ac:macro ac:name="toc" /> </p>]]></header>
                 </resource>
               </resources>
@@ -178,7 +178,7 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-common</artifactId>
             <version>${project.version}</version>
           </dependency>
diff --git a/appc-common/src/main/java/org/openecomp/appc/CmdLine.java b/appc-common/src/main/java/org/openecomp/appc/CmdLine.java
index 699edc70c..d63bd8758 100644
--- a/appc-common/src/main/java/org/openecomp/appc/CmdLine.java
+++ b/appc-common/src/main/java/org/openecomp/appc/CmdLine.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-    package org.openecomp.appc;
+    package org.onap.appc;
 
-import org.openecomp.appc.encryption.EncryptionTool;
+import org.onap.appc.encryption.EncryptionTool;
 
 public class CmdLine {
 
diff --git a/appc-common/src/main/java/org/openecomp/appc/Constants.java b/appc-common/src/main/java/org/openecomp/appc/Constants.java
index 5e59971ac..e030b647d 100644
--- a/appc-common/src/main/java/org/openecomp/appc/Constants.java
+++ b/appc-common/src/main/java/org/openecomp/appc/Constants.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc;
+package org.onap.appc;
 
 /**
  * This class contains the definitions of all constant values used in the APPC provider, adapters, and other components.
@@ -91,27 +91,27 @@ public final class Constants {
     /**
      * The name of the property that contains the service request enumerated value in the graph's context
      */
-    public static final String CONTEXT_SERVICE = "org.openecomp.appc.service";
+    public static final String CONTEXT_SERVICE = "org.onap.appc.service";
 
     /**
      * The name of the property that contains the VM id value in the graph's context
      */
-    public static final String CONTEXT_VMID = "org.openecomp.appc.vmid";
+    public static final String CONTEXT_VMID = "org.onap.appc.vmid";
 
     /**
      * The name of the property that contains the VM id value in the graph's context
      */
-    public static final String CONTEXT_IDENTITY_URL = "org.openecomp.appc.identity.url";
+    public static final String CONTEXT_IDENTITY_URL = "org.onap.appc.identity.url";
 
     /**
      * The name of the property that contains the service request id value in the graph's context
      */
-    public static final String CONTEXT_REQID = "org.openecomp.appc.reqid";
+    public static final String CONTEXT_REQID = "org.onap.appc.reqid";
 
     /**
      * The name of the property that indicates which method of the IaaS adapter to call
      */
-    public static final String CONTEXT_ACTION = "org.openecomp.appc.action";
+    public static final String CONTEXT_ACTION = "org.onap.appc.action";
 
     /**
      * The enumerated value for restart of a VM. This is a constant for one possible value of CONTEXT_SERVICE.
@@ -126,44 +126,44 @@ public final class Constants {
     /**
      * The name of the adapter. We get the name from a property file so that it can be changed easily if needed.
      */
-    public static final String PROPERTY_ADAPTER_NAME = "org.openecomp.appc.provider.adaptor.name";
+    public static final String PROPERTY_ADAPTER_NAME = "org.onap.appc.provider.adaptor.name";
 
     /**
      * The minimum number of contexts to cache in each provider/tenant pool
      */
-    public static final String PROPERTY_MIN_POOL_SIZE = "org.openecomp.appc.provider.min.pool";
+    public static final String PROPERTY_MIN_POOL_SIZE = "org.onap.appc.provider.min.pool";
 
     /**
      * The maximum number of contexts to cache in each provider/tenant pool
      */
-    public static final String PROPERTY_MAX_POOL_SIZE = "org.openecomp.appc.provider.max.pool";
+    public static final String PROPERTY_MAX_POOL_SIZE = "org.onap.appc.provider.max.pool";
 
     /**
      * The amount of time, in seconds, that the application waits for a change of state of a server to a known valid
      * state before giving up and failing the request.
      */
-    public static final String PROPERTY_SERVER_STATE_CHANGE_TIMEOUT = "org.openecomp.appc.server.state.change.timeout";
+    public static final String PROPERTY_SERVER_STATE_CHANGE_TIMEOUT = "org.onap.appc.server.state.change.timeout";
 
     /**
      * The amount of time, in seconds, between subsequent polls to the openstack provider to update the state of a
      * resource
      */
-    public static final String PROPERTY_OPENSTACK_POLL_INTERVAL = "org.openecomp.appc.openstack.poll.interval";
+    public static final String PROPERTY_OPENSTACK_POLL_INTERVAL = "org.onap.appc.openstack.poll.interval";
 
     /**
      * The amount of time, in seconds, to wait between retry attempts when a connection to a provider fails.
      */
-    public static final String PROPERTY_RETRY_DELAY = "org.openecomp.appc.provider.retry.delay";
+    public static final String PROPERTY_RETRY_DELAY = "org.onap.appc.provider.retry.delay";
 
     /**
      * The maximum number of times a connection retry will be attempted before the application fails the request
      */
-    public static final String PROPERTY_RETRY_LIMIT = "org.openecomp.appc.provider.retry.limit";
+    public static final String PROPERTY_RETRY_LIMIT = "org.onap.appc.provider.retry.limit";
     /**
      * The amount of time, in seconds, that the application waits for a change of state of a stacj to a known valid
      * state before giving up and failing the request.
      */
-    public static final String PROPERTY_STACK_STATE_CHANGE_TIMEOUT ="org.openecomp.appc.stack.state.change.timeout" ;
+    public static final String PROPERTY_STACK_STATE_CHANGE_TIMEOUT ="org.onap.appc.stack.state.change.timeout" ;
 
     @SuppressWarnings("nls")
     public static final String STATUS_GETTER = "status-getter";
diff --git a/appc-common/src/main/java/org/openecomp/appc/cache/CacheStrategies.java b/appc-common/src/main/java/org/openecomp/appc/cache/CacheStrategies.java
index 196b645a9..fadf9cb4f 100644
--- a/appc-common/src/main/java/org/openecomp/appc/cache/CacheStrategies.java
+++ b/appc-common/src/main/java/org/openecomp/appc/cache/CacheStrategies.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.cache;
+package org.onap.appc.cache;
 
 /**
  * Enum of CacheStrategies
diff --git a/appc-common/src/main/java/org/openecomp/appc/cache/CacheStrategy.java b/appc-common/src/main/java/org/openecomp/appc/cache/CacheStrategy.java
index e07708119..af91bb28c 100644
--- a/appc-common/src/main/java/org/openecomp/appc/cache/CacheStrategy.java
+++ b/appc-common/src/main/java/org/openecomp/appc/cache/CacheStrategy.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.cache;
+package org.onap.appc.cache;
 
 /**
  * Interface of CacheStrategy
diff --git a/appc-common/src/main/java/org/openecomp/appc/cache/MetadataCache.java b/appc-common/src/main/java/org/openecomp/appc/cache/MetadataCache.java
index 8196e8e3d..ea0cad28f 100644
--- a/appc-common/src/main/java/org/openecomp/appc/cache/MetadataCache.java
+++ b/appc-common/src/main/java/org/openecomp/appc/cache/MetadataCache.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.cache;
+package org.onap.appc.cache;
 
 /**
  * Interface of MetadataCache
diff --git a/appc-common/src/main/java/org/openecomp/appc/cache/impl/LRUCache.java b/appc-common/src/main/java/org/openecomp/appc/cache/impl/LRUCache.java
index b97a5f642..b82552f20 100644
--- a/appc-common/src/main/java/org/openecomp/appc/cache/impl/LRUCache.java
+++ b/appc-common/src/main/java/org/openecomp/appc/cache/impl/LRUCache.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.cache.impl;
+package org.onap.appc.cache.impl;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.openecomp.appc.cache.CacheStrategy;
+import org.onap.appc.cache.CacheStrategy;
 
 /**
  * LRU cache implements CacheStategy<K, V>
diff --git a/appc-common/src/main/java/org/openecomp/appc/cache/impl/MetadataCacheFactory.java b/appc-common/src/main/java/org/openecomp/appc/cache/impl/MetadataCacheFactory.java
index 91ad48f9b..c140c6e8b 100644
--- a/appc-common/src/main/java/org/openecomp/appc/cache/impl/MetadataCacheFactory.java
+++ b/appc-common/src/main/java/org/openecomp/appc/cache/impl/MetadataCacheFactory.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.cache.impl;
+package org.onap.appc.cache.impl;
 
-import org.openecomp.appc.cache.CacheStrategies;
-import org.openecomp.appc.cache.MetadataCache;
+import org.onap.appc.cache.CacheStrategies;
+import org.onap.appc.cache.MetadataCache;
 
 /**
  * Metadata Cache Factory
diff --git a/appc-common/src/main/java/org/openecomp/appc/cache/impl/MetadataCacheImpl.java b/appc-common/src/main/java/org/openecomp/appc/cache/impl/MetadataCacheImpl.java
index 249a97c3c..ca225adfe 100644
--- a/appc-common/src/main/java/org/openecomp/appc/cache/impl/MetadataCacheImpl.java
+++ b/appc-common/src/main/java/org/openecomp/appc/cache/impl/MetadataCacheImpl.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.cache.impl;
+package org.onap.appc.cache.impl;
 
-import org.openecomp.appc.cache.CacheStrategies;
-import org.openecomp.appc.cache.CacheStrategy;
-import org.openecomp.appc.cache.MetadataCache;
+import org.onap.appc.cache.CacheStrategies;
+import org.onap.appc.cache.CacheStrategy;
+import org.onap.appc.cache.MetadataCache;
 
 /**
  * Implementation of MetadataCache
diff --git a/appc-common/src/main/java/org/openecomp/appc/concurrent/Signal.java b/appc-common/src/main/java/org/openecomp/appc/concurrent/Signal.java
index 93da24087..5d439d164 100644
--- a/appc-common/src/main/java/org/openecomp/appc/concurrent/Signal.java
+++ b/appc-common/src/main/java/org/openecomp/appc/concurrent/Signal.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.concurrent;
+package org.onap.appc.concurrent;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeoutException;
 
-import org.openecomp.appc.util.StringHelper;
+import org.onap.appc.util.StringHelper;
 
 /**
  * This class is used to synchronize signaling of status between threads.
diff --git a/appc-common/src/main/java/org/openecomp/appc/configuration/Configuration.java b/appc-common/src/main/java/org/openecomp/appc/configuration/Configuration.java
index 870a73c45..a0acf12cc 100644
--- a/appc-common/src/main/java/org/openecomp/appc/configuration/Configuration.java
+++ b/appc-common/src/main/java/org/openecomp/appc/configuration/Configuration.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.configuration;
+package org.onap.appc.configuration;
 
 import java.util.Properties;
 
@@ -40,12 +40,12 @@ import org.slf4j.Logger;
  */
 public interface Configuration {
 
-    String PROPERTY_BOOTSTRAP_FILE_NAME = "org_openecomp_appc_bootstrap_file"; //
+    String PROPERTY_BOOTSTRAP_FILE_NAME = "org_onap_appc_bootstrap_file"; //
     String DEFAULT_BOOTSTRAP_FILE_NAME = "appc.properties"; 
-    String PROPERTY_BOOTSTRAP_FILE_PATH = "org_openecomp_appc_bootstrap_path"; //
+    String PROPERTY_BOOTSTRAP_FILE_PATH = "org_onap_appc_bootstrap_path"; //
     String DEFAULT_BOOTSTRAP_FILE_PATH = "/opt/openecomp/appc/data/properties,${user.home},etc,../etc";
-    String PROPERTY_RESOURCE_BUNDLES = "org.openecomp.appc.resources"; 
-    String DEFAULT_RESOURCE_BUNDLES = "org/openecomp/appc/i18n/MessageResources";
+    String PROPERTY_RESOURCE_BUNDLES = "org.onap.appc.resources"; 
+    String DEFAULT_RESOURCE_BUNDLES = "org/onap/appc/i18n/MessageResources";
 
    /**
      * This method is called to obtain a property expressed as a boolean value (true or false). The standard rules for
diff --git a/appc-common/src/main/java/org/openecomp/appc/configuration/ConfigurationFactory.java b/appc-common/src/main/java/org/openecomp/appc/configuration/ConfigurationFactory.java
index fa8b5ee0b..ee2648847 100644
--- a/appc-common/src/main/java/org/openecomp/appc/configuration/ConfigurationFactory.java
+++ b/appc-common/src/main/java/org/openecomp/appc/configuration/ConfigurationFactory.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.configuration;
+package org.onap.appc.configuration;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -37,7 +37,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.i18n.Msg;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
@@ -84,11 +84,11 @@ import com.att.eelf.i18n.EELFResourceManager;
  * to define the name and path. These are:
  * </p>
  * <dl>
- * <dt>org.openecomp.appc.bootstrap.file</dt>
+ * <dt>org.onap.appc.bootstrap.file</dt>
  * <dd>This property defines the name of the file that will be loaded. If not specified, the default value is
  * "appc.properties". This can be specified in either (or both) the default properties or the command line. The command
  * line specification will always override.</dd>
- * <dt>org.openecomp.appc.bootstrap.path</dt>
+ * <dt>org.onap.appc.bootstrap.path</dt>
  * <dd>This is a comma-delimited (,) path of directories to be searched to locate the specified file. The first
  * occurrence of the file is the one loaded, and no additional searching is performed. The path can be specified in
  * either, or both, the default values and the command line specification. If specified on the command line, the value
@@ -116,7 +116,7 @@ public final class ConfigurationFactory {
     /**
      * The default properties resource to be loaded
      */
-    private static final String DEFAULT_PROPERTIES = "org/openecomp/appc/default.properties";
+    private static final String DEFAULT_PROPERTIES = "org/onap/appc/default.properties";
 
     /**
      * This collection allows for special configurations to be created and maintained, organized by some identification
diff --git a/appc-common/src/main/java/org/openecomp/appc/configuration/DefaultConfiguration.java b/appc-common/src/main/java/org/openecomp/appc/configuration/DefaultConfiguration.java
index 635384952..3e86c0788 100644
--- a/appc-common/src/main/java/org/openecomp/appc/configuration/DefaultConfiguration.java
+++ b/appc-common/src/main/java/org/openecomp/appc/configuration/DefaultConfiguration.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.configuration;
+package org.onap.appc.configuration;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -39,8 +39,8 @@ import java.util.jar.Manifest;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.openecomp.appc.encryption.EncryptionTool;
-import org.openecomp.appc.util.UnmodifiableProperties;
+import org.onap.appc.encryption.EncryptionTool;
+import org.onap.appc.util.UnmodifiableProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -208,7 +208,7 @@ public final class DefaultConfiguration implements Configuration, Cloneable {
      * @param key          The property key
      * @param defaultValue The default value to be returned if the property does not exist
      * @return The value of the property expressed as a boolean, or false if it does not exist.
-     * @see org.openecomp.appc.configuration.Configuration#getBooleanProperty(java.lang.String, boolean)
+     * @see org.onap.appc.configuration.Configuration#getBooleanProperty(java.lang.String, boolean)
      */
     @Override
     public boolean getBooleanProperty(String key, boolean defaultValue) {
@@ -223,7 +223,7 @@ public final class DefaultConfiguration implements Configuration, Cloneable {
      *
      * @param key The property to retrieve
      * @return The value of the property, or 0.0 if not found
-     * @see org.openecomp.appc.configuration.Configuration#getDoubleProperty(java.lang.String)
+     * @see org.onap.appc.configuration.Configuration#getDoubleProperty(java.lang.String)
      */
     @SuppressWarnings("nls")
     @Override
@@ -241,7 +241,7 @@ public final class DefaultConfiguration implements Configuration, Cloneable {
      * @param key          The key of the property
      * @param defaultValue The default value to be returned if the property does not exist
      * @return The string value, or null if it does not exist.
-     * @see org.openecomp.appc.configuration.Configuration#getDoubleProperty(java.lang.String, double)
+     * @see org.onap.appc.configuration.Configuration#getDoubleProperty(java.lang.String, double)
      */
     @Override
     public double getDoubleProperty(String key, double defaultValue) {
@@ -257,7 +257,7 @@ public final class DefaultConfiguration implements Configuration, Cloneable {
      *
      * @param key The property name to retrieve.
      * @return The value of the property, or 0 if it does not exist or is invalid.
-     * @see org.openecomp.appc.configuration.Configuration#getIntegerProperty(java.lang.String)
+     * @see org.onap.appc.configuration.Configuration#getIntegerProperty(java.lang.String)
      */
     @SuppressWarnings("nls")
     @Override
@@ -276,7 +276,7 @@ public final class DefaultConfiguration implements Configuration, Cloneable {
      * @param key          The property name to retrieve.
      * @param defaultValue The default value to be returned if the property does not exist
      * @return The value of the property, or 0 if it does not exist or is invalid.
-     * @see org.openecomp.appc.configuration.Configuration#getIntegerProperty(java.lang.String, int)
+     * @see org.onap.appc.configuration.Configuration#getIntegerProperty(java.lang.String, int)
      */
     @Override
     public int getIntegerProperty(String key, int defaultValue) {
@@ -292,7 +292,7 @@ public final class DefaultConfiguration implements Configuration, Cloneable {
      * @param key The key of the property desired.
      * @return The value of the property expressed as an integer long value, or zero if the property does not exist or
      * is not a valid integer long.
-     * @see org.openecomp.appc.configuration.Configuration#getLongProperty(java.lang.String)
+     * @see org.onap.appc.configuration.Configuration#getLongProperty(java.lang.String)
      */
     @SuppressWarnings("nls")
     @Override
@@ -312,7 +312,7 @@ public final class DefaultConfiguration implements Configuration, Cloneable {
      * @param defaultValue the value to be returned if the property is not valid or does not exist.
      * @return The value of the property expressed as an integer long value, or the default value if the property does
      * not exist or is not a valid integer long.
-     * @see org.openecomp.appc.configuration.Configuration#getLongProperty(java.lang.String, long)
+     * @see org.onap.appc.configuration.Configuration#getLongProperty(java.lang.String, long)
      */
     @Override
     public long getLongProperty(String key, long defaultValue) {
@@ -328,7 +328,7 @@ public final class DefaultConfiguration implements Configuration, Cloneable {
      * properties.
      *
      * @return An unmodifiable properties object.
-     * @see org.openecomp.appc.configuration.Configuration#getProperties()
+     * @see org.onap.appc.configuration.Configuration#getProperties()
      */
     @Override
     public Properties getProperties() {
@@ -356,7 +356,7 @@ public final class DefaultConfiguration implements Configuration, Cloneable {
      * @param key          The key of the property
      * @param defaultValue The default value to be returned if the property does not exist
      * @return The string value, or null if it does not exist.
-     * @see org.openecomp.appc.configuration.Configuration#getProperty(java.lang.String, java.lang.String)
+     * @see org.onap.appc.configuration.Configuration#getProperty(java.lang.String, java.lang.String)
      */
     @Override
     public String getProperty(String key, String defaultValue) {
@@ -396,7 +396,7 @@ public final class DefaultConfiguration implements Configuration, Cloneable {
      *
      * @param key The property to be checked
      * @return True if the value is a boolean constant, or false if it does not exist or is not a correct string
-     * @see org.openecomp.appc.configuration.Configuration#isValidBoolean(java.lang.String)
+     * @see org.onap.appc.configuration.Configuration#isValidBoolean(java.lang.String)
      */
     @SuppressWarnings("nls")
     @Override
@@ -415,7 +415,7 @@ public final class DefaultConfiguration implements Configuration, Cloneable {
      * @param key The property to be examined
      * @return True if the property is a valid representation of a double, or false if it does not exist or contains
      * illegal characters.
-     * @see org.openecomp.appc.configuration.Configuration#isValidDouble(java.lang.String)
+     * @see org.onap.appc.configuration.Configuration#isValidDouble(java.lang.String)
      */
     @Override
     public boolean isValidDouble(String key) {
@@ -437,7 +437,7 @@ public final class DefaultConfiguration implements Configuration, Cloneable {
      * @param key The key of the property to check
      * @return True if the value is a valid integer string, or false if it does not exist or contains illegal
      * characters.
-     * @see org.openecomp.appc.configuration.Configuration#isValidInteger(java.lang.String)
+     * @see org.onap.appc.configuration.Configuration#isValidInteger(java.lang.String)
      */
     @Override
     public boolean isValidInteger(String key) {
@@ -459,7 +459,7 @@ public final class DefaultConfiguration implements Configuration, Cloneable {
      * @param key The property to be checked
      * @return True if the property is a valid representation of an integer long value, and false if it either does not
      * exist or is not valid.
-     * @see org.openecomp.appc.configuration.Configuration#isValidLong(java.lang.String)
+     * @see org.onap.appc.configuration.Configuration#isValidLong(java.lang.String)
      */
     @Override
     public boolean isValidLong(String key) {
@@ -493,7 +493,7 @@ public final class DefaultConfiguration implements Configuration, Cloneable {
      *
      * @param props An optional Properties object to be merged into the configuration, replacing any same-named
      *              properties.
-     * @see org.openecomp.appc.configuration.Configuration#setProperties(java.util.Properties)
+     * @see org.onap.appc.configuration.Configuration#setProperties(java.util.Properties)
      */
     @Override
     public void setProperties(Properties props) {
@@ -508,7 +508,7 @@ public final class DefaultConfiguration implements Configuration, Cloneable {
      *
      * @param key   The key of the property to be defined
      * @param value The value of the property to be defined
-     * @see org.openecomp.appc.configuration.Configuration#setProperty(java.lang.String, java.lang.String)
+     * @see org.onap.appc.configuration.Configuration#setProperty(java.lang.String, java.lang.String)
      */
     @Override
     public void setProperty(String key, String value) {
diff --git a/appc-common/src/main/java/org/openecomp/appc/configuration/package.html b/appc-common/src/main/java/org/openecomp/appc/configuration/package.html
index 131ba5ced..c6889da9a 100644
--- a/appc-common/src/main/java/org/openecomp/appc/configuration/package.html
+++ b/appc-common/src/main/java/org/openecomp/appc/configuration/package.html
@@ -171,4 +171,4 @@
   </p>
 </body>
 </html>
->>>>>>> app-controller/master:appc-common/src/main/java/org/openecomp/appc/configuration/package.html
+>>>>>>> app-controller/master:appc-common/src/main/java/org/onap/appc/configuration/package.html
diff --git a/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionException.java b/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionException.java
index 5ee6fa483..519933598 100644
--- a/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionException.java
+++ b/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.encryption;
+package org.onap.appc.encryption;
 
 public class EncryptionException extends RuntimeException {
 
diff --git a/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionTool.java b/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionTool.java
index 405487e2f..5d6d7ab33 100644
--- a/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionTool.java
+++ b/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionTool.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.encryption;
+package org.onap.appc.encryption;
 
 import java.security.Provider;
 import java.security.Provider.Service;
diff --git a/appc-common/src/main/java/org/openecomp/appc/encryption/HexHelper.java b/appc-common/src/main/java/org/openecomp/appc/encryption/HexHelper.java
index 8d149ab67..250a17efb 100644
--- a/appc-common/src/main/java/org/openecomp/appc/encryption/HexHelper.java
+++ b/appc-common/src/main/java/org/openecomp/appc/encryption/HexHelper.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.encryption;
+package org.onap.appc.encryption;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/appc-common/src/main/java/org/openecomp/appc/exceptions/APPCException.java b/appc-common/src/main/java/org/openecomp/appc/exceptions/APPCException.java
index 314d0a601..0efed763c 100644
--- a/appc-common/src/main/java/org/openecomp/appc/exceptions/APPCException.java
+++ b/appc-common/src/main/java/org/openecomp/appc/exceptions/APPCException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.exceptions;
+package org.onap.appc.exceptions;
 
 /**
  * This is a base class for all APPC defined exceptions.
diff --git a/appc-common/src/main/java/org/openecomp/appc/exceptions/InvalidInputException.java b/appc-common/src/main/java/org/openecomp/appc/exceptions/InvalidInputException.java
index e9bb0d197..4a82ba83b 100644
--- a/appc-common/src/main/java/org/openecomp/appc/exceptions/InvalidInputException.java
+++ b/appc-common/src/main/java/org/openecomp/appc/exceptions/InvalidInputException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.exceptions;
+package org.onap.appc.exceptions;
 
 public class InvalidInputException extends Exception {
     public InvalidInputException(String message){
diff --git a/appc-common/src/main/java/org/openecomp/appc/exceptions/InvalidStateException.java b/appc-common/src/main/java/org/openecomp/appc/exceptions/InvalidStateException.java
index ceeb87254..d29b93117 100644
--- a/appc-common/src/main/java/org/openecomp/appc/exceptions/InvalidStateException.java
+++ b/appc-common/src/main/java/org/openecomp/appc/exceptions/InvalidStateException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.exceptions;
+package org.onap.appc.exceptions;
 
 public class InvalidStateException extends Exception {
     public InvalidStateException(String message) {
diff --git a/appc-common/src/main/java/org/openecomp/appc/exceptions/UnknownProviderException.java b/appc-common/src/main/java/org/openecomp/appc/exceptions/UnknownProviderException.java
index f3eb8a486..89b29e652 100644
--- a/appc-common/src/main/java/org/openecomp/appc/exceptions/UnknownProviderException.java
+++ b/appc-common/src/main/java/org/openecomp/appc/exceptions/UnknownProviderException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.exceptions;
+package org.onap.appc.exceptions;
 
 /**
  * This exception indicates that the named provider could not be found or was unidentifiable.
diff --git a/appc-common/src/main/java/org/openecomp/appc/i18n/Msg.java b/appc-common/src/main/java/org/openecomp/appc/i18n/Msg.java
index f4a393fd6..b6a0657a0 100644
--- a/appc-common/src/main/java/org/openecomp/appc/i18n/Msg.java
+++ b/appc-common/src/main/java/org/openecomp/appc/i18n/Msg.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.i18n;
+package org.onap.appc.i18n;
 
 import com.att.eelf.i18n.EELFResolvableErrorEnum;
 import com.att.eelf.i18n.EELFResourceManager;
@@ -819,6 +819,6 @@ public enum Msg implements EELFResolvableErrorEnum {
      * Static initializer to ensure the resource bundles for this class are loaded...
      */
     static {
-        EELFResourceManager.loadMessageBundle("org/openecomp/appc/i18n/MessageResources");
+        EELFResourceManager.loadMessageBundle("org/onap/appc/i18n/MessageResources");
     }
 }
diff --git a/appc-common/src/main/java/org/openecomp/appc/logging/LoggingConstants.java b/appc-common/src/main/java/org/openecomp/appc/logging/LoggingConstants.java
index 5c6d7b2b7..30ff91d68 100644
--- a/appc-common/src/main/java/org/openecomp/appc/logging/LoggingConstants.java
+++ b/appc-common/src/main/java/org/openecomp/appc/logging/LoggingConstants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.logging;
+package org.onap.appc.logging;
 
 /**
  * Constant definition of logging
diff --git a/appc-common/src/main/java/org/openecomp/appc/logging/LoggingUtils.java b/appc-common/src/main/java/org/openecomp/appc/logging/LoggingUtils.java
index 65ea7893f..1e4156e02 100644
--- a/appc-common/src/main/java/org/openecomp/appc/logging/LoggingUtils.java
+++ b/appc-common/src/main/java/org/openecomp/appc/logging/LoggingUtils.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.logging;
+package org.onap.appc.logging;
 
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.i18n.Msg;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResolvableErrorEnum;
diff --git a/appc-common/src/main/java/org/openecomp/appc/metadata/MetadataService.java b/appc-common/src/main/java/org/openecomp/appc/metadata/MetadataService.java
index d1c0cf4a7..29586ea15 100644
--- a/appc-common/src/main/java/org/openecomp/appc/metadata/MetadataService.java
+++ b/appc-common/src/main/java/org/openecomp/appc/metadata/MetadataService.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metadata;
+package org.onap.appc.metadata;
 
-import org.openecomp.appc.metadata.objects.DependencyModelIdentifier;
+import org.onap.appc.metadata.objects.DependencyModelIdentifier;
 
 
 public interface MetadataService {
diff --git a/appc-common/src/main/java/org/openecomp/appc/metadata/impl/MetadataServiceImpl.java b/appc-common/src/main/java/org/openecomp/appc/metadata/impl/MetadataServiceImpl.java
index 092dbedb3..0321b7e81 100644
--- a/appc-common/src/main/java/org/openecomp/appc/metadata/impl/MetadataServiceImpl.java
+++ b/appc-common/src/main/java/org/openecomp/appc/metadata/impl/MetadataServiceImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metadata.impl;
+package org.onap.appc.metadata.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -30,10 +30,10 @@ import org.onap.ccsdk.sli.core.dblib.DbLibService;
 
 import javax.sql.rowset.CachedRowSet;
 
-import org.openecomp.appc.cache.MetadataCache;
-import org.openecomp.appc.cache.impl.MetadataCacheFactory;
-import org.openecomp.appc.metadata.MetadataService;
-import org.openecomp.appc.metadata.objects.DependencyModelIdentifier;
+import org.onap.appc.cache.MetadataCache;
+import org.onap.appc.cache.impl.MetadataCacheFactory;
+import org.onap.appc.metadata.MetadataService;
+import org.onap.appc.metadata.objects.DependencyModelIdentifier;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
diff --git a/appc-common/src/main/java/org/openecomp/appc/metadata/objects/DependencyModelIdentifier.java b/appc-common/src/main/java/org/openecomp/appc/metadata/objects/DependencyModelIdentifier.java
index 8b1b5870a..ddd035644 100644
--- a/appc-common/src/main/java/org/openecomp/appc/metadata/objects/DependencyModelIdentifier.java
+++ b/appc-common/src/main/java/org/openecomp/appc/metadata/objects/DependencyModelIdentifier.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metadata.objects;
+package org.onap.appc.metadata.objects;
 
 /**
  * Object of identifier for dependency model.
diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/Allocator.java b/appc-common/src/main/java/org/openecomp/appc/pool/Allocator.java
index e64e4626e..4b9f15a90 100644
--- a/appc-common/src/main/java/org/openecomp/appc/pool/Allocator.java
+++ b/appc-common/src/main/java/org/openecomp/appc/pool/Allocator.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.pool;
+package org.onap.appc.pool;
 
 import java.io.Closeable;
 
diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/CacheManagement.java b/appc-common/src/main/java/org/openecomp/appc/pool/CacheManagement.java
index 18793b9c4..9eb45776f 100644
--- a/appc-common/src/main/java/org/openecomp/appc/pool/CacheManagement.java
+++ b/appc-common/src/main/java/org/openecomp/appc/pool/CacheManagement.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.pool;
+package org.onap.appc.pool;
 
 public interface CacheManagement {
 
diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/CachedElement.java b/appc-common/src/main/java/org/openecomp/appc/pool/CachedElement.java
index d2b3c0a9f..d7d243d4f 100644
--- a/appc-common/src/main/java/org/openecomp/appc/pool/CachedElement.java
+++ b/appc-common/src/main/java/org/openecomp/appc/pool/CachedElement.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.pool;
+package org.onap.appc.pool;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -200,7 +200,7 @@ public class CachedElement<T extends Closeable> implements Closeable, Invocation
     /**
      * This method is used to be able to access the wrapped object underneath the dynamic proxy
      * 
-     * @see org.openecomp.appc.pool.CacheManagement#getWrappedObject()
+     * @see org.onap.appc.pool.CacheManagement#getWrappedObject()
      */
     @Override
     public T getWrappedObject() {
diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/Destructor.java b/appc-common/src/main/java/org/openecomp/appc/pool/Destructor.java
index 94ffbb29b..46bcd2cd0 100644
--- a/appc-common/src/main/java/org/openecomp/appc/pool/Destructor.java
+++ b/appc-common/src/main/java/org/openecomp/appc/pool/Destructor.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.pool;
+package org.onap.appc.pool;
 
 import java.io.Closeable;
 
diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/Pool.java b/appc-common/src/main/java/org/openecomp/appc/pool/Pool.java
index bbbba1717..6d850ae42 100644
--- a/appc-common/src/main/java/org/openecomp/appc/pool/Pool.java
+++ b/appc-common/src/main/java/org/openecomp/appc/pool/Pool.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.pool;
+package org.onap.appc.pool;
 
 import java.io.Closeable;
 import java.util.ArrayDeque;
diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/PoolDrainedException.java b/appc-common/src/main/java/org/openecomp/appc/pool/PoolDrainedException.java
index 01536cb61..260dc7b45 100644
--- a/appc-common/src/main/java/org/openecomp/appc/pool/PoolDrainedException.java
+++ b/appc-common/src/main/java/org/openecomp/appc/pool/PoolDrainedException.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.pool;
+package org.onap.appc.pool;
 
 /**
  * This exception is thrown whenever an attempt is made to access a pool of resources where the pool has been drained.
diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/PoolException.java b/appc-common/src/main/java/org/openecomp/appc/pool/PoolException.java
index cc6b759fd..76d798be1 100644
--- a/appc-common/src/main/java/org/openecomp/appc/pool/PoolException.java
+++ b/appc-common/src/main/java/org/openecomp/appc/pool/PoolException.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.pool;
+package org.onap.appc.pool;
 
 /**
  * A pool exception is a specialization of checked exceptions that define various pool abnormal states or requests.
diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/PoolExtensionException.java b/appc-common/src/main/java/org/openecomp/appc/pool/PoolExtensionException.java
index 0cfffac6a..c95c407c2 100644
--- a/appc-common/src/main/java/org/openecomp/appc/pool/PoolExtensionException.java
+++ b/appc-common/src/main/java/org/openecomp/appc/pool/PoolExtensionException.java
@@ -24,7 +24,7 @@
 
 
   
-package org.openecomp.appc.pool;
+package org.onap.appc.pool;
 
 /**
  * An error occurred trying to extend the pool
diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/PoolSpecificationException.java b/appc-common/src/main/java/org/openecomp/appc/pool/PoolSpecificationException.java
index 9c6f0c19a..361e50a54 100644
--- a/appc-common/src/main/java/org/openecomp/appc/pool/PoolSpecificationException.java
+++ b/appc-common/src/main/java/org/openecomp/appc/pool/PoolSpecificationException.java
@@ -24,7 +24,7 @@
 
 
   
-package org.openecomp.appc.pool;
+package org.onap.appc.pool;
 
 /**
  * This exception is thrown whenever the pool is not specified correctly
diff --git a/appc-common/src/main/java/org/openecomp/appc/util/JsonUtil.java b/appc-common/src/main/java/org/openecomp/appc/util/JsonUtil.java
index 53ff4e154..c1906362e 100644
--- a/appc-common/src/main/java/org/openecomp/appc/util/JsonUtil.java
+++ b/appc-common/src/main/java/org/openecomp/appc/util/JsonUtil.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.util;
+package org.onap.appc.util;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -42,6 +42,6 @@ public class JsonUtil {
     public static Map<String, String> convertJsonStringToFlatMap(String valueAsString) throws IOException {
         ObjectMapper objectMapper = new ObjectMapper();
         Map readValueMap = objectMapper.readValue(valueAsString,Map.class);
-        return org.openecomp.appc.util.ObjectMapper.map(readValueMap);
+        return org.onap.appc.util.ObjectMapper.map(readValueMap);
     }
 }
diff --git a/appc-common/src/main/java/org/openecomp/appc/util/MessageFormatter.java b/appc-common/src/main/java/org/openecomp/appc/util/MessageFormatter.java
index febf3dde4..44095fb71 100644
--- a/appc-common/src/main/java/org/openecomp/appc/util/MessageFormatter.java
+++ b/appc-common/src/main/java/org/openecomp/appc/util/MessageFormatter.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.util;
+package org.onap.appc.util;
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/appc-common/src/main/java/org/openecomp/appc/util/ObjectMapper.java b/appc-common/src/main/java/org/openecomp/appc/util/ObjectMapper.java
index 64038f9cc..df0b24a78 100644
--- a/appc-common/src/main/java/org/openecomp/appc/util/ObjectMapper.java
+++ b/appc-common/src/main/java/org/openecomp/appc/util/ObjectMapper.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.util;
+package org.onap.appc.util;
 
 import java.lang.reflect.Array;
 import java.util.Map;
diff --git a/appc-common/src/main/java/org/openecomp/appc/util/PathContext.java b/appc-common/src/main/java/org/openecomp/appc/util/PathContext.java
index 5664df67f..79b75d1a4 100644
--- a/appc-common/src/main/java/org/openecomp/appc/util/PathContext.java
+++ b/appc-common/src/main/java/org/openecomp/appc/util/PathContext.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.util;
+package org.onap.appc.util;
 
 
 import java.util.Collections;
diff --git a/appc-common/src/main/java/org/openecomp/appc/util/StringHelper.java b/appc-common/src/main/java/org/openecomp/appc/util/StringHelper.java
index a3603cddd..2e68cbba4 100644
--- a/appc-common/src/main/java/org/openecomp/appc/util/StringHelper.java
+++ b/appc-common/src/main/java/org/openecomp/appc/util/StringHelper.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.util;
+package org.onap.appc.util;
 
 import java.util.Date;
 import java.util.List;
diff --git a/appc-common/src/main/java/org/openecomp/appc/util/StructuredPropertyHelper.java b/appc-common/src/main/java/org/openecomp/appc/util/StructuredPropertyHelper.java
index dc40b631e..b610b5a3e 100644
--- a/appc-common/src/main/java/org/openecomp/appc/util/StructuredPropertyHelper.java
+++ b/appc-common/src/main/java/org/openecomp/appc/util/StructuredPropertyHelper.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.util;
+package org.onap.appc.util;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/appc-common/src/main/java/org/openecomp/appc/util/Time.java b/appc-common/src/main/java/org/openecomp/appc/util/Time.java
index 76fd6eb88..ce2babdc3 100644
--- a/appc-common/src/main/java/org/openecomp/appc/util/Time.java
+++ b/appc-common/src/main/java/org/openecomp/appc/util/Time.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.util;
+package org.onap.appc.util;
 
 import java.sql.Timestamp;
 import java.text.DateFormat;
diff --git a/appc-common/src/main/java/org/openecomp/appc/util/UnmodifiableProperties.java b/appc-common/src/main/java/org/openecomp/appc/util/UnmodifiableProperties.java
index fea0ed0ea..831f0f503 100644
--- a/appc-common/src/main/java/org/openecomp/appc/util/UnmodifiableProperties.java
+++ b/appc-common/src/main/java/org/openecomp/appc/util/UnmodifiableProperties.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.util;
+package org.onap.appc.util;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/appc-common/src/main/java/org/openecomp/appc/util/httpClient.java b/appc-common/src/main/java/org/openecomp/appc/util/httpClient.java
index cb6bb8c5f..edb27c6f6 100644
--- a/appc-common/src/main/java/org/openecomp/appc/util/httpClient.java
+++ b/appc-common/src/main/java/org/openecomp/appc/util/httpClient.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.util;
+package org.onap.appc.util;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
@@ -39,9 +39,9 @@ import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 36e510ce2..03e91e3a7 100644
--- a/appc-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -32,10 +32,10 @@
 
     <reference id="dbLibServiceRef" availability="mandatory" activation="eager" interface="org.onap.ccsdk.sli.core.dblib.DbLibService" />
 
-    <bean id="MetadataServiceImplBean" class="org.openecomp.appc.metadata.impl.MetadataServiceImpl" scope="singleton">
+    <bean id="MetadataServiceImplBean" class="org.onap.appc.metadata.impl.MetadataServiceImpl" scope="singleton">
         <property name="dbLibService" ref="dbLibServiceRef" />
     </bean>
 
-    <service id="MetadataService" interface="org.openecomp.appc.metadata.MetadataService" ref="MetadataServiceImplBean"/>
+    <service id="MetadataService" interface="org.onap.appc.metadata.MetadataService" ref="MetadataServiceImplBean"/>
 
 </blueprint>
diff --git a/appc-common/src/main/resources/org/openecomp/appc/i18n/MessageResources.properties b/appc-common/src/main/resources/org/openecomp/appc/i18n/MessageResources.properties
index 354adff9d..7ffb220a1 100644
--- a/appc-common/src/main/resources/org/openecomp/appc/i18n/MessageResources.properties
+++ b/appc-common/src/main/resources/org/openecomp/appc/i18n/MessageResources.properties
@@ -80,9 +80,9 @@ NO_OVERRIDE_PROPERTY_FILE_LOADED=APPC0007E|\
   If a configuration file was expected, verify the file name and that it exists on \
     the search path for the configuration properties.  The search path defaults to \
     <em>&#36;{user.home},/opt/app/appc/etc,etc,../etc,/etc,.</em> and can be overridden \
-    by specification of the property <em>org.openecomp.appc.bootstrap.path</em>.  The \
+    by specification of the property <em>org.onap.appc.bootstrap.path</em>.  The \
     property file name defaults to <em>appc.properties</em> and can also be \
-    overridden by the <em>org.openecomp.appc.bootstrap.file</em> property.|\
+    overridden by the <em>org.onap.appc.bootstrap.file</em> property.|\
   This message indicates that the bootstrap path was searched for the bootstrap \
     property file (a file that can be supplied to configure APPC) and that no file \
     with the specified name was found on any of the path elements of the path.
@@ -92,12 +92,12 @@ SEARCHING_CONFIGURATION_OVERRIDES=APPC0008I|\
   No resolution is required|\
   This message indicates that the specified path is being examined for a configuration \
     file of the indicated name.  The configuration file defaults to <em>appc.properties</em> \
-    but can be overridden by specification of the <em>org.openecomp.appc.bootstrap.file</em> \
+    but can be overridden by specification of the <em>org.onap.appc.bootstrap.file</em> \
     property (using a command-line override, for example).  This message is intended to \
     assist in the debugging and analysis of configuration issues where the indicated \
     file may not be processed or found.  The path that is searched is a comma-delimited \
     list of directories and defaults to <em>&#36;{user.home},/opt/app/appc/etc,etc,../etc,/etc,.</em> \
-    but can also be overridden by specification of the <em>org.openecomp.appc.bootstrap.path</em> \
+    but can also be overridden by specification of the <em>org.onap.appc.bootstrap.path</em> \
     property.
 
 LOADING_APPLICATION_OVERRIDES=APPC0009I|\
diff --git a/appc-common/src/test/java/org/openecomp/appc/cache/CacheStrategiesTest.java b/appc-common/src/test/java/org/openecomp/appc/cache/CacheStrategiesTest.java
index c9e0e0034..41ceb4303 100644
--- a/appc-common/src/test/java/org/openecomp/appc/cache/CacheStrategiesTest.java
+++ b/appc-common/src/test/java/org/openecomp/appc/cache/CacheStrategiesTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.cache;
+package org.onap.appc.cache;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/appc-common/src/test/java/org/openecomp/appc/cache/impl/LRUCacheTest.java b/appc-common/src/test/java/org/openecomp/appc/cache/impl/LRUCacheTest.java
index 75be94dac..3f4233d86 100644
--- a/appc-common/src/test/java/org/openecomp/appc/cache/impl/LRUCacheTest.java
+++ b/appc-common/src/test/java/org/openecomp/appc/cache/impl/LRUCacheTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.cache.impl;
+package org.onap.appc.cache.impl;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/appc-common/src/test/java/org/openecomp/appc/cache/impl/MetadataCacheFactoryTest.java b/appc-common/src/test/java/org/openecomp/appc/cache/impl/MetadataCacheFactoryTest.java
index db6658686..386118025 100644
--- a/appc-common/src/test/java/org/openecomp/appc/cache/impl/MetadataCacheFactoryTest.java
+++ b/appc-common/src/test/java/org/openecomp/appc/cache/impl/MetadataCacheFactoryTest.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.cache.impl;
+package org.onap.appc.cache.impl;
 
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openecomp.appc.cache.CacheStrategies;
+import org.onap.appc.cache.CacheStrategies;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
diff --git a/appc-common/src/test/java/org/openecomp/appc/cache/impl/MetadataCacheImplTest.java b/appc-common/src/test/java/org/openecomp/appc/cache/impl/MetadataCacheImplTest.java
index 48cc67921..c68fb48dc 100644
--- a/appc-common/src/test/java/org/openecomp/appc/cache/impl/MetadataCacheImplTest.java
+++ b/appc-common/src/test/java/org/openecomp/appc/cache/impl/MetadataCacheImplTest.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.cache.impl;
+package org.onap.appc.cache.impl;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.cache.CacheStrategies;
+import org.onap.appc.cache.CacheStrategies;
 import org.powermock.reflect.Whitebox;
 
 import static org.mockito.Mockito.spy;
diff --git a/appc-common/src/test/java/org/openecomp/appc/concurrent/TestSignal.java b/appc-common/src/test/java/org/openecomp/appc/concurrent/TestSignal.java
index 1148a6701..e86fe54a1 100644
--- a/appc-common/src/test/java/org/openecomp/appc/concurrent/TestSignal.java
+++ b/appc-common/src/test/java/org/openecomp/appc/concurrent/TestSignal.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.concurrent;
+package org.onap.appc.concurrent;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -33,7 +33,7 @@ import java.util.Date;
 import java.util.concurrent.TimeoutException;
 
 import org.junit.Test;
-import org.openecomp.appc.concurrent.Signal;
+import org.onap.appc.concurrent.Signal;
 
 public class TestSignal {
 
diff --git a/appc-common/src/test/java/org/openecomp/appc/configuration/DefaultConfigurationTest.java b/appc-common/src/test/java/org/openecomp/appc/configuration/DefaultConfigurationTest.java
index 53bd9dbd6..a423eae81 100644
--- a/appc-common/src/test/java/org/openecomp/appc/configuration/DefaultConfigurationTest.java
+++ b/appc-common/src/test/java/org/openecomp/appc/configuration/DefaultConfigurationTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.configuration;
+package org.onap.appc.configuration;
 
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/appc-common/src/test/java/org/openecomp/appc/encryption/TestEncryption.java b/appc-common/src/test/java/org/openecomp/appc/encryption/TestEncryption.java
index 3c7483fb5..aa9664d2e 100644
--- a/appc-common/src/test/java/org/openecomp/appc/encryption/TestEncryption.java
+++ b/appc-common/src/test/java/org/openecomp/appc/encryption/TestEncryption.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.encryption;
+package org.onap.appc.encryption;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
 import org.junit.Test;
-import org.openecomp.appc.encryption.EncryptionTool;
+import org.onap.appc.encryption.EncryptionTool;
 
 public class TestEncryption {
 
diff --git a/appc-common/src/test/java/org/openecomp/appc/exceptions/APPCExceptionTest.java b/appc-common/src/test/java/org/openecomp/appc/exceptions/APPCExceptionTest.java
index fc6aa9e27..a9611a2df 100644
--- a/appc-common/src/test/java/org/openecomp/appc/exceptions/APPCExceptionTest.java
+++ b/appc-common/src/test/java/org/openecomp/appc/exceptions/APPCExceptionTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.exceptions;
+package org.onap.appc.exceptions;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/appc-common/src/test/java/org/openecomp/appc/exceptions/InvalidInputExceptionTest.java b/appc-common/src/test/java/org/openecomp/appc/exceptions/InvalidInputExceptionTest.java
index 5608a1221..9822ff7ee 100644
--- a/appc-common/src/test/java/org/openecomp/appc/exceptions/InvalidInputExceptionTest.java
+++ b/appc-common/src/test/java/org/openecomp/appc/exceptions/InvalidInputExceptionTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.exceptions;
+package org.onap.appc.exceptions;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/appc-common/src/test/java/org/openecomp/appc/exceptions/InvalidStateExceptionTest.java b/appc-common/src/test/java/org/openecomp/appc/exceptions/InvalidStateExceptionTest.java
index a095a5187..c008131f1 100644
--- a/appc-common/src/test/java/org/openecomp/appc/exceptions/InvalidStateExceptionTest.java
+++ b/appc-common/src/test/java/org/openecomp/appc/exceptions/InvalidStateExceptionTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.exceptions;
+package org.onap.appc.exceptions;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/appc-common/src/test/java/org/openecomp/appc/exceptions/UnknownProviderExceptionTest.java b/appc-common/src/test/java/org/openecomp/appc/exceptions/UnknownProviderExceptionTest.java
index d3fc15d3b..d3c7ab5ef 100644
--- a/appc-common/src/test/java/org/openecomp/appc/exceptions/UnknownProviderExceptionTest.java
+++ b/appc-common/src/test/java/org/openecomp/appc/exceptions/UnknownProviderExceptionTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.exceptions;
+package org.onap.appc.exceptions;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/appc-common/src/test/java/org/openecomp/appc/i18n/MsgTest.java b/appc-common/src/test/java/org/openecomp/appc/i18n/MsgTest.java
index aa30ae7e1..1a541a5d4 100644
--- a/appc-common/src/test/java/org/openecomp/appc/i18n/MsgTest.java
+++ b/appc-common/src/test/java/org/openecomp/appc/i18n/MsgTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.i18n;
+package org.onap.appc.i18n;
 
 import static org.junit.Assert.assertNotNull;
 
diff --git a/appc-common/src/test/java/org/openecomp/appc/logging/LoggingConstantsTest.java b/appc-common/src/test/java/org/openecomp/appc/logging/LoggingConstantsTest.java
index 547f180ca..1238b494b 100644
--- a/appc-common/src/test/java/org/openecomp/appc/logging/LoggingConstantsTest.java
+++ b/appc-common/src/test/java/org/openecomp/appc/logging/LoggingConstantsTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.logging;
+package org.onap.appc.logging;
 
 import org.junit.Test;
 import org.powermock.reflect.Whitebox;
diff --git a/appc-common/src/test/java/org/openecomp/appc/metadata/TestMetadataService.java b/appc-common/src/test/java/org/openecomp/appc/metadata/TestMetadataService.java
index aa9e4533e..7316fe8a6 100644
--- a/appc-common/src/test/java/org/openecomp/appc/metadata/TestMetadataService.java
+++ b/appc-common/src/test/java/org/openecomp/appc/metadata/TestMetadataService.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metadata;
+package org.onap.appc.metadata;
 
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
 import com.sun.rowset.CachedRowSetImpl;
 import org.mockito.Mockito;
-import org.openecomp.appc.metadata.impl.MetadataServiceImpl;
+import org.onap.appc.metadata.impl.MetadataServiceImpl;
 
 import javax.sql.rowset.CachedRowSet;
 import java.sql.SQLException;
diff --git a/appc-common/src/test/java/org/openecomp/appc/metadata/objects/DependencyModelIdentifierTest.java b/appc-common/src/test/java/org/openecomp/appc/metadata/objects/DependencyModelIdentifierTest.java
index 214943ec6..95f3312cb 100644
--- a/appc-common/src/test/java/org/openecomp/appc/metadata/objects/DependencyModelIdentifierTest.java
+++ b/appc-common/src/test/java/org/openecomp/appc/metadata/objects/DependencyModelIdentifierTest.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metadata.objects;
+package org.onap.appc.metadata.objects;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.powermock.reflect.Whitebox;
 
-import static org.openecomp.appc.metadata.objects.DependencyModelIdentifier.prime;
+import static org.onap.appc.metadata.objects.DependencyModelIdentifier.prime;
 
 public class DependencyModelIdentifierTest {
     private static final String vnfType = "vnfType";
diff --git a/appc-common/src/test/java/org/openecomp/appc/pool/CachedElementTest.java b/appc-common/src/test/java/org/openecomp/appc/pool/CachedElementTest.java
index 99a417cd9..30e592430 100644
--- a/appc-common/src/test/java/org/openecomp/appc/pool/CachedElementTest.java
+++ b/appc-common/src/test/java/org/openecomp/appc/pool/CachedElementTest.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.pool;
+package org.onap.appc.pool;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -38,14 +38,14 @@ import java.lang.reflect.Method;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.pool.Allocator;
-import org.openecomp.appc.pool.CachedElement;
-import org.openecomp.appc.pool.Destructor;
-import org.openecomp.appc.pool.Pool;
-import org.openecomp.appc.pool.PoolDrainedException;
-import org.openecomp.appc.pool.PoolExtensionException;
-import org.openecomp.appc.pool.PoolSpecificationException;
-import org.openecomp.appc.pool.*;
+import org.onap.appc.pool.Allocator;
+import org.onap.appc.pool.CachedElement;
+import org.onap.appc.pool.Destructor;
+import org.onap.appc.pool.Pool;
+import org.onap.appc.pool.PoolDrainedException;
+import org.onap.appc.pool.PoolExtensionException;
+import org.onap.appc.pool.PoolSpecificationException;
+import org.onap.appc.pool.*;
 
 
 public class CachedElementTest implements Allocator<Testable>, Destructor<Testable> {
@@ -255,7 +255,7 @@ public class CachedElementTest implements Allocator<Testable>, Destructor<Testab
     }
 
     /**
-     * @see org.openecomp.appc.pool.Allocator#allocate(org.openecomp.appc.pool.Pool)
+     * @see org.onap.appc.pool.Allocator#allocate(org.onap.appc.pool.Pool)
      */
     @Override
     public Testable allocate(Pool<Testable> pool) {
@@ -267,7 +267,7 @@ public class CachedElementTest implements Allocator<Testable>, Destructor<Testab
     }
 
     /**
-     * @see org.openecomp.appc.pool.Destructor#destroy(java.io.Closeable, org.openecomp.appc.pool.Pool)
+     * @see org.onap.appc.pool.Destructor#destroy(java.io.Closeable, org.onap.appc.pool.Pool)
      */
     @Override
     public void destroy(Testable obj, Pool<Testable> pool) {
diff --git a/appc-common/src/test/java/org/openecomp/appc/pool/Element.java b/appc-common/src/test/java/org/openecomp/appc/pool/Element.java
index 41255b62f..877fab2aa 100644
--- a/appc-common/src/test/java/org/openecomp/appc/pool/Element.java
+++ b/appc-common/src/test/java/org/openecomp/appc/pool/Element.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.pool;
+package org.onap.appc.pool;
 
 import java.io.IOException;
 
diff --git a/appc-common/src/test/java/org/openecomp/appc/pool/PoolTest.java b/appc-common/src/test/java/org/openecomp/appc/pool/PoolTest.java
index 2c9194503..db9a2e615 100644
--- a/appc-common/src/test/java/org/openecomp/appc/pool/PoolTest.java
+++ b/appc-common/src/test/java/org/openecomp/appc/pool/PoolTest.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.pool;
+package org.onap.appc.pool;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -39,13 +39,13 @@ import java.lang.reflect.Proxy;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.pool.Allocator;
-import org.openecomp.appc.pool.Destructor;
-import org.openecomp.appc.pool.Pool;
-import org.openecomp.appc.pool.PoolDrainedException;
-import org.openecomp.appc.pool.PoolExtensionException;
-import org.openecomp.appc.pool.PoolSpecificationException;
-import org.openecomp.appc.pool.*;
+import org.onap.appc.pool.Allocator;
+import org.onap.appc.pool.Destructor;
+import org.onap.appc.pool.Pool;
+import org.onap.appc.pool.PoolDrainedException;
+import org.onap.appc.pool.PoolExtensionException;
+import org.onap.appc.pool.PoolSpecificationException;
+import org.onap.appc.pool.*;
 
 
 public class PoolTest implements Allocator<Testable>, Destructor<Testable> {
@@ -299,7 +299,7 @@ public class PoolTest implements Allocator<Testable>, Destructor<Testable> {
     }
 
     /**
-     * @see org.openecomp.appc.pool.Destructor#destroy(java.io.Closeable, org.openecomp.appc.pool.Pool)
+     * @see org.onap.appc.pool.Destructor#destroy(java.io.Closeable, org.onap.appc.pool.Pool)
      */
     @Override
     public void destroy(Testable obj, Pool<Testable> pool) {
@@ -312,7 +312,7 @@ public class PoolTest implements Allocator<Testable>, Destructor<Testable> {
     }
 
     /**
-     * @see org.openecomp.appc.pool.Allocator#allocate(org.openecomp.appc.pool.Pool)
+     * @see org.onap.appc.pool.Allocator#allocate(org.onap.appc.pool.Pool)
      */
     @Override
     public Testable allocate(Pool<Testable> pool) {
diff --git a/appc-common/src/test/java/org/openecomp/appc/pool/Testable.java b/appc-common/src/test/java/org/openecomp/appc/pool/Testable.java
index b6e69ef0c..fb2fa75ef 100644
--- a/appc-common/src/test/java/org/openecomp/appc/pool/Testable.java
+++ b/appc-common/src/test/java/org/openecomp/appc/pool/Testable.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.pool;
+package org.onap.appc.pool;
 
 import java.io.Closeable;
 
diff --git a/appc-common/src/test/java/org/openecomp/appc/util/TestJsonUtil.java b/appc-common/src/test/java/org/openecomp/appc/util/TestJsonUtil.java
index 87e70e43d..270f90f05 100644
--- a/appc-common/src/test/java/org/openecomp/appc/util/TestJsonUtil.java
+++ b/appc-common/src/test/java/org/openecomp/appc/util/TestJsonUtil.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.util;
+package org.onap.appc.util;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.util.JsonUtil;
+import org.onap.appc.util.JsonUtil;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/appc-common/src/test/java/org/openecomp/appc/util/TestStringHelper.java b/appc-common/src/test/java/org/openecomp/appc/util/TestStringHelper.java
index 74f0b121b..06957cf2d 100644
--- a/appc-common/src/test/java/org/openecomp/appc/util/TestStringHelper.java
+++ b/appc-common/src/test/java/org/openecomp/appc/util/TestStringHelper.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.util;
+package org.onap.appc.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue;
 import java.util.Properties;
 
 import org.junit.Test;
-import org.openecomp.appc.util.StringHelper;
+import org.onap.appc.util.StringHelper;
 
 
 public class TestStringHelper {
diff --git a/appc-common/src/test/java/org/openecomp/appc/util/TestStructuredPropertyHelper.java b/appc-common/src/test/java/org/openecomp/appc/util/TestStructuredPropertyHelper.java
index 0c019e9ee..06c27d0dd 100644
--- a/appc-common/src/test/java/org/openecomp/appc/util/TestStructuredPropertyHelper.java
+++ b/appc-common/src/test/java/org/openecomp/appc/util/TestStructuredPropertyHelper.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.util;
+package org.onap.appc.util;
 
 import static org.junit.Assert.*;
 
@@ -32,8 +32,8 @@ import java.util.Properties;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.util.StructuredPropertyHelper;
-import org.openecomp.appc.util.StructuredPropertyHelper.Node;
+import org.onap.appc.util.StructuredPropertyHelper;
+import org.onap.appc.util.StructuredPropertyHelper.Node;
 
 /**
  * This class is used to test the structured property helper class.
diff --git a/appc-config/appc-config-adaptor/features/pom.xml b/appc-config/appc-config-adaptor/features/pom.xml
index ef7f4d197..018adafb7 100644
--- a/appc-config/appc-config-adaptor/features/pom.xml
+++ b/appc-config/appc-config-adaptor/features/pom.xml
@@ -3,7 +3,7 @@
 
 
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config-adaptor</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -15,7 +15,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-adaptor-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-config/appc-config-adaptor/features/src/main/resources/features.xml b/appc-config/appc-config-adaptor/features/src/main/resources/features.xml
index d14795bac..55f30ffae 100644
--- a/appc-config/appc-config-adaptor/features/src/main/resources/features.xml
+++ b/appc-config/appc-config-adaptor/features/src/main/resources/features.xml
@@ -34,7 +34,7 @@
 		<bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-config-adaptor-provider/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-config-adaptor-provider/${project.version}</bundle>
 	</feature>
 
 </features>
diff --git a/appc-config/appc-config-adaptor/installer/pom.xml b/appc-config/appc-config-adaptor/installer/pom.xml
index 81fa47e3a..55e6befae 100644
--- a/appc-config/appc-config-adaptor/installer/pom.xml
+++ b/appc-config/appc-config-adaptor/installer/pom.xml
@@ -23,7 +23,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config-adaptor</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -34,12 +34,12 @@
     <properties>
         <application.name>appc-config-adaptor</application.name>
         <features.boot>appc-config-adaptor</features.boot>
-        <features.repositories>mvn:org.openecomp.appc/appc-config-adaptor-features/${project.version}/xml/features</features.repositories>
+        <features.repositories>mvn:org.onap.appc/appc-config-adaptor-features/${project.version}/xml/features</features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-adaptor-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -51,7 +51,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-adaptor-provider</artifactId>
             <version>1.3.0-SNAPSHOT</version>
         </dependency>
diff --git a/appc-config/appc-config-adaptor/pom.xml b/appc-config/appc-config-adaptor/pom.xml
index 06b77ae1f..dce9b092d 100644
--- a/appc-config/appc-config-adaptor/pom.xml
+++ b/appc-config/appc-config-adaptor/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -18,14 +18,14 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-config-adaptor-features</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-config-adaptor-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
diff --git a/appc-config/appc-config-adaptor/provider/pom.xml b/appc-config/appc-config-adaptor/provider/pom.xml
index 906caf29d..11583124a 100644
--- a/appc-config/appc-config-adaptor/provider/pom.xml
+++ b/appc-config/appc-config-adaptor/provider/pom.xml
@@ -28,7 +28,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config-adaptor</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -132,8 +132,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>appc.config.adaptor</Bundle-SymbolicName>
-                        <Bundle-Activator>org.openecomp.appc.ccadaptor.CCAActivator</Bundle-Activator>
-                        <Export-Package>org.openecomp.appc.adaptor</Export-Package>
+                        <Bundle-Activator>org.onap.appc.ccadaptor.CCAActivator</Bundle-Activator>
+                        <Export-Package>org.onap.appc.adaptor</Export-Package>
                         <Import-Package>*</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
                     </instructions>
diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/CCAActivator.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/CCAActivator.java
index 4bf0f33a4..d9d2b11b0 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/CCAActivator.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/CCAActivator.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.ccadaptor;
+package org.onap.appc.ccadaptor;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/ConfigComponentAdaptor.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/ConfigComponentAdaptor.java
index 4470ff2ee..1434b3d93 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/ConfigComponentAdaptor.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/ConfigComponentAdaptor.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.ccadaptor;
+package org.onap.appc.ccadaptor;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/DebugLog.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/DebugLog.java
index 307db639a..15db56c90 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/DebugLog.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/DebugLog.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.ccadaptor;
+package org.onap.appc.ccadaptor;
 
 import java.io.*;
 import java.text.DateFormat;
diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/EncryptionTool.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/EncryptionTool.java
index 8555c29fe..ad09d7faf 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/EncryptionTool.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/EncryptionTool.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.ccadaptor;
+package org.onap.appc.ccadaptor;
 
 import java.security.Provider;
 import java.security.Provider.Service;
diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/SshJcraftWrapper.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/SshJcraftWrapper.java
index 4d2169401..eb9e28fa2 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/SshJcraftWrapper.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/SshJcraftWrapper.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.ccadaptor;
+package org.onap.appc.ccadaptor;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/TelnetListener.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/TelnetListener.java
index e3f7138b0..6ae83b238 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/TelnetListener.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/TelnetListener.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.ccadaptor;
+package org.onap.appc.ccadaptor;
 
 public interface TelnetListener
 {
diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/TimedOutException.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/TimedOutException.java
index c0480f4fd..3952ffeb9 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/TimedOutException.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/TimedOutException.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.ccadaptor;
+package org.onap.appc.ccadaptor;
 
 import java.io.*;
 
diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/XmlUtil.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/XmlUtil.java
index 7cc1b57d7..bc8d968f2 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/XmlUtil.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/XmlUtil.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.ccadaptor;
+package org.onap.appc.ccadaptor;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestConfigComponentAdaptor.java b/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestConfigComponentAdaptor.java
index 7290dd2e2..2a258f187 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestConfigComponentAdaptor.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestConfigComponentAdaptor.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.ccadaptor;

+package org.onap.appc.ccadaptor;

 

 import java.util.HashMap;

 import java.util.Map;

diff --git a/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestDebugLog.java b/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestDebugLog.java
index fdd2c667c..c7a7953bd 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestDebugLog.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestDebugLog.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.ccadaptor;

+package org.onap.appc.ccadaptor;

 

 import org.junit.Test;

 

diff --git a/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestEncryptionTool.java b/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestEncryptionTool.java
index 5751d1e1c..a4a092e23 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestEncryptionTool.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestEncryptionTool.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.ccadaptor;

+package org.onap.appc.ccadaptor;

 

 import org.junit.Assert;

 import org.junit.Test;

diff --git a/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestSshJcraftWrapper.java b/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestSshJcraftWrapper.java
index bd5ca81a2..2a2adb75e 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestSshJcraftWrapper.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestSshJcraftWrapper.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.ccadaptor;

+package org.onap.appc.ccadaptor;

 

 import org.junit.Assert;

 import org.junit.Test;

diff --git a/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestXmlUtil.java b/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestXmlUtil.java
index 8ccef295a..f3e7a1004 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestXmlUtil.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestXmlUtil.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.ccadaptor;

+package org.onap.appc.ccadaptor;

 

 import java.util.HashMap;

 import java.util.Map;

diff --git a/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/ConfigComponentAdaptorTest.java b/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/ConfigComponentAdaptorTest.java
index 2f5cd1a31..4cd3934ae 100644
--- a/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/ConfigComponentAdaptorTest.java
+++ b/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/ConfigComponentAdaptorTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.ccadaptor;
+package org.onap.appc.ccadaptor;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/DebugLogTest.java b/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/DebugLogTest.java
index 522c00279..6fcb62675 100644
--- a/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/DebugLogTest.java
+++ b/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/DebugLogTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================

  */

 

-package org.openecomp.appc.ccadaptor;

+package org.onap.appc.ccadaptor;

 

 import org.junit.Assert;

 import org.junit.Test;

diff --git a/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/EncryptionToolTest.java b/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/EncryptionToolTest.java
index e352098db..afa9137db 100644
--- a/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/EncryptionToolTest.java
+++ b/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/EncryptionToolTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================

  */

 

-package org.openecomp.appc.ccadaptor;

+package org.onap.appc.ccadaptor;

 

 import org.junit.Assert;

 import org.junit.Test;

diff --git a/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/SshJcraftWrapperTest.java b/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/SshJcraftWrapperTest.java
index 64e338b58..ef1bf7d7f 100644
--- a/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/SshJcraftWrapperTest.java
+++ b/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/SshJcraftWrapperTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.ccadaptor;
+package org.onap.appc.ccadaptor;
 
 
 import java.io.File;
diff --git a/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/XmlUtilTest.java b/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/XmlUtilTest.java
index 5621a3d7d..59cabc26f 100644
--- a/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/XmlUtilTest.java
+++ b/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/XmlUtilTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================

  */

 

-package org.openecomp.appc.ccadaptor;

+package org.onap.appc.ccadaptor;

 

 import java.util.HashMap;

 import java.util.Map;

diff --git a/appc-config/appc-config-audit/features/pom.xml b/appc-config/appc-config-audit/features/pom.xml
index 5f8dabeca..f71afec62 100644
--- a/appc-config/appc-config-audit/features/pom.xml
+++ b/appc-config/appc-config-audit/features/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>		
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-config-audit</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -14,7 +14,7 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-config-audit-provider</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-config/appc-config-audit/features/src/main/resources/features.xml b/appc-config/appc-config-audit/features/src/main/resources/features.xml
index 27d64e267..1bba6ee71 100644
--- a/appc-config/appc-config-audit/features/src/main/resources/features.xml
+++ b/appc-config/appc-config-audit/features/src/main/resources/features.xml
@@ -40,6 +40,6 @@
 		<bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>
 		<bundle>wrap:mvn:xmlunit/xmlunit/${xmlunit.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-config-audit-provider/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-config-audit-provider/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/appc-config/appc-config-audit/installer/pom.xml b/appc-config/appc-config-audit/installer/pom.xml
index 1049049fc..cbe6f810c 100644
--- a/appc-config/appc-config-audit/installer/pom.xml
+++ b/appc-config/appc-config-audit/installer/pom.xml
@@ -23,7 +23,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config-audit</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -34,12 +34,12 @@
     <properties>
         <application.name>appc-config-audit</application.name>
         <features.boot>appc-config-audit</features.boot>
-        <features.repositories>mvn:org.openecomp.appc/appc-config-audit-features/${project.version}/xml/features</features.repositories>
+        <features.repositories>mvn:org.onap.appc/appc-config-audit-features/${project.version}/xml/features</features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-audit-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -51,7 +51,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-audit-provider</artifactId>
             <version>1.3.0-SNAPSHOT</version>
         </dependency>
diff --git a/appc-config/appc-config-audit/pom.xml b/appc-config/appc-config-audit/pom.xml
index 1b9f65336..1fcced92e 100644
--- a/appc-config/appc-config-audit/pom.xml
+++ b/appc-config/appc-config-audit/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-config</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -22,7 +22,7 @@
 
 		<dependencies>
 			<dependency>
-				<groupId>org.openecomp.appc</groupId>
+				<groupId>org.onap.appc</groupId>
 				<artifactId>appc-config-audit-features</artifactId>
 				<classifier>features</classifier>
 				<type>xml</type>
@@ -30,7 +30,7 @@
 			</dependency>
 
 			<dependency>
-				<groupId>org.openecomp.appc</groupId>
+				<groupId>org.onap.appc</groupId>
 				<artifactId>appc-config-audit-provider</artifactId>
 				<version>${project.version}</version>
 			</dependency>
diff --git a/appc-config/appc-config-audit/provider/pom.xml b/appc-config/appc-config-audit/provider/pom.xml
index 8831eb812..c07a4cd00 100644
--- a/appc-config/appc-config-audit/provider/pom.xml
+++ b/appc-config/appc-config-audit/provider/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config-audit</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
diff --git a/appc-config/appc-config-generator/features/pom.xml b/appc-config/appc-config-generator/features/pom.xml
index c40bdf9c1..4a29f8651 100644
--- a/appc-config/appc-config-generator/features/pom.xml
+++ b/appc-config/appc-config-generator/features/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config-generator</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -16,7 +16,7 @@
 
 
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-generator-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-config/appc-config-generator/features/src/main/resources/features.xml b/appc-config/appc-config-generator/features/src/main/resources/features.xml
index 3ce91a445..a039b5081 100644
--- a/appc-config/appc-config-generator/features/src/main/resources/features.xml
+++ b/appc-config/appc-config-generator/features/src/main/resources/features.xml
@@ -44,6 +44,6 @@
 		<bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-config-generator-provider/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-config-generator-provider/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/appc-config/appc-config-generator/installer/pom.xml b/appc-config/appc-config-generator/installer/pom.xml
index 1ef40dd94..bb9a7fafc 100644
--- a/appc-config/appc-config-generator/installer/pom.xml
+++ b/appc-config/appc-config-generator/installer/pom.xml
@@ -23,7 +23,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config-generator</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -34,12 +34,12 @@
     <properties>
         <application.name>appc-config-generator</application.name>
         <features.boot>appc-config-generator</features.boot>
-        <features.repositories>mvn:org.openecomp.appc/appc-config-generator-features/${project.version}/xml/features</features.repositories>
+        <features.repositories>mvn:org.onap.appc/appc-config-generator-features/${project.version}/xml/features</features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-generator-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -51,7 +51,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-generator-provider</artifactId>
             <version>1.3.0-SNAPSHOT</version>
         </dependency>
diff --git a/appc-config/appc-config-generator/pom.xml b/appc-config/appc-config-generator/pom.xml
index aaf5ba125..88c40cb28 100644
--- a/appc-config/appc-config-generator/pom.xml
+++ b/appc-config/appc-config-generator/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -22,7 +22,7 @@
 
         <dependencies>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-config-generator-features</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
@@ -30,7 +30,7 @@
             </dependency>
 
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-config-generator-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
diff --git a/appc-config/appc-config-generator/provider/pom.xml b/appc-config/appc-config-generator/provider/pom.xml
index 9cf7f5f24..d247e1589 100644
--- a/appc-config/appc-config-generator/provider/pom.xml
+++ b/appc-config/appc-config-generator/provider/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config-generator</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
diff --git a/appc-config/appc-config-params/features/pom.xml b/appc-config/appc-config-params/features/pom.xml
index 30c690134..1211be630 100644
--- a/appc-config/appc-config-params/features/pom.xml
+++ b/appc-config/appc-config-params/features/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-config-params</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -13,7 +13,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-config-params-provider</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-config/appc-config-params/features/src/main/resources/features.xml b/appc-config/appc-config-params/features/src/main/resources/features.xml
index 8a852b3d7..fbacf644b 100644
--- a/appc-config/appc-config-params/features/src/main/resources/features.xml
+++ b/appc-config/appc-config-params/features/src/main/resources/features.xml
@@ -44,12 +44,12 @@
 		<bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
 		<bundle>wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson.version}</bundle>
 		<bundle>wrap:mvn:org.yaml/snakeyaml/${snakeyaml.version}</bundle>
-		<bundle>wrap:mvn:org.openecomp.appc/appc-yang-generator/${project.version}</bundle>
+		<bundle>wrap:mvn:org.onap.appc/appc-yang-generator/${project.version}</bundle>
 		<bundle>wrap:mvn:org.openecomp.sdc.common/openecomp-tosca-datatype/${tosca.datatype.version}</bundle>
 		
 		<bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-config-params-provider/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-config-params-provider/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/appc-config/appc-config-params/installer/pom.xml b/appc-config/appc-config-params/installer/pom.xml
index fb1a9ff43..d862c0228 100644
--- a/appc-config/appc-config-params/installer/pom.xml
+++ b/appc-config/appc-config-params/installer/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config-params</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -13,12 +13,12 @@
     <properties>
         <application.name>appc-config-params</application.name>
         <features.boot>appc-config-params</features.boot>
-        <features.repositories>mvn:org.openecomp.appc/appc-config-params-features/${project.version}/xml/features</features.repositories>
+        <features.repositories>mvn:org.onap.appc/appc-config-params-features/${project.version}/xml/features</features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-params-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -30,7 +30,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-params-provider</artifactId>
             <version>1.3.0-SNAPSHOT</version>
         </dependency>
diff --git a/appc-config/appc-config-params/pom.xml b/appc-config/appc-config-params/pom.xml
index d99f04e96..bc049afa5 100644
--- a/appc-config/appc-config-params/pom.xml
+++ b/appc-config/appc-config-params/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-config</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -23,7 +23,7 @@
 
 		<dependencies>
 			<dependency>
-				<groupId>org.openecomp.appc</groupId>
+				<groupId>org.onap.appc</groupId>
 				<artifactId>appc-config-params-features</artifactId>
 				<classifier>features</classifier>
 				<type>xml</type>
@@ -31,7 +31,7 @@
 			</dependency>
 
 			<dependency>
-				<groupId>org.openecomp.appc</groupId>
+				<groupId>org.onap.appc</groupId>
 				<artifactId>appc-config-params-provider</artifactId>
 				<version>${project.version}</version>
 			</dependency>
diff --git a/appc-config/appc-config-params/provider/pom.xml b/appc-config/appc-config-params/provider/pom.xml
index 79a015930..61b739255 100644
--- a/appc-config/appc-config-params/provider/pom.xml
+++ b/appc-config/appc-config-params/provider/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-config-params</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
diff --git a/appc-config/appc-data-services/features/pom.xml b/appc-config/appc-data-services/features/pom.xml
index 083860ce9..88074192d 100644
--- a/appc-config/appc-data-services/features/pom.xml
+++ b/appc-config/appc-data-services/features/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-config-data-services</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>appc-config-data-services-features</artifactId>
@@ -13,7 +13,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-config-data-services-provider</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-config/appc-data-services/features/src/main/resources/features.xml b/appc-config/appc-data-services/features/src/main/resources/features.xml
index a37150ab3..6bc7cc9fc 100644
--- a/appc-config/appc-data-services/features/src/main/resources/features.xml
+++ b/appc-config/appc-data-services/features/src/main/resources/features.xml
@@ -42,6 +42,6 @@
 		<bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-config-data-services-provider/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-config-data-services-provider/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/appc-config/appc-data-services/installer/pom.xml b/appc-config/appc-data-services/installer/pom.xml
index 8eb628167..35a88f623 100644
--- a/appc-config/appc-data-services/installer/pom.xml
+++ b/appc-config/appc-data-services/installer/pom.xml
@@ -23,7 +23,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config-data-services</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -34,12 +34,12 @@
     <properties>
         <application.name>appc-config-data-services</application.name>
         <features.boot>appc-config-data-services</features.boot>
-        <features.repositories>mvn:org.openecomp.appc/appc-config-data-services-features/${project.version}/xml/features</features.repositories>
+        <features.repositories>mvn:org.onap.appc/appc-config-data-services-features/${project.version}/xml/features</features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-data-services-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -51,7 +51,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-data-services-provider</artifactId>
             <version>1.3.0-SNAPSHOT</version>
         </dependency>
diff --git a/appc-config/appc-data-services/pom.xml b/appc-config/appc-data-services/pom.xml
index 28d19c358..cf05d242c 100644
--- a/appc-config/appc-data-services/pom.xml
+++ b/appc-config/appc-data-services/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-config</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -21,7 +21,7 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.openecomp.appc</groupId>
+				<groupId>org.onap.appc</groupId>
 				<artifactId>appc-config-data-services-features</artifactId>
 				<classifier>features</classifier>
 				<type>xml</type>
@@ -29,7 +29,7 @@
 			</dependency>
 
 			<dependency>
-				<groupId>org.openecomp.appc</groupId>
+				<groupId>org.onap.appc</groupId>
 				<artifactId>appc-config-data-services-provider</artifactId>
 				<version>${project.version}</version>
 			</dependency>
diff --git a/appc-config/appc-data-services/provider/pom.xml b/appc-config/appc-data-services/provider/pom.xml
index 74f01408f..22b5bb7e6 100644
--- a/appc-config/appc-data-services/provider/pom.xml
+++ b/appc-config/appc-data-services/provider/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-config-data-services</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -106,8 +106,8 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>appc-config-data-services</Bundle-SymbolicName>
-						<Bundle-Activator>org.openecomp.appc.data.services.AppcDataServiceActivator</Bundle-Activator>
-						<Export-Package>org.openecomp.appc.data.services</Export-Package>
+						<Bundle-Activator>org.onap.appc.data.services.AppcDataServiceActivator</Bundle-Activator>
+						<Export-Package>org.onap.appc.data.services</Export-Package>
 						<Import-Package>*</Import-Package>
 						<DynamicImport-Package>*</DynamicImport-Package>
 					</instructions>
diff --git a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/AppcDataServiceActivator.java b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/AppcDataServiceActivator.java
index 0ccc2b752..698924853 100644
--- a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/AppcDataServiceActivator.java
+++ b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/AppcDataServiceActivator.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.data.services;
+package org.onap.appc.data.services;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.appc.data.services.node.ConfigResourceNode;
+import org.onap.appc.data.services.node.ConfigResourceNode;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
diff --git a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/AppcDataServiceConstant.java b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/AppcDataServiceConstant.java
index 39ed51a57..9add56b5e 100644
--- a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/AppcDataServiceConstant.java
+++ b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/AppcDataServiceConstant.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.data.services;
+package org.onap.appc.data.services;
 
 public class AppcDataServiceConstant {
 
diff --git a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/DGGeneralDBService.java b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/DGGeneralDBService.java
index cfb24939b..87e5506a2 100644
--- a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/DGGeneralDBService.java
+++ b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/DGGeneralDBService.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.data.services.db;
+package org.onap.appc.data.services.db;
 
 import java.util.Set;
 
diff --git a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/GeneralDataService.java b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/GeneralDataService.java
index bb6d89539..d0b8726ad 100644
--- a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/GeneralDataService.java
+++ b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/GeneralDataService.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.data.services.db;
+package org.onap.appc.data.services.db;
 
 import java.util.Map;
 import java.util.Set;
@@ -31,8 +31,8 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
 import org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource;
 
-import org.openecomp.appc.data.services.AppcDataServiceConstant;
-import org.openecomp.appc.data.services.utils.EscapeUtils;
+import org.onap.appc.data.services.AppcDataServiceConstant;
+import org.onap.appc.data.services.utils.EscapeUtils;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/node/ConfigResourceNode.java b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/node/ConfigResourceNode.java
index 3be53ab77..abdb3e85b 100644
--- a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/node/ConfigResourceNode.java
+++ b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/node/ConfigResourceNode.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.data.services.node;
+package org.onap.appc.data.services.node;
 
 import java.util.Map;
 import java.util.ArrayList;
@@ -35,9 +35,9 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
-import org.openecomp.appc.data.services.AppcDataServiceConstant;
-import org.openecomp.appc.data.services.db.DGGeneralDBService;
-import org.openecomp.appc.data.services.utils.EscapeUtils;
+import org.onap.appc.data.services.AppcDataServiceConstant;
+import org.onap.appc.data.services.db.DGGeneralDBService;
+import org.onap.appc.data.services.utils.EscapeUtils;
 
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
 
diff --git a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/utils/EscapeUtils.java b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/utils/EscapeUtils.java
index b8daeeb6f..56e776c7c 100644
--- a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/utils/EscapeUtils.java
+++ b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/utils/EscapeUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.data.services.utils;
+package org.onap.appc.data.services.utils;
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestConfigResourceNode.java b/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestConfigResourceNode.java
index 4fe01b3ae..fb44e8799 100644
--- a/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestConfigResourceNode.java
+++ b/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestConfigResourceNode.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.data.services.db;
+package org.onap.appc.data.services.db;
 
 import java.util.HashMap;
 import java.util.Map;
 import static org.junit.Assert.assertFalse;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.appc.data.services.AppcDataServiceConstant;
-import org.openecomp.appc.data.services.node.ConfigResourceNode;
+import org.onap.appc.data.services.AppcDataServiceConstant;
+import org.onap.appc.data.services.node.ConfigResourceNode;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 
diff --git a/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestDGGeneralDBService.java b/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestDGGeneralDBService.java
index d64f15cbe..91f05c1d4 100644
--- a/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestDGGeneralDBService.java
+++ b/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestDGGeneralDBService.java
@@ -21,7 +21,7 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.appc.data.services.db;
+package org.onap.appc.data.services.db;
 
 import static org.junit.Assert.assertEquals;
 import java.io.IOException;
@@ -34,7 +34,7 @@ import org.junit.Test;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
-import org.openecomp.appc.data.services.db.DGGeneralDBService;
+import org.onap.appc.data.services.db.DGGeneralDBService;
 
 public class TestDGGeneralDBService {
     DGGeneralDBService dbService;
diff --git a/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestSQLSaveQuery.java b/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestSQLSaveQuery.java
index dfb481486..2a8115336 100644
--- a/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestSQLSaveQuery.java
+++ b/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestSQLSaveQuery.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.data.services.db;
+package org.onap.appc.data.services.db;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/appc-config/appc-encryption-tool/features/pom.xml b/appc-config/appc-encryption-tool/features/pom.xml
index 0c72a4bfc..85b009d07 100644
--- a/appc-config/appc-encryption-tool/features/pom.xml
+++ b/appc-config/appc-encryption-tool/features/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config-encryption-tool</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -12,7 +12,7 @@
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-encryption-tool-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-config/appc-encryption-tool/features/src/main/resources/features.xml b/appc-config/appc-encryption-tool/features/src/main/resources/features.xml
index 3e9a710f4..53a3cbbe8 100644
--- a/appc-config/appc-encryption-tool/features/src/main/resources/features.xml
+++ b/appc-config/appc-encryption-tool/features/src/main/resources/features.xml
@@ -44,6 +44,6 @@
         <bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
         <bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
         <bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-config-encryption-tool-provider/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-config-encryption-tool-provider/${project.version}</bundle>
     </feature>
 </features>
diff --git a/appc-config/appc-encryption-tool/installer/pom.xml b/appc-config/appc-encryption-tool/installer/pom.xml
index 89b115430..6e870f9ec 100644
--- a/appc-config/appc-encryption-tool/installer/pom.xml
+++ b/appc-config/appc-encryption-tool/installer/pom.xml
@@ -23,7 +23,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config-encryption-tool</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -34,12 +34,12 @@
     <properties>
         <application.name>appc-config-encryption-tool</application.name>
         <features.boot>appc-config-encryption-tool</features.boot>
-        <features.repositories>mvn:org.openecomp.appc/appc-config-encryption-tool-features/${project.version}/xml/features</features.repositories>
+        <features.repositories>mvn:org.onap.appc/appc-config-encryption-tool-features/${project.version}/xml/features</features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-encryption-tool-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -51,7 +51,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-encryption-tool-provider</artifactId>
             <version>1.3.0-SNAPSHOT</version>
         </dependency>
diff --git a/appc-config/appc-encryption-tool/pom.xml b/appc-config/appc-encryption-tool/pom.xml
index cb55e2e27..e6de5db48 100644
--- a/appc-config/appc-encryption-tool/pom.xml
+++ b/appc-config/appc-encryption-tool/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -22,7 +22,7 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-config-encryption-tool-features</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
@@ -30,7 +30,7 @@
             </dependency>
 
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-config-encryption-tool-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
diff --git a/appc-config/appc-encryption-tool/provider/pom.xml b/appc-config/appc-encryption-tool/provider/pom.xml
index 7af7b749d..51df1bc03 100644
--- a/appc-config/appc-encryption-tool/provider/pom.xml
+++ b/appc-config/appc-encryption-tool/provider/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config-encryption-tool</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -63,9 +63,9 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>org.openecomp.appc.encryptiontool</Bundle-SymbolicName>
-                        <Bundle-Activator>org.openecomp.appc.encryptiontool.EncryptionToolActivator</Bundle-Activator>
-                        <Export-Package>org.openecomp.appc.encryptiontool</Export-Package>
+                        <Bundle-SymbolicName>org.onap.appc.encryptiontool</Bundle-SymbolicName>
+                        <Bundle-Activator>org.onap.appc.encryptiontool.EncryptionToolActivator</Bundle-Activator>
+                        <Export-Package>org.onap.appc.encryptiontool</Export-Package>
                         <Import-Package>*</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
                     </instructions>
diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/EncryptionToolActivator.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/EncryptionToolActivator.java
index 002450114..9942ef5ee 100644
--- a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/EncryptionToolActivator.java
+++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/EncryptionToolActivator.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.encryptiontool;
+package org.onap.appc.encryptiontool;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.appc.encryptiontool.wrapper.EncryptionToolDGWrapper;
+import org.onap.appc.encryptiontool.wrapper.EncryptionToolDGWrapper;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/Constants.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/Constants.java
index 710b61a43..9289b1be5 100644
--- a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/Constants.java
+++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/Constants.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.encryptiontool.wrapper;
+package org.onap.appc.encryptiontool.wrapper;
 
 public class Constants
 {
diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java
index 1999793ee..5e5d37e66 100644
--- a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java
+++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.encryptiontool.wrapper;
+package org.onap.appc.encryptiontool.wrapper;
 
 import java.io.File;
 import java.net.URL;
diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/EncryptionTool.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/EncryptionTool.java
index 934eb9c1a..d05a99be8 100644
--- a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/EncryptionTool.java
+++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/EncryptionTool.java
@@ -21,7 +21,7 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.appc.encryptiontool.wrapper;
+package org.onap.appc.encryptiontool.wrapper;
 
 import java.security.Provider;
 import java.security.Provider.Service;
diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/EncryptionToolDGWrapper.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/EncryptionToolDGWrapper.java
index cb07041c0..c30f05033 100644
--- a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/EncryptionToolDGWrapper.java
+++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/EncryptionToolDGWrapper.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.encryptiontool.wrapper;
+package org.onap.appc.encryptiontool.wrapper;
 
 import java.util.Map;
 
diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/WrapperEncryptionTool.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/WrapperEncryptionTool.java
index 37e362511..9cc322259 100644
--- a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/WrapperEncryptionTool.java
+++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/WrapperEncryptionTool.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.encryptiontool.wrapper;
+package org.onap.appc.encryptiontool.wrapper;
 
 import java.util.ArrayList;
 
diff --git a/appc-config/appc-encryption-tool/provider/src/test/java/org/openecomp/appc/encryptiontool/TestEncryptionTool.java b/appc-config/appc-encryption-tool/provider/src/test/java/org/openecomp/appc/encryptiontool/TestEncryptionTool.java
index 640c989e3..5c1d2d17c 100644
--- a/appc-config/appc-encryption-tool/provider/src/test/java/org/openecomp/appc/encryptiontool/TestEncryptionTool.java
+++ b/appc-config/appc-encryption-tool/provider/src/test/java/org/openecomp/appc/encryptiontool/TestEncryptionTool.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.encryptiontool;
+package org.onap.appc.encryptiontool;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.Test;
-import org.openecomp.appc.encryptiontool.wrapper.DbServiceUtil;
-import org.openecomp.appc.encryptiontool.wrapper.EncryptionToolDGWrapper;
-import org.openecomp.appc.encryptiontool.wrapper.WrapperEncryptionTool;
+import org.onap.appc.encryptiontool.wrapper.DbServiceUtil;
+import org.onap.appc.encryptiontool.wrapper.EncryptionToolDGWrapper;
+import org.onap.appc.encryptiontool.wrapper.WrapperEncryptionTool;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 public class TestEncryptionTool {
diff --git a/appc-config/appc-flow-controller/features/pom.xml b/appc-config/appc-flow-controller/features/pom.xml
index 08a6cf0fa..b03a53939 100644
--- a/appc-config/appc-flow-controller/features/pom.xml
+++ b/appc-config/appc-flow-controller/features/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config-flow-controller</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -13,7 +13,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-flow-controller-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-config/appc-flow-controller/features/src/main/resources/features.xml b/appc-config/appc-flow-controller/features/src/main/resources/features.xml
index 4a16565fe..b1b5391b6 100644
--- a/appc-config/appc-flow-controller/features/src/main/resources/features.xml
+++ b/appc-config/appc-flow-controller/features/src/main/resources/features.xml
@@ -38,6 +38,6 @@
 		<bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-config-flow-controller-provider/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-config-flow-controller-provider/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/appc-config/appc-flow-controller/installer/pom.xml b/appc-config/appc-flow-controller/installer/pom.xml
index b18f5c6b9..0b68bcc24 100644
--- a/appc-config/appc-flow-controller/installer/pom.xml
+++ b/appc-config/appc-flow-controller/installer/pom.xml
@@ -23,7 +23,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config-flow-controller</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -34,12 +34,12 @@
     <properties>
         <application.name>appc-config-flow-controller</application.name>
         <features.boot>appc-config-flow-controller</features.boot>
-        <features.repositories>mvn:org.openecomp.appc/appc-config-flow-controller-features/${project.version}/xml/features</features.repositories>
+        <features.repositories>mvn:org.onap.appc/appc-config-flow-controller-features/${project.version}/xml/features</features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-flow-controller-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -51,7 +51,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-flow-controller-provider</artifactId>
             <version>1.3.0-SNAPSHOT</version>
         </dependency>
diff --git a/appc-config/appc-flow-controller/pom.xml b/appc-config/appc-flow-controller/pom.xml
index 32d92b8d0..943f73fc9 100644
--- a/appc-config/appc-flow-controller/pom.xml
+++ b/appc-config/appc-flow-controller/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -22,7 +22,7 @@
 
         <dependencies>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-config-flow-controller-features</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
@@ -30,7 +30,7 @@
             </dependency>
 
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-config-flow-controller-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
diff --git a/appc-config/appc-flow-controller/provider/pom.xml b/appc-config/appc-flow-controller/provider/pom.xml
index 0958c0e8a..85509cdfe 100644
--- a/appc-config/appc-flow-controller/provider/pom.xml
+++ b/appc-config/appc-flow-controller/provider/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-config-flow-controller</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -106,9 +106,9 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>org.openecomp.appc.flow.controller</Bundle-SymbolicName>
-                        <Bundle-Activator>org.openecomp.appc.flow.controller.FlowControllerActivator</Bundle-Activator>
-                        <Export-Package>org.openecomp.appc.flow.controller</Export-Package>
+                        <Bundle-SymbolicName>org.onap.appc.flow.controller</Bundle-SymbolicName>
+                        <Bundle-Activator>org.onap.appc.flow.controller.FlowControllerActivator</Bundle-Activator>
+                        <Export-Package>org.onap.appc.flow.controller</Export-Package>
                         <Import-Package>*</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
                     </instructions>
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/FlowControllerActivator.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/FlowControllerActivator.java
index e7e80b731..4e8370024 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/FlowControllerActivator.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/FlowControllerActivator.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller;
+package org.onap.appc.flow.controller;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.appc.flow.controller.node.FlowControlNode;
-import org.openecomp.appc.flow.controller.node.JsonParsingNode;
-import org.openecomp.appc.flow.controller.node.RestServiceNode;
+import org.onap.appc.flow.controller.node.FlowControlNode;
+import org.onap.appc.flow.controller.node.JsonParsingNode;
+import org.onap.appc.flow.controller.node.RestServiceNode;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/ResponseHandlerImpl/DefaultResponseHandler.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/ResponseHandlerImpl/DefaultResponseHandler.java
index 58877348f..2a0edb086 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/ResponseHandlerImpl/DefaultResponseHandler.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/ResponseHandlerImpl/DefaultResponseHandler.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.ResponseHandlerImpl;
+package org.onap.appc.flow.controller.ResponseHandlerImpl;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.appc.flow.controller.data.Response;
-import org.openecomp.appc.flow.controller.data.ResponseAction;
-import org.openecomp.appc.flow.controller.data.Transaction;
-import org.openecomp.appc.flow.controller.utils.FlowControllerConstants;
+import org.onap.appc.flow.controller.data.Response;
+import org.onap.appc.flow.controller.data.ResponseAction;
+import org.onap.appc.flow.controller.data.Transaction;
+import org.onap.appc.flow.controller.utils.FlowControllerConstants;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/ActionIdentifier.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/ActionIdentifier.java
index 422bb1152..abce46862 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/ActionIdentifier.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/ActionIdentifier.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.data;
+package org.onap.appc.flow.controller.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/Parameters.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/Parameters.java
index fe3ae8ff0..8320b15fe 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/Parameters.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/Parameters.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.data;
+package org.onap.appc.flow.controller.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/PreCheck.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/PreCheck.java
index 9ee3d615a..db76895ab 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/PreCheck.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/PreCheck.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.data;
+package org.onap.appc.flow.controller.data;
 
 import java.util.List;
 
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/PrecheckOption.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/PrecheckOption.java
index 69431ea96..b3f146fdb 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/PrecheckOption.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/PrecheckOption.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.data;
+package org.onap.appc.flow.controller.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/Response.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/Response.java
index fb20edb6b..f5c6fe871 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/Response.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/Response.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.data;    
+package org.onap.appc.flow.controller.data;    
 
 import java.util.List;
 
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/ResponseAction.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/ResponseAction.java
index 84497de35..3768941df 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/ResponseAction.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/ResponseAction.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.data;
+package org.onap.appc.flow.controller.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/Transaction.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/Transaction.java
index 8f26e80ff..082e41b0d 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/Transaction.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/Transaction.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.data;
+package org.onap.appc.flow.controller.data;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/Transactions.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/Transactions.java
index 736b7f3b7..d8dc8472c 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/Transactions.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/data/Transactions.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.data;
+package org.onap.appc.flow.controller.data;
 
 import java.util.List;
 
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/dbervices/FlowControlDBService.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/dbervices/FlowControlDBService.java
index 153f5efbb..618494167 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/dbervices/FlowControlDBService.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/dbervices/FlowControlDBService.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.dbervices;
+package org.onap.appc.flow.controller.dbervices;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.openecomp.appc.flow.controller.data.Transaction;
-import org.openecomp.appc.flow.controller.utils.EscapeUtils;
-import org.openecomp.appc.flow.controller.utils.FlowControllerConstants;
+import org.onap.appc.flow.controller.data.Transaction;
+import org.onap.appc.flow.controller.utils.EscapeUtils;
+import org.onap.appc.flow.controller.utils.FlowControllerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/GraphExecutor.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/GraphExecutor.java
index e4481fba6..5548b1c3e 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/GraphExecutor.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/GraphExecutor.java
@@ -18,16 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.executorImpl;
+package org.onap.appc.flow.controller.executorImpl;
 
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Properties;
 
-import org.openecomp.appc.flow.controller.data.Parameters;
-import org.openecomp.appc.flow.controller.data.Transaction;
-import org.openecomp.appc.flow.controller.interfaces.FlowExecutorInterface;
-import org.openecomp.appc.flow.controller.utils.FlowControllerConstants;
+import org.onap.appc.flow.controller.data.Parameters;
+import org.onap.appc.flow.controller.data.Transaction;
+import org.onap.appc.flow.controller.interfaces.FlowExecutorInterface;
+import org.onap.appc.flow.controller.utils.FlowControllerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicGraph;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/NodeExecutor.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/NodeExecutor.java
index 3c78caa1e..50de43beb 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/NodeExecutor.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/NodeExecutor.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.executorImpl;
+package org.onap.appc.flow.controller.executorImpl;
 
 import java.util.HashMap;
 import java.util.Properties;
 
-import org.openecomp.appc.flow.controller.data.Transaction;
-import org.openecomp.appc.flow.controller.interfaces.FlowExecutorInterface;
+import org.onap.appc.flow.controller.data.Transaction;
+import org.onap.appc.flow.controller.interfaces.FlowExecutorInterface;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/RestExecutor.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/RestExecutor.java
index 4b0aa66f8..366e80273 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/RestExecutor.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/RestExecutor.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.executorImpl;
+package org.onap.appc.flow.controller.executorImpl;
 
 import java.io.FileInputStream;
 import java.io.InputStream;
@@ -34,10 +34,10 @@ import javax.ws.rs.HttpMethod;
 import javax.ws.rs.core.MediaType;
 
 import org.apache.commons.io.IOUtils;
-import org.openecomp.appc.flow.controller.data.Response;
-import org.openecomp.appc.flow.controller.data.Transaction;
-import org.openecomp.appc.flow.controller.interfaces.FlowExecutorInterface;
-import org.openecomp.appc.flow.controller.utils.FlowControllerConstants;
+import org.onap.appc.flow.controller.data.Response;
+import org.onap.appc.flow.controller.data.Transaction;
+import org.onap.appc.flow.controller.interfaces.FlowExecutorInterface;
+import org.onap.appc.flow.controller.utils.FlowControllerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/SecureRestClientTrustManager.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/SecureRestClientTrustManager.java
index 3cf2d6e63..cbe5de28b 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/SecureRestClientTrustManager.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/SecureRestClientTrustManager.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.executorImpl;
+package org.onap.appc.flow.controller.executorImpl;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/ActionIdentifier.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/ActionIdentifier.java
index f16477c05..2784dcc15 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/ActionIdentifier.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/ActionIdentifier.java
@@ -26,7 +26,7 @@
 //
 
 
-package org.openecomp.appc.flow.controller.interfaceData;
+package org.onap.appc.flow.controller.interfaceData;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Capabilities.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Capabilities.java
index 058d291f8..91414d3b2 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Capabilities.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Capabilities.java
@@ -26,7 +26,7 @@
 //
 
 
-package org.openecomp.appc.flow.controller.interfaceData;
+package org.onap.appc.flow.controller.interfaceData;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/DependencyInfo.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/DependencyInfo.java
index 0bc01867b..1dfe961b7 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/DependencyInfo.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/DependencyInfo.java
@@ -26,7 +26,7 @@
 //
 
 
-package org.openecomp.appc.flow.controller.interfaceData;
+package org.onap.appc.flow.controller.interfaceData;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Input.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Input.java
index 43564a4be..ed95268d1 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Input.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Input.java
@@ -26,7 +26,7 @@
 //
 
 
-package org.openecomp.appc.flow.controller.interfaceData;
+package org.onap.appc.flow.controller.interfaceData;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/InventoryInfo.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/InventoryInfo.java
index 12f086ff7..24da512b1 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/InventoryInfo.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/InventoryInfo.java
@@ -26,7 +26,7 @@
 //
 
 
-package org.openecomp.appc.flow.controller.interfaceData;
+package org.onap.appc.flow.controller.interfaceData;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/ObjectFactory.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/ObjectFactory.java
index 80cb3bff0..a52634b97 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/ObjectFactory.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/ObjectFactory.java
@@ -26,7 +26,7 @@
 //
 
 
-package org.openecomp.appc.flow.controller.interfaceData;
+package org.onap.appc.flow.controller.interfaceData;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
@@ -34,7 +34,7 @@ import javax.xml.bind.annotation.XmlRegistry;
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the org.openecomp.appc.flow.controller.interfaceData package. 
+ * generated in the org.onap.appc.flow.controller.interfaceData package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -50,7 +50,7 @@ public class ObjectFactory {
 
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.openecomp.appc.flow.controller.interfaceData
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.onap.appc.flow.controller.interfaceData
      * 
      */
     public ObjectFactory() {
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/RequestInfo.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/RequestInfo.java
index 0a0607794..2cca748e6 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/RequestInfo.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/RequestInfo.java
@@ -26,7 +26,7 @@
 //
 
 
-package org.openecomp.appc.flow.controller.interfaceData;
+package org.onap.appc.flow.controller.interfaceData;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/TunableParameters.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/TunableParameters.java
index b0bb0e06a..ceb3e2ade 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/TunableParameters.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/TunableParameters.java
@@ -26,7 +26,7 @@
 //
 
 
-package org.openecomp.appc.flow.controller.interfaceData;
+package org.onap.appc.flow.controller.interfaceData;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Vm.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Vm.java
index 750719e30..49a98ea0d 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Vm.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Vm.java
@@ -26,7 +26,7 @@
 //
 
 
-package org.openecomp.appc.flow.controller.interfaceData;
+package org.onap.appc.flow.controller.interfaceData;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/VnfInfo.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/VnfInfo.java
index 08ce862b7..d4a6d65b7 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/VnfInfo.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/VnfInfo.java
@@ -26,7 +26,7 @@
 //
 
 
-package org.openecomp.appc.flow.controller.interfaceData;
+package org.onap.appc.flow.controller.interfaceData;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Vnfcs.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Vnfcs.java
index a3cab0231..7adf05d3c 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Vnfcs.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Vnfcs.java
@@ -26,7 +26,7 @@
 //
 
 
-package org.openecomp.appc.flow.controller.interfaceData;
+package org.onap.appc.flow.controller.interfaceData;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Vnfcslist.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Vnfcslist.java
index 70692f3f6..849f7cad9 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Vnfcslist.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Vnfcslist.java
@@ -26,7 +26,7 @@
 //
 
 
-package org.openecomp.appc.flow.controller.interfaceData;
+package org.onap.appc.flow.controller.interfaceData;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Vnflist.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Vnflist.java
index 208970cfc..1d63f6e53 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Vnflist.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/Vnflist.java
@@ -26,7 +26,7 @@
 //
 
 
-package org.openecomp.appc.flow.controller.interfaceData;
+package org.onap.appc.flow.controller.interfaceData;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/package-info.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/package-info.java
index 825c7f8ce..926dfafd8 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/package-info.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaceData/package-info.java
@@ -25,5 +25,5 @@
 // Generated on: 2017.07.31 at 10:30:39 AM EDT 
 //
 
-@javax.xml.bind.annotation.XmlSchema(namespace = "http:org.openecomp.appc/sequence/v1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.openecomp.appc.flow.controller.interfaceData;
+@javax.xml.bind.annotation.XmlSchema(namespace = "http:org.onap.appc/sequence/v1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.onap.appc.flow.controller.interfaceData;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaces/FlowExecutorInterface.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaces/FlowExecutorInterface.java
index 18b535eb5..dbf27c829 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaces/FlowExecutorInterface.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaces/FlowExecutorInterface.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.interfaces;
+package org.onap.appc.flow.controller.interfaces;
 
 import java.util.HashMap;
 
-import org.openecomp.appc.flow.controller.data.Transaction;
-import org.openecomp.appc.flow.controller.utils.FlowControllerConstants;
+import org.onap.appc.flow.controller.data.Transaction;
+import org.onap.appc.flow.controller.utils.FlowControllerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import com.att.eelf.configuration.EELFLogger;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/FlowControlNode.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/FlowControlNode.java
index 42f9903da..010729f29 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/FlowControlNode.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/FlowControlNode.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.node;
+package org.onap.appc.flow.controller.node;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -33,27 +33,27 @@ import java.util.Properties;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.flow.controller.ResponseHandlerImpl.DefaultResponseHandler;
-import org.openecomp.appc.flow.controller.data.PrecheckOption;
-import org.openecomp.appc.flow.controller.data.ResponseAction;
-import org.openecomp.appc.flow.controller.data.Transaction;
-import org.openecomp.appc.flow.controller.data.Transactions;
-import org.openecomp.appc.flow.controller.dbervices.FlowControlDBService;
-import org.openecomp.appc.flow.controller.executorImpl.GraphExecutor;
-import org.openecomp.appc.flow.controller.executorImpl.NodeExecutor;
-import org.openecomp.appc.flow.controller.executorImpl.RestExecutor;
-import org.openecomp.appc.flow.controller.interfaceData.ActionIdentifier;
-import org.openecomp.appc.flow.controller.interfaceData.Capabilities;
-import org.openecomp.appc.flow.controller.interfaceData.DependencyInfo;
-import org.openecomp.appc.flow.controller.interfaceData.Input;
-import org.openecomp.appc.flow.controller.interfaceData.InventoryInfo;
-import org.openecomp.appc.flow.controller.interfaceData.RequestInfo;
-import org.openecomp.appc.flow.controller.interfaceData.Vm;
-import org.openecomp.appc.flow.controller.interfaceData.VnfInfo;
-import org.openecomp.appc.flow.controller.interfaceData.Vnfcs;
-import org.openecomp.appc.flow.controller.interfaceData.Vnfcslist;
-import org.openecomp.appc.flow.controller.interfaces.FlowExecutorInterface;
-import org.openecomp.appc.flow.controller.utils.FlowControllerConstants;
+import org.onap.appc.flow.controller.ResponseHandlerImpl.DefaultResponseHandler;
+import org.onap.appc.flow.controller.data.PrecheckOption;
+import org.onap.appc.flow.controller.data.ResponseAction;
+import org.onap.appc.flow.controller.data.Transaction;
+import org.onap.appc.flow.controller.data.Transactions;
+import org.onap.appc.flow.controller.dbervices.FlowControlDBService;
+import org.onap.appc.flow.controller.executorImpl.GraphExecutor;
+import org.onap.appc.flow.controller.executorImpl.NodeExecutor;
+import org.onap.appc.flow.controller.executorImpl.RestExecutor;
+import org.onap.appc.flow.controller.interfaceData.ActionIdentifier;
+import org.onap.appc.flow.controller.interfaceData.Capabilities;
+import org.onap.appc.flow.controller.interfaceData.DependencyInfo;
+import org.onap.appc.flow.controller.interfaceData.Input;
+import org.onap.appc.flow.controller.interfaceData.InventoryInfo;
+import org.onap.appc.flow.controller.interfaceData.RequestInfo;
+import org.onap.appc.flow.controller.interfaceData.Vm;
+import org.onap.appc.flow.controller.interfaceData.VnfInfo;
+import org.onap.appc.flow.controller.interfaceData.Vnfcs;
+import org.onap.appc.flow.controller.interfaceData.Vnfcslist;
+import org.onap.appc.flow.controller.interfaces.FlowExecutorInterface;
+import org.onap.appc.flow.controller.utils.FlowControllerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/FlowGenerator.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/FlowGenerator.java
index 94fc425d9..fe894c955 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/FlowGenerator.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/FlowGenerator.java
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.node;
+package org.onap.appc.flow.controller.node;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.appc.flow.controller.data.Response;
-import org.openecomp.appc.flow.controller.data.ResponseAction;
-import org.openecomp.appc.flow.controller.data.Transaction;
-import org.openecomp.appc.flow.controller.data.Transactions;
-import org.openecomp.appc.flow.controller.utils.FlowControllerConstants;
+import org.onap.appc.flow.controller.data.Response;
+import org.onap.appc.flow.controller.data.ResponseAction;
+import org.onap.appc.flow.controller.data.Transaction;
+import org.onap.appc.flow.controller.data.Transactions;
+import org.onap.appc.flow.controller.utils.FlowControllerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import com.att.eelf.configuration.EELFLogger;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/JsonParsingNode.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/JsonParsingNode.java
index dc638760a..dd56aee60 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/JsonParsingNode.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/JsonParsingNode.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.node;
+package org.onap.appc.flow.controller.node;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -30,9 +30,9 @@ import java.util.Map.Entry;
 import java.util.Properties;
 
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.flow.controller.data.Transaction;
-import org.openecomp.appc.flow.controller.executorImpl.RestExecutor;
-import org.openecomp.appc.flow.controller.utils.FlowControllerConstants;
+import org.onap.appc.flow.controller.data.Transaction;
+import org.onap.appc.flow.controller.executorImpl.RestExecutor;
+import org.onap.appc.flow.controller.utils.FlowControllerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/RestServiceNode.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/RestServiceNode.java
index d157d9fac..1975de3d9 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/RestServiceNode.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/RestServiceNode.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.node;
+package org.onap.appc.flow.controller.node;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -29,9 +29,9 @@ import java.util.Map;
 import java.util.Properties;
 
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.flow.controller.data.Transaction;
-import org.openecomp.appc.flow.controller.executorImpl.RestExecutor;
-import org.openecomp.appc.flow.controller.utils.FlowControllerConstants;
+import org.onap.appc.flow.controller.data.Transaction;
+import org.onap.appc.flow.controller.executorImpl.RestExecutor;
+import org.onap.appc.flow.controller.utils.FlowControllerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/utils/EscapeUtils.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/utils/EscapeUtils.java
index 6223fea54..40bf7593f 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/utils/EscapeUtils.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/utils/EscapeUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.utils;
+package org.onap.appc.flow.controller.utils;
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/utils/FlowControllerConstants.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/utils/FlowControllerConstants.java
index 9adade961..1881e3e45 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/utils/FlowControllerConstants.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/utils/FlowControllerConstants.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.controller.utils;
+package org.onap.appc.flow.controller.utils;
 
 public class FlowControllerConstants {
             
diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlDBServiceTest.java b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlDBServiceTest.java
index 079f65668..4c44e0d86 100644
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlDBServiceTest.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlDBServiceTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================

  */

 

-package org.openecomp.appc.flow.executor.node;

+package org.onap.appc.flow.executor.node;

 

 import static org.mockito.Matchers.any;

 import static org.mockito.Matchers.anyBoolean;

@@ -36,8 +36,8 @@ import org.junit.Ignore;
 import org.junit.Test;

 import org.junit.runner.RunWith;

 import org.mockito.Mock;

-import org.openecomp.appc.flow.controller.data.Transaction;

-import org.openecomp.appc.flow.controller.dbervices.FlowControlDBService;

+import org.onap.appc.flow.controller.data.Transaction;

+import org.onap.appc.flow.controller.dbervices.FlowControlDBService;

 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;

 import org.onap.ccsdk.sli.core.sli.SvcLogicException;

 import org.onap.ccsdk.sli.core.sli.SvcLogicResource;

diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlNodeTest.java b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlNodeTest.java
index e53ec249e..f29628dcc 100644
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlNodeTest.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlNodeTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================

  */

 

-package org.openecomp.appc.flow.executor.node;

+package org.onap.appc.flow.executor.node;

 

 import static org.mockito.Mockito.doReturn;

 import static org.mockito.Mockito.verify;

@@ -41,11 +41,11 @@ import org.junit.Ignore;
 import org.junit.Test;

 import org.mockito.Mock;

 import org.mockito.Mockito;

-import org.openecomp.appc.flow.controller.data.Transaction;

-import org.openecomp.appc.flow.controller.data.Transactions;

-import org.openecomp.appc.flow.controller.dbervices.FlowControlDBService;

-import org.openecomp.appc.flow.controller.node.FlowControlNode;

-import org.openecomp.appc.flow.controller.utils.FlowControllerConstants;

+import org.onap.appc.flow.controller.data.Transaction;

+import org.onap.appc.flow.controller.data.Transactions;

+import org.onap.appc.flow.controller.dbervices.FlowControlDBService;

+import org.onap.appc.flow.controller.node.FlowControlNode;

+import org.onap.appc.flow.controller.utils.FlowControllerConstants;

 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;

 import org.onap.ccsdk.sli.core.sli.SvcLogicException;

 import org.powermock.api.mockito.PowerMockito;

diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/RestExecutorTest.java b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/RestExecutorTest.java
index e943c9b98..11ddbe024 100644
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/RestExecutorTest.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/RestExecutorTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================

  */

 

-package org.openecomp.appc.flow.executor.node;

+package org.onap.appc.flow.executor.node;

 

 import static org.mockito.Matchers.any;

 import static org.mockito.Matchers.anyString;

@@ -46,7 +46,7 @@ import org.junit.Test;
 import org.mockito.InjectMocks;

 import org.mockito.Mock;

 import org.mockito.Mockito;

-import org.openecomp.appc.flow.controller.executorImpl.RestExecutor;

+import org.onap.appc.flow.controller.executorImpl.RestExecutor;

 import org.powermock.api.mockito.PowerMockito;

 

 import com.sun.jersey.api.client.Client;

diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestFlowExecutorNode.java b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestFlowExecutorNode.java
index 45896a4d0..3fe545334 100644
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestFlowExecutorNode.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestFlowExecutorNode.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.executor.node;
+package org.onap.appc.flow.executor.node;
 
 import java.io.InputStream;
 import java.util.Enumeration;
@@ -28,8 +28,8 @@ import java.util.Properties;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.appc.flow.controller.node.FlowControlNode;
-import org.openecomp.appc.flow.controller.utils.FlowControllerConstants;
+import org.onap.appc.flow.controller.node.FlowControlNode;
+import org.onap.appc.flow.controller.utils.FlowControllerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestParsingNode.java b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestParsingNode.java
index ae4f90cbc..ca84ca56a 100644
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestParsingNode.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestParsingNode.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.executor.node;
+package org.onap.appc.flow.executor.node;
 
 import java.io.InputStream;
 import java.util.Enumeration;
@@ -27,10 +27,10 @@ import java.util.Properties;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.flow.controller.node.FlowControlNode;
-import org.openecomp.appc.flow.controller.node.JsonParsingNode;
-import org.openecomp.appc.flow.controller.node.RestServiceNode;
-import org.openecomp.appc.flow.controller.utils.FlowControllerConstants;
+import org.onap.appc.flow.controller.node.FlowControlNode;
+import org.onap.appc.flow.controller.node.JsonParsingNode;
+import org.onap.appc.flow.controller.node.RestServiceNode;
+import org.onap.appc.flow.controller.utils.FlowControllerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 public class TestParsingNode {
diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestRestServiceNode.java b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestRestServiceNode.java
index 41b6bbb2c..ef661e3db 100644
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestRestServiceNode.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestRestServiceNode.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.flow.executor.node;
+package org.onap.appc.flow.executor.node;
 
 import java.io.InputStream;
 import java.util.Enumeration;
@@ -27,17 +27,17 @@ import java.util.Properties;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.flow.controller.data.Transaction;
-import org.openecomp.appc.flow.controller.executorImpl.RestExecutor;
-import org.openecomp.appc.flow.controller.interfaceData.ActionIdentifier;
-import org.openecomp.appc.flow.controller.interfaceData.InventoryInfo;
-import org.openecomp.appc.flow.controller.interfaceData.RequestInfo;
-import org.openecomp.appc.flow.controller.interfaceData.Vm;
-import org.openecomp.appc.flow.controller.interfaceData.VnfInfo;
-import org.openecomp.appc.flow.controller.interfaceData.Vnfcslist;
-import org.openecomp.appc.flow.controller.node.FlowControlNode;
-import org.openecomp.appc.flow.controller.node.RestServiceNode;
-import org.openecomp.appc.flow.controller.utils.FlowControllerConstants;
+import org.onap.appc.flow.controller.data.Transaction;
+import org.onap.appc.flow.controller.executorImpl.RestExecutor;
+import org.onap.appc.flow.controller.interfaceData.ActionIdentifier;
+import org.onap.appc.flow.controller.interfaceData.InventoryInfo;
+import org.onap.appc.flow.controller.interfaceData.RequestInfo;
+import org.onap.appc.flow.controller.interfaceData.Vm;
+import org.onap.appc.flow.controller.interfaceData.VnfInfo;
+import org.onap.appc.flow.controller.interfaceData.Vnfcslist;
+import org.onap.appc.flow.controller.node.FlowControlNode;
+import org.onap.appc.flow.controller.node.RestServiceNode;
+import org.onap.appc.flow.controller.utils.FlowControllerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 public class TestRestServiceNode {
diff --git a/appc-config/pom.xml b/appc-config/pom.xml
index 387b1f026..f205bf812 100644
--- a/appc-config/pom.xml
+++ b/appc-config/pom.xml
@@ -2,12 +2,12 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-config</artifactId>
     <packaging>pom</packaging>
     <name>Application Controller Config</name>
diff --git a/appc-dg-util/appc-dg-util-bundle/pom.xml b/appc-dg-util/appc-dg-util-bundle/pom.xml
index 1a6ec8fe0..70e41c40a 100644
--- a/appc-dg-util/appc-dg-util-bundle/pom.xml
+++ b/appc-dg-util/appc-dg-util-bundle/pom.xml
@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-dg-util</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -19,7 +19,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-common</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -150,12 +150,12 @@
             <artifactId>json</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-dmaap-adapter-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-netconf-adapter-bundle</artifactId>
             <version>1.3.0-SNAPSHOT</version>
         </dependency>
@@ -190,17 +190,17 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>appc-dg-util</Bundle-SymbolicName>
-                        <Bundle-Activator>org.openecomp.appc.dg.util.AppcDgUtilActivator</Bundle-Activator>
-                        <Export-Package>org.openecomp.appc.dg.util.*</Export-Package>
+                        <Bundle-Activator>org.onap.appc.dg.util.AppcDgUtilActivator</Bundle-Activator>
+                        <Export-Package>org.onap.appc.dg.util.*</Export-Package>
                         <Import-Package>
-                            org.openecomp.appc.adapter.netconf,
-                            org.openecomp.appc.adapter.netconf.dao,
-                            org.openecomp.appc.adapter.netconf.util,com.att.eelf.*,
-                            org.openecomp.appc.adapter.netconf.exception,
-                            org.openecomp.appc.adapter.messaging.*,
+                            org.onap.appc.adapter.netconf,
+                            org.onap.appc.adapter.netconf.dao,
+                            org.onap.appc.adapter.netconf.util,com.att.eelf.*,
+                            org.onap.appc.adapter.netconf.exception,
+                            org.onap.appc.adapter.messaging.*,
                             org.onap.ccsdk.sli.core.sli.*,
-                            org.openecomp.appc.exceptions,
-                            org.openecomp.appc.i18n,
+                            org.onap.appc.exceptions,
+                            org.onap.appc.i18n,
                             org.osgi.framework.*,
                             org.slf4j.*,
                             com.vmware.*,
diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/AppcDgUtilActivator.java b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/AppcDgUtilActivator.java
index 55c7cc0bf..486d475f4 100644
--- a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/AppcDgUtilActivator.java
+++ b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/AppcDgUtilActivator.java
@@ -40,7 +40,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openecomp.appc.dg.util;
+package org.onap.appc.dg.util;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/ExecuteNodeAction.java b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/ExecuteNodeAction.java
index 42735434c..38bc0955d 100644
--- a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/ExecuteNodeAction.java
+++ b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/ExecuteNodeAction.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.util;
+package org.onap.appc.dg.util;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/InputParameterValidation.java b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/InputParameterValidation.java
index 35955f13a..714e12a03 100644
--- a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/InputParameterValidation.java
+++ b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/InputParameterValidation.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.util;
+package org.onap.appc.dg.util;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/UpgradeStubNode.java b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/UpgradeStubNode.java
index 30bac0dd2..4f0a80f5a 100644
--- a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/UpgradeStubNode.java
+++ b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/UpgradeStubNode.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.util;
+package org.onap.appc.dg.util;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/ExecuteNodeActionImpl.java b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/ExecuteNodeActionImpl.java
index d80a80e44..b5dc40712 100644
--- a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/ExecuteNodeActionImpl.java
+++ b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/ExecuteNodeActionImpl.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.util.impl;
+package org.onap.appc.dg.util.impl;
 
-import org.openecomp.appc.dg.util.ExecuteNodeAction;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.dg.util.ExecuteNodeAction;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/InputParameterValidationImpl.java b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/InputParameterValidationImpl.java
index 5f1667176..5ea48bf44 100644
--- a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/InputParameterValidationImpl.java
+++ b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/InputParameterValidationImpl.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.util.impl;
+package org.onap.appc.dg.util.impl;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 
-import org.openecomp.appc.dg.util.InputParameterValidation;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.dg.util.InputParameterValidation;
+import org.onap.appc.exceptions.APPCException;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/UpgradeStubNodeImpl.java b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/UpgradeStubNodeImpl.java
index d152203bc..a7e650e9f 100644
--- a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/UpgradeStubNodeImpl.java
+++ b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/UpgradeStubNodeImpl.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.util.impl;
+package org.onap.appc.dg.util.impl;
 
 import java.util.Map;
 
-import org.openecomp.appc.dg.util.UpgradeStubNode;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.dg.util.UpgradeStubNode;
+import org.onap.appc.exceptions.APPCException;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dg-util/appc-dg-util-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index ec2e1b08c..ba507e945 100644
--- a/appc-dg-util/appc-dg-util-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-dg-util/appc-dg-util-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -30,30 +30,30 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
-    <bean id="inputParameterValidationBean" class="org.openecomp.appc.dg.util.impl.InputParameterValidationImpl" scope="prototype" >
+    <bean id="inputParameterValidationBean" class="org.onap.appc.dg.util.impl.InputParameterValidationImpl" scope="prototype" >
     </bean>
 
-    <service id="inputParameterValidationService" interface="org.openecomp.appc.dg.util.InputParameterValidation" ref="inputParameterValidationBean"/>
+    <service id="inputParameterValidationService" interface="org.onap.appc.dg.util.InputParameterValidation" ref="inputParameterValidationBean"/>
 
-    <bean id="executeNodeActionBean" class="org.openecomp.appc.dg.util.impl.ExecuteNodeActionImpl" scope="prototype" >
+    <bean id="executeNodeActionBean" class="org.onap.appc.dg.util.impl.ExecuteNodeActionImpl" scope="prototype" >
     </bean>
 
-    <service id="executeNodeActionService" interface="org.openecomp.appc.dg.util.ExecuteNodeAction" ref="executeNodeActionBean"/>
+    <service id="executeNodeActionService" interface="org.onap.appc.dg.util.ExecuteNodeAction" ref="executeNodeActionBean"/>
 
-    <!--bean id="DCAEReporterPlugin" class="org.openecomp.appc.dg.util.impl.DCAEReporterPluginImpl" scope="prototype" >
+    <!--bean id="DCAEReporterPlugin" class="org.onap.appc.dg.util.impl.DCAEReporterPluginImpl" scope="prototype" >
         <property name="eventSender" ref="eventSenderServiceRef"/>
     </bean-->
 
-    <!--reference interface="org.openecomp.appc.adapter.messaging.dmaap.EventSender" id="eventSenderServiceRef"/-->
-    <!--service id = "DCAEReporterPluginService" interface="org.openecomp.appc.dg.util.DCAEReporterPlugin" ref="DCAEReporterPlugin"/-->
+    <!--reference interface="org.onap.appc.adapter.messaging.dmaap.EventSender" id="eventSenderServiceRef"/-->
+    <!--service id = "DCAEReporterPluginService" interface="org.onap.appc.dg.util.DCAEReporterPlugin" ref="DCAEReporterPlugin"/-->
 
-    <!--bean id="NetconfClientPlugin" class="org.openecomp.appc.dg.util.impl.NetconfClientPluginImpl" scope="prototype" ></bean-->
-    <!--service id = "NetconfClientService" interface="org.openecomp.appc.dg.util.NetconfClientPlugin" ref="NetconfClientPlugin"/-->
+    <!--bean id="NetconfClientPlugin" class="org.onap.appc.dg.util.impl.NetconfClientPluginImpl" scope="prototype" ></bean-->
+    <!--service id = "NetconfClientService" interface="org.onap.appc.dg.util.NetconfClientPlugin" ref="NetconfClientPlugin"/-->
 
-    <!--bean id="NetconfDBPlugin" class="org.openecomp.appc.dg.util.impl.NetconfDBPluginImpl" scope="prototype" ></bean-->
-    <!--service id = "NetconfDBService" interface="org.openecomp.appc.dg.util.NetconfDBPlugin" ref="NetconfDBPlugin"/-->
+    <!--bean id="NetconfDBPlugin" class="org.onap.appc.dg.util.impl.NetconfDBPluginImpl" scope="prototype" ></bean-->
+    <!--service id = "NetconfDBService" interface="org.onap.appc.dg.util.NetconfDBPlugin" ref="NetconfDBPlugin"/-->
 
-    <bean id="upgradeNode" class="org.openecomp.appc.dg.util.impl.UpgradeStubNodeImpl" scope="prototype"/>
-    <service id = "upgradeNodeService" interface="org.openecomp.appc.dg.util.UpgradeStubNode" ref="upgradeNode"/>
+    <bean id="upgradeNode" class="org.onap.appc.dg.util.impl.UpgradeStubNodeImpl" scope="prototype"/>
+    <service id = "upgradeNodeService" interface="org.onap.appc.dg.util.UpgradeStubNode" ref="upgradeNode"/>
 
 </blueprint>
diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-dg-util/appc-dg-util-bundle/src/main/resources/org/openecomp/appc/default.properties
index a4f55e527..0185c72a9 100644
--- a/appc-dg-util/appc-dg-util-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-dg-util/appc-dg-util-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -24,6 +24,6 @@
 
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 #
diff --git a/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/AppcDgUtilActivatorTest.java b/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/AppcDgUtilActivatorTest.java
index 4aec25004..066863bb8 100644
--- a/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/AppcDgUtilActivatorTest.java
+++ b/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/AppcDgUtilActivatorTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.util;
+package org.onap.appc.dg.util;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/ExecuteNodeActionImplTest.java b/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/ExecuteNodeActionImplTest.java
index c1c107206..3280cb954 100644
--- a/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/ExecuteNodeActionImplTest.java
+++ b/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/ExecuteNodeActionImplTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.util.impl;
+package org.onap.appc.dg.util.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import org.junit.Before;
@@ -33,7 +33,7 @@ import org.mockito.Spy;
 import org.onap.ccsdk.sli.adaptors.aai.AAIService;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
diff --git a/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/InputParameterValidationImplTest.java b/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/InputParameterValidationImplTest.java
index 23e1f52c5..405c1d92a 100644
--- a/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/InputParameterValidationImplTest.java
+++ b/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/InputParameterValidationImplTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.util.impl;
+package org.onap.appc.dg.util.impl;
 
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/UpgradeStubNodeImplTest.java b/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/UpgradeStubNodeImplTest.java
index d652eb906..6eb732064 100644
--- a/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/UpgradeStubNodeImplTest.java
+++ b/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/UpgradeStubNodeImplTest.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.util.impl;
+package org.onap.appc.dg.util.impl;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
diff --git a/appc-dg-util/appc-dg-util-features/pom.xml b/appc-dg-util/appc-dg-util-features/pom.xml
index 922b776f1..325dd87c6 100644
--- a/appc-dg-util/appc-dg-util-features/pom.xml
+++ b/appc-dg-util/appc-dg-util-features/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-dg-util</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <name>appc-dg-util-features</name>
@@ -13,7 +13,7 @@
 
   <dependencies>
      <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-dg-util-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-dg-util/appc-dg-util-features/src/main/resources/features.xml b/appc-dg-util/appc-dg-util-features/src/main/resources/features.xml
index ed3d17f78..f6479df9c 100644
--- a/appc-dg-util/appc-dg-util-features/src/main/resources/features.xml
+++ b/appc-dg-util/appc-dg-util-features/src/main/resources/features.xml
@@ -34,8 +34,8 @@
         <!--<feature version="${project.version}">appc-aai-adapter</feature>-->
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-        <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-dg-util-bundle/${project.version}</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-dg-util-bundle/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-dg-util/appc-dg-util-installer/pom.xml b/appc-dg-util/appc-dg-util-installer/pom.xml
index 73c23e9e5..36d8cee5d 100644
--- a/appc-dg-util/appc-dg-util-installer/pom.xml
+++ b/appc-dg-util/appc-dg-util-installer/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-dg-util</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>appc-dg-util-installer</artifactId>
@@ -13,14 +13,14 @@
   <properties>
     <application.name>appc-dg-util</application.name>
     <features.boot>appc-dg-util</features.boot>
-    <features.repositories>mvn:org.openecomp.appc/appc-dg-util-features/${project.version}/xml/features</features.repositories>
+    <features.repositories>mvn:org.onap.appc/appc-dg-util-features/${project.version}/xml/features</features.repositories>
     <include.transitive.dependencies>false</include.transitive.dependencies>
   </properties>
 
   <dependencies>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-dg-util-features</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -34,7 +34,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-dg-util-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-dg-util/pom.xml b/appc-dg-util/pom.xml
index a8a02a266..292811966 100644
--- a/appc-dg-util/pom.xml
+++ b/appc-dg-util/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml b/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml
index 4597ee09b..ee5325c88 100644
--- a/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-dg-shared</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -11,12 +11,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-common</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-dg-common</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
@@ -31,7 +31,7 @@
             <artifactId>aai-service-provider</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-dg-dependency-model</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -60,7 +60,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-dg-domain-model-lib</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -76,8 +76,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>appc-dg-aai</Bundle-SymbolicName>
-                        <Export-Package>org.openecomp.appc.dg.aai</Export-Package>
-                        <Private-Package>org.openecomp.appc.dg.aai.exception,org.openecomp.appc.dg.aai.objects,org.openecomp.appc.dg.aai.impl.*</Private-Package>
+                        <Export-Package>org.onap.appc.dg.aai</Export-Package>
+                        <Private-Package>org.onap.appc.dg.aai.exception,org.onap.appc.dg.aai.objects,org.onap.appc.dg.aai.impl.*</Private-Package>
                         <Import-Package>
                             *;resolution:=optional
                         </Import-Package>
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/AAIPlugin.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/AAIPlugin.java
index f71f85ee7..64033dd38 100644
--- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/AAIPlugin.java
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/AAIPlugin.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.aai;
+package org.onap.appc.dg.aai;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/exception/AAIQueryException.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/exception/AAIQueryException.java
index 206825374..2ec604dcd 100644
--- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/exception/AAIQueryException.java
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/exception/AAIQueryException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.aai.exception;
+package org.onap.appc.dg.aai.exception;
 
 
 public class AAIQueryException extends Exception{
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/AAIPluginImpl.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/AAIPluginImpl.java
index d0fdf54b4..1b510a8ca 100644
--- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/AAIPluginImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/AAIPluginImpl.java
@@ -22,18 +22,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.aai.impl;
-import org.openecomp.appc.domainmodel.Vnf;
-import org.openecomp.appc.domainmodel.Vnfc;
-import org.openecomp.appc.domainmodel.Vserver;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+package org.onap.appc.dg.aai.impl;
+import org.onap.appc.domainmodel.Vnf;
+import org.onap.appc.domainmodel.Vnfc;
+import org.onap.appc.domainmodel.Vserver;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import com.att.eelf.i18n.EELFResourceManager;
 
-import org.openecomp.appc.dg.aai.AAIPlugin;
-import org.openecomp.appc.dg.aai.exception.AAIQueryException;
-import org.openecomp.appc.dg.aai.objects.AAIQueryResult;
-import org.openecomp.appc.dg.aai.objects.Relationship;
+import org.onap.appc.dg.aai.AAIPlugin;
+import org.onap.appc.dg.aai.exception.AAIQueryException;
+import org.onap.appc.dg.aai.objects.AAIQueryResult;
+import org.onap.appc.dg.aai.objects.Relationship;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
@@ -92,7 +92,7 @@ public class AAIPluginImpl implements AAIPlugin {
                 throw new APPCException(msg);
             }
             String msg = EELFResourceManager.format(Msg.SUCCESS_EVENT_MESSAGE, "PostGenericVnfData", "VNF ID " + vnf_id);
-            ctx.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
+            ctx.setAttribute(org.onap.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
 
         } catch (SvcLogicException e) {
             String msg = EELFResourceManager.format(Msg.AAI_QUERY_FAILED, vnf_id);
@@ -128,7 +128,7 @@ public class AAIPluginImpl implements AAIPlugin {
             ctx.setAttribute(Constants.IS_RELEASE_ENTITLEMENT_REQUIRE, Boolean.toString(!aaiEntitlementPoolUuid.isEmpty()));
             ctx.setAttribute(Constants.IS_RELEASE_LICENSE_REQUIRE, Boolean.toString(!aaiLicenseKeyGroupUuid.isEmpty()));
             String msg = EELFResourceManager.format(Msg.SUCCESS_EVENT_MESSAGE, "GetGenericVnfData","VNF ID " + vnf_id);
-            ctx.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
+            ctx.setAttribute(org.onap.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
 
             logger.info("AAIResponse: " + response.toString());
         } catch (SvcLogicException e) {
@@ -207,7 +207,7 @@ public class AAIPluginImpl implements AAIPlugin {
         populateContext(vnf,ctx);
         ctx.setAttribute("getVnfHierarchy_result", "SUCCESS");
         String msg = EELFResourceManager.format(Msg.SUCCESS_EVENT_MESSAGE, "GetVNFHierarchy","VNF ID " + vnfId);
-        ctx.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
+        ctx.setAttribute(org.onap.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
 
     }
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/Constants.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/Constants.java
index 7f82ea79f..6a6818e06 100644
--- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/Constants.java
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/Constants.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.aai.impl;
+package org.onap.appc.dg.aai.impl;
 
 
 public class Constants {
     public final static String VNF_ID_PARAM_NAME = "aai.vnfID";
     public static final String AAI_PREFIX_PARAM_NAME = "aai.prefix";
     public static final String AAI_INPUT_DATA = "aai.input.data";
-    public static final String AAI_ERROR_MESSAGE = "org.openecomp.appc.dg.error";
+    public static final String AAI_ERROR_MESSAGE = "org.onap.appc.dg.error";
 
     public static final String CONFIGURE_PATH = "/restconf/config/opendaylight-inventory:nodes/node/";
     public static final String CONNECT_PATH = "/restconf/config/opendaylight-inventory:nodes/node/controller-config/yang-ext:mount/config:modules";
@@ -64,20 +64,20 @@ public class Constants {
     public static final String PAYLOAD = "payload";
 
     // constants fo DG
-    public static final String VNF_TYPE_FIELD_NAME = "org.openecomp.appc.vftype";
-    public static final String VNF_VERSION_FIELD_NAME = "org.openecomp.appc.vfversion";
-    public static final String VNF_RESOURCE_VERSION_FIELD_NAME = "org.openecomp.appc.resource-version";
+    public static final String VNF_TYPE_FIELD_NAME = "org.onap.appc.vftype";
+    public static final String VNF_VERSION_FIELD_NAME = "org.onap.appc.vfversion";
+    public static final String VNF_RESOURCE_VERSION_FIELD_NAME = "org.onap.appc.resource-version";
     public static final String TARGET_VNF_TYPE = "target-vnf-type";
     public static final String FILE_CONTENT_FIELD_NAME = "file-content";
     public static final String CONNECTION_DETAILS_FIELD_NAME = "connection-details";
     public static final String CONFIGURATION_FILE_FIELD_NAME = "configuration-file-name";
     public static final String VNF_HOST_IP_ADDRESS_FIELD_NAME = "vnf-host-ip-address";
     public static final String UPGRADE_VERSION = "upgrade-version";
-    public static final String DG_ERROR_FIELD_NAME = "org.openecomp.appc.dg.error";
+    public static final String DG_ERROR_FIELD_NAME = "org.onap.appc.dg.error";
     public static final String ATTRIBUTE_ERROR_MESSAGE = "error-message";
     public static final String RESOURCEKEY = "resourceKey";
-    public static final String REQ_ID_FIELD_NAME = "org.openecomp.appc.reqid";
-    public static final String API_VERSION_FIELD_NAME = "org.openecomp.appc.apiversion";
+    public static final String REQ_ID_FIELD_NAME = "org.onap.appc.reqid";
+    public static final String API_VERSION_FIELD_NAME = "org.onap.appc.apiversion";
     public static final String MODEL_ENTITLMENT_POOL_UUID_NAME = "model.entitlement.pool.uuid";
     public static final String MODEL_LICENSE_KEY_UUID_NAME = "model.license.key.uuid";
     public static final String ENTITLMENT_POOL_UUID_NAME = "entitlement.pool.uuid";
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/objects/AAIQueryResult.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/objects/AAIQueryResult.java
index e6989a32d..674da55dd 100644
--- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/objects/AAIQueryResult.java
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/objects/AAIQueryResult.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.aai.objects;
+package org.onap.appc.dg.aai.objects;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/objects/Relationship.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/objects/Relationship.java
index f81919223..d32898f1c 100644
--- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/objects/Relationship.java
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/objects/Relationship.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.aai.objects;
+package org.onap.appc.dg.aai.objects;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 1b76c29fe..7adde0a9c 100644
--- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -27,8 +27,8 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
-    <service id="aaiServicePlugin" interface="org.openecomp.appc.dg.aai.AAIPlugin">
-        <bean class="org.openecomp.appc.dg.aai.impl.AAIPluginImpl"/>
+    <service id="aaiServicePlugin" interface="org.onap.appc.dg.aai.AAIPlugin">
+        <bean class="org.onap.appc.dg.aai.impl.AAIPluginImpl"/>
     </service>
 
 </blueprint>
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/test/java/org/openecomp/appc/dg/aai/impl/AAIClientMock.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/test/java/org/openecomp/appc/dg/aai/impl/AAIClientMock.java
index 5de5e8502..3de308392 100644
--- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/test/java/org/openecomp/appc/dg/aai/impl/AAIClientMock.java
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/test/java/org/openecomp/appc/dg/aai/impl/AAIClientMock.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.aai.impl;
+package org.onap.appc.dg.aai.impl;
 
 import java.net.URL;
 import java.util.HashMap;
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/test/java/org/openecomp/appc/dg/aai/impl/AAIPluginImplTest.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/test/java/org/openecomp/appc/dg/aai/impl/AAIPluginImplTest.java
index fbf7f03ea..d2f08597e 100644
--- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/test/java/org/openecomp/appc/dg/aai/impl/AAIPluginImplTest.java
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/test/java/org/openecomp/appc/dg/aai/impl/AAIPluginImplTest.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.aai.impl;
+package org.onap.appc.dg.aai.impl;
 
 import org.junit.runner.RunWith;
-import org.openecomp.appc.dg.aai.Constants;
-import org.openecomp.appc.dg.aai.impl.AAIPluginImpl;
-import org.openecomp.appc.dg.common.dao.DAOService;
-import org.openecomp.appc.dg.common.impl.LicenseManagerImpl;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.dg.aai.Constants;
+import org.onap.appc.dg.aai.impl.AAIPluginImpl;
+import org.onap.appc.dg.common.dao.DAOService;
+import org.onap.appc.dg.common.impl.LicenseManagerImpl;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
 import org.onap.ccsdk.sli.adaptors.aai.AAIClient;
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/pom.xml b/appc-dg/appc-dg-shared/appc-dg-common/pom.xml
index 1fc4950fd..ba0006742 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-common/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-dg-shared</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -11,18 +11,18 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-message-adapter-api</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-message-adapter-factory</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
@@ -63,17 +63,17 @@
 			<version>1.6.2</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dg-dependency-model</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-ranking-framework-lib</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-data-access-lib</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -83,7 +83,7 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dg-mdsal-store</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -128,9 +128,9 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>appc-dg-common</Bundle-SymbolicName>
-						<Export-Package>org.openecomp.appc.dg.common,org.openecomp.appc.dg.common.objects,org.openecomp.appc.dg.common.utils</Export-Package>
-						<Private-Package>org.openecomp.appc.dg.common.impl.*</Private-Package>
-						<Import-Package>org.openecomp.appc.adapter.message.*,org.openecomp.appc.adapter.factory.*,org.openecomp.appc.adapter.messaging.*,
+						<Export-Package>org.onap.appc.dg.common,org.onap.appc.dg.common.objects,org.onap.appc.dg.common.utils</Export-Package>
+						<Private-Package>org.onap.appc.dg.common.impl.*</Private-Package>
+						<Import-Package>org.onap.appc.adapter.message.*,org.onap.appc.adapter.factory.*,org.onap.appc.adapter.messaging.*,
 							*;resolution:=optional</Import-Package>
 						<Embed-Dependency>appc-dg-mdsal-store,appc-dg-domain-model-lib,appc-dg-dependency-model,jackson-dataformat-yaml,jackson-databind,jackson-core;scope=compile|runtime;inline=false;artifactId=!org.eclipse.osgi</Embed-Dependency>
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/DCAEReporterPlugin.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/DCAEReporterPlugin.java
index 7455fb43d..17bb56f66 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/DCAEReporterPlugin.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/DCAEReporterPlugin.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common;
+package org.onap.appc.dg.common;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/DgResolverPlugin.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/DgResolverPlugin.java
index ec1112324..b0ee4a5c9 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/DgResolverPlugin.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/DgResolverPlugin.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common;
+package org.onap.appc.dg.common;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/IntermediateMessageSender.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/IntermediateMessageSender.java
index bb677ff49..3e03c2ff7 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/IntermediateMessageSender.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/IntermediateMessageSender.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common;
+package org.onap.appc.dg.common;
 
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/JsonDgUtil.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/JsonDgUtil.java
index ef982679b..95143e145 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/JsonDgUtil.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/JsonDgUtil.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common;
+package org.onap.appc.dg.common;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/LegacyUtil.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/LegacyUtil.java
index 09a02e5db..54456b385 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/LegacyUtil.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/LegacyUtil.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common;
+package org.onap.appc.dg.common;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/OutputMessagePlugin.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/OutputMessagePlugin.java
index b52eee82d..935aa877d 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/OutputMessagePlugin.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/OutputMessagePlugin.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common;
+package org.onap.appc.dg.common;
 
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 
 public interface OutputMessagePlugin extends SvcLogicJavaPlugin {
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/VNFCDgResolverPlugin.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/VNFCDgResolverPlugin.java
index db129f98e..06036c225 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/VNFCDgResolverPlugin.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/VNFCDgResolverPlugin.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common;
+package org.onap.appc.dg.common;
 
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 
 
 public interface VNFCDgResolverPlugin extends SvcLogicJavaPlugin {
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/VNFConfigurator.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/VNFConfigurator.java
index 04eebb331..4ce0a9150 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/VNFConfigurator.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/VNFConfigurator.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common;
+package org.onap.appc.dg.common;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/VnfExecutionFlow.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/VnfExecutionFlow.java
index b74f8a302..b25eaf10f 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/VnfExecutionFlow.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/VnfExecutionFlow.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common;
+package org.onap.appc.dg.common;
 
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/AbstractResolver.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/AbstractResolver.java
index eec9a8e9f..3c70bab84 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/AbstractResolver.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/AbstractResolver.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
-import org.openecomp.appc.rankingframework.RankedAttributesResolver;
+import org.onap.appc.rankingframework.RankedAttributesResolver;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/AbstractResolverDataReader.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/AbstractResolverDataReader.java
index 6a8478f30..c5fe87c77 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/AbstractResolverDataReader.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/AbstractResolverDataReader.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
-import org.openecomp.appc.dao.util.DBUtils;
-import org.openecomp.appc.rankingframework.AbstractRankedAttributesResolverFactory;
-import org.openecomp.appc.rankingframework.ConfigurationEntry;
-import org.openecomp.appc.rankingframework.ConfigurationSet;
-import org.openecomp.appc.rankingframework.RankedAttributesResolver;
+import org.onap.appc.dao.util.DBUtils;
+import org.onap.appc.rankingframework.AbstractRankedAttributesResolverFactory;
+import org.onap.appc.rankingframework.ConfigurationEntry;
+import org.onap.appc.rankingframework.ConfigurationSet;
+import org.onap.appc.rankingframework.RankedAttributesResolver;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/Constants.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/Constants.java
index 1e5d846fb..603b65a19 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/Constants.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/Constants.java
@@ -22,20 +22,20 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
 
 
 class Constants {
 
-    public static final String DG_ERROR_FIELD_NAME = "org.openecomp.appc.dg.error";
+    public static final String DG_ERROR_FIELD_NAME = "org.onap.appc.dg.error";
     public static final String DG_OUTPUT_STATUS_MESSAGE = "output.status.message";
     public static final String EVENT_MESSAGE = "event-message";
     public static final String ATTRIBUTE_ERROR_MESSAGE = "error-message";
     public static final String ATTRIBUTE_SUCCESS_MESSAGE = "success-message";
     public static final String DG_ERROR_CODE = "output.status.dgerror.code";
-    public static final String API_VERSION_FIELD_NAME = "org.openecomp.appc.apiversion";
-    public static final String REQ_ID_FIELD_NAME = "org.openecomp.appc.reqid";
+    public static final String API_VERSION_FIELD_NAME = "org.onap.appc.apiversion";
+    public static final String REQ_ID_FIELD_NAME = "org.onap.appc.reqid";
     public static final String PAYLOAD = "payload";
     public static final String OUTPUT_PAYLOAD = "output.payload";
 
@@ -54,11 +54,11 @@ class Constants {
     public static final String CVAAS_FILE_CONTENT = "cvaas-file-content";
 
     enum LegacyAttributes {
-        Action("org.openecomp.appc.action"),
-        VMID("org.openecomp.appc.vmid"),
-        IdentityURL("org.openecomp.appc.identity.url"),
-        TenantID("org.openecomp.appc.tenant.id"),
-        SkipHypervisorCheck("org.openecomp.appc.skiphypervisorcheck");
+        Action("org.onap.appc.action"),
+        VMID("org.onap.appc.vmid"),
+        IdentityURL("org.onap.appc.identity.url"),
+        TenantID("org.onap.appc.tenant.id"),
+        SkipHypervisorCheck("org.onap.appc.skiphypervisorcheck");
 
         private String value;
         LegacyAttributes(String value) {this.value = value;}
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/DCAEReporterPluginImpl.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/DCAEReporterPluginImpl.java
index 50b88607a..68f3cdc68 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/DCAEReporterPluginImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/DCAEReporterPluginImpl.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.adapter.message.MessageDestination;
-import org.openecomp.appc.adapter.message.event.EventHeader;
-import org.openecomp.appc.adapter.message.event.EventMessage;
-import org.openecomp.appc.adapter.message.event.EventStatus;
-import org.openecomp.appc.dg.common.DCAEReporterPlugin;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.adapter.message.MessageDestination;
+import org.onap.appc.adapter.message.event.EventHeader;
+import org.onap.appc.adapter.message.event.EventMessage;
+import org.onap.appc.adapter.message.event.EventStatus;
+import org.onap.appc.dg.common.DCAEReporterPlugin;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import java.util.Map;
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/DgResolverPluginImpl.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/DgResolverPluginImpl.java
index 35d8e6497..c68fde5a2 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/DgResolverPluginImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/DgResolverPluginImpl.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import com.att.eelf.i18n.EELFResourceManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import java.util.Map;
 
-import org.openecomp.appc.dg.common.DgResolverPlugin;
+import org.onap.appc.dg.common.DgResolverPlugin;
 
 public class DgResolverPluginImpl implements DgResolverPlugin {
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/FlowKey.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/FlowKey.java
index a015ab4df..68f596f5d 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/FlowKey.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/FlowKey.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
 class FlowKey {
     private final String name;
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/IntermediateMessageSenderImpl.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/IntermediateMessageSenderImpl.java
index b297abc06..026fa2841 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/IntermediateMessageSenderImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/IntermediateMessageSenderImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
 
 import com.att.eelf.configuration.EELFLogger;
@@ -30,12 +30,12 @@ import com.att.eelf.configuration.EELFManager;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.adapter.message.MessageAdapterFactory;
-import org.openecomp.appc.adapter.message.Producer;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.dg.common.IntermediateMessageSender;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.message.MessageAdapterFactory;
+import org.onap.appc.adapter.message.Producer;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.dg.common.IntermediateMessageSender;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/JsonDgUtilImpl.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/JsonDgUtilImpl.java
index 47c33ca0b..fff43cbf5 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/JsonDgUtilImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/JsonDgUtilImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
@@ -31,10 +31,10 @@ import java.util.Set;
 
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.dg.common.JsonDgUtil;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.util.JsonUtil;
+import org.onap.appc.dg.common.JsonDgUtil;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.util.JsonUtil;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import com.att.eelf.configuration.EELFLogger;
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/LegacyUtilImpl.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/LegacyUtilImpl.java
index 1b8033f30..ad0884b94 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/LegacyUtilImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/LegacyUtilImpl.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
 import java.util.Map;
 
-import org.openecomp.appc.dg.common.LegacyUtil;
-import org.openecomp.appc.dg.common.utils.JSONUtil;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.dg.common.LegacyUtil;
+import org.onap.appc.dg.common.utils.JSONUtil;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/OutputMessagePluginImpl.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/OutputMessagePluginImpl.java
index e25bb95d3..66ac82fcb 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/OutputMessagePluginImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/OutputMessagePluginImpl.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import java.util.Map;
 
-import org.openecomp.appc.dg.common.OutputMessagePlugin;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.dg.common.OutputMessagePlugin;
+import org.onap.appc.exceptions.APPCException;
 
 import static org.apache.commons.lang3.StringUtils.isEmpty;
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/ResolverDataReaderFactory.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/ResolverDataReaderFactory.java
index 8fd817aee..790547f37 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/ResolverDataReaderFactory.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/ResolverDataReaderFactory.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 
 public class ResolverDataReaderFactory {
     private static final Configuration configuration = ConfigurationFactory.getConfiguration();
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/ResolverFactory.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/ResolverFactory.java
index 1161f822e..e39546846 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/ResolverFactory.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/ResolverFactory.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 
 public class ResolverFactory {
     private static final Configuration configuration = ConfigurationFactory.getConfiguration();
     private static class ReferenceHolder{
-        private static final AbstractResolver VNFC_RESOLVER = new VNFCResolver(configuration.getIntegerProperty("org.openecomp.appc.workflow.resolver.refresh_interval", 300));
-        private static final AbstractResolver VNF_RESOLVER = new VNFResolver(configuration.getIntegerProperty("org.openecomp.appc.workflow.resolver.refresh_interval", 300));
+        private static final AbstractResolver VNFC_RESOLVER = new VNFCResolver(configuration.getIntegerProperty("org.onap.appc.workflow.resolver.refresh_interval", 300));
+        private static final AbstractResolver VNF_RESOLVER = new VNFResolver(configuration.getIntegerProperty("org.onap.appc.workflow.resolver.refresh_interval", 300));
     }
 
     public static AbstractResolver createResolver(String resolverType){
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFCDgResolverPluginImpl.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFCDgResolverPluginImpl.java
index 1f3f92941..304bdf882 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFCDgResolverPluginImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFCDgResolverPluginImpl.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import java.util.Map;
 
-public class VNFCDgResolverPluginImpl implements org.openecomp.appc.dg.common.VNFCDgResolverPlugin {
+public class VNFCDgResolverPluginImpl implements org.onap.appc.dg.common.VNFCDgResolverPlugin {
     @Override
     public void resolveVNFCDg(Map<String, String> params, SvcLogicContext ctx) throws APPCException {
         DgResolverPluginImpl dgResolverPlugin = new DgResolverPluginImpl();
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFCResolver.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFCResolver.java
index 5fe7d4bf6..e2893951b 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFCResolver.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFCResolver.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
-import org.openecomp.appc.rankingframework.RankedAttributesContext;
+import org.onap.appc.rankingframework.RankedAttributesContext;
 
 
 public class VNFCResolver extends AbstractResolver {
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFCResolverDataReader.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFCResolverDataReader.java
index 860ba99e1..c78da685c 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFCResolverDataReader.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFCResolverDataReader.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFConfiguratorImpl.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFConfiguratorImpl.java
index e37cd047d..c46a9c227 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFConfiguratorImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFConfiguratorImpl.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
-
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.dg.common.VNFConfigurator;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.mdsal.MDSALStore;
-import org.openecomp.appc.mdsal.exception.MDSALStoreException;
-import org.openecomp.appc.mdsal.impl.MDSALStoreFactory;
-import org.openecomp.appc.mdsal.objects.BundleInfo;
+package org.onap.appc.dg.common.impl;
+
+import org.onap.appc.Constants;
+import org.onap.appc.dg.common.VNFConfigurator;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.mdsal.MDSALStore;
+import org.onap.appc.mdsal.exception.MDSALStoreException;
+import org.onap.appc.mdsal.impl.MDSALStoreFactory;
+import org.onap.appc.mdsal.objects.BundleInfo;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFResolver.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFResolver.java
index fad66e32d..501ad0713 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFResolver.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFResolver.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
-import org.openecomp.appc.rankingframework.RankedAttributesContext;
+import org.onap.appc.rankingframework.RankedAttributesContext;
 
 public class VNFResolver extends AbstractResolver {
     VNFResolver(int interval) {
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFResolverDataReader.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFResolverDataReader.java
index ff5bedaf7..3c4cf837e 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFResolverDataReader.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFResolverDataReader.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VnfExecutionFlowImpl.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VnfExecutionFlowImpl.java
index af642db78..65b364f62 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VnfExecutionFlowImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VnfExecutionFlowImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -31,19 +31,19 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import java.util.*;
 
-import org.openecomp.appc.dg.common.VnfExecutionFlow;
-import org.openecomp.appc.dg.dependencymanager.DependencyManager;
-import org.openecomp.appc.dg.dependencymanager.exception.DependencyModelNotFound;
-import org.openecomp.appc.dg.dependencymanager.impl.DependencyModelFactory;
-import org.openecomp.appc.dg.flowbuilder.FlowBuilder;
-import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel;
-import org.openecomp.appc.dg.flowbuilder.impl.FlowBuilderFactory;
-import org.openecomp.appc.dg.objects.*;
-import org.openecomp.appc.domainmodel.Vnf;
-import org.openecomp.appc.domainmodel.Vnfc;
-import org.openecomp.appc.domainmodel.Vserver;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.metadata.objects.DependencyModelIdentifier;
+import org.onap.appc.dg.common.VnfExecutionFlow;
+import org.onap.appc.dg.dependencymanager.DependencyManager;
+import org.onap.appc.dg.dependencymanager.exception.DependencyModelNotFound;
+import org.onap.appc.dg.dependencymanager.impl.DependencyModelFactory;
+import org.onap.appc.dg.flowbuilder.FlowBuilder;
+import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel;
+import org.onap.appc.dg.flowbuilder.impl.FlowBuilderFactory;
+import org.onap.appc.dg.objects.*;
+import org.onap.appc.domainmodel.Vnf;
+import org.onap.appc.domainmodel.Vnfc;
+import org.onap.appc.domainmodel.Vserver;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.metadata.objects.DependencyModelIdentifier;
 
 public class VnfExecutionFlowImpl implements VnfExecutionFlow {
 
@@ -134,7 +134,7 @@ public class VnfExecutionFlowImpl implements VnfExecutionFlow {
             logContext(context);
         }
         String msg = EELFResourceManager.format(Msg.SUCCESS_EVENT_MESSAGE, "GetVnfExecutionFlowData","VNF ID " + params.get(Constants.VNF_TYPE));
-        context.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
+        context.setAttribute(org.onap.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
     }
 
     private void validateInput(String dependencyType, String flowStrategy, Map<String, String> params) {
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/objects/ConnectionDetails.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/objects/ConnectionDetails.java
index 01a38723c..1572e726b 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/objects/ConnectionDetails.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/objects/ConnectionDetails.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.objects;
+package org.onap.appc.dg.common.objects;
 
 
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/utils/JAXBUtil.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/utils/JAXBUtil.java
index e081b8d32..38012b1bd 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/utils/JAXBUtil.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/utils/JAXBUtil.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.utils;
+package org.onap.appc.dg.common.utils;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/utils/JSONUtil.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/utils/JSONUtil.java
index 449f92f8c..388295a7d 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/utils/JSONUtil.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/utils/JSONUtil.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.utils;
+package org.onap.appc.dg.common.utils;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 9014d9f9d..8dc5a2962 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -30,51 +30,51 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
-    <bean id="JsonDgUtilBean" class="org.openecomp.appc.dg.common.impl.JsonDgUtilImpl"/>
-    <service id="JsonDgUtil" interface="org.openecomp.appc.dg.common.JsonDgUtil" ref="JsonDgUtilBean"/>
+    <bean id="JsonDgUtilBean" class="org.onap.appc.dg.common.impl.JsonDgUtilImpl"/>
+    <service id="JsonDgUtil" interface="org.onap.appc.dg.common.JsonDgUtil" ref="JsonDgUtilBean"/>
 
     <reference id="eventSenderReference" availability="mandatory" activation="eager"
-               interface="org.openecomp.appc.adapter.message.EventSender"/>
+               interface="org.onap.appc.adapter.message.EventSender"/>
 
-    <bean id="DCAEReporterPluginBean" class="org.openecomp.appc.dg.common.impl.DCAEReporterPluginImpl"
+    <bean id="DCAEReporterPluginBean" class="org.onap.appc.dg.common.impl.DCAEReporterPluginImpl"
           scope="singleton">
         <property name="eventSender" ref="eventSenderReference"/>
     </bean>
 
-    <service id="DCAEReporterPlugin" interface="org.openecomp.appc.dg.common.DCAEReporterPlugin" 
+    <service id="DCAEReporterPlugin" interface="org.onap.appc.dg.common.DCAEReporterPlugin" 
              ref="DCAEReporterPluginBean"/>
 
-    <bean id="OutputMessagePluginBean" class="org.openecomp.appc.dg.common.impl.OutputMessagePluginImpl" 
+    <bean id="OutputMessagePluginBean" class="org.onap.appc.dg.common.impl.OutputMessagePluginImpl" 
           scope="singleton"/>
-    <service id="OutputMessagePlugin" interface="org.openecomp.appc.dg.common.OutputMessagePlugin" 
+    <service id="OutputMessagePlugin" interface="org.onap.appc.dg.common.OutputMessagePlugin" 
              ref="OutputMessagePluginBean"/>
 
-    <bean id="legacyUtilBean" class="org.openecomp.appc.dg.common.impl.LegacyUtilImpl" scope="singleton"/>
-    <service id="legacyUtil" interface="org.openecomp.appc.dg.common.LegacyUtil" ref="legacyUtilBean"/>
+    <bean id="legacyUtilBean" class="org.onap.appc.dg.common.impl.LegacyUtilImpl" scope="singleton"/>
+    <service id="legacyUtil" interface="org.onap.appc.dg.common.LegacyUtil" ref="legacyUtilBean"/>
 
-    <bean id="DgResolverPluginBean" class="org.openecomp.appc.dg.common.impl.DgResolverPluginImpl" scope="singleton"/>
+    <bean id="DgResolverPluginBean" class="org.onap.appc.dg.common.impl.DgResolverPluginImpl" scope="singleton"/>
 
-    <service id="DgResolverPlugin" interface="org.openecomp.appc.dg.common.DgResolverPlugin" 
+    <service id="DgResolverPlugin" interface="org.onap.appc.dg.common.DgResolverPlugin" 
              ref="DgResolverPluginBean"/>
 
-    <bean id="vnfExecutionFlowBean" class="org.openecomp.appc.dg.common.impl.VnfExecutionFlowImpl" scope="singleton"/>
-    <service id="vnfExecutionFlowService" interface="org.openecomp.appc.dg.common.VnfExecutionFlow" 
+    <bean id="vnfExecutionFlowBean" class="org.onap.appc.dg.common.impl.VnfExecutionFlowImpl" scope="singleton"/>
+    <service id="vnfExecutionFlowService" interface="org.onap.appc.dg.common.VnfExecutionFlow" 
              ref="vnfExecutionFlowBean"/>
 
-    <bean id="VNFCDgResolverPluginBean" class="org.openecomp.appc.dg.common.impl.VNFCDgResolverPluginImpl" 
+    <bean id="VNFCDgResolverPluginBean" class="org.onap.appc.dg.common.impl.VNFCDgResolverPluginImpl" 
           scope="singleton"/>
 
-    <service id="VNFCDgResolverPlugin" interface="org.openecomp.appc.dg.common.VNFCDgResolverPlugin" 
+    <service id="VNFCDgResolverPlugin" interface="org.onap.appc.dg.common.VNFCDgResolverPlugin" 
              ref="VNFCDgResolverPluginBean"/>
 
-    <bean id="vnfConfiguratorBean" class="org.openecomp.appc.dg.common.impl.VNFConfiguratorImpl" scope="singleton"/>
+    <bean id="vnfConfiguratorBean" class="org.onap.appc.dg.common.impl.VNFConfiguratorImpl" scope="singleton"/>
 
-    <service id="vnfConfigurationService" interface="org.openecomp.appc.dg.common.VNFConfigurator" 
+    <service id="vnfConfigurationService" interface="org.onap.appc.dg.common.VNFConfigurator" 
              ref="vnfConfiguratorBean"/>
 
-    <bean id="interimMessageSender" class="org.openecomp.appc.dg.common.impl.IntermediateMessageSenderImpl" 
+    <bean id="interimMessageSender" class="org.onap.appc.dg.common.impl.IntermediateMessageSenderImpl" 
           init-method="init" scope="singleton"/>
     <service id="interimMessageSenderService" ref="interimMessageSender" 
-             interface="org.openecomp.appc.dg.common.IntermediateMessageSender"/>
+             interface="org.onap.appc.dg.common.IntermediateMessageSender"/>
 
 </blueprint>
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/org/openecomp/appc/default.properties b/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/org/openecomp/appc/default.properties
index 77db0976b..ec2a2b709 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/org/openecomp/appc/default.properties
@@ -22,20 +22,20 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
-org.openecomp.appc.netconf.db.url.netconfctl=jdbc:mysql://127.0.0.1:3306/test
-org.openecomp.appc.netconf.db.user.netconfctl=test
-org.openecomp.appc.netconf.db.pass.netconfctl=123456
+org.onap.appc.netconf.db.url.netconfctl=jdbc:mysql://127.0.0.1:3306/test
+org.onap.appc.netconf.db.user.netconfctl=test
+org.onap.appc.netconf.db.pass.netconfctl=123456
 
-org.openecomp.appc.db.url.sdnctl=jdbc:mysql://127.0.0.1:3306/test
-org.openecomp.appc.db.user.sdnctl=test
-org.openecomp.appc.db.pass.sdnctl=123456
+org.onap.appc.db.url.sdnctl=jdbc:mysql://127.0.0.1:3306/test
+org.onap.appc.db.user.sdnctl=test
+org.onap.appc.db.pass.sdnctl=123456
 
-org.openecomp.appc.netconf.db.url.sdnctl=jdbc:mysql://127.0.0.1:3306/test
-org.openecomp.appc.netconf.db.user.sdnctl=test
-org.openecomp.appc.netconf.db.pass.sdnctl=123456
+org.onap.appc.netconf.db.url.sdnctl=jdbc:mysql://127.0.0.1:3306/test
+org.onap.appc.netconf.db.user.sdnctl=test
+org.onap.appc.netconf.db.pass.sdnctl=123456
 
 ###																###
 ### Properties commented out below provided in appc.properties  ###
@@ -47,4 +47,4 @@ event.client.secret=64AG2hF4pYeG2pq7CT6XwUOT
 #restconf.user=<RESTCONF_USER>
 #restconf.pass=<RESTCONF_PASSWORD>
 
-org.openecomp.appc.adapter.netconf.VNFOperationalStateValidatorImpl-CONFIG_FILE=VnfGetOperationalStates
+org.onap.appc.adapter.netconf.VNFOperationalStateValidatorImpl-CONFIG_FILE=VnfGetOperationalStates
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/DCAEReporterPluginImplTest.java b/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/DCAEReporterPluginImplTest.java
index 0b3a13eb8..7c36360f8 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/DCAEReporterPluginImplTest.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/DCAEReporterPluginImplTest.java
@@ -22,17 +22,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.*;
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.adapter.message.MessageDestination;
-import org.openecomp.appc.adapter.message.event.EventMessage;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.adapter.message.MessageDestination;
+import org.onap.appc.adapter.message.event.EventMessage;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/EventSenderMock.java b/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/EventSenderMock.java
index a3fd754a2..cc30d3aea 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/EventSenderMock.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/EventSenderMock.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
 import java.util.Map;
 
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.adapter.message.MessageDestination;
-import org.openecomp.appc.adapter.message.event.EventMessage;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.adapter.message.MessageDestination;
+import org.onap.appc.adapter.message.event.EventMessage;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/JsonDgUtilImplTest.java b/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/JsonDgUtilImplTest.java
index 6febd2679..6f5a0f13d 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/JsonDgUtilImplTest.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/JsonDgUtilImplTest.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
 import ch.qos.logback.core.Appender;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.dg.common.impl.JsonDgUtilImpl;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.dg.common.impl.JsonDgUtilImpl;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import java.util.HashMap;
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/TestVNFConfiguratorImpl.java b/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/TestVNFConfiguratorImpl.java
index dd99d74e9..ca3e7f5e2 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/TestVNFConfiguratorImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/TestVNFConfiguratorImpl.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
-
-import org.openecomp.appc.dg.common.VNFConfigurator;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.mdsal.MDSALStore;
-import org.openecomp.appc.mdsal.impl.MDSALStoreFactory;
-import org.openecomp.appc.mdsal.impl.MDSALStoreImpl;
-import org.openecomp.appc.mdsal.objects.BundleInfo;
+package org.onap.appc.dg.common.impl;
+
+import org.onap.appc.dg.common.VNFConfigurator;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.mdsal.MDSALStore;
+import org.onap.appc.mdsal.impl.MDSALStoreFactory;
+import org.onap.appc.mdsal.impl.MDSALStoreImpl;
+import org.onap.appc.mdsal.objects.BundleInfo;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/TestVnfExecutionFlowImpl.java b/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/TestVnfExecutionFlowImpl.java
index b08714a85..bad862030 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/TestVnfExecutionFlowImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/TestVnfExecutionFlowImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.common.impl;
+package org.onap.appc.dg.common.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -31,18 +31,18 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Matchers;
-import org.openecomp.appc.dg.common.VnfExecutionFlow;
-import org.openecomp.appc.dg.common.impl.Constants;
-import org.openecomp.appc.dg.common.impl.VnfExecutionFlowImpl;
-import org.openecomp.appc.dg.dependencymanager.DependencyManager;
-import org.openecomp.appc.dg.dependencymanager.exception.DependencyModelNotFound;
-import org.openecomp.appc.dg.dependencymanager.impl.DependencyModelFactory;
-import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel;
-import org.openecomp.appc.dg.objects.DependencyTypes;
-import org.openecomp.appc.dg.objects.Node;
-import org.openecomp.appc.dg.objects.VnfcDependencyModel;
-import org.openecomp.appc.domainmodel.Vnfc;
-import org.openecomp.appc.metadata.objects.DependencyModelIdentifier;
+import org.onap.appc.dg.common.VnfExecutionFlow;
+import org.onap.appc.dg.common.impl.Constants;
+import org.onap.appc.dg.common.impl.VnfExecutionFlowImpl;
+import org.onap.appc.dg.dependencymanager.DependencyManager;
+import org.onap.appc.dg.dependencymanager.exception.DependencyModelNotFound;
+import org.onap.appc.dg.dependencymanager.impl.DependencyModelFactory;
+import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel;
+import org.onap.appc.dg.objects.DependencyTypes;
+import org.onap.appc.dg.objects.Node;
+import org.onap.appc.dg.objects.VnfcDependencyModel;
+import org.onap.appc.domainmodel.Vnfc;
+import org.onap.appc.metadata.objects.DependencyModelIdentifier;
 import org.osgi.framework.FrameworkUtil;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml b/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml
index fae24ea44..9045892ef 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-dg-shared</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
@@ -20,7 +20,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-common</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -76,7 +76,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-dg-domain-model-lib</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/DependencyManager.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/DependencyManager.java
index 34ebff8b6..8d04cea11 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/DependencyManager.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/DependencyManager.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.dependencymanager;
+package org.onap.appc.dg.dependencymanager;
 
-import org.openecomp.appc.dg.dependencymanager.exception.DependencyModelNotFound;
-import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel;
-import org.openecomp.appc.dg.objects.DependencyTypes;
-import org.openecomp.appc.dg.objects.VnfcDependencyModel;
+import org.onap.appc.dg.dependencymanager.exception.DependencyModelNotFound;
+import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel;
+import org.onap.appc.dg.objects.DependencyTypes;
+import org.onap.appc.dg.objects.VnfcDependencyModel;
 
-import org.openecomp.appc.metadata.objects.DependencyModelIdentifier;
+import org.onap.appc.metadata.objects.DependencyModelIdentifier;
 
 public interface DependencyManager {
     VnfcDependencyModel getVnfcDependencyModel(DependencyModelIdentifier modelIdentifier, DependencyTypes dependencyType) throws InvalidDependencyModel, DependencyModelNotFound;
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/DependencyType.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/DependencyType.java
index 16c568a99..15717f06b 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/DependencyType.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/DependencyType.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.dependencymanager;
+package org.onap.appc.dg.dependencymanager;
 
-import org.openecomp.appc.dg.dependencymanager.exception.DependencyModelNotFound;
-import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel;
-import org.openecomp.appc.dg.objects.VnfcDependencyModel;
+import org.onap.appc.dg.dependencymanager.exception.DependencyModelNotFound;
+import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel;
+import org.onap.appc.dg.objects.VnfcDependencyModel;
 
-import org.openecomp.appc.metadata.objects.DependencyModelIdentifier;
+import org.onap.appc.metadata.objects.DependencyModelIdentifier;
 
 public interface DependencyType {
     VnfcDependencyModel getVnfcDependencyModel(DependencyModelIdentifier modelIdentifier) throws InvalidDependencyModel, DependencyModelNotFound;
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/exception/DependencyModelNotFound.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/exception/DependencyModelNotFound.java
index f12da927a..ffb6182cd 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/exception/DependencyModelNotFound.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/exception/DependencyModelNotFound.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.dependencymanager.exception;
+package org.onap.appc.dg.dependencymanager.exception;
 
 
 public class DependencyModelNotFound extends Exception {
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/helper/DependencyModelParser.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/helper/DependencyModelParser.java
index c06841251..187020028 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/helper/DependencyModelParser.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/helper/DependencyModelParser.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.dependencymanager.helper;
+package org.onap.appc.dg.dependencymanager.helper;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -31,10 +31,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel;
-import org.openecomp.appc.dg.objects.Node;
-import org.openecomp.appc.dg.objects.VnfcDependencyModel;
-import org.openecomp.appc.domainmodel.Vnfc;
+import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel;
+import org.onap.appc.dg.objects.Node;
+import org.onap.appc.dg.objects.VnfcDependencyModel;
+import org.onap.appc.domainmodel.Vnfc;
 
 import java.io.IOException;
 import java.util.*;
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/DependencyManagerImpl.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/DependencyManagerImpl.java
index 1cbdb7ed5..31ea46cc6 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/DependencyManagerImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/DependencyManagerImpl.java
@@ -22,18 +22,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.dependencymanager.impl;
+package org.onap.appc.dg.dependencymanager.impl;
 
-import org.openecomp.appc.dg.dependencymanager.DependencyManager;
-import org.openecomp.appc.dg.dependencymanager.DependencyType;
-import org.openecomp.appc.dg.dependencymanager.exception.DependencyModelNotFound;
-import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel;
-import org.openecomp.appc.dg.objects.DependencyTypes;
-import org.openecomp.appc.dg.objects.VnfcDependencyModel;
+import org.onap.appc.dg.dependencymanager.DependencyManager;
+import org.onap.appc.dg.dependencymanager.DependencyType;
+import org.onap.appc.dg.dependencymanager.exception.DependencyModelNotFound;
+import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel;
+import org.onap.appc.dg.objects.DependencyTypes;
+import org.onap.appc.dg.objects.VnfcDependencyModel;
 
-import org.openecomp.appc.cache.MetadataCache;
-import org.openecomp.appc.cache.impl.MetadataCacheFactory;
-import org.openecomp.appc.metadata.objects.DependencyModelIdentifier;
+import org.onap.appc.cache.MetadataCache;
+import org.onap.appc.cache.impl.MetadataCacheFactory;
+import org.onap.appc.metadata.objects.DependencyModelIdentifier;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/DependencyModelFactory.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/DependencyModelFactory.java
index 54d55817c..a3fd36937 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/DependencyModelFactory.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/DependencyModelFactory.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.dependencymanager.impl;
+package org.onap.appc.dg.dependencymanager.impl;
 
-import org.openecomp.appc.dg.dependencymanager.DependencyManager;
+import org.onap.appc.dg.dependencymanager.DependencyManager;
 
 
 public class DependencyModelFactory {
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/ResourceDependency.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/ResourceDependency.java
index 889df971b..73792d3ad 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/ResourceDependency.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/ResourceDependency.java
@@ -22,18 +22,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.dependencymanager.impl;
+package org.onap.appc.dg.dependencymanager.impl;
 
-import org.openecomp.appc.metadata.MetadataService;
-import org.openecomp.appc.metadata.objects.DependencyModelIdentifier;
+import org.onap.appc.metadata.MetadataService;
+import org.onap.appc.metadata.objects.DependencyModelIdentifier;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
-import org.openecomp.appc.dg.dependencymanager.DependencyType;
-import org.openecomp.appc.dg.dependencymanager.exception.DependencyModelNotFound;
-import org.openecomp.appc.dg.dependencymanager.helper.DependencyModelParser;
-import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel;
-import org.openecomp.appc.dg.objects.VnfcDependencyModel;
+import org.onap.appc.dg.dependencymanager.DependencyType;
+import org.onap.appc.dg.dependencymanager.exception.DependencyModelNotFound;
+import org.onap.appc.dg.dependencymanager.helper.DependencyModelParser;
+import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel;
+import org.onap.appc.dg.objects.VnfcDependencyModel;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
@@ -60,7 +60,7 @@ public class ResourceDependency implements DependencyType{
 
         } else {
             logger.info("MetadataService error from bundlecontext");
-            logger.warn("Cannot find service reference for org.openecomp.appc.metadata.MetadataService");
+            logger.warn("Cannot find service reference for org.onap.appc.metadata.MetadataService");
         }
     }
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/FlowBuilder.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/FlowBuilder.java
index 155842032..78dacd105 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/FlowBuilder.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/FlowBuilder.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.flowbuilder;
+package org.onap.appc.dg.flowbuilder;
 
-import org.openecomp.appc.dg.objects.InventoryModel;
-import org.openecomp.appc.dg.objects.VnfcDependencyModel;
-import org.openecomp.appc.dg.objects.VnfcFlowModel;
+import org.onap.appc.dg.objects.InventoryModel;
+import org.onap.appc.dg.objects.VnfcDependencyModel;
+import org.onap.appc.dg.objects.VnfcFlowModel;
 
 
 public interface FlowBuilder {
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/FlowStrategy.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/FlowStrategy.java
index 4f802a9c7..e2c292776 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/FlowStrategy.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/FlowStrategy.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.flowbuilder;
+package org.onap.appc.dg.flowbuilder;
 
-import org.openecomp.appc.dg.objects.InventoryModel;
-import org.openecomp.appc.dg.objects.VnfcDependencyModel;
-import org.openecomp.appc.dg.objects.VnfcFlowModel;
+import org.onap.appc.dg.objects.InventoryModel;
+import org.onap.appc.dg.objects.VnfcDependencyModel;
+import org.onap.appc.dg.objects.VnfcFlowModel;
 
 
 public interface FlowStrategy {
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/exception/InvalidDependencyModel.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/exception/InvalidDependencyModel.java
index 305d4eba2..9f4cfed93 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/exception/InvalidDependencyModel.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/exception/InvalidDependencyModel.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.flowbuilder.exception;
+package org.onap.appc.dg.flowbuilder.exception;
 
 
 public class InvalidDependencyModel extends RuntimeException {
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/helper/Graph.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/helper/Graph.java
index b21c22d69..95e0b6675 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/helper/Graph.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/helper/Graph.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.flowbuilder.helper;
+package org.onap.appc.dg.flowbuilder.helper;
 
 import java.util.*;
 
-import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel;
+import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel;
 
 
 public class Graph<T> {
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/AbstractFlowStrategy.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/AbstractFlowStrategy.java
index 247bd0249..fbb2d5d67 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/AbstractFlowStrategy.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/AbstractFlowStrategy.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.flowbuilder.impl;
+package org.onap.appc.dg.flowbuilder.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -31,11 +31,11 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.openecomp.appc.dg.flowbuilder.FlowStrategy;
-import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel;
-import org.openecomp.appc.dg.flowbuilder.helper.Graph;
-import org.openecomp.appc.dg.objects.*;
-import org.openecomp.appc.domainmodel.Vnfc;
+import org.onap.appc.dg.flowbuilder.FlowStrategy;
+import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel;
+import org.onap.appc.dg.flowbuilder.helper.Graph;
+import org.onap.appc.dg.objects.*;
+import org.onap.appc.domainmodel.Vnfc;
 
 
 public abstract class AbstractFlowStrategy implements FlowStrategy {
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/FlowBuilderFactory.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/FlowBuilderFactory.java
index b7cec3c6d..ac5e35b89 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/FlowBuilderFactory.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/FlowBuilderFactory.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.flowbuilder.impl;
+package org.onap.appc.dg.flowbuilder.impl;
 
-import org.openecomp.appc.dg.flowbuilder.FlowBuilder;
-import org.openecomp.appc.dg.objects.FlowStrategies;
+import org.onap.appc.dg.flowbuilder.FlowBuilder;
+import org.onap.appc.dg.objects.FlowStrategies;
 
 
 public class FlowBuilderFactory {
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/FlowBuilderImpl.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/FlowBuilderImpl.java
index 38a7a64c4..59d1e4bf9 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/FlowBuilderImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/FlowBuilderImpl.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.flowbuilder.impl;
+package org.onap.appc.dg.flowbuilder.impl;
 
-import org.openecomp.appc.dg.flowbuilder.FlowBuilder;
-import org.openecomp.appc.dg.flowbuilder.FlowStrategy;
-import org.openecomp.appc.dg.objects.InventoryModel;
-import org.openecomp.appc.dg.objects.VnfcDependencyModel;
-import org.openecomp.appc.dg.objects.VnfcFlowModel;
+import org.onap.appc.dg.flowbuilder.FlowBuilder;
+import org.onap.appc.dg.flowbuilder.FlowStrategy;
+import org.onap.appc.dg.objects.InventoryModel;
+import org.onap.appc.dg.objects.VnfcDependencyModel;
+import org.onap.appc.dg.objects.VnfcFlowModel;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/ForwardFlowStrategy.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/ForwardFlowStrategy.java
index 422559d79..9c5aae64f 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/ForwardFlowStrategy.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/ForwardFlowStrategy.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.flowbuilder.impl;
+package org.onap.appc.dg.flowbuilder.impl;
 
 import java.util.*;
 
-import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel;
-import org.openecomp.appc.domainmodel.Vnfc;
+import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel;
+import org.onap.appc.domainmodel.Vnfc;
 
 
 public class ForwardFlowStrategy extends AbstractFlowStrategy {
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/ReverseFlowStrategy.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/ReverseFlowStrategy.java
index 246ee3433..79cd4420c 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/ReverseFlowStrategy.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/ReverseFlowStrategy.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.flowbuilder.impl;
+package org.onap.appc.dg.flowbuilder.impl;
 
 import java.util.*;
 
-import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel;
-import org.openecomp.appc.domainmodel.Vnfc;
+import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel;
+import org.onap.appc.domainmodel.Vnfc;
 
 
 public class ReverseFlowStrategy extends AbstractFlowStrategy {
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/DependencyTypes.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/DependencyTypes.java
index f891f9114..b74ea7965 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/DependencyTypes.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/DependencyTypes.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.objects;
+package org.onap.appc.dg.objects;
 
 
 public enum DependencyTypes {
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/FlowStrategies.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/FlowStrategies.java
index 387502ca5..857d802c2 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/FlowStrategies.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/FlowStrategies.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.objects;
+package org.onap.appc.dg.objects;
 
 
 public enum FlowStrategies {
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/InventoryModel.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/InventoryModel.java
index 8f46c0ad3..e9156a8d9 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/InventoryModel.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/InventoryModel.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.objects;
+package org.onap.appc.dg.objects;
 
-import org.openecomp.appc.domainmodel.Vnf;
+import org.onap.appc.domainmodel.Vnf;
 
 
 public class InventoryModel {
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/Node.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/Node.java
index af7da267c..586ce7deb 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/Node.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/Node.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.objects;
+package org.onap.appc.dg.objects;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/VnfcDependencyModel.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/VnfcDependencyModel.java
index f8b0d0381..278d6fcaa 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/VnfcDependencyModel.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/VnfcDependencyModel.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.objects;
+package org.onap.appc.dg.objects;
 
 import java.util.Set;
 
-import org.openecomp.appc.domainmodel.Vnfc;
+import org.onap.appc.domainmodel.Vnfc;
 
 
 public class VnfcDependencyModel {
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/VnfcFlowModel.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/VnfcFlowModel.java
index 3f30cdce6..1100e42cb 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/VnfcFlowModel.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/VnfcFlowModel.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.objects;
+package org.onap.appc.dg.objects;
 
 import java.util.*;
 
-import org.openecomp.appc.domainmodel.Vnfc;
+import org.onap.appc.domainmodel.Vnfc;
 
 
 public class VnfcFlowModel {
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/test/java/org/openecomp/appc/dg/flowbuilder/TestFlowBuilder.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/test/java/org/openecomp/appc/dg/flowbuilder/TestFlowBuilder.java
index 6f6277f1d..009515378 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/test/java/org/openecomp/appc/dg/flowbuilder/TestFlowBuilder.java
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/test/java/org/openecomp/appc/dg/flowbuilder/TestFlowBuilder.java
@@ -22,17 +22,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.flowbuilder;
+package org.onap.appc.dg.flowbuilder;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.dg.flowbuilder.FlowBuilder;
-import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel;
-import org.openecomp.appc.dg.flowbuilder.impl.FlowBuilderFactory;
-import org.openecomp.appc.dg.objects.*;
-import org.openecomp.appc.domainmodel.Vnf;
-import org.openecomp.appc.domainmodel.Vnfc;
-import org.openecomp.appc.domainmodel.Vserver;
+import org.onap.appc.dg.flowbuilder.FlowBuilder;
+import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel;
+import org.onap.appc.dg.flowbuilder.impl.FlowBuilderFactory;
+import org.onap.appc.dg.objects.*;
+import org.onap.appc.domainmodel.Vnf;
+import org.onap.appc.domainmodel.Vnfc;
+import org.onap.appc.domainmodel.Vserver;
 
 import java.util.HashSet;
 import java.util.Iterator;
diff --git a/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/pom.xml b/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/pom.xml
index 7d3d8c92b..8e11a0116 100644
--- a/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-dg-shared</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.openecomp.appc</groupId>
+  <groupId>org.onap.appc</groupId>
   <artifactId>appc-dg-domain-model-lib</artifactId>
 
   <name>appc-dg-domain-model-lib</name>
diff --git a/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/Vnf.java b/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/Vnf.java
index 2e7306952..9f75779cd 100644
--- a/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/Vnf.java
+++ b/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/Vnf.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.domainmodel;
+package org.onap.appc.domainmodel;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/Vnfc.java b/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/Vnfc.java
index 867869b71..de075f085 100644
--- a/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/Vnfc.java
+++ b/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/Vnfc.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.domainmodel;
+package org.onap.appc.domainmodel;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/Vserver.java b/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/Vserver.java
index 40d8295f9..0840bd91e 100644
--- a/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/Vserver.java
+++ b/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/Vserver.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.domainmodel;
+package org.onap.appc.domainmodel;
 
 
 public class Vserver {
diff --git a/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml b/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml
index d74d8014e..a89643738 100644
--- a/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-dg-shared</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -11,13 +11,13 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dg-common</artifactId>
 			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-license-manager-api</artifactId>
 			<version>1.3.0-SNAPSHOT</version>
 			<scope>compile</scope>
@@ -43,12 +43,12 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>appc-dg-license-manager</Bundle-SymbolicName>
-						<Export-Package>org.openecomp.appc.dg.licmgr</Export-Package>
-						<Export-Service>org.openecomp.appc.dg.licmgr.LicenseManagerPlugin</Export-Service>
-						<Private-Package>org.openecomp.appc.dg.licmgr.impl</Private-Package>
+						<Export-Package>org.onap.appc.dg.licmgr</Export-Package>
+						<Export-Service>org.onap.appc.dg.licmgr.LicenseManagerPlugin</Export-Service>
+						<Private-Package>org.onap.appc.dg.licmgr.impl</Private-Package>
 						<Import-Package>
-							org.openecomp.appc.licmgr,org.openecomp.appc.licmgr.exception,org.openecomp.appc.licmgr.objects,
-							org.openecomp.appc.exceptions, com.att.eelf.configuration,
+							org.onap.appc.licmgr,org.onap.appc.licmgr.exception,org.onap.appc.licmgr.objects,
+							org.onap.appc.exceptions, com.att.eelf.configuration,
 							*;resolution:=optional
 						</Import-Package>
 					</instructions>
diff --git a/appc-dg/appc-dg-shared/appc-dg-license-manager/src/main/java/org/openecomp/appc/dg/licmgr/LicenseManagerPlugin.java b/appc-dg/appc-dg-shared/appc-dg-license-manager/src/main/java/org/openecomp/appc/dg/licmgr/LicenseManagerPlugin.java
index 4eb743b7b..cfe263ff9 100644
--- a/appc-dg/appc-dg-shared/appc-dg-license-manager/src/main/java/org/openecomp/appc/dg/licmgr/LicenseManagerPlugin.java
+++ b/appc-dg/appc-dg-shared/appc-dg-license-manager/src/main/java/org/openecomp/appc/dg/licmgr/LicenseManagerPlugin.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.licmgr;
+package org.onap.appc.dg.licmgr;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
@@ -35,8 +35,8 @@ public interface LicenseManagerPlugin extends SvcLogicJavaPlugin {
     /**
      * Retrieves license model from APPC database and populate flags into svc context
      * @param params map with parameters:
-     *               org.openecomp.appc.vftype - the vnf type / service type;
-     *               org.openecomp.appc.resource-version - the vnf version / service version
+     *               org.onap.appc.vftype - the vnf type / service type;
+     *               org.onap.appc.resource-version - the vnf version / service version
      * @param ctx service logic context
      *            1. supposed properties already in context:
      *            aai.input.data.entitlement-assignment-group-uuid - entitlement-group-uuid asset tag already stored in AAI
diff --git a/appc-dg/appc-dg-shared/appc-dg-license-manager/src/main/java/org/openecomp/appc/dg/licmgr/impl/LicenseManagerPluginImpl.java b/appc-dg/appc-dg-shared/appc-dg-license-manager/src/main/java/org/openecomp/appc/dg/licmgr/impl/LicenseManagerPluginImpl.java
index ec823432f..4a72c2358 100644
--- a/appc-dg/appc-dg-shared/appc-dg-license-manager/src/main/java/org/openecomp/appc/dg/licmgr/impl/LicenseManagerPluginImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-license-manager/src/main/java/org/openecomp/appc/dg/licmgr/impl/LicenseManagerPluginImpl.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.licmgr.impl;
+package org.onap.appc.dg.licmgr.impl;
 
 import java.util.Map;
 
-import org.openecomp.appc.dg.licmgr.LicenseManagerPlugin;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.licmgr.Constants;
-import org.openecomp.appc.licmgr.LicenseManager;
-import org.openecomp.appc.licmgr.exception.DataAccessException;
-import org.openecomp.appc.licmgr.objects.LicenseModel;
+import org.onap.appc.dg.licmgr.LicenseManagerPlugin;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.licmgr.Constants;
+import org.onap.appc.licmgr.LicenseManager;
+import org.onap.appc.licmgr.exception.DataAccessException;
+import org.onap.appc.licmgr.objects.LicenseModel;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
@@ -52,8 +52,8 @@ public class LicenseManagerPluginImpl implements LicenseManagerPlugin {
     /**
      * Retrieves license model from APPC database and populate flags into svc context
      * @param params map with parameters:
-     *               org.openecomp.appc.vftype - the vnf type / service type;
-     *               org.openecomp.appc.resource-version - the vnf version / service version
+     *               org.onap.appc.vftype - the vnf type / service type;
+     *               org.onap.appc.resource-version - the vnf version / service version
      * @param ctx service logic context
      *            1. supposed properties already in context:
      *            aai.input.data.entitlement-assignment-group-uuid - entitlement-group-uuid asset tag already stored in AAI
diff --git a/appc-dg/appc-dg-shared/appc-dg-license-manager/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dg/appc-dg-shared/appc-dg-license-manager/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 68c163f6f..647751aee 100644
--- a/appc-dg/appc-dg-shared/appc-dg-license-manager/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-license-manager/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -31,11 +31,11 @@
 		   xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
 
-	<reference id="LicenseManagerRef" availability="mandatory" activation="eager" interface="org.openecomp.appc.licmgr.LicenseManager" />
+	<reference id="LicenseManagerRef" availability="mandatory" activation="eager" interface="org.onap.appc.licmgr.LicenseManager" />
 
-	<bean id="LicenseManagerPluginBean" class="org.openecomp.appc.dg.licmgr.impl.LicenseManagerPluginImpl" scope="singleton">
+	<bean id="LicenseManagerPluginBean" class="org.onap.appc.dg.licmgr.impl.LicenseManagerPluginImpl" scope="singleton">
 		<property name="licenseManager" ref="LicenseManagerRef" />
 	</bean>
-	<service id="LicenseManagerPlugin" interface="org.openecomp.appc.dg.licmgr.LicenseManagerPlugin" ref="LicenseManagerPluginBean"/>
+	<service id="LicenseManagerPlugin" interface="org.onap.appc.dg.licmgr.LicenseManagerPlugin" ref="LicenseManagerPluginBean"/>
 
 </blueprint>
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml
index f386fe46b..a2b5487bb 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml
@@ -2,7 +2,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-dg-shared</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
@@ -19,7 +19,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-common</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/MDSALStore.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/MDSALStore.java
index 5526a7fe4..eba364a10 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/MDSALStore.java
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/MDSALStore.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.mdsal;
+package org.onap.appc.mdsal;
 
-import org.openecomp.appc.mdsal.exception.MDSALStoreException;
-import org.openecomp.appc.mdsal.objects.BundleInfo;
+import org.onap.appc.mdsal.exception.MDSALStoreException;
+import org.onap.appc.mdsal.objects.BundleInfo;
 
 import java.util.Date;
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/exception/MDSALStoreException.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/exception/MDSALStoreException.java
index f1bbf7fff..2bb30b1c2 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/exception/MDSALStoreException.java
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/exception/MDSALStoreException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.mdsal.exception;
+package org.onap.appc.mdsal.exception;
 
 /**
  * This is custom exception type defined for MD-SAL store. All exceptions thrown by mdsal store module need to be wrapped in this class.
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/Constants.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/Constants.java
index 949f6ffa3..bb847477f 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/Constants.java
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/Constants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.mdsal.impl;
+package org.onap.appc.mdsal.impl;
 /**
  * This class contains the definitions of all constant values used in the appc-dg-mdsal-store
  * These properties are used for creating osgi bundle zip file. It also defines contents for Blueprint.xml file of bundle
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/MDSALStoreFactory.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/MDSALStoreFactory.java
index 603f01f60..bc951d926 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/MDSALStoreFactory.java
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/MDSALStoreFactory.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.mdsal.impl;
+package org.onap.appc.mdsal.impl;
 
-import org.openecomp.appc.mdsal.MDSALStore;
+import org.onap.appc.mdsal.MDSALStore;
 
 /*
  * Factory class to create/get instance of MDSALStore
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/MDSALStoreImpl.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/MDSALStoreImpl.java
index b90d9c0e5..c9e083557 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/MDSALStoreImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/MDSALStoreImpl.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.mdsal.impl;
-
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.mdsal.MDSALStore;
-import org.openecomp.appc.mdsal.exception.MDSALStoreException;
-import org.openecomp.appc.mdsal.objects.BundleInfo;
-import org.openecomp.appc.mdsal.operation.ConfigOperation;
+package org.onap.appc.mdsal.impl;
+
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.mdsal.MDSALStore;
+import org.onap.appc.mdsal.exception.MDSALStoreException;
+import org.onap.appc.mdsal.objects.BundleInfo;
+import org.onap.appc.mdsal.operation.ConfigOperation;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.osgi.framework.Bundle;
@@ -113,7 +113,7 @@ public class MDSALStoreImpl implements MDSALStore{
     public void storeJson( String module , String requestId ,String configJSON) throws MDSALStoreException {
 
         try {
-            ConfigOperation.storeConfig(configJSON , module , org.openecomp.appc.Constants.YANG_BASE_CONTAINER, org.openecomp.appc.Constants.YANG_VNF_CONFIG_LIST,requestId,org.openecomp.appc.Constants.YANG_VNF_CONFIG);
+            ConfigOperation.storeConfig(configJSON , module , org.onap.appc.Constants.YANG_BASE_CONTAINER, org.onap.appc.Constants.YANG_VNF_CONFIG_LIST,requestId,org.onap.appc.Constants.YANG_VNF_CONFIG);
         } catch (APPCException e) {
             throw new MDSALStoreException("Exception while storing config json to MDSAL store." +e.getMessage(), e);
         }
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/objects/BundleInfo.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/objects/BundleInfo.java
index 4fb12ce06..b6d65447d 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/objects/BundleInfo.java
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/objects/BundleInfo.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.mdsal.objects;
+package org.onap.appc.mdsal.objects;
 /**
  * Holds bundle information which includes name , description , version and location. This information will be used to create osgi bundle.
  */
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperation.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperation.java
index 5c5a1bb34..1dcf1c6b0 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperation.java
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperation.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.mdsal.operation;
+package org.onap.appc.mdsal.operation;
 
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.mdsal.impl.Constants;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.mdsal.impl.Constants;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperation.java~ccmerge b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperation.java~ccmerge
index c1695d467..36f471853 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperation.java~ccmerge
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperation.java~ccmerge
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.mdsal.operation;
+package org.onap.appc.mdsal.operation;
 
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.mdsal.impl.Constants;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.mdsal.impl.Constants;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperationRequestFormatter.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperationRequestFormatter.java
index 26e7669e2..b2ada2ecc 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperationRequestFormatter.java
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperationRequestFormatter.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.mdsal.operation;
+package org.onap.appc.mdsal.operation;
 
-import org.openecomp.appc.mdsal.impl.Constants;
+import org.onap.appc.mdsal.impl.Constants;
 
 import java.net.URL;
 /**
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml b/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml
index 47fd4a5a5..570b29966 100644
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-dg-shared</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -11,18 +11,18 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-netconf-adapter-bundle</artifactId>
 			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dg-common</artifactId>
 			<version>${project.version}</version>
 			<scope>compile</scope>
@@ -74,8 +74,8 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>appc-dg-netconf</Bundle-SymbolicName>
-						<Export-Package>org.openecomp.appc.dg.netconf</Export-Package>
-						<Private-Package>org.openecomp.appc.dg.netconf.impl.*</Private-Package>
+						<Export-Package>org.onap.appc.dg.netconf</Export-Package>
+						<Private-Package>org.onap.appc.dg.netconf.impl.*</Private-Package>
 						<Import-Package>
 							*;resolution:=optional
 						</Import-Package>
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/java/org/openecomp/appc/dg/netconf/NetconfClientPlugin.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/java/org/openecomp/appc/dg/netconf/NetconfClientPlugin.java
index a0b8363e4..e1c563a4b 100644
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/java/org/openecomp/appc/dg/netconf/NetconfClientPlugin.java
+++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/java/org/openecomp/appc/dg/netconf/NetconfClientPlugin.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.netconf;
+package org.onap.appc.dg.netconf;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/java/org/openecomp/appc/dg/netconf/NetconfDBPlugin.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/java/org/openecomp/appc/dg/netconf/NetconfDBPlugin.java
index 8ed0f4129..a4086a521 100644
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/java/org/openecomp/appc/dg/netconf/NetconfDBPlugin.java
+++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/java/org/openecomp/appc/dg/netconf/NetconfDBPlugin.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.netconf;
+package org.onap.appc.dg.netconf;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/java/org/openecomp/appc/dg/netconf/impl/NetconfClientPluginImpl.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/java/org/openecomp/appc/dg/netconf/impl/NetconfClientPluginImpl.java
index 61926a41c..174226473 100644
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/java/org/openecomp/appc/dg/netconf/impl/NetconfClientPluginImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/java/org/openecomp/appc/dg/netconf/impl/NetconfClientPluginImpl.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.netconf.impl;
+package org.onap.appc.dg.netconf.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.adapter.netconf.*;
-import org.openecomp.appc.adapter.netconf.util.Constants;
-import org.openecomp.appc.dg.netconf.NetconfClientPlugin;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.netconf.*;
+import org.onap.appc.adapter.netconf.util.Constants;
+import org.onap.appc.dg.netconf.NetconfClientPlugin;
+import org.onap.appc.exceptions.APPCException;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
@@ -48,7 +48,7 @@ import java.util.Map;
 
 public class NetconfClientPluginImpl implements NetconfClientPlugin {
 
-    private static final String NETCONF_CLIENT_FACTORY_NAME = "org.openecomp.appc.adapter.netconf.NetconfClientFactory";
+    private static final String NETCONF_CLIENT_FACTORY_NAME = "org.onap.appc.adapter.netconf.NetconfClientFactory";
     private static ObjectMapper mapper = new ObjectMapper();
     private static EELFLogger logger = EELFManager.getInstance().getApplicationLogger();
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/java/org/openecomp/appc/dg/netconf/impl/NetconfDBPluginImpl.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/java/org/openecomp/appc/dg/netconf/impl/NetconfDBPluginImpl.java
index 62707e3df..459ece9c1 100644
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/java/org/openecomp/appc/dg/netconf/impl/NetconfDBPluginImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/java/org/openecomp/appc/dg/netconf/impl/NetconfDBPluginImpl.java
@@ -22,19 +22,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.netconf.impl;
+package org.onap.appc.dg.netconf.impl;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.util.Map;
 
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.NetconfDataAccessService;
-import org.openecomp.appc.adapter.netconf.exception.DataAccessException;
-import org.openecomp.appc.adapter.netconf.util.Constants;
-import org.openecomp.appc.dg.netconf.NetconfDBPlugin;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.NetconfDataAccessService;
+import org.onap.appc.adapter.netconf.exception.DataAccessException;
+import org.onap.appc.adapter.netconf.util.Constants;
+import org.onap.appc.dg.netconf.NetconfDBPlugin;
+import org.onap.appc.exceptions.APPCException;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index c3e768785..e22fe0528 100644
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -30,17 +30,17 @@
 		   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		   xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
-	<reference id="DataAccessServiceRef" availability="mandatory" activation="eager" interface="org.openecomp.appc.adapter.netconf.NetconfDataAccessService" />
+	<reference id="DataAccessServiceRef" availability="mandatory" activation="eager" interface="org.onap.appc.adapter.netconf.NetconfDataAccessService" />
 
 
-	<bean id="NetconfDBPluginBean" class="org.openecomp.appc.dg.netconf.impl.NetconfDBPluginImpl" scope="singleton">
+	<bean id="NetconfDBPluginBean" class="org.onap.appc.dg.netconf.impl.NetconfDBPluginImpl" scope="singleton">
 		<property name="daoService" ref="DataAccessServiceRef" />
 	</bean>
-	<service id="NetconfDBPlugin" interface="org.openecomp.appc.dg.netconf.NetconfDBPlugin" ref="NetconfDBPluginBean"/>
+	<service id="NetconfDBPlugin" interface="org.onap.appc.dg.netconf.NetconfDBPlugin" ref="NetconfDBPluginBean"/>
 
-	<bean id="NetconfClientPluginBean" class="org.openecomp.appc.dg.netconf.impl.NetconfClientPluginImpl" scope="singleton">
+	<bean id="NetconfClientPluginBean" class="org.onap.appc.dg.netconf.impl.NetconfClientPluginImpl" scope="singleton">
 		<property name="dao" ref="DataAccessServiceRef" />
 	</bean>
-	<service id="NetconfClientPlugin" interface="org.openecomp.appc.dg.netconf.NetconfClientPlugin" ref="NetconfClientPluginBean"/>
+	<service id="NetconfClientPlugin" interface="org.onap.appc.dg.netconf.NetconfClientPlugin" ref="NetconfClientPluginBean"/>
 
 </blueprint>
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/DAOServiceMock.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/DAOServiceMock.java
index 3e2411da8..379e164b5 100644
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/DAOServiceMock.java
+++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/DAOServiceMock.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.netconf.impl;
+package org.onap.appc.dg.netconf.impl;
 
 import java.util.HashMap;
 
-import org.openecomp.appc.adapter.netconf.ConnectionDetails;
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.NetconfDataAccessService;
-import org.openecomp.appc.adapter.netconf.exception.DataAccessException;
+import org.onap.appc.adapter.netconf.ConnectionDetails;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.NetconfDataAccessService;
+import org.onap.appc.adapter.netconf.exception.DataAccessException;
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
 
 class DAOServiceMock implements NetconfDataAccessService {
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/MockOperationalStateValidatorImpl.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/MockOperationalStateValidatorImpl.java
index 19e6d035a..802fe15e0 100644
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/MockOperationalStateValidatorImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/MockOperationalStateValidatorImpl.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.netconf.impl;
+package org.onap.appc.dg.netconf.impl;
 
-import org.openecomp.appc.adapter.netconf.OperationalStateValidator;
-import org.openecomp.appc.adapter.netconf.VnfType;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.netconf.OperationalStateValidator;
+import org.onap.appc.adapter.netconf.VnfType;
+import org.onap.appc.exceptions.APPCException;
 
 
 public class MockOperationalStateValidatorImpl implements OperationalStateValidator {
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientFactoryMock.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientFactoryMock.java
index 1af12c7bd..f61d188d9 100644
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientFactoryMock.java
+++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientFactoryMock.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.netconf.impl;
+package org.onap.appc.dg.netconf.impl;
 
-import org.openecomp.appc.adapter.netconf.NetconfClient;
-import org.openecomp.appc.adapter.netconf.NetconfClientFactory;
-import org.openecomp.appc.adapter.netconf.NetconfClientType;
-import org.openecomp.appc.adapter.netconf.jsch.NetconfClientJsch;
-import org.openecomp.appc.adapter.netconf.odlconnector.NetconfClientRestconfImpl;
+import org.onap.appc.adapter.netconf.NetconfClient;
+import org.onap.appc.adapter.netconf.NetconfClientFactory;
+import org.onap.appc.adapter.netconf.NetconfClientType;
+import org.onap.appc.adapter.netconf.jsch.NetconfClientJsch;
+import org.onap.appc.adapter.netconf.odlconnector.NetconfClientRestconfImpl;
 
 
 public class NetconfClientFactoryMock extends NetconfClientFactory {
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientJschMock.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientJschMock.java
index 301eafd6b..82361a95e 100644
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientJschMock.java
+++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientJschMock.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.netconf.impl;
+package org.onap.appc.dg.netconf.impl;
 
-import org.openecomp.appc.adapter.netconf.NetconfClient;
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.netconf.NetconfClient;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.exceptions.APPCException;
 
 
 public class NetconfClientJschMock implements NetconfClient {
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientPluginImplTest.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientPluginImplTest.java
index 845d4f288..0becff701 100644
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientPluginImplTest.java
+++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientPluginImplTest.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.netconf.impl;
+package org.onap.appc.dg.netconf.impl;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Before;
@@ -32,9 +32,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
-import org.openecomp.appc.adapter.netconf.*;
-import org.openecomp.appc.adapter.netconf.util.Constants;
-import org.openecomp.appc.dg.netconf.impl.NetconfClientPluginImpl;
+import org.onap.appc.adapter.netconf.*;
+import org.onap.appc.adapter.netconf.util.Constants;
+import org.onap.appc.dg.netconf.impl.NetconfClientPluginImpl;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -90,7 +90,7 @@ public class NetconfClientPluginImplTest {
     String operationalState = "<rpc message-id=\"101\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n" +
             "       <get>\n" +
             "              <filter>\n" +
-            "                     <ManagedElement xmlns=\"urn:org:openecomp:appc:Test\">\n" +
+            "                     <ManagedElement xmlns=\"urn:org:onap:appc:Test\">\n" +
             "                           <VnfFunction xmlns=\"urn:org:openecomop:appc:Test\">\n" +
             "                                  <ProcessorManagement>\n" +
             "                                         <MatedPair>\n" +
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfDBPluginImplTest.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfDBPluginImplTest.java
index f01a462f1..5137b904b 100644
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfDBPluginImplTest.java
+++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfDBPluginImplTest.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.netconf.impl;
+package org.onap.appc.dg.netconf.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.*;
-import org.openecomp.appc.adapter.netconf.ConnectionDetails;
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.NetconfDataAccessService;
-import org.openecomp.appc.adapter.netconf.exception.DataAccessException;
-import org.openecomp.appc.dg.netconf.impl.NetconfDBPluginImpl;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.netconf.ConnectionDetails;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.NetconfDataAccessService;
+import org.onap.appc.adapter.netconf.exception.DataAccessException;
+import org.onap.appc.dg.netconf.impl.NetconfDBPluginImpl;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import java.io.IOException;
@@ -66,7 +66,7 @@ public class NetconfDBPluginImplTest {
     public void testRetrieveDSConfiguration() throws Exception {
         init();
         params = new HashMap<>();
-        params.put("org.openecomp.appc.vftype", "VNF");
+        params.put("org.onap.appc.vftype", "VNF");
         params.put("configuration-file-name", "VnfGetRunningConfig");
         SvcLogicContext ctx = new SvcLogicContext();
         netconfDBPlugin.retrieveDSConfiguration(params, ctx);
@@ -86,7 +86,7 @@ public class NetconfDBPluginImplTest {
         try {
             netconfDBPlugin.retrieveDSConfiguration(params, ctx);
         } catch (DataAccessException e) {
-            //Assert.assertNotNull(ctx.getAttribute("org.openecomp.appc.dg.error"));
+            //Assert.assertNotNull(ctx.getAttribute("org.onap.appc.dg.error"));
             Assert.assertNull(ctx.getAttribute("file-content"));
         }
 
@@ -161,7 +161,7 @@ public class NetconfDBPluginImplTest {
     public void testRetrieveConnectionDetails() throws Exception {
         init();
         params = new HashMap<>();
-        params.put("org.openecomp.appc.vftype", "VNF");
+        params.put("org.onap.appc.vftype", "VNF");
         params.put("vnf-host-ip-address", host1);
         SvcLogicContext ctx = new SvcLogicContext();
         netconfDBPlugin.retrieveConnectionDetails(params, ctx);
@@ -173,7 +173,7 @@ public class NetconfDBPluginImplTest {
     public void testRetrieveConnectionDetailsNegativeJsonProcessingException() throws Exception {
         init();
         params = new HashMap<>();
-        params.put("org.openecomp.appc.vftype", "MOCK");
+        params.put("org.onap.appc.vftype", "MOCK");
         params.put("vnf-host-ip-address", host1);
         SvcLogicContext ctx = new SvcLogicContext();
 
@@ -192,7 +192,7 @@ public class NetconfDBPluginImplTest {
     public void testRetrieveConnectionDetailsNegativeMissingConfiguration() throws Exception {
         init();
         params = new HashMap<>();
-        params.put("org.openecomp.appc.vftype", "VNF");
+        params.put("org.onap.appc.vftype", "VNF");
         params.put("vnf-host-ip-address", host1);
         SvcLogicContext ctx = new SvcLogicContext();
         substituteMapper(true);
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/ObjectMapperMock.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/ObjectMapperMock.java
index c5168e253..cacc15eae 100644
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/ObjectMapperMock.java
+++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/ObjectMapperMock.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.netconf.impl;
+package org.onap.appc.dg.netconf.impl;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/OperationStateValidatorFactoryMock.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/OperationStateValidatorFactoryMock.java
index 24b0323dd..2194fc14c 100644
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/OperationStateValidatorFactoryMock.java
+++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/OperationStateValidatorFactoryMock.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.netconf.impl;
+package org.onap.appc.dg.netconf.impl;
 
 import org.apache.commons.lang3.NotImplementedException;
-import org.openecomp.appc.adapter.netconf.*;
+import org.onap.appc.adapter.netconf.*;
 
 
 public class OperationStateValidatorFactoryMock extends OperationalStateValidatorFactory {
diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-features/pom.xml b/appc-dg/appc-dg-shared/appc-dg-shared-features/pom.xml
index e61b75051..0856b024f 100644
--- a/appc-dg/appc-dg-shared/appc-dg-shared-features/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-shared-features/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-dg-shared</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -11,27 +11,27 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dg-ssh</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dg-netconf</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dg-aai</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dg-license-manager</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dg-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-features/src/main/resources/features.xml b/appc-dg/appc-dg-shared/appc-dg-shared-features/src/main/resources/features.xml
index 606c47813..57c3e958f 100644
--- a/appc-dg/appc-dg-shared/appc-dg-shared-features/src/main/resources/features.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-shared-features/src/main/resources/features.xml
@@ -27,17 +27,17 @@
 <features name="appc-dg-shared-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
 		  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-	<repository>mvn:org.openecomp.appc/appc-ssh-adapter-features/${project.version}/xml/features</repository>
-	<repository>mvn:org.openecomp.appc/appc-netconf-adapter-features/${project.version}/xml/features</repository>
+	<repository>mvn:org.onap.appc/appc-ssh-adapter-features/${project.version}/xml/features</repository>
+	<repository>mvn:org.onap.appc/appc-netconf-adapter-features/${project.version}/xml/features</repository>
 	<feature name='appc-dg-shared' description="appc-dg-shared" version='${project.version}'>
 		<feature version='${project.version}'>appc-ssh-adapter</feature>
 		<feature version='${project.version}'>appc-netconf-adapter</feature>
 		<feature>sdnc-sli</feature>
-        <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
-        <bundle start-level="85" start="true">mvn:org.openecomp.appc/appc-dg-common/${project.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-dg-ssh/${project.version}</bundle>
-		<bundle start-level="85" start="true">mvn:org.openecomp.appc/appc-dg-netconf/${project.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-dg-license-manager/${project.version}</bundle>
-		<bundle start-level="85" start="true">mvn:org.openecomp.appc/appc-dg-aai/${project.version}</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
+        <bundle start-level="85" start="true">mvn:org.onap.appc/appc-dg-common/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-dg-ssh/${project.version}</bundle>
+		<bundle start-level="85" start="true">mvn:org.onap.appc/appc-dg-netconf/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-dg-license-manager/${project.version}</bundle>
+		<bundle start-level="85" start="true">mvn:org.onap.appc/appc-dg-aai/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-installer/pom.xml b/appc-dg/appc-dg-shared/appc-dg-shared-installer/pom.xml
index 5e9955180..beebffe90 100644
--- a/appc-dg/appc-dg-shared/appc-dg-shared-installer/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-shared-installer/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-dg-shared</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -13,12 +13,12 @@
 	<properties>
 		<application.name>appc-dg-shared</application.name>
 		<features.boot>appc-dg-shared</features.boot>
-		<features.repositories>mvn:org.openecomp.appc/appc-dg-shared-features/${project.version}/xml/features</features.repositories>
+		<features.repositories>mvn:org.onap.appc/appc-dg-shared-features/${project.version}/xml/features</features.repositories>
 	</properties>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dg-shared-features</artifactId>
 			<version>${project.version}</version>
 			<classifier>features</classifier>
@@ -26,7 +26,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-ssh-adapter-features</artifactId>
 			<version>${project.version}</version>
 			<classifier>features</classifier>
@@ -34,7 +34,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-netconf-adapter-features</artifactId>
 			<version>${project.version}</version>
 			<classifier>features</classifier>
diff --git a/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml b/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml
index db4c51596..c31ed4bc5 100644
--- a/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-dg-shared</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -11,18 +11,18 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-ssh-adapter-api</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dg-common</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
@@ -40,7 +40,7 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-ssh-adapter-tests</artifactId>
 			<version>${project.version}</version>
 			<scope>test</scope>
@@ -56,8 +56,8 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>appc-dg-ssh</Bundle-SymbolicName>
-						<Export-Package>org.openecomp.appc.dg.ssh</Export-Package>
-						<Private-Package>org.openecomp.appc.dg.ssh.impl.*</Private-Package>
+						<Export-Package>org.onap.appc.dg.ssh</Export-Package>
+						<Private-Package>org.onap.appc.dg.ssh.impl.*</Private-Package>
 						<Import-Package>
 							*;resolution:=optional
 						</Import-Package>
diff --git a/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/java/org/openecomp/appc/dg/ssh/SshDBPlugin.java b/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/java/org/openecomp/appc/dg/ssh/SshDBPlugin.java
index d69e25cbb..da5e3dfe6 100644
--- a/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/java/org/openecomp/appc/dg/ssh/SshDBPlugin.java
+++ b/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/java/org/openecomp/appc/dg/ssh/SshDBPlugin.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.ssh;
+package org.onap.appc.dg.ssh;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/java/org/openecomp/appc/dg/ssh/SshService.java b/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/java/org/openecomp/appc/dg/ssh/SshService.java
index d0f922577..591e58805 100644
--- a/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/java/org/openecomp/appc/dg/ssh/SshService.java
+++ b/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/java/org/openecomp/appc/dg/ssh/SshService.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.ssh;
+package org.onap.appc.dg.ssh;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/java/org/openecomp/appc/dg/ssh/impl/SshDBPluginImpl.java b/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/java/org/openecomp/appc/dg/ssh/impl/SshDBPluginImpl.java
index f660d8e56..c3dfc61d6 100644
--- a/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/java/org/openecomp/appc/dg/ssh/impl/SshDBPluginImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/java/org/openecomp/appc/dg/ssh/impl/SshDBPluginImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.ssh.impl;
+package org.onap.appc.dg.ssh.impl;
 
 import com.att.eelf.i18n.EELFResourceManager;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -30,13 +30,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.util.Map;
 
-import org.openecomp.appc.adapter.ssh.Constants;
-import org.openecomp.appc.adapter.ssh.SshConnectionDetails;
-import org.openecomp.appc.adapter.ssh.SshDataAccessException;
-import org.openecomp.appc.adapter.ssh.SshDataAccessService;
-import org.openecomp.appc.dg.ssh.SshDBPlugin;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.adapter.ssh.Constants;
+import org.onap.appc.adapter.ssh.SshConnectionDetails;
+import org.onap.appc.adapter.ssh.SshDataAccessException;
+import org.onap.appc.adapter.ssh.SshDataAccessService;
+import org.onap.appc.dg.ssh.SshDBPlugin;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/java/org/openecomp/appc/dg/ssh/impl/SshServiceImpl.java b/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/java/org/openecomp/appc/dg/ssh/impl/SshServiceImpl.java
index b708a9b32..1c584cdb9 100644
--- a/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/java/org/openecomp/appc/dg/ssh/impl/SshServiceImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/java/org/openecomp/appc/dg/ssh/impl/SshServiceImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.ssh.impl;
+package org.onap.appc.dg.ssh.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -30,11 +30,11 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Map;
 
-import org.openecomp.appc.adapter.ssh.SshAdapter;
-import org.openecomp.appc.adapter.ssh.SshConnection;
-import org.openecomp.appc.adapter.ssh.SshConnectionDetails;
-import org.openecomp.appc.dg.ssh.SshService;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.ssh.SshAdapter;
+import org.onap.appc.adapter.ssh.SshConnection;
+import org.onap.appc.adapter.ssh.SshConnectionDetails;
+import org.onap.appc.dg.ssh.SshService;
+import org.onap.appc.exceptions.APPCException;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
diff --git a/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 386e8b5da..19a145293 100644
--- a/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-ssh/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -30,16 +30,16 @@
 		   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		   xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
-	<reference id="sshAdapterRef" availability="mandatory" activation="eager" interface="org.openecomp.appc.adapter.ssh.SshAdapter" />
-	<bean id="sshServiceBean" class="org.openecomp.appc.dg.ssh.impl.SshServiceImpl" scope="singleton">
+	<reference id="sshAdapterRef" availability="mandatory" activation="eager" interface="org.onap.appc.adapter.ssh.SshAdapter" />
+	<bean id="sshServiceBean" class="org.onap.appc.dg.ssh.impl.SshServiceImpl" scope="singleton">
 		<property name="sshAdapter" ref="sshAdapterRef" />
 	</bean>
-	<service id="sshService" interface="org.openecomp.appc.dg.ssh.SshService" ref="sshServiceBean"/>
+	<service id="sshService" interface="org.onap.appc.dg.ssh.SshService" ref="sshServiceBean"/>
 
-	<reference id="sshDAServiceRef" availability="mandatory" activation="eager" interface="org.openecomp.appc.adapter.ssh.SshDataAccessService" />
-	<bean id="sshDBPluginBean" class="org.openecomp.appc.dg.ssh.impl.SshDBPluginImpl" scope="singleton">
+	<reference id="sshDAServiceRef" availability="mandatory" activation="eager" interface="org.onap.appc.adapter.ssh.SshDataAccessService" />
+	<bean id="sshDBPluginBean" class="org.onap.appc.dg.ssh.impl.SshDBPluginImpl" scope="singleton">
 		<property name="dataAccessService" ref="sshDAServiceRef" />
 	</bean>
-	<service id="sshDBPlugin" interface="org.openecomp.appc.dg.ssh.SshDBPlugin" ref="sshDBPluginBean"/>
+	<service id="sshDBPlugin" interface="org.onap.appc.dg.ssh.SshDBPlugin" ref="sshDBPluginBean"/>
 
 </blueprint>
diff --git a/appc-dg/appc-dg-shared/appc-dg-ssh/src/test/java/org/openecomp/appc/dg/ssh/impl/SshServiceImplTest.java b/appc-dg/appc-dg-shared/appc-dg-ssh/src/test/java/org/openecomp/appc/dg/ssh/impl/SshServiceImplTest.java
index f54f608cf..bb232863f 100644
--- a/appc-dg/appc-dg-shared/appc-dg-ssh/src/test/java/org/openecomp/appc/dg/ssh/impl/SshServiceImplTest.java
+++ b/appc-dg/appc-dg-shared/appc-dg-ssh/src/test/java/org/openecomp/appc/dg/ssh/impl/SshServiceImplTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.ssh.impl;
+package org.onap.appc.dg.ssh.impl;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -31,12 +31,12 @@ import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.openecomp.appc.adapter.ssh.SshAdapterMock;
-import org.openecomp.appc.adapter.ssh.SshConnectionDetails;
-import org.openecomp.appc.adapter.ssh.SshConnectionMock;
-import org.openecomp.appc.dg.ssh.SshService;
-import org.openecomp.appc.dg.ssh.impl.SshServiceImpl;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.ssh.SshAdapterMock;
+import org.onap.appc.adapter.ssh.SshConnectionDetails;
+import org.onap.appc.adapter.ssh.SshConnectionMock;
+import org.onap.appc.dg.ssh.SshService;
+import org.onap.appc.dg.ssh.impl.SshServiceImpl;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import java.util.HashMap;
diff --git a/appc-dg/appc-dg-shared/pom.xml b/appc-dg/appc-dg-shared/pom.xml
index 4509cf28c..182f6d534 100644
--- a/appc-dg/appc-dg-shared/pom.xml
+++ b/appc-dg/appc-dg-shared/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-dg</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
diff --git a/appc-dg/pom.xml b/appc-dg/pom.xml
index 7dee3a1a3..27d68fef7 100644
--- a/appc-dg/pom.xml
+++ b/appc-dg/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
 		<artifactId>appc</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/appc-directed-graph/appc-dgraph/pom.xml b/appc-directed-graph/appc-dgraph/pom.xml
index e35d5cc0d..555987233 100644
--- a/appc-directed-graph/appc-dgraph/pom.xml
+++ b/appc-directed-graph/appc-dgraph/pom.xml
@@ -27,14 +27,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-directed-graph</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-dgraph</artifactId>
     <version>1.3.0-SNAPSHOT</version>
 
diff --git a/appc-directed-graph/appc-dgraph/provider/pom.xml b/appc-directed-graph/appc-dgraph/provider/pom.xml
index bacbc43c4..31d472e2c 100644
--- a/appc-directed-graph/appc-dgraph/provider/pom.xml
+++ b/appc-directed-graph/appc-dgraph/provider/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-dgraph</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -31,18 +31,18 @@
         </dependency>
 
         <dependency>
-            <groupId>org.openecomp.appc.plugins</groupId>
+            <groupId>org.onap.appc.plugins</groupId>
             <artifactId>dg-loader-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-generator-provider</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-params-provider</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
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 73b1d7aaa..5ee11c39e 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.openecomp.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.openecomp.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.openecomp.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.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":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_CommonConfiguration.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_CommonConfiguration.json
index 5df4bd121..ef6c0d087 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_CommonConfiguration.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_CommonConfiguration.json
@@ -1 +1 @@
-[{"id":"15c59d71.ababe3","type":"dgstart","name":"DGSTART","outputs":1,"x":104,"y":48,"z":"c322e357.b8be8","wires":[["a514f47b.d5bda8"]]},{"id":"a514f47b.d5bda8","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":287,"y":50,"z":"c322e357.b8be8","wires":[["fb0c7139.5af51"]]},{"id":"fb0c7139.5af51","type":"method","name":"method CommonConfiguration","xml":"<method rpc='CommonConfiguration' mode='sync'>\n","comments":"","outputs":1,"x":547,"y":48,"z":"c322e357.b8be8","wires":[["3d94ea58.b453b6"]]},{"id":"3d94ea58.b453b6","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":84,"y":404,"z":"c322e357.b8be8","wires":[["62ba3ef0.ca976","c6df868f.aa7308","bc6c421e.60c4b","93c5931.7ab677","be2f239f.7dc29","dcac81d6.e4742"]]},{"id":"659a83cd.3ad29c","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$request-action`\">\n\n\n","comments":"","outputs":1,"x":414.5,"y":343,"z":"c322e357.b8be8","wires":[["78fe488d.d629a8","ba1faf4d.90c7f","81174cbe.247c4","74691fa2.1c0c1","e740321c.4b927","4531bc67.6e9694","4d8d372f.0ebc28"]]},{"id":"210f97fe.bca328","type":"call","name":"call: Configure","xml":"<call module=\"APPC\" rpc=\"Configure\" mode=\"sync\">","comments":"","outputs":1,"x":1080.5,"y":348,"z":"c322e357.b8be8","wires":[["9070d727.d59288","44288c9c.74bae4"]]},{"id":"78fe488d.d629a8","type":"outcome","name":"Configure","xml":"<outcome value='Configure'>\n","comments":"","outputs":1,"x":687.5,"y":344,"z":"c322e357.b8be8","wires":[["5dff373d.db8a48"]]},{"id":"ba1faf4d.90c7f","type":"outcome","name":"ConfigModify","xml":"<outcome value='ConfigModify'>\n","comments":"","outputs":1,"x":684.5,"y":474,"z":"c322e357.b8be8","wires":[["5dff373d.db8a48"]]},{"id":"74691fa2.1c0c1","type":"outcome","name":"ConfigScaleOut","xml":"<outcome value='ConfigScaleOut'>\n","comments":"","outputs":1,"x":687.5,"y":390,"z":"c322e357.b8be8","wires":[["5dff373d.db8a48"]]},{"id":"5dff373d.db8a48","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":878.5,"y":344,"z":"c322e357.b8be8","wires":[["210f97fe.bca328"]]},{"id":"62ba3ef0.ca976","type":"switchNode","name":"switch error-code","xml":"<switch test='`$error-code`'>\n","comments":"","outputs":1,"x":304,"y":821,"z":"c322e357.b8be8","wires":[["ade1eb2c.468eb8","75f0f4a7.e85dec"]]},{"id":"ade1eb2c.468eb8","type":"success","name":"outcome: 400","xml":"<outcome value=\"400\">","comments":"","outputs":1,"x":512,"y":830,"z":"c322e357.b8be8","wires":[["a91b8e31.5ff52"]]},{"id":"75f0f4a7.e85dec","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":514,"y":905,"z":"c322e357.b8be8","wires":[["d33f3933.4c8b78"]]},{"id":"a91b8e31.5ff52","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":722,"y":836,"z":"c322e357.b8be8","wires":[["9337492c.d201c8"]]},{"id":"d33f3933.4c8b78","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":729,"y":910,"z":"c322e357.b8be8","wires":[["1f02e341.848ead"]]},{"id":"9337492c.d201c8","type":"set","name":"set Status for dispatcher","xml":"<set>\n<parameter name='SvcLogic.status' value='success' />\n<parameter name='output.status.code' value='`$error-code`' />\n<parameter name='output.status.message' value='`$error-message`' />","comments":"","x":955,"y":836,"z":"c322e357.b8be8","wires":[]},{"id":"1f02e341.848ead","type":"set","name":"set Status for dispatcher","xml":"<set>\n<parameter name='SvcLogic.status' value='failure' />\n<parameter name='output.status.code' value='`$error-code`' />\n<parameter name='output.status.message' value='`$error-message`' />\n","comments":"","x":962,"y":916,"z":"c322e357.b8be8","wires":[]},{"id":"c6df868f.aa7308","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=\"`'STATUS RETURNED TO DISPATCHER error-code = ' + $output.status.code`\" />\n<parameter name=\"field3\" value=\"`'STATUS RETURNED TO DISPATCHER error-message = ' + $output.status.message`\" />\n<parameter name=\"field4\" value=\"`'STATUS RETURNED TO DISPATCHER = ' + $SvcLogic.status`\" />","comments":"","outputs":1,"x":273,"y":1116,"z":"c322e357.b8be8","wires":[[]]},{"id":"bc6c421e.60c4b","type":"call","name":"call: GetConfigParams","xml":"<call module=\"APPC\" rpc=\"GetConfigParams\" mode=\"sync\">","comments":"","outputs":1,"x":329,"y":160,"z":"c322e357.b8be8","wires":[["f0d70e02.3a146","9cc63cfb.539a2","ee7268bd.050cd8"]]},{"id":"f0d70e02.3a146","type":"failure","name":"Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":548,"y":262,"z":"c322e357.b8be8","wires":[["86ef19e.3d758e8"]]},{"id":"86ef19e.3d758e8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":716,"y":263,"z":"c322e357.b8be8","wires":[["659a83cd.3ad29c","f91a152c.8ed648"]]},{"id":"9cc63cfb.539a2","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":549,"y":151,"z":"c322e357.b8be8","wires":[["199d1e69.01b822"]]},{"id":"ee7268bd.050cd8","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":547,"y":200,"z":"c322e357.b8be8","wires":[["1a90801b.bb597"]]},{"id":"199d1e69.01b822","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":728,"y":149,"z":"c322e357.b8be8","wires":[[]]},{"id":"1a90801b.bb597","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":722,"y":202,"z":"c322e357.b8be8","wires":[["b99a1084.665dd"]]},{"id":"b99a1084.665dd","type":"set","name":"set error-code","xml":"<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='DG Workflow GetConfigParams not found' />\n","comments":"","x":916,"y":205,"z":"c322e357.b8be8","wires":[]},{"id":"9070d727.d59288","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1296,"y":348,"z":"c322e357.b8be8","wires":[["598408aa.da8188"]]},{"id":"598408aa.da8188","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1464,"y":348,"z":"c322e357.b8be8","wires":[["4733bef3.5975b"]]},{"id":"4733bef3.5975b","type":"set","name":"set error-code","xml":"<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='DG Workflow Configure not found' />\n","comments":"","x":1664,"y":349,"z":"c322e357.b8be8","wires":[]},{"id":"44288c9c.74bae4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1289,"y":399,"z":"c322e357.b8be8","wires":[["e51b2033.d0295"]]},{"id":"e51b2033.d0295","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1470,"y":402,"z":"c322e357.b8be8","wires":[[]]},{"id":"81174cbe.247c4","type":"outcome","name":"ConfigRestore","xml":"<outcome value='ConfigRestore'>\n","comments":"","outputs":1,"x":688,"y":433,"z":"c322e357.b8be8","wires":[["5dff373d.db8a48"]]},{"id":"93c5931.7ab677","type":"call","name":"call: SetStatus","xml":"<call module=\"APPC\" rpc=\"SetStatus\" mode=\"sync\">","comments":"","outputs":1,"x":291,"y":719,"z":"c322e357.b8be8","wires":[["fe31a123.38291","131cb562.b3371b"]]},{"id":"fe31a123.38291","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":481,"y":702,"z":"c322e357.b8be8","wires":[["8823b534.00f5f8"]]},{"id":"8823b534.00f5f8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":667,"y":702,"z":"c322e357.b8be8","wires":[["c84859b3.72e148"]]},{"id":"c84859b3.72e148","type":"set","name":"set error-code","xml":"<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='DG Workflow SetConfigStatus not found' />\n","comments":"","x":855,"y":701,"z":"c322e357.b8be8","wires":[]},{"id":"131cb562.b3371b","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":475,"y":747,"z":"c322e357.b8be8","wires":[["a66046c6.450ae8"]]},{"id":"a66046c6.450ae8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":640,"y":746,"z":"c322e357.b8be8","wires":[[]]},{"id":"e740321c.4b927","type":"failure","name":"Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":606,"y":650,"z":"c322e357.b8be8","wires":[["d03bfb1.6cdfe08"]]},{"id":"ef753c5c.a1a3e","type":"set","name":"set error-code","xml":"<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value=\"`'Invalid action ' + $request-action`\"  />\n","comments":"","x":979,"y":651,"z":"c322e357.b8be8","wires":[]},{"id":"d03bfb1.6cdfe08","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":778,"y":647,"z":"c322e357.b8be8","wires":[["ef753c5c.a1a3e"]]},{"id":"4531bc67.6e9694","type":"outcome","name":"ConfigBackup","xml":"<outcome value='ConfigBackup'>\n","comments":"","outputs":1,"x":678,"y":517,"z":"c322e357.b8be8","wires":[["5dff373d.db8a48"]]},{"id":"4d8d372f.0ebc28","type":"outcome","name":"ConfigBackupDelete","xml":"<outcome value='ConfigBackupDelete'>\n","comments":"","outputs":1,"x":685,"y":567,"z":"c322e357.b8be8","wires":[["5dff373d.db8a48"]]},{"id":"dcac81d6.e4742","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"response\" />\n<parameter name=\"message\" value=\"`$tmp.message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":313.5,"y":1028,"z":"c322e357.b8be8","wires":[["9cff3b81.458148"]]},{"id":"be2f239f.7dc29","type":"set","name":"set tmp.message","xml":"<set>\n<parameter name=\"tmp.message\" value=\"`$output.status.code + ':' + $output.status.message`\" />\n","comments":"","x":296,"y":971,"z":"c322e357.b8be8","wires":[]},{"id":"9cff3b81.458148","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":521,"y":1030,"z":"c322e357.b8be8","wires":[["88b17439.3c8f78"]]},{"id":"88b17439.3c8f78","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":701,"y":1030,"z":"c322e357.b8be8","wires":[[]]},{"id":"f91a152c.8ed648","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":944,"y":267,"z":"c322e357.b8be8","wires":[[]]}]
+[{"id":"15c59d71.ababe3","type":"dgstart","name":"DGSTART","outputs":1,"x":104,"y":48,"z":"c322e357.b8be8","wires":[["a514f47b.d5bda8"]]},{"id":"a514f47b.d5bda8","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":287,"y":50,"z":"c322e357.b8be8","wires":[["fb0c7139.5af51"]]},{"id":"fb0c7139.5af51","type":"method","name":"method CommonConfiguration","xml":"<method rpc='CommonConfiguration' mode='sync'>\n","comments":"","outputs":1,"x":547,"y":48,"z":"c322e357.b8be8","wires":[["3d94ea58.b453b6"]]},{"id":"3d94ea58.b453b6","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":84,"y":404,"z":"c322e357.b8be8","wires":[["62ba3ef0.ca976","c6df868f.aa7308","bc6c421e.60c4b","93c5931.7ab677","be2f239f.7dc29","dcac81d6.e4742"]]},{"id":"659a83cd.3ad29c","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$request-action`\">\n\n\n","comments":"","outputs":1,"x":414.5,"y":343,"z":"c322e357.b8be8","wires":[["78fe488d.d629a8","ba1faf4d.90c7f","81174cbe.247c4","74691fa2.1c0c1","e740321c.4b927","4531bc67.6e9694","4d8d372f.0ebc28"]]},{"id":"210f97fe.bca328","type":"call","name":"call: Configure","xml":"<call module=\"APPC\" rpc=\"Configure\" mode=\"sync\">","comments":"","outputs":1,"x":1080.5,"y":348,"z":"c322e357.b8be8","wires":[["9070d727.d59288","44288c9c.74bae4"]]},{"id":"78fe488d.d629a8","type":"outcome","name":"Configure","xml":"<outcome value='Configure'>\n","comments":"","outputs":1,"x":687.5,"y":344,"z":"c322e357.b8be8","wires":[["5dff373d.db8a48"]]},{"id":"ba1faf4d.90c7f","type":"outcome","name":"ConfigModify","xml":"<outcome value='ConfigModify'>\n","comments":"","outputs":1,"x":684.5,"y":474,"z":"c322e357.b8be8","wires":[["5dff373d.db8a48"]]},{"id":"74691fa2.1c0c1","type":"outcome","name":"ConfigScaleOut","xml":"<outcome value='ConfigScaleOut'>\n","comments":"","outputs":1,"x":687.5,"y":390,"z":"c322e357.b8be8","wires":[["5dff373d.db8a48"]]},{"id":"5dff373d.db8a48","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":878.5,"y":344,"z":"c322e357.b8be8","wires":[["210f97fe.bca328"]]},{"id":"62ba3ef0.ca976","type":"switchNode","name":"switch error-code","xml":"<switch test='`$error-code`'>\n","comments":"","outputs":1,"x":304,"y":821,"z":"c322e357.b8be8","wires":[["ade1eb2c.468eb8","75f0f4a7.e85dec"]]},{"id":"ade1eb2c.468eb8","type":"success","name":"outcome: 400","xml":"<outcome value=\"400\">","comments":"","outputs":1,"x":512,"y":830,"z":"c322e357.b8be8","wires":[["a91b8e31.5ff52"]]},{"id":"75f0f4a7.e85dec","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":514,"y":905,"z":"c322e357.b8be8","wires":[["d33f3933.4c8b78"]]},{"id":"a91b8e31.5ff52","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":722,"y":836,"z":"c322e357.b8be8","wires":[["9337492c.d201c8"]]},{"id":"d33f3933.4c8b78","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":729,"y":910,"z":"c322e357.b8be8","wires":[["1f02e341.848ead"]]},{"id":"9337492c.d201c8","type":"set","name":"set Status for dispatcher","xml":"<set>\n<parameter name='SvcLogic.status' value='success' />\n<parameter name='output.status.code' value='`$error-code`' />\n<parameter name='output.status.message' value='`$error-message`' />","comments":"","x":955,"y":836,"z":"c322e357.b8be8","wires":[]},{"id":"1f02e341.848ead","type":"set","name":"set Status for dispatcher","xml":"<set>\n<parameter name='SvcLogic.status' value='failure' />\n<parameter name='output.status.code' value='`$error-code`' />\n<parameter name='output.status.message' value='`$error-message`' />\n","comments":"","x":962,"y":916,"z":"c322e357.b8be8","wires":[]},{"id":"c6df868f.aa7308","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=\"`'STATUS RETURNED TO DISPATCHER error-code = ' + $output.status.code`\" />\n<parameter name=\"field3\" value=\"`'STATUS RETURNED TO DISPATCHER error-message = ' + $output.status.message`\" />\n<parameter name=\"field4\" value=\"`'STATUS RETURNED TO DISPATCHER = ' + $SvcLogic.status`\" />","comments":"","outputs":1,"x":273,"y":1116,"z":"c322e357.b8be8","wires":[[]]},{"id":"bc6c421e.60c4b","type":"call","name":"call: GetConfigParams","xml":"<call module=\"APPC\" rpc=\"GetConfigParams\" mode=\"sync\">","comments":"","outputs":1,"x":329,"y":160,"z":"c322e357.b8be8","wires":[["f0d70e02.3a146","9cc63cfb.539a2","ee7268bd.050cd8"]]},{"id":"f0d70e02.3a146","type":"failure","name":"Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":548,"y":262,"z":"c322e357.b8be8","wires":[["86ef19e.3d758e8"]]},{"id":"86ef19e.3d758e8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":716,"y":263,"z":"c322e357.b8be8","wires":[["659a83cd.3ad29c","f91a152c.8ed648"]]},{"id":"9cc63cfb.539a2","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":549,"y":151,"z":"c322e357.b8be8","wires":[["199d1e69.01b822"]]},{"id":"ee7268bd.050cd8","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":547,"y":200,"z":"c322e357.b8be8","wires":[["1a90801b.bb597"]]},{"id":"199d1e69.01b822","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":728,"y":149,"z":"c322e357.b8be8","wires":[[]]},{"id":"1a90801b.bb597","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":722,"y":202,"z":"c322e357.b8be8","wires":[["b99a1084.665dd"]]},{"id":"b99a1084.665dd","type":"set","name":"set error-code","xml":"<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='DG Workflow GetConfigParams not found' />\n","comments":"","x":916,"y":205,"z":"c322e357.b8be8","wires":[]},{"id":"9070d727.d59288","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1296,"y":348,"z":"c322e357.b8be8","wires":[["598408aa.da8188"]]},{"id":"598408aa.da8188","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1464,"y":348,"z":"c322e357.b8be8","wires":[["4733bef3.5975b"]]},{"id":"4733bef3.5975b","type":"set","name":"set error-code","xml":"<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='DG Workflow Configure not found' />\n","comments":"","x":1664,"y":349,"z":"c322e357.b8be8","wires":[]},{"id":"44288c9c.74bae4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1289,"y":399,"z":"c322e357.b8be8","wires":[["e51b2033.d0295"]]},{"id":"e51b2033.d0295","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1470,"y":402,"z":"c322e357.b8be8","wires":[[]]},{"id":"81174cbe.247c4","type":"outcome","name":"ConfigRestore","xml":"<outcome value='ConfigRestore'>\n","comments":"","outputs":1,"x":688,"y":433,"z":"c322e357.b8be8","wires":[["5dff373d.db8a48"]]},{"id":"93c5931.7ab677","type":"call","name":"call: SetStatus","xml":"<call module=\"APPC\" rpc=\"SetStatus\" mode=\"sync\">","comments":"","outputs":1,"x":291,"y":719,"z":"c322e357.b8be8","wires":[["fe31a123.38291","131cb562.b3371b"]]},{"id":"fe31a123.38291","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":481,"y":702,"z":"c322e357.b8be8","wires":[["8823b534.00f5f8"]]},{"id":"8823b534.00f5f8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":667,"y":702,"z":"c322e357.b8be8","wires":[["c84859b3.72e148"]]},{"id":"c84859b3.72e148","type":"set","name":"set error-code","xml":"<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='DG Workflow SetConfigStatus not found' />\n","comments":"","x":855,"y":701,"z":"c322e357.b8be8","wires":[]},{"id":"131cb562.b3371b","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":475,"y":747,"z":"c322e357.b8be8","wires":[["a66046c6.450ae8"]]},{"id":"a66046c6.450ae8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":640,"y":746,"z":"c322e357.b8be8","wires":[[]]},{"id":"e740321c.4b927","type":"failure","name":"Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":606,"y":650,"z":"c322e357.b8be8","wires":[["d03bfb1.6cdfe08"]]},{"id":"ef753c5c.a1a3e","type":"set","name":"set error-code","xml":"<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value=\"`'Invalid action ' + $request-action`\"  />\n","comments":"","x":979,"y":651,"z":"c322e357.b8be8","wires":[]},{"id":"d03bfb1.6cdfe08","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":778,"y":647,"z":"c322e357.b8be8","wires":[["ef753c5c.a1a3e"]]},{"id":"4531bc67.6e9694","type":"outcome","name":"ConfigBackup","xml":"<outcome value='ConfigBackup'>\n","comments":"","outputs":1,"x":678,"y":517,"z":"c322e357.b8be8","wires":[["5dff373d.db8a48"]]},{"id":"4d8d372f.0ebc28","type":"outcome","name":"ConfigBackupDelete","xml":"<outcome value='ConfigBackupDelete'>\n","comments":"","outputs":1,"x":685,"y":567,"z":"c322e357.b8be8","wires":[["5dff373d.db8a48"]]},{"id":"dcac81d6.e4742","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"response\" />\n<parameter name=\"message\" value=\"`$tmp.message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":313.5,"y":1028,"z":"c322e357.b8be8","wires":[["9cff3b81.458148"]]},{"id":"be2f239f.7dc29","type":"set","name":"set tmp.message","xml":"<set>\n<parameter name=\"tmp.message\" value=\"`$output.status.code + ':' + $output.status.message`\" />\n","comments":"","x":296,"y":971,"z":"c322e357.b8be8","wires":[]},{"id":"9cff3b81.458148","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":521,"y":1030,"z":"c322e357.b8be8","wires":[["88b17439.3c8f78"]]},{"id":"88b17439.3c8f78","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":701,"y":1030,"z":"c322e357.b8be8","wires":[[]]},{"id":"f91a152c.8ed648","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":944,"y":267,"z":"c322e357.b8be8","wires":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Configure.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Configure.json
index b817bbf00..196956e12 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Configure.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Configure.json
@@ -1 +1 @@
-[{"id":"480ea5ae.d5651c","type":"dgstart","name":"DGSTART","outputs":1,"x":150,"y":60,"z":"cadfa83f.4d8a88","wires":[["a11357be.658c98"]]},{"id":"a11357be.658c98","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":333,"y":61,"z":"cadfa83f.4d8a88","wires":[["48197593.d501bc"]]},{"id":"48197593.d501bc","type":"method","name":"method Configure","xml":"<method rpc='Configure' mode='sync'>\n","comments":"","outputs":1,"x":531,"y":59,"z":"cadfa83f.4d8a88","wires":[["524e2ac6.d57614"]]},{"id":"524e2ac6.d57614","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":152,"y":118,"z":"cadfa83f.4d8a88","wires":[["60b94849.8fbe08","a08072ec.d21e9","99bebd86.edca2","b4f59168.7906f","33406d49.1ea402","fb8af18a.2b272"]]},{"id":"60b94849.8fbe08","type":"call","name":"call: DownloadConfig","xml":"<call module=\"APPC\" rpc=\"`$tmp.configureactiondg.DOWNLOAD-CONFIG-DG`\" mode=\"sync\">","comments":"","outputs":1,"x":319,"y":1043,"z":"cadfa83f.4d8a88","wires":[["26d0764c.b2c4ea","a1c9c3ac.c65b3","332d5385.b7918c"]]},{"id":"26d0764c.b2c4ea","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":617,"y":983,"z":"cadfa83f.4d8a88","wires":[["9ad20c2f.bb05a"]]},{"id":"a1c9c3ac.c65b3","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":632,"y":1044,"z":"cadfa83f.4d8a88","wires":[["84738e4d.e575"]]},{"id":"332d5385.b7918c","type":"success","name":" success","xml":"<outcome value=\"success\">","comments":"","outputs":1,"x":612,"y":1108,"z":"cadfa83f.4d8a88","wires":[["c166ddbd.547ca"]]},{"id":"9ad20c2f.bb05a","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":809,"y":975,"z":"cadfa83f.4d8a88","wires":[["d8230437.7273e8","b1a8052e.9d5358","e8c161d9.03c09"]]},{"id":"84738e4d.e575","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":797,"y":1045,"z":"cadfa83f.4d8a88","wires":[["1f62ef66.70ec21"]]},{"id":"c166ddbd.547ca","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":813,"y":1103,"z":"cadfa83f.4d8a88","wires":[["1cd207dc.cfc708","d8e99c6.9bb2f6","4cc652f1.8c357c"]]},{"id":"d8230437.7273e8","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-code = ' + $error-code`\" />\n<parameter name=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n","comments":"","outputs":1,"x":1023,"y":810,"z":"cadfa83f.4d8a88","wires":[[]]},{"id":"1f62ef66.70ec21","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 ' + $tmp.configureactiondg.DOWNLOAD-CONFIG-DG + ' not found'`\"/>\n\t","comments":"","x":1005,"y":1041,"z":"cadfa83f.4d8a88","wires":[]},{"id":"1cd207dc.cfc708","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-code = ' + $error-code`\" />\n<parameter name=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n<parameter name=\"field4\" value=\"ACTIVATESUCCESS\" />","comments":"","outputs":1,"x":1016,"y":1100,"z":"cadfa83f.4d8a88","wires":[[]]},{"id":"b1a8052e.9d5358","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t","comments":"","x":1034,"y":993,"z":"cadfa83f.4d8a88","wires":[]},{"id":"33406d49.1ea402","type":"switchNode","name":"switch config-type","xml":"<switch test='`$config-type`'>\n","comments":"","outputs":1,"x":238,"y":512,"z":"cadfa83f.4d8a88","wires":[["4583918a.3e1cf","5016eddc.eaee64"]]},{"id":"4583918a.3e1cf","type":"success","name":"outcome: template","xml":"<outcome value=\"template\">","comments":"","outputs":1,"x":444.5,"y":512,"z":"cadfa83f.4d8a88","wires":[["7d993b7c.7b6f34"]]},{"id":"a08072ec.d21e9","type":"set","name":"set Download params","xml":"<set>\n<parameter name='host-ip-address' value='`$vnf-host-ip-address`' />\n<parameter name='device-login' value='`$device-authentication.USER-NAME`' />\n<parameter name='device-password' value='`$device-authentication.PASSWORD`' />\n<parameter name='port-number' value='`$device-authentication.PORT-NUMBER`' />\n<parameter name='protocol' value='`$tmp.deviceinterfaceprotocol.PROTOCOL`' />\n<parameter name='device-config' value='`$deviceconfig-file-content`' />","comments":"","x":335,"y":954,"z":"cadfa83f.4d8a88","wires":[]},{"id":"99bebd86.edca2","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=\"CONFIGPARAMS\" value=\"`$config-data`\"/>\n<parameter name=\"CONFIGPARAMS1\" value=\"`$block_configuration-parameters`\"/>\n<parameter name=\"TEMPLATENAME\" value=\"`$template-name`\"/>\n<parameter name=\"CONFIGURATION\" value=\"`$configuration`\"/>\n<parameter name=\"CONFIGURATION1\" value=\"`$block_configuration`\"/>\n\n","comments":"","outputs":1,"x":343,"y":107,"z":"cadfa83f.4d8a88","wires":[[]]},{"id":"8f391762.bc0128","type":"call","name":"call: GenerateTemplateConfig","xml":"<call module=\"APPC\" rpc=\"GenerateTemplateConfig\" mode=\"sync\">","comments":"","outputs":1,"x":839.5,"y":596,"z":"cadfa83f.4d8a88","wires":[["2a341f8b.78c7","44ce6236.c9f71c"]]},{"id":"2a341f8b.78c7","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1055.5,"y":585,"z":"cadfa83f.4d8a88","wires":[["99b9e3f3.4a9c3"]]},{"id":"99b9e3f3.4a9c3","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1227.5,"y":583,"z":"cadfa83f.4d8a88","wires":[["fc1b8d44.7676b"]]},{"id":"fc1b8d44.7676b","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 GenerateTemplateConfig not found'`\"/>\n\t","comments":"","x":1409.5,"y":585,"z":"cadfa83f.4d8a88","wires":[]},{"id":"44ce6236.c9f71c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1048.5,"y":631,"z":"cadfa83f.4d8a88","wires":[["65e826ca.d13518"]]},{"id":"65e826ca.d13518","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1208.5,"y":634,"z":"cadfa83f.4d8a88","wires":[["6a5e4bf3.53e254"]]},{"id":"6a5e4bf3.53e254","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t\n\t","comments":"","x":1393.5,"y":634,"z":"cadfa83f.4d8a88","wires":[]},{"id":"ca6cca85.5f74f8","type":"comment","name":"templatename cases","info":"","comments":"","x":562,"y":422,"z":"cadfa83f.4d8a88","wires":[]},{"id":"b58a409e.2bbcb","type":"comment","name":"merge ASDC template and data","info":"","comments":"","x":502,"y":459,"z":"cadfa83f.4d8a88","wires":[]},{"id":"fee64dc4.1d9be","type":"comment","name":"configBlock with or without parameters","info":"","comments":"","x":512,"y":644,"z":"cadfa83f.4d8a88","wires":[]},{"id":"7d993b7c.7b6f34","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":629,"y":513,"z":"cadfa83f.4d8a88","wires":[["8f391762.bc0128","59a0bc37.92e444"]]},{"id":"59a0bc37.92e444","type":"execute","name":"execute getTemplate","xml":"<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"getTemplate\">\n<parameter name=\"fileCategory\" value=\"config_template\" />\n<parameter name=\"responsePrefix\" value=\"config-template\" />","comments":"","outputs":1,"x":834,"y":458,"z":"cadfa83f.4d8a88","wires":[["f0f05e5b.1643a","57b955b6.a7363c"]]},{"id":"f0f05e5b.1643a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1023,"y":486,"z":"cadfa83f.4d8a88","wires":[["919b1a0e.7f8158"]]},{"id":"919b1a0e.7f8158","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1197,"y":494,"z":"cadfa83f.4d8a88","wires":[["41f91d3f.4cdc94"]]},{"id":"41f91d3f.4cdc94","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$config-template.error-message`\"/>\n\t\n\t\n\t","comments":"","x":1400,"y":508,"z":"cadfa83f.4d8a88","wires":[]},{"id":"57b955b6.a7363c","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1034,"y":426,"z":"cadfa83f.4d8a88","wires":[["f7d52240.3f7b9"]]},{"id":"f7d52240.3f7b9","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1215,"y":428,"z":"cadfa83f.4d8a88","wires":[["1af2c5e7.67c0aa"]]},{"id":"1af2c5e7.67c0aa","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 template info\"/>\n\t\n\t\n\t","comments":"","x":1410,"y":432,"z":"cadfa83f.4d8a88","wires":[]},{"id":"5016eddc.eaee64","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":429,"y":688,"z":"cadfa83f.4d8a88","wires":[["27c69859.b17628"]]},{"id":"27c69859.b17628","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":620,"y":686,"z":"cadfa83f.4d8a88","wires":[["31736aaf.d50f16"]]},{"id":"31736aaf.d50f16","type":"call","name":"call: GenerateConfig","xml":"<call module=\"APPC\" rpc=\"GenerateConfig\" mode=\"sync\">","comments":"","outputs":1,"x":836,"y":689,"z":"cadfa83f.4d8a88","wires":[["df338fd9.9e1d5","b78f9a31.550958"]]},{"id":"df338fd9.9e1d5","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1038,"y":683,"z":"cadfa83f.4d8a88","wires":[["d92ec733.6213c8"]]},{"id":"d92ec733.6213c8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1210,"y":685,"z":"cadfa83f.4d8a88","wires":[["be7c9084.d5615"]]},{"id":"be7c9084.d5615","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 GenerateConfig not found'`\"/>\n\t","comments":"","x":1391,"y":687,"z":"cadfa83f.4d8a88","wires":[]},{"id":"b78f9a31.550958","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1026,"y":745,"z":"cadfa83f.4d8a88","wires":[["ab74a39a.05a96"]]},{"id":"ab74a39a.05a96","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1197,"y":748,"z":"cadfa83f.4d8a88","wires":[["deac69f1.1634d8"]]},{"id":"deac69f1.1634d8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t\n\t","comments":"","x":1392,"y":750,"z":"cadfa83f.4d8a88","wires":[]},{"id":"d8e99c6.9bb2f6","type":"set","name":"set error-code 400 and message","xml":"<set>\n<parameter name='error-code' value='400' />\n<parameter name=\"error-message\" value=\"SUCCESS - request has been processed successfully\" />\n","comments":"","x":1078,"y":1152,"z":"cadfa83f.4d8a88","wires":[]},{"id":"7bb3e89d.220328","type":"comment","name":"ConfigCompAdaptor resets error code for success cases","info":"","comments":"","x":633,"y":1154,"z":"cadfa83f.4d8a88","wires":[]},{"id":"b4f59168.7906f","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"Prepare Success\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":369,"y":811,"z":"cadfa83f.4d8a88","wires":[["e86c4a58.ea7bf8"]]},{"id":"4cc652f1.8c357c","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"Download Success\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":1030,"y":1217,"z":"cadfa83f.4d8a88","wires":[["614f4f80.c8d4d"]]},{"id":"ece509d2.9ca6b8","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.openecomp.appc.config.generator.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"`$tmp.message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":1654,"y":984,"z":"cadfa83f.4d8a88","wires":[[]]},{"id":"e707672e.0c50c8","type":"set","name":"set tmp.message","xml":"<set>\n<parameter name='tmp.message' value=\"`'Download Failure : ' + $error-code + ' : ' + $error-message`\" />\n","comments":"","x":1643,"y":917,"z":"cadfa83f.4d8a88","wires":[]},{"id":"e8c161d9.03c09","type":"switchNode","name":"switch: error-code","xml":"<switch test=\"`$error-code`\">\n","comments":"","outputs":1,"x":1051,"y":870,"z":"cadfa83f.4d8a88","wires":[["f74cb5ed.9a8218","78a2372a.1c5678"]]},{"id":"f74cb5ed.9a8218","type":"success","name":"outcome: 400","xml":"<outcome value=\"400\">","comments":"","outputs":1,"x":1255,"y":871,"z":"cadfa83f.4d8a88","wires":[["d36bba51.566648"]]},{"id":"d36bba51.566648","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1440,"y":868,"z":"cadfa83f.4d8a88","wires":[[]]},{"id":"78a2372a.1c5678","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":1261,"y":941,"z":"cadfa83f.4d8a88","wires":[["9de899ed.51ab28"]]},{"id":"9de899ed.51ab28","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1450,"y":942,"z":"cadfa83f.4d8a88","wires":[["e707672e.0c50c8","ece509d2.9ca6b8"]]},{"id":"38899f2c.e6804","type":"comment","name":"ISBC cases returns failure to stop polling","info":"","comments":"","x":1280,"y":827,"z":"cadfa83f.4d8a88","wires":[]},{"id":"614f4f80.c8d4d","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1243,"y":1218,"z":"cadfa83f.4d8a88","wires":[["19ef6421.7c0d0c"]]},{"id":"19ef6421.7c0d0c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1412,"y":1222,"z":"cadfa83f.4d8a88","wires":[[]]},{"id":"e86c4a58.ea7bf8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":567,"y":813,"z":"cadfa83f.4d8a88","wires":[["4fa99aff.ef8d44"]]},{"id":"4fa99aff.ef8d44","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":743,"y":812,"z":"cadfa83f.4d8a88","wires":[[]]},{"id":"fb8af18a.2b272","type":"call","name":"call: ProcessParameterDefinition","xml":"<call module=\"APPC\" rpc=\"ProcessParameterDefinition\" mode=\"sync\">","comments":"","outputs":1,"x":410,"y":158,"z":"cadfa83f.4d8a88","wires":[["45281ac8.fd3ee4","cc966cb3.a4964"]]},{"id":"45281ac8.fd3ee4","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":647,"y":138,"z":"cadfa83f.4d8a88","wires":[["221bff2c.dba47"]]},{"id":"221bff2c.dba47","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":820,"y":136,"z":"cadfa83f.4d8a88","wires":[["45c0c2ac.c894cc"]]},{"id":"45c0c2ac.c894cc","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 ProcessParameterDefinition not found'`\"/>\n\t","comments":"","x":1006,"y":138,"z":"cadfa83f.4d8a88","wires":[]},{"id":"cc966cb3.a4964","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":646,"y":195,"z":"cadfa83f.4d8a88","wires":[["6b712b47.080f44"]]},{"id":"6b712b47.080f44","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":809,"y":199,"z":"cadfa83f.4d8a88","wires":[["5a394136.dbb19"]]},{"id":"5a394136.dbb19","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t\n\t","comments":"","x":1009,"y":199,"z":"cadfa83f.4d8a88","wires":[]}]
+[{"id":"480ea5ae.d5651c","type":"dgstart","name":"DGSTART","outputs":1,"x":150,"y":60,"z":"cadfa83f.4d8a88","wires":[["a11357be.658c98"]]},{"id":"a11357be.658c98","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":333,"y":61,"z":"cadfa83f.4d8a88","wires":[["48197593.d501bc"]]},{"id":"48197593.d501bc","type":"method","name":"method Configure","xml":"<method rpc='Configure' mode='sync'>\n","comments":"","outputs":1,"x":531,"y":59,"z":"cadfa83f.4d8a88","wires":[["524e2ac6.d57614"]]},{"id":"524e2ac6.d57614","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":152,"y":118,"z":"cadfa83f.4d8a88","wires":[["60b94849.8fbe08","a08072ec.d21e9","99bebd86.edca2","b4f59168.7906f","33406d49.1ea402","fb8af18a.2b272"]]},{"id":"60b94849.8fbe08","type":"call","name":"call: DownloadConfig","xml":"<call module=\"APPC\" rpc=\"`$tmp.configureactiondg.DOWNLOAD-CONFIG-DG`\" mode=\"sync\">","comments":"","outputs":1,"x":319,"y":1043,"z":"cadfa83f.4d8a88","wires":[["26d0764c.b2c4ea","a1c9c3ac.c65b3","332d5385.b7918c"]]},{"id":"26d0764c.b2c4ea","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":617,"y":983,"z":"cadfa83f.4d8a88","wires":[["9ad20c2f.bb05a"]]},{"id":"a1c9c3ac.c65b3","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":632,"y":1044,"z":"cadfa83f.4d8a88","wires":[["84738e4d.e575"]]},{"id":"332d5385.b7918c","type":"success","name":" success","xml":"<outcome value=\"success\">","comments":"","outputs":1,"x":612,"y":1108,"z":"cadfa83f.4d8a88","wires":[["c166ddbd.547ca"]]},{"id":"9ad20c2f.bb05a","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":809,"y":975,"z":"cadfa83f.4d8a88","wires":[["d8230437.7273e8","b1a8052e.9d5358","e8c161d9.03c09"]]},{"id":"84738e4d.e575","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":797,"y":1045,"z":"cadfa83f.4d8a88","wires":[["1f62ef66.70ec21"]]},{"id":"c166ddbd.547ca","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":813,"y":1103,"z":"cadfa83f.4d8a88","wires":[["1cd207dc.cfc708","d8e99c6.9bb2f6","4cc652f1.8c357c"]]},{"id":"d8230437.7273e8","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-code = ' + $error-code`\" />\n<parameter name=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n","comments":"","outputs":1,"x":1023,"y":810,"z":"cadfa83f.4d8a88","wires":[[]]},{"id":"1f62ef66.70ec21","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 ' + $tmp.configureactiondg.DOWNLOAD-CONFIG-DG + ' not found'`\"/>\n\t","comments":"","x":1005,"y":1041,"z":"cadfa83f.4d8a88","wires":[]},{"id":"1cd207dc.cfc708","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-code = ' + $error-code`\" />\n<parameter name=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n<parameter name=\"field4\" value=\"ACTIVATESUCCESS\" />","comments":"","outputs":1,"x":1016,"y":1100,"z":"cadfa83f.4d8a88","wires":[[]]},{"id":"b1a8052e.9d5358","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t","comments":"","x":1034,"y":993,"z":"cadfa83f.4d8a88","wires":[]},{"id":"33406d49.1ea402","type":"switchNode","name":"switch config-type","xml":"<switch test='`$config-type`'>\n","comments":"","outputs":1,"x":238,"y":512,"z":"cadfa83f.4d8a88","wires":[["4583918a.3e1cf","5016eddc.eaee64"]]},{"id":"4583918a.3e1cf","type":"success","name":"outcome: template","xml":"<outcome value=\"template\">","comments":"","outputs":1,"x":444.5,"y":512,"z":"cadfa83f.4d8a88","wires":[["7d993b7c.7b6f34"]]},{"id":"a08072ec.d21e9","type":"set","name":"set Download params","xml":"<set>\n<parameter name='host-ip-address' value='`$vnf-host-ip-address`' />\n<parameter name='device-login' value='`$device-authentication.USER-NAME`' />\n<parameter name='device-password' value='`$device-authentication.PASSWORD`' />\n<parameter name='port-number' value='`$device-authentication.PORT-NUMBER`' />\n<parameter name='protocol' value='`$tmp.deviceinterfaceprotocol.PROTOCOL`' />\n<parameter name='device-config' value='`$deviceconfig-file-content`' />","comments":"","x":335,"y":954,"z":"cadfa83f.4d8a88","wires":[]},{"id":"99bebd86.edca2","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=\"CONFIGPARAMS\" value=\"`$config-data`\"/>\n<parameter name=\"CONFIGPARAMS1\" value=\"`$block_configuration-parameters`\"/>\n<parameter name=\"TEMPLATENAME\" value=\"`$template-name`\"/>\n<parameter name=\"CONFIGURATION\" value=\"`$configuration`\"/>\n<parameter name=\"CONFIGURATION1\" value=\"`$block_configuration`\"/>\n\n","comments":"","outputs":1,"x":343,"y":107,"z":"cadfa83f.4d8a88","wires":[[]]},{"id":"8f391762.bc0128","type":"call","name":"call: GenerateTemplateConfig","xml":"<call module=\"APPC\" rpc=\"GenerateTemplateConfig\" mode=\"sync\">","comments":"","outputs":1,"x":839.5,"y":596,"z":"cadfa83f.4d8a88","wires":[["2a341f8b.78c7","44ce6236.c9f71c"]]},{"id":"2a341f8b.78c7","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1055.5,"y":585,"z":"cadfa83f.4d8a88","wires":[["99b9e3f3.4a9c3"]]},{"id":"99b9e3f3.4a9c3","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1227.5,"y":583,"z":"cadfa83f.4d8a88","wires":[["fc1b8d44.7676b"]]},{"id":"fc1b8d44.7676b","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 GenerateTemplateConfig not found'`\"/>\n\t","comments":"","x":1409.5,"y":585,"z":"cadfa83f.4d8a88","wires":[]},{"id":"44ce6236.c9f71c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1048.5,"y":631,"z":"cadfa83f.4d8a88","wires":[["65e826ca.d13518"]]},{"id":"65e826ca.d13518","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1208.5,"y":634,"z":"cadfa83f.4d8a88","wires":[["6a5e4bf3.53e254"]]},{"id":"6a5e4bf3.53e254","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t\n\t","comments":"","x":1393.5,"y":634,"z":"cadfa83f.4d8a88","wires":[]},{"id":"ca6cca85.5f74f8","type":"comment","name":"templatename cases","info":"","comments":"","x":562,"y":422,"z":"cadfa83f.4d8a88","wires":[]},{"id":"b58a409e.2bbcb","type":"comment","name":"merge ASDC template and data","info":"","comments":"","x":502,"y":459,"z":"cadfa83f.4d8a88","wires":[]},{"id":"fee64dc4.1d9be","type":"comment","name":"configBlock with or without parameters","info":"","comments":"","x":512,"y":644,"z":"cadfa83f.4d8a88","wires":[]},{"id":"7d993b7c.7b6f34","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":629,"y":513,"z":"cadfa83f.4d8a88","wires":[["8f391762.bc0128","59a0bc37.92e444"]]},{"id":"59a0bc37.92e444","type":"execute","name":"execute getTemplate","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getTemplate\">\n<parameter name=\"fileCategory\" value=\"config_template\" />\n<parameter name=\"responsePrefix\" value=\"config-template\" />","comments":"","outputs":1,"x":834,"y":458,"z":"cadfa83f.4d8a88","wires":[["f0f05e5b.1643a","57b955b6.a7363c"]]},{"id":"f0f05e5b.1643a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1023,"y":486,"z":"cadfa83f.4d8a88","wires":[["919b1a0e.7f8158"]]},{"id":"919b1a0e.7f8158","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1197,"y":494,"z":"cadfa83f.4d8a88","wires":[["41f91d3f.4cdc94"]]},{"id":"41f91d3f.4cdc94","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$config-template.error-message`\"/>\n\t\n\t\n\t","comments":"","x":1400,"y":508,"z":"cadfa83f.4d8a88","wires":[]},{"id":"57b955b6.a7363c","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1034,"y":426,"z":"cadfa83f.4d8a88","wires":[["f7d52240.3f7b9"]]},{"id":"f7d52240.3f7b9","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1215,"y":428,"z":"cadfa83f.4d8a88","wires":[["1af2c5e7.67c0aa"]]},{"id":"1af2c5e7.67c0aa","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 template info\"/>\n\t\n\t\n\t","comments":"","x":1410,"y":432,"z":"cadfa83f.4d8a88","wires":[]},{"id":"5016eddc.eaee64","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":429,"y":688,"z":"cadfa83f.4d8a88","wires":[["27c69859.b17628"]]},{"id":"27c69859.b17628","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":620,"y":686,"z":"cadfa83f.4d8a88","wires":[["31736aaf.d50f16"]]},{"id":"31736aaf.d50f16","type":"call","name":"call: GenerateConfig","xml":"<call module=\"APPC\" rpc=\"GenerateConfig\" mode=\"sync\">","comments":"","outputs":1,"x":836,"y":689,"z":"cadfa83f.4d8a88","wires":[["df338fd9.9e1d5","b78f9a31.550958"]]},{"id":"df338fd9.9e1d5","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1038,"y":683,"z":"cadfa83f.4d8a88","wires":[["d92ec733.6213c8"]]},{"id":"d92ec733.6213c8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1210,"y":685,"z":"cadfa83f.4d8a88","wires":[["be7c9084.d5615"]]},{"id":"be7c9084.d5615","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 GenerateConfig not found'`\"/>\n\t","comments":"","x":1391,"y":687,"z":"cadfa83f.4d8a88","wires":[]},{"id":"b78f9a31.550958","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1026,"y":745,"z":"cadfa83f.4d8a88","wires":[["ab74a39a.05a96"]]},{"id":"ab74a39a.05a96","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1197,"y":748,"z":"cadfa83f.4d8a88","wires":[["deac69f1.1634d8"]]},{"id":"deac69f1.1634d8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t\n\t","comments":"","x":1392,"y":750,"z":"cadfa83f.4d8a88","wires":[]},{"id":"d8e99c6.9bb2f6","type":"set","name":"set error-code 400 and message","xml":"<set>\n<parameter name='error-code' value='400' />\n<parameter name=\"error-message\" value=\"SUCCESS - request has been processed successfully\" />\n","comments":"","x":1078,"y":1152,"z":"cadfa83f.4d8a88","wires":[]},{"id":"7bb3e89d.220328","type":"comment","name":"ConfigCompAdaptor resets error code for success cases","info":"","comments":"","x":633,"y":1154,"z":"cadfa83f.4d8a88","wires":[]},{"id":"b4f59168.7906f","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=\"Prepare Success\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":369,"y":811,"z":"cadfa83f.4d8a88","wires":[["e86c4a58.ea7bf8"]]},{"id":"4cc652f1.8c357c","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=\"Download Success\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":1030,"y":1217,"z":"cadfa83f.4d8a88","wires":[["614f4f80.c8d4d"]]},{"id":"ece509d2.9ca6b8","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.onap.appc.config.generator.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"`$tmp.message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":1654,"y":984,"z":"cadfa83f.4d8a88","wires":[[]]},{"id":"e707672e.0c50c8","type":"set","name":"set tmp.message","xml":"<set>\n<parameter name='tmp.message' value=\"`'Download Failure : ' + $error-code + ' : ' + $error-message`\" />\n","comments":"","x":1643,"y":917,"z":"cadfa83f.4d8a88","wires":[]},{"id":"e8c161d9.03c09","type":"switchNode","name":"switch: error-code","xml":"<switch test=\"`$error-code`\">\n","comments":"","outputs":1,"x":1051,"y":870,"z":"cadfa83f.4d8a88","wires":[["f74cb5ed.9a8218","78a2372a.1c5678"]]},{"id":"f74cb5ed.9a8218","type":"success","name":"outcome: 400","xml":"<outcome value=\"400\">","comments":"","outputs":1,"x":1255,"y":871,"z":"cadfa83f.4d8a88","wires":[["d36bba51.566648"]]},{"id":"d36bba51.566648","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1440,"y":868,"z":"cadfa83f.4d8a88","wires":[[]]},{"id":"78a2372a.1c5678","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":1261,"y":941,"z":"cadfa83f.4d8a88","wires":[["9de899ed.51ab28"]]},{"id":"9de899ed.51ab28","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1450,"y":942,"z":"cadfa83f.4d8a88","wires":[["e707672e.0c50c8","ece509d2.9ca6b8"]]},{"id":"38899f2c.e6804","type":"comment","name":"ISBC cases returns failure to stop polling","info":"","comments":"","x":1280,"y":827,"z":"cadfa83f.4d8a88","wires":[]},{"id":"614f4f80.c8d4d","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1243,"y":1218,"z":"cadfa83f.4d8a88","wires":[["19ef6421.7c0d0c"]]},{"id":"19ef6421.7c0d0c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1412,"y":1222,"z":"cadfa83f.4d8a88","wires":[[]]},{"id":"e86c4a58.ea7bf8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":567,"y":813,"z":"cadfa83f.4d8a88","wires":[["4fa99aff.ef8d44"]]},{"id":"4fa99aff.ef8d44","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":743,"y":812,"z":"cadfa83f.4d8a88","wires":[[]]},{"id":"fb8af18a.2b272","type":"call","name":"call: ProcessParameterDefinition","xml":"<call module=\"APPC\" rpc=\"ProcessParameterDefinition\" mode=\"sync\">","comments":"","outputs":1,"x":410,"y":158,"z":"cadfa83f.4d8a88","wires":[["45281ac8.fd3ee4","cc966cb3.a4964"]]},{"id":"45281ac8.fd3ee4","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":647,"y":138,"z":"cadfa83f.4d8a88","wires":[["221bff2c.dba47"]]},{"id":"221bff2c.dba47","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":820,"y":136,"z":"cadfa83f.4d8a88","wires":[["45c0c2ac.c894cc"]]},{"id":"45c0c2ac.c894cc","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 ProcessParameterDefinition not found'`\"/>\n\t","comments":"","x":1006,"y":138,"z":"cadfa83f.4d8a88","wires":[]},{"id":"cc966cb3.a4964","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":646,"y":195,"z":"cadfa83f.4d8a88","wires":[["6b712b47.080f44"]]},{"id":"6b712b47.080f44","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":809,"y":199,"z":"cadfa83f.4d8a88","wires":[["5a394136.dbb19"]]},{"id":"5a394136.dbb19","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t\n\t","comments":"","x":1009,"y":199,"z":"cadfa83f.4d8a88","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_CreateSnapShotVM.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_CreateSnapShotVM.json
index 72d423375..ae4393758 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_CreateSnapShotVM.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_CreateSnapShotVM.json
@@ -1 +1 @@
-[{"id":"d52c65e5.f5198","type":"dgstart","name":"DGSTART","outputs":1,"x":176.75,"y":107.75,"z":"30478bde.f2abc4","wires":[["ddb3e53d.f4b2f"]]},{"id":"ddb3e53d.f4b2f","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":364.75,"y":108.75,"z":"30478bde.f2abc4","wires":[["d8340025.194a6"]]},{"id":"d8340025.194a6","type":"method","name":"CreateSnapshotVM","xml":"<method rpc='CreateSnapShotVM' mode='sync'>\n","comments":"","outputs":1,"x":593.7499694824219,"y":109.75,"z":"30478bde.f2abc4","wires":[["d54c9ea.28358e"]]},{"id":"6b99250e.35643c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":930.7499694824219,"y":320.7499694824219,"z":"30478bde.f2abc4","wires":[["397ee930.1e2b1e"]]},{"id":"a43afbad.7e76b","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":939.7499694824219,"y":199.74996948242188,"z":"30478bde.f2abc4","wires":[["7859efa9.a0ac4"]]},{"id":"9f18808f.a11f7","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1486.7499694824219,"y":292.7499694824219,"z":"30478bde.f2abc4","wires":[]},{"id":"5dad8781.d7ba1","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='RPC CreateSnapShot not found' />","comments":"","x":1247.7499694824219,"y":199.74996948242188,"z":"30478bde.f2abc4","wires":[]},{"id":"397ee930.1e2b1e","type":"switchNode","name":"switch error-code","xml":"<switch test='`$error_code`'>\n","comments":"","outputs":1,"x":1123.7499694824219,"y":321.7499694824219,"z":"30478bde.f2abc4","wires":[["1ed28160.fcd10f","7b2975af.e9ca64"]]},{"id":"1ed28160.fcd10f","type":"success","name":"SUCCESS 200","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":1305.7499694824219,"y":291.7499694824219,"z":"30478bde.f2abc4","wires":[["9f18808f.a11f7"]]},{"id":"7b2975af.e9ca64","type":"outcome","name":"ERROR","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1297.7499694824219,"y":450.7499694824219,"z":"30478bde.f2abc4","wires":[["da50f76.9fc8c08"]]},{"id":"da50f76.9fc8c08","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1430.7499694824219,"y":451.7499694824219,"z":"30478bde.f2abc4","wires":[["bc220e8d.e4e278","191f3219.fef8f6"]]},{"id":"bc220e8d.e4e278","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n","comments":"","x":1565.7499694824219,"y":492.75,"z":"30478bde.f2abc4","wires":[]},{"id":"7859efa9.a0ac4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1095.7499694824219,"y":199.74996948242188,"z":"30478bde.f2abc4","wires":[["5dad8781.d7ba1"]]},{"id":"77e88d06.223f64","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.payload = ' + $input.payload`\" />\n<parameter name=\"field3\" value=\"`'vm-id in context=' + $vm-id`\" />","comments":"","outputs":1,"x":876.8666687011719,"y":98.75,"z":"30478bde.f2abc4","wires":[[]]},{"id":"d54c9ea.28358e","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":751.6166687011719,"y":169.61666870117188,"z":"30478bde.f2abc4","wires":[["77e88d06.223f64","d8474535.89d048"]]},{"id":"191f3219.fef8f6","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=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n<parameter name=\"field4\" value=\"`'error-code = ' + $error_code`\" />","comments":"","outputs":1,"x":1555.6166687011719,"y":423.6166687011719,"z":"30478bde.f2abc4","wires":[[]]},{"id":"d8474535.89d048","type":"execute","name":"createSnapshot()","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='createSnapshot'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$vm-id`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$identity-url`\" />","comments":"","outputs":1,"x":767.7499694824219,"y":265.75,"z":"30478bde.f2abc4","wires":[["a43afbad.7e76b","6b99250e.35643c"]]}]
+[{"id":"d52c65e5.f5198","type":"dgstart","name":"DGSTART","outputs":1,"x":176.75,"y":107.75,"z":"30478bde.f2abc4","wires":[["ddb3e53d.f4b2f"]]},{"id":"ddb3e53d.f4b2f","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":364.75,"y":108.75,"z":"30478bde.f2abc4","wires":[["d8340025.194a6"]]},{"id":"d8340025.194a6","type":"method","name":"CreateSnapshotVM","xml":"<method rpc='CreateSnapShotVM' mode='sync'>\n","comments":"","outputs":1,"x":593.7499694824219,"y":109.75,"z":"30478bde.f2abc4","wires":[["d54c9ea.28358e"]]},{"id":"6b99250e.35643c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":930.7499694824219,"y":320.7499694824219,"z":"30478bde.f2abc4","wires":[["397ee930.1e2b1e"]]},{"id":"a43afbad.7e76b","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":939.7499694824219,"y":199.74996948242188,"z":"30478bde.f2abc4","wires":[["7859efa9.a0ac4"]]},{"id":"9f18808f.a11f7","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1486.7499694824219,"y":292.7499694824219,"z":"30478bde.f2abc4","wires":[]},{"id":"5dad8781.d7ba1","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='RPC CreateSnapShot not found' />","comments":"","x":1247.7499694824219,"y":199.74996948242188,"z":"30478bde.f2abc4","wires":[]},{"id":"397ee930.1e2b1e","type":"switchNode","name":"switch error-code","xml":"<switch test='`$error_code`'>\n","comments":"","outputs":1,"x":1123.7499694824219,"y":321.7499694824219,"z":"30478bde.f2abc4","wires":[["1ed28160.fcd10f","7b2975af.e9ca64"]]},{"id":"1ed28160.fcd10f","type":"success","name":"SUCCESS 200","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":1305.7499694824219,"y":291.7499694824219,"z":"30478bde.f2abc4","wires":[["9f18808f.a11f7"]]},{"id":"7b2975af.e9ca64","type":"outcome","name":"ERROR","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1297.7499694824219,"y":450.7499694824219,"z":"30478bde.f2abc4","wires":[["da50f76.9fc8c08"]]},{"id":"da50f76.9fc8c08","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1430.7499694824219,"y":451.7499694824219,"z":"30478bde.f2abc4","wires":[["bc220e8d.e4e278","191f3219.fef8f6"]]},{"id":"bc220e8d.e4e278","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n","comments":"","x":1565.7499694824219,"y":492.75,"z":"30478bde.f2abc4","wires":[]},{"id":"7859efa9.a0ac4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1095.7499694824219,"y":199.74996948242188,"z":"30478bde.f2abc4","wires":[["5dad8781.d7ba1"]]},{"id":"77e88d06.223f64","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.payload = ' + $input.payload`\" />\n<parameter name=\"field3\" value=\"`'vm-id in context=' + $vm-id`\" />","comments":"","outputs":1,"x":876.8666687011719,"y":98.75,"z":"30478bde.f2abc4","wires":[[]]},{"id":"d54c9ea.28358e","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":751.6166687011719,"y":169.61666870117188,"z":"30478bde.f2abc4","wires":[["77e88d06.223f64","d8474535.89d048"]]},{"id":"191f3219.fef8f6","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=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n<parameter name=\"field4\" value=\"`'error-code = ' + $error_code`\" />","comments":"","outputs":1,"x":1555.6166687011719,"y":423.6166687011719,"z":"30478bde.f2abc4","wires":[[]]},{"id":"d8474535.89d048","type":"execute","name":"createSnapshot()","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='createSnapshot'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$vm-id`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$identity-url`\" />","comments":"","outputs":1,"x":767.7499694824219,"y":265.75,"z":"30478bde.f2abc4","wires":[["a43afbad.7e76b","6b99250e.35643c"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DGOrchestrator.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DGOrchestrator.json
index e9b2b1aef..ff471974c 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DGOrchestrator.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DGOrchestrator.json
@@ -114,7 +114,7 @@
             ]
         ],
         "x": 1850.5411643981934,
-        "xml": "<execute plugin=\"org.openecomp.appc.flow.controller.node.FlowControlNode\" method=\"processFlow\">\n<parameter name=\"messageType\" value=\"response\" />\n<parameter name=\"message\" value=\"`$tmp.message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.flowControl\" />\n",
+        "xml": "<execute plugin=\"org.onap.appc.flow.controller.node.FlowControlNode\" method=\"processFlow\">\n<parameter name=\"messageType\" value=\"response\" />\n<parameter name=\"message\" value=\"`$tmp.message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.flowControl\" />\n",
         "y": 327.96586418151855,
         "z": "7aa4b695.11473"
     },
@@ -202,7 +202,7 @@
             ]
         ],
         "x": 314.2475776672363,
-        "xml": "<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"response\" />\n<parameter name=\"message\" value=\"`$tmp.message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n",
+        "xml": "<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"response\" />\n<parameter name=\"message\" value=\"`$tmp.message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n",
         "y": 1005.7912883758545,
         "z": "7aa4b695.11473"
     },
@@ -444,7 +444,7 @@
             ]
         ],
         "x": 831.6644706726074,
-        "xml": "<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"getCapability\">\n<parameter name=\"caplevel\" value=\"`$action-level`\" />\n<parameter name=\"checkCapability\" value=\"`$request-action`\" />\n<parameter name=\"vnf-type\" value=\"`$vnf-type`\" />\n\n",
+        "xml": "<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getCapability\">\n<parameter name=\"caplevel\" value=\"`$action-level`\" />\n<parameter name=\"checkCapability\" value=\"`$request-action`\" />\n<parameter name=\"vnf-type\" value=\"`$vnf-type`\" />\n\n",
         "y": 463.6523542404175,
         "z": "7aa4b695.11473"
     },
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadCliConfig.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadCliConfig.json
index 4aff6061b..be68a52af 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadCliConfig.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadCliConfig.json
@@ -1 +1 @@
-[{"id":"cc3f1f05.590e2","type":"dgstart","name":"DGSTART","outputs":1,"x":262,"y":117,"z":"8f971cf0.9ab5c","wires":[["9c5ed558.935128"]]},{"id":"9c5ed558.935128","type":"service-logic","name":"APPC 4.0.0","module":"APPC","version":"3.1.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":475,"y":114,"z":"8f971cf0.9ab5c","wires":[["3cae3899.2ea4d8"]]},{"id":"3cae3899.2ea4d8","type":"method","name":"method DownloadCLIConfig","xml":"<method rpc='DownloadCliConfig' mode='sync'>\n","comments":"","outputs":1,"x":703,"y":114,"z":"8f971cf0.9ab5c","wires":[["b932981.f2fe068"]]},{"id":"838fcb2d.61bce8","type":"execute","name":"execute : Download Configuration","xml":"<configure adaptor='org.openecomp.appc.ccadaptor.ConfigComponentAdaptor' key='DownloadCliConfig'>\n<parameter name=\"Download_config_template\" value=\"`$download-config-template.TEMPLATE`\"/>\n<parameter name=\"Config_contents\" value=\"`$device-config`\"/>\n<parameter name=\"Host_ip_address\" value=\"`$host-ip-address`\" />\n<parameter name=\"User_name\" value=\"`$device-login`\" />\n<parameter name=\"Password\" value=\"`$device-password`\" />\n<parameter name=\"Port_number\" value=\"`$port-number`\" />\n\n\n","comments":"","outputs":1,"x":411,"y":456,"z":"8f971cf0.9ab5c","wires":[["d050e0d2.b2267","84bb3919.ad5688","4cbf4207.52ffdc"]]},{"id":"d050e0d2.b2267","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":697,"y":611,"z":"8f971cf0.9ab5c","wires":[["2181b8c9.4f5038"]]},{"id":"b932981.f2fe068","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":178,"y":270,"z":"8f971cf0.9ab5c","wires":[["1ec47089.0e6d1f"]]},{"id":"2181b8c9.4f5038","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<!-- Dont over write error code and message -->\n","comments":"","x":905,"y":610,"z":"8f971cf0.9ab5c","wires":[]},{"id":"84bb3919.ad5688","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":791,"y":406,"z":"8f971cf0.9ab5c","wires":[["d912ec9e.456d4"]]},{"id":"4cbf4207.52ffdc","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":776,"y":513,"z":"8f971cf0.9ab5c","wires":[["d29269ef.626db8"]]},{"id":"d29269ef.626db8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":957,"y":471,"z":"8f971cf0.9ab5c","wires":[["cae99c12.7fa8f"]]},{"id":"d912ec9e.456d4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":949,"y":402,"z":"8f971cf0.9ab5c","wires":[["8c7e5c1f.d6d09"]]},{"id":"8c7e5c1f.d6d09","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1108,"y":402,"z":"8f971cf0.9ab5c","wires":[]},{"id":"cae99c12.7fa8f","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"Unable to Download CLI Config to Device\" />\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1116,"y":471,"z":"8f971cf0.9ab5c","wires":[]},{"id":"af8106d6.2c54e8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"Unable to get download config template\" />\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1225,"y":277,"z":"8f971cf0.9ab5c","wires":[]},{"id":"1ec47089.0e6d1f","type":"get-resource","name":"get-resource DOWNLOAD_CONFIG_TEMPLATE","xml":"<get-resource\n\tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey=\"SELECT TEMPLATE FROM DOWNLOAD_CONFIG_TEMPLATE WHERE vnf_type = $vnf-type ;\"\n    force='true'\n\tpfx='download-config-template'>\n","comments":"","outputs":1,"x":485,"y":267,"z":"8f971cf0.9ab5c","wires":[["fe1132ad.5731b","9280f34d.3465f","54bd663f.2cab28"]]},{"id":"9280f34d.3465f","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":831,"y":254,"z":"8f971cf0.9ab5c","wires":[["75516ff4.5cb1"]]},{"id":"fe1132ad.5731b","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":833,"y":323,"z":"8f971cf0.9ab5c","wires":[["75516ff4.5cb1"]]},{"id":"75516ff4.5cb1","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1027,"y":278,"z":"8f971cf0.9ab5c","wires":[["af8106d6.2c54e8"]]},{"id":"54bd663f.2cab28","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":422,"y":350,"z":"8f971cf0.9ab5c","wires":[["46aaf503.56738c"]]},{"id":"46aaf503.56738c","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":615,"y":349,"z":"8f971cf0.9ab5c","wires":[["838fcb2d.61bce8"]]}]
+[{"id":"cc3f1f05.590e2","type":"dgstart","name":"DGSTART","outputs":1,"x":262,"y":117,"z":"8f971cf0.9ab5c","wires":[["9c5ed558.935128"]]},{"id":"9c5ed558.935128","type":"service-logic","name":"APPC 4.0.0","module":"APPC","version":"3.1.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":475,"y":114,"z":"8f971cf0.9ab5c","wires":[["3cae3899.2ea4d8"]]},{"id":"3cae3899.2ea4d8","type":"method","name":"method DownloadCLIConfig","xml":"<method rpc='DownloadCliConfig' mode='sync'>\n","comments":"","outputs":1,"x":703,"y":114,"z":"8f971cf0.9ab5c","wires":[["b932981.f2fe068"]]},{"id":"838fcb2d.61bce8","type":"execute","name":"execute : Download Configuration","xml":"<configure adaptor='org.onap.appc.ccadaptor.ConfigComponentAdaptor' key='DownloadCliConfig'>\n<parameter name=\"Download_config_template\" value=\"`$download-config-template.TEMPLATE`\"/>\n<parameter name=\"Config_contents\" value=\"`$device-config`\"/>\n<parameter name=\"Host_ip_address\" value=\"`$host-ip-address`\" />\n<parameter name=\"User_name\" value=\"`$device-login`\" />\n<parameter name=\"Password\" value=\"`$device-password`\" />\n<parameter name=\"Port_number\" value=\"`$port-number`\" />\n\n\n","comments":"","outputs":1,"x":411,"y":456,"z":"8f971cf0.9ab5c","wires":[["d050e0d2.b2267","84bb3919.ad5688","4cbf4207.52ffdc"]]},{"id":"d050e0d2.b2267","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":697,"y":611,"z":"8f971cf0.9ab5c","wires":[["2181b8c9.4f5038"]]},{"id":"b932981.f2fe068","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":178,"y":270,"z":"8f971cf0.9ab5c","wires":[["1ec47089.0e6d1f"]]},{"id":"2181b8c9.4f5038","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<!-- Dont over write error code and message -->\n","comments":"","x":905,"y":610,"z":"8f971cf0.9ab5c","wires":[]},{"id":"84bb3919.ad5688","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":791,"y":406,"z":"8f971cf0.9ab5c","wires":[["d912ec9e.456d4"]]},{"id":"4cbf4207.52ffdc","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":776,"y":513,"z":"8f971cf0.9ab5c","wires":[["d29269ef.626db8"]]},{"id":"d29269ef.626db8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":957,"y":471,"z":"8f971cf0.9ab5c","wires":[["cae99c12.7fa8f"]]},{"id":"d912ec9e.456d4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":949,"y":402,"z":"8f971cf0.9ab5c","wires":[["8c7e5c1f.d6d09"]]},{"id":"8c7e5c1f.d6d09","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1108,"y":402,"z":"8f971cf0.9ab5c","wires":[]},{"id":"cae99c12.7fa8f","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"Unable to Download CLI Config to Device\" />\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1116,"y":471,"z":"8f971cf0.9ab5c","wires":[]},{"id":"af8106d6.2c54e8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"Unable to get download config template\" />\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1225,"y":277,"z":"8f971cf0.9ab5c","wires":[]},{"id":"1ec47089.0e6d1f","type":"get-resource","name":"get-resource DOWNLOAD_CONFIG_TEMPLATE","xml":"<get-resource\n\tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey=\"SELECT TEMPLATE FROM DOWNLOAD_CONFIG_TEMPLATE WHERE vnf_type = $vnf-type ;\"\n    force='true'\n\tpfx='download-config-template'>\n","comments":"","outputs":1,"x":485,"y":267,"z":"8f971cf0.9ab5c","wires":[["fe1132ad.5731b","9280f34d.3465f","54bd663f.2cab28"]]},{"id":"9280f34d.3465f","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":831,"y":254,"z":"8f971cf0.9ab5c","wires":[["75516ff4.5cb1"]]},{"id":"fe1132ad.5731b","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":833,"y":323,"z":"8f971cf0.9ab5c","wires":[["75516ff4.5cb1"]]},{"id":"75516ff4.5cb1","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1027,"y":278,"z":"8f971cf0.9ab5c","wires":[["af8106d6.2c54e8"]]},{"id":"54bd663f.2cab28","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":422,"y":350,"z":"8f971cf0.9ab5c","wires":[["46aaf503.56738c"]]},{"id":"46aaf503.56738c","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":615,"y":349,"z":"8f971cf0.9ab5c","wires":[["838fcb2d.61bce8"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadIsbcConfig.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadIsbcConfig.json
index f8a7b5737..54499c934 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadIsbcConfig.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadIsbcConfig.json
@@ -1 +1 @@
-[{"id":"eb3345bc.1c6008","type":"dgstart","name":"DGSTART","outputs":1,"x":160,"y":114,"z":"e64f9575.c955b8","wires":[["48829488.85508c"]]},{"id":"48829488.85508c","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":342.1667022705078,"y":110.66668701171875,"z":"e64f9575.c955b8","wires":[["e0a3d8ff.542978"]]},{"id":"e0a3d8ff.542978","type":"method","name":"method DownloadIsbcConfig","xml":"<method rpc='DownloadIsbcConfig' mode='sync'>\n","comments":"","outputs":1,"x":612.5000305175781,"y":107.33334350585938,"z":"e64f9575.c955b8","wires":[["114a3b97.bcbcc4"]]},{"id":"114a3b97.bcbcc4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":127.25,"y":174.88888549804688,"z":"e64f9575.c955b8","wires":[["83df5118.b8ab3","7075ec58.bf47f4","b6692cc9.1d46f"]]},{"id":"83df5118.b8ab3","type":"configure","name":"configure: SftpAdaptor: Put config","xml":"<configure adaptor=\"org.openecomp.appc.ccadaptor.ConfigComponentAdaptor\" key=\"put\">\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=\"data\" value=\"`$deviceconfig-file-content`\"/>\t\n<parameter name=\"fullPathFileName\" value=\"`$configfilereference-deviceconfig.TARGET-FILE-PATH`\"/>\t\n\n\n","comments":"","outputs":1,"x":451.06817626953125,"y":388.2281188964844,"z":"e64f9575.c955b8","wires":[["b2f45988.44cff8","b0981c87.9858"]]},{"id":"b2f45988.44cff8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":731.0681762695312,"y":365.2281188964844,"z":"e64f9575.c955b8","wires":[["7119a88b.f78748"]]},{"id":"7119a88b.f78748","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":915.0681762695312,"y":370.2281188964844,"z":"e64f9575.c955b8","wires":[["dd3ffa1.5c71708","cb21b493.06d748"]]},{"id":"7075ec58.bf47f4","type":"call","name":"call: CheckConfigStatus","xml":"<call module=\"APPC\" rpc=\"CheckConfigStatus\" mode=\"sync\">","comments":"","outputs":1,"x":426.06817626953125,"y":619.2281188964844,"z":"e64f9575.c955b8","wires":[["d5aabd81.471ee"]]},{"id":"dd3ffa1.5c71708","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"error-code\" value=\"401\"/>\n","comments":"","x":1131.25,"y":426.8888854980469,"z":"e64f9575.c955b8","wires":[]},{"id":"b0981c87.9858","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":729,"y":517.0000305175781,"z":"e64f9575.c955b8","wires":[["b7e9dc8a.54fff"]]},{"id":"b7e9dc8a.54fff","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":902,"y":521.0000305175781,"z":"e64f9575.c955b8","wires":[["169463d2.10edfc"]]},{"id":"169463d2.10edfc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"error-code\" value=\"401\"/>\n<parameter name=\"error-message\" value=\"DG Failure.Unable to Call Sftp Adaptor for Config\"/>","comments":"","x":1094,"y":521.0000305175781,"z":"e64f9575.c955b8","wires":[]},{"id":"cb21b493.06d748","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=\"host\" value=\"`$vnf-host-ip-address`\"/>\n<parameter name=\"SFTPERRORCODE\" value=\"`$error-code`\"/>\n<parameter name=\"SFTPERRORMESSAGE\" value=\"`$error-message`\"/>\n\n\n\n\n\n","comments":"","outputs":1,"x":1128,"y":327.0000305175781,"z":"e64f9575.c955b8","wires":[[]]},{"id":"67dd3158.9d315","type":"failure","name":"failure","xml":"<outcome value='failure'>","comments":"","outputs":1,"x":635,"y":625.3333435058594,"z":"e64f9575.c955b8","wires":[["153f64f9.4e677b"]]},{"id":"153f64f9.4e677b","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":802,"y":625.3333435058594,"z":"e64f9575.c955b8","wires":[["2ba04af9.5b58c6"]]},{"id":"2ba04af9.5b58c6","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=\"field3\" value=\"CONTINUE THE FLOW\"/>\n\n","comments":"","outputs":1,"x":996,"y":620.3333435058594,"z":"e64f9575.c955b8","wires":[[]]},{"id":"d5aabd81.471ee","type":"failure","name":"not-found","xml":"<outcome value='not-found'>","comments":"","outputs":1,"x":636,"y":680.3333435058594,"z":"e64f9575.c955b8","wires":[["b6627066.5ac24"]]},{"id":"b6627066.5ac24","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":811,"y":683.3333435058594,"z":"e64f9575.c955b8","wires":[["8f7d48e.816bcb8"]]},{"id":"8f7d48e.816bcb8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"error-code\" value=\"401\"/>\n<parameter name=\"error-message\" value=\"DG Workflow RetryActivate not found\"/>","comments":"","x":1009,"y":681.3333435058594,"z":"e64f9575.c955b8","wires":[]},{"id":"b6692cc9.1d46f","type":"execute","name":"execute getConfigFileReference","xml":"<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"getConfigFileReference\">\n<parameter name=\"responsePrefix\" value=\"tmp.configfilereference\" />\n","comments":"","outputs":1,"x":423,"y":253,"z":"e64f9575.c955b8","wires":[["f431fc4b.07dbd","6aa707f2.3962d8"]]},{"id":"f431fc4b.07dbd","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":664,"y":256,"z":"e64f9575.c955b8","wires":[["490891c5.5ce3c"]]},{"id":"490891c5.5ce3c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":821,"y":259,"z":"e64f9575.c955b8","wires":[["b38dc0b2.00fff"]]},{"id":"b38dc0b2.00fff","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.configfilereference.error-message`\"/>","comments":"","x":1007,"y":264,"z":"e64f9575.c955b8","wires":[]},{"id":"6aa707f2.3962d8","type":"failure","name":"not-found","xml":"<outcome value='not-found'>","comments":"","outputs":1,"x":666,"y":308,"z":"e64f9575.c955b8","wires":[["e505c188.60085"]]},{"id":"e505c188.60085","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":818,"y":311,"z":"e64f9575.c955b8","wires":[["e3e69cb8.26078"]]},{"id":"e3e69cb8.26078","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"error-code\" value=\"401\"/>\n<parameter name=\"error-message\" value=\"Unable to get data from config_file_reference\"/>","comments":"","x":965,"y":312,"z":"e64f9575.c955b8","wires":[]}]
+[{"id":"eb3345bc.1c6008","type":"dgstart","name":"DGSTART","outputs":1,"x":160,"y":114,"z":"e64f9575.c955b8","wires":[["48829488.85508c"]]},{"id":"48829488.85508c","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":342.1667022705078,"y":110.66668701171875,"z":"e64f9575.c955b8","wires":[["e0a3d8ff.542978"]]},{"id":"e0a3d8ff.542978","type":"method","name":"method DownloadIsbcConfig","xml":"<method rpc='DownloadIsbcConfig' mode='sync'>\n","comments":"","outputs":1,"x":612.5000305175781,"y":107.33334350585938,"z":"e64f9575.c955b8","wires":[["114a3b97.bcbcc4"]]},{"id":"114a3b97.bcbcc4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":127.25,"y":174.88888549804688,"z":"e64f9575.c955b8","wires":[["83df5118.b8ab3","7075ec58.bf47f4","b6692cc9.1d46f"]]},{"id":"83df5118.b8ab3","type":"configure","name":"configure: SftpAdaptor: Put config","xml":"<configure adaptor=\"org.onap.appc.ccadaptor.ConfigComponentAdaptor\" key=\"put\">\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=\"data\" value=\"`$deviceconfig-file-content`\"/>\t\n<parameter name=\"fullPathFileName\" value=\"`$configfilereference-deviceconfig.TARGET-FILE-PATH`\"/>\t\n\n\n","comments":"","outputs":1,"x":451.06817626953125,"y":388.2281188964844,"z":"e64f9575.c955b8","wires":[["b2f45988.44cff8","b0981c87.9858"]]},{"id":"b2f45988.44cff8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":731.0681762695312,"y":365.2281188964844,"z":"e64f9575.c955b8","wires":[["7119a88b.f78748"]]},{"id":"7119a88b.f78748","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":915.0681762695312,"y":370.2281188964844,"z":"e64f9575.c955b8","wires":[["dd3ffa1.5c71708","cb21b493.06d748"]]},{"id":"7075ec58.bf47f4","type":"call","name":"call: CheckConfigStatus","xml":"<call module=\"APPC\" rpc=\"CheckConfigStatus\" mode=\"sync\">","comments":"","outputs":1,"x":426.06817626953125,"y":619.2281188964844,"z":"e64f9575.c955b8","wires":[["d5aabd81.471ee"]]},{"id":"dd3ffa1.5c71708","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"error-code\" value=\"401\"/>\n","comments":"","x":1131.25,"y":426.8888854980469,"z":"e64f9575.c955b8","wires":[]},{"id":"b0981c87.9858","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":729,"y":517.0000305175781,"z":"e64f9575.c955b8","wires":[["b7e9dc8a.54fff"]]},{"id":"b7e9dc8a.54fff","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":902,"y":521.0000305175781,"z":"e64f9575.c955b8","wires":[["169463d2.10edfc"]]},{"id":"169463d2.10edfc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"error-code\" value=\"401\"/>\n<parameter name=\"error-message\" value=\"DG Failure.Unable to Call Sftp Adaptor for Config\"/>","comments":"","x":1094,"y":521.0000305175781,"z":"e64f9575.c955b8","wires":[]},{"id":"cb21b493.06d748","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=\"host\" value=\"`$vnf-host-ip-address`\"/>\n<parameter name=\"SFTPERRORCODE\" value=\"`$error-code`\"/>\n<parameter name=\"SFTPERRORMESSAGE\" value=\"`$error-message`\"/>\n\n\n\n\n\n","comments":"","outputs":1,"x":1128,"y":327.0000305175781,"z":"e64f9575.c955b8","wires":[[]]},{"id":"67dd3158.9d315","type":"failure","name":"failure","xml":"<outcome value='failure'>","comments":"","outputs":1,"x":635,"y":625.3333435058594,"z":"e64f9575.c955b8","wires":[["153f64f9.4e677b"]]},{"id":"153f64f9.4e677b","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":802,"y":625.3333435058594,"z":"e64f9575.c955b8","wires":[["2ba04af9.5b58c6"]]},{"id":"2ba04af9.5b58c6","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=\"field3\" value=\"CONTINUE THE FLOW\"/>\n\n","comments":"","outputs":1,"x":996,"y":620.3333435058594,"z":"e64f9575.c955b8","wires":[[]]},{"id":"d5aabd81.471ee","type":"failure","name":"not-found","xml":"<outcome value='not-found'>","comments":"","outputs":1,"x":636,"y":680.3333435058594,"z":"e64f9575.c955b8","wires":[["b6627066.5ac24"]]},{"id":"b6627066.5ac24","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":811,"y":683.3333435058594,"z":"e64f9575.c955b8","wires":[["8f7d48e.816bcb8"]]},{"id":"8f7d48e.816bcb8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"error-code\" value=\"401\"/>\n<parameter name=\"error-message\" value=\"DG Workflow RetryActivate not found\"/>","comments":"","x":1009,"y":681.3333435058594,"z":"e64f9575.c955b8","wires":[]},{"id":"b6692cc9.1d46f","type":"execute","name":"execute getConfigFileReference","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getConfigFileReference\">\n<parameter name=\"responsePrefix\" value=\"tmp.configfilereference\" />\n","comments":"","outputs":1,"x":423,"y":253,"z":"e64f9575.c955b8","wires":[["f431fc4b.07dbd","6aa707f2.3962d8"]]},{"id":"f431fc4b.07dbd","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":664,"y":256,"z":"e64f9575.c955b8","wires":[["490891c5.5ce3c"]]},{"id":"490891c5.5ce3c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":821,"y":259,"z":"e64f9575.c955b8","wires":[["b38dc0b2.00fff"]]},{"id":"b38dc0b2.00fff","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.configfilereference.error-message`\"/>","comments":"","x":1007,"y":264,"z":"e64f9575.c955b8","wires":[]},{"id":"6aa707f2.3962d8","type":"failure","name":"not-found","xml":"<outcome value='not-found'>","comments":"","outputs":1,"x":666,"y":308,"z":"e64f9575.c955b8","wires":[["e505c188.60085"]]},{"id":"e505c188.60085","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":818,"y":311,"z":"e64f9575.c955b8","wires":[["e3e69cb8.26078"]]},{"id":"e3e69cb8.26078","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"error-code\" value=\"401\"/>\n<parameter name=\"error-message\" value=\"Unable to get data from config_file_reference\"/>","comments":"","x":965,"y":312,"z":"e64f9575.c955b8","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadSBGConfig.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadSBGConfig.json
index 0f99ae796..3e628cdb7 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadSBGConfig.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadSBGConfig.json
@@ -1 +1 @@
-[{"id":"feea8c0f.99cea","type":"dgstart","name":"DGSTART","outputs":1,"x":174,"y":159,"z":"7a568ea5.52b07","wires":[["2fe1975f.6b6288"]]},{"id":"2fe1975f.6b6288","type":"service-logic","name":"APPC 4.0.0","module":"APPC","version":"3.1.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":351,"y":158,"z":"7a568ea5.52b07","wires":[["b943522e.8d306"]]},{"id":"b943522e.8d306","type":"method","name":"method DownloadSBGConfig","xml":"<method rpc='DownloadSBGConfig' mode='sync'>\n","comments":"","outputs":1,"x":580,"y":158,"z":"7a568ea5.52b07","wires":[["4ddd2ec1.7fc8d"]]},{"id":"addce3cc.d1b1a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":701,"y":594,"z":"7a568ea5.52b07","wires":[["6bee2910.0e32c8"]]},{"id":"724dd10a.2dcb2","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":823,"y":263,"z":"7a568ea5.52b07","wires":[["fe0ad156.02b64"]]},{"id":"dab463be.ebfdb","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":833,"y":314,"z":"7a568ea5.52b07","wires":[["e6658a4.7b23878"]]},{"id":"fe0ad156.02b64","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":986,"y":285,"z":"7a568ea5.52b07","wires":[["f1bee661.c07688"]]},{"id":"f1bee661.c07688","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1145,"y":285,"z":"7a568ea5.52b07","wires":[]},{"id":"6bee2910.0e32c8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<!-- Dont over write error code and message -->\n","comments":"","x":971,"y":605,"z":"7a568ea5.52b07","wires":[]},{"id":"e6658a4.7b23878","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":994,"y":354,"z":"7a568ea5.52b07","wires":[["bb929331.e8df4"]]},{"id":"bb929331.e8df4","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"Failed in SBG Config Data Generation from XSL Template.\" />\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1153,"y":354,"z":"7a568ea5.52b07","wires":[]},{"id":"4ddd2ec1.7fc8d","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":262,"y":324,"z":"7a568ea5.52b07","wires":[["c9835662.80d108"]]},{"id":"c9835662.80d108","type":"configure","name":"configure: ConfigRequest","xml":"<execute plugin=\"org.openecomp.appc.config.generator.node.ConfigGeneratorNode\" method=\"generateConfig\">\n<parameter name=\"requestData\" value=\"`$device-config`\" />\n<parameter name=\"requestId\" value=\"`$request-id`\" />\n<parameter name=\"vnfType\" value=\"`$vnf-type`\" />\n<parameter name=\"requestAction\" value=\"`$request-action`\" />\n\n","comments":"","outputs":1,"x":530,"y":306.72222900390625,"z":"7a568ea5.52b07","wires":[["724dd10a.2dcb2","dab463be.ebfdb","661f9b55.49eef4"]]},{"id":"3e1ce578.4e621a","type":"configure","name":"configure: DeviceRequest","xml":"<execute plugin=\"org.openecomp.appc.device.interfaces.node.DeviceRequestProcessorNode\" method=\"processDeviceRequest\">\n<parameter name=\"requestId\" value=\"`$request-id`\" />\n<parameter name=\"vnfType\" value=\"`$vnf-type`\" />\n<parameter name=\"requestAction\" value=\"`$request-action`\" />\n<parameter name=\"hostname\" value=\"`$host-ip-address`\" />\n<parameter name=\"username\" value=\"`$device-login`\" />\n<parameter name=\"password\" value=\"`$device-password`\" />\n<parameter name=\"portNumber\" value=\"`$port-number`\" />\n<!--parameter name=\"netconfUsername\" value=\"`$device-login`\" />\n<parameter name=\"netconfPassword\" value=\"`$port-password`\" />\n<parameter name=\"netconfPortNumber\" value=\"830\" /-->\n\n","comments":"","outputs":1,"x":415,"y":490.72222900390625,"z":"7a568ea5.52b07","wires":[["45e3f24b.c7be4c","3033f064.d00c3","addce3cc.d1b1a"]]},{"id":"661f9b55.49eef4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":582,"y":381,"z":"7a568ea5.52b07","wires":[["3e1ce578.4e621a"]]},{"id":"45e3f24b.c7be4c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":704,"y":446,"z":"7a568ea5.52b07","wires":[["bcd76242.4c6ad"]]},{"id":"3033f064.d00c3","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":714,"y":497,"z":"7a568ea5.52b07","wires":[["5c38315c.a32dd"]]},{"id":"bcd76242.4c6ad","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":867,"y":468,"z":"7a568ea5.52b07","wires":[["6de6909e.1110d"]]},{"id":"6de6909e.1110d","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1026,"y":468,"z":"7a568ea5.52b07","wires":[]},{"id":"5c38315c.a32dd","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":875,"y":537,"z":"7a568ea5.52b07","wires":[["6e521d00.9a9f84"]]},{"id":"6e521d00.9a9f84","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"Unable to Download Config to Device\" />\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1034,"y":537,"z":"7a568ea5.52b07","wires":[]}]
+[{"id":"feea8c0f.99cea","type":"dgstart","name":"DGSTART","outputs":1,"x":174,"y":159,"z":"7a568ea5.52b07","wires":[["2fe1975f.6b6288"]]},{"id":"2fe1975f.6b6288","type":"service-logic","name":"APPC 4.0.0","module":"APPC","version":"3.1.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":351,"y":158,"z":"7a568ea5.52b07","wires":[["b943522e.8d306"]]},{"id":"b943522e.8d306","type":"method","name":"method DownloadSBGConfig","xml":"<method rpc='DownloadSBGConfig' mode='sync'>\n","comments":"","outputs":1,"x":580,"y":158,"z":"7a568ea5.52b07","wires":[["4ddd2ec1.7fc8d"]]},{"id":"addce3cc.d1b1a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":701,"y":594,"z":"7a568ea5.52b07","wires":[["6bee2910.0e32c8"]]},{"id":"724dd10a.2dcb2","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":823,"y":263,"z":"7a568ea5.52b07","wires":[["fe0ad156.02b64"]]},{"id":"dab463be.ebfdb","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":833,"y":314,"z":"7a568ea5.52b07","wires":[["e6658a4.7b23878"]]},{"id":"fe0ad156.02b64","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":986,"y":285,"z":"7a568ea5.52b07","wires":[["f1bee661.c07688"]]},{"id":"f1bee661.c07688","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1145,"y":285,"z":"7a568ea5.52b07","wires":[]},{"id":"6bee2910.0e32c8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<!-- Dont over write error code and message -->\n","comments":"","x":971,"y":605,"z":"7a568ea5.52b07","wires":[]},{"id":"e6658a4.7b23878","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":994,"y":354,"z":"7a568ea5.52b07","wires":[["bb929331.e8df4"]]},{"id":"bb929331.e8df4","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"Failed in SBG Config Data Generation from XSL Template.\" />\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1153,"y":354,"z":"7a568ea5.52b07","wires":[]},{"id":"4ddd2ec1.7fc8d","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":262,"y":324,"z":"7a568ea5.52b07","wires":[["c9835662.80d108"]]},{"id":"c9835662.80d108","type":"configure","name":"configure: ConfigRequest","xml":"<execute plugin=\"org.onap.appc.config.generator.node.ConfigGeneratorNode\" method=\"generateConfig\">\n<parameter name=\"requestData\" value=\"`$device-config`\" />\n<parameter name=\"requestId\" value=\"`$request-id`\" />\n<parameter name=\"vnfType\" value=\"`$vnf-type`\" />\n<parameter name=\"requestAction\" value=\"`$request-action`\" />\n\n","comments":"","outputs":1,"x":530,"y":306.72222900390625,"z":"7a568ea5.52b07","wires":[["724dd10a.2dcb2","dab463be.ebfdb","661f9b55.49eef4"]]},{"id":"3e1ce578.4e621a","type":"configure","name":"configure: DeviceRequest","xml":"<execute plugin=\"org.onap.appc.device.interfaces.node.DeviceRequestProcessorNode\" method=\"processDeviceRequest\">\n<parameter name=\"requestId\" value=\"`$request-id`\" />\n<parameter name=\"vnfType\" value=\"`$vnf-type`\" />\n<parameter name=\"requestAction\" value=\"`$request-action`\" />\n<parameter name=\"hostname\" value=\"`$host-ip-address`\" />\n<parameter name=\"username\" value=\"`$device-login`\" />\n<parameter name=\"password\" value=\"`$device-password`\" />\n<parameter name=\"portNumber\" value=\"`$port-number`\" />\n<!--parameter name=\"netconfUsername\" value=\"`$device-login`\" />\n<parameter name=\"netconfPassword\" value=\"`$port-password`\" />\n<parameter name=\"netconfPortNumber\" value=\"830\" /-->\n\n","comments":"","outputs":1,"x":415,"y":490.72222900390625,"z":"7a568ea5.52b07","wires":[["45e3f24b.c7be4c","3033f064.d00c3","addce3cc.d1b1a"]]},{"id":"661f9b55.49eef4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":582,"y":381,"z":"7a568ea5.52b07","wires":[["3e1ce578.4e621a"]]},{"id":"45e3f24b.c7be4c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":704,"y":446,"z":"7a568ea5.52b07","wires":[["bcd76242.4c6ad"]]},{"id":"3033f064.d00c3","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":714,"y":497,"z":"7a568ea5.52b07","wires":[["5c38315c.a32dd"]]},{"id":"bcd76242.4c6ad","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":867,"y":468,"z":"7a568ea5.52b07","wires":[["6de6909e.1110d"]]},{"id":"6de6909e.1110d","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1026,"y":468,"z":"7a568ea5.52b07","wires":[]},{"id":"5c38315c.a32dd","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":875,"y":537,"z":"7a568ea5.52b07","wires":[["6e521d00.9a9f84"]]},{"id":"6e521d00.9a9f84","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"Unable to Download Config to Device\" />\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1034,"y":537,"z":"7a568ea5.52b07","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadXmlConfig.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadXmlConfig.json
index 35f444aec..e53e1a76a 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadXmlConfig.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadXmlConfig.json
@@ -1 +1 @@
-[{"id":"74f96b34.8d6e54","type":"dgstart","name":"DGSTART","outputs":1,"x":164,"y":171,"z":"9852b4f8.482598","wires":[["a662a4c7.3e74d8"]]},{"id":"a662a4c7.3e74d8","type":"service-logic","name":"APPC 4.0.0","module":"APPC","version":"3.1.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":341,"y":170,"z":"9852b4f8.482598","wires":[["cf63224b.3ac57"]]},{"id":"cf63224b.3ac57","type":"method","name":"method DownloadXmlConfig","xml":"<method rpc='DownloadXmlConfig' mode='sync'>\n","comments":"","outputs":1,"x":570,"y":170,"z":"9852b4f8.482598","wires":[["8652063a.79abf8"]]},{"id":"63da4c86.afeb64","type":"execute","name":"execute : Download Configuration","xml":"<configure adaptor='org.openecomp.appc.ccadaptor.ConfigComponentAdaptor' key='xml-download'>\n<parameter name=\"Contents\" value=\"`$device-config`\"/>\n<parameter name=\"Host_ip_address\" value=\"`$host-ip-address`\" />\n<parameter name=\"User_name\" value=\"`$device-login`\" />\n<parameter name=\"Password\" value=\"`$device-password`\" />\n<parameter name=\"Port_number\" value=\"`$port-number`\" />\n\n\n","comments":"","outputs":1,"x":430,"y":296,"z":"9852b4f8.482598","wires":[["76ab52c2.59aafc","ca9c3a74.973c48","4365f1e1.cf9c8"]]},{"id":"76ab52c2.59aafc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":712,"y":361,"z":"9852b4f8.482598","wires":[["3f9a92ce.040c6e"]]},{"id":"ca9c3a74.973c48","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":813,"y":275,"z":"9852b4f8.482598","wires":[["965ec1c1.3949a"]]},{"id":"4365f1e1.cf9c8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":823,"y":326,"z":"9852b4f8.482598","wires":[["403128f0.908298"]]},{"id":"965ec1c1.3949a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":976,"y":297,"z":"9852b4f8.482598","wires":[["e627e0a8.31843"]]},{"id":"e627e0a8.31843","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1135,"y":297,"z":"9852b4f8.482598","wires":[]},{"id":"8652063a.79abf8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":180,"y":295,"z":"9852b4f8.482598","wires":[["63da4c86.afeb64"]]},{"id":"3f9a92ce.040c6e","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<!-- Dont over write error code and message -->\n","comments":"","x":938,"y":464,"z":"9852b4f8.482598","wires":[]},{"id":"403128f0.908298","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":984,"y":366,"z":"9852b4f8.482598","wires":[["6c05d71d.c6f7c8"]]},{"id":"6c05d71d.c6f7c8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"Unable to Download XML Config to Device\" />\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1143,"y":366,"z":"9852b4f8.482598","wires":[]}]
+[{"id":"74f96b34.8d6e54","type":"dgstart","name":"DGSTART","outputs":1,"x":164,"y":171,"z":"9852b4f8.482598","wires":[["a662a4c7.3e74d8"]]},{"id":"a662a4c7.3e74d8","type":"service-logic","name":"APPC 4.0.0","module":"APPC","version":"3.1.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":341,"y":170,"z":"9852b4f8.482598","wires":[["cf63224b.3ac57"]]},{"id":"cf63224b.3ac57","type":"method","name":"method DownloadXmlConfig","xml":"<method rpc='DownloadXmlConfig' mode='sync'>\n","comments":"","outputs":1,"x":570,"y":170,"z":"9852b4f8.482598","wires":[["8652063a.79abf8"]]},{"id":"63da4c86.afeb64","type":"execute","name":"execute : Download Configuration","xml":"<configure adaptor='org.onap.appc.ccadaptor.ConfigComponentAdaptor' key='xml-download'>\n<parameter name=\"Contents\" value=\"`$device-config`\"/>\n<parameter name=\"Host_ip_address\" value=\"`$host-ip-address`\" />\n<parameter name=\"User_name\" value=\"`$device-login`\" />\n<parameter name=\"Password\" value=\"`$device-password`\" />\n<parameter name=\"Port_number\" value=\"`$port-number`\" />\n\n\n","comments":"","outputs":1,"x":430,"y":296,"z":"9852b4f8.482598","wires":[["76ab52c2.59aafc","ca9c3a74.973c48","4365f1e1.cf9c8"]]},{"id":"76ab52c2.59aafc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":712,"y":361,"z":"9852b4f8.482598","wires":[["3f9a92ce.040c6e"]]},{"id":"ca9c3a74.973c48","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":813,"y":275,"z":"9852b4f8.482598","wires":[["965ec1c1.3949a"]]},{"id":"4365f1e1.cf9c8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":823,"y":326,"z":"9852b4f8.482598","wires":[["403128f0.908298"]]},{"id":"965ec1c1.3949a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":976,"y":297,"z":"9852b4f8.482598","wires":[["e627e0a8.31843"]]},{"id":"e627e0a8.31843","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1135,"y":297,"z":"9852b4f8.482598","wires":[]},{"id":"8652063a.79abf8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":180,"y":295,"z":"9852b4f8.482598","wires":[["63da4c86.afeb64"]]},{"id":"3f9a92ce.040c6e","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<!-- Dont over write error code and message -->\n","comments":"","x":938,"y":464,"z":"9852b4f8.482598","wires":[]},{"id":"403128f0.908298","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":984,"y":366,"z":"9852b4f8.482598","wires":[["6c05d71d.c6f7c8"]]},{"id":"6c05d71d.c6f7c8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-message\" value=\"Unable to Download XML Config to Device\" />\n<parameter name=\"error-code\" value=\"401\" />\n","comments":"","x":1143,"y":366,"z":"9852b4f8.482598","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_EvacuateVM.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_EvacuateVM.json
index 8f7f7961c..d93fcf195 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_EvacuateVM.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_EvacuateVM.json
@@ -1 +1 @@
-[{"id":"3226fb76.a7fe14","type":"dgstart","name":"DGSTART","outputs":1,"x":150.88333129882812,"y":102.88333129882812,"z":"96b506dc.10c5e8","wires":[["f2b4466.fcec638"]]},{"id":"f2b4466.fcec638","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":338.8833312988281,"y":103.88333129882812,"z":"96b506dc.10c5e8","wires":[["205bcc30.cae044"]]},{"id":"205bcc30.cae044","type":"method","name":"EvacuateVM","xml":"<method rpc='EvacuateVM' mode='sync'>\n","comments":"","outputs":1,"x":567.88330078125,"y":104.88333129882812,"z":"96b506dc.10c5e8","wires":[["213ddb60.68307c"]]},{"id":"d8525233.851af8","type":"execute","name":"execute: evacuate","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='evacuateServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$vm-id`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$identity-url`\" />\n<parameter name=\"org.openecomp.appc.tenant.id\" value=\"`$tenant-id`\" />\n<parameter name=\"org.openecomp.appc.rebuildvm\" value=\"`$rebuild-vm`\" />\n<parameter name=\"org.openecomp.appc.targethost.id\" value=\"`$targethost-id`\" />\n\n","comments":"","outputs":1,"x":729.88330078125,"y":271.88330078125,"z":"96b506dc.10c5e8","wires":[["ec71f7ec.66516","1f5ce9b3.25109e"]]},{"id":"ec71f7ec.66516","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":924.88330078125,"y":316.88330078125,"z":"96b506dc.10c5e8","wires":[["4a9ae26e.e2a654"]]},{"id":"1f5ce9b3.25109e","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":913.88330078125,"y":194.88330078125,"z":"96b506dc.10c5e8","wires":[["5eba654f.8cceec"]]},{"id":"3d2c4844.2e8078","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='400' />\n<parameter name='error-message' value='Request Processed Successfully' />","comments":"","x":1372.88330078125,"y":290.88330078125,"z":"96b506dc.10c5e8","wires":[]},{"id":"5572aa21.a402dc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='RPC Evacuate not found' />","comments":"","x":1254.88330078125,"y":213.88330078125,"z":"96b506dc.10c5e8","wires":[]},{"id":"4a9ae26e.e2a654","type":"switchNode","name":"switch","xml":"<switch test='`$EVACUATE_STATUS`'>\n","comments":"","outputs":1,"x":1066.88330078125,"y":316.88330078125,"z":"96b506dc.10c5e8","wires":[["a71868a3.d0fc38","a3d63b8d.7bb02"]]},{"id":"a71868a3.d0fc38","type":"success","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1197.88330078125,"y":290.88330078125,"z":"96b506dc.10c5e8","wires":[["3d2c4844.2e8078"]]},{"id":"a3d63b8d.7bb02","type":"outcome","name":"ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":1191.88330078125,"y":373.88330078125,"z":"96b506dc.10c5e8","wires":[["a85ae409.b4541"]]},{"id":"a85ae409.b4541","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1332.88330078125,"y":374.88330078125,"z":"96b506dc.10c5e8","wires":[["d00419cf.1b199","411472cf.0aaea4"]]},{"id":"d00419cf.1b199","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n","comments":"","x":1508.8832397460938,"y":423.8833312988281,"z":"96b506dc.10c5e8","wires":[]},{"id":"5eba654f.8cceec","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1069.88330078125,"y":194.88330078125,"z":"96b506dc.10c5e8","wires":[["5572aa21.a402dc"]]},{"id":"8851723f.af52a","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.payload = ' + $input.payload`\" />\n<parameter name=\"field3\" value=\"`'vm-id in context=' + $vm-id`\" />","comments":"","outputs":1,"x":851,"y":93.88333129882812,"z":"96b506dc.10c5e8","wires":[[]]},{"id":"213ddb60.68307c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":725.75,"y":164.75,"z":"96b506dc.10c5e8","wires":[["8851723f.af52a","d8525233.851af8"]]},{"id":"411472cf.0aaea4","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=\"field3\" value=\"`'error-message = ' + $error-message`\" />","comments":"","outputs":1,"x":1495.7499389648438,"y":375.75,"z":"96b506dc.10c5e8","wires":[[]]}]
+[{"id":"3226fb76.a7fe14","type":"dgstart","name":"DGSTART","outputs":1,"x":150.88333129882812,"y":102.88333129882812,"z":"96b506dc.10c5e8","wires":[["f2b4466.fcec638"]]},{"id":"f2b4466.fcec638","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":338.8833312988281,"y":103.88333129882812,"z":"96b506dc.10c5e8","wires":[["205bcc30.cae044"]]},{"id":"205bcc30.cae044","type":"method","name":"EvacuateVM","xml":"<method rpc='EvacuateVM' mode='sync'>\n","comments":"","outputs":1,"x":567.88330078125,"y":104.88333129882812,"z":"96b506dc.10c5e8","wires":[["213ddb60.68307c"]]},{"id":"d8525233.851af8","type":"execute","name":"execute: evacuate","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='evacuateServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$vm-id`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$identity-url`\" />\n<parameter name=\"org.onap.appc.tenant.id\" value=\"`$tenant-id`\" />\n<parameter name=\"org.onap.appc.rebuildvm\" value=\"`$rebuild-vm`\" />\n<parameter name=\"org.onap.appc.targethost.id\" value=\"`$targethost-id`\" />\n\n","comments":"","outputs":1,"x":729.88330078125,"y":271.88330078125,"z":"96b506dc.10c5e8","wires":[["ec71f7ec.66516","1f5ce9b3.25109e"]]},{"id":"ec71f7ec.66516","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":924.88330078125,"y":316.88330078125,"z":"96b506dc.10c5e8","wires":[["4a9ae26e.e2a654"]]},{"id":"1f5ce9b3.25109e","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":913.88330078125,"y":194.88330078125,"z":"96b506dc.10c5e8","wires":[["5eba654f.8cceec"]]},{"id":"3d2c4844.2e8078","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='400' />\n<parameter name='error-message' value='Request Processed Successfully' />","comments":"","x":1372.88330078125,"y":290.88330078125,"z":"96b506dc.10c5e8","wires":[]},{"id":"5572aa21.a402dc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='RPC Evacuate not found' />","comments":"","x":1254.88330078125,"y":213.88330078125,"z":"96b506dc.10c5e8","wires":[]},{"id":"4a9ae26e.e2a654","type":"switchNode","name":"switch","xml":"<switch test='`$EVACUATE_STATUS`'>\n","comments":"","outputs":1,"x":1066.88330078125,"y":316.88330078125,"z":"96b506dc.10c5e8","wires":[["a71868a3.d0fc38","a3d63b8d.7bb02"]]},{"id":"a71868a3.d0fc38","type":"success","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1197.88330078125,"y":290.88330078125,"z":"96b506dc.10c5e8","wires":[["3d2c4844.2e8078"]]},{"id":"a3d63b8d.7bb02","type":"outcome","name":"ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":1191.88330078125,"y":373.88330078125,"z":"96b506dc.10c5e8","wires":[["a85ae409.b4541"]]},{"id":"a85ae409.b4541","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1332.88330078125,"y":374.88330078125,"z":"96b506dc.10c5e8","wires":[["d00419cf.1b199","411472cf.0aaea4"]]},{"id":"d00419cf.1b199","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n","comments":"","x":1508.8832397460938,"y":423.8833312988281,"z":"96b506dc.10c5e8","wires":[]},{"id":"5eba654f.8cceec","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1069.88330078125,"y":194.88330078125,"z":"96b506dc.10c5e8","wires":[["5572aa21.a402dc"]]},{"id":"8851723f.af52a","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.payload = ' + $input.payload`\" />\n<parameter name=\"field3\" value=\"`'vm-id in context=' + $vm-id`\" />","comments":"","outputs":1,"x":851,"y":93.88333129882812,"z":"96b506dc.10c5e8","wires":[[]]},{"id":"213ddb60.68307c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":725.75,"y":164.75,"z":"96b506dc.10c5e8","wires":[["8851723f.af52a","d8525233.851af8"]]},{"id":"411472cf.0aaea4","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=\"field3\" value=\"`'error-message = ' + $error-message`\" />","comments":"","outputs":1,"x":1495.7499389648438,"y":375.75,"z":"96b506dc.10c5e8","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 f14cad438..1d3e98389 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.openecomp.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.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":[[]]}]
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 7af09f4c7..756c0f63f 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.openecomp.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.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":[[]]}]
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 b83ae7488..b5b3076ee 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.openecomp.appc.encryptiontool.wrapper.EncryptionToolDGWrapper\" method =\"getProperty\">\n <parameter name=\"responsePrefix\" value =\"prefix\"/>\n   <parameter name=\"propertyName\" value=\"`$tmp.prefix+'.'+$password`\"/>\n   <parameter name =\"password\" value=\"`$propertyName`\"/>\n  ","comments":"","outputs":1,"x":550.0205993652344,"y":401.6720428466797,"z":"3a255785.10924","wires":[["b214d4c8.55cc38","96a663b3.997758"]]},{"id":"b2bbc50f.ea54b8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"Unable to decrypt the password.\" />\n","comments":"","x":1214.041763305664,"y":614.1915740966797,"z":"3a255785.10924","wires":[]},{"id":"c1a9c1c9.fed838","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1045.3124160766602,"y":614.3707752227783,"z":"3a255785.10924","wires":[["b2bbc50f.ea54b8"]]},{"id":"96a663b3.997758","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":847.2499694824219,"y":611.9915924072266,"z":"3a255785.10924","wires":[["c1a9c1c9.fed838"]]},{"id":"b214d4c8.55cc38","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":828.2626647949219,"y":545.8457794189453,"z":"3a255785.10924","wires":[["c1a9c1c9.fed838"]]},{"id":"c09f3d41.277fb8","type":"execute","name":"execute Convert payload to DG Context ","xml":"<execute plugin=\"org.openecomp.sdnc.config.generator.convert.ConvertNode\" method=\"convertJson2DGContext\">\n<parameter name=\"jsonData\" value=\"`$tmp.merge.mergedData`\" />\n<parameter name=\"isEscaped\" value=\"Y\" />\n<parameter name=\"blockKeys\" value=\"EnvParameters,PlaybookName,Timeout,vnf-host-ip-address,NodeList\" />\n<parameter name=\"responsePrefix\" value=\"tmp.convertnode\" />","comments":"","outputs":1,"x":627.8367538452148,"y":165.25354766845703,"z":"3a255785.10924","wires":[["99d1509f.18583","9e943dc.ae89e4"]]},{"id":"2a5268ba.0741d","type":"set","name":"set Payload params ","xml":"<set>\n<parameter name='PlaybookName' value='`$PlaybookName`' />\n<parameter name='NodeList' value='`$NodeList`'/>\n<parameter name='vnf_id' value='`$vnf-id`' />\n<parameter name='AgentUrl' value='`$vnf-host-ip-address`'/>\n <parameter name='User' value='`$propertyName`'/>\n  <parameter name='Password' value='`$password`'/>\n  <parameter name='EnvParameters' value='`$EnvParameters`'/>\n  <parameter name='Timeout' value='`$Timeout`'/>\n\n\n\n","comments":"","x":343.6443176269531,"y":674.4057769775391,"z":"3a255785.10924","wires":[]},{"id":"9e943dc.ae89e4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":847.074951171875,"y":360.90834045410156,"z":"3a255785.10924","wires":[["7fea6668.af3de8"]]},{"id":"99d1509f.18583","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":843.9082946777344,"y":448.1916723251343,"z":"3a255785.10924","wires":[["93cf0cd6.d0a4c8"]]},{"id":"7fea6668.af3de8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1013.74169921875,"y":364.0749969482422,"z":"3a255785.10924","wires":[["c8734633.74013"]]},{"id":"93cf0cd6.d0a4c8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1020.0748672485352,"y":427.5582904815674,"z":"3a255785.10924","wires":[["e76811f1.a807c8"]]},{"id":"e76811f1.a807c8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Unable to process convert payload to context.\"/>\n\t\n","comments":"","x":1223.27486038208,"y":430.74167823791504,"z":"3a255785.10924","wires":[]},{"id":"b9fa92db.ae801","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":315.3415985107422,"y":158.8415985107422,"z":"3a255785.10924","wires":[["c09f3d41.277fb8","5c57c6d8.9af2d","cdba2626.e4f0e","2a5268ba.0741d","16bf6e4e.95f3ea","4c298c19.5899dc","32880258.268d3e","d4dec4aa.f06728","c671c44b.c97d8","e3f37288.1de128","2c0d811a.49430e"]]},{"id":"c8734633.74013","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.convertnode.error-message`\"/>\n\t\n\t","comments":"","x":1242.3082275390625,"y":366.47496032714844,"z":"3a255785.10924","wires":[]},{"id":"42dbe00.4a7a1a","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`'/>","comments":"","x":1068.1939392089844,"y":765.8487701416016,"z":"3a255785.10924","wires":[]},{"id":"246043c5.f9790c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":781.9915771484375,"y":747.4250335693359,"z":"3a255785.10924","wires":[["42dbe00.4a7a1a"]]},{"id":"1f2fd774.7f32f1","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":758.191650390625,"y":829.9749603271484,"z":"3a255785.10924","wires":[["b0cf78a8.2fb77"]]},{"id":"16bf6e4e.95f3ea","type":"set","name":"set tmp.prefix","xml":"<set>\n<parameter name=\"tmp.prefix\" value=\"`$vnf-type + '.' + $input.action`\"/>\n<parameter name=\"password\" value=\"password\"/>\n<parameter name=\"user\" value=\"user\"/>\n\n","comments":"","x":587.5591125488281,"y":304.48838806152344,"z":"3a255785.10924","wires":[]},{"id":"4c298c19.5899dc","type":"execute","name":"execute getUser","xml":" <execute plugin='org.openecomp.appc.encryptiontool.wrapper.EncryptionToolDGWrapper' method = 'getProperty'>\n  <parameter name='responsePrefix' value =\"prefix\"/>\n  <parameter name='propertyName' value=\"`$tmp.prefix+'.'+$user`\"/>","comments":"","outputs":1,"x":444.6667785644531,"y":539.8667144775391,"z":"3a255785.10924","wires":[[]]},{"id":"e3f37288.1de128","type":"set","name":"set password","xml":"<set>\n<parameter name=\"tmp.prefix\" value=\"`$vnf-type + '.' + $input.action`\"/>\n<parameter name=\"password\" value=\"`$propertyName`\"/>\n\n\n","comments":"","x":542.9998168945312,"y":455.5333251953125,"z":"3a255785.10924","wires":[]},{"id":"d4dec4aa.f06728","type":"set","name":"set user","xml":"<set>\n<parameter name=\"user\" value=\"$propertyName\"/>\n\n\n","comments":"","x":421.33331298828125,"y":599.2000122070312,"z":"3a255785.10924","wires":[]},{"id":"32880258.268d3e","type":"set","name":"set Payload params ","xml":"<set>\n<parameter name='PlaybookName' value='`$block_PlaybookName`' />\n<parameter name='NodeList' value ='`$block_NodeList`'/>\n<parameter name='vnf_id' value='`$vnf-id`' />\n<parameter name='AgentUrl' value='`$vnf-host-ip-address`'/>\n<parameter name='EnvParameters' value='`$block_EnvParameters`'/>\n<parameter name='Timeout' value='`$block_Timeout`'/>\n\n\n\n","comments":"","x":629.6666564941406,"y":211.86668395996094,"z":"3a255785.10924","wires":[]},{"id":"b0cf78a8.2fb77","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value='ansible-adapter-1.0.0 Dg not found'/>","comments":"","x":1012.8333435058594,"y":873.8905181884766,"z":"3a255785.10924","wires":[]},{"id":"bbc9b301.642c68","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='400' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`'/>\n","comments":"","x":797.1191101074219,"y":971.0333404541016,"z":"3a255785.10924","wires":[]},{"id":"5c1a8e53.1df84","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":555.6905212402344,"y":911.8429107666016,"z":"3a255785.10924","wires":[["bbc9b301.642c68"]]},{"id":"c671c44b.c97d8","type":"record","name":"record","xml":"<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name='field2' value='`$propertyName`'/>\n  <parameter name='field3' value='`$password`'/>","comments":"","outputs":1,"x":476.3999938964844,"y":638,"z":"3a255785.10924","wires":[[]]},{"id":"2c0d811a.49430e","type":"record","name":"record","xml":"<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log1\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name='field2' value='`$propertyName`'/>\n  <parameter name='field3' value='`$password`'/>","comments":"","outputs":1,"x":533.6666259765625,"y":511.0000305175781,"z":"3a255785.10924","wires":[[]]}]
\ No newline at end of file
+[{"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
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_Configure.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_Configure.json
index cd3c46664..1379f645d 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_Configure.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_Configure.json
@@ -1 +1 @@
-[{"id":"bcf33378.a06a7","type":"dgstart","name":"DGSTART","outputs":1,"x":115,"y":60.33333778381348,"z":"9adc6d3f.4fd9a","wires":[["9aecacf7.59d93"]]},{"id":"9aecacf7.59d93","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":298,"y":61.33333778381348,"z":"9adc6d3f.4fd9a","wires":[["d767a7f1.e85ab8"]]},{"id":"d767a7f1.e85ab8","type":"method","name":"method Generic_Configure","xml":"<method rpc='Generic_Configure' mode='sync'>\n","comments":"","outputs":1,"x":513,"y":53.33333778381348,"z":"9adc6d3f.4fd9a","wires":[["9648a68e.58be58"]]},{"id":"9648a68e.58be58","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":132,"y":196.66666316986084,"z":"9adc6d3f.4fd9a","wires":[["b08a9e58.bd07e","ecefd839.64cd58","bbe79244.e2541","7421ecb2.1ac094"]]},{"id":"b08a9e58.bd07e","type":"call","name":"call: DownloadConfig","xml":"<call module=\"APPC\" rpc=\"`$tmp.configureactiondg.DOWNLOAD-CONFIG-DG`\" mode=\"sync\">","comments":"","outputs":1,"x":398.4444351196289,"y":472.77783012390137,"z":"9adc6d3f.4fd9a","wires":[["ef940996.264278","b02b2cdd.876c9","9cdecbc8.ba74f8"]]},{"id":"ef940996.264278","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":623.6666374206543,"y":409.4444389343262,"z":"9adc6d3f.4fd9a","wires":[["41480864.94a478"]]},{"id":"b02b2cdd.876c9","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":644.9166984558105,"y":576.8334465026855,"z":"9adc6d3f.4fd9a","wires":[["cc065ab0.bbd438"]]},{"id":"9cdecbc8.ba74f8","type":"success","name":" success","xml":"<outcome value=\"success\">","comments":"","outputs":1,"x":593.2500114440918,"y":769.1667022705078,"z":"9adc6d3f.4fd9a","wires":[["2e4169d0.23efc6"]]},{"id":"41480864.94a478","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":832.3333053588867,"y":403.66669845581055,"z":"9adc6d3f.4fd9a","wires":[["10597d65.368c33","c9fe6ef2.b8991","ee63b08a.143ca"]]},{"id":"cc065ab0.bbd438","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":827.8333282470703,"y":622.000072479248,"z":"9adc6d3f.4fd9a","wires":[["b2cd609c.f0e14"]]},{"id":"2e4169d0.23efc6","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":799.2500114440918,"y":760.4167022705078,"z":"9adc6d3f.4fd9a","wires":[["4351ab2.e80d754","5155e2e.c35c01c","ac964ccc.c134e","de42b2.dca01d5"]]},{"id":"10597d65.368c33","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-code = ' + $error-code`\" />\n<parameter name=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n","comments":"","outputs":1,"x":1095.2222938537598,"y":385.888879776001,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"b2cd609c.f0e14","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 ' + $tmp.configureactiondg.DOWNLOAD-CONFIG-DG + ' not found'`\"/>\n\t","comments":"","x":1231.2500228881836,"y":646.7500114440918,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"4351ab2.e80d754","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-code = ' + $error-code`\" />\n<parameter name=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n<parameter name=\"field4\" value=\"ACTIVATESUCCESS\" />","comments":"","outputs":1,"x":1089.750015258789,"y":756.1666979789734,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"c9fe6ef2.b8991","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t","comments":"","x":1111.777847290039,"y":549.4444303512573,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"ecefd839.64cd58","type":"set","name":"set Download params","xml":"<set>\n<parameter name='host-ip-address' value='`$vnf-host-ip-address`' />\n<parameter name='device-login' value='`$device-authentication.USER-NAME`' />\n<parameter name='device-password' value='`$device-authentication.PASSWORD`' />\n<parameter name='port-number' value='`$device-authentication.PORT-NUMBER`' />\n<parameter name='protocol' value='`$tmp.deviceinterfaceprotocol.PROTOCOL`' />\n<parameter name='device-config' value='`$deviceconfig-file-content`' />","comments":"","x":448.8888473510742,"y":350.4444570541382,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"5155e2e.c35c01c","type":"set","name":"set error-code 400 and message","xml":"<set>\n<parameter name='error-code' value='400' />\n<parameter name=\"error-message\" value=\"SUCCESS - request has been processed successfully\" />\n","comments":"","x":1107.583267211914,"y":707.3333854675293,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"a4b7d4d9.d03ab8","type":"comment","name":"ConfigCompAdaptor resets error code for success cases","info":"","comments":"","x":1461.7500305175781,"y":704.3333892822266,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"bbe79244.e2541","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"get Config Info\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":449.55554962158203,"y":269.11108779907227,"z":"9adc6d3f.4fd9a","wires":[["d1d61570.0be3f8"]]},{"id":"ac964ccc.c134e","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"400: Download of Config file is Successful\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":1090.000015258789,"y":827.7500171661377,"z":"9adc6d3f.4fd9a","wires":[["93a11316.da719"]]},{"id":"5268669e.4e3c78","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.openecomp.appc.config.generator.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"`$tmp.message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":1887.8889350891113,"y":551.5555553436279,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"77bc4fc2.cc583","type":"set","name":"set tmp.message","xml":"<set>\n<parameter name='tmp.message' value=\"`'Download Failure : ' + $error-code + ' : ' + $error-message`\" />\n","comments":"","x":1889.1110229492188,"y":477.8888874053955,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"ee63b08a.143ca","type":"switchNode","name":"switch: error-code","xml":"<switch test=\"`$error-code`\">\n","comments":"","outputs":1,"x":1120.9999084472656,"y":456.9999694824219,"z":"9adc6d3f.4fd9a","wires":[["b1c4ad91.8aa34","8d980f69.01da2"]]},{"id":"b1c4ad91.8aa34","type":"success","name":"outcome: 400","xml":"<outcome value=\"400\">","comments":"","outputs":1,"x":1316.6666946411133,"y":399.6666660308838,"z":"9adc6d3f.4fd9a","wires":[["8b8d3a30.692328"]]},{"id":"8b8d3a30.692328","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1551.6666717529297,"y":397.22224521636963,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"8d980f69.01da2","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":1327.6666259765625,"y":482.444429397583,"z":"9adc6d3f.4fd9a","wires":[["4cb182b1.06d15c"]]},{"id":"4cb182b1.06d15c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1551.1110382080078,"y":484.55556869506836,"z":"9adc6d3f.4fd9a","wires":[["77bc4fc2.cc583","5268669e.4e3c78"]]},{"id":"7625e08d.e0025","type":"comment","name":"ISBC cases returns failure to stop polling","info":"","comments":"","x":1601.6665344238281,"y":297.88886165618896,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"93a11316.da719","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1285.916648864746,"y":823.3333911895752,"z":"9adc6d3f.4fd9a","wires":[["b3148632.6019e8"]]},{"id":"b3148632.6019e8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1459.5000267028809,"y":824.8333911895752,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"d1d61570.0be3f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":648.6666641235352,"y":269.99997329711914,"z":"9adc6d3f.4fd9a","wires":[["8e0a1916.289ea8"]]},{"id":"8e0a1916.289ea8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":866.8889312744141,"y":272.888897895813,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"de42b2.dca01d5","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1055.000015258789,"y":901.9998970031738,"z":"9adc6d3f.4fd9a","wires":[["547a0900.632ad8","cfef6f4a.c8106"]]},{"id":"cfef6f4a.c8106","type":"call","name":"call: SaveRunningConfig","xml":"<call module=\"APPC\" rpc=\"SaveRunningConfig\" mode=\"sync\">","comments":"","outputs":1,"x":1314.750015258789,"y":900.833270072937,"z":"9adc6d3f.4fd9a","wires":[["bfd5ce67.f2b84"]]},{"id":"547a0900.632ad8","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$request-action`\">\n","comments":"","outputs":1,"x":1269.4998970031738,"y":992.4998931884766,"z":"9adc6d3f.4fd9a","wires":[["9e0e7bc6.f3ad08","2bc0abbb.b9c904"]]},{"id":"9e0e7bc6.f3ad08","type":"other","name":"Configure","xml":"<outcome value='Configure'>","comments":"","outputs":1,"x":1516.749900817871,"y":982.4165191650391,"z":"9adc6d3f.4fd9a","wires":[["43f68adb.c89264"]]},{"id":"2bc0abbb.b9c904","type":"other","name":"ConfigScale","xml":"<outcome value='ConfigScale'>","comments":"","outputs":1,"x":1521.5000228881836,"y":1049.4998941421509,"z":"9adc6d3f.4fd9a","wires":[["43f68adb.c89264"]]},{"id":"43f68adb.c89264","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1798.9165344238281,"y":1029.5832738876343,"z":"9adc6d3f.4fd9a","wires":[["65936072.2b5fa"]]},{"id":"65936072.2b5fa","type":"call","name":"call: UpdateAaiInfo","xml":"<call module=\"APPC\" rpc=\"UpdateAaiInfo\" mode=\"sync\">","comments":"","outputs":1,"x":820.3334465026855,"y":1139.9166431427002,"z":"9adc6d3f.4fd9a","wires":[["9151a526.f94b68"]]},{"id":"9151a526.f94b68","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1027.9167556762695,"y":1144.1666440963745,"z":"9adc6d3f.4fd9a","wires":[["1879d6b6.911e99"]]},{"id":"1879d6b6.911e99","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1222.083267211914,"y":1145.7498989105225,"z":"9adc6d3f.4fd9a","wires":[["e81a1fc0.a272c","f0dd7641.253498"]]},{"id":"e81a1fc0.a272c","type":"set","name":"set:  dcae-error message","xml":"<set>\n\t  <parameter name=\"dcae-error-message\" value=\"DG Workflow UpdateAaiInfo not found\"/>\n\t  ","comments":"","x":1529.2500228881836,"y":1120.3332686424255,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"f0dd7641.253498","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=\"DCAEERRORMESSAGE\" value=\"`$dcae-error-message`\"/>\n","comments":"","outputs":1,"x":1472.1666526794434,"y":1166.5832710266113,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"6518f897.340dd8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1721.0832748413086,"y":900.9998979568481,"z":"9adc6d3f.4fd9a","wires":[["186de19c.bcf0ae","407c43d8.cfa8ac"]]},{"id":"bfd5ce67.f2b84","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1528.5832748413086,"y":900.7498979568481,"z":"9adc6d3f.4fd9a","wires":[["6518f897.340dd8"]]},{"id":"186de19c.bcf0ae","type":"set","name":"set:  dcae-error message","xml":"<set>\n\t  <parameter name=\"dcae-error-message\" value=\"DG Workflow SaveRunningConfig not found\"/>\n\t ","comments":"","x":2030.0000305175781,"y":903.2498960494995,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"407c43d8.cfa8ac","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=\"DCAEERRORMESSAGE\" value=\"`$dcae-error-message`\"/>\n","comments":"","outputs":1,"x":1974.4999084472656,"y":958.0832719802856,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"7421ecb2.1ac094","type":"execute","name":"execute getCommonConfigInfo","xml":"<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"getCommonConfigInfo\">\n<parameter name=\"responsePrefix\" value=\"tmp.commonConfigInfo\" />\n","comments":"","outputs":1,"x":517.7777709960938,"y":156.66665649414062,"z":"9adc6d3f.4fd9a","wires":[["b891a8f2.0b2ce8","686bbe23.d037e"]]},{"id":"b891a8f2.0b2ce8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":785.7778053283691,"y":162.9999771118164,"z":"9adc6d3f.4fd9a","wires":[["17029b5a.574655"]]},{"id":"17029b5a.574655","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":948.7778053283691,"y":166.9999771118164,"z":"9adc6d3f.4fd9a","wires":[["8d2d875d.8b0af8"]]},{"id":"8d2d875d.8b0af8","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":1116.7778053283691,"y":165.9999771118164,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"686bbe23.d037e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":779.7777786254883,"y":237.99999237060547,"z":"9adc6d3f.4fd9a","wires":[["7cedc144.223ff"]]},{"id":"7cedc144.223ff","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":957.1110610961914,"y":238.33336639404297,"z":"9adc6d3f.4fd9a","wires":[["1ab7b9f2.f91326"]]},{"id":"1ab7b9f2.f91326","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":1144.7777099609375,"y":236.33328437805176,"z":"9adc6d3f.4fd9a","wires":[]}]
+[{"id":"bcf33378.a06a7","type":"dgstart","name":"DGSTART","outputs":1,"x":115,"y":60.33333778381348,"z":"9adc6d3f.4fd9a","wires":[["9aecacf7.59d93"]]},{"id":"9aecacf7.59d93","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":298,"y":61.33333778381348,"z":"9adc6d3f.4fd9a","wires":[["d767a7f1.e85ab8"]]},{"id":"d767a7f1.e85ab8","type":"method","name":"method Generic_Configure","xml":"<method rpc='Generic_Configure' mode='sync'>\n","comments":"","outputs":1,"x":513,"y":53.33333778381348,"z":"9adc6d3f.4fd9a","wires":[["9648a68e.58be58"]]},{"id":"9648a68e.58be58","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":132,"y":196.66666316986084,"z":"9adc6d3f.4fd9a","wires":[["b08a9e58.bd07e","ecefd839.64cd58","bbe79244.e2541","7421ecb2.1ac094"]]},{"id":"b08a9e58.bd07e","type":"call","name":"call: DownloadConfig","xml":"<call module=\"APPC\" rpc=\"`$tmp.configureactiondg.DOWNLOAD-CONFIG-DG`\" mode=\"sync\">","comments":"","outputs":1,"x":398.4444351196289,"y":472.77783012390137,"z":"9adc6d3f.4fd9a","wires":[["ef940996.264278","b02b2cdd.876c9","9cdecbc8.ba74f8"]]},{"id":"ef940996.264278","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":623.6666374206543,"y":409.4444389343262,"z":"9adc6d3f.4fd9a","wires":[["41480864.94a478"]]},{"id":"b02b2cdd.876c9","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":644.9166984558105,"y":576.8334465026855,"z":"9adc6d3f.4fd9a","wires":[["cc065ab0.bbd438"]]},{"id":"9cdecbc8.ba74f8","type":"success","name":" success","xml":"<outcome value=\"success\">","comments":"","outputs":1,"x":593.2500114440918,"y":769.1667022705078,"z":"9adc6d3f.4fd9a","wires":[["2e4169d0.23efc6"]]},{"id":"41480864.94a478","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":832.3333053588867,"y":403.66669845581055,"z":"9adc6d3f.4fd9a","wires":[["10597d65.368c33","c9fe6ef2.b8991","ee63b08a.143ca"]]},{"id":"cc065ab0.bbd438","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":827.8333282470703,"y":622.000072479248,"z":"9adc6d3f.4fd9a","wires":[["b2cd609c.f0e14"]]},{"id":"2e4169d0.23efc6","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":799.2500114440918,"y":760.4167022705078,"z":"9adc6d3f.4fd9a","wires":[["4351ab2.e80d754","5155e2e.c35c01c","ac964ccc.c134e","de42b2.dca01d5"]]},{"id":"10597d65.368c33","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-code = ' + $error-code`\" />\n<parameter name=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n","comments":"","outputs":1,"x":1095.2222938537598,"y":385.888879776001,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"b2cd609c.f0e14","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 ' + $tmp.configureactiondg.DOWNLOAD-CONFIG-DG + ' not found'`\"/>\n\t","comments":"","x":1231.2500228881836,"y":646.7500114440918,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"4351ab2.e80d754","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-code = ' + $error-code`\" />\n<parameter name=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n<parameter name=\"field4\" value=\"ACTIVATESUCCESS\" />","comments":"","outputs":1,"x":1089.750015258789,"y":756.1666979789734,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"c9fe6ef2.b8991","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t","comments":"","x":1111.777847290039,"y":549.4444303512573,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"ecefd839.64cd58","type":"set","name":"set Download params","xml":"<set>\n<parameter name='host-ip-address' value='`$vnf-host-ip-address`' />\n<parameter name='device-login' value='`$device-authentication.USER-NAME`' />\n<parameter name='device-password' value='`$device-authentication.PASSWORD`' />\n<parameter name='port-number' value='`$device-authentication.PORT-NUMBER`' />\n<parameter name='protocol' value='`$tmp.deviceinterfaceprotocol.PROTOCOL`' />\n<parameter name='device-config' value='`$deviceconfig-file-content`' />","comments":"","x":448.8888473510742,"y":350.4444570541382,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"5155e2e.c35c01c","type":"set","name":"set error-code 400 and message","xml":"<set>\n<parameter name='error-code' value='400' />\n<parameter name=\"error-message\" value=\"SUCCESS - request has been processed successfully\" />\n","comments":"","x":1107.583267211914,"y":707.3333854675293,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"a4b7d4d9.d03ab8","type":"comment","name":"ConfigCompAdaptor resets error code for success cases","info":"","comments":"","x":1461.7500305175781,"y":704.3333892822266,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"bbe79244.e2541","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=\"get Config Info\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":449.55554962158203,"y":269.11108779907227,"z":"9adc6d3f.4fd9a","wires":[["d1d61570.0be3f8"]]},{"id":"ac964ccc.c134e","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=\"400: Download of Config file is Successful\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":1090.000015258789,"y":827.7500171661377,"z":"9adc6d3f.4fd9a","wires":[["93a11316.da719"]]},{"id":"5268669e.4e3c78","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.onap.appc.config.generator.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"`$tmp.message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":1887.8889350891113,"y":551.5555553436279,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"77bc4fc2.cc583","type":"set","name":"set tmp.message","xml":"<set>\n<parameter name='tmp.message' value=\"`'Download Failure : ' + $error-code + ' : ' + $error-message`\" />\n","comments":"","x":1889.1110229492188,"y":477.8888874053955,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"ee63b08a.143ca","type":"switchNode","name":"switch: error-code","xml":"<switch test=\"`$error-code`\">\n","comments":"","outputs":1,"x":1120.9999084472656,"y":456.9999694824219,"z":"9adc6d3f.4fd9a","wires":[["b1c4ad91.8aa34","8d980f69.01da2"]]},{"id":"b1c4ad91.8aa34","type":"success","name":"outcome: 400","xml":"<outcome value=\"400\">","comments":"","outputs":1,"x":1316.6666946411133,"y":399.6666660308838,"z":"9adc6d3f.4fd9a","wires":[["8b8d3a30.692328"]]},{"id":"8b8d3a30.692328","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1551.6666717529297,"y":397.22224521636963,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"8d980f69.01da2","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":1327.6666259765625,"y":482.444429397583,"z":"9adc6d3f.4fd9a","wires":[["4cb182b1.06d15c"]]},{"id":"4cb182b1.06d15c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1551.1110382080078,"y":484.55556869506836,"z":"9adc6d3f.4fd9a","wires":[["77bc4fc2.cc583","5268669e.4e3c78"]]},{"id":"7625e08d.e0025","type":"comment","name":"ISBC cases returns failure to stop polling","info":"","comments":"","x":1601.6665344238281,"y":297.88886165618896,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"93a11316.da719","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1285.916648864746,"y":823.3333911895752,"z":"9adc6d3f.4fd9a","wires":[["b3148632.6019e8"]]},{"id":"b3148632.6019e8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1459.5000267028809,"y":824.8333911895752,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"d1d61570.0be3f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":648.6666641235352,"y":269.99997329711914,"z":"9adc6d3f.4fd9a","wires":[["8e0a1916.289ea8"]]},{"id":"8e0a1916.289ea8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":866.8889312744141,"y":272.888897895813,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"de42b2.dca01d5","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1055.000015258789,"y":901.9998970031738,"z":"9adc6d3f.4fd9a","wires":[["547a0900.632ad8","cfef6f4a.c8106"]]},{"id":"cfef6f4a.c8106","type":"call","name":"call: SaveRunningConfig","xml":"<call module=\"APPC\" rpc=\"SaveRunningConfig\" mode=\"sync\">","comments":"","outputs":1,"x":1314.750015258789,"y":900.833270072937,"z":"9adc6d3f.4fd9a","wires":[["bfd5ce67.f2b84"]]},{"id":"547a0900.632ad8","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$request-action`\">\n","comments":"","outputs":1,"x":1269.4998970031738,"y":992.4998931884766,"z":"9adc6d3f.4fd9a","wires":[["9e0e7bc6.f3ad08","2bc0abbb.b9c904"]]},{"id":"9e0e7bc6.f3ad08","type":"other","name":"Configure","xml":"<outcome value='Configure'>","comments":"","outputs":1,"x":1516.749900817871,"y":982.4165191650391,"z":"9adc6d3f.4fd9a","wires":[["43f68adb.c89264"]]},{"id":"2bc0abbb.b9c904","type":"other","name":"ConfigScale","xml":"<outcome value='ConfigScale'>","comments":"","outputs":1,"x":1521.5000228881836,"y":1049.4998941421509,"z":"9adc6d3f.4fd9a","wires":[["43f68adb.c89264"]]},{"id":"43f68adb.c89264","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1798.9165344238281,"y":1029.5832738876343,"z":"9adc6d3f.4fd9a","wires":[["65936072.2b5fa"]]},{"id":"65936072.2b5fa","type":"call","name":"call: UpdateAaiInfo","xml":"<call module=\"APPC\" rpc=\"UpdateAaiInfo\" mode=\"sync\">","comments":"","outputs":1,"x":820.3334465026855,"y":1139.9166431427002,"z":"9adc6d3f.4fd9a","wires":[["9151a526.f94b68"]]},{"id":"9151a526.f94b68","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1027.9167556762695,"y":1144.1666440963745,"z":"9adc6d3f.4fd9a","wires":[["1879d6b6.911e99"]]},{"id":"1879d6b6.911e99","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1222.083267211914,"y":1145.7498989105225,"z":"9adc6d3f.4fd9a","wires":[["e81a1fc0.a272c","f0dd7641.253498"]]},{"id":"e81a1fc0.a272c","type":"set","name":"set:  dcae-error message","xml":"<set>\n\t  <parameter name=\"dcae-error-message\" value=\"DG Workflow UpdateAaiInfo not found\"/>\n\t  ","comments":"","x":1529.2500228881836,"y":1120.3332686424255,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"f0dd7641.253498","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=\"DCAEERRORMESSAGE\" value=\"`$dcae-error-message`\"/>\n","comments":"","outputs":1,"x":1472.1666526794434,"y":1166.5832710266113,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"6518f897.340dd8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1721.0832748413086,"y":900.9998979568481,"z":"9adc6d3f.4fd9a","wires":[["186de19c.bcf0ae","407c43d8.cfa8ac"]]},{"id":"bfd5ce67.f2b84","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1528.5832748413086,"y":900.7498979568481,"z":"9adc6d3f.4fd9a","wires":[["6518f897.340dd8"]]},{"id":"186de19c.bcf0ae","type":"set","name":"set:  dcae-error message","xml":"<set>\n\t  <parameter name=\"dcae-error-message\" value=\"DG Workflow SaveRunningConfig not found\"/>\n\t ","comments":"","x":2030.0000305175781,"y":903.2498960494995,"z":"9adc6d3f.4fd9a","wires":[]},{"id":"407c43d8.cfa8ac","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=\"DCAEERRORMESSAGE\" value=\"`$dcae-error-message`\"/>\n","comments":"","outputs":1,"x":1974.4999084472656,"y":958.0832719802856,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"7421ecb2.1ac094","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":517.7777709960938,"y":156.66665649414062,"z":"9adc6d3f.4fd9a","wires":[["b891a8f2.0b2ce8","686bbe23.d037e"]]},{"id":"b891a8f2.0b2ce8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":785.7778053283691,"y":162.9999771118164,"z":"9adc6d3f.4fd9a","wires":[["17029b5a.574655"]]},{"id":"17029b5a.574655","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":948.7778053283691,"y":166.9999771118164,"z":"9adc6d3f.4fd9a","wires":[["8d2d875d.8b0af8"]]},{"id":"8d2d875d.8b0af8","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":1116.7778053283691,"y":165.9999771118164,"z":"9adc6d3f.4fd9a","wires":[[]]},{"id":"686bbe23.d037e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":779.7777786254883,"y":237.99999237060547,"z":"9adc6d3f.4fd9a","wires":[["7cedc144.223ff"]]},{"id":"7cedc144.223ff","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":957.1110610961914,"y":238.33336639404297,"z":"9adc6d3f.4fd9a","wires":[["1ab7b9f2.f91326"]]},{"id":"1ab7b9f2.f91326","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":1144.7777099609375,"y":236.33328437805176,"z":"9adc6d3f.4fd9a","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetAaiInfo.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetAaiInfo.json
index a238c0e03..047b5c5ea 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetAaiInfo.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetAaiInfo.json
@@ -78,7 +78,7 @@
             ]
         ],
         "x": 271.5,
-        "xml": "<execute plugin=\"org.openecomp.appc.aai.client.node.AAIResourceNode\" method=\"getAllVServersVnfcsInfo\">\n<parameter name=\"responsePrefix\" value=\"tmp.vnfInfo\" />\n",
+        "xml": "<execute plugin=\"org.onap.appc.aai.client.node.AAIResourceNode\" method=\"getAllVServersVnfcsInfo\">\n<parameter name=\"responsePrefix\" value=\"tmp.vnfInfo\" />\n",
         "y": 560,
         "z": "a83714d9.fe1b58"
     },
@@ -172,7 +172,7 @@
             ]
         ],
         "x": 385,
-        "xml": "<execute plugin=\"org.openecomp.appc.aai.client.node.AAIResourceNode\" method=\"getVnfInfo\">\n<parameter name=\"vnfId\" value=\"`$vnf-id`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.vnfInfo\" />\n",
+        "xml": "<execute plugin=\"org.onap.appc.aai.client.node.AAIResourceNode\" method=\"getVnfInfo\">\n<parameter name=\"vnfId\" value=\"`$vnf-id`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.vnfInfo\" />\n",
         "y": 141,
         "z": "a83714d9.fe1b58"
     },
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetAaiInfoTest.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetAaiInfoTest.json
index 8f28cc306..91c101abb 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetAaiInfoTest.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetAaiInfoTest.json
@@ -1 +1 @@
-[{"id":"824ef7fe.3f3a28","type":"dgstart","name":"DGSTART","outputs":1,"x":103.33332443237305,"y":37.222219467163086,"z":"2e3a20a4.cdd4b","wires":[["63f1353e.3afaec"]]},{"id":"63f1353e.3afaec","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":270.66666412353516,"y":71.66667461395264,"z":"2e3a20a4.cdd4b","wires":[["39441c46.1ce144"]]},{"id":"39441c46.1ce144","type":"method","name":"method GetAaiInfo","xml":"<method rpc='GetAaiInfoTest' mode='sync'>\n","comments":"","outputs":1,"x":465.66666412353516,"y":66.66667461395264,"z":"2e3a20a4.cdd4b","wires":[["69fc431f.857fdc"]]},{"id":"69fc431f.857fdc","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":113.41666412353516,"y":208.66667366027832,"z":"2e3a20a4.cdd4b","wires":[["d21e1229.c7233","75cc0c83.6ea414"]]},{"id":"75cc0c83.6ea414","type":"execute","name":"execute getAllVServersVnfcsInfo","xml":"<execute plugin=\"org.openecomp.appc.aai.client.node.AAIResourceNode\" method=\"getAllVServersVnfcsInfo\">\n<parameter name=\"responsePrefix\" value=\"tmp.vnfInfo\" />\n","comments":"","outputs":1,"x":360.16666412353516,"y":309.66667461395264,"z":"2e3a20a4.cdd4b","wires":[["b861bae7.ed7f38","e920d0c2.265e9"]]},{"id":"b861bae7.ed7f38","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":597.9166641235352,"y":308.16669273376465,"z":"2e3a20a4.cdd4b","wires":[["6536b658.4a6e98"]]},{"id":"e920d0c2.265e9","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":590.9166641235352,"y":373.9166946411133,"z":"2e3a20a4.cdd4b","wires":[["2e927b94.777bc4"]]},{"id":"6536b658.4a6e98","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":732.1666946411133,"y":307.41669368743896,"z":"2e3a20a4.cdd4b","wires":[["f5c71351.7eb9c"]]},{"id":"2e927b94.777bc4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":731.4166946411133,"y":373.9166946411133,"z":"2e3a20a4.cdd4b","wires":[["a3877152.03659"]]},{"id":"a3877152.03659","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value=\"`$tmp.vnfInfo.error-message`\" />\n\n\n\t","comments":"","x":921.1667022705078,"y":374.91669273376465,"z":"2e3a20a4.cdd4b","wires":[]},{"id":"d21e1229.c7233","type":"execute","name":"execute getVnfInfo","xml":"<execute plugin=\"org.openecomp.appc.aai.client.node.AAIResourceNode\" method=\"getVnfInfo\">\n<parameter name=\"vnfId\" value=\"`$vnf-id`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.vnfInfo\" />\n","comments":"","outputs":1,"x":357.66666412353516,"y":188.91667366027832,"z":"2e3a20a4.cdd4b","wires":[["a263590d.bf4bc8","883728c.1caaed8"]]},{"id":"a263590d.bf4bc8","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":541.4166641235352,"y":165.41667366027832,"z":"2e3a20a4.cdd4b","wires":[["6a5be154.0d7fd"]]},{"id":"6a5be154.0d7fd","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":692.4166984558105,"y":164.66667461395264,"z":"2e3a20a4.cdd4b","wires":[["b11705da.bdd1c8"]]},{"id":"b11705da.bdd1c8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value=\"Unable to get Vnf Info from ANAI\" />\n\n\n\t","comments":"","x":867.1666984558105,"y":149.16667366027832,"z":"2e3a20a4.cdd4b","wires":[]},{"id":"883728c.1caaed8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":542.9166641235352,"y":236.66667556762695,"z":"2e3a20a4.cdd4b","wires":[["37a2c648.d6328a"]]},{"id":"37a2c648.d6328a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":690.1666984558105,"y":236.16667556762695,"z":"2e3a20a4.cdd4b","wires":[["b02272fd.969a9"]]},{"id":"b02272fd.969a9","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value=\"`$tmp.vnfInfo.error-message`\" />\n\n\n\t","comments":"","x":866.4166984558105,"y":228.91667556762695,"z":"2e3a20a4.cdd4b","wires":[]},{"id":"bec2087a.fef188","type":"set","name":"set vnf-type, name","xml":"<set>\n<!--<parameter name='vnf-type' value='`$tmp.vnfInfo.vnf.vnf-type`' /> \n<parameter name='vnf-name' value='`$tmp.vnfInfo.vnf.vnf-name`' /> -->\n<parameter name='vnf-type' value='vUSP - vDBE-IPX HUB' /> \n<parameter name='vnf-name' value='vUSP - vDBE-IPX HUB' />\n\n","comments":"","x":150.16666412353516,"y":439.16669368743896,"z":"2e3a20a4.cdd4b","wires":[]},{"id":"f5c71351.7eb9c","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value=\"Unable to get VServer Info from A&amp;AI\" />\n\n\n\t","comments":"","x":909.1666984558105,"y":307.66669273376465,"z":"2e3a20a4.cdd4b","wires":[]}]
+[{"id":"824ef7fe.3f3a28","type":"dgstart","name":"DGSTART","outputs":1,"x":103.33332443237305,"y":37.222219467163086,"z":"2e3a20a4.cdd4b","wires":[["63f1353e.3afaec"]]},{"id":"63f1353e.3afaec","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":270.66666412353516,"y":71.66667461395264,"z":"2e3a20a4.cdd4b","wires":[["39441c46.1ce144"]]},{"id":"39441c46.1ce144","type":"method","name":"method GetAaiInfo","xml":"<method rpc='GetAaiInfoTest' mode='sync'>\n","comments":"","outputs":1,"x":465.66666412353516,"y":66.66667461395264,"z":"2e3a20a4.cdd4b","wires":[["69fc431f.857fdc"]]},{"id":"69fc431f.857fdc","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":113.41666412353516,"y":208.66667366027832,"z":"2e3a20a4.cdd4b","wires":[["d21e1229.c7233","75cc0c83.6ea414"]]},{"id":"75cc0c83.6ea414","type":"execute","name":"execute getAllVServersVnfcsInfo","xml":"<execute plugin=\"org.onap.appc.aai.client.node.AAIResourceNode\" method=\"getAllVServersVnfcsInfo\">\n<parameter name=\"responsePrefix\" value=\"tmp.vnfInfo\" />\n","comments":"","outputs":1,"x":360.16666412353516,"y":309.66667461395264,"z":"2e3a20a4.cdd4b","wires":[["b861bae7.ed7f38","e920d0c2.265e9"]]},{"id":"b861bae7.ed7f38","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":597.9166641235352,"y":308.16669273376465,"z":"2e3a20a4.cdd4b","wires":[["6536b658.4a6e98"]]},{"id":"e920d0c2.265e9","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":590.9166641235352,"y":373.9166946411133,"z":"2e3a20a4.cdd4b","wires":[["2e927b94.777bc4"]]},{"id":"6536b658.4a6e98","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":732.1666946411133,"y":307.41669368743896,"z":"2e3a20a4.cdd4b","wires":[["f5c71351.7eb9c"]]},{"id":"2e927b94.777bc4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":731.4166946411133,"y":373.9166946411133,"z":"2e3a20a4.cdd4b","wires":[["a3877152.03659"]]},{"id":"a3877152.03659","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value=\"`$tmp.vnfInfo.error-message`\" />\n\n\n\t","comments":"","x":921.1667022705078,"y":374.91669273376465,"z":"2e3a20a4.cdd4b","wires":[]},{"id":"d21e1229.c7233","type":"execute","name":"execute getVnfInfo","xml":"<execute plugin=\"org.onap.appc.aai.client.node.AAIResourceNode\" method=\"getVnfInfo\">\n<parameter name=\"vnfId\" value=\"`$vnf-id`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.vnfInfo\" />\n","comments":"","outputs":1,"x":357.66666412353516,"y":188.91667366027832,"z":"2e3a20a4.cdd4b","wires":[["a263590d.bf4bc8","883728c.1caaed8"]]},{"id":"a263590d.bf4bc8","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":541.4166641235352,"y":165.41667366027832,"z":"2e3a20a4.cdd4b","wires":[["6a5be154.0d7fd"]]},{"id":"6a5be154.0d7fd","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":692.4166984558105,"y":164.66667461395264,"z":"2e3a20a4.cdd4b","wires":[["b11705da.bdd1c8"]]},{"id":"b11705da.bdd1c8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value=\"Unable to get Vnf Info from ANAI\" />\n\n\n\t","comments":"","x":867.1666984558105,"y":149.16667366027832,"z":"2e3a20a4.cdd4b","wires":[]},{"id":"883728c.1caaed8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":542.9166641235352,"y":236.66667556762695,"z":"2e3a20a4.cdd4b","wires":[["37a2c648.d6328a"]]},{"id":"37a2c648.d6328a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":690.1666984558105,"y":236.16667556762695,"z":"2e3a20a4.cdd4b","wires":[["b02272fd.969a9"]]},{"id":"b02272fd.969a9","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value=\"`$tmp.vnfInfo.error-message`\" />\n\n\n\t","comments":"","x":866.4166984558105,"y":228.91667556762695,"z":"2e3a20a4.cdd4b","wires":[]},{"id":"bec2087a.fef188","type":"set","name":"set vnf-type, name","xml":"<set>\n<!--<parameter name='vnf-type' value='`$tmp.vnfInfo.vnf.vnf-type`' /> \n<parameter name='vnf-name' value='`$tmp.vnfInfo.vnf.vnf-name`' /> -->\n<parameter name='vnf-type' value='vUSP - vDBE-IPX HUB' /> \n<parameter name='vnf-name' value='vUSP - vDBE-IPX HUB' />\n\n","comments":"","x":150.16666412353516,"y":439.16669368743896,"z":"2e3a20a4.cdd4b","wires":[]},{"id":"f5c71351.7eb9c","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value=\"Unable to get VServer Info from A&amp;AI\" />\n\n\n\t","comments":"","x":909.1666984558105,"y":307.66669273376465,"z":"2e3a20a4.cdd4b","wires":[]}]
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 ea99a5335..3b7e70584 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.openecomp.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.openecomp.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.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":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetDeviceRunningConfig.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetDeviceRunningConfig.json
index 29c13707e..0297491fa 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetDeviceRunningConfig.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetDeviceRunningConfig.json
@@ -1 +1 @@
-[{"id":"73fd49f3.a1d278","type":"dgstart","name":"DGSTART","outputs":1,"x":208.75,"y":98.75,"z":"d5c2f7ab.9eeb78","wires":[["98dbdd7c.fe8c3"]]},{"id":"53ce8877.2ecf68","type":"method","name":"method: GetDeviceRunningConfig","xml":"<method rpc='GetDeviceRunningConfig' mode='sync'>\n","comments":"","outputs":1,"x":645.1785430908203,"y":89.17857456207275,"z":"d5c2f7ab.9eeb78","wires":[["71df0315.00e07c"]]},{"id":"98dbdd7c.fe8c3","type":"service-logic","name":"APPC 4.0.0","module":"APPC","version":"3.1.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":399.75,"y":96.75,"z":"d5c2f7ab.9eeb78","wires":[["53ce8877.2ecf68"]]},{"id":"a7b3e993.df4158","type":"set","name":"set Request Parameters","xml":"<set>\n<parameter name='vnf-type' value=\"`$config.vnf-type`\" />\n<parameter name='vnf-name' value=\"`$config.vnf-name`\" />\n<parameter name='protocol' value=\"`$config.protocol`\" />\n<parameter name='hostIpAddress' value=\"`$config.host-ip-address`\" />\n<parameter name='userName' value=\"`$config.user-name`\" />\n<parameter name='password' value=\"`$config.password`\" />\n<parameter name='portNumber' value=\"`$config.port-number`\" />\n","comments":"","x":571.0834197998047,"y":167.74999570846558,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"f83cb7cd.e4dd78","type":"execute","name":"execute: Get Rest Configuration","xml":"<execute plugin=\"com.att.sdnctl.restconf.RestConfCallNode\" method=\"getConfiguration\">\n<parameter name=\"hostIpAddress\" value=\"`$hostIpAddress`\" />\n<parameter name=\"protocol\" value=\"`$protocol`\" />\n<parameter name=\"responsePrefix\" value=\"restconf\" />\n","comments":"","outputs":1,"x":704.75,"y":512.75,"z":"d5c2f7ab.9eeb78","wires":[["198a50e4.1a084f","f26ecc71.80f99","813bb5a6.7d4a68"]]},{"id":"855c15a1.c5faf8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"\"/>\n<parameter name=\"dcae-error-message\" value=\"Unable to Get the Configuration\"/>\n","comments":"","x":2005.7500381469727,"y":622.7500162124634,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"198a50e4.1a084f","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":961.75,"y":580.75,"z":"d5c2f7ab.9eeb78","wires":[["d887442e.fdbd68"]]},{"id":"d51d7787.158188","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":984.75,"y":632.75,"z":"d5c2f7ab.9eeb78","wires":[["2880086.7157bf8"]]},{"id":"2880086.7157bf8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$restconf.config`\" />\n","comments":"","x":1213.75,"y":620.75,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"f26ecc71.80f99","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":800.75,"y":632.75,"z":"d5c2f7ab.9eeb78","wires":[["d51d7787.158188"]]},{"id":"d887442e.fdbd68","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1792.7500343322754,"y":612.7500648498535,"z":"d5c2f7ab.9eeb78","wires":[["855c15a1.c5faf8"]]},{"id":"71df0315.00e07c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":301.75,"y":166.75,"z":"d5c2f7ab.9eeb78","wires":[["a7b3e993.df4158","2fbf7d15.74f302"]]},{"id":"29cf8ea9.51acb2","type":"outcome","name":"RESTCONF-XML","xml":"<outcome value='RESTCONF-XML'>\n","comments":"","outputs":1,"x":346.75,"y":513.75,"z":"d5c2f7ab.9eeb78","wires":[["cbfbcb9b.61f818"]]},{"id":"cbfbcb9b.61f818","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":506.75,"y":464.75,"z":"d5c2f7ab.9eeb78","wires":[["f83cb7cd.e4dd78"]]},{"id":"2fbf7d15.74f302","type":"switchNode","name":"switch : Protocol","xml":"<switch test=\"`$protocol`\">\n","comments":"","outputs":1,"x":176.75,"y":268.75,"z":"d5c2f7ab.9eeb78","wires":[["29cf8ea9.51acb2","47521138.e1182","aa86a367.9e31","9e29ccc9.7ecc5","cb04f713.845c98","d235c42e.58bf08"]]},{"id":"47521138.e1182","type":"outcome","name":"CLI","xml":"<outcome value='CLI'>\n","comments":"","outputs":1,"x":370.75,"y":269.75,"z":"d5c2f7ab.9eeb78","wires":[["6f3ae8b7.9b6778"]]},{"id":"e982ff2.bf8a4","type":"get-resource","name":"get-resource GET_CONFIG_TEMPLATE","xml":"<get-resource\n\tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey=\"SELECT TEMPLATE FROM GET_CONFIG_TEMPLATE WHERE vnf_type = $vnf-type ;\"\n    force='true'\n\tpfx='config-template'>\n","comments":"","outputs":1,"x":754.7499694824219,"y":247.75,"z":"d5c2f7ab.9eeb78","wires":[["48deb1d2.fcd28","935998ed.ba2098"]]},{"id":"6f3ae8b7.9b6778","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":510.7499694824219,"y":270.75,"z":"d5c2f7ab.9eeb78","wires":[["e982ff2.bf8a4","5f0176d.376ce88"]]},{"id":"ede520ec.0c179","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"\"/>\n<parameter name=\"dcae-error-message\" value=\"Unable to Read Config Template\"/>\n\t","comments":"","x":1331.7499694824219,"y":274.75,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"98a7d137.1e399","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1160.7499694824219,"y":275.75,"z":"d5c2f7ab.9eeb78","wires":[["ede520ec.0c179"]]},{"id":"41ac5929.942928","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$cliOutput`\" />\n","comments":"","x":1207.75,"y":490.75004863739014,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"5f0176d.376ce88","type":"execute","name":"execute: Get CLI RunningConfig","xml":"<configure adaptor='org.openecomp.appc.ccadaptor.ConfigComponentAdaptor' key='GetCliRunningConfig'>\n<parameter name=\"Host_ip_address\" value=\"`$hostIpAddress`\" />\n<parameter name=\"User_name\" value=\"`$userName`\" />\n<parameter name=\"Password\" value=\"`$password`\" />\n<parameter name=\"Port_number\" value=\"`$portNumber`\" />\n<parameter name=\"Get_config_template\" value=\"`$config-template.TEMPLATE`\" />\n","comments":"","outputs":1,"x":720.7500152587891,"y":336.7500123977661,"z":"d5c2f7ab.9eeb78","wires":[["78d9a2f9.46003c","97890ce8.6b316","98f67919.c738f8"]]},{"id":"e6da77d0.fadda8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":986.75,"y":435.75006103515625,"z":"d5c2f7ab.9eeb78","wires":[["41ac5929.942928"]]},{"id":"48deb1d2.fcd28","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1007.7499694824219,"y":287.75,"z":"d5c2f7ab.9eeb78","wires":[["98a7d137.1e399"]]},{"id":"78d9a2f9.46003c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":812.75,"y":433.75006103515625,"z":"d5c2f7ab.9eeb78","wires":[["e6da77d0.fadda8"]]},{"id":"813bb5a6.7d4a68","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":970.75,"y":535.75,"z":"d5c2f7ab.9eeb78","wires":[["d887442e.fdbd68"]]},{"id":"935998ed.ba2098","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1006.7499694824219,"y":216.75,"z":"d5c2f7ab.9eeb78","wires":[["98a7d137.1e399"]]},{"id":"97890ce8.6b316","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":989.7500076293945,"y":351.7499933242798,"z":"d5c2f7ab.9eeb78","wires":[["560e0fe9.a63f6"]]},{"id":"98f67919.c738f8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":980.75,"y":390.75,"z":"d5c2f7ab.9eeb78","wires":[["d887442e.fdbd68"]]},{"id":"fde847ff.94d008","type":"comment","name":"User Story ID: US731106","info":"Developed by Brinda Santh <bs2796@att.com>","comments":"","x":887.7499694824219,"y":28.75,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"aa86a367.9e31","type":"outcome","name":"NETCONF-XML","xml":"<outcome value='NETCONF-XML'>\n","comments":"","outputs":1,"x":281.75,"y":676.75,"z":"d5c2f7ab.9eeb78","wires":[["e84e48c0.7bd1f8"]]},{"id":"e84e48c0.7bd1f8","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":453.75,"y":676.75,"z":"d5c2f7ab.9eeb78","wires":[["567cae24.a2056"]]},{"id":"567cae24.a2056","type":"execute","name":"execute: Get XML RunningConfig","xml":"<configure adaptor='org.openecomp.appc.ccadaptor.ConfigComponentAdaptor' key='xml-getrunningconfig'>\n<parameter name=\"Host_ip_address\" value=\"`$hostIpAddress`\" />\n<parameter name=\"User_name\" value=\"`$userName`\" />\n<parameter name=\"Password\" value=\"`$password`\" />\n<parameter name=\"Port_number\" value=\"`$portNumber`\" />\n<parameter name=\"Protocol\" value=\"`$protocol`\" />\n","comments":"","outputs":1,"x":683.6071929931641,"y":705.892858505249,"z":"d5c2f7ab.9eeb78","wires":[["50a8e434.940b6c","66893930.a5f318","d6c04b27.53f0c8"]]},{"id":"50a8e434.940b6c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1009.75,"y":687.75,"z":"d5c2f7ab.9eeb78","wires":[["560e0fe9.a63f6"]]},{"id":"66893930.a5f318","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1010.75,"y":736.75,"z":"d5c2f7ab.9eeb78","wires":[["d887442e.fdbd68"]]},{"id":"9e29ccc9.7ecc5","type":"outcome","name":"RESTCONF","xml":"<outcome value='RESTCONF'>\n","comments":"","outputs":1,"x":358.75,"y":438.75,"z":"d5c2f7ab.9eeb78","wires":[["cbfbcb9b.61f818"]]},{"id":"d6c04b27.53f0c8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":830.75,"y":784.75,"z":"d5c2f7ab.9eeb78","wires":[["907796bc.3521c8"]]},{"id":"907796bc.3521c8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1006.75,"y":783.75,"z":"d5c2f7ab.9eeb78","wires":[["230d353a.82deba"]]},{"id":"230d353a.82deba","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$xmlRunningConfigOutput `\" />\n","comments":"","x":1211.4169387817383,"y":781.7500133514404,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"cb04f713.845c98","type":"outcome","name":"CHEF","xml":"<outcome value='CHEF'>\n","comments":"","outputs":1,"x":252.75,"y":773.75,"z":"d5c2f7ab.9eeb78","wires":[["87e6927d.8c87a"]]},{"id":"2c9ce105.810cce","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":465.74999237060547,"y":821.4166603088379,"z":"d5c2f7ab.9eeb78","wires":[["830e8c40.09ea8"]]},{"id":"830e8c40.09ea8","type":"execute","name":"execute: getChefRunningConfig","xml":"<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"getConfigFilesByVnfVmNCategory\">\n<parameter name=\"fileCategory\" value=\"device_configuration\" />\n<parameter name='vnfId' value=\"`$config.vnf-id`\" />\n<parameter name='vmName' value=\"`$config.vm-name`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.deviceconfig\" />\n","comments":"","outputs":1,"x":701.8928680419922,"y":865.6072664260864,"z":"d5c2f7ab.9eeb78","wires":[["f10cdc38.2c8fd","d81f053f.e21898","8b94b394.610ac"]]},{"id":"8b94b394.610ac","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":896.4642944335938,"y":961.89284324646,"z":"d5c2f7ab.9eeb78","wires":[["ff4e13e0.ba24a"]]},{"id":"ff4e13e0.ba24a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1195.4167976379395,"y":996.4166450500488,"z":"d5c2f7ab.9eeb78","wires":[["bd7122ae.6d345"]]},{"id":"d81f053f.e21898","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1003.750129699707,"y":897.7500658035278,"z":"d5c2f7ab.9eeb78","wires":[[]]},{"id":"f10cdc38.2c8fd","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1002.750129699707,"y":848.7500658035278,"z":"d5c2f7ab.9eeb78","wires":[["3be4b321.a7b82c"]]},{"id":"bd7122ae.6d345","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$tmp.deviceconfig.file-content`\" />\n","comments":"","x":1431.750144958496,"y":1000.08331823349,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"3be4b321.a7b82c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1178.750129699707,"y":852.7500658035278,"z":"d5c2f7ab.9eeb78","wires":[["68fcda28.298664"]]},{"id":"68fcda28.298664","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"\"/>\n<parameter name=\"dcae-error-message\" value=\"`$tmp.deviceconfig.error-message`\"/>\n\n","comments":"","x":1329.0834503173828,"y":832.8929662704468,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"d47a34b9.96fae8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"\"/>\n<parameter name=\"dcae-error-message\" value=\"`$error-message`\"/>\n","comments":"","x":1520.75,"y":398.75,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"560e0fe9.a63f6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1345.75,"y":402.75,"z":"d5c2f7ab.9eeb78","wires":[["d47a34b9.96fae8"]]},{"id":"d235c42e.58bf08","type":"outcome","name":" Ansible","xml":"<outcome value='Ansible'>\n","comments":"","outputs":1,"x":227.19049835205078,"y":891.4763145446777,"z":"d5c2f7ab.9eeb78","wires":[["7994c061.4c34b"]]},{"id":"87e6927d.8c87a","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":413.33331298828125,"y":953.333251953125,"z":"d5c2f7ab.9eeb78","wires":[["b2457e62.0d6be"]]},{"id":"b2457e62.0d6be","type":"call","name":"call  GetTemplateConfig_Chef","xml":"<call module='APPC' rpc='GetTemplateConfig_Chef' mode='sync' >\n","comments":"","outputs":1,"x":659.2857055664062,"y":954.0477857589722,"z":"d5c2f7ab.9eeb78","wires":[["e573827e.36bb9","35aad49a.f87bcc","7142f414.35002c"]]},{"id":"163d15dd.b3498a","type":"call","name":"call  GetTemplateConfig_Ansible","xml":"<call module='APPC' rpc='GetTemplateConfig_Ansible' mode='sync' >\n","comments":"","outputs":1,"x":597.857063293457,"y":1235.476152420044,"z":"d5c2f7ab.9eeb78","wires":[["e6a86a3a.62afb8","80beb099.eee58","9ba09f64.03e81"]]},{"id":"35aad49a.f87bcc","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":722.6190185546875,"y":1095.7143206596375,"z":"d5c2f7ab.9eeb78","wires":[["d887442e.fdbd68"]]},{"id":"e573827e.36bb9","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":721.6190185546875,"y":1046.7143206596375,"z":"d5c2f7ab.9eeb78","wires":[["73395769.c7fd38"]]},{"id":"73395769.c7fd38","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":897.6190185546875,"y":1050.7143206596375,"z":"d5c2f7ab.9eeb78","wires":[["ebfee93d.0a6c28"]]},{"id":"ebfee93d.0a6c28","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"\"/>\n<parameter name=\"dcae-error-message\" value=\"`$tmp.deviceconfig.error-message`\"/>\n\n","comments":"","x":1089.6190185546875,"y":1043.7143206596375,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"7142f414.35002c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":660.9523315429688,"y":1169.047694683075,"z":"d5c2f7ab.9eeb78","wires":[["6ed3304a.f8835"]]},{"id":"6ed3304a.f8835","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":823.9523315429688,"y":1169.047694683075,"z":"d5c2f7ab.9eeb78","wires":[["99960733.d8c138"]]},{"id":"99960733.d8c138","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$tmp.deviceconfig.file-content`\" />\n<parameter name='output.status.code' value='`$org.openecomp.appc.adapter.ansible.result.code`' />\n<parameter name='output.status.message' value='`$org.openecomp.appc.adapter.ansible.message`'/>\n<parameter name='output.status.results' value = '`$output.status.results`'/>\n","comments":"","x":1026.9523315429688,"y":1171.047694683075,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"7994c061.4c34b","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":409.52384185791016,"y":1150.4760665893555,"z":"d5c2f7ab.9eeb78","wires":[["163d15dd.b3498a"]]},{"id":"80beb099.eee58","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":831.1903610229492,"y":1300.4761695861816,"z":"d5c2f7ab.9eeb78","wires":[["d887442e.fdbd68"]]},{"id":"e6a86a3a.62afb8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":830.1903610229492,"y":1251.4761695861816,"z":"d5c2f7ab.9eeb78","wires":[["565cf063.e3efb"]]},{"id":"565cf063.e3efb","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1006.1903610229492,"y":1255.4761695861816,"z":"d5c2f7ab.9eeb78","wires":[["484bbab0.c63454"]]},{"id":"484bbab0.c63454","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"\"/>\n<parameter name=\"dcae-error-message\" value=\"`$tmp.deviceconfig.error-message`\"/>\n\n","comments":"","x":1198.1903381347656,"y":1248.4761772155762,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"9ba09f64.03e81","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":769.5236740112305,"y":1373.8095436096191,"z":"d5c2f7ab.9eeb78","wires":[["6b8fab54.184374"]]},{"id":"6b8fab54.184374","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":932.5236740112305,"y":1373.8095436096191,"z":"d5c2f7ab.9eeb78","wires":[["5dadab18.730154"]]},{"id":"5dadab18.730154","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$tmp.deviceconfig.file-content`\" />\n<parameter name='code' value='`$output.status.code`' />\n<parameter name='message' value='`$output.status.message`'/>\n<parameter name='Status' value = '`$output.status.results`'/>\n","comments":"","x":1135.5236282348633,"y":1375.809624671936,"z":"d5c2f7ab.9eeb78","wires":[]}]
+[{"id":"73fd49f3.a1d278","type":"dgstart","name":"DGSTART","outputs":1,"x":208.75,"y":98.75,"z":"d5c2f7ab.9eeb78","wires":[["98dbdd7c.fe8c3"]]},{"id":"53ce8877.2ecf68","type":"method","name":"method: GetDeviceRunningConfig","xml":"<method rpc='GetDeviceRunningConfig' mode='sync'>\n","comments":"","outputs":1,"x":645.1785430908203,"y":89.17857456207275,"z":"d5c2f7ab.9eeb78","wires":[["71df0315.00e07c"]]},{"id":"98dbdd7c.fe8c3","type":"service-logic","name":"APPC 4.0.0","module":"APPC","version":"3.1.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":399.75,"y":96.75,"z":"d5c2f7ab.9eeb78","wires":[["53ce8877.2ecf68"]]},{"id":"a7b3e993.df4158","type":"set","name":"set Request Parameters","xml":"<set>\n<parameter name='vnf-type' value=\"`$config.vnf-type`\" />\n<parameter name='vnf-name' value=\"`$config.vnf-name`\" />\n<parameter name='protocol' value=\"`$config.protocol`\" />\n<parameter name='hostIpAddress' value=\"`$config.host-ip-address`\" />\n<parameter name='userName' value=\"`$config.user-name`\" />\n<parameter name='password' value=\"`$config.password`\" />\n<parameter name='portNumber' value=\"`$config.port-number`\" />\n","comments":"","x":571.0834197998047,"y":167.74999570846558,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"f83cb7cd.e4dd78","type":"execute","name":"execute: Get Rest Configuration","xml":"<execute plugin=\"com.att.sdnctl.restconf.RestConfCallNode\" method=\"getConfiguration\">\n<parameter name=\"hostIpAddress\" value=\"`$hostIpAddress`\" />\n<parameter name=\"protocol\" value=\"`$protocol`\" />\n<parameter name=\"responsePrefix\" value=\"restconf\" />\n","comments":"","outputs":1,"x":704.75,"y":512.75,"z":"d5c2f7ab.9eeb78","wires":[["198a50e4.1a084f","f26ecc71.80f99","813bb5a6.7d4a68"]]},{"id":"855c15a1.c5faf8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"\"/>\n<parameter name=\"dcae-error-message\" value=\"Unable to Get the Configuration\"/>\n","comments":"","x":2005.7500381469727,"y":622.7500162124634,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"198a50e4.1a084f","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":961.75,"y":580.75,"z":"d5c2f7ab.9eeb78","wires":[["d887442e.fdbd68"]]},{"id":"d51d7787.158188","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":984.75,"y":632.75,"z":"d5c2f7ab.9eeb78","wires":[["2880086.7157bf8"]]},{"id":"2880086.7157bf8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$restconf.config`\" />\n","comments":"","x":1213.75,"y":620.75,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"f26ecc71.80f99","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":800.75,"y":632.75,"z":"d5c2f7ab.9eeb78","wires":[["d51d7787.158188"]]},{"id":"d887442e.fdbd68","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1792.7500343322754,"y":612.7500648498535,"z":"d5c2f7ab.9eeb78","wires":[["855c15a1.c5faf8"]]},{"id":"71df0315.00e07c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":301.75,"y":166.75,"z":"d5c2f7ab.9eeb78","wires":[["a7b3e993.df4158","2fbf7d15.74f302"]]},{"id":"29cf8ea9.51acb2","type":"outcome","name":"RESTCONF-XML","xml":"<outcome value='RESTCONF-XML'>\n","comments":"","outputs":1,"x":346.75,"y":513.75,"z":"d5c2f7ab.9eeb78","wires":[["cbfbcb9b.61f818"]]},{"id":"cbfbcb9b.61f818","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":506.75,"y":464.75,"z":"d5c2f7ab.9eeb78","wires":[["f83cb7cd.e4dd78"]]},{"id":"2fbf7d15.74f302","type":"switchNode","name":"switch : Protocol","xml":"<switch test=\"`$protocol`\">\n","comments":"","outputs":1,"x":176.75,"y":268.75,"z":"d5c2f7ab.9eeb78","wires":[["29cf8ea9.51acb2","47521138.e1182","aa86a367.9e31","9e29ccc9.7ecc5","cb04f713.845c98","d235c42e.58bf08"]]},{"id":"47521138.e1182","type":"outcome","name":"CLI","xml":"<outcome value='CLI'>\n","comments":"","outputs":1,"x":370.75,"y":269.75,"z":"d5c2f7ab.9eeb78","wires":[["6f3ae8b7.9b6778"]]},{"id":"e982ff2.bf8a4","type":"get-resource","name":"get-resource GET_CONFIG_TEMPLATE","xml":"<get-resource\n\tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey=\"SELECT TEMPLATE FROM GET_CONFIG_TEMPLATE WHERE vnf_type = $vnf-type ;\"\n    force='true'\n\tpfx='config-template'>\n","comments":"","outputs":1,"x":754.7499694824219,"y":247.75,"z":"d5c2f7ab.9eeb78","wires":[["48deb1d2.fcd28","935998ed.ba2098"]]},{"id":"6f3ae8b7.9b6778","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":510.7499694824219,"y":270.75,"z":"d5c2f7ab.9eeb78","wires":[["e982ff2.bf8a4","5f0176d.376ce88"]]},{"id":"ede520ec.0c179","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"\"/>\n<parameter name=\"dcae-error-message\" value=\"Unable to Read Config Template\"/>\n\t","comments":"","x":1331.7499694824219,"y":274.75,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"98a7d137.1e399","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1160.7499694824219,"y":275.75,"z":"d5c2f7ab.9eeb78","wires":[["ede520ec.0c179"]]},{"id":"41ac5929.942928","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$cliOutput`\" />\n","comments":"","x":1207.75,"y":490.75004863739014,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"5f0176d.376ce88","type":"execute","name":"execute: Get CLI RunningConfig","xml":"<configure adaptor='org.onap.appc.ccadaptor.ConfigComponentAdaptor' key='GetCliRunningConfig'>\n<parameter name=\"Host_ip_address\" value=\"`$hostIpAddress`\" />\n<parameter name=\"User_name\" value=\"`$userName`\" />\n<parameter name=\"Password\" value=\"`$password`\" />\n<parameter name=\"Port_number\" value=\"`$portNumber`\" />\n<parameter name=\"Get_config_template\" value=\"`$config-template.TEMPLATE`\" />\n","comments":"","outputs":1,"x":720.7500152587891,"y":336.7500123977661,"z":"d5c2f7ab.9eeb78","wires":[["78d9a2f9.46003c","97890ce8.6b316","98f67919.c738f8"]]},{"id":"e6da77d0.fadda8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":986.75,"y":435.75006103515625,"z":"d5c2f7ab.9eeb78","wires":[["41ac5929.942928"]]},{"id":"48deb1d2.fcd28","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1007.7499694824219,"y":287.75,"z":"d5c2f7ab.9eeb78","wires":[["98a7d137.1e399"]]},{"id":"78d9a2f9.46003c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":812.75,"y":433.75006103515625,"z":"d5c2f7ab.9eeb78","wires":[["e6da77d0.fadda8"]]},{"id":"813bb5a6.7d4a68","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":970.75,"y":535.75,"z":"d5c2f7ab.9eeb78","wires":[["d887442e.fdbd68"]]},{"id":"935998ed.ba2098","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1006.7499694824219,"y":216.75,"z":"d5c2f7ab.9eeb78","wires":[["98a7d137.1e399"]]},{"id":"97890ce8.6b316","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":989.7500076293945,"y":351.7499933242798,"z":"d5c2f7ab.9eeb78","wires":[["560e0fe9.a63f6"]]},{"id":"98f67919.c738f8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":980.75,"y":390.75,"z":"d5c2f7ab.9eeb78","wires":[["d887442e.fdbd68"]]},{"id":"fde847ff.94d008","type":"comment","name":"User Story ID: US731106","info":"Developed by Brinda Santh <bs2796@att.com>","comments":"","x":887.7499694824219,"y":28.75,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"aa86a367.9e31","type":"outcome","name":"NETCONF-XML","xml":"<outcome value='NETCONF-XML'>\n","comments":"","outputs":1,"x":281.75,"y":676.75,"z":"d5c2f7ab.9eeb78","wires":[["e84e48c0.7bd1f8"]]},{"id":"e84e48c0.7bd1f8","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":453.75,"y":676.75,"z":"d5c2f7ab.9eeb78","wires":[["567cae24.a2056"]]},{"id":"567cae24.a2056","type":"execute","name":"execute: Get XML RunningConfig","xml":"<configure adaptor='org.onap.appc.ccadaptor.ConfigComponentAdaptor' key='xml-getrunningconfig'>\n<parameter name=\"Host_ip_address\" value=\"`$hostIpAddress`\" />\n<parameter name=\"User_name\" value=\"`$userName`\" />\n<parameter name=\"Password\" value=\"`$password`\" />\n<parameter name=\"Port_number\" value=\"`$portNumber`\" />\n<parameter name=\"Protocol\" value=\"`$protocol`\" />\n","comments":"","outputs":1,"x":683.6071929931641,"y":705.892858505249,"z":"d5c2f7ab.9eeb78","wires":[["50a8e434.940b6c","66893930.a5f318","d6c04b27.53f0c8"]]},{"id":"50a8e434.940b6c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1009.75,"y":687.75,"z":"d5c2f7ab.9eeb78","wires":[["560e0fe9.a63f6"]]},{"id":"66893930.a5f318","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1010.75,"y":736.75,"z":"d5c2f7ab.9eeb78","wires":[["d887442e.fdbd68"]]},{"id":"9e29ccc9.7ecc5","type":"outcome","name":"RESTCONF","xml":"<outcome value='RESTCONF'>\n","comments":"","outputs":1,"x":358.75,"y":438.75,"z":"d5c2f7ab.9eeb78","wires":[["cbfbcb9b.61f818"]]},{"id":"d6c04b27.53f0c8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":830.75,"y":784.75,"z":"d5c2f7ab.9eeb78","wires":[["907796bc.3521c8"]]},{"id":"907796bc.3521c8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1006.75,"y":783.75,"z":"d5c2f7ab.9eeb78","wires":[["230d353a.82deba"]]},{"id":"230d353a.82deba","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$xmlRunningConfigOutput `\" />\n","comments":"","x":1211.4169387817383,"y":781.7500133514404,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"cb04f713.845c98","type":"outcome","name":"CHEF","xml":"<outcome value='CHEF'>\n","comments":"","outputs":1,"x":252.75,"y":773.75,"z":"d5c2f7ab.9eeb78","wires":[["87e6927d.8c87a"]]},{"id":"2c9ce105.810cce","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":465.74999237060547,"y":821.4166603088379,"z":"d5c2f7ab.9eeb78","wires":[["830e8c40.09ea8"]]},{"id":"830e8c40.09ea8","type":"execute","name":"execute: getChefRunningConfig","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getConfigFilesByVnfVmNCategory\">\n<parameter name=\"fileCategory\" value=\"device_configuration\" />\n<parameter name='vnfId' value=\"`$config.vnf-id`\" />\n<parameter name='vmName' value=\"`$config.vm-name`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.deviceconfig\" />\n","comments":"","outputs":1,"x":701.8928680419922,"y":865.6072664260864,"z":"d5c2f7ab.9eeb78","wires":[["f10cdc38.2c8fd","d81f053f.e21898","8b94b394.610ac"]]},{"id":"8b94b394.610ac","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":896.4642944335938,"y":961.89284324646,"z":"d5c2f7ab.9eeb78","wires":[["ff4e13e0.ba24a"]]},{"id":"ff4e13e0.ba24a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1195.4167976379395,"y":996.4166450500488,"z":"d5c2f7ab.9eeb78","wires":[["bd7122ae.6d345"]]},{"id":"d81f053f.e21898","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1003.750129699707,"y":897.7500658035278,"z":"d5c2f7ab.9eeb78","wires":[[]]},{"id":"f10cdc38.2c8fd","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1002.750129699707,"y":848.7500658035278,"z":"d5c2f7ab.9eeb78","wires":[["3be4b321.a7b82c"]]},{"id":"bd7122ae.6d345","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$tmp.deviceconfig.file-content`\" />\n","comments":"","x":1431.750144958496,"y":1000.08331823349,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"3be4b321.a7b82c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1178.750129699707,"y":852.7500658035278,"z":"d5c2f7ab.9eeb78","wires":[["68fcda28.298664"]]},{"id":"68fcda28.298664","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"\"/>\n<parameter name=\"dcae-error-message\" value=\"`$tmp.deviceconfig.error-message`\"/>\n\n","comments":"","x":1329.0834503173828,"y":832.8929662704468,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"d47a34b9.96fae8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"\"/>\n<parameter name=\"dcae-error-message\" value=\"`$error-message`\"/>\n","comments":"","x":1520.75,"y":398.75,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"560e0fe9.a63f6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1345.75,"y":402.75,"z":"d5c2f7ab.9eeb78","wires":[["d47a34b9.96fae8"]]},{"id":"d235c42e.58bf08","type":"outcome","name":" Ansible","xml":"<outcome value='Ansible'>\n","comments":"","outputs":1,"x":227.19049835205078,"y":891.4763145446777,"z":"d5c2f7ab.9eeb78","wires":[["7994c061.4c34b"]]},{"id":"87e6927d.8c87a","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":413.33331298828125,"y":953.333251953125,"z":"d5c2f7ab.9eeb78","wires":[["b2457e62.0d6be"]]},{"id":"b2457e62.0d6be","type":"call","name":"call  GetTemplateConfig_Chef","xml":"<call module='APPC' rpc='GetTemplateConfig_Chef' mode='sync' >\n","comments":"","outputs":1,"x":659.2857055664062,"y":954.0477857589722,"z":"d5c2f7ab.9eeb78","wires":[["e573827e.36bb9","35aad49a.f87bcc","7142f414.35002c"]]},{"id":"163d15dd.b3498a","type":"call","name":"call  GetTemplateConfig_Ansible","xml":"<call module='APPC' rpc='GetTemplateConfig_Ansible' mode='sync' >\n","comments":"","outputs":1,"x":597.857063293457,"y":1235.476152420044,"z":"d5c2f7ab.9eeb78","wires":[["e6a86a3a.62afb8","80beb099.eee58","9ba09f64.03e81"]]},{"id":"35aad49a.f87bcc","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":722.6190185546875,"y":1095.7143206596375,"z":"d5c2f7ab.9eeb78","wires":[["d887442e.fdbd68"]]},{"id":"e573827e.36bb9","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":721.6190185546875,"y":1046.7143206596375,"z":"d5c2f7ab.9eeb78","wires":[["73395769.c7fd38"]]},{"id":"73395769.c7fd38","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":897.6190185546875,"y":1050.7143206596375,"z":"d5c2f7ab.9eeb78","wires":[["ebfee93d.0a6c28"]]},{"id":"ebfee93d.0a6c28","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"\"/>\n<parameter name=\"dcae-error-message\" value=\"`$tmp.deviceconfig.error-message`\"/>\n\n","comments":"","x":1089.6190185546875,"y":1043.7143206596375,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"7142f414.35002c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":660.9523315429688,"y":1169.047694683075,"z":"d5c2f7ab.9eeb78","wires":[["6ed3304a.f8835"]]},{"id":"6ed3304a.f8835","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":823.9523315429688,"y":1169.047694683075,"z":"d5c2f7ab.9eeb78","wires":[["99960733.d8c138"]]},{"id":"99960733.d8c138","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$tmp.deviceconfig.file-content`\" />\n<parameter name='output.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='output.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='output.status.results' value = '`$output.status.results`'/>\n","comments":"","x":1026.9523315429688,"y":1171.047694683075,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"7994c061.4c34b","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":409.52384185791016,"y":1150.4760665893555,"z":"d5c2f7ab.9eeb78","wires":[["163d15dd.b3498a"]]},{"id":"80beb099.eee58","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":831.1903610229492,"y":1300.4761695861816,"z":"d5c2f7ab.9eeb78","wires":[["d887442e.fdbd68"]]},{"id":"e6a86a3a.62afb8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":830.1903610229492,"y":1251.4761695861816,"z":"d5c2f7ab.9eeb78","wires":[["565cf063.e3efb"]]},{"id":"565cf063.e3efb","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1006.1903610229492,"y":1255.4761695861816,"z":"d5c2f7ab.9eeb78","wires":[["484bbab0.c63454"]]},{"id":"484bbab0.c63454","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"\"/>\n<parameter name=\"dcae-error-message\" value=\"`$tmp.deviceconfig.error-message`\"/>\n\n","comments":"","x":1198.1903381347656,"y":1248.4761772155762,"z":"d5c2f7ab.9eeb78","wires":[]},{"id":"9ba09f64.03e81","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":769.5236740112305,"y":1373.8095436096191,"z":"d5c2f7ab.9eeb78","wires":[["6b8fab54.184374"]]},{"id":"6b8fab54.184374","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":932.5236740112305,"y":1373.8095436096191,"z":"d5c2f7ab.9eeb78","wires":[["5dadab18.730154"]]},{"id":"5dadab18.730154","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$tmp.deviceconfig.file-content`\" />\n<parameter name='code' value='`$output.status.code`' />\n<parameter name='message' value='`$output.status.message`'/>\n<parameter name='Status' value = '`$output.status.results`'/>\n","comments":"","x":1135.5236282348633,"y":1375.809624671936,"z":"d5c2f7ab.9eeb78","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetTemplateConfig_Ansible.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetTemplateConfig_Ansible.json
index 81039f658..a140a14a8 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetTemplateConfig_Ansible.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetTemplateConfig_Ansible.json
@@ -1 +1 @@
-[{"id":"5803aa79.45b404","type":"method","name":"method GetTemplateConfig_Ansible","xml":"<method rpc='GetTemplateConfig_Ansible' mode='sync'>\n","comments":"","outputs":1,"x":588.7499847412109,"y":107.5,"z":"b2b332b8.ecb4c","wires":[["b3dc5912.de0548"]]},{"id":"35047526.e59a1a","type":"dgstart","name":"DGSTART","outputs":1,"x":127.0594711303711,"y":106.5714282989502,"z":"b2b332b8.ecb4c","wires":[["2ac38826.404d58"]]},{"id":"2ac38826.404d58","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":325.2023391723633,"y":104.14286041259766,"z":"b2b332b8.ecb4c","wires":[["5803aa79.45b404"]]},{"id":"7e21bb0c.03de44","type":"execute","name":"execute getTemplate","xml":"<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"getTemplate\">\n<parameter name=\"fileCategory\" value=\"config_template\" />\n<parameter name=\"responsePrefix\" value=\"config-template\" />","comments":"","outputs":1,"x":419.70245361328125,"y":319.5358352661133,"z":"b2b332b8.ecb4c","wires":[["54cd3796.95a458","90f2178d.ba27c8"]]},{"id":"90f2178d.ba27c8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":694.059513092041,"y":361.0000648498535,"z":"b2b332b8.ecb4c","wires":[["5392ab8b.3b7874"]]},{"id":"5392ab8b.3b7874","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":885.7896118164062,"y":362.1429262161255,"z":"b2b332b8.ecb4c","wires":[["d978e419.70a338"]]},{"id":"d978e419.70a338","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$config-template.error-message`\"/>\n\t\n\t\n\t","comments":"","x":1115.4563827514648,"y":364.9206962585449,"z":"b2b332b8.ecb4c","wires":[]},{"id":"54cd3796.95a458","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":700.583324432373,"y":283.6667594909668,"z":"b2b332b8.ecb4c","wires":[["e0937d2c.970ef"]]},{"id":"e0937d2c.970ef","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":884.916576385498,"y":288.0000877380371,"z":"b2b332b8.ecb4c","wires":[["9df2fa59.e3b388"]]},{"id":"b3dc5912.de0548","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":156.20235061645508,"y":342.5000410079956,"z":"b2b332b8.ecb4c","wires":[["7e21bb0c.03de44","941be79f.807ed8","7b6affbc.ca3f"]]},{"id":"ebd8afae.4253d","type":"not-found","name":"found","xml":"<outcome value='found'>\n","comments":"","outputs":1,"x":1145.6310234069824,"y":448.46429920196533,"z":"b2b332b8.ecb4c","wires":[["b022a59b.66efe8"]]},{"id":"8ced2749.1c0918","type":"other","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1149.7382049560547,"y":517.2143268585205,"z":"b2b332b8.ecb4c","wires":[["bb3ddb29.67e8a8"]]},{"id":"941be79f.807ed8","type":"call","name":"call  Generic_AnsibleDG","xml":"<call module='APPC' rpc='Generic_AnsibleDG' mode='sync' >\n","comments":"","outputs":1,"x":324.91674041748047,"y":606.8571729660034,"z":"b2b332b8.ecb4c","wires":[["f0ca9dc.a029d6","c14fa4fe.f59ef8"]]},{"id":"b022a59b.66efe8","type":"call","name":"call  MergeTemplateData","xml":"<call module='APPC' rpc='MergeTemplateData' mode='sync' >\n","comments":"","outputs":1,"x":1352.857192993164,"y":447.1428565979004,"z":"b2b332b8.ecb4c","wires":[[]]},{"id":"18d834e5.32eb1b","type":"execute","name":"execute getTemplate Parameter_definition","xml":"<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"getTemplateByVnfTypeNAction\">\n<parameter name=\"fileCategory\" value=\"config_template\" />\n<parameter name=\"responsePrefix\" value=\"config-template\" />","comments":"","outputs":1,"x":878.5714721679688,"y":471.4286117553711,"z":"b2b332b8.ecb4c","wires":[["ebd8afae.4253d","8ced2749.1c0918"]]},{"id":"bb3ddb29.67e8a8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1361.4285202026367,"y":528.5714836120605,"z":"b2b332b8.ecb4c","wires":[[]]},{"id":"f0ca9dc.a029d6","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":562.8571891784668,"y":657.1429481506348,"z":"b2b332b8.ecb4c","wires":[["4d19c7fd.436708"]]},{"id":"4d19c7fd.436708","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$tmp.deviceconfig.file-content`\" />\n<parameter name='output.status.code' value='`$output.status.code`' />\n<parameter name='output.status.message' value='`$output.status.message`'/>\n<parameter name='output.status.results' value = '`$output.status.results`'/>\n","comments":"","x":780.5716171264648,"y":663.5714693069458,"z":"b2b332b8.ecb4c","wires":[]},{"id":"c14fa4fe.f59ef8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":547.1428833007812,"y":558.5713958740234,"z":"b2b332b8.ecb4c","wires":[["55b4f534.292e5c"]]},{"id":"55b4f534.292e5c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='output.status.code' value='200' />\n<parameter name='output.status.message' value='`$output.status.message`'/>\n","comments":"","x":798.571403503418,"y":574.28564453125,"z":"b2b332b8.ecb4c","wires":[]},{"id":"9df2fa59.e3b388","type":"execute","name":"execute: getAnsibleRunningConfig","xml":"<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"getConfigFilesByVnfActionNCategory\">\n<parameter name=\"fileCategory\" value=\"device_configuration\" />\n<parameter name='vnfname' value=\"`$config.vnf-name`\" />\n<parameter name='action' value=\"`$config.action`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.deviceconfig\" />\n","comments":"","outputs":1,"x":1141.6666107177734,"y":200.00000953674316,"z":"b2b332b8.ecb4c","wires":[["44e9bc7b.8cfb94","15aafa2c.198166","5aacae79.29154"]]},{"id":"5aacae79.29154","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1287.6666412353516,"y":281.9999647140503,"z":"b2b332b8.ecb4c","wires":[["8117d87b.2808a8"]]},{"id":"8117d87b.2808a8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1450.6666412353516,"y":281.9999647140503,"z":"b2b332b8.ecb4c","wires":[["b514f44.0458208"]]},{"id":"15aafa2c.198166","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1435.6666412353516,"y":224.9999647140503,"z":"b2b332b8.ecb4c","wires":[[]]},{"id":"44e9bc7b.8cfb94","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1441.3333206176758,"y":162.6666498184204,"z":"b2b332b8.ecb4c","wires":[["5e2afb10.22e314"]]},{"id":"b514f44.0458208","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$tmp.deviceconfig.file-content`\" />\n","comments":"","x":1653.6666412353516,"y":283.9999647140503,"z":"b2b332b8.ecb4c","wires":[]},{"id":"5e2afb10.22e314","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1617.3333206176758,"y":166.6666498184204,"z":"b2b332b8.ecb4c","wires":[["bd876721.641cc8"]]},{"id":"bd876721.641cc8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"\"/>\n<parameter name=\"dcae-error-message\" value=\"`$tmp.deviceconfig.error-message`\"/>\n\n","comments":"","x":1809.3333206176758,"y":159.6666498184204,"z":"b2b332b8.ecb4c","wires":[]},{"id":"7b6affbc.ca3f","type":"set","name":"set tmp.message","xml":"<set>\n<parameter name=\"tmp.message\" value=\"`$error-code + ':' + $error-message`\"/>\n","comments":"","x":308.75404357910156,"y":702.3611240386963,"z":"b2b332b8.ecb4c","wires":[]}]
+[{"id":"5803aa79.45b404","type":"method","name":"method GetTemplateConfig_Ansible","xml":"<method rpc='GetTemplateConfig_Ansible' mode='sync'>\n","comments":"","outputs":1,"x":588.7499847412109,"y":107.5,"z":"b2b332b8.ecb4c","wires":[["b3dc5912.de0548"]]},{"id":"35047526.e59a1a","type":"dgstart","name":"DGSTART","outputs":1,"x":127.0594711303711,"y":106.5714282989502,"z":"b2b332b8.ecb4c","wires":[["2ac38826.404d58"]]},{"id":"2ac38826.404d58","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":325.2023391723633,"y":104.14286041259766,"z":"b2b332b8.ecb4c","wires":[["5803aa79.45b404"]]},{"id":"7e21bb0c.03de44","type":"execute","name":"execute getTemplate","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getTemplate\">\n<parameter name=\"fileCategory\" value=\"config_template\" />\n<parameter name=\"responsePrefix\" value=\"config-template\" />","comments":"","outputs":1,"x":419.70245361328125,"y":319.5358352661133,"z":"b2b332b8.ecb4c","wires":[["54cd3796.95a458","90f2178d.ba27c8"]]},{"id":"90f2178d.ba27c8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":694.059513092041,"y":361.0000648498535,"z":"b2b332b8.ecb4c","wires":[["5392ab8b.3b7874"]]},{"id":"5392ab8b.3b7874","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":885.7896118164062,"y":362.1429262161255,"z":"b2b332b8.ecb4c","wires":[["d978e419.70a338"]]},{"id":"d978e419.70a338","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$config-template.error-message`\"/>\n\t\n\t\n\t","comments":"","x":1115.4563827514648,"y":364.9206962585449,"z":"b2b332b8.ecb4c","wires":[]},{"id":"54cd3796.95a458","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":700.583324432373,"y":283.6667594909668,"z":"b2b332b8.ecb4c","wires":[["e0937d2c.970ef"]]},{"id":"e0937d2c.970ef","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":884.916576385498,"y":288.0000877380371,"z":"b2b332b8.ecb4c","wires":[["9df2fa59.e3b388"]]},{"id":"b3dc5912.de0548","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":156.20235061645508,"y":342.5000410079956,"z":"b2b332b8.ecb4c","wires":[["7e21bb0c.03de44","941be79f.807ed8","7b6affbc.ca3f"]]},{"id":"ebd8afae.4253d","type":"not-found","name":"found","xml":"<outcome value='found'>\n","comments":"","outputs":1,"x":1145.6310234069824,"y":448.46429920196533,"z":"b2b332b8.ecb4c","wires":[["b022a59b.66efe8"]]},{"id":"8ced2749.1c0918","type":"other","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1149.7382049560547,"y":517.2143268585205,"z":"b2b332b8.ecb4c","wires":[["bb3ddb29.67e8a8"]]},{"id":"941be79f.807ed8","type":"call","name":"call  Generic_AnsibleDG","xml":"<call module='APPC' rpc='Generic_AnsibleDG' mode='sync' >\n","comments":"","outputs":1,"x":324.91674041748047,"y":606.8571729660034,"z":"b2b332b8.ecb4c","wires":[["f0ca9dc.a029d6","c14fa4fe.f59ef8"]]},{"id":"b022a59b.66efe8","type":"call","name":"call  MergeTemplateData","xml":"<call module='APPC' rpc='MergeTemplateData' mode='sync' >\n","comments":"","outputs":1,"x":1352.857192993164,"y":447.1428565979004,"z":"b2b332b8.ecb4c","wires":[[]]},{"id":"18d834e5.32eb1b","type":"execute","name":"execute getTemplate Parameter_definition","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getTemplateByVnfTypeNAction\">\n<parameter name=\"fileCategory\" value=\"config_template\" />\n<parameter name=\"responsePrefix\" value=\"config-template\" />","comments":"","outputs":1,"x":878.5714721679688,"y":471.4286117553711,"z":"b2b332b8.ecb4c","wires":[["ebd8afae.4253d","8ced2749.1c0918"]]},{"id":"bb3ddb29.67e8a8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1361.4285202026367,"y":528.5714836120605,"z":"b2b332b8.ecb4c","wires":[[]]},{"id":"f0ca9dc.a029d6","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":562.8571891784668,"y":657.1429481506348,"z":"b2b332b8.ecb4c","wires":[["4d19c7fd.436708"]]},{"id":"4d19c7fd.436708","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$tmp.deviceconfig.file-content`\" />\n<parameter name='output.status.code' value='`$output.status.code`' />\n<parameter name='output.status.message' value='`$output.status.message`'/>\n<parameter name='output.status.results' value = '`$output.status.results`'/>\n","comments":"","x":780.5716171264648,"y":663.5714693069458,"z":"b2b332b8.ecb4c","wires":[]},{"id":"c14fa4fe.f59ef8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":547.1428833007812,"y":558.5713958740234,"z":"b2b332b8.ecb4c","wires":[["55b4f534.292e5c"]]},{"id":"55b4f534.292e5c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='output.status.code' value='200' />\n<parameter name='output.status.message' value='`$output.status.message`'/>\n","comments":"","x":798.571403503418,"y":574.28564453125,"z":"b2b332b8.ecb4c","wires":[]},{"id":"9df2fa59.e3b388","type":"execute","name":"execute: getAnsibleRunningConfig","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getConfigFilesByVnfActionNCategory\">\n<parameter name=\"fileCategory\" value=\"device_configuration\" />\n<parameter name='vnfname' value=\"`$config.vnf-name`\" />\n<parameter name='action' value=\"`$config.action`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.deviceconfig\" />\n","comments":"","outputs":1,"x":1141.6666107177734,"y":200.00000953674316,"z":"b2b332b8.ecb4c","wires":[["44e9bc7b.8cfb94","15aafa2c.198166","5aacae79.29154"]]},{"id":"5aacae79.29154","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1287.6666412353516,"y":281.9999647140503,"z":"b2b332b8.ecb4c","wires":[["8117d87b.2808a8"]]},{"id":"8117d87b.2808a8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1450.6666412353516,"y":281.9999647140503,"z":"b2b332b8.ecb4c","wires":[["b514f44.0458208"]]},{"id":"15aafa2c.198166","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1435.6666412353516,"y":224.9999647140503,"z":"b2b332b8.ecb4c","wires":[[]]},{"id":"44e9bc7b.8cfb94","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1441.3333206176758,"y":162.6666498184204,"z":"b2b332b8.ecb4c","wires":[["5e2afb10.22e314"]]},{"id":"b514f44.0458208","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$tmp.deviceconfig.file-content`\" />\n","comments":"","x":1653.6666412353516,"y":283.9999647140503,"z":"b2b332b8.ecb4c","wires":[]},{"id":"5e2afb10.22e314","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1617.3333206176758,"y":166.6666498184204,"z":"b2b332b8.ecb4c","wires":[["bd876721.641cc8"]]},{"id":"bd876721.641cc8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"\"/>\n<parameter name=\"dcae-error-message\" value=\"`$tmp.deviceconfig.error-message`\"/>\n\n","comments":"","x":1809.3333206176758,"y":159.6666498184204,"z":"b2b332b8.ecb4c","wires":[]},{"id":"7b6affbc.ca3f","type":"set","name":"set tmp.message","xml":"<set>\n<parameter name=\"tmp.message\" value=\"`$error-code + ':' + $error-message`\"/>\n","comments":"","x":308.75404357910156,"y":702.3611240386963,"z":"b2b332b8.ecb4c","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetTemplateConfig_Chef.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetTemplateConfig_Chef.json
index 0fed2cf26..49eb59517 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetTemplateConfig_Chef.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetTemplateConfig_Chef.json
@@ -1 +1 @@
-[{"id":"c9005ac7.c57248","type":"dgstart","name":"DGSTART","outputs":1,"x":130,"y":107.57143020629883,"z":"1c322045.61564","wires":[["81c4fde7.3fb5b"]]},{"id":"81c4fde7.3fb5b","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":311.00000762939453,"y":65.1428575515747,"z":"1c322045.61564","wires":[["c35c9610.8d2ad8"]]},{"id":"c35c9610.8d2ad8","type":"method","name":"method GetTemplateConfig_Chef ","xml":"<method rpc='GetTemplateConfig_Chef' mode='sync'>\n","comments":"","outputs":1,"x":574.5476837158203,"y":68.49999618530273,"z":"1c322045.61564","wires":[["791848b0.bcbe48"]]},{"id":"791848b0.bcbe48","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":142.00001907348633,"y":303.50003814697266,"z":"1c322045.61564","wires":[["13786ad0.1af775","9911db8b.909de8","a0dd8b28.4c27d8"]]},{"id":"13786ad0.1af775","type":"set","name":"set tmp.message","xml":"<set>\n<parameter name=\"tmp.message\" value=\"`$error-code + ':' + $error-message`\"/>\n","comments":"","x":409.37306213378906,"y":692.8253631591797,"z":"1c322045.61564","wires":[]},{"id":"3e746174.0ab35e","type":"execute","name":"execute isPDFILE","xml":"<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"getTemplateByVnfTypeNAction\">\n<parameter name=\"fileCategory\" value=\"config_template\" />\n<parameter name=\"responsePrefix\" value=\"config-template\" />","comments":"","outputs":1,"x":762.9166679382324,"y":514.1666812896729,"z":"1c322045.61564","wires":[["ca5f68cd.7df168","abf0e2c0.46e46"]]},{"id":"ca5f68cd.7df168","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1008.9166717529297,"y":494.6666507720947,"z":"1c322045.61564","wires":[[]]},{"id":"abf0e2c0.46e46","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1003.4166717529297,"y":536.6666774749756,"z":"1c322045.61564","wires":[["9285e961.bde908"]]},{"id":"9285e961.bde908","type":"call","name":"call  chefDG","xml":"<call module='APPC' rpc='' mode='sync' >\n","comments":"","outputs":1,"x":1170.416690826416,"y":539.1666574478149,"z":"1c322045.61564","wires":[["6b096ef8.220c6"]]},{"id":"6b096ef8.220c6","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1349.1667938232422,"y":540.4167070388794,"z":"1c322045.61564","wires":[["3b23acb8.aee1b4"]]},{"id":"3b23acb8.aee1b4","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='output.status.code' value='`$org.openecomp.appc.adapter.ansible.result.code`' />\n<parameter name='output.status.message' value='`$org.openecomp.appc.adapter.ansible.message`'/>\n<parameter name='output.status.results' value = '`$output.status.results`'/>\n","comments":"","x":1531.666706085205,"y":540.4166622161865,"z":"1c322045.61564","wires":[]},{"id":"9911db8b.909de8","type":"call","name":"call  Generic_ChefDG","xml":"<call module='APPC' rpc='Generic_ChefDG' mode='sync' >\n","comments":"","outputs":1,"x":428.3334197998047,"y":591.666748046875,"z":"1c322045.61564","wires":[["13c04cd9.b43873","3d395b6f.37d6d4"]]},{"id":"70ff03bc.550c5c","type":"execute","name":"execute: getChefRunningConfig","xml":"<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"getConfigFilesByVnfActionNCategory\">\n<parameter name=\"fileCategory\" value=\"device_configuration\" />\n<parameter name='vnfname' value=\"`$config.vnf-name`\" />\n<parameter name='action' value=\"`$config.action`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.deviceconfig\" />\n","comments":"","outputs":1,"x":1041.66650390625,"y":158.33333206176758,"z":"1c322045.61564","wires":[["e0166624.d85ba8","2d46c9a9.5e4556","60877372.7124dc"]]},{"id":"60877372.7124dc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1187.6665115356445,"y":240.3333044052124,"z":"1c322045.61564","wires":[["594ea12a.967b5"]]},{"id":"594ea12a.967b5","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1350.6665115356445,"y":240.3333044052124,"z":"1c322045.61564","wires":[["69841f84.beca3"]]},{"id":"2d46c9a9.5e4556","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1335.6665115356445,"y":183.3333044052124,"z":"1c322045.61564","wires":[[]]},{"id":"e0166624.d85ba8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1341.3331909179688,"y":120.99998950958252,"z":"1c322045.61564","wires":[["afceb049.effd"]]},{"id":"69841f84.beca3","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$tmp.deviceconfig.file-content`\" />\n","comments":"","x":1553.6665115356445,"y":242.3333044052124,"z":"1c322045.61564","wires":[]},{"id":"afceb049.effd","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1517.3331909179688,"y":124.99998950958252,"z":"1c322045.61564","wires":[["89203f87.bdd35"]]},{"id":"89203f87.bdd35","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"\"/>\n<parameter name=\"dcae-error-message\" value=\"`$tmp.deviceconfig.error-message`\"/>\n\n","comments":"","x":1709.3331909179688,"y":117.99998950958252,"z":"1c322045.61564","wires":[]},{"id":"a0dd8b28.4c27d8","type":"execute","name":"execute getTemplate","xml":"<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"getTemplate\">\n<parameter name=\"fileCategory\" value=\"config_template\" />\n<parameter name=\"responsePrefix\" value=\"config-template\" />","comments":"","outputs":1,"x":414.66676330566406,"y":274.1072106361389,"z":"1c322045.61564","wires":[["209fd4e.f5e6a2c","c880f1bf.06526"]]},{"id":"c880f1bf.06526","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":629.3811264038086,"y":316.52382373809814,"z":"1c322045.61564","wires":[["3e7c0fa2.d88be"]]},{"id":"3e7c0fa2.d88be","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":821.1112251281738,"y":317.6666851043701,"z":"1c322045.61564","wires":[["daf816d8.f062d8"]]},{"id":"daf816d8.f062d8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$config-template.error-message`\"/>\n\t\n\t\n\t","comments":"","x":1050.7779960632324,"y":320.44445514678955,"z":"1c322045.61564","wires":[]},{"id":"209fd4e.f5e6a2c","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":635.9049377441406,"y":239.19051837921143,"z":"1c322045.61564","wires":[["32a527f0.aabd78"]]},{"id":"32a527f0.aabd78","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":820.2381896972656,"y":243.52384662628174,"z":"1c322045.61564","wires":[["70ff03bc.550c5c"]]},{"id":"3d395b6f.37d6d4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":651.6666259765625,"y":703.3333129882812,"z":"1c322045.61564","wires":[["d444f8cd.5ab698"]]},{"id":"d444f8cd.5ab698","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$tmp.deviceconfig.file-content`\" />\n<parameter name='output.status.code' value='`$output.status.code`' />\n<parameter name='output.status.message' value='`$output.status.message`'/>\n<parameter name='output.status.results' value = '`$output.status.results`'/>\n","comments":"","x":869.3810539245605,"y":709.7618341445923,"z":"1c322045.61564","wires":[]},{"id":"13c04cd9.b43873","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":635.952320098877,"y":604.7617607116699,"z":"1c322045.61564","wires":[["c021af06.07788"]]},{"id":"c021af06.07788","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='output.status.code' value='200' />\n<parameter name='output.status.message' value='`$output.status.message`'/>\n","comments":"","x":887.3808403015137,"y":620.4760093688965,"z":"1c322045.61564","wires":[]}]
+[{"id":"c9005ac7.c57248","type":"dgstart","name":"DGSTART","outputs":1,"x":130,"y":107.57143020629883,"z":"1c322045.61564","wires":[["81c4fde7.3fb5b"]]},{"id":"81c4fde7.3fb5b","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":311.00000762939453,"y":65.1428575515747,"z":"1c322045.61564","wires":[["c35c9610.8d2ad8"]]},{"id":"c35c9610.8d2ad8","type":"method","name":"method GetTemplateConfig_Chef ","xml":"<method rpc='GetTemplateConfig_Chef' mode='sync'>\n","comments":"","outputs":1,"x":574.5476837158203,"y":68.49999618530273,"z":"1c322045.61564","wires":[["791848b0.bcbe48"]]},{"id":"791848b0.bcbe48","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":142.00001907348633,"y":303.50003814697266,"z":"1c322045.61564","wires":[["13786ad0.1af775","9911db8b.909de8","a0dd8b28.4c27d8"]]},{"id":"13786ad0.1af775","type":"set","name":"set tmp.message","xml":"<set>\n<parameter name=\"tmp.message\" value=\"`$error-code + ':' + $error-message`\"/>\n","comments":"","x":409.37306213378906,"y":692.8253631591797,"z":"1c322045.61564","wires":[]},{"id":"3e746174.0ab35e","type":"execute","name":"execute isPDFILE","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getTemplateByVnfTypeNAction\">\n<parameter name=\"fileCategory\" value=\"config_template\" />\n<parameter name=\"responsePrefix\" value=\"config-template\" />","comments":"","outputs":1,"x":762.9166679382324,"y":514.1666812896729,"z":"1c322045.61564","wires":[["ca5f68cd.7df168","abf0e2c0.46e46"]]},{"id":"ca5f68cd.7df168","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1008.9166717529297,"y":494.6666507720947,"z":"1c322045.61564","wires":[[]]},{"id":"abf0e2c0.46e46","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1003.4166717529297,"y":536.6666774749756,"z":"1c322045.61564","wires":[["9285e961.bde908"]]},{"id":"9285e961.bde908","type":"call","name":"call  chefDG","xml":"<call module='APPC' rpc='' mode='sync' >\n","comments":"","outputs":1,"x":1170.416690826416,"y":539.1666574478149,"z":"1c322045.61564","wires":[["6b096ef8.220c6"]]},{"id":"6b096ef8.220c6","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1349.1667938232422,"y":540.4167070388794,"z":"1c322045.61564","wires":[["3b23acb8.aee1b4"]]},{"id":"3b23acb8.aee1b4","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='output.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='output.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='output.status.results' value = '`$output.status.results`'/>\n","comments":"","x":1531.666706085205,"y":540.4166622161865,"z":"1c322045.61564","wires":[]},{"id":"9911db8b.909de8","type":"call","name":"call  Generic_ChefDG","xml":"<call module='APPC' rpc='Generic_ChefDG' mode='sync' >\n","comments":"","outputs":1,"x":428.3334197998047,"y":591.666748046875,"z":"1c322045.61564","wires":[["13c04cd9.b43873","3d395b6f.37d6d4"]]},{"id":"70ff03bc.550c5c","type":"execute","name":"execute: getChefRunningConfig","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getConfigFilesByVnfActionNCategory\">\n<parameter name=\"fileCategory\" value=\"device_configuration\" />\n<parameter name='vnfname' value=\"`$config.vnf-name`\" />\n<parameter name='action' value=\"`$config.action`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.deviceconfig\" />\n","comments":"","outputs":1,"x":1041.66650390625,"y":158.33333206176758,"z":"1c322045.61564","wires":[["e0166624.d85ba8","2d46c9a9.5e4556","60877372.7124dc"]]},{"id":"60877372.7124dc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1187.6665115356445,"y":240.3333044052124,"z":"1c322045.61564","wires":[["594ea12a.967b5"]]},{"id":"594ea12a.967b5","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1350.6665115356445,"y":240.3333044052124,"z":"1c322045.61564","wires":[["69841f84.beca3"]]},{"id":"2d46c9a9.5e4556","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1335.6665115356445,"y":183.3333044052124,"z":"1c322045.61564","wires":[[]]},{"id":"e0166624.d85ba8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1341.3331909179688,"y":120.99998950958252,"z":"1c322045.61564","wires":[["afceb049.effd"]]},{"id":"69841f84.beca3","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$tmp.deviceconfig.file-content`\" />\n","comments":"","x":1553.6665115356445,"y":242.3333044052124,"z":"1c322045.61564","wires":[]},{"id":"afceb049.effd","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1517.3331909179688,"y":124.99998950958252,"z":"1c322045.61564","wires":[["89203f87.bdd35"]]},{"id":"89203f87.bdd35","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"\"/>\n<parameter name=\"dcae-error-message\" value=\"`$tmp.deviceconfig.error-message`\"/>\n\n","comments":"","x":1709.3331909179688,"y":117.99998950958252,"z":"1c322045.61564","wires":[]},{"id":"a0dd8b28.4c27d8","type":"execute","name":"execute getTemplate","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getTemplate\">\n<parameter name=\"fileCategory\" value=\"config_template\" />\n<parameter name=\"responsePrefix\" value=\"config-template\" />","comments":"","outputs":1,"x":414.66676330566406,"y":274.1072106361389,"z":"1c322045.61564","wires":[["209fd4e.f5e6a2c","c880f1bf.06526"]]},{"id":"c880f1bf.06526","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":629.3811264038086,"y":316.52382373809814,"z":"1c322045.61564","wires":[["3e7c0fa2.d88be"]]},{"id":"3e7c0fa2.d88be","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":821.1112251281738,"y":317.6666851043701,"z":"1c322045.61564","wires":[["daf816d8.f062d8"]]},{"id":"daf816d8.f062d8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$config-template.error-message`\"/>\n\t\n\t\n\t","comments":"","x":1050.7779960632324,"y":320.44445514678955,"z":"1c322045.61564","wires":[]},{"id":"209fd4e.f5e6a2c","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":635.9049377441406,"y":239.19051837921143,"z":"1c322045.61564","wires":[["32a527f0.aabd78"]]},{"id":"32a527f0.aabd78","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":820.2381896972656,"y":243.52384662628174,"z":"1c322045.61564","wires":[["70ff03bc.550c5c"]]},{"id":"3d395b6f.37d6d4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":651.6666259765625,"y":703.3333129882812,"z":"1c322045.61564","wires":[["d444f8cd.5ab698"]]},{"id":"d444f8cd.5ab698","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='device-running-config' value=\"`$tmp.deviceconfig.file-content`\" />\n<parameter name='output.status.code' value='`$output.status.code`' />\n<parameter name='output.status.message' value='`$output.status.message`'/>\n<parameter name='output.status.results' value = '`$output.status.results`'/>\n","comments":"","x":869.3810539245605,"y":709.7618341445923,"z":"1c322045.61564","wires":[]},{"id":"13c04cd9.b43873","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":635.952320098877,"y":604.7617607116699,"z":"1c322045.61564","wires":[["c021af06.07788"]]},{"id":"c021af06.07788","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='output.status.code' value='200' />\n<parameter name='output.status.message' value='`$output.status.message`'/>\n","comments":"","x":887.3808403015137,"y":620.4760093688965,"z":"1c322045.61564","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_MergeTemplateData.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_MergeTemplateData.json
index 597f5c365..caf5b0215 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_MergeTemplateData.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_MergeTemplateData.json
@@ -201,7 +201,7 @@
             ]
         ],
         "x": 1048.8214511871338,
-        "xml": "<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"getTemplate\">\n<parameter name=\"fileCategory\" value=\"config_template\" />\n<parameter name=\"responsePrefix\" value=\"config-template\" />",
+        "xml": "<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getTemplate\">\n<parameter name=\"fileCategory\" value=\"config_template\" />\n<parameter name=\"responsePrefix\" value=\"config-template\" />",
         "y": 315.6111030578613,
         "z": "a49375c8.88c748"
     },
@@ -620,7 +620,7 @@
             ]
         ],
         "x": 520.4166278839111,
-        "xml": "<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"Prepare Success\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n",
+        "xml": "<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"Prepare Success\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n",
         "y": 803.0277366638184,
         "z": "a49375c8.88c748"
     },
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_MigrateVM.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_MigrateVM.json
index 1e66423fb..a63550307 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_MigrateVM.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_MigrateVM.json
@@ -1 +1 @@
-[{"id":"29daabd9.730244","type":"dgstart","name":"DGSTART","outputs":1,"x":196.75,"y":188,"z":"27eb9f4d.8d411","wires":[["cc222124.e7128"]]},{"id":"cc222124.e7128","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":353.75,"y":188,"z":"27eb9f4d.8d411","wires":[["7e1c4042.16219"]]},{"id":"7e1c4042.16219","type":"method","name":"MigrateVM","xml":"<method rpc='MigrateVM' mode='sync'>\n","comments":"","outputs":1,"x":551.75,"y":190,"z":"27eb9f4d.8d411","wires":[["c110c152.1bc2a8"]]},{"id":"1f969631.1d8242","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":919.7499694824219,"y":399.9999694824219,"z":"27eb9f4d.8d411","wires":[["9805b9e5.9e953"]]},{"id":"c17662ed.1e20f8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":928.7499694824219,"y":278.9999694824219,"z":"27eb9f4d.8d411","wires":[["da84e71.f159418"]]},{"id":"88ee1742.3ee838","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1475.7499694824219,"y":371.9999694824219,"z":"27eb9f4d.8d411","wires":[]},{"id":"3ef14420.6e1444","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='RPC Evacuate not found' />","comments":"","x":1236.7499694824219,"y":278.9999694824219,"z":"27eb9f4d.8d411","wires":[]},{"id":"9805b9e5.9e953","type":"switchNode","name":"switch error-code","xml":"<switch test='`$error_code`'>\n","comments":"","outputs":1,"x":1112.7499694824219,"y":400.9999694824219,"z":"27eb9f4d.8d411","wires":[["691e84cc.425a2c","aa558b50.816e18"]]},{"id":"691e84cc.425a2c","type":"success","name":"SUCCESS 200","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":1294.7499694824219,"y":370.9999694824219,"z":"27eb9f4d.8d411","wires":[["88ee1742.3ee838"]]},{"id":"aa558b50.816e18","type":"outcome","name":"ERROR","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1286.7499694824219,"y":529.9999694824219,"z":"27eb9f4d.8d411","wires":[["26d4a85e.24a188"]]},{"id":"26d4a85e.24a188","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1419.7499694824219,"y":530.9999694824219,"z":"27eb9f4d.8d411","wires":[["25417c19.7df6bc","d562ae2a.dd7e68"]]},{"id":"25417c19.7df6bc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n","comments":"","x":1554.7499694824219,"y":572,"z":"27eb9f4d.8d411","wires":[]},{"id":"da84e71.f159418","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1084.7499694824219,"y":278.9999694824219,"z":"27eb9f4d.8d411","wires":[["3ef14420.6e1444"]]},{"id":"f66a49ef.3f7618","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.payload = ' + $input.payload`\" />\n<parameter name=\"field3\" value=\"`'vm-id in context=' + $vm-id`\" />","comments":"","outputs":1,"x":918.86669921875,"y":220,"z":"27eb9f4d.8d411","wires":[[]]},{"id":"c110c152.1bc2a8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":740.6166687011719,"y":248.86666870117188,"z":"27eb9f4d.8d411","wires":[["f66a49ef.3f7618","c3151ca4.c3d568","553a1643.e935b8"]]},{"id":"d562ae2a.dd7e68","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=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n<parameter name=\"field4\" value=\"`'error-code = ' + $error_code`\" />","comments":"","outputs":1,"x":1544.6166687011719,"y":502.8666687011719,"z":"27eb9f4d.8d411","wires":[[]]},{"id":"c3151ca4.c3d568","type":"execute","name":"migrateServer()","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='migrateServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$vm-id`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$identity-url`\" />\n<parameter name=\"org.openecomp.appc.skiphypervisorcheck\" value=\"`$skip-hypervisor-check`\" />","comments":"","outputs":1,"x":756.7499694824219,"y":334,"z":"27eb9f4d.8d411","wires":[["c17662ed.1e20f8","1f969631.1d8242"]]},{"id":"553a1643.e935b8","type":"set","name":"set skiphypervisorcheck","xml":"<set>\n<parameter name='org.openecomp.appc.skiphypervisorcheck' value='`$skip-hypervisor-check`' />\n","comments":"","x":954.75,"y":146.75,"z":"27eb9f4d.8d411","wires":[]}]
+[{"id":"29daabd9.730244","type":"dgstart","name":"DGSTART","outputs":1,"x":196.75,"y":188,"z":"27eb9f4d.8d411","wires":[["cc222124.e7128"]]},{"id":"cc222124.e7128","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":353.75,"y":188,"z":"27eb9f4d.8d411","wires":[["7e1c4042.16219"]]},{"id":"7e1c4042.16219","type":"method","name":"MigrateVM","xml":"<method rpc='MigrateVM' mode='sync'>\n","comments":"","outputs":1,"x":551.75,"y":190,"z":"27eb9f4d.8d411","wires":[["c110c152.1bc2a8"]]},{"id":"1f969631.1d8242","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":919.7499694824219,"y":399.9999694824219,"z":"27eb9f4d.8d411","wires":[["9805b9e5.9e953"]]},{"id":"c17662ed.1e20f8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":928.7499694824219,"y":278.9999694824219,"z":"27eb9f4d.8d411","wires":[["da84e71.f159418"]]},{"id":"88ee1742.3ee838","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1475.7499694824219,"y":371.9999694824219,"z":"27eb9f4d.8d411","wires":[]},{"id":"3ef14420.6e1444","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='RPC Evacuate not found' />","comments":"","x":1236.7499694824219,"y":278.9999694824219,"z":"27eb9f4d.8d411","wires":[]},{"id":"9805b9e5.9e953","type":"switchNode","name":"switch error-code","xml":"<switch test='`$error_code`'>\n","comments":"","outputs":1,"x":1112.7499694824219,"y":400.9999694824219,"z":"27eb9f4d.8d411","wires":[["691e84cc.425a2c","aa558b50.816e18"]]},{"id":"691e84cc.425a2c","type":"success","name":"SUCCESS 200","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":1294.7499694824219,"y":370.9999694824219,"z":"27eb9f4d.8d411","wires":[["88ee1742.3ee838"]]},{"id":"aa558b50.816e18","type":"outcome","name":"ERROR","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1286.7499694824219,"y":529.9999694824219,"z":"27eb9f4d.8d411","wires":[["26d4a85e.24a188"]]},{"id":"26d4a85e.24a188","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1419.7499694824219,"y":530.9999694824219,"z":"27eb9f4d.8d411","wires":[["25417c19.7df6bc","d562ae2a.dd7e68"]]},{"id":"25417c19.7df6bc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n","comments":"","x":1554.7499694824219,"y":572,"z":"27eb9f4d.8d411","wires":[]},{"id":"da84e71.f159418","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1084.7499694824219,"y":278.9999694824219,"z":"27eb9f4d.8d411","wires":[["3ef14420.6e1444"]]},{"id":"f66a49ef.3f7618","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.payload = ' + $input.payload`\" />\n<parameter name=\"field3\" value=\"`'vm-id in context=' + $vm-id`\" />","comments":"","outputs":1,"x":918.86669921875,"y":220,"z":"27eb9f4d.8d411","wires":[[]]},{"id":"c110c152.1bc2a8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":740.6166687011719,"y":248.86666870117188,"z":"27eb9f4d.8d411","wires":[["f66a49ef.3f7618","c3151ca4.c3d568","553a1643.e935b8"]]},{"id":"d562ae2a.dd7e68","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=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n<parameter name=\"field4\" value=\"`'error-code = ' + $error_code`\" />","comments":"","outputs":1,"x":1544.6166687011719,"y":502.8666687011719,"z":"27eb9f4d.8d411","wires":[[]]},{"id":"c3151ca4.c3d568","type":"execute","name":"migrateServer()","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='migrateServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$vm-id`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$identity-url`\" />\n<parameter name=\"org.onap.appc.skiphypervisorcheck\" value=\"`$skip-hypervisor-check`\" />","comments":"","outputs":1,"x":756.7499694824219,"y":334,"z":"27eb9f4d.8d411","wires":[["c17662ed.1e20f8","1f969631.1d8242"]]},{"id":"553a1643.e935b8","type":"set","name":"set skiphypervisorcheck","xml":"<set>\n<parameter name='org.onap.appc.skiphypervisorcheck' value='`$skip-hypervisor-check`' />\n","comments":"","x":954.75,"y":146.75,"z":"27eb9f4d.8d411","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 db1f0449e..562a1a75d 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.openecomp.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.openecomp.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.openecomp.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.openecomp.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.openecomp.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.openecomp.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.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"]]}]
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 01dbdb5c6..1b4970a4f 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.openecomp.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.openecomp.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.openecomp.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.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":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RebuildVM.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RebuildVM.json
index c4087c50e..a66760674 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RebuildVM.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RebuildVM.json
@@ -1 +1 @@
-[{"id":"e426d1a4.04b0b","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":281.75,"y":295,"z":"734c8384.84e874","wires":[["f11dad1d.996b88"]]},{"id":"b1ce76a2.53d928","type":"dgstart","name":"DGSTART","outputs":1,"x":288.75,"y":245,"z":"734c8384.84e874","wires":[["e426d1a4.04b0b"]]},{"id":"5bf06fcf.867b98","type":"execute","name":"rebuildServer()","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='rebuildServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$vm-id`\"/>\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$identity-url`\" />\n<parameter name=\"org.openecomp.appc.skiphypervisorcheck\" value=\"`$skip-hypervisor-check`\" />","comments":"","outputs":1,"x":722.7499694824219,"y":348,"z":"734c8384.84e874","wires":[["7d4aacf6.6c04fc","4916b7b8.2d8468"]]},{"id":"7d4aacf6.6c04fc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":866.7499694824219,"y":403,"z":"734c8384.84e874","wires":[["e3c23dad.ae06a"]]},{"id":"4916b7b8.2d8468","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":835.7499694824219,"y":225,"z":"734c8384.84e874","wires":[["dc58c2ba.2db078"]]},{"id":"4eeee11d.fb26f","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":571.75,"y":294.8833312988281,"z":"734c8384.84e874","wires":[["2c303534.0f7902","5bf06fcf.867b98","f2e4ec01.884618"]]},{"id":"2c303534.0f7902","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.payload = ' + $input.payload`\" />\n<parameter name=\"field3\" value=\"`'vm-id = '+ $vm-id`\" />","comments":"","outputs":1,"x":701.7499694824219,"y":295.8833312988281,"z":"734c8384.84e874","wires":[[]]},{"id":"6e491f05.7959","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='RPC Rebuild not found' />","comments":"","x":1120.7499694824219,"y":226.88333129882812,"z":"734c8384.84e874","wires":[]},{"id":"dc58c2ba.2db078","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":973.7499694824219,"y":226.88333129882812,"z":"734c8384.84e874","wires":[["6e491f05.7959"]]},{"id":"f11dad1d.996b88","type":"method","name":"RebuildVM","xml":"<method rpc='RebuildVM' mode='sync'>\n","comments":"","outputs":1,"x":432.75,"y":295.8833312988281,"z":"734c8384.84e874","wires":[["4eeee11d.fb26f"]]},{"id":"e3bd299a.2eb3d","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1448.7499694824219,"y":363.8833312988281,"z":"734c8384.84e874","wires":[]},{"id":"6da3c674.de3f5","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1365.7499694824219,"y":447.8833312988281,"z":"734c8384.84e874","wires":[["d3e45f44.e31868","52bdc72a.f6f06"]]},{"id":"d3e45f44.e31868","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n","comments":"","x":1522.7499694824219,"y":480.88336181640625,"z":"734c8384.84e874","wires":[]},{"id":"52bdc72a.f6f06","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=\"field3\" value=\"`'error-message = ' + $error-message`\" />","comments":"","outputs":1,"x":1504.6166687011719,"y":427.7500305175781,"z":"734c8384.84e874","wires":[[]]},{"id":"e3c23dad.ae06a","type":"switchNode","name":"switch error-code","xml":"<switch test='`$error_code`'>\n","comments":"","outputs":1,"x":1044.7499694824219,"y":403.8833312988281,"z":"734c8384.84e874","wires":[["45af49c7.7ad408","14becb17.12bdad"]]},{"id":"45af49c7.7ad408","type":"success","name":"SUCCESS-200","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":1240.7499694824219,"y":365.8833312988281,"z":"734c8384.84e874","wires":[["e3bd299a.2eb3d"]]},{"id":"14becb17.12bdad","type":"outcome","name":"ERROR","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1224.7499694824219,"y":448.8833312988281,"z":"734c8384.84e874","wires":[["6da3c674.de3f5"]]},{"id":"f2e4ec01.884618","type":"set","name":"set skiphypervisorcheck","xml":"<set>\n<parameter name='org.openecomp.appc.skiphypervisorcheck' value='`$skip-hypervisor-check`' />\n","comments":"","x":758.75,"y":174.75,"z":"734c8384.84e874","wires":[]}]
+[{"id":"e426d1a4.04b0b","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":281.75,"y":295,"z":"734c8384.84e874","wires":[["f11dad1d.996b88"]]},{"id":"b1ce76a2.53d928","type":"dgstart","name":"DGSTART","outputs":1,"x":288.75,"y":245,"z":"734c8384.84e874","wires":[["e426d1a4.04b0b"]]},{"id":"5bf06fcf.867b98","type":"execute","name":"rebuildServer()","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='rebuildServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$vm-id`\"/>\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$identity-url`\" />\n<parameter name=\"org.onap.appc.skiphypervisorcheck\" value=\"`$skip-hypervisor-check`\" />","comments":"","outputs":1,"x":722.7499694824219,"y":348,"z":"734c8384.84e874","wires":[["7d4aacf6.6c04fc","4916b7b8.2d8468"]]},{"id":"7d4aacf6.6c04fc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":866.7499694824219,"y":403,"z":"734c8384.84e874","wires":[["e3c23dad.ae06a"]]},{"id":"4916b7b8.2d8468","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":835.7499694824219,"y":225,"z":"734c8384.84e874","wires":[["dc58c2ba.2db078"]]},{"id":"4eeee11d.fb26f","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":571.75,"y":294.8833312988281,"z":"734c8384.84e874","wires":[["2c303534.0f7902","5bf06fcf.867b98","f2e4ec01.884618"]]},{"id":"2c303534.0f7902","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.payload = ' + $input.payload`\" />\n<parameter name=\"field3\" value=\"`'vm-id = '+ $vm-id`\" />","comments":"","outputs":1,"x":701.7499694824219,"y":295.8833312988281,"z":"734c8384.84e874","wires":[[]]},{"id":"6e491f05.7959","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='RPC Rebuild not found' />","comments":"","x":1120.7499694824219,"y":226.88333129882812,"z":"734c8384.84e874","wires":[]},{"id":"dc58c2ba.2db078","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":973.7499694824219,"y":226.88333129882812,"z":"734c8384.84e874","wires":[["6e491f05.7959"]]},{"id":"f11dad1d.996b88","type":"method","name":"RebuildVM","xml":"<method rpc='RebuildVM' mode='sync'>\n","comments":"","outputs":1,"x":432.75,"y":295.8833312988281,"z":"734c8384.84e874","wires":[["4eeee11d.fb26f"]]},{"id":"e3bd299a.2eb3d","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1448.7499694824219,"y":363.8833312988281,"z":"734c8384.84e874","wires":[]},{"id":"6da3c674.de3f5","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1365.7499694824219,"y":447.8833312988281,"z":"734c8384.84e874","wires":[["d3e45f44.e31868","52bdc72a.f6f06"]]},{"id":"d3e45f44.e31868","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n","comments":"","x":1522.7499694824219,"y":480.88336181640625,"z":"734c8384.84e874","wires":[]},{"id":"52bdc72a.f6f06","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=\"field3\" value=\"`'error-message = ' + $error-message`\" />","comments":"","outputs":1,"x":1504.6166687011719,"y":427.7500305175781,"z":"734c8384.84e874","wires":[[]]},{"id":"e3c23dad.ae06a","type":"switchNode","name":"switch error-code","xml":"<switch test='`$error_code`'>\n","comments":"","outputs":1,"x":1044.7499694824219,"y":403.8833312988281,"z":"734c8384.84e874","wires":[["45af49c7.7ad408","14becb17.12bdad"]]},{"id":"45af49c7.7ad408","type":"success","name":"SUCCESS-200","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":1240.7499694824219,"y":365.8833312988281,"z":"734c8384.84e874","wires":[["e3bd299a.2eb3d"]]},{"id":"14becb17.12bdad","type":"outcome","name":"ERROR","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1224.7499694824219,"y":448.8833312988281,"z":"734c8384.84e874","wires":[["6da3c674.de3f5"]]},{"id":"f2e4ec01.884618","type":"set","name":"set skiphypervisorcheck","xml":"<set>\n<parameter name='org.onap.appc.skiphypervisorcheck' value='`$skip-hypervisor-check`' />\n","comments":"","x":758.75,"y":174.75,"z":"734c8384.84e874","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RestartVMCommonFlow.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RestartVMCommonFlow.json
index 912e1b90e..11bfe876a 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RestartVMCommonFlow.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RestartVMCommonFlow.json
@@ -1 +1 @@
-[{"id":"fb9d148d.f2d9","type":"dgstart","name":"DGSTART","outputs":1,"x":154.75,"y":203.75,"z":"acb37c25.7d695","wires":[["c90bb6a6.647f98"]]},{"id":"c90bb6a6.647f98","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":311.75,"y":203.75,"z":"acb37c25.7d695","wires":[["116cfb8a.32bd8c"]]},{"id":"116cfb8a.32bd8c","type":"method","name":"RestartVMCommonFlow","xml":"<method rpc='RestartVMCommonFlow' mode='sync'>\n","comments":"","outputs":1,"x":509.75,"y":205.75,"z":"acb37c25.7d695","wires":[["1e02b081.c37eef"]]},{"id":"1adee386.87e9d4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":877.7499694824219,"y":415.7499694824219,"z":"acb37c25.7d695","wires":[["15c4aee3.95def9"]]},{"id":"5118ed02.7b4054","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":886.7499694824219,"y":294.7499694824219,"z":"acb37c25.7d695","wires":[["17a2e299.91aeed"]]},{"id":"f2ed13d.10a4af","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1433.7499694824219,"y":387.7499694824219,"z":"acb37c25.7d695","wires":[]},{"id":"3fab6fa7.02aab","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='RPC Evacuate not found' />","comments":"","x":1194.7499694824219,"y":294.7499694824219,"z":"acb37c25.7d695","wires":[]},{"id":"15c4aee3.95def9","type":"switchNode","name":"switch error-code","xml":"<switch test='`$error_code`'>\n","comments":"","outputs":1,"x":1070.7499694824219,"y":416.7499694824219,"z":"acb37c25.7d695","wires":[["c6756561.624ca8","212002a8.ea32fe"]]},{"id":"c6756561.624ca8","type":"success","name":"SUCCESS","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":1252.7499694824219,"y":386.7499694824219,"z":"acb37c25.7d695","wires":[["f2ed13d.10a4af"]]},{"id":"212002a8.ea32fe","type":"outcome","name":"ERROR","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1244.7499694824219,"y":545.7499694824219,"z":"acb37c25.7d695","wires":[["2b794bb8.68c304"]]},{"id":"2b794bb8.68c304","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1377.7499694824219,"y":546.7499694824219,"z":"acb37c25.7d695","wires":[["60ad6e19.dea3f","e3ac2d57.c4e65"]]},{"id":"60ad6e19.dea3f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n","comments":"","x":1512.7499694824219,"y":587.75,"z":"acb37c25.7d695","wires":[]},{"id":"17a2e299.91aeed","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1042.7499694824219,"y":294.7499694824219,"z":"acb37c25.7d695","wires":[["3fab6fa7.02aab"]]},{"id":"eb2d0f23.0a1f58","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.payload = ' + $input.payload`\" />\n<parameter name=\"field3\" value=\"`'vm-id in context=' + $vm-id`\" />","comments":"","outputs":1,"x":873.86669921875,"y":243.75,"z":"acb37c25.7d695","wires":[[]]},{"id":"1e02b081.c37eef","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":698.6166687011719,"y":264.6166687011719,"z":"acb37c25.7d695","wires":[["eb2d0f23.0a1f58","85ed6b90.7ce48","ead01081.d1b55"]]},{"id":"e3ac2d57.c4e65","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=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n<parameter name=\"field4\" value=\"`'error-code = ' + $error_code`\" />","comments":"","outputs":1,"x":1502.6166687011719,"y":518.6166687011719,"z":"acb37c25.7d695","wires":[[]]},{"id":"85ed6b90.7ce48","type":"execute","name":"restartServer()","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='restartServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$vm-id`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$identity-url`\" />\n<parameter name=\"org.openecomp.appc.skiphypervisorcheck\" value=\"`$skip-hypervisor-check`\" />","comments":"","outputs":1,"x":714.7499694824219,"y":349.75,"z":"acb37c25.7d695","wires":[["5118ed02.7b4054","1adee386.87e9d4"]]},{"id":"ead01081.d1b55","type":"set","name":"set skiphypervisorcheck","xml":"<set>\n<parameter name='org.openecomp.appc.skiphypervisorcheck' value='`$skip-hypervisor-check`' />\n","comments":"","x":922.75,"y":175.75,"z":"acb37c25.7d695","wires":[]}]
+[{"id":"fb9d148d.f2d9","type":"dgstart","name":"DGSTART","outputs":1,"x":154.75,"y":203.75,"z":"acb37c25.7d695","wires":[["c90bb6a6.647f98"]]},{"id":"c90bb6a6.647f98","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":311.75,"y":203.75,"z":"acb37c25.7d695","wires":[["116cfb8a.32bd8c"]]},{"id":"116cfb8a.32bd8c","type":"method","name":"RestartVMCommonFlow","xml":"<method rpc='RestartVMCommonFlow' mode='sync'>\n","comments":"","outputs":1,"x":509.75,"y":205.75,"z":"acb37c25.7d695","wires":[["1e02b081.c37eef"]]},{"id":"1adee386.87e9d4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":877.7499694824219,"y":415.7499694824219,"z":"acb37c25.7d695","wires":[["15c4aee3.95def9"]]},{"id":"5118ed02.7b4054","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":886.7499694824219,"y":294.7499694824219,"z":"acb37c25.7d695","wires":[["17a2e299.91aeed"]]},{"id":"f2ed13d.10a4af","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1433.7499694824219,"y":387.7499694824219,"z":"acb37c25.7d695","wires":[]},{"id":"3fab6fa7.02aab","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='RPC Evacuate not found' />","comments":"","x":1194.7499694824219,"y":294.7499694824219,"z":"acb37c25.7d695","wires":[]},{"id":"15c4aee3.95def9","type":"switchNode","name":"switch error-code","xml":"<switch test='`$error_code`'>\n","comments":"","outputs":1,"x":1070.7499694824219,"y":416.7499694824219,"z":"acb37c25.7d695","wires":[["c6756561.624ca8","212002a8.ea32fe"]]},{"id":"c6756561.624ca8","type":"success","name":"SUCCESS","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":1252.7499694824219,"y":386.7499694824219,"z":"acb37c25.7d695","wires":[["f2ed13d.10a4af"]]},{"id":"212002a8.ea32fe","type":"outcome","name":"ERROR","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1244.7499694824219,"y":545.7499694824219,"z":"acb37c25.7d695","wires":[["2b794bb8.68c304"]]},{"id":"2b794bb8.68c304","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1377.7499694824219,"y":546.7499694824219,"z":"acb37c25.7d695","wires":[["60ad6e19.dea3f","e3ac2d57.c4e65"]]},{"id":"60ad6e19.dea3f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n","comments":"","x":1512.7499694824219,"y":587.75,"z":"acb37c25.7d695","wires":[]},{"id":"17a2e299.91aeed","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1042.7499694824219,"y":294.7499694824219,"z":"acb37c25.7d695","wires":[["3fab6fa7.02aab"]]},{"id":"eb2d0f23.0a1f58","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.payload = ' + $input.payload`\" />\n<parameter name=\"field3\" value=\"`'vm-id in context=' + $vm-id`\" />","comments":"","outputs":1,"x":873.86669921875,"y":243.75,"z":"acb37c25.7d695","wires":[[]]},{"id":"1e02b081.c37eef","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":698.6166687011719,"y":264.6166687011719,"z":"acb37c25.7d695","wires":[["eb2d0f23.0a1f58","85ed6b90.7ce48","ead01081.d1b55"]]},{"id":"e3ac2d57.c4e65","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=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n<parameter name=\"field4\" value=\"`'error-code = ' + $error_code`\" />","comments":"","outputs":1,"x":1502.6166687011719,"y":518.6166687011719,"z":"acb37c25.7d695","wires":[[]]},{"id":"85ed6b90.7ce48","type":"execute","name":"restartServer()","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='restartServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$vm-id`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$identity-url`\" />\n<parameter name=\"org.onap.appc.skiphypervisorcheck\" value=\"`$skip-hypervisor-check`\" />","comments":"","outputs":1,"x":714.7499694824219,"y":349.75,"z":"acb37c25.7d695","wires":[["5118ed02.7b4054","1adee386.87e9d4"]]},{"id":"ead01081.d1b55","type":"set","name":"set skiphypervisorcheck","xml":"<set>\n<parameter name='org.onap.appc.skiphypervisorcheck' value='`$skip-hypervisor-check`' />\n","comments":"","x":922.75,"y":175.75,"z":"acb37c25.7d695","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RestartVNFVMCommonFlow.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RestartVNFVMCommonFlow.json
index 21b1c8390..aa33394a0 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RestartVNFVMCommonFlow.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RestartVNFVMCommonFlow.json
@@ -1 +1 @@
-[{"id":"8be5abbb.8e8238","type":"method","name":"RestartVMVNFCommonFlow","xml":"<method rpc='RestartVMVNFCommonFlow' mode='sync'>\n","comments":"","outputs":1,"x":162.75,"y":182,"z":"c78c4b7.7adc638","wires":[["436e1771.f30bb"]]},{"id":"4675131a.a2bb4c","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":145.75,"y":133,"z":"c78c4b7.7adc638","wires":[["8be5abbb.8e8238"]]},{"id":"8e03a789.3ae3f8","type":"dgstart","name":"DGSTART","outputs":1,"x":137.75,"y":83,"z":"c78c4b7.7adc638","wires":[["4675131a.a2bb4c"]]},{"id":"bcbc30ba.d66ea8","type":"execute","name":"execute_getVNF_Hierarchy","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />","comments":"","outputs":1,"x":413.75,"y":269,"z":"c78c4b7.7adc638","wires":[["f2d80d63.c8c16","bbe6ec00.5438f8"]]},{"id":"f2d80d63.c8c16","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":569.0357208251953,"y":314.85713386535645,"z":"c78c4b7.7adc638","wires":[["5133513c.856678"]]},{"id":"d5460718.47f668","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":1394.6073913574219,"y":309.5713963508606,"z":"c78c4b7.7adc638","wires":[["89a2871c.2a813","e61b9900.e00db"]]},{"id":"89a2871c.2a813","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":1587.3217239379883,"y":319.42853116989136,"z":"c78c4b7.7adc638","wires":[["47896469.b34acc"]]},{"id":"47896469.b34acc","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":1699.3217010498047,"y":252.7142515182495,"z":"c78c4b7.7adc638","wires":[["52fff5b0.4373c4"]]},{"id":"52fff5b0.4373c4","type":"execute","name":"execute_UpdateAA&I","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Restarting\" />\n","comments":"","outputs":1,"x":1808.036018371582,"y":319.42854022979736,"z":"c78c4b7.7adc638","wires":[["31c0fe16.4742aa","a2d40fa2.090648"]]},{"id":"31c0fe16.4742aa","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2071.1785888671875,"y":320.57142639160156,"z":"c78c4b7.7adc638","wires":[["be4bc685.e500f"]]},{"id":"e61b9900.e00db","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='400' />\n<parameter name='error-message' value='Request Processed Successfully' />","comments":"","x":1581.0359420776367,"y":376.71416425704956,"z":"c78c4b7.7adc638","wires":[]},{"id":"bbe6ec00.5438f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":566.03564453125,"y":92.28571319580078,"z":"c78c4b7.7adc638","wires":[["2812784e.6d9f"]]},{"id":"5510e749.6e8828","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Failure Executing getVNF_Hierarchy for Restart' />\n","comments":"","x":935.3214340209961,"y":141.57142579555511,"z":"c78c4b7.7adc638","wires":[]},{"id":"9c4bf697.756408","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3518.7500076293945,"y":431.5714588165283,"z":"c78c4b7.7adc638","wires":[["2ad56342.527344"]]},{"id":"ab5d7a5c.3e581","type":"execute","name":"execute_update_AA&I","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Restarted\" />\n","comments":"","outputs":1,"x":4355.46378326416,"y":980.1429214477539,"z":"c78c4b7.7adc638","wires":[["81c62225.e792e8","bbf5360a.5bc72"]]},{"id":"81c62225.e792e8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":4548.892219543457,"y":1085.2858295440674,"z":"c78c4b7.7adc638","wires":[["4a8daed.def30d"]]},{"id":"aba526e8.36f458","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Failure in executing AAI Update' />\n","comments":"","x":4895.892219543457,"y":1136.2858295440674,"z":"c78c4b7.7adc638","wires":[]},{"id":"bbf5360a.5bc72","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4548.178039550781,"y":888.0000867843628,"z":"c78c4b7.7adc638","wires":[["e14f710d.b91ca8"]]},{"id":"a2d40fa2.090648","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1882.7500381469727,"y":612.571478843689,"z":"c78c4b7.7adc638","wires":[["5e910b8f.321cb4"]]},{"id":"dd56ae0f.c5ba","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Error Updating AAI for Restart' />","comments":"","x":2206.32137298584,"y":701.4286470413208,"z":"c78c4b7.7adc638","wires":[]},{"id":"68548acd.173d04","type":"execute","name":"execute_Update_AA&I","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />\n","comments":"","outputs":1,"x":4881.035980224609,"y":594.7143478393555,"z":"c78c4b7.7adc638","wires":[["90a50ec1.5fc638","3382cc54.8f8ec4"]]},{"id":"90a50ec1.5fc638","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":5152.749912261963,"y":329.00002574920654,"z":"c78c4b7.7adc638","wires":[["9d0e2fd1.9c1f4"]]},{"id":"842b4e6e.1e2b88","type":"comment","name":"update VNFCs to Restarting","info":"","comments":"","x":1888.6074600219727,"y":281.71423721313477,"z":"c78c4b7.7adc638","wires":[]},{"id":"939f4559.9592f8","type":"comment","name":"call south bound to Restart VMs","info":"","comments":"","x":3345.1778717041016,"y":252.4285831451416,"z":"c78c4b7.7adc638","wires":[]},{"id":"c6333415.230b9","type":"comment","name":"if failure from south bound then update as Error","info":"","comments":"","x":4876.321907043457,"y":664.1428642272949,"z":"c78c4b7.7adc638","wires":[]},{"id":"972ff5db.a46f1","type":"comment","name":"Restarted VNFCs in AA&I","info":"","comments":"","x":4386.321113586426,"y":1017.714334487915,"z":"c78c4b7.7adc638","wires":[]},{"id":"d7b30e91.75e808","type":"comment","name":"Fetch all VMs and VNFCs from AA&I for given VNF_ID","info":"","comments":"","x":904.4642944335938,"y":172.85714149475098,"z":"c78c4b7.7adc638","wires":[]},{"id":"3382cc54.8f8ec4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":5144.607753753662,"y":422.14294624328613,"z":"c78c4b7.7adc638","wires":[["2e3ea305.ff4bcc"]]},{"id":"733fe7fa.0cd4a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":3483.035758972168,"y":102.85716247558594,"z":"c78c4b7.7adc638","wires":[["dfc7121e.032c28"]]},{"id":"f62397a3.6d3b68","type":"switchNode","name":"switch","xml":"<switch test='`$VNF.VMCount`'>\n","comments":"","outputs":1,"x":1011.607421875,"y":312.28571701049805,"z":"c78c4b7.7adc638","wires":[["863f594c.cb09c8","c9ef2a5a.b038c8"]]},{"id":"863f594c.cb09c8","type":"other","name":"outcome_0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1280.0358276367188,"y":92.42858505249023,"z":"c78c4b7.7adc638","wires":[["820fea44.414b08"]]},{"id":"c9ef2a5a.b038c8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1228.8930282592773,"y":308.1428813934326,"z":"c78c4b7.7adc638","wires":[["d5460718.47f668"]]},{"id":"2ad56342.527344","type":"switchNode","name":"switch","xml":"<switch test='`$RESTART_STATUS`'>\n","comments":"","outputs":1,"x":3700.7500076293945,"y":430.5714588165283,"z":"c78c4b7.7adc638","wires":[["3dec0816.214ee8","f8697aba.3918c","c3be56a.b4937a8"]]},{"id":"c3be56a.b4937a8","type":"success","name":"outcome_SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":3988.1785583496094,"y":767.0000228881836,"z":"c78c4b7.7adc638","wires":[["5736a106.f1fa9"]]},{"id":"3dec0816.214ee8","type":"other","name":"outcome_CONTEXT_NOT_FOUND","xml":"<outcome value='CONTEXT_NOT_FOUND'>\n","comments":"","outputs":1,"x":4003.607635498047,"y":626.4286317825317,"z":"c78c4b7.7adc638","wires":[["52b45889.17d01"]]},{"id":"f8697aba.3918c","type":"other","name":"outcome_ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":3900.7498474121094,"y":384.0000534057617,"z":"c78c4b7.7adc638","wires":[["69297849.639b5"]]},{"id":"b6417ff9.bc58e8","type":"execute","name":"execute_Restart","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='restartServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$VNF.VM[$i].URL`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />\n\n","comments":"","outputs":1,"x":3343.0358657836914,"y":319.8571901321411,"z":"c78c4b7.7adc638","wires":[["9c4bf697.756408","733fe7fa.0cd4a"]]},{"id":"5133513c.856678","type":"switchNode","name":"switch","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":719.3214340209961,"y":312.8572082519531,"z":"c78c4b7.7adc638","wires":[["72b6ce18.26c098","9bead82f.cd767"]]},{"id":"9bead82f.cd767","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":867.5358428955078,"y":583.5714192390442,"z":"c78c4b7.7adc638","wires":[["542f0923.e53be8"]]},{"id":"f514a265.f82058","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Failure Getting VNF Hierarchy for Restart VNF' />\n","comments":"","x":1348.1071891784668,"y":660.285737991333,"z":"c78c4b7.7adc638","wires":[]},{"id":"72b6ce18.26c098","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":871.7499771118164,"y":313.1429080963135,"z":"c78c4b7.7adc638","wires":[["f62397a3.6d3b68"]]},{"id":"bf58666b.5d2968","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='No VMs found for Restart VNF' />","comments":"","x":1634.3217468261719,"y":146.8571014404297,"z":"c78c4b7.7adc638","wires":[]},{"id":"be4bc685.e500f","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":2406.1786003112793,"y":313.4285650253296,"z":"c78c4b7.7adc638","wires":[["48805c31.df9c94","c4d38aa0.b4e8f","7ec494b3.dd525c"]]},{"id":"48805c31.df9c94","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":3131.7501907348633,"y":324.7142677307129,"z":"c78c4b7.7adc638","wires":[["b6417ff9.bc58e8"]]},{"id":"c4d38aa0.b4e8f","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2510.8929176330566,"y":96.4286117553711,"z":"c78c4b7.7adc638","wires":[["563a7593.eb4274"]]},{"id":"d27091ce.97eff8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Unable to send Post Request to update AAI' />","comments":"","x":2901.892868041992,"y":188.4285430908203,"z":"c78c4b7.7adc638","wires":[]},{"id":"7ec494b3.dd525c","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2523.4642753601074,"y":604.857063293457,"z":"c78c4b7.7adc638","wires":[["c35c1366.818ab8"]]},{"id":"c4e150c6.fcb6e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Post Failure Executing Update AAI for Restart' />","comments":"","x":2843.3210678100586,"y":700.2857112884521,"z":"c78c4b7.7adc638","wires":[]},{"id":"e14f710d.b91ca8","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":4710.892288208008,"y":888.428671836853,"z":"c78c4b7.7adc638","wires":[["b8831eff.8281c","6315cee2.ae8958","2807abc1.9b6e14"]]},{"id":"b8831eff.8281c","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":4896.606781005859,"y":887.1429166793823,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"6315cee2.ae8958","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":4901.606986999512,"y":819.2857484817505,"z":"c78c4b7.7adc638","wires":[["7eece4ab.7ff8fc"]]},{"id":"2807abc1.9b6e14","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":4884.606498718262,"y":953.142897605896,"z":"c78c4b7.7adc638","wires":[["27931143.bd9bf6"]]},{"id":"759fc367.db7e2c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Failure in executing AAI Update-Not Found' />","comments":"","x":5265.035415649414,"y":881.8571405410767,"z":"c78c4b7.7adc638","wires":[]},{"id":"6c01944a.700a04","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Failure in executing AAI Update' />","comments":"","x":5292.464195251465,"y":1003.4285669326782,"z":"c78c4b7.7adc638","wires":[]},{"id":"9d0e2fd1.9c1f4","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":5279.179107666016,"y":322.8571615219116,"z":"c78c4b7.7adc638","wires":[["4b5074bb.24e7d4","26b9401d.a918d","5d819842.9acbd8"]]},{"id":"4b5074bb.24e7d4","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":5526.892833709717,"y":269.0000228881836,"z":"c78c4b7.7adc638","wires":[["91fb6ccc.f4eef8"]]},{"id":"91fb6ccc.f4eef8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Restart Failure' />\n","comments":"","x":5778.750324249268,"y":268.00002098083496,"z":"c78c4b7.7adc638","wires":[]},{"id":"26b9401d.a918d","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":5528.893047332764,"y":323.85716438293457,"z":"c78c4b7.7adc638","wires":[["76b4c65c.5494e8"]]},{"id":"5d819842.9acbd8","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":5521.750049591064,"y":389.42859840393066,"z":"c78c4b7.7adc638","wires":[["44730574.2bfc04"]]},{"id":"2812784e.6d9f","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":730.0356864929199,"y":91.99999713897705,"z":"c78c4b7.7adc638","wires":[["29ec2441.2ed354","5510e749.6e8828"]]},{"id":"29ec2441.2ed354","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Exception in getting VNF Hierachy\" />\n\n","comments":"","outputs":1,"x":935.1785926818848,"y":90.85714149475098,"z":"c78c4b7.7adc638","wires":[["5c59289d.8de6f8"]]},{"id":"5c59289d.8de6f8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1081.8928756713867,"y":87.14285659790039,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"542f0923.e53be8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1136.773910522461,"y":585.7620143890381,"z":"c78c4b7.7adc638","wires":[["f514a265.f82058","887f7ca9.35a54"]]},{"id":"887f7ca9.35a54","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in getting VNF Hierachy\" />","comments":"","outputs":1,"x":1329.678638458252,"y":585.1429443359375,"z":"c78c4b7.7adc638","wires":[["a197a7a4.cb6e18"]]},{"id":"a197a7a4.cb6e18","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1510.9644165039062,"y":584.5715417861938,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"820fea44.414b08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1460.321662902832,"y":93.85717391967773,"z":"c78c4b7.7adc638","wires":[["bf58666b.5d2968","d30d206.ec69d6"]]},{"id":"d30d206.ec69d6","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"VM Count is 0\" />\n","comments":"","outputs":1,"x":1643.7503547668457,"y":90.8571424484253,"z":"c78c4b7.7adc638","wires":[["6c930a9e.2240e4"]]},{"id":"6c930a9e.2240e4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1817.6074447631836,"y":92.57139015197754,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"5e910b8f.321cb4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2030.321434020996,"y":611.1428813934326,"z":"c78c4b7.7adc638","wires":[["67794257.4253f4","dd56ae0f.c5ba"]]},{"id":"67794257.4253f4","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $VNF.VM[$i].VNFC`\" />\n","comments":"","outputs":1,"x":2201.750244140625,"y":608.0000610351562,"z":"c78c4b7.7adc638","wires":[["d5a2eec0.c02f4"]]},{"id":"d5a2eec0.c02f4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2335.03564453125,"y":607.857177734375,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"c35c1366.818ab8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2688.0354232788086,"y":602.2856788635254,"z":"c78c4b7.7adc638","wires":[["8d88d68d.178098","c4e150c6.fcb6e"]]},{"id":"8d88d68d.178098","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc ' + $VNF.VM[$i].VNFC`\" />\n\n","comments":"","outputs":1,"x":2845.03564453125,"y":603.142822265625,"z":"c78c4b7.7adc638","wires":[["191c4bc9.ddbc74"]]},{"id":"191c4bc9.ddbc74","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2972.178066253662,"y":602.8570718765259,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"563a7593.eb4274","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2699.464412689209,"y":92.42860984802246,"z":"c78c4b7.7adc638","wires":[["2e8a3fbc.e890c8","d27091ce.97eff8"]]},{"id":"2e8a3fbc.e890c8","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $VNF.VM[$i].VNFC`\" />\n","comments":"","outputs":1,"x":2899.1787300109863,"y":91.85716533660889,"z":"c78c4b7.7adc638","wires":[["ef0eaa38.35d1b8"]]},{"id":"ef0eaa38.35d1b8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3058.6072311401367,"y":91.00004768371582,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"dfc7121e.032c28","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":4711.606857299805,"y":104.57143783569336,"z":"c78c4b7.7adc638","wires":[["11853f36.20c181","68548acd.173d04"]]},{"id":"11853f36.20c181","type":"execute","name":"Report_Failure_in_Restart","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in restart for:' + $VNF.VM[$i].URL`\" />","comments":"","outputs":1,"x":4931.178768157959,"y":131.285737991333,"z":"c78c4b7.7adc638","wires":[["fdc72ce2.9ea988"]]},{"id":"fdc72ce2.9ea988","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":5115.178413391113,"y":133.2857437133789,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"52b45889.17d01","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":4286.178771972656,"y":620.5714626312256,"z":"c78c4b7.7adc638","wires":[["68548acd.173d04","c3a57cd6.f21208"]]},{"id":"c3a57cd6.f21208","type":"execute","name":"Report_Context_not_found","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Context not found:' + $VNF.VM[$i].URL`\" />","comments":"","outputs":1,"x":4495.321556091309,"y":365.571475982666,"z":"c78c4b7.7adc638","wires":[["b2825586.5f88a"]]},{"id":"b2825586.5f88a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4863.180023193359,"y":376.1428756713867,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"69297849.639b5","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":4118.179046630859,"y":360.0000228881836,"z":"c78c4b7.7adc638","wires":[["68548acd.173d04","fb63e7f6.56328"]]},{"id":"fb63e7f6.56328","type":"execute","name":"Report_Error_occoured_while_restarting_the_server","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Error occoured while restarting the server:' + $VNF.VM[$i].URL`\" />","comments":"","outputs":1,"x":4313.607406616211,"y":220.85715770721436,"z":"c78c4b7.7adc638","wires":[["73e3e5cd.5347a4"]]},{"id":"73e3e5cd.5347a4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4656.179046630859,"y":197.99999237060547,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"7eece4ab.7ff8fc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":5098.607124328613,"y":817.7143201828003,"z":"c78c4b7.7adc638","wires":[["3e396754.cadd8","759fc367.db7e2c"]]},{"id":"27931143.bd9bf6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":5095.463916778564,"y":949.8571300506592,"z":"c78c4b7.7adc638","wires":[["d2a97794.1b43b","6c01944a.700a04"]]},{"id":"4a8daed.def30d","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":4685.892219543457,"y":1081.2858295440674,"z":"c78c4b7.7adc638","wires":[["86b1c274.45e328","aba526e8.36f458"]]},{"id":"3e396754.cadd8","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $VNF.VM[$i].VNFC`\" />","comments":"","outputs":1,"x":5262.892913818359,"y":816.5714340209961,"z":"c78c4b7.7adc638","wires":[["4778c346.14f30c"]]},{"id":"d2a97794.1b43b","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc' + $VNF.VM[$i].VNFC`\" />","comments":"","outputs":1,"x":5278.749771118164,"y":948.5713906288147,"z":"c78c4b7.7adc638","wires":[["29a82f21.5b0f2"]]},{"id":"4778c346.14f30c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":5435.892486572266,"y":821.2857761383057,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"29a82f21.5b0f2","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":5446.035621643066,"y":946.857105255127,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"86b1c274.45e328","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $VNF.VM[$i].VNFC`\" />","comments":"","outputs":1,"x":4888.178146362305,"y":1077.1429538726807,"z":"c78c4b7.7adc638","wires":[["ca092d63.dce3c"]]},{"id":"ca092d63.dce3c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":5045.749572753906,"y":1071.1429538726807,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"8e902dec.138668","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Failure in executing AAI update-Restart Failure' />","comments":"","x":5440.749938964844,"y":689.9999990463257,"z":"c78c4b7.7adc638","wires":[]},{"id":"2e3ea305.ff4bcc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":5264.75,"y":599.7142333984375,"z":"c78c4b7.7adc638","wires":[["87148039.f379c8","8e902dec.138668"]]},{"id":"87148039.f379c8","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $VNF.VM[$i].VNFC`\" />\n","comments":"","outputs":1,"x":5436.178810119629,"y":596.571403503418,"z":"c78c4b7.7adc638","wires":[["e405c242.de001"]]},{"id":"e405c242.de001","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":5569.464210510254,"y":596.4285297393799,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"796af8b9.6f0df","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Not Found - Failure in executing AAI Update' />","comments":"","x":6149.75,"y":408,"z":"c78c4b7.7adc638","wires":[]},{"id":"76b4c65c.5494e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":5942.32177734375,"y":328.00006103515625,"z":"c78c4b7.7adc638","wires":[["976e1ffd.3c5ac","796af8b9.6f0df"]]},{"id":"976e1ffd.3c5ac","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $VNF.VM[$i].VNFC`\" />\n","comments":"","outputs":1,"x":6147.035861968994,"y":311.4286222457886,"z":"c78c4b7.7adc638","wires":[["53aeb441.936564"]]},{"id":"53aeb441.936564","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":6306.4643630981445,"y":310.5715045928955,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"bb205133.796038","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Not Found - Failure in executing AAI Update-Restart Failure' />","comments":"","x":5882.75,"y":582,"z":"c78c4b7.7adc638","wires":[]},{"id":"44730574.2bfc04","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":5727.46435546875,"y":483.99996757507324,"z":"c78c4b7.7adc638","wires":[["e06ab492.36011","bb205133.796038"]]},{"id":"e06ab492.36011","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value='Exception in AAI Update for vnfc $VNF.VM[$i].VNFC' />\n","comments":"","outputs":1,"x":5884.464576721191,"y":484.85711097717285,"z":"c78c4b7.7adc638","wires":[["d1e85fde.16424"]]},{"id":"d1e85fde.16424","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":6011.6069984436035,"y":484.57136058807373,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"5736a106.f1fa9","type":"execute","name":"Report_Success_in_Restart","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Restart event executed successfully for ' + $VNF.VM[$i].URL`\" />\n","comments":"","outputs":1,"x":3846.0833435058594,"y":974.6667098999023,"z":"c78c4b7.7adc638","wires":[["9238bd39.7f0f08","b06b539b.237a6"]]},{"id":"9238bd39.7f0f08","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4072.083333333334,"y":1016.6666641235352,"z":"c78c4b7.7adc638","wires":[["ab5d7a5c.3e581"]]},{"id":"b06b539b.237a6","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":4106.083333333334,"y":908.6666641235352,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"436e1771.f30bb","type":"switchNode","name":"switch action-level","xml":"<switch test='`$action-level`'>\n","comments":"","outputs":1,"x":158.5,"y":255.75,"z":"c78c4b7.7adc638","wires":[["c3eb7ee2.6bc838","4b42a252.ce9b7c","2b0668a9.f98a5"]]},{"id":"c3eb7ee2.6bc838","type":"outcome","name":"vnf","xml":"<outcome value='vnf'>\n","comments":"","outputs":1,"x":377.5,"y":190.75,"z":"c78c4b7.7adc638","wires":[["bcbc30ba.d66ea8"]]},{"id":"4b42a252.ce9b7c","type":"outcome","name":"vm","xml":"<outcome value='vm'>\n","comments":"","outputs":1,"x":299.5,"y":916.75,"z":"c78c4b7.7adc638","wires":[["fcce9aee.30317"]]},{"id":"fcce9aee.30317","type":"call","name":"call RestartVMCommonFlow","xml":"<call module='APPC' rpc='RestartVMCommonFlow' mode='sync' >\n","comments":"","outputs":1,"x":524.5,"y":913.75,"z":"c78c4b7.7adc638","wires":[["7d578194.240498","f8a137de.0c9738","3a144b5c.7e90fc"]]},{"id":"7d578194.240498","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":749.5,"y":839.75,"z":"c78c4b7.7adc638","wires":[["a2b0ff50.40a9e"]]},{"id":"f8a137de.0c9738","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":750,"y":907.75,"z":"c78c4b7.7adc638","wires":[["a2b0ff50.40a9e"]]},{"id":"a2b0ff50.40a9e","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":957.75,"y":875.25,"z":"c78c4b7.7adc638","wires":[["4c06f4b2.5bf40c"]]},{"id":"57559431.e251f4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":925.5,"y":953.75,"z":"c78c4b7.7adc638","wires":[["b886d3f6.91d68"]]},{"id":"3a144b5c.7e90fc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":747.7499942779541,"y":960.7499914169312,"z":"c78c4b7.7adc638","wires":[["57559431.e251f4"]]},{"id":"b886d3f6.91d68","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='400' />\n<parameter name='error-message' value='Request Processed Successfully' />","comments":"","x":1107.5,"y":951.75,"z":"c78c4b7.7adc638","wires":[]},{"id":"4c06f4b2.5bf40c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n","comments":"","x":1127.5,"y":872.75,"z":"c78c4b7.7adc638","wires":[]},{"id":"8e978100.d3a1c8","type":"comment","name":"Check action-level, call VM restart if action level is VM","info":"","comments":"","x":246.25,"y":320.75,"z":"c78c4b7.7adc638","wires":[]},{"id":"d78e2f94.fc3e3","type":"comment","name":"Call DG for VM level Restart - parameters are in context","info":"","comments":"","x":456.5,"y":824.75,"z":"c78c4b7.7adc638","wires":[]},{"id":"2b0668a9.f98a5","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":279.75,"y":1012.75,"z":"c78c4b7.7adc638","wires":[["3188358.10d61ca"]]},{"id":"3188358.10d61ca","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":442.75,"y":1007.75,"z":"c78c4b7.7adc638","wires":[["8c09b4ed.560f08"]]},{"id":"8c09b4ed.560f08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Invalid action-level found' />\n","comments":"","x":659.5,"y":1007.25,"z":"c78c4b7.7adc638","wires":[]}]
+[{"id":"8be5abbb.8e8238","type":"method","name":"RestartVMVNFCommonFlow","xml":"<method rpc='RestartVMVNFCommonFlow' mode='sync'>\n","comments":"","outputs":1,"x":162.75,"y":182,"z":"c78c4b7.7adc638","wires":[["436e1771.f30bb"]]},{"id":"4675131a.a2bb4c","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":145.75,"y":133,"z":"c78c4b7.7adc638","wires":[["8be5abbb.8e8238"]]},{"id":"8e03a789.3ae3f8","type":"dgstart","name":"DGSTART","outputs":1,"x":137.75,"y":83,"z":"c78c4b7.7adc638","wires":[["4675131a.a2bb4c"]]},{"id":"bcbc30ba.d66ea8","type":"execute","name":"execute_getVNF_Hierarchy","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />","comments":"","outputs":1,"x":413.75,"y":269,"z":"c78c4b7.7adc638","wires":[["f2d80d63.c8c16","bbe6ec00.5438f8"]]},{"id":"f2d80d63.c8c16","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":569.0357208251953,"y":314.85713386535645,"z":"c78c4b7.7adc638","wires":[["5133513c.856678"]]},{"id":"d5460718.47f668","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":1394.6073913574219,"y":309.5713963508606,"z":"c78c4b7.7adc638","wires":[["89a2871c.2a813","e61b9900.e00db"]]},{"id":"89a2871c.2a813","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":1587.3217239379883,"y":319.42853116989136,"z":"c78c4b7.7adc638","wires":[["47896469.b34acc"]]},{"id":"47896469.b34acc","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":1699.3217010498047,"y":252.7142515182495,"z":"c78c4b7.7adc638","wires":[["52fff5b0.4373c4"]]},{"id":"52fff5b0.4373c4","type":"execute","name":"execute_UpdateAA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Restarting\" />\n","comments":"","outputs":1,"x":1808.036018371582,"y":319.42854022979736,"z":"c78c4b7.7adc638","wires":[["31c0fe16.4742aa","a2d40fa2.090648"]]},{"id":"31c0fe16.4742aa","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2071.1785888671875,"y":320.57142639160156,"z":"c78c4b7.7adc638","wires":[["be4bc685.e500f"]]},{"id":"e61b9900.e00db","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='400' />\n<parameter name='error-message' value='Request Processed Successfully' />","comments":"","x":1581.0359420776367,"y":376.71416425704956,"z":"c78c4b7.7adc638","wires":[]},{"id":"bbe6ec00.5438f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":566.03564453125,"y":92.28571319580078,"z":"c78c4b7.7adc638","wires":[["2812784e.6d9f"]]},{"id":"5510e749.6e8828","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Failure Executing getVNF_Hierarchy for Restart' />\n","comments":"","x":935.3214340209961,"y":141.57142579555511,"z":"c78c4b7.7adc638","wires":[]},{"id":"9c4bf697.756408","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3518.7500076293945,"y":431.5714588165283,"z":"c78c4b7.7adc638","wires":[["2ad56342.527344"]]},{"id":"ab5d7a5c.3e581","type":"execute","name":"execute_update_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Restarted\" />\n","comments":"","outputs":1,"x":4355.46378326416,"y":980.1429214477539,"z":"c78c4b7.7adc638","wires":[["81c62225.e792e8","bbf5360a.5bc72"]]},{"id":"81c62225.e792e8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":4548.892219543457,"y":1085.2858295440674,"z":"c78c4b7.7adc638","wires":[["4a8daed.def30d"]]},{"id":"aba526e8.36f458","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Failure in executing AAI Update' />\n","comments":"","x":4895.892219543457,"y":1136.2858295440674,"z":"c78c4b7.7adc638","wires":[]},{"id":"bbf5360a.5bc72","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4548.178039550781,"y":888.0000867843628,"z":"c78c4b7.7adc638","wires":[["e14f710d.b91ca8"]]},{"id":"a2d40fa2.090648","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1882.7500381469727,"y":612.571478843689,"z":"c78c4b7.7adc638","wires":[["5e910b8f.321cb4"]]},{"id":"dd56ae0f.c5ba","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Error Updating AAI for Restart' />","comments":"","x":2206.32137298584,"y":701.4286470413208,"z":"c78c4b7.7adc638","wires":[]},{"id":"68548acd.173d04","type":"execute","name":"execute_Update_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />\n","comments":"","outputs":1,"x":4881.035980224609,"y":594.7143478393555,"z":"c78c4b7.7adc638","wires":[["90a50ec1.5fc638","3382cc54.8f8ec4"]]},{"id":"90a50ec1.5fc638","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":5152.749912261963,"y":329.00002574920654,"z":"c78c4b7.7adc638","wires":[["9d0e2fd1.9c1f4"]]},{"id":"842b4e6e.1e2b88","type":"comment","name":"update VNFCs to Restarting","info":"","comments":"","x":1888.6074600219727,"y":281.71423721313477,"z":"c78c4b7.7adc638","wires":[]},{"id":"939f4559.9592f8","type":"comment","name":"call south bound to Restart VMs","info":"","comments":"","x":3345.1778717041016,"y":252.4285831451416,"z":"c78c4b7.7adc638","wires":[]},{"id":"c6333415.230b9","type":"comment","name":"if failure from south bound then update as Error","info":"","comments":"","x":4876.321907043457,"y":664.1428642272949,"z":"c78c4b7.7adc638","wires":[]},{"id":"972ff5db.a46f1","type":"comment","name":"Restarted VNFCs in AA&I","info":"","comments":"","x":4386.321113586426,"y":1017.714334487915,"z":"c78c4b7.7adc638","wires":[]},{"id":"d7b30e91.75e808","type":"comment","name":"Fetch all VMs and VNFCs from AA&I for given VNF_ID","info":"","comments":"","x":904.4642944335938,"y":172.85714149475098,"z":"c78c4b7.7adc638","wires":[]},{"id":"3382cc54.8f8ec4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":5144.607753753662,"y":422.14294624328613,"z":"c78c4b7.7adc638","wires":[["2e3ea305.ff4bcc"]]},{"id":"733fe7fa.0cd4a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":3483.035758972168,"y":102.85716247558594,"z":"c78c4b7.7adc638","wires":[["dfc7121e.032c28"]]},{"id":"f62397a3.6d3b68","type":"switchNode","name":"switch","xml":"<switch test='`$VNF.VMCount`'>\n","comments":"","outputs":1,"x":1011.607421875,"y":312.28571701049805,"z":"c78c4b7.7adc638","wires":[["863f594c.cb09c8","c9ef2a5a.b038c8"]]},{"id":"863f594c.cb09c8","type":"other","name":"outcome_0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1280.0358276367188,"y":92.42858505249023,"z":"c78c4b7.7adc638","wires":[["820fea44.414b08"]]},{"id":"c9ef2a5a.b038c8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1228.8930282592773,"y":308.1428813934326,"z":"c78c4b7.7adc638","wires":[["d5460718.47f668"]]},{"id":"2ad56342.527344","type":"switchNode","name":"switch","xml":"<switch test='`$RESTART_STATUS`'>\n","comments":"","outputs":1,"x":3700.7500076293945,"y":430.5714588165283,"z":"c78c4b7.7adc638","wires":[["3dec0816.214ee8","f8697aba.3918c","c3be56a.b4937a8"]]},{"id":"c3be56a.b4937a8","type":"success","name":"outcome_SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":3988.1785583496094,"y":767.0000228881836,"z":"c78c4b7.7adc638","wires":[["5736a106.f1fa9"]]},{"id":"3dec0816.214ee8","type":"other","name":"outcome_CONTEXT_NOT_FOUND","xml":"<outcome value='CONTEXT_NOT_FOUND'>\n","comments":"","outputs":1,"x":4003.607635498047,"y":626.4286317825317,"z":"c78c4b7.7adc638","wires":[["52b45889.17d01"]]},{"id":"f8697aba.3918c","type":"other","name":"outcome_ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":3900.7498474121094,"y":384.0000534057617,"z":"c78c4b7.7adc638","wires":[["69297849.639b5"]]},{"id":"b6417ff9.bc58e8","type":"execute","name":"execute_Restart","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='restartServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$VNF.VM[$i].URL`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n\n","comments":"","outputs":1,"x":3343.0358657836914,"y":319.8571901321411,"z":"c78c4b7.7adc638","wires":[["9c4bf697.756408","733fe7fa.0cd4a"]]},{"id":"5133513c.856678","type":"switchNode","name":"switch","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":719.3214340209961,"y":312.8572082519531,"z":"c78c4b7.7adc638","wires":[["72b6ce18.26c098","9bead82f.cd767"]]},{"id":"9bead82f.cd767","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":867.5358428955078,"y":583.5714192390442,"z":"c78c4b7.7adc638","wires":[["542f0923.e53be8"]]},{"id":"f514a265.f82058","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Failure Getting VNF Hierarchy for Restart VNF' />\n","comments":"","x":1348.1071891784668,"y":660.285737991333,"z":"c78c4b7.7adc638","wires":[]},{"id":"72b6ce18.26c098","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":871.7499771118164,"y":313.1429080963135,"z":"c78c4b7.7adc638","wires":[["f62397a3.6d3b68"]]},{"id":"bf58666b.5d2968","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='No VMs found for Restart VNF' />","comments":"","x":1634.3217468261719,"y":146.8571014404297,"z":"c78c4b7.7adc638","wires":[]},{"id":"be4bc685.e500f","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":2406.1786003112793,"y":313.4285650253296,"z":"c78c4b7.7adc638","wires":[["48805c31.df9c94","c4d38aa0.b4e8f","7ec494b3.dd525c"]]},{"id":"48805c31.df9c94","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":3131.7501907348633,"y":324.7142677307129,"z":"c78c4b7.7adc638","wires":[["b6417ff9.bc58e8"]]},{"id":"c4d38aa0.b4e8f","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2510.8929176330566,"y":96.4286117553711,"z":"c78c4b7.7adc638","wires":[["563a7593.eb4274"]]},{"id":"d27091ce.97eff8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Unable to send Post Request to update AAI' />","comments":"","x":2901.892868041992,"y":188.4285430908203,"z":"c78c4b7.7adc638","wires":[]},{"id":"7ec494b3.dd525c","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2523.4642753601074,"y":604.857063293457,"z":"c78c4b7.7adc638","wires":[["c35c1366.818ab8"]]},{"id":"c4e150c6.fcb6e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Post Failure Executing Update AAI for Restart' />","comments":"","x":2843.3210678100586,"y":700.2857112884521,"z":"c78c4b7.7adc638","wires":[]},{"id":"e14f710d.b91ca8","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":4710.892288208008,"y":888.428671836853,"z":"c78c4b7.7adc638","wires":[["b8831eff.8281c","6315cee2.ae8958","2807abc1.9b6e14"]]},{"id":"b8831eff.8281c","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":4896.606781005859,"y":887.1429166793823,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"6315cee2.ae8958","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":4901.606986999512,"y":819.2857484817505,"z":"c78c4b7.7adc638","wires":[["7eece4ab.7ff8fc"]]},{"id":"2807abc1.9b6e14","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":4884.606498718262,"y":953.142897605896,"z":"c78c4b7.7adc638","wires":[["27931143.bd9bf6"]]},{"id":"759fc367.db7e2c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Failure in executing AAI Update-Not Found' />","comments":"","x":5265.035415649414,"y":881.8571405410767,"z":"c78c4b7.7adc638","wires":[]},{"id":"6c01944a.700a04","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Failure in executing AAI Update' />","comments":"","x":5292.464195251465,"y":1003.4285669326782,"z":"c78c4b7.7adc638","wires":[]},{"id":"9d0e2fd1.9c1f4","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":5279.179107666016,"y":322.8571615219116,"z":"c78c4b7.7adc638","wires":[["4b5074bb.24e7d4","26b9401d.a918d","5d819842.9acbd8"]]},{"id":"4b5074bb.24e7d4","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":5526.892833709717,"y":269.0000228881836,"z":"c78c4b7.7adc638","wires":[["91fb6ccc.f4eef8"]]},{"id":"91fb6ccc.f4eef8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Restart Failure' />\n","comments":"","x":5778.750324249268,"y":268.00002098083496,"z":"c78c4b7.7adc638","wires":[]},{"id":"26b9401d.a918d","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":5528.893047332764,"y":323.85716438293457,"z":"c78c4b7.7adc638","wires":[["76b4c65c.5494e8"]]},{"id":"5d819842.9acbd8","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":5521.750049591064,"y":389.42859840393066,"z":"c78c4b7.7adc638","wires":[["44730574.2bfc04"]]},{"id":"2812784e.6d9f","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":730.0356864929199,"y":91.99999713897705,"z":"c78c4b7.7adc638","wires":[["29ec2441.2ed354","5510e749.6e8828"]]},{"id":"29ec2441.2ed354","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Exception in getting VNF Hierachy\" />\n\n","comments":"","outputs":1,"x":935.1785926818848,"y":90.85714149475098,"z":"c78c4b7.7adc638","wires":[["5c59289d.8de6f8"]]},{"id":"5c59289d.8de6f8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1081.8928756713867,"y":87.14285659790039,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"542f0923.e53be8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1136.773910522461,"y":585.7620143890381,"z":"c78c4b7.7adc638","wires":[["f514a265.f82058","887f7ca9.35a54"]]},{"id":"887f7ca9.35a54","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in getting VNF Hierachy\" />","comments":"","outputs":1,"x":1329.678638458252,"y":585.1429443359375,"z":"c78c4b7.7adc638","wires":[["a197a7a4.cb6e18"]]},{"id":"a197a7a4.cb6e18","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1510.9644165039062,"y":584.5715417861938,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"820fea44.414b08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1460.321662902832,"y":93.85717391967773,"z":"c78c4b7.7adc638","wires":[["bf58666b.5d2968","d30d206.ec69d6"]]},{"id":"d30d206.ec69d6","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"VM Count is 0\" />\n","comments":"","outputs":1,"x":1643.7503547668457,"y":90.8571424484253,"z":"c78c4b7.7adc638","wires":[["6c930a9e.2240e4"]]},{"id":"6c930a9e.2240e4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1817.6074447631836,"y":92.57139015197754,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"5e910b8f.321cb4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2030.321434020996,"y":611.1428813934326,"z":"c78c4b7.7adc638","wires":[["67794257.4253f4","dd56ae0f.c5ba"]]},{"id":"67794257.4253f4","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $VNF.VM[$i].VNFC`\" />\n","comments":"","outputs":1,"x":2201.750244140625,"y":608.0000610351562,"z":"c78c4b7.7adc638","wires":[["d5a2eec0.c02f4"]]},{"id":"d5a2eec0.c02f4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2335.03564453125,"y":607.857177734375,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"c35c1366.818ab8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2688.0354232788086,"y":602.2856788635254,"z":"c78c4b7.7adc638","wires":[["8d88d68d.178098","c4e150c6.fcb6e"]]},{"id":"8d88d68d.178098","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc ' + $VNF.VM[$i].VNFC`\" />\n\n","comments":"","outputs":1,"x":2845.03564453125,"y":603.142822265625,"z":"c78c4b7.7adc638","wires":[["191c4bc9.ddbc74"]]},{"id":"191c4bc9.ddbc74","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2972.178066253662,"y":602.8570718765259,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"563a7593.eb4274","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2699.464412689209,"y":92.42860984802246,"z":"c78c4b7.7adc638","wires":[["2e8a3fbc.e890c8","d27091ce.97eff8"]]},{"id":"2e8a3fbc.e890c8","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $VNF.VM[$i].VNFC`\" />\n","comments":"","outputs":1,"x":2899.1787300109863,"y":91.85716533660889,"z":"c78c4b7.7adc638","wires":[["ef0eaa38.35d1b8"]]},{"id":"ef0eaa38.35d1b8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3058.6072311401367,"y":91.00004768371582,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"dfc7121e.032c28","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":4711.606857299805,"y":104.57143783569336,"z":"c78c4b7.7adc638","wires":[["11853f36.20c181","68548acd.173d04"]]},{"id":"11853f36.20c181","type":"execute","name":"Report_Failure_in_Restart","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in restart for:' + $VNF.VM[$i].URL`\" />","comments":"","outputs":1,"x":4931.178768157959,"y":131.285737991333,"z":"c78c4b7.7adc638","wires":[["fdc72ce2.9ea988"]]},{"id":"fdc72ce2.9ea988","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":5115.178413391113,"y":133.2857437133789,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"52b45889.17d01","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":4286.178771972656,"y":620.5714626312256,"z":"c78c4b7.7adc638","wires":[["68548acd.173d04","c3a57cd6.f21208"]]},{"id":"c3a57cd6.f21208","type":"execute","name":"Report_Context_not_found","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Context not found:' + $VNF.VM[$i].URL`\" />","comments":"","outputs":1,"x":4495.321556091309,"y":365.571475982666,"z":"c78c4b7.7adc638","wires":[["b2825586.5f88a"]]},{"id":"b2825586.5f88a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4863.180023193359,"y":376.1428756713867,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"69297849.639b5","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":4118.179046630859,"y":360.0000228881836,"z":"c78c4b7.7adc638","wires":[["68548acd.173d04","fb63e7f6.56328"]]},{"id":"fb63e7f6.56328","type":"execute","name":"Report_Error_occoured_while_restarting_the_server","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Error occoured while restarting the server:' + $VNF.VM[$i].URL`\" />","comments":"","outputs":1,"x":4313.607406616211,"y":220.85715770721436,"z":"c78c4b7.7adc638","wires":[["73e3e5cd.5347a4"]]},{"id":"73e3e5cd.5347a4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4656.179046630859,"y":197.99999237060547,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"7eece4ab.7ff8fc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":5098.607124328613,"y":817.7143201828003,"z":"c78c4b7.7adc638","wires":[["3e396754.cadd8","759fc367.db7e2c"]]},{"id":"27931143.bd9bf6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":5095.463916778564,"y":949.8571300506592,"z":"c78c4b7.7adc638","wires":[["d2a97794.1b43b","6c01944a.700a04"]]},{"id":"4a8daed.def30d","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":4685.892219543457,"y":1081.2858295440674,"z":"c78c4b7.7adc638","wires":[["86b1c274.45e328","aba526e8.36f458"]]},{"id":"3e396754.cadd8","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $VNF.VM[$i].VNFC`\" />","comments":"","outputs":1,"x":5262.892913818359,"y":816.5714340209961,"z":"c78c4b7.7adc638","wires":[["4778c346.14f30c"]]},{"id":"d2a97794.1b43b","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc' + $VNF.VM[$i].VNFC`\" />","comments":"","outputs":1,"x":5278.749771118164,"y":948.5713906288147,"z":"c78c4b7.7adc638","wires":[["29a82f21.5b0f2"]]},{"id":"4778c346.14f30c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":5435.892486572266,"y":821.2857761383057,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"29a82f21.5b0f2","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":5446.035621643066,"y":946.857105255127,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"86b1c274.45e328","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $VNF.VM[$i].VNFC`\" />","comments":"","outputs":1,"x":4888.178146362305,"y":1077.1429538726807,"z":"c78c4b7.7adc638","wires":[["ca092d63.dce3c"]]},{"id":"ca092d63.dce3c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":5045.749572753906,"y":1071.1429538726807,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"8e902dec.138668","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Failure in executing AAI update-Restart Failure' />","comments":"","x":5440.749938964844,"y":689.9999990463257,"z":"c78c4b7.7adc638","wires":[]},{"id":"2e3ea305.ff4bcc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":5264.75,"y":599.7142333984375,"z":"c78c4b7.7adc638","wires":[["87148039.f379c8","8e902dec.138668"]]},{"id":"87148039.f379c8","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $VNF.VM[$i].VNFC`\" />\n","comments":"","outputs":1,"x":5436.178810119629,"y":596.571403503418,"z":"c78c4b7.7adc638","wires":[["e405c242.de001"]]},{"id":"e405c242.de001","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":5569.464210510254,"y":596.4285297393799,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"796af8b9.6f0df","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Not Found - Failure in executing AAI Update' />","comments":"","x":6149.75,"y":408,"z":"c78c4b7.7adc638","wires":[]},{"id":"76b4c65c.5494e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":5942.32177734375,"y":328.00006103515625,"z":"c78c4b7.7adc638","wires":[["976e1ffd.3c5ac","796af8b9.6f0df"]]},{"id":"976e1ffd.3c5ac","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $VNF.VM[$i].VNFC`\" />\n","comments":"","outputs":1,"x":6147.035861968994,"y":311.4286222457886,"z":"c78c4b7.7adc638","wires":[["53aeb441.936564"]]},{"id":"53aeb441.936564","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":6306.4643630981445,"y":310.5715045928955,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"bb205133.796038","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Not Found - Failure in executing AAI Update-Restart Failure' />","comments":"","x":5882.75,"y":582,"z":"c78c4b7.7adc638","wires":[]},{"id":"44730574.2bfc04","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":5727.46435546875,"y":483.99996757507324,"z":"c78c4b7.7adc638","wires":[["e06ab492.36011","bb205133.796038"]]},{"id":"e06ab492.36011","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value='Exception in AAI Update for vnfc $VNF.VM[$i].VNFC' />\n","comments":"","outputs":1,"x":5884.464576721191,"y":484.85711097717285,"z":"c78c4b7.7adc638","wires":[["d1e85fde.16424"]]},{"id":"d1e85fde.16424","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":6011.6069984436035,"y":484.57136058807373,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"5736a106.f1fa9","type":"execute","name":"Report_Success_in_Restart","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Restart event executed successfully for ' + $VNF.VM[$i].URL`\" />\n","comments":"","outputs":1,"x":3846.0833435058594,"y":974.6667098999023,"z":"c78c4b7.7adc638","wires":[["9238bd39.7f0f08","b06b539b.237a6"]]},{"id":"9238bd39.7f0f08","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4072.083333333334,"y":1016.6666641235352,"z":"c78c4b7.7adc638","wires":[["ab5d7a5c.3e581"]]},{"id":"b06b539b.237a6","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":4106.083333333334,"y":908.6666641235352,"z":"c78c4b7.7adc638","wires":[[]]},{"id":"436e1771.f30bb","type":"switchNode","name":"switch action-level","xml":"<switch test='`$action-level`'>\n","comments":"","outputs":1,"x":158.5,"y":255.75,"z":"c78c4b7.7adc638","wires":[["c3eb7ee2.6bc838","4b42a252.ce9b7c","2b0668a9.f98a5"]]},{"id":"c3eb7ee2.6bc838","type":"outcome","name":"vnf","xml":"<outcome value='vnf'>\n","comments":"","outputs":1,"x":377.5,"y":190.75,"z":"c78c4b7.7adc638","wires":[["bcbc30ba.d66ea8"]]},{"id":"4b42a252.ce9b7c","type":"outcome","name":"vm","xml":"<outcome value='vm'>\n","comments":"","outputs":1,"x":299.5,"y":916.75,"z":"c78c4b7.7adc638","wires":[["fcce9aee.30317"]]},{"id":"fcce9aee.30317","type":"call","name":"call RestartVMCommonFlow","xml":"<call module='APPC' rpc='RestartVMCommonFlow' mode='sync' >\n","comments":"","outputs":1,"x":524.5,"y":913.75,"z":"c78c4b7.7adc638","wires":[["7d578194.240498","f8a137de.0c9738","3a144b5c.7e90fc"]]},{"id":"7d578194.240498","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":749.5,"y":839.75,"z":"c78c4b7.7adc638","wires":[["a2b0ff50.40a9e"]]},{"id":"f8a137de.0c9738","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":750,"y":907.75,"z":"c78c4b7.7adc638","wires":[["a2b0ff50.40a9e"]]},{"id":"a2b0ff50.40a9e","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":957.75,"y":875.25,"z":"c78c4b7.7adc638","wires":[["4c06f4b2.5bf40c"]]},{"id":"57559431.e251f4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":925.5,"y":953.75,"z":"c78c4b7.7adc638","wires":[["b886d3f6.91d68"]]},{"id":"3a144b5c.7e90fc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":747.7499942779541,"y":960.7499914169312,"z":"c78c4b7.7adc638","wires":[["57559431.e251f4"]]},{"id":"b886d3f6.91d68","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='400' />\n<parameter name='error-message' value='Request Processed Successfully' />","comments":"","x":1107.5,"y":951.75,"z":"c78c4b7.7adc638","wires":[]},{"id":"4c06f4b2.5bf40c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n","comments":"","x":1127.5,"y":872.75,"z":"c78c4b7.7adc638","wires":[]},{"id":"8e978100.d3a1c8","type":"comment","name":"Check action-level, call VM restart if action level is VM","info":"","comments":"","x":246.25,"y":320.75,"z":"c78c4b7.7adc638","wires":[]},{"id":"d78e2f94.fc3e3","type":"comment","name":"Call DG for VM level Restart - parameters are in context","info":"","comments":"","x":456.5,"y":824.75,"z":"c78c4b7.7adc638","wires":[]},{"id":"2b0668a9.f98a5","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":279.75,"y":1012.75,"z":"c78c4b7.7adc638","wires":[["3188358.10d61ca"]]},{"id":"3188358.10d61ca","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":442.75,"y":1007.75,"z":"c78c4b7.7adc638","wires":[["8c09b4ed.560f08"]]},{"id":"8c09b4ed.560f08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Invalid action-level found' />\n","comments":"","x":659.5,"y":1007.25,"z":"c78c4b7.7adc638","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 97de6415d..7e620c9c7 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.openecomp.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.openecomp.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.openecomp.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.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":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_UpdateAaiforPayloadInput.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_UpdateAaiforPayloadInput.json
index 46956d52e..46e147366 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_UpdateAaiforPayloadInput.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_UpdateAaiforPayloadInput.json
@@ -1 +1 @@
-[{"id":"9333f052.3d35c","type":"service-logic","name":"APPC 3.0.0","module":"APPC","version":"3.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='3.0.0'>","outputs":1,"x":267,"y":42.333335876464844,"z":"2c29979c.085788","wires":[["b5bc2ae5.c3ccb8"]]},{"id":"ccfc3135.e932f","type":"dgstart","name":"DGSTART","outputs":1,"x":96.83331298828125,"y":41.66667938232422,"z":"2c29979c.085788","wires":[["9333f052.3d35c"]]},{"id":"b5bc2ae5.c3ccb8","type":"method","name":"method UpdateAaiforPayloadInput","xml":"<method rpc='UpdateAaiforPayloadInput' mode='sync'>\n","comments":"","outputs":1,"x":490.3333740234375,"y":39,"z":"2c29979c.085788","wires":[["6f4f9cf7.421284"]]},{"id":"6f4f9cf7.421284","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":120,"y":262.33333587646484,"z":"2c29979c.085788","wires":[["dacd8a6.62c3978","46ce8310.34f23c","16298fb8.22c27","f50ba4be.268618"]]},{"id":"46ce8310.34f23c","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=\"RETURNEDERRORMSG\" value=\"`$aai-error-message`\"/>\n\n","comments":"","outputs":1,"x":327,"y":717.3333969116211,"z":"2c29979c.085788","wires":[[]]},{"id":"dacd8a6.62c3978","type":"switchNode","name":"switch: vm length","xml":"<switch test=\"`$size_request-parameters.vm`\">","comments":"","outputs":1,"x":356,"y":165.44445037841797,"z":"2c29979c.085788","wires":[["44fdeb61.aa9034","72261fcd.ca467","2a6d9b73.a96634"]]},{"id":"daef72.bdc6c09","type":"for","name":"for: vm","xml":"<for index=\"j\" start=\"0\" end=\"`$size_request-parameters.vm`\" >","comments":"","outputs":1,"x":365,"y":319.3333969116211,"z":"2c29979c.085788","wires":[["9ed29edc.ebe52"]]},{"id":"44fdeb61.aa9034","type":"other","name":"outcome: Length=0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":591.0000610351562,"y":142.44445037841797,"z":"2c29979c.085788","wires":[["bfe524b3.a8b848"]]},{"id":"72261fcd.ca467","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":581.0000610351562,"y":201.44445037841797,"z":"2c29979c.085788","wires":[["bfe524b3.a8b848"]]},{"id":"9ed29edc.ebe52","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":540.0000610351562,"y":320.3333969116211,"z":"2c29979c.085788","wires":[["8a8c3760.6f71b8"]]},{"id":"bfe524b3.a8b848","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":785.0000610351562,"y":171.44445037841797,"z":"2c29979c.085788","wires":[["270c634c.7568ec","a13ad30b.4366c"]]},{"id":"6ef24474.a983ec","type":"get-resource","name":"get-resource: A&AI Data for VNFC Name ","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"vnfc\" key=\"vnfc-name = $request-parameters.vm[$j].vnfc[$k].vnfc-name\" pfx=\"tmp.aai-data-vnfc\" >\n\n\n","comments":"","outputs":1,"x":1249.5001220703125,"y":677.5555648803711,"z":"2c29979c.085788","wires":[["a751861e.5d43a8","52d5b700.fd5458"]]},{"id":"270c634c.7568ec","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=\"VM data not found in request\"/>\n\n\n","comments":"","outputs":1,"x":975.0000610351562,"y":152.44445037841797,"z":"2c29979c.085788","wires":[[]]},{"id":"a751861e.5d43a8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1511,"y":680.3333358764648,"z":"2c29979c.085788","wires":[["3e894fae.eed92"]]},{"id":"3e894fae.eed92","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1682,"y":685.3333358764648,"z":"2c29979c.085788","wires":[["29d3772.e8a1788"]]},{"id":"defef68c.efd408","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1274.1664962768555,"y":1023.5833148956299,"z":"2c29979c.085788","wires":[["1b7742ee.646d8d"]]},{"id":"1b7742ee.646d8d","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1465.1664962768555,"y":1023.0833148956299,"z":"2c29979c.085788","wires":[["484c0808.c6a598","22e0181c.878b98"]]},{"id":"484c0808.c6a598","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=\"`$request-parameters.vm[$j].vnfc[$k].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":1641.6665000915527,"y":977.5833759307861,"z":"2c29979c.085788","wires":[[]]},{"id":"22e0181c.878b98","type":"set","name":"set: Append to aai error message","xml":"<set>\n\t  <parameter name=\"aai-error-message\" value=\"`'Insert to A&amp;AI Failed for ' + $request-parameters.vm[$j].vnfc[$k].vnfc-name + '.' + $aai-error-message`\"/>","comments":"","x":1718.1664962768555,"y":1071.8333158493042,"z":"2c29979c.085788","wires":[]},{"id":"8ffddb97.757d58","type":"for","name":"for: vm.vnfc","xml":"<for index=\"k\" start=\"0\" end=\"`$size_request-parameters.vm[$j].vnfc`\" >","comments":"","outputs":1,"x":875.2143783569336,"y":614.7619743347168,"z":"2c29979c.085788","wires":[["c2298a98.0adbd8"]]},{"id":"c2298a98.0adbd8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1060.5001831054688,"y":615.3333358764648,"z":"2c29979c.085788","wires":[["b61d1503.913e98","6ef24474.a983ec"]]},{"id":"b61d1503.913e98","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\n<parameter name=\"VNFCNAME\" value=\"`$request-parameters.vm[$j].vnfc[$k].vnfc-name`\"/>\n\n<parameter name=\"VMNAME\" value=\"`$request-parameters.vm[$j].vm-name`\"/>\n","comments":"","outputs":1,"x":1245.5001831054688,"y":597.3333358764648,"z":"2c29979c.085788","wires":[[]]},{"id":"2a6d9b73.a96634","type":"other","name":"outcome: Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":373.00006103515625,"y":248.1111068725586,"z":"2c29979c.085788","wires":[["b4699d7b.74cfd"]]},{"id":"b4699d7b.74cfd","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":560,"y":253.1111068725586,"z":"2c29979c.085788","wires":[["daef72.bdc6c09"]]},{"id":"e4aab88c.91de48","type":"switchNode","name":"switch: vnfc length","xml":"<switch test=\"`$size_request-parameters.vm[$j].vnfc`\">","comments":"","outputs":1,"x":704.3572540283203,"y":477.9047508239746,"z":"2c29979c.085788","wires":[["cc76df4b.79195","b9647e56.5428","515b427.0838abc"]]},{"id":"cc76df4b.79195","type":"other","name":"outcome: Length=0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1012.5001831054688,"y":465.33333587646484,"z":"2c29979c.085788","wires":[["daca7ad3.6849a8"]]},{"id":"b9647e56.5428","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":999.5001831054688,"y":503.33333587646484,"z":"2c29979c.085788","wires":[["daca7ad3.6849a8"]]},{"id":"515b427.0838abc","type":"other","name":"outcome: Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1002.5001831054688,"y":555.3333358764648,"z":"2c29979c.085788","wires":[["85b4db72.6fea78"]]},{"id":"daca7ad3.6849a8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1233.500244140625,"y":493.33333587646484,"z":"2c29979c.085788","wires":[["a51065d2.dda8e8","84809a16.798bb8"]]},{"id":"a51065d2.dda8e8","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=\"VNFC data not in request\"/>\n\n\n","comments":"","outputs":1,"x":1425.500244140625,"y":459.33333587646484,"z":"2c29979c.085788","wires":[[]]},{"id":"85b4db72.6fea78","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":663.5001220703125,"y":615.3333358764648,"z":"2c29979c.085788","wires":[["8ffddb97.757d58"]]},{"id":"8a8c3760.6f71b8","type":"get-resource","name":"get-resource: A&AI Data for VM Name","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"vserver\" key=\"vserver-name = $request-parameters.vm[$j].vm-name\" pfx=\"tmp.aai-data-vm\" >\n\n","comments":"","outputs":1,"x":813.1666870117188,"y":323.1111068725586,"z":"2c29979c.085788","wires":[["891fa503.2eb248","8165f2d1.c2795","760228ff.b17788"]]},{"id":"891fa503.2eb248","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1074.166748046875,"y":284.1111068725586,"z":"2c29979c.085788","wires":[["ffbb360a.0f9b98"]]},{"id":"8165f2d1.c2795","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1083.166748046875,"y":335.1111068725586,"z":"2c29979c.085788","wires":[["ffbb360a.0f9b98"]]},{"id":"760228ff.b17788","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1060,"y":396.33333587646484,"z":"2c29979c.085788","wires":[["9ead1868.e9e0d8"]]},{"id":"ffbb360a.0f9b98","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1265.166748046875,"y":310.1111068725586,"z":"2c29979c.085788","wires":[["23cd0ec8.29e192"]]},{"id":"23cd0ec8.29e192","type":"set","name":"set: Append to aai-error message","xml":"<set>\n\t  <parameter name=\"aai-error-message\" value=\"`'Get from A&amp;AI Failed for ' + $request-parameters.vm[$j].vm-name + '.' + $aai-error-message`\"/>","comments":"","x":1538.166748046875,"y":315.1111068725586,"z":"2c29979c.085788","wires":[]},{"id":"a13ad30b.4366c","type":"set","name":"set: Append to aai-error message","xml":"<set>\n\t  <parameter name=\"aai-error-message\" value=\"`'VM Info not found in request.' + $aai-error-message`\"/>","comments":"","x":1055.1666870117188,"y":198.1111068725586,"z":"2c29979c.085788","wires":[]},{"id":"84809a16.798bb8","type":"set","name":"set: Append to aai-error message","xml":"<set>\n\t  <parameter name=\"aai-error-message\" value=\"`'VNFC Info not found in request.' + $aai-error-message`\"/>","comments":"","x":1505.6668701171875,"y":520.3333358764648,"z":"2c29979c.085788","wires":[]},{"id":"16298fb8.22c27","type":"switchNode","name":"switch: aai-error-message","xml":"<switch test=\"`$aai-error-message`\">","comments":"","outputs":1,"x":131.16668701171875,"y":859.1111068725586,"z":"2c29979c.085788","wires":[["ccb9af83.f0c75","d8d6fa14.d6e7e8"]]},{"id":"ccb9af83.f0c75","type":"other","name":"outcome: not populated","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":387.16668701171875,"y":858.1111068725586,"z":"2c29979c.085788","wires":[["8e4f6b95.1df068"]]},{"id":"8e4f6b95.1df068","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":589.1666870117188,"y":872.1111068725586,"z":"2c29979c.085788","wires":[["18c23b39.337805"]]},{"id":"d8d6fa14.d6e7e8","type":"other","name":"outcome: Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":362.16668701171875,"y":936.1111068725586,"z":"2c29979c.085788","wires":[["94c6b29b.e6273"]]},{"id":"94c6b29b.e6273","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":554.1666870117188,"y":938.1111068725586,"z":"2c29979c.085788","wires":[["73ce9597.b49bcc","715964cb.dde1bc"]]},{"id":"18c23b39.337805","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":782.1666870117188,"y":874.1111068725586,"z":"2c29979c.085788","wires":[]},{"id":"73ce9597.b49bcc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":746.1666870117188,"y":1004.1111679077148,"z":"2c29979c.085788","wires":[]},{"id":"f50ba4be.268618","type":"set","name":"set prov-status and orch-status","xml":"<set>\n<parameter name=\"tmp.aai-prov-status\" value=\"NVTPROV\" />\n\t<parameter name=\"tmp.aai-orch-status\" value=\"CONFIGURED\" />\n","comments":"","x":403,"y":84.33333587646484,"z":"2c29979c.085788","wires":[]},{"id":"c46d035a.6bbd7","type":"save","name":"save Put VNFC","xml":"<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='vnfc' key='vnfc-name = $request-parameters.vm[$j].vnfc[$k].vnfc-name' force='true' pfx='tmp.vnfc-sys-controller'>\n<parameter name='vnfc-function-code' value='`$request-parameters.vm[$j].vnfc[$k].vnfc-function-code`'/>\n<parameter name='vnfc-type' value='`$request-parameters.vm[$j].vnfc[$k].vnfc-type`'/>\n<parameter name='ipaddress-v4-oam-vip' value='`$request-parameters.vm[$j].vnfc[$k].ipaddress-v4-oam-vip`'/>\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='group-notation' value='`$request-parameters.vm[$j].vnfc[$k].group-notation`'/>\n\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='`$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='`$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","comments":"","outputs":1,"x":1553.749984741211,"y":896.8333148956299,"z":"2c29979c.085788","wires":[["defef68c.efd408"]]},{"id":"29d3772.e8a1788","type":"call","name":"call: GetVfModuleInfo","xml":"<call module=\"APPC\" rpc=\"GetVfModuleInfo\" mode=\"sync\">","comments":"","outputs":1,"x":1110.5,"y":771.3333358764648,"z":"2c29979c.085788","wires":[["c6141f12.05436","9041ddd8.6b377"]]},{"id":"c6141f12.05436","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1109.5,"y":901.3333358764648,"z":"2c29979c.085788","wires":[["e0ced342.2ee9"]]},{"id":"e0ced342.2ee9","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1349.9999885559082,"y":893.0833740234375,"z":"2c29979c.085788","wires":[["c46d035a.6bbd7"]]},{"id":"9ead1868.e9e0d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1241,"y":397.33333587646484,"z":"2c29979c.085788","wires":[["e4aab88c.91de48"]]},{"id":"9041ddd8.6b377","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1329,"y":770.3333358764648,"z":"2c29979c.085788","wires":[["745b11d2.f9797"]]},{"id":"efef03f8.81d38","type":"switchNode","name":"switch: tmp.vf-module-id","xml":"<switch test=\"`$tmp.vf-module-id`\">","comments":"","outputs":1,"x":1744,"y":771.3333358764648,"z":"2c29979c.085788","wires":[["525acc69.20d3e4","9b2ee4c2.6db578"]]},{"id":"745b11d2.f9797","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1505,"y":769.3333358764648,"z":"2c29979c.085788","wires":[["efef03f8.81d38"]]},{"id":"525acc69.20d3e4","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1965,"y":767.3333358764648,"z":"2c29979c.085788","wires":[["8cf964a5.579d18"]]},{"id":"8cf964a5.579d18","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2120,"y":768.3333358764648,"z":"2c29979c.085788","wires":[[]]},{"id":"9b2ee4c2.6db578","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1962,"y":821.3333358764648,"z":"2c29979c.085788","wires":[["e0ced342.2ee9"]]},{"id":"715964cb.dde1bc","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"`'501:' + $aai-error-message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":768,"y":947.3333358764648,"z":"2c29979c.085788","wires":[[]]},{"id":"52d5b700.fd5458","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1515.928581237793,"y":622.6904859542847,"z":"2c29979c.085788","wires":[["ca342217.314c8"]]},{"id":"ca342217.314c8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1674.678581237793,"y":622.6904859542847,"z":"2c29979c.085788","wires":[["56cad9d9.774ac8"]]},{"id":"56cad9d9.774ac8","type":"get-resource","name":"update: A&AI Data for VNFC status update","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"vnfc\" key=\"vnfc-name = $request-parameters.vm[$j].vnfc[$k].vnfc-name\" pfx=\"tmp.aai-data-vnfc-update\" >\n<parameter name='vnfc-name' value='`$request-parameters.vm[$j].vnfc[$k].vnfc-name`'/>\n<parameter name='prov-status' value='`$tmp.aai-prov-status`'/>\n<parameter name='orchestration-status' value='`$tmp.aai-orch-status`'/>\n\n","comments":"","outputs":1,"x":1952.1785888671875,"y":622.6904859542847,"z":"2c29979c.085788","wires":[["cc410b82.8ebc38","e8d3d750.465eb8"]]},{"id":"cc410b82.8ebc38","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2238.6787109375,"y":599.9404907226562,"z":"2c29979c.085788","wires":[["df90a4f2.8e71d8"]]},{"id":"df90a4f2.8e71d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2390.6785583496094,"y":617.1904773712158,"z":"2c29979c.085788","wires":[["69ebc07.edf0c4","4743ee44.6c93f"]]},{"id":"69ebc07.edf0c4","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=\"Update VNFC status to AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$request-parameters.vm[$j].vnfc[$k].vnfc-name`\"/>\n<parameter name=\"field4\" value=\"`$tmp.aai-data-vnfc-update`\"/>\n\n","comments":"","outputs":1,"x":2584.6785583496094,"y":599.1904773712158,"z":"2c29979c.085788","wires":[[]]},{"id":"4743ee44.6c93f","type":"set","name":"set: Append to aai error message","xml":"<set>\n\t  <parameter name=\"aai-error-message\" value=\"`'Update VNFC status to A&amp;AI Failed for ' + $request-parameters.vm[$j].vnfc[$k].vnfc-name + '.' + $aai-error-message`\"/>","comments":"","x":2666.178596496582,"y":660.940486907959,"z":"2c29979c.085788","wires":[]},{"id":"e8d3d750.465eb8","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2225.9285583496094,"y":683.9404773712158,"z":"2c29979c.085788","wires":[["c21aabb4.5a6d58"]]},{"id":"c21aabb4.5a6d58","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2387.1785926818848,"y":682.690486907959,"z":"2c29979c.085788","wires":[["a5bec166.b3913"]]},{"id":"a5bec166.b3913","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=\"Update VNFC status to AnAI Request Success\"/>\n<parameter name=\"field3\" value=\"`$request-parameters.vm[$j].vnfc[$k].vnfc-name`\"/>\n<parameter name=\"field4\" value=\"`$tmp.aai-data-vnfc-update`\"/>\n\n","comments":"","outputs":1,"x":2568.4285583496094,"y":707.6904773712158,"z":"2c29979c.085788","wires":[[]]}]
+[{"id":"9333f052.3d35c","type":"service-logic","name":"APPC 3.0.0","module":"APPC","version":"3.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='3.0.0'>","outputs":1,"x":267,"y":42.333335876464844,"z":"2c29979c.085788","wires":[["b5bc2ae5.c3ccb8"]]},{"id":"ccfc3135.e932f","type":"dgstart","name":"DGSTART","outputs":1,"x":96.83331298828125,"y":41.66667938232422,"z":"2c29979c.085788","wires":[["9333f052.3d35c"]]},{"id":"b5bc2ae5.c3ccb8","type":"method","name":"method UpdateAaiforPayloadInput","xml":"<method rpc='UpdateAaiforPayloadInput' mode='sync'>\n","comments":"","outputs":1,"x":490.3333740234375,"y":39,"z":"2c29979c.085788","wires":[["6f4f9cf7.421284"]]},{"id":"6f4f9cf7.421284","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":120,"y":262.33333587646484,"z":"2c29979c.085788","wires":[["dacd8a6.62c3978","46ce8310.34f23c","16298fb8.22c27","f50ba4be.268618"]]},{"id":"46ce8310.34f23c","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=\"RETURNEDERRORMSG\" value=\"`$aai-error-message`\"/>\n\n","comments":"","outputs":1,"x":327,"y":717.3333969116211,"z":"2c29979c.085788","wires":[[]]},{"id":"dacd8a6.62c3978","type":"switchNode","name":"switch: vm length","xml":"<switch test=\"`$size_request-parameters.vm`\">","comments":"","outputs":1,"x":356,"y":165.44445037841797,"z":"2c29979c.085788","wires":[["44fdeb61.aa9034","72261fcd.ca467","2a6d9b73.a96634"]]},{"id":"daef72.bdc6c09","type":"for","name":"for: vm","xml":"<for index=\"j\" start=\"0\" end=\"`$size_request-parameters.vm`\" >","comments":"","outputs":1,"x":365,"y":319.3333969116211,"z":"2c29979c.085788","wires":[["9ed29edc.ebe52"]]},{"id":"44fdeb61.aa9034","type":"other","name":"outcome: Length=0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":591.0000610351562,"y":142.44445037841797,"z":"2c29979c.085788","wires":[["bfe524b3.a8b848"]]},{"id":"72261fcd.ca467","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":581.0000610351562,"y":201.44445037841797,"z":"2c29979c.085788","wires":[["bfe524b3.a8b848"]]},{"id":"9ed29edc.ebe52","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":540.0000610351562,"y":320.3333969116211,"z":"2c29979c.085788","wires":[["8a8c3760.6f71b8"]]},{"id":"bfe524b3.a8b848","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":785.0000610351562,"y":171.44445037841797,"z":"2c29979c.085788","wires":[["270c634c.7568ec","a13ad30b.4366c"]]},{"id":"6ef24474.a983ec","type":"get-resource","name":"get-resource: A&AI Data for VNFC Name ","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"vnfc\" key=\"vnfc-name = $request-parameters.vm[$j].vnfc[$k].vnfc-name\" pfx=\"tmp.aai-data-vnfc\" >\n\n\n","comments":"","outputs":1,"x":1249.5001220703125,"y":677.5555648803711,"z":"2c29979c.085788","wires":[["a751861e.5d43a8","52d5b700.fd5458"]]},{"id":"270c634c.7568ec","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=\"VM data not found in request\"/>\n\n\n","comments":"","outputs":1,"x":975.0000610351562,"y":152.44445037841797,"z":"2c29979c.085788","wires":[[]]},{"id":"a751861e.5d43a8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1511,"y":680.3333358764648,"z":"2c29979c.085788","wires":[["3e894fae.eed92"]]},{"id":"3e894fae.eed92","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1682,"y":685.3333358764648,"z":"2c29979c.085788","wires":[["29d3772.e8a1788"]]},{"id":"defef68c.efd408","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1274.1664962768555,"y":1023.5833148956299,"z":"2c29979c.085788","wires":[["1b7742ee.646d8d"]]},{"id":"1b7742ee.646d8d","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1465.1664962768555,"y":1023.0833148956299,"z":"2c29979c.085788","wires":[["484c0808.c6a598","22e0181c.878b98"]]},{"id":"484c0808.c6a598","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=\"`$request-parameters.vm[$j].vnfc[$k].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":1641.6665000915527,"y":977.5833759307861,"z":"2c29979c.085788","wires":[[]]},{"id":"22e0181c.878b98","type":"set","name":"set: Append to aai error message","xml":"<set>\n\t  <parameter name=\"aai-error-message\" value=\"`'Insert to A&amp;AI Failed for ' + $request-parameters.vm[$j].vnfc[$k].vnfc-name + '.' + $aai-error-message`\"/>","comments":"","x":1718.1664962768555,"y":1071.8333158493042,"z":"2c29979c.085788","wires":[]},{"id":"8ffddb97.757d58","type":"for","name":"for: vm.vnfc","xml":"<for index=\"k\" start=\"0\" end=\"`$size_request-parameters.vm[$j].vnfc`\" >","comments":"","outputs":1,"x":875.2143783569336,"y":614.7619743347168,"z":"2c29979c.085788","wires":[["c2298a98.0adbd8"]]},{"id":"c2298a98.0adbd8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1060.5001831054688,"y":615.3333358764648,"z":"2c29979c.085788","wires":[["b61d1503.913e98","6ef24474.a983ec"]]},{"id":"b61d1503.913e98","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\n<parameter name=\"VNFCNAME\" value=\"`$request-parameters.vm[$j].vnfc[$k].vnfc-name`\"/>\n\n<parameter name=\"VMNAME\" value=\"`$request-parameters.vm[$j].vm-name`\"/>\n","comments":"","outputs":1,"x":1245.5001831054688,"y":597.3333358764648,"z":"2c29979c.085788","wires":[[]]},{"id":"2a6d9b73.a96634","type":"other","name":"outcome: Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":373.00006103515625,"y":248.1111068725586,"z":"2c29979c.085788","wires":[["b4699d7b.74cfd"]]},{"id":"b4699d7b.74cfd","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":560,"y":253.1111068725586,"z":"2c29979c.085788","wires":[["daef72.bdc6c09"]]},{"id":"e4aab88c.91de48","type":"switchNode","name":"switch: vnfc length","xml":"<switch test=\"`$size_request-parameters.vm[$j].vnfc`\">","comments":"","outputs":1,"x":704.3572540283203,"y":477.9047508239746,"z":"2c29979c.085788","wires":[["cc76df4b.79195","b9647e56.5428","515b427.0838abc"]]},{"id":"cc76df4b.79195","type":"other","name":"outcome: Length=0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1012.5001831054688,"y":465.33333587646484,"z":"2c29979c.085788","wires":[["daca7ad3.6849a8"]]},{"id":"b9647e56.5428","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":999.5001831054688,"y":503.33333587646484,"z":"2c29979c.085788","wires":[["daca7ad3.6849a8"]]},{"id":"515b427.0838abc","type":"other","name":"outcome: Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1002.5001831054688,"y":555.3333358764648,"z":"2c29979c.085788","wires":[["85b4db72.6fea78"]]},{"id":"daca7ad3.6849a8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1233.500244140625,"y":493.33333587646484,"z":"2c29979c.085788","wires":[["a51065d2.dda8e8","84809a16.798bb8"]]},{"id":"a51065d2.dda8e8","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=\"VNFC data not in request\"/>\n\n\n","comments":"","outputs":1,"x":1425.500244140625,"y":459.33333587646484,"z":"2c29979c.085788","wires":[[]]},{"id":"85b4db72.6fea78","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":663.5001220703125,"y":615.3333358764648,"z":"2c29979c.085788","wires":[["8ffddb97.757d58"]]},{"id":"8a8c3760.6f71b8","type":"get-resource","name":"get-resource: A&AI Data for VM Name","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"vserver\" key=\"vserver-name = $request-parameters.vm[$j].vm-name\" pfx=\"tmp.aai-data-vm\" >\n\n","comments":"","outputs":1,"x":813.1666870117188,"y":323.1111068725586,"z":"2c29979c.085788","wires":[["891fa503.2eb248","8165f2d1.c2795","760228ff.b17788"]]},{"id":"891fa503.2eb248","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1074.166748046875,"y":284.1111068725586,"z":"2c29979c.085788","wires":[["ffbb360a.0f9b98"]]},{"id":"8165f2d1.c2795","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1083.166748046875,"y":335.1111068725586,"z":"2c29979c.085788","wires":[["ffbb360a.0f9b98"]]},{"id":"760228ff.b17788","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1060,"y":396.33333587646484,"z":"2c29979c.085788","wires":[["9ead1868.e9e0d8"]]},{"id":"ffbb360a.0f9b98","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1265.166748046875,"y":310.1111068725586,"z":"2c29979c.085788","wires":[["23cd0ec8.29e192"]]},{"id":"23cd0ec8.29e192","type":"set","name":"set: Append to aai-error message","xml":"<set>\n\t  <parameter name=\"aai-error-message\" value=\"`'Get from A&amp;AI Failed for ' + $request-parameters.vm[$j].vm-name + '.' + $aai-error-message`\"/>","comments":"","x":1538.166748046875,"y":315.1111068725586,"z":"2c29979c.085788","wires":[]},{"id":"a13ad30b.4366c","type":"set","name":"set: Append to aai-error message","xml":"<set>\n\t  <parameter name=\"aai-error-message\" value=\"`'VM Info not found in request.' + $aai-error-message`\"/>","comments":"","x":1055.1666870117188,"y":198.1111068725586,"z":"2c29979c.085788","wires":[]},{"id":"84809a16.798bb8","type":"set","name":"set: Append to aai-error message","xml":"<set>\n\t  <parameter name=\"aai-error-message\" value=\"`'VNFC Info not found in request.' + $aai-error-message`\"/>","comments":"","x":1505.6668701171875,"y":520.3333358764648,"z":"2c29979c.085788","wires":[]},{"id":"16298fb8.22c27","type":"switchNode","name":"switch: aai-error-message","xml":"<switch test=\"`$aai-error-message`\">","comments":"","outputs":1,"x":131.16668701171875,"y":859.1111068725586,"z":"2c29979c.085788","wires":[["ccb9af83.f0c75","d8d6fa14.d6e7e8"]]},{"id":"ccb9af83.f0c75","type":"other","name":"outcome: not populated","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":387.16668701171875,"y":858.1111068725586,"z":"2c29979c.085788","wires":[["8e4f6b95.1df068"]]},{"id":"8e4f6b95.1df068","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":589.1666870117188,"y":872.1111068725586,"z":"2c29979c.085788","wires":[["18c23b39.337805"]]},{"id":"d8d6fa14.d6e7e8","type":"other","name":"outcome: Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":362.16668701171875,"y":936.1111068725586,"z":"2c29979c.085788","wires":[["94c6b29b.e6273"]]},{"id":"94c6b29b.e6273","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":554.1666870117188,"y":938.1111068725586,"z":"2c29979c.085788","wires":[["73ce9597.b49bcc","715964cb.dde1bc"]]},{"id":"18c23b39.337805","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":782.1666870117188,"y":874.1111068725586,"z":"2c29979c.085788","wires":[]},{"id":"73ce9597.b49bcc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":746.1666870117188,"y":1004.1111679077148,"z":"2c29979c.085788","wires":[]},{"id":"f50ba4be.268618","type":"set","name":"set prov-status and orch-status","xml":"<set>\n<parameter name=\"tmp.aai-prov-status\" value=\"NVTPROV\" />\n\t<parameter name=\"tmp.aai-orch-status\" value=\"CONFIGURED\" />\n","comments":"","x":403,"y":84.33333587646484,"z":"2c29979c.085788","wires":[]},{"id":"c46d035a.6bbd7","type":"save","name":"save Put VNFC","xml":"<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='vnfc' key='vnfc-name = $request-parameters.vm[$j].vnfc[$k].vnfc-name' force='true' pfx='tmp.vnfc-sys-controller'>\n<parameter name='vnfc-function-code' value='`$request-parameters.vm[$j].vnfc[$k].vnfc-function-code`'/>\n<parameter name='vnfc-type' value='`$request-parameters.vm[$j].vnfc[$k].vnfc-type`'/>\n<parameter name='ipaddress-v4-oam-vip' value='`$request-parameters.vm[$j].vnfc[$k].ipaddress-v4-oam-vip`'/>\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='group-notation' value='`$request-parameters.vm[$j].vnfc[$k].group-notation`'/>\n\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='`$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='`$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","comments":"","outputs":1,"x":1553.749984741211,"y":896.8333148956299,"z":"2c29979c.085788","wires":[["defef68c.efd408"]]},{"id":"29d3772.e8a1788","type":"call","name":"call: GetVfModuleInfo","xml":"<call module=\"APPC\" rpc=\"GetVfModuleInfo\" mode=\"sync\">","comments":"","outputs":1,"x":1110.5,"y":771.3333358764648,"z":"2c29979c.085788","wires":[["c6141f12.05436","9041ddd8.6b377"]]},{"id":"c6141f12.05436","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1109.5,"y":901.3333358764648,"z":"2c29979c.085788","wires":[["e0ced342.2ee9"]]},{"id":"e0ced342.2ee9","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1349.9999885559082,"y":893.0833740234375,"z":"2c29979c.085788","wires":[["c46d035a.6bbd7"]]},{"id":"9ead1868.e9e0d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1241,"y":397.33333587646484,"z":"2c29979c.085788","wires":[["e4aab88c.91de48"]]},{"id":"9041ddd8.6b377","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1329,"y":770.3333358764648,"z":"2c29979c.085788","wires":[["745b11d2.f9797"]]},{"id":"efef03f8.81d38","type":"switchNode","name":"switch: tmp.vf-module-id","xml":"<switch test=\"`$tmp.vf-module-id`\">","comments":"","outputs":1,"x":1744,"y":771.3333358764648,"z":"2c29979c.085788","wires":[["525acc69.20d3e4","9b2ee4c2.6db578"]]},{"id":"745b11d2.f9797","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1505,"y":769.3333358764648,"z":"2c29979c.085788","wires":[["efef03f8.81d38"]]},{"id":"525acc69.20d3e4","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1965,"y":767.3333358764648,"z":"2c29979c.085788","wires":[["8cf964a5.579d18"]]},{"id":"8cf964a5.579d18","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2120,"y":768.3333358764648,"z":"2c29979c.085788","wires":[[]]},{"id":"9b2ee4c2.6db578","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1962,"y":821.3333358764648,"z":"2c29979c.085788","wires":[["e0ced342.2ee9"]]},{"id":"715964cb.dde1bc","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:' + $aai-error-message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n","comments":"","outputs":1,"x":768,"y":947.3333358764648,"z":"2c29979c.085788","wires":[[]]},{"id":"52d5b700.fd5458","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1515.928581237793,"y":622.6904859542847,"z":"2c29979c.085788","wires":[["ca342217.314c8"]]},{"id":"ca342217.314c8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1674.678581237793,"y":622.6904859542847,"z":"2c29979c.085788","wires":[["56cad9d9.774ac8"]]},{"id":"56cad9d9.774ac8","type":"get-resource","name":"update: A&AI Data for VNFC status update","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"vnfc\" key=\"vnfc-name = $request-parameters.vm[$j].vnfc[$k].vnfc-name\" pfx=\"tmp.aai-data-vnfc-update\" >\n<parameter name='vnfc-name' value='`$request-parameters.vm[$j].vnfc[$k].vnfc-name`'/>\n<parameter name='prov-status' value='`$tmp.aai-prov-status`'/>\n<parameter name='orchestration-status' value='`$tmp.aai-orch-status`'/>\n\n","comments":"","outputs":1,"x":1952.1785888671875,"y":622.6904859542847,"z":"2c29979c.085788","wires":[["cc410b82.8ebc38","e8d3d750.465eb8"]]},{"id":"cc410b82.8ebc38","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2238.6787109375,"y":599.9404907226562,"z":"2c29979c.085788","wires":[["df90a4f2.8e71d8"]]},{"id":"df90a4f2.8e71d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2390.6785583496094,"y":617.1904773712158,"z":"2c29979c.085788","wires":[["69ebc07.edf0c4","4743ee44.6c93f"]]},{"id":"69ebc07.edf0c4","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=\"Update VNFC status to AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$request-parameters.vm[$j].vnfc[$k].vnfc-name`\"/>\n<parameter name=\"field4\" value=\"`$tmp.aai-data-vnfc-update`\"/>\n\n","comments":"","outputs":1,"x":2584.6785583496094,"y":599.1904773712158,"z":"2c29979c.085788","wires":[[]]},{"id":"4743ee44.6c93f","type":"set","name":"set: Append to aai error message","xml":"<set>\n\t  <parameter name=\"aai-error-message\" value=\"`'Update VNFC status to A&amp;AI Failed for ' + $request-parameters.vm[$j].vnfc[$k].vnfc-name + '.' + $aai-error-message`\"/>","comments":"","x":2666.178596496582,"y":660.940486907959,"z":"2c29979c.085788","wires":[]},{"id":"e8d3d750.465eb8","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2225.9285583496094,"y":683.9404773712158,"z":"2c29979c.085788","wires":[["c21aabb4.5a6d58"]]},{"id":"c21aabb4.5a6d58","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2387.1785926818848,"y":682.690486907959,"z":"2c29979c.085788","wires":[["a5bec166.b3913"]]},{"id":"a5bec166.b3913","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=\"Update VNFC status to AnAI Request Success\"/>\n<parameter name=\"field3\" value=\"`$request-parameters.vm[$j].vnfc[$k].vnfc-name`\"/>\n<parameter name=\"field4\" value=\"`$tmp.aai-data-vnfc-update`\"/>\n\n","comments":"","outputs":1,"x":2568.4285583496094,"y":707.6904773712158,"z":"2c29979c.085788","wires":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_UpdateAaiforReferenceData.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_UpdateAaiforReferenceData.json
index f8f98b5f9..2f2a1c228 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_UpdateAaiforReferenceData.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_UpdateAaiforReferenceData.json
@@ -1 +1 @@
-[{"id":"c69cd5c6.8eaf98","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":265,"y":43,"z":"fc522b47.df72a8","wires":[["b1be4c4.c4d55b"]]},{"id":"b15f51d0.e9644","type":"dgstart","name":"DGSTART","outputs":1,"x":110.83331298828125,"y":41.333343505859375,"z":"fc522b47.df72a8","wires":[["c69cd5c6.8eaf98"]]},{"id":"b1be4c4.c4d55b","type":"method","name":"method UpdateAaiforReferenceData","xml":"<method rpc='UpdateAaiforReferenceData' mode='sync'>","comments":"","outputs":1,"x":523.333381652832,"y":41.66666507720947,"z":"fc522b47.df72a8","wires":[["825cd02b.13654"]]},{"id":"825cd02b.13654","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":137,"y":111.00000762939453,"z":"fc522b47.df72a8","wires":[["b0c09c76.678a4","91b4bedf.8242e"]]},{"id":"3d5bc46a.eb3eac","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=\"RETURNEDERRORMSG\" value=\"`$dcae-error-message`\"/>\n\n","comments":"","outputs":1,"x":701,"y":798.0000381469727,"z":"fc522b47.df72a8","wires":[[]]},{"id":"7b50f281.3bd31c","type":"execute","name":"execute addVnfcs","xml":"<execute plugin=\"org.openecomp.appc.aai.client.node.AAIResourceNode\" method=\"addVnfcs\">\n<parameter name=\"responsePrefix\" value=\"tmp.vnfInfo\" />\n","comments":"","outputs":1,"x":804.4722518920898,"y":309.9166955947876,"z":"fc522b47.df72a8","wires":[["6923ea4a.854004"]]},{"id":"6923ea4a.854004","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":998.4166717529297,"y":311.6666555404663,"z":"fc522b47.df72a8","wires":[["57336ac3.2f76c4"]]},{"id":"57336ac3.2f76c4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1200.9166717529297,"y":301.1389045715332,"z":"fc522b47.df72a8","wires":[["a0914fb9.6aa8d"]]},{"id":"9999c346.0a4e8","type":"execute","name":"execute saveTxLog","xml":"<execute plugin=\"org.openecomp.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":884.0000076293945,"y":488.9166965484619,"z":"fc522b47.df72a8","wires":[["f51ac733.4c4768"]]},{"id":"a0914fb9.6aa8d","type":"set","name":"set:  dcae-error message","xml":"<set>\n <parameter name=\"dcae-error-message\" value=\"`$dcae-error-message + $tmp.vnfInfo.error-message` \"/>","comments":"","x":1446.0554962158203,"y":303.22223472595215,"z":"fc522b47.df72a8","wires":[]},{"id":"82371710.a9d4e8","type":"execute","name":"execute IntermediateMessageSender","xml":"<execute plugin='org.openecomp.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":931.7500152587891,"y":589.9166955947876,"z":"fc522b47.df72a8","wires":[["dcdf5417.c44018","569bfe06.8d086"]]},{"id":"dcdf5417.c44018","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1183.7500190734863,"y":555.4166965484619,"z":"fc522b47.df72a8","wires":[["12d82c2e.3fb1f4"]]},{"id":"569bfe06.8d086","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1181.5000190734863,"y":638.6666965484619,"z":"fc522b47.df72a8","wires":[["12d82c2e.3fb1f4"]]},{"id":"12d82c2e.3fb1f4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1352.0000190734863,"y":598.9166955947876,"z":"fc522b47.df72a8","wires":[["fb53247d.69b308"]]},{"id":"fb53247d.69b308","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":1509.0000228881836,"y":599.416695356369,"z":"fc522b47.df72a8","wires":[[]]},{"id":"b0c09c76.678a4","type":"execute","name":"execute getVnfcReference","xml":"<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"getVnfcReference\">\n<parameter name=\"responsePrefix\" value=\"vnfcReference[]\" />\n","comments":"","outputs":1,"x":370.6111068725586,"y":206.80553817749023,"z":"fc522b47.df72a8","wires":[["c7965317.f93b8","f5513545.9ebe58","4e0097d1.637198"]]},{"id":"c7965317.f93b8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":604,"y":131.66666412353516,"z":"fc522b47.df72a8","wires":[["b2bfe106.18886"]]},{"id":"f5513545.9ebe58","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":598,"y":175.66666412353516,"z":"fc522b47.df72a8","wires":[["195d6b48.f1dd15"]]},{"id":"b2bfe106.18886","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":783,"y":113.66666412353516,"z":"fc522b47.df72a8","wires":[["509bacca.15cd24"]]},{"id":"195d6b48.f1dd15","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":767,"y":166.66666412353516,"z":"fc522b47.df72a8","wires":[["db840e52.e49de"]]},{"id":"4e0097d1.637198","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":570,"y":227.66666412353516,"z":"fc522b47.df72a8","wires":[["58a9e06a.4fd7b"]]},{"id":"509bacca.15cd24","type":"set","name":"set:  dcae-error message","xml":"<set>\n <parameter name=\"dcae-error-message\" value=\"Unable to Update A&amp;AI. Unable to read vnfc-reference data \"/>","comments":"","x":1016,"y":111.66666412353516,"z":"fc522b47.df72a8","wires":[]},{"id":"db840e52.e49de","type":"set","name":"set:  dcae-error message","xml":"<set>\n <parameter name=\"dcae-error-message\" value=\"`'Unable to Update A&amp;AI. ' + $vnfc-reference[0].error-message` \"/>","comments":"","x":1002,"y":170.66666412353516,"z":"fc522b47.df72a8","wires":[]},{"id":"58a9e06a.4fd7b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":729,"y":222.66666412353516,"z":"fc522b47.df72a8","wires":[["61838342.3eb0dc","7b50f281.3bd31c"]]},{"id":"91b4bedf.8242e","type":"switchNode","name":"switch dcae message","xml":"<switch test='`$dcae-error-message`'>\n","comments":"","outputs":1,"x":322.5,"y":431.4166965484619,"z":"fc522b47.df72a8","wires":[["ee5101dd.36d73","830349c.beb4cb8"]]},{"id":"ee5101dd.36d73","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":566.0000076293945,"y":430.4166965484619,"z":"fc522b47.df72a8","wires":[["1d8c3b97.711514"]]},{"id":"830349c.beb4cb8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":523.7500038146973,"y":499.66669845581055,"z":"fc522b47.df72a8","wires":[["572fefb0.03cc1"]]},{"id":"572fefb0.03cc1","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":685.7500076293945,"y":503.16669845581055,"z":"fc522b47.df72a8","wires":[["9999c346.0a4e8","82371710.a9d4e8","3d5bc46a.eb3eac"]]},{"id":"1d8c3b97.711514","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":728.0000076293945,"y":429.1666965484619,"z":"fc522b47.df72a8","wires":[[]]},{"id":"61838342.3eb0dc","type":"execute","name":"execute updateVnfVServer","xml":"<execute plugin=\"org.openecomp.appc.aai.client.node.AAIResourceNode\" method=\"updateVnfAndVServerStatus\">\n<parameter name=\"responsePrefix\" value=\"tmp.vnfInfo\" />\n","comments":"","outputs":1,"x":1021.5,"y":220.4166603088379,"z":"fc522b47.df72a8","wires":[["ba6a8b0c.35b0a8"]]},{"id":"ba6a8b0c.35b0a8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1234.5000038146973,"y":221.16666221618652,"z":"fc522b47.df72a8","wires":[["adfe125f.70063"]]},{"id":"adfe125f.70063","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1386.2500076293945,"y":218.16666221618652,"z":"fc522b47.df72a8","wires":[["44dcf49d.ca985c"]]},{"id":"44dcf49d.ca985c","type":"set","name":"set:  dcae-error message","xml":"<set>\n <parameter name=\"dcae-error-message\" value=\"`$tmp.vnfInfo.error-message` \"/>","comments":"","x":1605.250015258789,"y":219.6666603088379,"z":"fc522b47.df72a8","wires":[]},{"id":"f51ac733.4c4768","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1068.000015258789,"y":488.6666946411133,"z":"fc522b47.df72a8","wires":[["3a09ed31.0554e2"]]},{"id":"3a09ed31.0554e2","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1223.000015258789,"y":488.6666965484619,"z":"fc522b47.df72a8","wires":[[]]}]
+[{"id":"c69cd5c6.8eaf98","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":265,"y":43,"z":"fc522b47.df72a8","wires":[["b1be4c4.c4d55b"]]},{"id":"b15f51d0.e9644","type":"dgstart","name":"DGSTART","outputs":1,"x":110.83331298828125,"y":41.333343505859375,"z":"fc522b47.df72a8","wires":[["c69cd5c6.8eaf98"]]},{"id":"b1be4c4.c4d55b","type":"method","name":"method UpdateAaiforReferenceData","xml":"<method rpc='UpdateAaiforReferenceData' mode='sync'>","comments":"","outputs":1,"x":523.333381652832,"y":41.66666507720947,"z":"fc522b47.df72a8","wires":[["825cd02b.13654"]]},{"id":"825cd02b.13654","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":137,"y":111.00000762939453,"z":"fc522b47.df72a8","wires":[["b0c09c76.678a4","91b4bedf.8242e"]]},{"id":"3d5bc46a.eb3eac","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=\"RETURNEDERRORMSG\" value=\"`$dcae-error-message`\"/>\n\n","comments":"","outputs":1,"x":701,"y":798.0000381469727,"z":"fc522b47.df72a8","wires":[[]]},{"id":"7b50f281.3bd31c","type":"execute","name":"execute addVnfcs","xml":"<execute plugin=\"org.onap.appc.aai.client.node.AAIResourceNode\" method=\"addVnfcs\">\n<parameter name=\"responsePrefix\" value=\"tmp.vnfInfo\" />\n","comments":"","outputs":1,"x":804.4722518920898,"y":309.9166955947876,"z":"fc522b47.df72a8","wires":[["6923ea4a.854004"]]},{"id":"6923ea4a.854004","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":998.4166717529297,"y":311.6666555404663,"z":"fc522b47.df72a8","wires":[["57336ac3.2f76c4"]]},{"id":"57336ac3.2f76c4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1200.9166717529297,"y":301.1389045715332,"z":"fc522b47.df72a8","wires":[["a0914fb9.6aa8d"]]},{"id":"9999c346.0a4e8","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":884.0000076293945,"y":488.9166965484619,"z":"fc522b47.df72a8","wires":[["f51ac733.4c4768"]]},{"id":"a0914fb9.6aa8d","type":"set","name":"set:  dcae-error message","xml":"<set>\n <parameter name=\"dcae-error-message\" value=\"`$dcae-error-message + $tmp.vnfInfo.error-message` \"/>","comments":"","x":1446.0554962158203,"y":303.22223472595215,"z":"fc522b47.df72a8","wires":[]},{"id":"82371710.a9d4e8","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":931.7500152587891,"y":589.9166955947876,"z":"fc522b47.df72a8","wires":[["dcdf5417.c44018","569bfe06.8d086"]]},{"id":"dcdf5417.c44018","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1183.7500190734863,"y":555.4166965484619,"z":"fc522b47.df72a8","wires":[["12d82c2e.3fb1f4"]]},{"id":"569bfe06.8d086","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1181.5000190734863,"y":638.6666965484619,"z":"fc522b47.df72a8","wires":[["12d82c2e.3fb1f4"]]},{"id":"12d82c2e.3fb1f4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1352.0000190734863,"y":598.9166955947876,"z":"fc522b47.df72a8","wires":[["fb53247d.69b308"]]},{"id":"fb53247d.69b308","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":1509.0000228881836,"y":599.416695356369,"z":"fc522b47.df72a8","wires":[[]]},{"id":"b0c09c76.678a4","type":"execute","name":"execute getVnfcReference","xml":"<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getVnfcReference\">\n<parameter name=\"responsePrefix\" value=\"vnfcReference[]\" />\n","comments":"","outputs":1,"x":370.6111068725586,"y":206.80553817749023,"z":"fc522b47.df72a8","wires":[["c7965317.f93b8","f5513545.9ebe58","4e0097d1.637198"]]},{"id":"c7965317.f93b8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":604,"y":131.66666412353516,"z":"fc522b47.df72a8","wires":[["b2bfe106.18886"]]},{"id":"f5513545.9ebe58","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":598,"y":175.66666412353516,"z":"fc522b47.df72a8","wires":[["195d6b48.f1dd15"]]},{"id":"b2bfe106.18886","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":783,"y":113.66666412353516,"z":"fc522b47.df72a8","wires":[["509bacca.15cd24"]]},{"id":"195d6b48.f1dd15","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":767,"y":166.66666412353516,"z":"fc522b47.df72a8","wires":[["db840e52.e49de"]]},{"id":"4e0097d1.637198","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":570,"y":227.66666412353516,"z":"fc522b47.df72a8","wires":[["58a9e06a.4fd7b"]]},{"id":"509bacca.15cd24","type":"set","name":"set:  dcae-error message","xml":"<set>\n <parameter name=\"dcae-error-message\" value=\"Unable to Update A&amp;AI. Unable to read vnfc-reference data \"/>","comments":"","x":1016,"y":111.66666412353516,"z":"fc522b47.df72a8","wires":[]},{"id":"db840e52.e49de","type":"set","name":"set:  dcae-error message","xml":"<set>\n <parameter name=\"dcae-error-message\" value=\"`'Unable to Update A&amp;AI. ' + $vnfc-reference[0].error-message` \"/>","comments":"","x":1002,"y":170.66666412353516,"z":"fc522b47.df72a8","wires":[]},{"id":"58a9e06a.4fd7b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":729,"y":222.66666412353516,"z":"fc522b47.df72a8","wires":[["61838342.3eb0dc","7b50f281.3bd31c"]]},{"id":"91b4bedf.8242e","type":"switchNode","name":"switch dcae message","xml":"<switch test='`$dcae-error-message`'>\n","comments":"","outputs":1,"x":322.5,"y":431.4166965484619,"z":"fc522b47.df72a8","wires":[["ee5101dd.36d73","830349c.beb4cb8"]]},{"id":"ee5101dd.36d73","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":566.0000076293945,"y":430.4166965484619,"z":"fc522b47.df72a8","wires":[["1d8c3b97.711514"]]},{"id":"830349c.beb4cb8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":523.7500038146973,"y":499.66669845581055,"z":"fc522b47.df72a8","wires":[["572fefb0.03cc1"]]},{"id":"572fefb0.03cc1","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":685.7500076293945,"y":503.16669845581055,"z":"fc522b47.df72a8","wires":[["9999c346.0a4e8","82371710.a9d4e8","3d5bc46a.eb3eac"]]},{"id":"1d8c3b97.711514","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":728.0000076293945,"y":429.1666965484619,"z":"fc522b47.df72a8","wires":[[]]},{"id":"61838342.3eb0dc","type":"execute","name":"execute updateVnfVServer","xml":"<execute plugin=\"org.onap.appc.aai.client.node.AAIResourceNode\" method=\"updateVnfAndVServerStatus\">\n<parameter name=\"responsePrefix\" value=\"tmp.vnfInfo\" />\n","comments":"","outputs":1,"x":1021.5,"y":220.4166603088379,"z":"fc522b47.df72a8","wires":[["ba6a8b0c.35b0a8"]]},{"id":"ba6a8b0c.35b0a8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1234.5000038146973,"y":221.16666221618652,"z":"fc522b47.df72a8","wires":[["adfe125f.70063"]]},{"id":"adfe125f.70063","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1386.2500076293945,"y":218.16666221618652,"z":"fc522b47.df72a8","wires":[["44dcf49d.ca985c"]]},{"id":"44dcf49d.ca985c","type":"set","name":"set:  dcae-error message","xml":"<set>\n <parameter name=\"dcae-error-message\" value=\"`$tmp.vnfInfo.error-message` \"/>","comments":"","x":1605.250015258789,"y":219.6666603088379,"z":"fc522b47.df72a8","wires":[]},{"id":"f51ac733.4c4768","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1068.000015258789,"y":488.6666946411133,"z":"fc522b47.df72a8","wires":[["3a09ed31.0554e2"]]},{"id":"3a09ed31.0554e2","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1223.000015258789,"y":488.6666965484619,"z":"fc522b47.df72a8","wires":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Start.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Start.json
index 523c6f633..c6195da22 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Start.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Start.json
@@ -60,7 +60,7 @@
             ]
         ],
         "x": 496,
-        "xml": "<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='startServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$vm-id`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$identity-url`\" />",
+        "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='startServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$vm-id`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$identity-url`\" />",
         "y": 406,
         "z": "3b333f3b.e62d"
     },
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Stop.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Stop.json
index 5a3ff7c10..fd93d00a0 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Stop.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Stop.json
@@ -60,7 +60,7 @@
             ]
         ],
         "x": 409,
-        "xml": "<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='stopServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$vm-id`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$identity-url`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='stopServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$vm-id`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$identity-url`\" />\n",
         "y": 158.50000762939453,
         "z": "602aa70d.a192e8"
     },
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ansible-adapter-1.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ansible-adapter-1.0.json
index 3900dc3e1..5f3e718a8 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ansible-adapter-1.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ansible-adapter-1.0.json
@@ -1 +1 @@
-[{"id":"d048ba2a.84e2f8","type":"method","name":"ansible-adapter-1.0","xml":"<method rpc='ansible-adapter-1.0' mode='sync'>\n","comments":"","outputs":1,"x":477.6999816894531,"y":230.8833348751068,"z":"7d7da29a.2b7398","wires":[["13d8bcd3.33755f"]]},{"id":"750a91a2.96947","type":"service-logic","name":"APPC 2.0.1","module":"APPC","version":"2.0.1","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='2.0.1'>","outputs":1,"x":268.6999816894531,"y":308.8833348751068,"z":"7d7da29a.2b7398","wires":[["d048ba2a.84e2f8"]]},{"id":"53079a4f.559f84","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />\n","comments":"","x":1218.6999816894531,"y":669.8833348751068,"z":"7d7da29a.2b7398","wires":[]},{"id":"13d8bcd3.33755f","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$AgentUrl`'/>\n  <parameter name='User' value='`$User`'/>\n                        <parameter name='Password' value='`$Password`'/>\n                        <parameter name='LocalParameters' value='`$LocalParameters`'/>\n                        <parameter name='EnvParameters' value='`$EnvParameters`'/>\n                        <parameter name='NodeList' value='`$NodeList`'/>\n                        <parameter name='Timeout' value='`$Timeout`'/>\n                        <parameter name='Version' value='`$Version`'/>\n                        <parameter name='PlaybookName' value='`$PlaybookName`'/>\n","comments":"","outputs":1,"x":682.6999816894531,"y":228.8833348751068,"z":"7d7da29a.2b7398","wires":[["237110e5.33ae38","fe1ba4a5.cd6b68"]]},{"id":"30b13fff.531b44","type":"switchNode","name":"switch","xml":"<switch test=\"`$org.openecomp.appc.adapter.ansible.result.code`\">\n","comments":"","outputs":1,"x":472.6999816894531,"y":389.8833348751068,"z":"7d7da29a.2b7398","wires":[["f58c4f93.2bcb6","66fbd51d.685a14","c8a28d7.c69dd3"]]},{"id":"f58c4f93.2bcb6","type":"other","name":"outcome","xml":"<outcome value='500'>\n","comments":"","outputs":1,"x":659.6999816894531,"y":389.8833348751068,"z":"7d7da29a.2b7398","wires":[["53079a4f.559f84"]]},{"id":"66fbd51d.685a14","type":"other","name":"outcome","xml":"<outcome value='100'>\n","comments":"","outputs":1,"x":296.6999816894531,"y":477.8833348751068,"z":"7d7da29a.2b7398","wires":[["daab3eeb.acc3e8"]]},{"id":"daab3eeb.acc3e8","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecResult' >\n   <parameter name='message' value='`$org.openecomp.appc.adapter.ansible.message`'/>\n   <parameter name='code' value='$org.openecomp.appc.adapter.ansible.result.code`'/>\n   <parameter name='AgentUrl' value='`$AgentUrl`'/>\n   <parameter name='User' value='`$User`'/>\n   <parameter name='Password' value='`$Password`'/>\n   <parameter name='Id' value='`$org.openecomp.appc.adapter.ansible.Id`'/>\n","comments":"","outputs":1,"x":474.6999816894531,"y":476.8833348751068,"z":"7d7da29a.2b7398","wires":[["415101d2.f995cc","98312eaf.163de8"]]},{"id":"237110e5.33ae38","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":936.6999816894531,"y":229.8833348751068,"z":"7d7da29a.2b7398","wires":[["53079a4f.559f84"]]},{"id":"fe1ba4a5.cd6b68","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":295.6999816894531,"y":390.8833348751068,"z":"7d7da29a.2b7398","wires":[["30b13fff.531b44"]]},{"id":"415101d2.f995cc","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":664.6999816894531,"y":477.8833348751068,"z":"7d7da29a.2b7398","wires":[["53079a4f.559f84"]]},{"id":"c8a28d7.c69dd3","type":"other","name":"outcome","xml":"<outcome value='101'>\n","comments":"","outputs":1,"x":283.6999816894531,"y":670.8833348751068,"z":"7d7da29a.2b7398","wires":[["53079a4f.559f84"]]},{"id":"98312eaf.163de8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":662.6999816894531,"y":546.8833348751068,"z":"7d7da29a.2b7398","wires":[["2c831d15.81b10a"]]},{"id":"2c831d15.81b10a","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='output.status.code' value='`$org.openecomp.appc.adapter.ansible.result.code`' />\n<parameter name='output.status.message' value='`$org.openecomp.appc.adapter.ansible.message`'/>\n<parameter name='output.status.results' value = '`$org.openecomp.appc.adapter.ansible.results`'/>\n","comments":"","x":814.6999816894531,"y":621.8833348751068,"z":"7d7da29a.2b7398","wires":[]},{"id":"f6dd55b0.6ce568","type":"dgstart","name":"DGSTART","outputs":1,"x":246.69998168945312,"y":208.8833348751068,"z":"7d7da29a.2b7398","wires":[["750a91a2.96947"]]}]
+[{"id":"d048ba2a.84e2f8","type":"method","name":"ansible-adapter-1.0","xml":"<method rpc='ansible-adapter-1.0' mode='sync'>\n","comments":"","outputs":1,"x":477.6999816894531,"y":230.8833348751068,"z":"7d7da29a.2b7398","wires":[["13d8bcd3.33755f"]]},{"id":"750a91a2.96947","type":"service-logic","name":"APPC 2.0.1","module":"APPC","version":"2.0.1","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='2.0.1'>","outputs":1,"x":268.6999816894531,"y":308.8833348751068,"z":"7d7da29a.2b7398","wires":[["d048ba2a.84e2f8"]]},{"id":"53079a4f.559f84","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.onap.appc.adapter.ansible.message`' />\n<parameter name='output.status.results' value='`$org.onap.appc.adapter.ansible.results`' />\n","comments":"","x":1218.6999816894531,"y":669.8833348751068,"z":"7d7da29a.2b7398","wires":[]},{"id":"13d8bcd3.33755f","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.adapter.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$AgentUrl`'/>\n  <parameter name='User' value='`$User`'/>\n                        <parameter name='Password' value='`$Password`'/>\n                        <parameter name='LocalParameters' value='`$LocalParameters`'/>\n                        <parameter name='EnvParameters' value='`$EnvParameters`'/>\n                        <parameter name='NodeList' value='`$NodeList`'/>\n                        <parameter name='Timeout' value='`$Timeout`'/>\n                        <parameter name='Version' value='`$Version`'/>\n                        <parameter name='PlaybookName' value='`$PlaybookName`'/>\n","comments":"","outputs":1,"x":682.6999816894531,"y":228.8833348751068,"z":"7d7da29a.2b7398","wires":[["237110e5.33ae38","fe1ba4a5.cd6b68"]]},{"id":"30b13fff.531b44","type":"switchNode","name":"switch","xml":"<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n","comments":"","outputs":1,"x":472.6999816894531,"y":389.8833348751068,"z":"7d7da29a.2b7398","wires":[["f58c4f93.2bcb6","66fbd51d.685a14","c8a28d7.c69dd3"]]},{"id":"f58c4f93.2bcb6","type":"other","name":"outcome","xml":"<outcome value='500'>\n","comments":"","outputs":1,"x":659.6999816894531,"y":389.8833348751068,"z":"7d7da29a.2b7398","wires":[["53079a4f.559f84"]]},{"id":"66fbd51d.685a14","type":"other","name":"outcome","xml":"<outcome value='100'>\n","comments":"","outputs":1,"x":296.6999816894531,"y":477.8833348751068,"z":"7d7da29a.2b7398","wires":[["daab3eeb.acc3e8"]]},{"id":"daab3eeb.acc3e8","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.adapter.ansible.AnsibleAdapter' method='reqExecResult' >\n   <parameter name='message' value='`$org.onap.appc.adapter.ansible.message`'/>\n   <parameter name='code' value='$org.onap.appc.adapter.ansible.result.code`'/>\n   <parameter name='AgentUrl' value='`$AgentUrl`'/>\n   <parameter name='User' value='`$User`'/>\n   <parameter name='Password' value='`$Password`'/>\n   <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n","comments":"","outputs":1,"x":474.6999816894531,"y":476.8833348751068,"z":"7d7da29a.2b7398","wires":[["415101d2.f995cc","98312eaf.163de8"]]},{"id":"237110e5.33ae38","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":936.6999816894531,"y":229.8833348751068,"z":"7d7da29a.2b7398","wires":[["53079a4f.559f84"]]},{"id":"fe1ba4a5.cd6b68","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":295.6999816894531,"y":390.8833348751068,"z":"7d7da29a.2b7398","wires":[["30b13fff.531b44"]]},{"id":"415101d2.f995cc","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":664.6999816894531,"y":477.8833348751068,"z":"7d7da29a.2b7398","wires":[["53079a4f.559f84"]]},{"id":"c8a28d7.c69dd3","type":"other","name":"outcome","xml":"<outcome value='101'>\n","comments":"","outputs":1,"x":283.6999816894531,"y":670.8833348751068,"z":"7d7da29a.2b7398","wires":[["53079a4f.559f84"]]},{"id":"98312eaf.163de8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":662.6999816894531,"y":546.8833348751068,"z":"7d7da29a.2b7398","wires":[["2c831d15.81b10a"]]},{"id":"2c831d15.81b10a","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='output.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='output.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='output.status.results' value = '`$org.onap.appc.adapter.ansible.results`'/>\n","comments":"","x":814.6999816894531,"y":621.8833348751068,"z":"7d7da29a.2b7398","wires":[]},{"id":"f6dd55b0.6ce568","type":"dgstart","name":"DGSTART","outputs":1,"x":246.69998168945312,"y":208.8833348751068,"z":"7d7da29a.2b7398","wires":[["750a91a2.96947"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_chef.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_chef.json
index 975269c80..90ad59d5b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_chef.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_chef.json
@@ -1 +1 @@
-[{"id":"140af023.c01a74","type":"set","name":"chef server set","xml":"<set>\n<parameter name='chef-server-address' value='`$chef-server-address`' />\n<parameter name='chef-username' value='`$chef-username`' />\n<parameter name='chef-organization' value='`$chef-organization`'/>\n","comments":"","x":365.45452880859375,"y":189.45455932617187,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"2b2e3f8.1e4be4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":180,"y":435.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["435fc781.218d3","4721f95d.96aacc"]]},{"id":"435fc781.218d3","type":"execute","name":"Environment","xml":"<execute plugin='org.openecomp.appc.adapter.chef.ChefAdapter' method='VnfcEnvironment' >\n<parameter name='organizations' value='`$chef-organization`'/> \n<parameter name='serverAddress' value='`$chef-server-address`'/> \n<parameter name='username' value='`$chef-username`'/> \n<parameter name='Environment' value='`$Environment`'/>","comments":"","outputs":1,"x":371.3636474609375,"y":361.27272033691406,"z":"d01d9ed1.ef0e3","wires":[[]]},{"id":"5557f4f3.12a834","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":778.3636322021484,"y":359.7272529602051,"z":"d01d9ed1.ef0e3","wires":[["bfed75ec.2b8ab8","7b9b653d.d895bc"]]},{"id":"bfed75ec.2b8ab8","type":"execute","name":"VnfcNodeobjects","xml":"<execute plugin='org.openecomp.appc.adapter.chef.ChefAdapter' method='VnfcNodeobjects' >\n<parameter name='organizations' value='`$chef-organization`'/> \n<parameter name='serverAddress' value='`$chef-server-address`'/> \n<parameter name='username' value='`$chef-username`'/> \n<parameter name='NodeList' value='`$NodeList`'/>\n<parameter name='Node' value='`$Node`'/>","comments":"","outputs":1,"x":1011.54541015625,"y":317.99999618530273,"z":"d01d9ed1.ef0e3","wires":[[]]},{"id":"7b9b653d.d895bc","type":"switchNode","name":"switch","xml":"<switch test='`$chefServerResult.code`'>","comments":"","outputs":1,"x":1024.54541015625,"y":421.99999618530273,"z":"d01d9ed1.ef0e3","wires":[["bba9eac6.8963","5201322b.f4fb04"]]},{"id":"5201322b.f4fb04","type":"other","name":"outcome","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":1212.54541015625,"y":404.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["f4945dcf.a990c"]]},{"id":"bba9eac6.8963","type":"other","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1122.54541015625,"y":537.9999961853027,"z":"d01d9ed1.ef0e3","wires":[["55c99e5b.134484"]]},{"id":"e39566b4.a3d428","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1642.636474609375,"y":150.09090423583984,"z":"d01d9ed1.ef0e3","wires":[["869b2999.23ad9","de7cd48.8c432a8"]]},{"id":"89f57d06.98e65","type":"execute","name":"checkPushJob","xml":"<execute plugin='org.openecomp.appc.adapter.chef.ChefAdapter' method='checkPushJob' >\n\t<parameter name='organizations' value='`$chef-organization`'/> \n\t<parameter name='serverAddress' value='`$chef-server-address`'/> \n\t<parameter name='username' value='`$chef-username`'/> \n\t<parameter name='jobid' value='`$jobID`'/>\n\t<parameter name='retryTimes' value='`$retryTimes`'/>\n\t<parameter name='retryInterval' value='`$retryInterval`'/>","comments":"","outputs":1,"x":2304.908920288086,"y":680.9999189376831,"z":"d01d9ed1.ef0e3","wires":[[]]},{"id":"7e919e85.903df","type":"other","name":"outcome","xml":"<outcome value='201'>\n","comments":"","outputs":1,"x":1839.5453491210937,"y":532.1817626953125,"z":"d01d9ed1.ef0e3","wires":[["c405481b.6960d8"]]},{"id":"bc2f0cc3.e72f4","type":"other","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1842.6362609863281,"y":377.9090385437012,"z":"d01d9ed1.ef0e3","wires":[["e59aab7c.9268a8"]]},{"id":"de7cd48.8c432a8","type":"switchNode","name":"switch","xml":"<switch test='`$chefServerResult.code`'>\n","comments":"","outputs":1,"x":1681.8181495666504,"y":437.54541778564453,"z":"d01d9ed1.ef0e3","wires":[["7e919e85.903df","bc2f0cc3.e72f4"]]},{"id":"869b2999.23ad9","type":"execute","name":"pushJob","xml":"<execute plugin='org.openecomp.appc.adapter.chef.ChefAdapter' method='VnfcPushJob'>\n\t<parameter name='organizations' value='`$chef-organization`'/> \n\t<parameter name='serverAddress' value='`$chef-server-address`'/> \n\t<parameter name='username' value='`$chef-username`'/> \n\t<parameter name='NodeList' value='`$NodeList`'/>\n\t<parameter name='CallbackCapable' value='`$CallbackCapable`'/>\n\t<parameter name='RequestId' value='`$RequestId`'/>\n\t<parameter name='CallbackUrl' value='`$CallbackUrl`'/>","comments":"","outputs":1,"x":1823.727294921875,"y":132.63634490966797,"z":"d01d9ed1.ef0e3","wires":[[]]},{"id":"a34166a1.34cb58","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":524,"y":539.9999923706055,"z":"d01d9ed1.ef0e3","wires":[["e58c4075.ed393"]]},{"id":"2e7b281e.16947","type":"other","name":"outcome","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":539,"y":390.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["5557f4f3.12a834"]]},{"id":"4721f95d.96aacc","type":"switchNode","name":"switch","xml":"<switch test='`$chefServerResult.code`'>","comments":"","outputs":1,"x":341.81817626953125,"y":585.5454635620117,"z":"d01d9ed1.ef0e3","wires":[["a34166a1.34cb58","2e7b281e.16947","c922487b.69f3f8"]]},{"id":"55c99e5b.134484","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$chefServerResult.message`' />\n","comments":"","x":1296.54541015625,"y":543.9999961853027,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"e58c4075.ed393","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$chefServerResult.message`' />\n","comments":"","x":748,"y":548.9999923706055,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"c922487b.69f3f8","type":"other","name":"outcome","xml":"<outcome value='201'>\n","comments":"","outputs":1,"x":539.9090576171875,"y":460.27269744873047,"z":"d01d9ed1.ef0e3","wires":[["5557f4f3.12a834"]]},{"id":"c891e16f.0bcab","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":55,"y":288.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["140af023.c01a74","2b2e3f8.1e4be4","2e05211e.aedffa"]]},{"id":"e59aab7c.9268a8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$chefServerResult.message`' />\n","comments":"","x":2045,"y":376.99999237060547,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"c405481b.6960d8","type":"switchNode","name":"switch","xml":"<switch test='`$CallbackCapable`'>\n","comments":"","outputs":1,"x":1915,"y":638.9999923706055,"z":"d01d9ed1.ef0e3","wires":[["ed08562b.daacc8","b2d207f7.541de8"]]},{"id":"b2d207f7.541de8","type":"other","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2076,"y":691.9999923706055,"z":"d01d9ed1.ef0e3","wires":[["31229535.42d75e"]]},{"id":"ed08562b.daacc8","type":"outcomeTrue","name":"outcome","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2079.0909118652344,"y":537.7272682189941,"z":"d01d9ed1.ef0e3","wires":[["32d473d9.6462a4"]]},{"id":"32d473d9.6462a4","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='output.status.code' value='400' />\n<parameter name='output.status.message' value='chef success, waiting for callback' />","comments":"","x":2262,"y":538.9999923706055,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"9ca9daea.6acd88","type":"other","name":"outcome","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":2413,"y":935.9999923706055,"z":"d01d9ed1.ef0e3","wires":[["4eef569.fb26f68"]]},{"id":"c6d62c0a.3f9b9","type":"other","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2416.0909118652344,"y":781.7272682189941,"z":"d01d9ed1.ef0e3","wires":[["ca8973b0.029ee"]]},{"id":"e96f044b.63d178","type":"switchNode","name":"switch","xml":"<switch test='`$chefServerResult.code`'>\n","comments":"","outputs":1,"x":2255.2728004455566,"y":841.3636474609375,"z":"d01d9ed1.ef0e3","wires":[["9ca9daea.6acd88","c6d62c0a.3f9b9"]]},{"id":"ca8973b0.029ee","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$chefServerResult.message`' />","comments":"","x":2635.363525390625,"y":732.9999923706055,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"87c5419b.6dab8","type":"execute","name":"fetchResults","xml":"<execute plugin='org.openecomp.appc.adapter.chef.ChefAdapter' method='fetchResults' >\n\t<parameter name='organizations' value='`$chef-organization`'/> \n\t<parameter name='serverAddress' value='`$chef-server-address`'/> \n\t<parameter name='username' value='`$chef-username`'/> \n\t<parameter name='NodeList' value='`$NodeList`'/>","comments":"","outputs":1,"x":2940.181640625,"y":1173.1818771362304,"z":"d01d9ed1.ef0e3","wires":[[]]},{"id":"31229535.42d75e","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2078.9999999999995,"y":794.9999923706052,"z":"d01d9ed1.ef0e3","wires":[["89f57d06.98e65","e96f044b.63d178"]]},{"id":"a02c4706.79bfd","type":"switchNode","name":"switch","xml":"<switch test='`$chefServerResult.code`'>\n","comments":"","outputs":1,"x":2927.0000000000004,"y":1316.9999923706057,"z":"d01d9ed1.ef0e3","wires":[["1aaf2aa6.4b2ed5","5442d73e.8a3dbc"]]},{"id":"5442d73e.8a3dbc","type":"other","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":3200.0909156799316,"y":1434.0000219345095,"z":"d01d9ed1.ef0e3","wires":[["cd3ecae3.6d4fe"]]},{"id":"1aaf2aa6.4b2ed5","type":"other","name":"outcome","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":3201.181884765625,"y":1281.7272872924807,"z":"d01d9ed1.ef0e3","wires":[["af3c7cd7.ce071"]]},{"id":"af3c7cd7.ce071","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='output.status.code' value='400' />\n<parameter name='output.status.message' value='finish' />\n<parameter name='output.status.results' value='`$chefServerResult.message`' />","comments":"","x":3429.36376953125,"y":1282.4545822143557,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"cd3ecae3.6d4fe","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$chefServerResult.message`' />\n","comments":"","x":3435.181884765625,"y":1442.727165222168,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"adaf20bf.bee18","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2777,"y":1236.9999923706054,"z":"d01d9ed1.ef0e3","wires":[["87c5419b.6dab8","a02c4706.79bfd"]]},{"id":"4eef569.fb26f68","type":"switchNode","name":"switch","xml":"<switch test='`$GetOutputFlag`'>\n","comments":"","outputs":1,"x":2581,"y":1014.9999923706055,"z":"d01d9ed1.ef0e3","wires":[["dc3b0064.30c57","549d03c6.e67ec4"]]},{"id":"549d03c6.e67ec4","type":"outcomeTrue","name":"outcome","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2780.0909156799316,"y":1072.0000219345092,"z":"d01d9ed1.ef0e3","wires":[["adaf20bf.bee18"]]},{"id":"dc3b0064.30c57","type":"other","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2783.181827545166,"y":917.727297782898,"z":"d01d9ed1.ef0e3","wires":[["860f1f7c.8abfe"]]},{"id":"860f1f7c.8abfe","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='output.status.code' value='400' />\n<parameter name='output.status.message' value='`$chefServerResult.message`' />","comments":"","x":2967.36376953125,"y":920.4545211791992,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"818dcbdc.5b35d8","type":"dgstart","name":"DGSTART","outputs":1,"x":110,"y":31.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["2bdc7277.2d4bae"]]},{"id":"2a671177.11d28e","type":"method","name":"chef","xml":"<method rpc='chef' mode='sync'>\n","comments":"","outputs":1,"x":88,"y":192.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["c891e16f.0bcab"]]},{"id":"f4945dcf.a990c","type":"switchNode","name":"switch","xml":"<switch test='`$PushJobFlag`'>\n","comments":"","outputs":1,"x":1318,"y":241.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["45a18d9c.fae008","34db35c3.1ebd66"]]},{"id":"34db35c3.1ebd66","type":"other","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1438,"y":298.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["638a8115.b9ed04"]]},{"id":"45a18d9c.fae008","type":"outcomeTrue","name":"outcome","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1441.0909118652343,"y":144.72726821899414,"z":"d01d9ed1.ef0e3","wires":[["e39566b4.a3d428"]]},{"id":"638a8115.b9ed04","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='output.status.code' value='400' />\n<parameter name='output.status.message' value='chef success, do not need push job ' />","comments":"","x":1480,"y":418.99999237060547,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"2bdc7277.2d4bae","type":"service-logic","name":"APPC 3.0.0","module":"APPC","version":"3.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='3.0.0'>","outputs":1,"x":108.45452117919922,"y":113.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["2a671177.11d28e"]]},{"id":"2e05211e.aedffa","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":298.00000762939453,"y":280.5713939666748,"z":"d01d9ed1.ef0e3","wires":[[]]}]
+[{"id":"140af023.c01a74","type":"set","name":"chef server set","xml":"<set>\n<parameter name='chef-server-address' value='`$chef-server-address`' />\n<parameter name='chef-username' value='`$chef-username`' />\n<parameter name='chef-organization' value='`$chef-organization`'/>\n","comments":"","x":365.45452880859375,"y":189.45455932617187,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"2b2e3f8.1e4be4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":180,"y":435.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["435fc781.218d3","4721f95d.96aacc"]]},{"id":"435fc781.218d3","type":"execute","name":"Environment","xml":"<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='VnfcEnvironment' >\n<parameter name='organizations' value='`$chef-organization`'/> \n<parameter name='serverAddress' value='`$chef-server-address`'/> \n<parameter name='username' value='`$chef-username`'/> \n<parameter name='Environment' value='`$Environment`'/>","comments":"","outputs":1,"x":371.3636474609375,"y":361.27272033691406,"z":"d01d9ed1.ef0e3","wires":[[]]},{"id":"5557f4f3.12a834","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":778.3636322021484,"y":359.7272529602051,"z":"d01d9ed1.ef0e3","wires":[["bfed75ec.2b8ab8","7b9b653d.d895bc"]]},{"id":"bfed75ec.2b8ab8","type":"execute","name":"VnfcNodeobjects","xml":"<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='VnfcNodeobjects' >\n<parameter name='organizations' value='`$chef-organization`'/> \n<parameter name='serverAddress' value='`$chef-server-address`'/> \n<parameter name='username' value='`$chef-username`'/> \n<parameter name='NodeList' value='`$NodeList`'/>\n<parameter name='Node' value='`$Node`'/>","comments":"","outputs":1,"x":1011.54541015625,"y":317.99999618530273,"z":"d01d9ed1.ef0e3","wires":[[]]},{"id":"7b9b653d.d895bc","type":"switchNode","name":"switch","xml":"<switch test='`$chefServerResult.code`'>","comments":"","outputs":1,"x":1024.54541015625,"y":421.99999618530273,"z":"d01d9ed1.ef0e3","wires":[["bba9eac6.8963","5201322b.f4fb04"]]},{"id":"5201322b.f4fb04","type":"other","name":"outcome","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":1212.54541015625,"y":404.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["f4945dcf.a990c"]]},{"id":"bba9eac6.8963","type":"other","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1122.54541015625,"y":537.9999961853027,"z":"d01d9ed1.ef0e3","wires":[["55c99e5b.134484"]]},{"id":"e39566b4.a3d428","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1642.636474609375,"y":150.09090423583984,"z":"d01d9ed1.ef0e3","wires":[["869b2999.23ad9","de7cd48.8c432a8"]]},{"id":"89f57d06.98e65","type":"execute","name":"checkPushJob","xml":"<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='checkPushJob' >\n\t<parameter name='organizations' value='`$chef-organization`'/> \n\t<parameter name='serverAddress' value='`$chef-server-address`'/> \n\t<parameter name='username' value='`$chef-username`'/> \n\t<parameter name='jobid' value='`$jobID`'/>\n\t<parameter name='retryTimes' value='`$retryTimes`'/>\n\t<parameter name='retryInterval' value='`$retryInterval`'/>","comments":"","outputs":1,"x":2304.908920288086,"y":680.9999189376831,"z":"d01d9ed1.ef0e3","wires":[[]]},{"id":"7e919e85.903df","type":"other","name":"outcome","xml":"<outcome value='201'>\n","comments":"","outputs":1,"x":1839.5453491210937,"y":532.1817626953125,"z":"d01d9ed1.ef0e3","wires":[["c405481b.6960d8"]]},{"id":"bc2f0cc3.e72f4","type":"other","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1842.6362609863281,"y":377.9090385437012,"z":"d01d9ed1.ef0e3","wires":[["e59aab7c.9268a8"]]},{"id":"de7cd48.8c432a8","type":"switchNode","name":"switch","xml":"<switch test='`$chefServerResult.code`'>\n","comments":"","outputs":1,"x":1681.8181495666504,"y":437.54541778564453,"z":"d01d9ed1.ef0e3","wires":[["7e919e85.903df","bc2f0cc3.e72f4"]]},{"id":"869b2999.23ad9","type":"execute","name":"pushJob","xml":"<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='VnfcPushJob'>\n\t<parameter name='organizations' value='`$chef-organization`'/> \n\t<parameter name='serverAddress' value='`$chef-server-address`'/> \n\t<parameter name='username' value='`$chef-username`'/> \n\t<parameter name='NodeList' value='`$NodeList`'/>\n\t<parameter name='CallbackCapable' value='`$CallbackCapable`'/>\n\t<parameter name='RequestId' value='`$RequestId`'/>\n\t<parameter name='CallbackUrl' value='`$CallbackUrl`'/>","comments":"","outputs":1,"x":1823.727294921875,"y":132.63634490966797,"z":"d01d9ed1.ef0e3","wires":[[]]},{"id":"a34166a1.34cb58","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":524,"y":539.9999923706055,"z":"d01d9ed1.ef0e3","wires":[["e58c4075.ed393"]]},{"id":"2e7b281e.16947","type":"other","name":"outcome","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":539,"y":390.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["5557f4f3.12a834"]]},{"id":"4721f95d.96aacc","type":"switchNode","name":"switch","xml":"<switch test='`$chefServerResult.code`'>","comments":"","outputs":1,"x":341.81817626953125,"y":585.5454635620117,"z":"d01d9ed1.ef0e3","wires":[["a34166a1.34cb58","2e7b281e.16947","c922487b.69f3f8"]]},{"id":"55c99e5b.134484","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$chefServerResult.message`' />\n","comments":"","x":1296.54541015625,"y":543.9999961853027,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"e58c4075.ed393","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$chefServerResult.message`' />\n","comments":"","x":748,"y":548.9999923706055,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"c922487b.69f3f8","type":"other","name":"outcome","xml":"<outcome value='201'>\n","comments":"","outputs":1,"x":539.9090576171875,"y":460.27269744873047,"z":"d01d9ed1.ef0e3","wires":[["5557f4f3.12a834"]]},{"id":"c891e16f.0bcab","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":55,"y":288.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["140af023.c01a74","2b2e3f8.1e4be4","2e05211e.aedffa"]]},{"id":"e59aab7c.9268a8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$chefServerResult.message`' />\n","comments":"","x":2045,"y":376.99999237060547,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"c405481b.6960d8","type":"switchNode","name":"switch","xml":"<switch test='`$CallbackCapable`'>\n","comments":"","outputs":1,"x":1915,"y":638.9999923706055,"z":"d01d9ed1.ef0e3","wires":[["ed08562b.daacc8","b2d207f7.541de8"]]},{"id":"b2d207f7.541de8","type":"other","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2076,"y":691.9999923706055,"z":"d01d9ed1.ef0e3","wires":[["31229535.42d75e"]]},{"id":"ed08562b.daacc8","type":"outcomeTrue","name":"outcome","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2079.0909118652344,"y":537.7272682189941,"z":"d01d9ed1.ef0e3","wires":[["32d473d9.6462a4"]]},{"id":"32d473d9.6462a4","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='output.status.code' value='400' />\n<parameter name='output.status.message' value='chef success, waiting for callback' />","comments":"","x":2262,"y":538.9999923706055,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"9ca9daea.6acd88","type":"other","name":"outcome","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":2413,"y":935.9999923706055,"z":"d01d9ed1.ef0e3","wires":[["4eef569.fb26f68"]]},{"id":"c6d62c0a.3f9b9","type":"other","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2416.0909118652344,"y":781.7272682189941,"z":"d01d9ed1.ef0e3","wires":[["ca8973b0.029ee"]]},{"id":"e96f044b.63d178","type":"switchNode","name":"switch","xml":"<switch test='`$chefServerResult.code`'>\n","comments":"","outputs":1,"x":2255.2728004455566,"y":841.3636474609375,"z":"d01d9ed1.ef0e3","wires":[["9ca9daea.6acd88","c6d62c0a.3f9b9"]]},{"id":"ca8973b0.029ee","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$chefServerResult.message`' />","comments":"","x":2635.363525390625,"y":732.9999923706055,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"87c5419b.6dab8","type":"execute","name":"fetchResults","xml":"<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='fetchResults' >\n\t<parameter name='organizations' value='`$chef-organization`'/> \n\t<parameter name='serverAddress' value='`$chef-server-address`'/> \n\t<parameter name='username' value='`$chef-username`'/> \n\t<parameter name='NodeList' value='`$NodeList`'/>","comments":"","outputs":1,"x":2940.181640625,"y":1173.1818771362304,"z":"d01d9ed1.ef0e3","wires":[[]]},{"id":"31229535.42d75e","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2078.9999999999995,"y":794.9999923706052,"z":"d01d9ed1.ef0e3","wires":[["89f57d06.98e65","e96f044b.63d178"]]},{"id":"a02c4706.79bfd","type":"switchNode","name":"switch","xml":"<switch test='`$chefServerResult.code`'>\n","comments":"","outputs":1,"x":2927.0000000000004,"y":1316.9999923706057,"z":"d01d9ed1.ef0e3","wires":[["1aaf2aa6.4b2ed5","5442d73e.8a3dbc"]]},{"id":"5442d73e.8a3dbc","type":"other","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":3200.0909156799316,"y":1434.0000219345095,"z":"d01d9ed1.ef0e3","wires":[["cd3ecae3.6d4fe"]]},{"id":"1aaf2aa6.4b2ed5","type":"other","name":"outcome","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":3201.181884765625,"y":1281.7272872924807,"z":"d01d9ed1.ef0e3","wires":[["af3c7cd7.ce071"]]},{"id":"af3c7cd7.ce071","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='output.status.code' value='400' />\n<parameter name='output.status.message' value='finish' />\n<parameter name='output.status.results' value='`$chefServerResult.message`' />","comments":"","x":3429.36376953125,"y":1282.4545822143557,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"cd3ecae3.6d4fe","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$chefServerResult.message`' />\n","comments":"","x":3435.181884765625,"y":1442.727165222168,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"adaf20bf.bee18","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2777,"y":1236.9999923706054,"z":"d01d9ed1.ef0e3","wires":[["87c5419b.6dab8","a02c4706.79bfd"]]},{"id":"4eef569.fb26f68","type":"switchNode","name":"switch","xml":"<switch test='`$GetOutputFlag`'>\n","comments":"","outputs":1,"x":2581,"y":1014.9999923706055,"z":"d01d9ed1.ef0e3","wires":[["dc3b0064.30c57","549d03c6.e67ec4"]]},{"id":"549d03c6.e67ec4","type":"outcomeTrue","name":"outcome","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2780.0909156799316,"y":1072.0000219345092,"z":"d01d9ed1.ef0e3","wires":[["adaf20bf.bee18"]]},{"id":"dc3b0064.30c57","type":"other","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2783.181827545166,"y":917.727297782898,"z":"d01d9ed1.ef0e3","wires":[["860f1f7c.8abfe"]]},{"id":"860f1f7c.8abfe","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='output.status.code' value='400' />\n<parameter name='output.status.message' value='`$chefServerResult.message`' />","comments":"","x":2967.36376953125,"y":920.4545211791992,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"818dcbdc.5b35d8","type":"dgstart","name":"DGSTART","outputs":1,"x":110,"y":31.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["2bdc7277.2d4bae"]]},{"id":"2a671177.11d28e","type":"method","name":"chef","xml":"<method rpc='chef' mode='sync'>\n","comments":"","outputs":1,"x":88,"y":192.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["c891e16f.0bcab"]]},{"id":"f4945dcf.a990c","type":"switchNode","name":"switch","xml":"<switch test='`$PushJobFlag`'>\n","comments":"","outputs":1,"x":1318,"y":241.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["45a18d9c.fae008","34db35c3.1ebd66"]]},{"id":"34db35c3.1ebd66","type":"other","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1438,"y":298.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["638a8115.b9ed04"]]},{"id":"45a18d9c.fae008","type":"outcomeTrue","name":"outcome","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1441.0909118652343,"y":144.72726821899414,"z":"d01d9ed1.ef0e3","wires":[["e39566b4.a3d428"]]},{"id":"638a8115.b9ed04","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='output.status.code' value='400' />\n<parameter name='output.status.message' value='chef success, do not need push job ' />","comments":"","x":1480,"y":418.99999237060547,"z":"d01d9ed1.ef0e3","wires":[]},{"id":"2bdc7277.2d4bae","type":"service-logic","name":"APPC 3.0.0","module":"APPC","version":"3.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='3.0.0'>","outputs":1,"x":108.45452117919922,"y":113.99999237060547,"z":"d01d9ed1.ef0e3","wires":[["2a671177.11d28e"]]},{"id":"2e05211e.aedffa","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":298.00000762939453,"y":280.5713939666748,"z":"d01d9ed1.ef0e3","wires":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_healthcheck.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_healthcheck.json
index f75bbfad8..bc683f16c 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_healthcheck.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_healthcheck.json
@@ -1 +1 @@
-[{"id":"eb339652.aa1bb","type":"dgstart","name":"DGSTART","outputs":1,"x":361.8833312988281,"y":294.5666790008545,"z":"8fbf021e.b75288","wires":[["6a6b9cbd.5c5064"]]},{"id":"6a6b9cbd.5c5064","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":520.8833312988281,"y":290.5666790008545,"z":"8fbf021e.b75288","wires":[["ad9ed23f.8f9c68"]]},{"id":"ad9ed23f.8f9c68","type":"method","name":"method healthcheck","xml":"<method rpc='healthcheck' mode='sync'>\n","comments":"","outputs":1,"x":725.8833389282227,"y":289.5666809082031,"z":"8fbf021e.b75288","wires":[["23912012.6a432"]]},{"id":"23912012.6a432","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":385.8833312988281,"y":398.5666790008545,"z":"8fbf021e.b75288","wires":[["96f48524.be9e1","d37d976d.cb8ed"]]},{"id":"96f48524.be9e1","type":"execute","name":"execute get and executeFlowSequence","xml":"<execute plugin=\"org.openecomp.appc.flow.controller.node.RestServiceNode\" method=\"sendRequest\">\n<parameter name=\"responsePrefix\" value=\"APPC.healthcheck\" />\n\n","comments":"","outputs":1,"x":438.8832702636719,"y":497.01111030578613,"z":"8fbf021e.b75288","wires":[["6be528f6.12212","d4a71709.a43268","c328bc28.cc53f"]]},{"id":"6be528f6.12212","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":737.994457244873,"y":469.34446811676025,"z":"8fbf021e.b75288","wires":[["248dee55.40e1d2"]]},{"id":"248dee55.40e1d2","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":891.4388961791992,"y":456.5666694641113,"z":"8fbf021e.b75288","wires":[["31d502fd.89de4e"]]},{"id":"31d502fd.89de4e","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value=\"Unable to find Execute Node DG sendRequest\" />\n\n\n\t","comments":"","x":1059.9667205810547,"y":443.9000587463379,"z":"8fbf021e.b75288","wires":[]},{"id":"d4a71709.a43268","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":739.6610946655273,"y":514.1222286224365,"z":"8fbf021e.b75288","wires":[["1d2f2a87.475dc5"]]},{"id":"1d2f2a87.475dc5","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":891.2166862487793,"y":507.34448051452637,"z":"8fbf021e.b75288","wires":[["bc79231c.35d1f"]]},{"id":"bc79231c.35d1f","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value=\"`$APPC.healthcheck.error-message`\" />\n\n\n\t","comments":"","x":1053.2723236083984,"y":500.5111427307129,"z":"8fbf021e.b75288","wires":[]},{"id":"d37d976d.cb8ed","type":"set","name":"set Context params","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<parameter name='request-id' value='`$input.common-header.request-id`' />\n\n<parameter name='originator-id' value='`$input.common-header.originator-id`' /> \n\n<!-- Not required in Get request<parameter name='payload' value='`$input.payload`' />  -->\n\n<parameter name='request-action-type' value= 'GET' /> \n\n\n\n","comments":"","x":1149.0261611938477,"y":373.67383003234863,"z":"8fbf021e.b75288","wires":[]},{"id":"c328bc28.cc53f","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":749.9944763183594,"y":571.9000425338745,"z":"8fbf021e.b75288","wires":[["a4c92174.a2ada8"]]},{"id":"a4c92174.a2ada8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":931.3277626037598,"y":570.2333450317383,"z":"8fbf021e.b75288","wires":[["f6918f40.5299c"]]},{"id":"f6918f40.5299c","type":"set","name":"set payloadResponse","xml":"<set>\n<parameter name='output.payload' value='`$APPC.healthcheck.status-message`' /> \n\n\n\n\n","comments":"","x":1175.8833465576172,"y":561.3166847229004,"z":"8fbf021e.b75288","wires":[]}]
+[{"id":"eb339652.aa1bb","type":"dgstart","name":"DGSTART","outputs":1,"x":361.8833312988281,"y":294.5666790008545,"z":"8fbf021e.b75288","wires":[["6a6b9cbd.5c5064"]]},{"id":"6a6b9cbd.5c5064","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":520.8833312988281,"y":290.5666790008545,"z":"8fbf021e.b75288","wires":[["ad9ed23f.8f9c68"]]},{"id":"ad9ed23f.8f9c68","type":"method","name":"method healthcheck","xml":"<method rpc='healthcheck' mode='sync'>\n","comments":"","outputs":1,"x":725.8833389282227,"y":289.5666809082031,"z":"8fbf021e.b75288","wires":[["23912012.6a432"]]},{"id":"23912012.6a432","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":385.8833312988281,"y":398.5666790008545,"z":"8fbf021e.b75288","wires":[["96f48524.be9e1","d37d976d.cb8ed"]]},{"id":"96f48524.be9e1","type":"execute","name":"execute get and executeFlowSequence","xml":"<execute plugin=\"org.onap.appc.flow.controller.node.RestServiceNode\" method=\"sendRequest\">\n<parameter name=\"responsePrefix\" value=\"APPC.healthcheck\" />\n\n","comments":"","outputs":1,"x":438.8832702636719,"y":497.01111030578613,"z":"8fbf021e.b75288","wires":[["6be528f6.12212","d4a71709.a43268","c328bc28.cc53f"]]},{"id":"6be528f6.12212","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":737.994457244873,"y":469.34446811676025,"z":"8fbf021e.b75288","wires":[["248dee55.40e1d2"]]},{"id":"248dee55.40e1d2","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":891.4388961791992,"y":456.5666694641113,"z":"8fbf021e.b75288","wires":[["31d502fd.89de4e"]]},{"id":"31d502fd.89de4e","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value=\"Unable to find Execute Node DG sendRequest\" />\n\n\n\t","comments":"","x":1059.9667205810547,"y":443.9000587463379,"z":"8fbf021e.b75288","wires":[]},{"id":"d4a71709.a43268","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":739.6610946655273,"y":514.1222286224365,"z":"8fbf021e.b75288","wires":[["1d2f2a87.475dc5"]]},{"id":"1d2f2a87.475dc5","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":891.2166862487793,"y":507.34448051452637,"z":"8fbf021e.b75288","wires":[["bc79231c.35d1f"]]},{"id":"bc79231c.35d1f","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value=\"`$APPC.healthcheck.error-message`\" />\n\n\n\t","comments":"","x":1053.2723236083984,"y":500.5111427307129,"z":"8fbf021e.b75288","wires":[]},{"id":"d37d976d.cb8ed","type":"set","name":"set Context params","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<parameter name='request-id' value='`$input.common-header.request-id`' />\n\n<parameter name='originator-id' value='`$input.common-header.originator-id`' /> \n\n<!-- Not required in Get request<parameter name='payload' value='`$input.payload`' />  -->\n\n<parameter name='request-action-type' value= 'GET' /> \n\n\n\n","comments":"","x":1149.0261611938477,"y":373.67383003234863,"z":"8fbf021e.b75288","wires":[]},{"id":"c328bc28.cc53f","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":749.9944763183594,"y":571.9000425338745,"z":"8fbf021e.b75288","wires":[["a4c92174.a2ada8"]]},{"id":"a4c92174.a2ada8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":931.3277626037598,"y":570.2333450317383,"z":"8fbf021e.b75288","wires":[["f6918f40.5299c"]]},{"id":"f6918f40.5299c","type":"set","name":"set payloadResponse","xml":"<set>\n<parameter name='output.payload' value='`$APPC.healthcheck.status-message`' /> \n\n\n\n\n","comments":"","x":1175.8833465576172,"y":561.3166847229004,"z":"8fbf021e.b75288","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_method_DownloadvIRCChefConfig_4.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_method_DownloadvIRCChefConfig_4.0.0.json
index 3faa7139f..01bfe71a0 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_method_DownloadvIRCChefConfig_4.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_method_DownloadvIRCChefConfig_4.0.0.json
@@ -1 +1 @@
-[{"id":"7429c878.5abe38","type":"dgstart","name":"DGSTART","outputs":1,"x":136,"y":73,"z":"f809d11d.5015c","wires":[["2a4f05d6.88a89a"]]},{"id":"2a4f05d6.88a89a","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":125,"y":141,"z":"f809d11d.5015c","wires":[["aa94c1db.ebfc"]]},{"id":"aa94c1db.ebfc","type":"method","name":"method","xml":"<method rpc='DownloadvIRCChefConfig' mode='sync'>\n","comments":"","outputs":1,"x":124,"y":216,"z":"f809d11d.5015c","wires":[["ea7c5ec6.16476"]]},{"id":"ea7c5ec6.16476","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":113,"y":315,"z":"f809d11d.5015c","wires":[["d3e04c9b.c07be","d1b241f6.8c179","9c35834d.a01fa","da9b7cd9.09d6f","bf9d85fc.805698"]]},{"id":"d3e04c9b.c07be","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.adapter.chef.ChefAdapter' method='retrieveData'>\n     <parameter name='org.openecomp.appc.instance.dgContext' value='environment-name'/>\n     <parameter name='org.openecomp.appc.instance.allConfig' value='`$virc-environment`'/>\n     <parameter name='org.openecomp.appc.instance.key' value='name'/>\n","comments":"","outputs":1,"x":409,"y":126,"z":"f809d11d.5015c","wires":[[]]},{"id":"d1b241f6.8c179","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.adapter.chef.ChefAdapter' method='combineStrings' >\n     <parameter name='org.openecomp.appc.instance.dgContext' value='chef-action'/>\n     <parameter name='org.openecomp.appc.instance.String1' value='/environments/'/>\n     <parameter name='org.openecomp.appc.instance.String2' value='`$environment-name`'/>","comments":"","outputs":1,"x":399,"y":183,"z":"f809d11d.5015c","wires":[[]]},{"id":"9c35834d.a01fa","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.adapter.chef.ChefAdapter' method='chefPut' >\n<parameter name='org.openecomp.appc.instance.organizations' value='`$chef-organization`'/> \n<parameter name='org.openecomp.appc.instance.serverAddress' value='`$chef-server-address`'/> \n<parameter name='org.openecomp.appc.instance.username' value='`$chef-username`'/> \n<parameter name='org.openecomp.appc.instance.chefAction' value='`$chef-action`'/> \n<parameter name='org.openecomp.appc.instance.chefRequestBody' value='`$virc-environment`'/>","comments":"","outputs":1,"x":405,"y":244,"z":"f809d11d.5015c","wires":[[]]},{"id":"da9b7cd9.09d6f","type":"switchNode","name":"switch","xml":"<switch test='`$org.openecomp.appc.chefServerResult.code`'>\n","comments":"","outputs":1,"x":252,"y":453,"z":"f809d11d.5015c","wires":[["374e8d98.aebe72","616a3c9c.5953a4","41e33222.25d1ec"]]},{"id":"374e8d98.aebe72","type":"outcome","name":"outcome","xml":"<outcome value='404'>\n","comments":"","outputs":1,"x":456,"y":329,"z":"f809d11d.5015c","wires":[["15bca697.807fd9"]]},{"id":"eb531a20.afbbd8","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.adapter.chef.ChefAdapter' method='chefPost' >\n<parameter name='org.openecomp.appc.instance.organizations' value='`$chef-organization`'/> \n<parameter name='org.openecomp.appc.instance.serverAddress' value='`$chef-server-address`'/> \n<parameter name='org.openecomp.appc.instance.username' value='`$chef-username`'/> \n<parameter name='org.openecomp.appc.instance.chefAction' value='/environments'/> \n<parameter name='org.openecomp.appc.instance.chefRequestBody' value='`$virc-environment`'/>\n","comments":"","outputs":1,"x":789,"y":228,"z":"f809d11d.5015c","wires":[[]]},{"id":"11e5058e.84b97a","type":"outcome","name":"outcome","xml":"<outcome value='201'>\n","comments":"","outputs":1,"x":1083,"y":534,"z":"f809d11d.5015c","wires":[["6ded9d24.0dbaa4"]]},{"id":"f5ae799f.bf25a8","type":"outcome","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1081,"y":352,"z":"f809d11d.5015c","wires":[["1f394e1f.056dd2"]]},{"id":"23cc137a.1b7dfc","type":"switchNode","name":"switch","xml":"<switch test='`$org.openecomp.appc.chefServerResult.code`'>\n","comments":"","outputs":1,"x":803,"y":410,"z":"f809d11d.5015c","wires":[["11e5058e.84b97a","f5ae799f.bf25a8"]]},{"id":"15bca697.807fd9","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":615,"y":329,"z":"f809d11d.5015c","wires":[["eb531a20.afbbd8","23cc137a.1b7dfc"]]},{"id":"616a3c9c.5953a4","type":"outcome","name":"outcome","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":591,"y":565,"z":"f809d11d.5015c","wires":[["5abbe56e.76c5cc"]]},{"id":"41e33222.25d1ec","type":"outcome","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":606,"y":667,"z":"f809d11d.5015c","wires":[["b231a35d.86656"]]},{"id":"6ded9d24.0dbaa4","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='400' />\n<parameter name='error-message' value='successfully create the chef environment'/>\n","comments":"","x":1289,"y":529,"z":"f809d11d.5015c","wires":[]},{"id":"1f394e1f.056dd2","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$org.openecomp.appc.chefServerResult.message`' />\n","comments":"","x":1292,"y":350,"z":"f809d11d.5015c","wires":[]},{"id":"b231a35d.86656","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$org.openecomp.appc.chefServerResult.message`' />\n","comments":"","x":793,"y":669,"z":"f809d11d.5015c","wires":[]},{"id":"5abbe56e.76c5cc","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='400' />\n<parameter name='error-message' value='successfully updated the chef environment'/>\n","comments":"","x":808,"y":567,"z":"f809d11d.5015c","wires":[]},{"id":"bf9d85fc.805698","type":"set","name":"set","xml":"<set>\n<parameter name='chef-server-address' value='`$vnf-host-ip-address`' />\n<parameter name='chef-username' value='`$device-authentication.USER-NAME`' />\n<parameter name='chef-organization' value='virc'/>\n<parameter name='virc-environment' value='`$deviceconfig-file-content`' />","comments":"","x":419,"y":68,"z":"f809d11d.5015c","wires":[]}]
+[{"id":"7429c878.5abe38","type":"dgstart","name":"DGSTART","outputs":1,"x":136,"y":73,"z":"f809d11d.5015c","wires":[["2a4f05d6.88a89a"]]},{"id":"2a4f05d6.88a89a","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":125,"y":141,"z":"f809d11d.5015c","wires":[["aa94c1db.ebfc"]]},{"id":"aa94c1db.ebfc","type":"method","name":"method","xml":"<method rpc='DownloadvIRCChefConfig' mode='sync'>\n","comments":"","outputs":1,"x":124,"y":216,"z":"f809d11d.5015c","wires":[["ea7c5ec6.16476"]]},{"id":"ea7c5ec6.16476","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":113,"y":315,"z":"f809d11d.5015c","wires":[["d3e04c9b.c07be","d1b241f6.8c179","9c35834d.a01fa","da9b7cd9.09d6f","bf9d85fc.805698"]]},{"id":"d3e04c9b.c07be","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='retrieveData'>\n     <parameter name='org.onap.appc.instance.dgContext' value='environment-name'/>\n     <parameter name='org.onap.appc.instance.allConfig' value='`$virc-environment`'/>\n     <parameter name='org.onap.appc.instance.key' value='name'/>\n","comments":"","outputs":1,"x":409,"y":126,"z":"f809d11d.5015c","wires":[[]]},{"id":"d1b241f6.8c179","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='combineStrings' >\n     <parameter name='org.onap.appc.instance.dgContext' value='chef-action'/>\n     <parameter name='org.onap.appc.instance.String1' value='/environments/'/>\n     <parameter name='org.onap.appc.instance.String2' value='`$environment-name`'/>","comments":"","outputs":1,"x":399,"y":183,"z":"f809d11d.5015c","wires":[[]]},{"id":"9c35834d.a01fa","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='chefPut' >\n<parameter name='org.onap.appc.instance.organizations' value='`$chef-organization`'/> \n<parameter name='org.onap.appc.instance.serverAddress' value='`$chef-server-address`'/> \n<parameter name='org.onap.appc.instance.username' value='`$chef-username`'/> \n<parameter name='org.onap.appc.instance.chefAction' value='`$chef-action`'/> \n<parameter name='org.onap.appc.instance.chefRequestBody' value='`$virc-environment`'/>","comments":"","outputs":1,"x":405,"y":244,"z":"f809d11d.5015c","wires":[[]]},{"id":"da9b7cd9.09d6f","type":"switchNode","name":"switch","xml":"<switch test='`$org.onap.appc.chefServerResult.code`'>\n","comments":"","outputs":1,"x":252,"y":453,"z":"f809d11d.5015c","wires":[["374e8d98.aebe72","616a3c9c.5953a4","41e33222.25d1ec"]]},{"id":"374e8d98.aebe72","type":"outcome","name":"outcome","xml":"<outcome value='404'>\n","comments":"","outputs":1,"x":456,"y":329,"z":"f809d11d.5015c","wires":[["15bca697.807fd9"]]},{"id":"eb531a20.afbbd8","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='chefPost' >\n<parameter name='org.onap.appc.instance.organizations' value='`$chef-organization`'/> \n<parameter name='org.onap.appc.instance.serverAddress' value='`$chef-server-address`'/> \n<parameter name='org.onap.appc.instance.username' value='`$chef-username`'/> \n<parameter name='org.onap.appc.instance.chefAction' value='/environments'/> \n<parameter name='org.onap.appc.instance.chefRequestBody' value='`$virc-environment`'/>\n","comments":"","outputs":1,"x":789,"y":228,"z":"f809d11d.5015c","wires":[[]]},{"id":"11e5058e.84b97a","type":"outcome","name":"outcome","xml":"<outcome value='201'>\n","comments":"","outputs":1,"x":1083,"y":534,"z":"f809d11d.5015c","wires":[["6ded9d24.0dbaa4"]]},{"id":"f5ae799f.bf25a8","type":"outcome","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1081,"y":352,"z":"f809d11d.5015c","wires":[["1f394e1f.056dd2"]]},{"id":"23cc137a.1b7dfc","type":"switchNode","name":"switch","xml":"<switch test='`$org.onap.appc.chefServerResult.code`'>\n","comments":"","outputs":1,"x":803,"y":410,"z":"f809d11d.5015c","wires":[["11e5058e.84b97a","f5ae799f.bf25a8"]]},{"id":"15bca697.807fd9","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":615,"y":329,"z":"f809d11d.5015c","wires":[["eb531a20.afbbd8","23cc137a.1b7dfc"]]},{"id":"616a3c9c.5953a4","type":"outcome","name":"outcome","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":591,"y":565,"z":"f809d11d.5015c","wires":[["5abbe56e.76c5cc"]]},{"id":"41e33222.25d1ec","type":"outcome","name":"outcome","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":606,"y":667,"z":"f809d11d.5015c","wires":[["b231a35d.86656"]]},{"id":"6ded9d24.0dbaa4","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='400' />\n<parameter name='error-message' value='successfully create the chef environment'/>\n","comments":"","x":1289,"y":529,"z":"f809d11d.5015c","wires":[]},{"id":"1f394e1f.056dd2","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.chefServerResult.message`' />\n","comments":"","x":1292,"y":350,"z":"f809d11d.5015c","wires":[]},{"id":"b231a35d.86656","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.chefServerResult.message`' />\n","comments":"","x":793,"y":669,"z":"f809d11d.5015c","wires":[]},{"id":"5abbe56e.76c5cc","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='400' />\n<parameter name='error-message' value='successfully updated the chef environment'/>\n","comments":"","x":808,"y":567,"z":"f809d11d.5015c","wires":[]},{"id":"bf9d85fc.805698","type":"set","name":"set","xml":"<set>\n<parameter name='chef-server-address' value='`$vnf-host-ip-address`' />\n<parameter name='chef-username' value='`$device-authentication.USER-NAME`' />\n<parameter name='chef-organization' value='virc'/>\n<parameter name='virc-environment' value='`$deviceconfig-file-content`' />","comments":"","x":419,"y":68,"z":"f809d11d.5015c","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_method_Generic_Restart.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_method_Generic_Restart.json
index d818ec2eb..d2c8a0066 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_method_Generic_Restart.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_method_Generic_Restart.json
@@ -51,7 +51,7 @@
         "id": "3569147a.725ba4",
         "type": "execute",
         "name": "execute_getVNF_Hierarchy",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />",
         "comments": "",
         "outputs": 1,
         "x": 285,
@@ -135,7 +135,7 @@
         "id": "89f6a89.5a2f1d8",
         "type": "execute",
         "name": "execute_UpdateAA&I",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Restarting\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Restarting\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 1759.286018371582,
@@ -222,7 +222,7 @@
         "id": "33439619.cba012",
         "type": "execute",
         "name": "execute_update_AA&I",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Restarted\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Restarted\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 4306.71378326416,
@@ -309,7 +309,7 @@
         "id": "dab9037a.73cc8",
         "type": "execute",
         "name": "execute_Update_AA&I",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 4832.285980224609,
@@ -544,7 +544,7 @@
         "id": "5fc462ef.902c24",
         "type": "execute",
         "name": "execute_Restart",
-        "xml": "<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='restartServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$VNF.VM[$i].URL`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />\n\n",
+        "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='restartServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$VNF.VM[$i].URL`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3294.2858657836914,
@@ -901,7 +901,7 @@
         "id": "2bab1708.35229",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Exception in getting VNF Hierachy\" />\n\n",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Exception in getting VNF Hierachy\" />\n\n",
         "comments": "",
         "outputs": 1,
         "x": 886.4285926818848,
@@ -949,7 +949,7 @@
         "id": "587f4ad0.9d068c",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in getting VNF Hierachy\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in getting VNF Hierachy\" />",
         "comments": "",
         "outputs": 1,
         "x": 1280.928638458252,
@@ -997,7 +997,7 @@
         "id": "1b7172ec.01ee45",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"VM Count is 0\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"VM Count is 0\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 1595.0003547668457,
@@ -1045,7 +1045,7 @@
         "id": "4ee323c7.76dfa4",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $VNF.VM[$i].VNFC`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $VNF.VM[$i].VNFC`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 2153.000244140625,
@@ -1093,7 +1093,7 @@
         "id": "aa960cd9.883948",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc ' + $VNF.VM[$i].VNFC`\" />\n\n",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc ' + $VNF.VM[$i].VNFC`\" />\n\n",
         "comments": "",
         "outputs": 1,
         "x": 2796.28564453125,
@@ -1141,7 +1141,7 @@
         "id": "e89f00f2.e11a58",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $VNF.VM[$i].VNFC`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $VNF.VM[$i].VNFC`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 2850.4287300109863,
@@ -1189,7 +1189,7 @@
         "id": "3e633dc7.8349aa",
         "type": "execute",
         "name": "Report_Failure_in_Restart",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in restart for:' + $VNF.VM[$i].URL`\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in restart for:' + $VNF.VM[$i].URL`\" />",
         "comments": "",
         "outputs": 1,
         "x": 4882.428768157959,
@@ -1237,7 +1237,7 @@
         "id": "44f3a34b.72d604",
         "type": "execute",
         "name": "Report_Context_not_found",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Context not found:' + $VNF.VM[$i].URL`\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Context not found:' + $VNF.VM[$i].URL`\" />",
         "comments": "",
         "outputs": 1,
         "x": 4446.571556091309,
@@ -1285,7 +1285,7 @@
         "id": "5592e4e8.e05cac",
         "type": "execute",
         "name": "Report_Error_occoured_while_restarting_the_server",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Error occoured while restarting the server:' + $VNF.VM[$i].URL`\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Error occoured while restarting the server:' + $VNF.VM[$i].URL`\" />",
         "comments": "",
         "outputs": 1,
         "x": 4264.857406616211,
@@ -1369,7 +1369,7 @@
         "id": "7391fda3.691d64",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $VNF.VM[$i].VNFC`\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $VNF.VM[$i].VNFC`\" />",
         "comments": "",
         "outputs": 1,
         "x": 5214.142913818359,
@@ -1385,7 +1385,7 @@
         "id": "740c3416.6b040c",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc' + $VNF.VM[$i].VNFC`\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc' + $VNF.VM[$i].VNFC`\" />",
         "comments": "",
         "outputs": 1,
         "x": 5229.999771118164,
@@ -1429,7 +1429,7 @@
         "id": "e598f194.bdfb48",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $VNF.VM[$i].VNFC`\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $VNF.VM[$i].VNFC`\" />",
         "comments": "",
         "outputs": 1,
         "x": 4839.428146362305,
@@ -1475,7 +1475,7 @@
         "id": "d57f60ae.3596c8",
         "type": "execute",
         "name": "execute: flatAndAddToContext",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
         "comments": "",
         "outputs": 1,
         "x": 131,
@@ -1522,7 +1522,7 @@
         "id": "322113ac.4683e4",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $VNF.VM[$i].VNFC`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $VNF.VM[$i].VNFC`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 5387.428810119629,
@@ -1581,7 +1581,7 @@
         "id": "472e9f56.80f4f8",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $VNF.VM[$i].VNFC`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $VNF.VM[$i].VNFC`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 6098.285861968994,
@@ -1640,7 +1640,7 @@
         "id": "af2136b6.655e3",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value='Exception in AAI Update for vnfc $VNF.VM[$i].VNFC' />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value='Exception in AAI Update for vnfc $VNF.VM[$i].VNFC' />\n",
         "comments": "",
         "outputs": 1,
         "x": 5835.714576721191,
@@ -1699,7 +1699,7 @@
         "id": "60ae25ab.2f83ec",
         "type": "execute",
         "name": "Report_Error_Flattening_Payload_Json",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />",
         "comments": "",
         "outputs": 1,
         "x": 528.5714111328125,
@@ -1774,7 +1774,7 @@
         "id": "2e5d2a6.945f0d6",
         "type": "execute",
         "name": "Report_Error_Loading_Json_Flattening_Plugin",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />",
         "comments": "",
         "outputs": 1,
         "x": 535.5714149475098,
@@ -1820,7 +1820,7 @@
         "id": "5f0bb2d7.73d944",
         "type": "execute",
         "name": "Report_Success_in_Restart",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Restart event executed successfully for ' + $VNF.VM[$i].URL`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Restart event executed successfully for ' + $VNF.VM[$i].URL`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 3797.3333435058594,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_method_topology-operation-all_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_method_topology-operation-all_2.0.0.json
index e86c0d02b..1221a04c8 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_method_topology-operation-all_2.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_method_topology-operation-all_2.0.0.json
@@ -35,7 +35,7 @@
         "id": "3c6a4d55.f97af2",
         "type": "switchNode",
         "name": "action",
-        "xml": "<switch test='`$org.openecomp.appc.action`'>\n",
+        "xml": "<switch test='`$org.onap.appc.action`'>\n",
         "comments": "What method should we try to call. Closely maps to __action__Server()",
         "outputs": 1,
         "x": 138,
@@ -100,7 +100,7 @@
         "id": "a9607cbc.3e9d9",
         "type": "execute",
         "name": "restartServer()",
-        "xml": "<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='restartServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$org.openecomp.appc.vmid`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$org.openecomp.appc.identity.url`\" />",
+        "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='restartServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$org.onap.appc.vmid`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$org.onap.appc.identity.url`\" />",
         "comments": "",
         "outputs": 1,
         "x": 456,
@@ -155,7 +155,7 @@
         "id": "aa907476.8ca3a8",
         "type": "execute",
         "name": "rebuildServer()",
-        "xml": "<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='rebuildServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$org.openecomp.appc.vmid`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$org.openecomp.appc.identity.url`\" />",
+        "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='rebuildServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$org.onap.appc.vmid`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$org.onap.appc.identity.url`\" />",
         "comments": "",
         "outputs": 1,
         "x": 467,
@@ -220,7 +220,7 @@
         "id": "3355fed0.38abf2",
         "type": "execute",
         "name": "migrateServer()",
-        "xml": "<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='migrateServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$org.openecomp.appc.vmid`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$org.openecomp.appc.identity.url`\" />",
+        "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='migrateServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$org.onap.appc.vmid`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$org.onap.appc.identity.url`\" />",
         "comments": "",
         "outputs": 1,
         "x": 469.75,
@@ -317,7 +317,7 @@
         "id": "e4197510.21f14",
         "type": "execute",
         "name": "evacuateServer()",
-        "xml": "<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='evacuateServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$org.openecomp.appc.vmid`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$org.openecomp.appc.identity.url`\" />",
+        "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='evacuateServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$org.onap.appc.vmid`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$org.onap.appc.identity.url`\" />",
         "comments": "",
         "outputs": 1,
         "x": 467.75,
@@ -393,7 +393,7 @@
         "id": "71679082.b68048",
         "type": "execute",
         "name": "createSnapshot()",
-        "xml": "<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='createSnapshot'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$org.openecomp.appc.vmid`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$org.openecomp.appc.identity.url`\" />",
+        "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='createSnapshot'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$org.onap.appc.vmid`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$org.onap.appc.identity.url`\" />",
         "comments": "",
         "outputs": 1,
         "x": 470.25,
@@ -512,7 +512,7 @@
         "id": "6c21a87b.083fa8",
         "type": "execute",
         "name": "migrateServer()",
-        "xml": "<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='migrateServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$org.openecomp.appc.vmid`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$org.openecomp.appc.identity.url`\" />",
+        "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='migrateServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$org.onap.appc.vmid`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$org.onap.appc.identity.url`\" />",
         "comments": "",
         "outputs": 1,
         "x": 852,
@@ -609,7 +609,7 @@
         "id": "23a53072.a495a8",
         "type": "execute",
         "name": "evacuateServer()",
-        "xml": "<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='evacuateServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$org.openecomp.appc.vmid`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$org.openecomp.appc.identity.url`\" />",
+        "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='evacuateServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$org.onap.appc.vmid`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$org.onap.appc.identity.url`\" />",
         "comments": "",
         "outputs": 1,
         "x": 852,
@@ -701,7 +701,7 @@
         "id": "9585b4b9.8a925",
         "type": "execute",
         "name": "put",
-        "xml": "<execute plugin='org.openecomp.appc.adapter.rest.RestAdapter' method='commonPut' >\n<parameter name='org.openecomp.appc.instance.URI' value='`$org.openecomp.appc.configURL`'/>\n<parameter name='org.openecomp.appc.instance.requestBody' value='`$org.openecomp.appc.configJson`'/>\n<parameter name='org.openecomp.appc.instance.headers' value='{\"Content-type\":\"application/json\"}'/>\n<parameter name='org.openecomp.appc.instance.haveHeader' value='true'/>",
+        "xml": "<execute plugin='org.onap.appc.adapter.rest.RestAdapter' method='commonPut' >\n<parameter name='org.onap.appc.instance.URI' value='`$org.onap.appc.configURL`'/>\n<parameter name='org.onap.appc.instance.requestBody' value='`$org.onap.appc.configJson`'/>\n<parameter name='org.onap.appc.instance.headers' value='{\"Content-type\":\"application/json\"}'/>\n<parameter name='org.onap.appc.instance.haveHeader' value='true'/>",
         "comments": "",
         "outputs": 1,
         "x": 464.8887939453125,
@@ -750,7 +750,7 @@
         "id": "c5f8933.239dff",
         "type": "execute",
         "name": "delete",
-        "xml": "<execute plugin='org.openecomp.appc.adapter.rest.RestAdapter' method='commonDelete' >\n<parameter name='org.openecomp.appc.instance.URI' value='`$org.openecomp.appc.configURL`'/>\n<parameter name='org.openecomp.appc.instance.haveHeader' value='false'/>\n",
+        "xml": "<execute plugin='org.onap.appc.adapter.rest.RestAdapter' method='commonDelete' >\n<parameter name='org.onap.appc.instance.URI' value='`$org.onap.appc.configURL`'/>\n<parameter name='org.onap.appc.instance.haveHeader' value='false'/>\n",
         "comments": "",
         "outputs": 1,
         "x": 431.64447021484375,
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 b7743d3eb..77cc2c896 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
@@ -11,7 +11,7 @@
             ]
         ],
         "x": 331.25,
-        "xml": "<execute plugin=\"org.openecomp.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"SetInputData action complete\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n",
+        "xml": "<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"SetInputData action complete\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n",
         "y": 897.1666736602783,
         "z": "5ad64f3a.c3774"
     },
@@ -251,7 +251,7 @@
             ]
         ],
         "x": 574.3333206176758,
-        "xml": "<execute plugin=\"org.openecomp.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",
+        "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",
         "y": 137.75000190734863,
         "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 a49f9b2a6..5141a7df4 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.openecomp.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.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":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-operation.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-operation.json
index ee8918e99..10639c7cd 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-operation.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-operation.json
@@ -1 +1 @@
-[{"id":"6295e18d.289b8","type":"dgstart","name":"DGSTART","outputs":1,"x":162,"y":124,"z":"22560c9c.507f14","wires":[["71e03392.dbcd8c"]]},{"id":"71e03392.dbcd8c","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":327.0000305175781,"y":127.33331298828125,"z":"22560c9c.507f14","wires":[["d8b42c68.f5ab3"]]},{"id":"d8b42c68.f5ab3","type":"method","name":"method audit-configuration-operation","xml":"<method rpc='audit-configuration-operation' mode='sync'>\n","comments":"","outputs":1,"x":582.6666870117188,"y":126.33331298828125,"z":"22560c9c.507f14","wires":[["d91d40bd.89138"]]},{"id":"6d141611.56d708","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$audit-configuration-operation-input.request-information.request-action`\">\n<!--\n leaf request-action {\n                type enumeration {\n                    enum \"VsbgServiceAuditRequest\";\n                }\n            }\n}\n-->\n\n","comments":"","outputs":1,"x":187.5,"y":433,"z":"22560c9c.507f14","wires":[["5f81be6d.88ffe","624313d9.5e1ccc"]]},{"id":"5f81be6d.88ffe","type":"outcome","name":"VsbgServiceAuditRequest","xml":"<outcome value='VsbgServiceAuditRequest'>","comments":"","outputs":1,"x":450.5,"y":425,"z":"22560c9c.507f14","wires":[["b7c64a6e.3b97a8"]]},{"id":"b7c64a6e.3b97a8","type":"switchNode","name":"switch: request-sub-action","xml":"<switch test=\"`$audit-configuration-operation-input.request-information.request-sub-action`\">\n","comments":"","outputs":1,"x":714.5,"y":428,"z":"22560c9c.507f14","wires":[["2c21f7b1.0224a8","3dc879b9.2a21a6","fb1f199e.1ee6b8"]]},{"id":"2c21f7b1.0224a8","type":"outcome","name":"AUDIT","xml":"<outcome value='AUDIT'>","comments":"","outputs":1,"x":936.5,"y":428,"z":"22560c9c.507f14","wires":[["b23ec1e7.d9a61"]]},{"id":"624313d9.5e1ccc","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":395.5,"y":490,"z":"22560c9c.507f14","wires":[["60490b53.5d2ee4"]]},{"id":"60490b53.5d2ee4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='request-action not recognized'/>\n","comments":"","x":549.5509033203125,"y":491.8646240234375,"z":"22560c9c.507f14","wires":[]},{"id":"896948ef.2fe218","type":"configure","name":"configure: ConfigComponentAdaptor","xml":"<configure adaptor=\"org.openecomp.appc.ccadaptor.ConfigComponentAdaptor\" key=\"dummy\">\n\t<parameter name=\"action\" value=\"`$service-data.appc-request-header.svc-action`\"/>\n\t","comments":"","outputs":1,"x":1305,"y":658,"z":"22560c9c.507f14","wires":[["b0e4346e.d63768","cf246bec.706c08"]]},{"id":"3dc879b9.2a21a6","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":880.5,"y":606,"z":"22560c9c.507f14","wires":[["9d054a2c.f820a8"]]},{"id":"9d054a2c.f820a8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='request-sub-action not recognized'/>\n","comments":"","x":1047.5,"y":608,"z":"22560c9c.507f14","wires":[]},{"id":"967eb60d.2ec408","type":"comment","name":"Audit-configuration-Operation","info":"","comments":"","x":1530,"y":67,"z":"22560c9c.507f14","wires":[]},{"id":"b0e4346e.d63768","type":"failure","name":"failure","xml":"<outcome value='failure'>","outputs":1,"x":1527,"y":621,"z":"22560c9c.507f14","wires":[["f35bfc8a.ba17b"]]},{"id":"f35bfc8a.ba17b","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<!-- error code & message provided by ncs-adaptor -->\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1690.3331298828125,"y":615.6666259765625,"z":"22560c9c.507f14","wires":[]},{"id":"249d783.f996f88","type":"returnSuccess","name":"return success","xml":" <return status=\"success\">\n \n","comments":"","x":1699,"y":719,"z":"22560c9c.507f14","wires":[]},{"id":"b5c3e0b7.6e9cb","type":"set","name":"set Copy from input to Service-data","xml":"<set>\n<parameter name=\"service-data.\" value=\"audit-configuration-operation-input.\"/>\n\n","comments":"","x":1363,"y":502,"z":"22560c9c.507f14","wires":[]},{"id":"cf246bec.706c08","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1531,"y":713,"z":"22560c9c.507f14","wires":[["249d783.f996f88"]]},{"id":"4c8f0493.b0d5bc","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=\"audit-configuration-operation\"/>\n\n<parameter name=\"field3\" value=\"`$audit-configuration-operation-input.request-information.request-action`\"/>\n<parameter name=\"field4\" value=\"`$service-data.request-information.request-action`\"/>\n<parameter name=\"field5\" value=\"`$audit-configuration-operation-input.request-information.request-sub-action`\"/>\n<parameter name=\"field6\" value=\"`$service-data.request-information.request-sub-action`\"/>\n<parameter name=\"field7\" value=\"`$audit-configuration-operation-input.service-information.service-instance-id`\"/>\n<parameter name=\"field8\" value=\"`$service-data.service-information.service-instance-id`\"/>\n","comments":"","outputs":1,"x":1278,"y":596,"z":"22560c9c.507f14","wires":[[]]},{"id":"441443b2.8ba20c","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=\"VsbgServiceAuditRequest\" />\n\t<parameter name=\"service-data.oper-status.last-sub-action\" value=\"`$audit-configuration-operation-input.request-information.request-sub-action`\" />\n\t<parameter name=\"service-data.oper-status.last-svc-request-id\" value=\"`$audit-configuration-operation-input.sdnc-request-header.svc-request-id`\" />\n\t<!-- Causes exception when set to Null\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\" />\n\t-->\n","comments":"","outputs":1,"x":1458,"y":395.33331298828125,"z":"22560c9c.507f14","wires":[[]]},{"id":"b23ec1e7.d9a61","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1094,"y":426.33331298828125,"z":"22560c9c.507f14","wires":[["441443b2.8ba20c","b5c3e0b7.6e9cb","4c8f0493.b0d5bc","896948ef.2fe218","b74ead9c.3101a","db63f043.6eab3"]]},{"id":"e9f54ef7.3c4b3","type":"switchNode","name":"switch: service-instance-id  config == input","xml":"<switch test=\"`$audit-configuration-operation-input.service-information.service-instance-id == $service-data.service-information.service-instance-id`\">","comments":"","outputs":1,"x":560,"y":270.33331298828125,"z":"22560c9c.507f14","wires":[["fcc63e45.6168e","baaeb60.30b6648"]]},{"id":"fcc63e45.6168e","type":"outcomeFalse","name":"false","xml":"<outcome value=\"false\">","comments":"","outputs":1,"x":832,"y":206.33331298828125,"z":"22560c9c.507f14","wires":[["ba2ca0a6.b672c"]]},{"id":"ba2ca0a6.b672c","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"Service instance not found in config tree\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":993,"y":199.33331298828125,"z":"22560c9c.507f14","wires":[]},{"id":"baaeb60.30b6648","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":828,"y":273.33331298828125,"z":"22560c9c.507f14","wires":[[]]},{"id":"ace6f0cc.7ecce","type":"set","name":"set:service-data based on input","xml":"<set>\n\t\n\t<parameter name=\"service-data.request-information.request-id\" value=\"`$audit-configuration-operation-input.request-information.request-id`\" />\n\t<parameter name=\"service-data.request-information.notification-url\" value=\"`$audit-configuration-operation-input.request-information.notification-url`\" />\n\t<parameter name=\"service-data.request-information.request-action\" value=\"`$audit-configuration-operation-input.request-information.request-action`\" />\n\t<parameter name=\"service-data.request-information.source\" value=\"`$audit-configuration-operation-input.request-information.source`\" />\n\t<parameter name=\"service-data.request-information.order-number\" value=\"`$audit-configuration-operation-input.request-information.order-number`\" />\n\t<parameter name=\"service.request-information.order-version\" value=\"`$audit-configuration-operation-input.request-information.order-version`\" />\n\t<parameter name=\"service-data.appc-request-header.svc-request-id\" value=\"`$audit-configuration-operation-input.appc-request-header.svc-request-id`\" />\n\t<parameter name=\"service-data.appc-request-header.svc-action\" value=\"`$audit-configuration-operation-input.appc-request-header.svc-action`\" />\n\t<parameter name=\"service-data.appc-request-header.svc-notification-url\" value=\"`$audit-configuration-operation-input.appc-request-header.svc-notification-url`\" />\n\t<!-- \n\t<parameter name=\"service-data.service-information.service-instance-id\" value=\"`$audit-configuration-operation-input.service-information.service-instance-id`\" />\n\t-->\n\t<parameter name=\"service-data.service-information.service-type\" value=\"`$audit-configuration-operation-input.service-information.service-type`\" />\n\t<parameter name=\"service-data.request-information.request-sub-action\" value=\"`$audit-configuration-operation-input.request-information.request-sub-action`\" />\n\n\t\n\t\n\t","comments":"","x":537,"y":183.3333282470703,"z":"22560c9c.507f14","wires":[]},{"id":"2806bcfa.2a9a64","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-configuration-operation\"/>\n<parameter name=\"field3\" value=\"`$service-data.appc-request-header.svc-action`\"/>\n<parameter name=\"field4\" value=\"`$service-data.appc-request-header.svc-request-id`\"/>\n<parameter name=\"field5\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field6\" value=\"`$service-data.request-information.request-id`\"/>\n<parameter name=\"field7\" value=\"`$service-data.request-information.request-action`\"/>\n<parameter name=\"field8\" value=\"`$service-data.request-information.source`\"/>\n<parameter name=\"field9\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field10\" value=\"`$service-data.service-information.service-type`\"/>\n<parameter name=\"field11\" value=\"`$service-data.request-information.request-sub-action`\"/>","comments":"","outputs":1,"x":458,"y":223.3333282470703,"z":"22560c9c.507f14","wires":[[]]},{"id":"d91d40bd.89138","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":232.5,"y":199,"z":"22560c9c.507f14","wires":[["ace6f0cc.7ecce","2806bcfa.2a9a64","a37c4df0.5c6a2"]]},{"id":"a37c4df0.5c6a2","type":"switchNode","name":"switch: last-sub-action-status","xml":"<switch test=\"`$service-data.oper-status.last-sub-action-status`\">\n","comments":"","outputs":1,"x":461,"y":326,"z":"22560c9c.507f14","wires":[["117b233.4c88cdd","d97589b.e4e1e78"]]},{"id":"117b233.4c88cdd","type":"outcome","name":"InProgress","xml":"<outcome value='InProgress'>","comments":"","outputs":1,"x":677,"y":319,"z":"22560c9c.507f14","wires":[["8850e7c6.f04338"]]},{"id":"8850e7c6.f04338","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":846,"y":317,"z":"22560c9c.507f14","wires":[["2a7366c4.037b4a","66448305.03e3cc","c09b7edb.44d67","6d141611.56d708"]]},{"id":"2a7366c4.037b4a","type":"set","name":"set: last-sub-action-status = InProgressTimeout","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"InProgressTimeout\" />","comments":"","x":1139,"y":330,"z":"22560c9c.507f14","wires":[]},{"id":"d97589b.e4e1e78","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":673,"y":367,"z":"22560c9c.507f14","wires":[["6d141611.56d708"]]},{"id":"66448305.03e3cc","type":"execute","name":"execute getTimeDifference","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"getTimeDifference\">\n\t<parameter name=\"inDate\" value=\"`$service-data.oper-status.modify-timestamp`\"/>\n\t<parameter name=\"ctxTempVariable\" value=\"tmp.inprogress-time\"/>","comments":"","outputs":1,"x":1085,"y":248,"z":"22560c9c.507f14","wires":[[]]},{"id":"c09b7edb.44d67","type":"switchNode","name":"switch: tmp.inprogress-time > 6 min (360 seconds)","xml":"<switch test=\"`$tmp.inprogress-time > 360`\">","outputs":1,"x":1162,"y":287,"z":"22560c9c.507f14","wires":[["1349d992.d4dd66"]]},{"id":"1349d992.d4dd66","type":"outcomeFalse","name":"false ","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1462,"y":285,"z":"22560c9c.507f14","wires":[["7daebc71.51c9d4"]]},{"id":"7daebc71.51c9d4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Still processing your previous request.'/>","comments":"","x":1646,"y":282,"z":"22560c9c.507f14","wires":[]},{"id":"b74ead9c.3101a","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":1374,"y":548,"z":"22560c9c.507f14","wires":[]},{"id":"db63f043.6eab3","type":"execute","name":"execute: setTime(modify-timestamp)","xml":"<execute plugin=\"org.openecomp.sdnc.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>","comments":"","outputs":1,"x":1366,"y":449,"z":"22560c9c.507f14","wires":[[]]},{"id":"fb1f199e.1ee6b8","type":"outcome","name":"GETRUNNINGCONFIG","xml":"<outcome value='GETRUNNINGCONFIG'>","comments":"","outputs":1,"x":982,"y":505,"z":"22560c9c.507f14","wires":[["b23ec1e7.d9a61"]]}]
+[{"id":"6295e18d.289b8","type":"dgstart","name":"DGSTART","outputs":1,"x":162,"y":124,"z":"22560c9c.507f14","wires":[["71e03392.dbcd8c"]]},{"id":"71e03392.dbcd8c","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":327.0000305175781,"y":127.33331298828125,"z":"22560c9c.507f14","wires":[["d8b42c68.f5ab3"]]},{"id":"d8b42c68.f5ab3","type":"method","name":"method audit-configuration-operation","xml":"<method rpc='audit-configuration-operation' mode='sync'>\n","comments":"","outputs":1,"x":582.6666870117188,"y":126.33331298828125,"z":"22560c9c.507f14","wires":[["d91d40bd.89138"]]},{"id":"6d141611.56d708","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$audit-configuration-operation-input.request-information.request-action`\">\n<!--\n leaf request-action {\n                type enumeration {\n                    enum \"VsbgServiceAuditRequest\";\n                }\n            }\n}\n-->\n\n","comments":"","outputs":1,"x":187.5,"y":433,"z":"22560c9c.507f14","wires":[["5f81be6d.88ffe","624313d9.5e1ccc"]]},{"id":"5f81be6d.88ffe","type":"outcome","name":"VsbgServiceAuditRequest","xml":"<outcome value='VsbgServiceAuditRequest'>","comments":"","outputs":1,"x":450.5,"y":425,"z":"22560c9c.507f14","wires":[["b7c64a6e.3b97a8"]]},{"id":"b7c64a6e.3b97a8","type":"switchNode","name":"switch: request-sub-action","xml":"<switch test=\"`$audit-configuration-operation-input.request-information.request-sub-action`\">\n","comments":"","outputs":1,"x":714.5,"y":428,"z":"22560c9c.507f14","wires":[["2c21f7b1.0224a8","3dc879b9.2a21a6","fb1f199e.1ee6b8"]]},{"id":"2c21f7b1.0224a8","type":"outcome","name":"AUDIT","xml":"<outcome value='AUDIT'>","comments":"","outputs":1,"x":936.5,"y":428,"z":"22560c9c.507f14","wires":[["b23ec1e7.d9a61"]]},{"id":"624313d9.5e1ccc","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":395.5,"y":490,"z":"22560c9c.507f14","wires":[["60490b53.5d2ee4"]]},{"id":"60490b53.5d2ee4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='request-action not recognized'/>\n","comments":"","x":549.5509033203125,"y":491.8646240234375,"z":"22560c9c.507f14","wires":[]},{"id":"896948ef.2fe218","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","comments":"","outputs":1,"x":1305,"y":658,"z":"22560c9c.507f14","wires":[["b0e4346e.d63768","cf246bec.706c08"]]},{"id":"3dc879b9.2a21a6","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":880.5,"y":606,"z":"22560c9c.507f14","wires":[["9d054a2c.f820a8"]]},{"id":"9d054a2c.f820a8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='request-sub-action not recognized'/>\n","comments":"","x":1047.5,"y":608,"z":"22560c9c.507f14","wires":[]},{"id":"967eb60d.2ec408","type":"comment","name":"Audit-configuration-Operation","info":"","comments":"","x":1530,"y":67,"z":"22560c9c.507f14","wires":[]},{"id":"b0e4346e.d63768","type":"failure","name":"failure","xml":"<outcome value='failure'>","outputs":1,"x":1527,"y":621,"z":"22560c9c.507f14","wires":[["f35bfc8a.ba17b"]]},{"id":"f35bfc8a.ba17b","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<!-- error code & message provided by ncs-adaptor -->\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1690.3331298828125,"y":615.6666259765625,"z":"22560c9c.507f14","wires":[]},{"id":"249d783.f996f88","type":"returnSuccess","name":"return success","xml":" <return status=\"success\">\n \n","comments":"","x":1699,"y":719,"z":"22560c9c.507f14","wires":[]},{"id":"b5c3e0b7.6e9cb","type":"set","name":"set Copy from input to Service-data","xml":"<set>\n<parameter name=\"service-data.\" value=\"audit-configuration-operation-input.\"/>\n\n","comments":"","x":1363,"y":502,"z":"22560c9c.507f14","wires":[]},{"id":"cf246bec.706c08","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1531,"y":713,"z":"22560c9c.507f14","wires":[["249d783.f996f88"]]},{"id":"4c8f0493.b0d5bc","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=\"audit-configuration-operation\"/>\n\n<parameter name=\"field3\" value=\"`$audit-configuration-operation-input.request-information.request-action`\"/>\n<parameter name=\"field4\" value=\"`$service-data.request-information.request-action`\"/>\n<parameter name=\"field5\" value=\"`$audit-configuration-operation-input.request-information.request-sub-action`\"/>\n<parameter name=\"field6\" value=\"`$service-data.request-information.request-sub-action`\"/>\n<parameter name=\"field7\" value=\"`$audit-configuration-operation-input.service-information.service-instance-id`\"/>\n<parameter name=\"field8\" value=\"`$service-data.service-information.service-instance-id`\"/>\n","comments":"","outputs":1,"x":1278,"y":596,"z":"22560c9c.507f14","wires":[[]]},{"id":"441443b2.8ba20c","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=\"VsbgServiceAuditRequest\" />\n\t<parameter name=\"service-data.oper-status.last-sub-action\" value=\"`$audit-configuration-operation-input.request-information.request-sub-action`\" />\n\t<parameter name=\"service-data.oper-status.last-svc-request-id\" value=\"`$audit-configuration-operation-input.sdnc-request-header.svc-request-id`\" />\n\t<!-- Causes exception when set to Null\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\" />\n\t-->\n","comments":"","outputs":1,"x":1458,"y":395.33331298828125,"z":"22560c9c.507f14","wires":[[]]},{"id":"b23ec1e7.d9a61","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1094,"y":426.33331298828125,"z":"22560c9c.507f14","wires":[["441443b2.8ba20c","b5c3e0b7.6e9cb","4c8f0493.b0d5bc","896948ef.2fe218","b74ead9c.3101a","db63f043.6eab3"]]},{"id":"e9f54ef7.3c4b3","type":"switchNode","name":"switch: service-instance-id  config == input","xml":"<switch test=\"`$audit-configuration-operation-input.service-information.service-instance-id == $service-data.service-information.service-instance-id`\">","comments":"","outputs":1,"x":560,"y":270.33331298828125,"z":"22560c9c.507f14","wires":[["fcc63e45.6168e","baaeb60.30b6648"]]},{"id":"fcc63e45.6168e","type":"outcomeFalse","name":"false","xml":"<outcome value=\"false\">","comments":"","outputs":1,"x":832,"y":206.33331298828125,"z":"22560c9c.507f14","wires":[["ba2ca0a6.b672c"]]},{"id":"ba2ca0a6.b672c","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"Service instance not found in config tree\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":993,"y":199.33331298828125,"z":"22560c9c.507f14","wires":[]},{"id":"baaeb60.30b6648","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":828,"y":273.33331298828125,"z":"22560c9c.507f14","wires":[[]]},{"id":"ace6f0cc.7ecce","type":"set","name":"set:service-data based on input","xml":"<set>\n\t\n\t<parameter name=\"service-data.request-information.request-id\" value=\"`$audit-configuration-operation-input.request-information.request-id`\" />\n\t<parameter name=\"service-data.request-information.notification-url\" value=\"`$audit-configuration-operation-input.request-information.notification-url`\" />\n\t<parameter name=\"service-data.request-information.request-action\" value=\"`$audit-configuration-operation-input.request-information.request-action`\" />\n\t<parameter name=\"service-data.request-information.source\" value=\"`$audit-configuration-operation-input.request-information.source`\" />\n\t<parameter name=\"service-data.request-information.order-number\" value=\"`$audit-configuration-operation-input.request-information.order-number`\" />\n\t<parameter name=\"service.request-information.order-version\" value=\"`$audit-configuration-operation-input.request-information.order-version`\" />\n\t<parameter name=\"service-data.appc-request-header.svc-request-id\" value=\"`$audit-configuration-operation-input.appc-request-header.svc-request-id`\" />\n\t<parameter name=\"service-data.appc-request-header.svc-action\" value=\"`$audit-configuration-operation-input.appc-request-header.svc-action`\" />\n\t<parameter name=\"service-data.appc-request-header.svc-notification-url\" value=\"`$audit-configuration-operation-input.appc-request-header.svc-notification-url`\" />\n\t<!-- \n\t<parameter name=\"service-data.service-information.service-instance-id\" value=\"`$audit-configuration-operation-input.service-information.service-instance-id`\" />\n\t-->\n\t<parameter name=\"service-data.service-information.service-type\" value=\"`$audit-configuration-operation-input.service-information.service-type`\" />\n\t<parameter name=\"service-data.request-information.request-sub-action\" value=\"`$audit-configuration-operation-input.request-information.request-sub-action`\" />\n\n\t\n\t\n\t","comments":"","x":537,"y":183.3333282470703,"z":"22560c9c.507f14","wires":[]},{"id":"2806bcfa.2a9a64","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-configuration-operation\"/>\n<parameter name=\"field3\" value=\"`$service-data.appc-request-header.svc-action`\"/>\n<parameter name=\"field4\" value=\"`$service-data.appc-request-header.svc-request-id`\"/>\n<parameter name=\"field5\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field6\" value=\"`$service-data.request-information.request-id`\"/>\n<parameter name=\"field7\" value=\"`$service-data.request-information.request-action`\"/>\n<parameter name=\"field8\" value=\"`$service-data.request-information.source`\"/>\n<parameter name=\"field9\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field10\" value=\"`$service-data.service-information.service-type`\"/>\n<parameter name=\"field11\" value=\"`$service-data.request-information.request-sub-action`\"/>","comments":"","outputs":1,"x":458,"y":223.3333282470703,"z":"22560c9c.507f14","wires":[[]]},{"id":"d91d40bd.89138","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":232.5,"y":199,"z":"22560c9c.507f14","wires":[["ace6f0cc.7ecce","2806bcfa.2a9a64","a37c4df0.5c6a2"]]},{"id":"a37c4df0.5c6a2","type":"switchNode","name":"switch: last-sub-action-status","xml":"<switch test=\"`$service-data.oper-status.last-sub-action-status`\">\n","comments":"","outputs":1,"x":461,"y":326,"z":"22560c9c.507f14","wires":[["117b233.4c88cdd","d97589b.e4e1e78"]]},{"id":"117b233.4c88cdd","type":"outcome","name":"InProgress","xml":"<outcome value='InProgress'>","comments":"","outputs":1,"x":677,"y":319,"z":"22560c9c.507f14","wires":[["8850e7c6.f04338"]]},{"id":"8850e7c6.f04338","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":846,"y":317,"z":"22560c9c.507f14","wires":[["2a7366c4.037b4a","66448305.03e3cc","c09b7edb.44d67","6d141611.56d708"]]},{"id":"2a7366c4.037b4a","type":"set","name":"set: last-sub-action-status = InProgressTimeout","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"InProgressTimeout\" />","comments":"","x":1139,"y":330,"z":"22560c9c.507f14","wires":[]},{"id":"d97589b.e4e1e78","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":673,"y":367,"z":"22560c9c.507f14","wires":[["6d141611.56d708"]]},{"id":"66448305.03e3cc","type":"execute","name":"execute getTimeDifference","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"getTimeDifference\">\n\t<parameter name=\"inDate\" value=\"`$service-data.oper-status.modify-timestamp`\"/>\n\t<parameter name=\"ctxTempVariable\" value=\"tmp.inprogress-time\"/>","comments":"","outputs":1,"x":1085,"y":248,"z":"22560c9c.507f14","wires":[[]]},{"id":"c09b7edb.44d67","type":"switchNode","name":"switch: tmp.inprogress-time > 6 min (360 seconds)","xml":"<switch test=\"`$tmp.inprogress-time > 360`\">","outputs":1,"x":1162,"y":287,"z":"22560c9c.507f14","wires":[["1349d992.d4dd66"]]},{"id":"1349d992.d4dd66","type":"outcomeFalse","name":"false ","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1462,"y":285,"z":"22560c9c.507f14","wires":[["7daebc71.51c9d4"]]},{"id":"7daebc71.51c9d4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Still processing your previous request.'/>","comments":"","x":1646,"y":282,"z":"22560c9c.507f14","wires":[]},{"id":"b74ead9c.3101a","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":1374,"y":548,"z":"22560c9c.507f14","wires":[]},{"id":"db63f043.6eab3","type":"execute","name":"execute: setTime(modify-timestamp)","xml":"<execute plugin=\"org.openecomp.sdnc.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>","comments":"","outputs":1,"x":1366,"y":449,"z":"22560c9c.507f14","wires":[[]]},{"id":"fb1f199e.1ee6b8","type":"outcome","name":"GETRUNNINGCONFIG","xml":"<outcome value='GETRUNNINGCONFIG'>","comments":"","outputs":1,"x":982,"y":505,"z":"22560c9c.507f14","wires":[["b23ec1e7.d9a61"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_method_Generic_Evacuate_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_method_Generic_Evacuate_2.0.0.json
index 39e551164..4defa76ed 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_method_Generic_Evacuate_2.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_method_Generic_Evacuate_2.0.0.json
@@ -1 +1 @@
-[{"id":"a83fc34.6924bc","type":"dgstart","name":"DGSTART","outputs":1,"x":177,"y":100,"z":"f4cf2376.c92f4","wires":[["531a3928.a7bb9"]]},{"id":"531a3928.a7bb9","type":"service-logic","name":"Appc-API 2.0.0","module":"Appc-API","version":"2.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='2.0.0'>","outputs":1,"x":365,"y":101,"z":"f4cf2376.c92f4","wires":[["352baa79.80aee6"]]},{"id":"352baa79.80aee6","type":"method","name":"Generic_Evacuate","xml":"<method rpc='Generic_Evacuate' mode='sync'>\n","comments":"","outputs":1,"x":269,"y":231,"z":"f4cf2376.c92f4","wires":[["c748601f.21dab8"]]},{"id":"75bc6e9a.dd5c9","type":"execute","name":"execute: evacuate","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='evacuateServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$vm-id`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$identity-url`\" />\n<parameter name=\"org.openecomp.appc.tenant.id\" value=\"`$tenant-id`\" />\n<parameter name=\"org.openecomp.appc.rebuildvm\" value=\"`$rebuild-vm`\" />\n<parameter name=\"org.openecomp.appc.targethost.id\" value=\"`$targethost-id`\" />\n\n","comments":"","outputs":1,"x":411,"y":523,"z":"f4cf2376.c92f4","wires":[["eb6db261.bc7b28","47819cc2.30deac"]]},{"id":"eb6db261.bc7b28","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":601,"y":571,"z":"f4cf2376.c92f4","wires":[["97cc1ef3.9ec4f"]]},{"id":"47819cc2.30deac","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":591,"y":462,"z":"f4cf2376.c92f4","wires":[["b00d6f4f.ffcb88"]]},{"id":"9b05722c.840468","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1095,"y":501,"z":"f4cf2376.c92f4","wires":[]},{"id":"b00d6f4f.ffcb88","type":"returnFailure","name":"return failure","xml":"<return status='failure'>","comments":"","x":753,"y":462,"z":"f4cf2376.c92f4","wires":[]},{"id":"c748601f.21dab8","type":"execute","name":"execute: flatAndAddToContext","xml":"<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />\n","comments":"","outputs":1,"x":293,"y":350,"z":"f4cf2376.c92f4","wires":[["75fbe835.95b8a8","b3f66172.ffd75"]]},{"id":"75fbe835.95b8a8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":229,"y":523,"z":"f4cf2376.c92f4","wires":[["75bc6e9a.dd5c9"]]},{"id":"b3f66172.ffd75","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":526,"y":287,"z":"f4cf2376.c92f4","wires":[["53bd08e0.7b10f"]]},{"id":"53bd08e0.7b10f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":711,"y":287,"z":"f4cf2376.c92f4","wires":[]},{"id":"97cc1ef3.9ec4f","type":"switchNode","name":"switch","xml":"<switch test='`$EVACUATE_STATUS`'>\n","comments":"","outputs":1,"x":755,"y":571,"z":"f4cf2376.c92f4","wires":[["6c8bad6c.9d4904","629304e4.1ee93c"]]},{"id":"6c8bad6c.9d4904","type":"success","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":922,"y":502,"z":"f4cf2376.c92f4","wires":[["9b05722c.840468"]]},{"id":"629304e4.1ee93c","type":"outcome","name":"ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":922,"y":637,"z":"f4cf2376.c92f4","wires":[["8fdc00fc.50b118"]]},{"id":"be82d5f2.b11a9","type":"set","name":"set output message","xml":"<set>\n<parameter name='output.status.message' value=\"`$error-message`\" />\n","comments":"","x":1253,"y":636,"z":"f4cf2376.c92f4","wires":[]},{"id":"8fdc00fc.50b118","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1067,"y":636,"z":"f4cf2376.c92f4","wires":[["be82d5f2.b11a9","eca3cbfd.19b238"]]},{"id":"eca3cbfd.19b238","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":1241,"y":697,"z":"f4cf2376.c92f4","wires":[]}]
+[{"id":"a83fc34.6924bc","type":"dgstart","name":"DGSTART","outputs":1,"x":177,"y":100,"z":"f4cf2376.c92f4","wires":[["531a3928.a7bb9"]]},{"id":"531a3928.a7bb9","type":"service-logic","name":"Appc-API 2.0.0","module":"Appc-API","version":"2.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='2.0.0'>","outputs":1,"x":365,"y":101,"z":"f4cf2376.c92f4","wires":[["352baa79.80aee6"]]},{"id":"352baa79.80aee6","type":"method","name":"Generic_Evacuate","xml":"<method rpc='Generic_Evacuate' mode='sync'>\n","comments":"","outputs":1,"x":269,"y":231,"z":"f4cf2376.c92f4","wires":[["c748601f.21dab8"]]},{"id":"75bc6e9a.dd5c9","type":"execute","name":"execute: evacuate","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='evacuateServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$vm-id`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$identity-url`\" />\n<parameter name=\"org.onap.appc.tenant.id\" value=\"`$tenant-id`\" />\n<parameter name=\"org.onap.appc.rebuildvm\" value=\"`$rebuild-vm`\" />\n<parameter name=\"org.onap.appc.targethost.id\" value=\"`$targethost-id`\" />\n\n","comments":"","outputs":1,"x":411,"y":523,"z":"f4cf2376.c92f4","wires":[["eb6db261.bc7b28","47819cc2.30deac"]]},{"id":"eb6db261.bc7b28","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":601,"y":571,"z":"f4cf2376.c92f4","wires":[["97cc1ef3.9ec4f"]]},{"id":"47819cc2.30deac","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":591,"y":462,"z":"f4cf2376.c92f4","wires":[["b00d6f4f.ffcb88"]]},{"id":"9b05722c.840468","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1095,"y":501,"z":"f4cf2376.c92f4","wires":[]},{"id":"b00d6f4f.ffcb88","type":"returnFailure","name":"return failure","xml":"<return status='failure'>","comments":"","x":753,"y":462,"z":"f4cf2376.c92f4","wires":[]},{"id":"c748601f.21dab8","type":"execute","name":"execute: flatAndAddToContext","xml":"<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />\n","comments":"","outputs":1,"x":293,"y":350,"z":"f4cf2376.c92f4","wires":[["75fbe835.95b8a8","b3f66172.ffd75"]]},{"id":"75fbe835.95b8a8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":229,"y":523,"z":"f4cf2376.c92f4","wires":[["75bc6e9a.dd5c9"]]},{"id":"b3f66172.ffd75","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":526,"y":287,"z":"f4cf2376.c92f4","wires":[["53bd08e0.7b10f"]]},{"id":"53bd08e0.7b10f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":711,"y":287,"z":"f4cf2376.c92f4","wires":[]},{"id":"97cc1ef3.9ec4f","type":"switchNode","name":"switch","xml":"<switch test='`$EVACUATE_STATUS`'>\n","comments":"","outputs":1,"x":755,"y":571,"z":"f4cf2376.c92f4","wires":[["6c8bad6c.9d4904","629304e4.1ee93c"]]},{"id":"6c8bad6c.9d4904","type":"success","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":922,"y":502,"z":"f4cf2376.c92f4","wires":[["9b05722c.840468"]]},{"id":"629304e4.1ee93c","type":"outcome","name":"ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":922,"y":637,"z":"f4cf2376.c92f4","wires":[["8fdc00fc.50b118"]]},{"id":"be82d5f2.b11a9","type":"set","name":"set output message","xml":"<set>\n<parameter name='output.status.message' value=\"`$error-message`\" />\n","comments":"","x":1253,"y":636,"z":"f4cf2376.c92f4","wires":[]},{"id":"8fdc00fc.50b118","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1067,"y":636,"z":"f4cf2376.c92f4","wires":[["be82d5f2.b11a9","eca3cbfd.19b238"]]},{"id":"eca3cbfd.19b238","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":1241,"y":697,"z":"f4cf2376.c92f4","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-activate.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-activate.json
index 8cfd596e6..15f59608c 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-activate.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-activate.json
@@ -1 +1 @@
-[{"id":"b7ddcc21.7450f8","type":"comment","name":"Service-Configuration-Activate","info":"","comments":"","x":1004.75,"y":44,"z":"f00ee083.799bc","wires":[]},{"id":"6190e20.7a54fa","type":"dgstart","name":"DGSTART","outputs":1,"x":132.5,"y":92.1111068725586,"z":"f00ee083.799bc","wires":[["2058c9b5.b7deb6"]]},{"id":"2058c9b5.b7deb6","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":283.6667022705078,"y":92.77776336669922,"z":"f00ee083.799bc","wires":[["4a5c6156.ae9748"]]},{"id":"4a5c6156.ae9748","type":"method","name":"method service-configuration-activate","xml":"<method rpc='service-configuration-activate' mode='sync'>\n","comments":"","outputs":1,"x":539.0000305175781,"y":92.44442749023438,"z":"f00ee083.799bc","wires":[["ae76d72a.cd9fa8"]]},{"id":"c16f0bac.54ec08","type":"switchNode","name":"switch: order-status","xml":"<switch test=\"`$service-data.oper-status.order-status`\">\n<!--\nleaf order-status {\n\ttype enumeration {\n\t\tenum \"Reserved\";\n\t\tenum \"Activated\";\n\t\tenum \"PendingDelete\";\n\t\tenum \"RequestFailed\";\n\t\tenum \"InProgressTimeout\";\n\t\tenum \"InProgress\";\n\t\tenum \"PendingActivate\";\n\t}\n}\n-->","comments":"","outputs":1,"x":146.76312255859375,"y":288.3101501464844,"z":"f00ee083.799bc","wires":[["d1c8c56d.d2c3c8","45617b36.27072c","9d92c880.b8ace8","99c2a412.526c98"]]},{"id":"d1c8c56d.d2c3c8","type":"outcome","name":"Reserved","xml":"<outcome value='Reserved'>","comments":"","outputs":1,"x":352.9147033691406,"y":338.154296875,"z":"f00ee083.799bc","wires":[["5b9c2108.22ff08"]]},{"id":"5b9c2108.22ff08","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":540.9318237304688,"y":302.6607666015625,"z":"f00ee083.799bc","wires":[["8ff99d13.048668","9f7cc348.9044a","d5e2186e.f0d268","5396ee77.430da8","7e50854b.88cc3c","24aaef83.aeb2d8","db59e9a7.81ab18"]]},{"id":"9f7cc348.9044a","type":"set","name":"set: maintinance-indicator = N","xml":"<set>\n\t<parameter name='service-data.oper-status.maintenance-indicator' value='N' />","comments":"","x":807.69384765625,"y":514.8492431640625,"z":"f00ee083.799bc","wires":[]},{"id":"c5dfc2e0.a31f88","type":"failure","name":"failure","xml":"<outcome value='failure'>","outputs":1,"x":939.60693359375,"y":597.1112060546875,"z":"f00ee083.799bc","wires":[["7ab0628e.874b74"]]},{"id":"7ab0628e.874b74","type":"block","name":"block : atomic","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1134.6068115234375,"y":596.1112060546875,"z":"f00ee083.799bc","wires":[["7c81a934.5f99d","e378e2b2.661aa8"]]},{"id":"45617b36.27072c","type":"other","name":"Other","xml":"<outcome value='Other'>\n\n<!-- null, PendingActivate, Activated, Audited -->","comments":"","outputs":1,"x":238.27389526367188,"y":806.9207153320312,"z":"f00ee083.799bc","wires":[["bd4cd955.3ff1b"]]},{"id":"8ff99d13.048668","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":827.9404296875,"y":335.44451904296875,"z":"f00ee083.799bc","wires":[]},{"id":"d5e2186e.f0d268","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":821.7498779296875,"y":387,"z":"f00ee083.799bc","wires":[[]]},{"id":"bd4cd955.3ff1b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid Order Status State'/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":427.08331298828125,"y":803.3333129882812,"z":"f00ee083.799bc","wires":[]},{"id":"c03d84f0.eb0e78","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"Service instance not found in config tree\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":729.27392578125,"y":152.46835327148438,"z":"f00ee083.799bc","wires":[]},{"id":"59d25bd8.67e904","type":"outcomeFalse","name":"false","xml":"<outcome value=\"false\">","comments":"","outputs":1,"x":550.083251953125,"y":150.66664123535156,"z":"f00ee083.799bc","wires":[["c03d84f0.eb0e78"]]},{"id":"13043f4e.308b39","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":544.4165649414062,"y":194.00001525878906,"z":"f00ee083.799bc","wires":[["c16f0bac.54ec08"]]},{"id":"ae76d72a.cd9fa8","type":"switchNode","name":"switch: service-instance-id  config == input","xml":"<switch test=\"`$service-configuration-operation-input.service-information.service-instance-id == $service-data.service-information.service-instance-id`\">","comments":"","outputs":1,"x":206.74984741210938,"y":169.99998474121094,"z":"f00ee083.799bc","wires":[["59d25bd8.67e904","13043f4e.308b39"]]},{"id":"5396ee77.430da8","type":"save","name":"save: modify-timestamp","xml":"<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource\" resource=\"service-data\">\n\t\t<parameter name=\"service-data.oper-status.modify-timestamp\" value=\"`$service-data.oper-status.modify-timestamp`\" />","comments":"","outputs":1,"x":783.75,"y":450,"z":"f00ee083.799bc","wires":[[]]},{"id":"391458f8.3734d8","type":"failure","name":"success","xml":"<outcome value='success'>","comments":"","outputs":1,"x":936.7498779296875,"y":864,"z":"f00ee083.799bc","wires":[["230778fb.d3aa48"]]},{"id":"230778fb.d3aa48","type":"block","name":"block : atomic","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1139.41650390625,"y":861.3333740234375,"z":"f00ee083.799bc","wires":[["669f2807.a376","f3bf236d.1c5ee8"]]},{"id":"669f2807.a376","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1445.7498779296875,"y":970,"z":"f00ee083.799bc","wires":[]},{"id":"beaa19db.1d003","type":"comment","name":"OrderStatus null - NO prepare done","info":"","comments":"","x":144,"y":873,"z":"f00ee083.799bc","wires":[]},{"id":"4afdefcb.ed7e5","type":"set","name":"set: order-status = RequestFailed","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"RequestFailed\" />","comments":"","x":1529.7498779296875,"y":548,"z":"f00ee083.799bc","wires":[]},{"id":"7e50854b.88cc3c","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=\"VsbgServiceActivateRequest\" />\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":906.7498779296875,"y":280,"z":"f00ee083.799bc","wires":[[]]},{"id":"4d7aca93.0251cc","type":"set","name":"set: order-status = PendingActivate","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"PendingActivate\" />","comments":"","x":1499.7498779296875,"y":851,"z":"f00ee083.799bc","wires":[]},{"id":"96545374.14f618","type":"comment","name":"Only Need Service_instance_id from input","info":"","comments":"","x":1184.5,"y":367,"z":"f00ee083.799bc","wires":[]},{"id":"24aaef83.aeb2d8","type":"configure","name":"configure: ConfigComponentAdaptor","xml":"<configure adaptor=\"org.openecomp.appc.ccadaptor.ConfigComponentAdaptor\" key=\"dummy\">\n\t<parameter name=\"action\" value=\"activate\"/>\n\t\n\n\t","comments":"","outputs":1,"x":671.75,"y":626,"z":"f00ee083.799bc","wires":[["c5dfc2e0.a31f88","391458f8.3734d8"]]},{"id":"db59e9a7.81ab18","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-configuration-operation:Activate:Before Calling ConfigAdaptor\"/>\n<parameter name=\"field3\" value=\"`$service-data.oper-status.order-status`\"/>\n<parameter name=\"field4\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field5\" value=\"`$service-data.vnf-config-information.vnf-type`\"/>\n\n<parameter name=\"field7\" value=\"`$service-data.vnf-config-information.vnf-host-ip-address`\"/>\n\n\n","comments":"","outputs":1,"x":734.5,"y":568,"z":"f00ee083.799bc","wires":[[]]},{"id":"7c81a934.5f99d","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-configuration-operation:Activate:After Calling ConfigAdaptor:Failure\"/>\n<parameter name=\"field3\" value=\"`$service-data.oper-status.order-status`\"/>\n<parameter name=\"field4\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field5\" value=\"`$service-data.vnf-config-information.vnf-type`\"/>\n\n<parameter name=\"field7\" value=\"`$service-data.vnf-config-information.vnf-host-ip-address`\"/>\n\n\n","comments":"","outputs":1,"x":1439.5,"y":507,"z":"f00ee083.799bc","wires":[[]]},{"id":"f3bf236d.1c5ee8","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-configuration-operation:Activate:After Calling ConfigAdaptor:Success\"/>\n<parameter name=\"field3\" value=\"`$service-data.oper-status.order-status`\"/>\n<parameter name=\"field4\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field5\" value=\"`$service-data.vnf-config-information.vnf-type`\"/>\n<parameter name=\"field7\" value=\"`$service-data.vnf-config-information.vnf-host-ip-address`\"/>\n\n\n","comments":"","outputs":1,"x":1416.5,"y":791,"z":"f00ee083.799bc","wires":[[]]},{"id":"9d92c880.b8ace8","type":"outcome","name":"RequestFailed","xml":"<outcome value='RequestFailed'>","comments":"","outputs":1,"x":361.75,"y":275,"z":"f00ee083.799bc","wires":[["5b9c2108.22ff08"]]},{"id":"77ba363f.3bc7d8","type":"outcome","name":"InProgressTimeout","xml":"<outcome value='InProgressTimeout'>","comments":"","outputs":1,"x":382.75,"y":471,"z":"f00ee083.799bc","wires":[[]]},{"id":"97f847f7.7c233","type":"set","name":"set: last-sub-action-status = RequestFailed","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"RequestFailed\" />","comments":"","x":1556.75,"y":592,"z":"f00ee083.799bc","wires":[]},{"id":"bfd9b6ea.7f73c8","type":"comment","name":"LastSubAction status set on Notification","info":"","comments":"","x":1890.75,"y":590,"z":"f00ee083.799bc","wires":[]},{"id":"2e268fc9.50fa08","type":"comment","name":"Set Order Status on Notification","info":"","comments":"","x":1706.75,"y":761,"z":"f00ee083.799bc","wires":[]},{"id":"e378e2b2.661aa8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1463.75,"y":645,"z":"f00ee083.799bc","wires":[]},{"id":"99c2a412.526c98","type":"outcome","name":"PendingActivate","xml":"<outcome value='PendingActivate'>","comments":"","outputs":1,"x":351.75,"y":391,"z":"f00ee083.799bc","wires":[["5b9c2108.22ff08"]]}]
+[{"id":"b7ddcc21.7450f8","type":"comment","name":"Service-Configuration-Activate","info":"","comments":"","x":1004.75,"y":44,"z":"f00ee083.799bc","wires":[]},{"id":"6190e20.7a54fa","type":"dgstart","name":"DGSTART","outputs":1,"x":132.5,"y":92.1111068725586,"z":"f00ee083.799bc","wires":[["2058c9b5.b7deb6"]]},{"id":"2058c9b5.b7deb6","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":283.6667022705078,"y":92.77776336669922,"z":"f00ee083.799bc","wires":[["4a5c6156.ae9748"]]},{"id":"4a5c6156.ae9748","type":"method","name":"method service-configuration-activate","xml":"<method rpc='service-configuration-activate' mode='sync'>\n","comments":"","outputs":1,"x":539.0000305175781,"y":92.44442749023438,"z":"f00ee083.799bc","wires":[["ae76d72a.cd9fa8"]]},{"id":"c16f0bac.54ec08","type":"switchNode","name":"switch: order-status","xml":"<switch test=\"`$service-data.oper-status.order-status`\">\n<!--\nleaf order-status {\n\ttype enumeration {\n\t\tenum \"Reserved\";\n\t\tenum \"Activated\";\n\t\tenum \"PendingDelete\";\n\t\tenum \"RequestFailed\";\n\t\tenum \"InProgressTimeout\";\n\t\tenum \"InProgress\";\n\t\tenum \"PendingActivate\";\n\t}\n}\n-->","comments":"","outputs":1,"x":146.76312255859375,"y":288.3101501464844,"z":"f00ee083.799bc","wires":[["d1c8c56d.d2c3c8","45617b36.27072c","9d92c880.b8ace8","99c2a412.526c98"]]},{"id":"d1c8c56d.d2c3c8","type":"outcome","name":"Reserved","xml":"<outcome value='Reserved'>","comments":"","outputs":1,"x":352.9147033691406,"y":338.154296875,"z":"f00ee083.799bc","wires":[["5b9c2108.22ff08"]]},{"id":"5b9c2108.22ff08","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":540.9318237304688,"y":302.6607666015625,"z":"f00ee083.799bc","wires":[["8ff99d13.048668","9f7cc348.9044a","d5e2186e.f0d268","5396ee77.430da8","7e50854b.88cc3c","24aaef83.aeb2d8","db59e9a7.81ab18"]]},{"id":"9f7cc348.9044a","type":"set","name":"set: maintinance-indicator = N","xml":"<set>\n\t<parameter name='service-data.oper-status.maintenance-indicator' value='N' />","comments":"","x":807.69384765625,"y":514.8492431640625,"z":"f00ee083.799bc","wires":[]},{"id":"c5dfc2e0.a31f88","type":"failure","name":"failure","xml":"<outcome value='failure'>","outputs":1,"x":939.60693359375,"y":597.1112060546875,"z":"f00ee083.799bc","wires":[["7ab0628e.874b74"]]},{"id":"7ab0628e.874b74","type":"block","name":"block : atomic","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1134.6068115234375,"y":596.1112060546875,"z":"f00ee083.799bc","wires":[["7c81a934.5f99d","e378e2b2.661aa8"]]},{"id":"45617b36.27072c","type":"other","name":"Other","xml":"<outcome value='Other'>\n\n<!-- null, PendingActivate, Activated, Audited -->","comments":"","outputs":1,"x":238.27389526367188,"y":806.9207153320312,"z":"f00ee083.799bc","wires":[["bd4cd955.3ff1b"]]},{"id":"8ff99d13.048668","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":827.9404296875,"y":335.44451904296875,"z":"f00ee083.799bc","wires":[]},{"id":"d5e2186e.f0d268","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":821.7498779296875,"y":387,"z":"f00ee083.799bc","wires":[[]]},{"id":"bd4cd955.3ff1b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid Order Status State'/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":427.08331298828125,"y":803.3333129882812,"z":"f00ee083.799bc","wires":[]},{"id":"c03d84f0.eb0e78","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"Service instance not found in config tree\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":729.27392578125,"y":152.46835327148438,"z":"f00ee083.799bc","wires":[]},{"id":"59d25bd8.67e904","type":"outcomeFalse","name":"false","xml":"<outcome value=\"false\">","comments":"","outputs":1,"x":550.083251953125,"y":150.66664123535156,"z":"f00ee083.799bc","wires":[["c03d84f0.eb0e78"]]},{"id":"13043f4e.308b39","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":544.4165649414062,"y":194.00001525878906,"z":"f00ee083.799bc","wires":[["c16f0bac.54ec08"]]},{"id":"ae76d72a.cd9fa8","type":"switchNode","name":"switch: service-instance-id  config == input","xml":"<switch test=\"`$service-configuration-operation-input.service-information.service-instance-id == $service-data.service-information.service-instance-id`\">","comments":"","outputs":1,"x":206.74984741210938,"y":169.99998474121094,"z":"f00ee083.799bc","wires":[["59d25bd8.67e904","13043f4e.308b39"]]},{"id":"5396ee77.430da8","type":"save","name":"save: modify-timestamp","xml":"<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource\" resource=\"service-data\">\n\t\t<parameter name=\"service-data.oper-status.modify-timestamp\" value=\"`$service-data.oper-status.modify-timestamp`\" />","comments":"","outputs":1,"x":783.75,"y":450,"z":"f00ee083.799bc","wires":[[]]},{"id":"391458f8.3734d8","type":"failure","name":"success","xml":"<outcome value='success'>","comments":"","outputs":1,"x":936.7498779296875,"y":864,"z":"f00ee083.799bc","wires":[["230778fb.d3aa48"]]},{"id":"230778fb.d3aa48","type":"block","name":"block : atomic","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1139.41650390625,"y":861.3333740234375,"z":"f00ee083.799bc","wires":[["669f2807.a376","f3bf236d.1c5ee8"]]},{"id":"669f2807.a376","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1445.7498779296875,"y":970,"z":"f00ee083.799bc","wires":[]},{"id":"beaa19db.1d003","type":"comment","name":"OrderStatus null - NO prepare done","info":"","comments":"","x":144,"y":873,"z":"f00ee083.799bc","wires":[]},{"id":"4afdefcb.ed7e5","type":"set","name":"set: order-status = RequestFailed","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"RequestFailed\" />","comments":"","x":1529.7498779296875,"y":548,"z":"f00ee083.799bc","wires":[]},{"id":"7e50854b.88cc3c","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=\"VsbgServiceActivateRequest\" />\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":906.7498779296875,"y":280,"z":"f00ee083.799bc","wires":[[]]},{"id":"4d7aca93.0251cc","type":"set","name":"set: order-status = PendingActivate","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"PendingActivate\" />","comments":"","x":1499.7498779296875,"y":851,"z":"f00ee083.799bc","wires":[]},{"id":"96545374.14f618","type":"comment","name":"Only Need Service_instance_id from input","info":"","comments":"","x":1184.5,"y":367,"z":"f00ee083.799bc","wires":[]},{"id":"24aaef83.aeb2d8","type":"configure","name":"configure: ConfigComponentAdaptor","xml":"<configure adaptor=\"org.onap.appc.ccadaptor.ConfigComponentAdaptor\" key=\"dummy\">\n\t<parameter name=\"action\" value=\"activate\"/>\n\t\n\n\t","comments":"","outputs":1,"x":671.75,"y":626,"z":"f00ee083.799bc","wires":[["c5dfc2e0.a31f88","391458f8.3734d8"]]},{"id":"db59e9a7.81ab18","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-configuration-operation:Activate:Before Calling ConfigAdaptor\"/>\n<parameter name=\"field3\" value=\"`$service-data.oper-status.order-status`\"/>\n<parameter name=\"field4\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field5\" value=\"`$service-data.vnf-config-information.vnf-type`\"/>\n\n<parameter name=\"field7\" value=\"`$service-data.vnf-config-information.vnf-host-ip-address`\"/>\n\n\n","comments":"","outputs":1,"x":734.5,"y":568,"z":"f00ee083.799bc","wires":[[]]},{"id":"7c81a934.5f99d","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-configuration-operation:Activate:After Calling ConfigAdaptor:Failure\"/>\n<parameter name=\"field3\" value=\"`$service-data.oper-status.order-status`\"/>\n<parameter name=\"field4\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field5\" value=\"`$service-data.vnf-config-information.vnf-type`\"/>\n\n<parameter name=\"field7\" value=\"`$service-data.vnf-config-information.vnf-host-ip-address`\"/>\n\n\n","comments":"","outputs":1,"x":1439.5,"y":507,"z":"f00ee083.799bc","wires":[[]]},{"id":"f3bf236d.1c5ee8","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-configuration-operation:Activate:After Calling ConfigAdaptor:Success\"/>\n<parameter name=\"field3\" value=\"`$service-data.oper-status.order-status`\"/>\n<parameter name=\"field4\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field5\" value=\"`$service-data.vnf-config-information.vnf-type`\"/>\n<parameter name=\"field7\" value=\"`$service-data.vnf-config-information.vnf-host-ip-address`\"/>\n\n\n","comments":"","outputs":1,"x":1416.5,"y":791,"z":"f00ee083.799bc","wires":[[]]},{"id":"9d92c880.b8ace8","type":"outcome","name":"RequestFailed","xml":"<outcome value='RequestFailed'>","comments":"","outputs":1,"x":361.75,"y":275,"z":"f00ee083.799bc","wires":[["5b9c2108.22ff08"]]},{"id":"77ba363f.3bc7d8","type":"outcome","name":"InProgressTimeout","xml":"<outcome value='InProgressTimeout'>","comments":"","outputs":1,"x":382.75,"y":471,"z":"f00ee083.799bc","wires":[[]]},{"id":"97f847f7.7c233","type":"set","name":"set: last-sub-action-status = RequestFailed","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"RequestFailed\" />","comments":"","x":1556.75,"y":592,"z":"f00ee083.799bc","wires":[]},{"id":"bfd9b6ea.7f73c8","type":"comment","name":"LastSubAction status set on Notification","info":"","comments":"","x":1890.75,"y":590,"z":"f00ee083.799bc","wires":[]},{"id":"2e268fc9.50fa08","type":"comment","name":"Set Order Status on Notification","info":"","comments":"","x":1706.75,"y":761,"z":"f00ee083.799bc","wires":[]},{"id":"e378e2b2.661aa8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1463.75,"y":645,"z":"f00ee083.799bc","wires":[]},{"id":"99c2a412.526c98","type":"outcome","name":"PendingActivate","xml":"<outcome value='PendingActivate'>","comments":"","outputs":1,"x":351.75,"y":391,"z":"f00ee083.799bc","wires":[["5b9c2108.22ff08"]]}]
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 b7567ce61..cc531d753 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.openecomp.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.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":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-prepare.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-prepare.json
index 5508d5e15..d413a720b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-prepare.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-prepare.json
@@ -1 +1 @@
-[{"id":"6ce8b23c.6622bc","type":"comment","name":"IF NCS success, all can fail and we still return success","info":"","x":2710.476806640625,"y":1298.6689453125,"z":"9633ac01.1c873","wires":[]},{"id":"176fa587.64801a","type":"comment","name":"IF NCS success, all can fail and we still return success","info":"","x":3402.651191711426,"y":715.9393172264099,"z":"9633ac01.1c873","wires":[]},{"id":"cdb39a50.0e04e8","type":"comment","name":"Used for Cancel, disconnect","info":"","x":3131.91357421875,"y":1137.333251953125,"z":"9633ac01.1c873","wires":[]},{"id":"22d49eda.3a5e82","type":"comment","name":"Service-Configuration-Prepare","info":"","comments":"","x":576.75,"y":25,"z":"9633ac01.1c873","wires":[]},{"id":"7f2c4f0f.b4df9","type":"dgstart","name":"DGSTART","outputs":1,"x":102,"y":99.1111068725586,"z":"9633ac01.1c873","wires":[["3f18b239.d3494e"]]},{"id":"3f18b239.d3494e","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":259.66668701171875,"y":97.77776336669922,"z":"9633ac01.1c873","wires":[["fd14a489.4c1158"]]},{"id":"fd14a489.4c1158","type":"method","name":"method service-configuration-prepare","xml":"<method rpc='service-configuration-prepare' mode='sync'>\n","comments":"","outputs":1,"x":507,"y":104.44442749023438,"z":"9633ac01.1c873","wires":[["4b7f48e1.29b478"]]},{"id":"4b7f48e1.29b478","type":"switchNode","name":"switch: order-status","xml":"<switch test=\"`$service-data.oper-status.order-status`\">\n<!--\nleaf order-status {\n\ttype enumeration {\n\t\tenum \"Reserved\";\n\t\tenum \"Activated\";\n\t\tenum \"PendingDelete\";\n\t\tenum \"RequestFailed\";\n\t\tenum \"InProgressTimeout\";\n\t\tenum \"InProgress\";\n\t}\n}\n-->","comments":"","outputs":1,"x":135.25,"y":187.31015014648438,"z":"9633ac01.1c873","wires":[["a2d91a.3cdbf6e8","21c383a7.69136c","1d1d1f1f.1fcae1","9a4d7636.b60368","ea79ba30.614648"]]},{"id":"1d1d1f1f.1fcae1","type":"outcome","name":"RequestFailed","xml":"<outcome value='RequestFailed'>","comments":"","outputs":1,"x":398.7848205566406,"y":272.3448486328125,"z":"9633ac01.1c873","wires":[["37764947.e60ce6"]]},{"id":"a2d91a.3cdbf6e8","type":"outcome","name":"Reserved","xml":"<outcome value='Reserved'>","comments":"","outputs":1,"x":390.9147033691406,"y":221.154296875,"z":"9633ac01.1c873","wires":[["37764947.e60ce6"]]},{"id":"37764947.e60ce6","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":612.931884765625,"y":207.66079711914062,"z":"9633ac01.1c873","wires":[["2b276628.d6c4ba","a87cb168.0c421","a899e50f.59e928","9f955bc.fe03ba8","4eb7d82e.78eb68","abd61b38.bbefe8","806b14e0.e3f2d8"]]},{"id":"4eb7d82e.78eb68","type":"configure","name":"configure: ConfigComponentAdaptor","xml":"<configure adaptor=\"org.openecomp.appc.ccadaptor.ConfigComponentAdaptor\" key=\"dummy\">\n\t<parameter name=\"action\" value=\"prepare\"/>\n\t\n\n\t","comments":"","outputs":1,"x":933.3130493164062,"y":653.2779541015625,"z":"9633ac01.1c873","wires":[["c19ff3d7.54cf2","f045d778.2bf8e8"]]},{"id":"2b276628.d6c4ba","type":"set","name":"set: maintinance-indicator = N","xml":"<set>\n\t<parameter name='service-data.oper-status.maintenance-indicator' value='N' />","comments":"","x":902.6939086914062,"y":545.8492431640625,"z":"9633ac01.1c873","wires":[]},{"id":"c19ff3d7.54cf2","type":"failure","name":"failure","xml":"<outcome value='failure'>","outputs":1,"x":1173.6070556640625,"y":569.1112060546875,"z":"9633ac01.1c873","wires":[["733e8f0a.db9e5"]]},{"id":"b28d79c6.26f198","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<!-- error code & message provided by ncs-adaptor -->\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1571.940185546875,"y":500.77783203125,"z":"9633ac01.1c873","wires":[]},{"id":"733e8f0a.db9e5","type":"block","name":"block : atomic","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1346.60693359375,"y":556.1112060546875,"z":"9633ac01.1c873","wires":[["b28d79c6.26f198","7b6460f9.47c97"]]},{"id":"9a4d7636.b60368","type":"other","name":"Other","xml":"<outcome value='Other'>\n\n<!-- Audited, PendingActivate, Activated, other -->\n<!-- Audit is allowed only after Activate -->","comments":"","outputs":1,"x":369.2738952636719,"y":703.9207153320312,"z":"9633ac01.1c873","wires":[["7a642d2c.3f9d14"]]},{"id":"a899e50f.59e928","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":921.9404296875,"y":392.44451904296875,"z":"9633ac01.1c873","wires":[]},{"id":"a87cb168.0c421","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":914.7498779296875,"y":494,"z":"9633ac01.1c873","wires":[[]]},{"id":"7a642d2c.3f9d14","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid Order Status State'/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":596.0833129882812,"y":704.3333129882812,"z":"9633ac01.1c873","wires":[]},{"id":"21c383a7.69136c","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","outputs":1,"x":409.75,"y":173,"z":"9633ac01.1c873","wires":[["37764947.e60ce6"]]},{"id":"f045d778.2bf8e8","type":"failure","name":"success","xml":"<outcome value='success'>","comments":"","outputs":1,"x":1173.7498779296875,"y":698,"z":"9633ac01.1c873","wires":[["657c1712.60d3f8"]]},{"id":"657c1712.60d3f8","type":"block","name":"block : atomic","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1366.4166259765625,"y":628.3333740234375,"z":"9633ac01.1c873","wires":[["35a34d7c.e7dea2","ab3dbd3e.dadbd","1f374bb.3fed3b4","52652755.f025f8"]]},{"id":"35a34d7c.e7dea2","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1599.7498779296875,"y":794,"z":"9633ac01.1c873","wires":[]},{"id":"806b14e0.e3f2d8","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=\"VsbgServiceActivateRequest\" />\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<!-- Setting this to null seems to be failing\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\" />\n\t-->\n","comments":"","outputs":1,"x":996.7498779296875,"y":156,"z":"9633ac01.1c873","wires":[[]]},{"id":"ab3dbd3e.dadbd","type":"set","name":"set: order-status = Reserved","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Reserved\" />","comments":"","x":1629.75,"y":659,"z":"9633ac01.1c873","wires":[]},{"id":"9f955bc.fe03ba8","type":"set","name":"set Copy from input to Service-data","xml":"<set>\n<parameter name=\"service-data.\" value=\"service-configuration-operation-input.\"/>\n\n","comments":"","x":895.75,"y":271,"z":"9633ac01.1c873","wires":[]},{"id":"1f374bb.3fed3b4","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-configuration-operation:Prepare:After Calling ConfigAdaptor:Success\"/>\n<parameter name=\"field3\" value=\"`$service-data.oper-status.order-status`\"/>\n<parameter name=\"field4\" value=\"`$service-data.service-information.service-instance-id`\"/>\n\n\n","comments":"","outputs":1,"x":1569.75,"y":602,"z":"9633ac01.1c873","wires":[[]]},{"id":"7b6460f9.47c97","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-configuration-operation:Prepare:After Calling ConfigAdaptor:Failure\"/>\n<parameter name=\"field3\" value=\"`$service-data.oper-status.order-status`\"/>\n<parameter name=\"field4\" value=\"`$service-data.service-information.service-instance-id`\"/>\n\n\n","comments":"","outputs":1,"x":1552.75,"y":380,"z":"9633ac01.1c873","wires":[[]]},{"id":"128e76b6.814b29","type":"comment","name":"Failed prepares are not saved in Config Tree","info":"","comments":"","x":1860.75,"y":496,"z":"9633ac01.1c873","wires":[]},{"id":"52652755.f025f8","type":"set","name":"set: last-sub-action-status = Success","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"Success\" />","comments":"","x":1668.5,"y":719,"z":"9633ac01.1c873","wires":[]},{"id":"ea79ba30.614648","type":"outcome","name":"Activated","xml":"<outcome value='Activated'>","comments":"","outputs":1,"x":387.5,"y":330,"z":"9633ac01.1c873","wires":[["37764947.e60ce6"]]},{"id":"abd61b38.bbefe8","type":"switchNode","name":"switch: update-configuration","xml":"<switch test=\"`$service-configuration-operation-input.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration_length`\">\n","comments":"","outputs":1,"x":848.5,"y":69,"z":"9633ac01.1c873","wires":[["a9cb27b6.b38238","99f8115d.6be47"]]},{"id":"a9cb27b6.b38238","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1085.5,"y":71,"z":"9633ac01.1c873","wires":[["131554ac.7778fb"]]},{"id":"f0f0e9e5.ffc3b8","type":"comment","name":"New Start Prepare","info":"","comments":"","x":1077.5,"y":30,"z":"9633ac01.1c873","wires":[]},{"id":"131554ac.7778fb","type":"block","name":"block : atomic","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1275.5,"y":70,"z":"9633ac01.1c873","wires":[["f8d7c48f.cf07a8"]]},{"id":"f8d7c48f.cf07a8","type":"set","name":"Clear Service Data VNF Parameters List","xml":"<set>\n     <parameter name=\"service-data.vnf-config-parameters-list.\" value=\"\" />\n\n","comments":"","x":1537.5,"y":72,"z":"9633ac01.1c873","wires":[]},{"id":"99f8115d.6be47","type":"other","name":"outcome: Length=0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1054.5,"y":116,"z":"9633ac01.1c873","wires":[["131554ac.7778fb"]]}]
+[{"id":"6ce8b23c.6622bc","type":"comment","name":"IF NCS success, all can fail and we still return success","info":"","x":2710.476806640625,"y":1298.6689453125,"z":"9633ac01.1c873","wires":[]},{"id":"176fa587.64801a","type":"comment","name":"IF NCS success, all can fail and we still return success","info":"","x":3402.651191711426,"y":715.9393172264099,"z":"9633ac01.1c873","wires":[]},{"id":"cdb39a50.0e04e8","type":"comment","name":"Used for Cancel, disconnect","info":"","x":3131.91357421875,"y":1137.333251953125,"z":"9633ac01.1c873","wires":[]},{"id":"22d49eda.3a5e82","type":"comment","name":"Service-Configuration-Prepare","info":"","comments":"","x":576.75,"y":25,"z":"9633ac01.1c873","wires":[]},{"id":"7f2c4f0f.b4df9","type":"dgstart","name":"DGSTART","outputs":1,"x":102,"y":99.1111068725586,"z":"9633ac01.1c873","wires":[["3f18b239.d3494e"]]},{"id":"3f18b239.d3494e","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":259.66668701171875,"y":97.77776336669922,"z":"9633ac01.1c873","wires":[["fd14a489.4c1158"]]},{"id":"fd14a489.4c1158","type":"method","name":"method service-configuration-prepare","xml":"<method rpc='service-configuration-prepare' mode='sync'>\n","comments":"","outputs":1,"x":507,"y":104.44442749023438,"z":"9633ac01.1c873","wires":[["4b7f48e1.29b478"]]},{"id":"4b7f48e1.29b478","type":"switchNode","name":"switch: order-status","xml":"<switch test=\"`$service-data.oper-status.order-status`\">\n<!--\nleaf order-status {\n\ttype enumeration {\n\t\tenum \"Reserved\";\n\t\tenum \"Activated\";\n\t\tenum \"PendingDelete\";\n\t\tenum \"RequestFailed\";\n\t\tenum \"InProgressTimeout\";\n\t\tenum \"InProgress\";\n\t}\n}\n-->","comments":"","outputs":1,"x":135.25,"y":187.31015014648438,"z":"9633ac01.1c873","wires":[["a2d91a.3cdbf6e8","21c383a7.69136c","1d1d1f1f.1fcae1","9a4d7636.b60368","ea79ba30.614648"]]},{"id":"1d1d1f1f.1fcae1","type":"outcome","name":"RequestFailed","xml":"<outcome value='RequestFailed'>","comments":"","outputs":1,"x":398.7848205566406,"y":272.3448486328125,"z":"9633ac01.1c873","wires":[["37764947.e60ce6"]]},{"id":"a2d91a.3cdbf6e8","type":"outcome","name":"Reserved","xml":"<outcome value='Reserved'>","comments":"","outputs":1,"x":390.9147033691406,"y":221.154296875,"z":"9633ac01.1c873","wires":[["37764947.e60ce6"]]},{"id":"37764947.e60ce6","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":612.931884765625,"y":207.66079711914062,"z":"9633ac01.1c873","wires":[["2b276628.d6c4ba","a87cb168.0c421","a899e50f.59e928","9f955bc.fe03ba8","4eb7d82e.78eb68","abd61b38.bbefe8","806b14e0.e3f2d8"]]},{"id":"4eb7d82e.78eb68","type":"configure","name":"configure: ConfigComponentAdaptor","xml":"<configure adaptor=\"org.onap.appc.ccadaptor.ConfigComponentAdaptor\" key=\"dummy\">\n\t<parameter name=\"action\" value=\"prepare\"/>\n\t\n\n\t","comments":"","outputs":1,"x":933.3130493164062,"y":653.2779541015625,"z":"9633ac01.1c873","wires":[["c19ff3d7.54cf2","f045d778.2bf8e8"]]},{"id":"2b276628.d6c4ba","type":"set","name":"set: maintinance-indicator = N","xml":"<set>\n\t<parameter name='service-data.oper-status.maintenance-indicator' value='N' />","comments":"","x":902.6939086914062,"y":545.8492431640625,"z":"9633ac01.1c873","wires":[]},{"id":"c19ff3d7.54cf2","type":"failure","name":"failure","xml":"<outcome value='failure'>","outputs":1,"x":1173.6070556640625,"y":569.1112060546875,"z":"9633ac01.1c873","wires":[["733e8f0a.db9e5"]]},{"id":"b28d79c6.26f198","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<!-- error code & message provided by ncs-adaptor -->\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1571.940185546875,"y":500.77783203125,"z":"9633ac01.1c873","wires":[]},{"id":"733e8f0a.db9e5","type":"block","name":"block : atomic","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1346.60693359375,"y":556.1112060546875,"z":"9633ac01.1c873","wires":[["b28d79c6.26f198","7b6460f9.47c97"]]},{"id":"9a4d7636.b60368","type":"other","name":"Other","xml":"<outcome value='Other'>\n\n<!-- Audited, PendingActivate, Activated, other -->\n<!-- Audit is allowed only after Activate -->","comments":"","outputs":1,"x":369.2738952636719,"y":703.9207153320312,"z":"9633ac01.1c873","wires":[["7a642d2c.3f9d14"]]},{"id":"a899e50f.59e928","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":921.9404296875,"y":392.44451904296875,"z":"9633ac01.1c873","wires":[]},{"id":"a87cb168.0c421","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":914.7498779296875,"y":494,"z":"9633ac01.1c873","wires":[[]]},{"id":"7a642d2c.3f9d14","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid Order Status State'/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":596.0833129882812,"y":704.3333129882812,"z":"9633ac01.1c873","wires":[]},{"id":"21c383a7.69136c","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","outputs":1,"x":409.75,"y":173,"z":"9633ac01.1c873","wires":[["37764947.e60ce6"]]},{"id":"f045d778.2bf8e8","type":"failure","name":"success","xml":"<outcome value='success'>","comments":"","outputs":1,"x":1173.7498779296875,"y":698,"z":"9633ac01.1c873","wires":[["657c1712.60d3f8"]]},{"id":"657c1712.60d3f8","type":"block","name":"block : atomic","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1366.4166259765625,"y":628.3333740234375,"z":"9633ac01.1c873","wires":[["35a34d7c.e7dea2","ab3dbd3e.dadbd","1f374bb.3fed3b4","52652755.f025f8"]]},{"id":"35a34d7c.e7dea2","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1599.7498779296875,"y":794,"z":"9633ac01.1c873","wires":[]},{"id":"806b14e0.e3f2d8","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=\"VsbgServiceActivateRequest\" />\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<!-- Setting this to null seems to be failing\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\" />\n\t-->\n","comments":"","outputs":1,"x":996.7498779296875,"y":156,"z":"9633ac01.1c873","wires":[[]]},{"id":"ab3dbd3e.dadbd","type":"set","name":"set: order-status = Reserved","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Reserved\" />","comments":"","x":1629.75,"y":659,"z":"9633ac01.1c873","wires":[]},{"id":"9f955bc.fe03ba8","type":"set","name":"set Copy from input to Service-data","xml":"<set>\n<parameter name=\"service-data.\" value=\"service-configuration-operation-input.\"/>\n\n","comments":"","x":895.75,"y":271,"z":"9633ac01.1c873","wires":[]},{"id":"1f374bb.3fed3b4","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-configuration-operation:Prepare:After Calling ConfigAdaptor:Success\"/>\n<parameter name=\"field3\" value=\"`$service-data.oper-status.order-status`\"/>\n<parameter name=\"field4\" value=\"`$service-data.service-information.service-instance-id`\"/>\n\n\n","comments":"","outputs":1,"x":1569.75,"y":602,"z":"9633ac01.1c873","wires":[[]]},{"id":"7b6460f9.47c97","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-configuration-operation:Prepare:After Calling ConfigAdaptor:Failure\"/>\n<parameter name=\"field3\" value=\"`$service-data.oper-status.order-status`\"/>\n<parameter name=\"field4\" value=\"`$service-data.service-information.service-instance-id`\"/>\n\n\n","comments":"","outputs":1,"x":1552.75,"y":380,"z":"9633ac01.1c873","wires":[[]]},{"id":"128e76b6.814b29","type":"comment","name":"Failed prepares are not saved in Config Tree","info":"","comments":"","x":1860.75,"y":496,"z":"9633ac01.1c873","wires":[]},{"id":"52652755.f025f8","type":"set","name":"set: last-sub-action-status = Success","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"Success\" />","comments":"","x":1668.5,"y":719,"z":"9633ac01.1c873","wires":[]},{"id":"ea79ba30.614648","type":"outcome","name":"Activated","xml":"<outcome value='Activated'>","comments":"","outputs":1,"x":387.5,"y":330,"z":"9633ac01.1c873","wires":[["37764947.e60ce6"]]},{"id":"abd61b38.bbefe8","type":"switchNode","name":"switch: update-configuration","xml":"<switch test=\"`$service-configuration-operation-input.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration_length`\">\n","comments":"","outputs":1,"x":848.5,"y":69,"z":"9633ac01.1c873","wires":[["a9cb27b6.b38238","99f8115d.6be47"]]},{"id":"a9cb27b6.b38238","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1085.5,"y":71,"z":"9633ac01.1c873","wires":[["131554ac.7778fb"]]},{"id":"f0f0e9e5.ffc3b8","type":"comment","name":"New Start Prepare","info":"","comments":"","x":1077.5,"y":30,"z":"9633ac01.1c873","wires":[]},{"id":"131554ac.7778fb","type":"block","name":"block : atomic","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1275.5,"y":70,"z":"9633ac01.1c873","wires":[["f8d7c48f.cf07a8"]]},{"id":"f8d7c48f.cf07a8","type":"set","name":"Clear Service Data VNF Parameters List","xml":"<set>\n     <parameter name=\"service-data.vnf-config-parameters-list.\" value=\"\" />\n\n","comments":"","x":1537.5,"y":72,"z":"9633ac01.1c873","wires":[]},{"id":"99f8115d.6be47","type":"other","name":"outcome: Length=0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1054.5,"y":116,"z":"9633ac01.1c873","wires":[["131554ac.7778fb"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC-API_2.0.0.0_method_VNF_Rollback.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC-API_2.0.0.0_method_VNF_Rollback.json
index babc497c1..f0c0bd3db 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC-API_2.0.0.0_method_VNF_Rollback.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC-API_2.0.0.0_method_VNF_Rollback.json
@@ -19,7 +19,7 @@
     "id": "145d561d.5cc62a",
     "type": "execute",
     "name": "execute_getVNF_Hierarchy",
-    "xml": "<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />",
     "comments": "",
     "outputs": 1,
     "x": 318,
@@ -153,7 +153,7 @@
     "id": "f205d4a8.a6d008",
     "type": "execute",
     "name": "execute: flatAndAddToContext",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
     "comments": "",
     "outputs": 1,
     "x": 273.6666564941406,
@@ -198,7 +198,7 @@
     "id": "b50265a4.9ec658",
     "type": "execute",
     "name": "execute_SendUEBEvent",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"Exception in getting VNF Hierachy\"/>\n<parameter name='output.status.message' value=\"Exception in getting VNF Hierachy\"/>\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"Exception in getting VNF Hierachy\"/>\n<parameter name='output.status.message' value=\"Exception in getting VNF Hierachy\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 1315,
@@ -305,7 +305,7 @@
     "id": "c6500acc.d09d98",
     "type": "execute",
     "name": "execute_SendUEBEvent",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"VM Count is 0\"/>\n<parameter name='output.status.message' value=\"VM Count is 0\"/>\n\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"VM Count is 0\"/>\n<parameter name='output.status.message' value=\"VM Count is 0\"/>\n\n",
     "comments": "",
     "outputs": 1,
     "x": 1260,
@@ -319,7 +319,7 @@
     "id": "e690e466.a45438",
     "type": "execute",
     "name": "execute_RollbackStack",
-    "xml": "<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='restoreStack' >\n <parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.openecomp.appc.instance.url\" value=\"`$VNF.VM[0].URL`\" />\n <parameter name=\"org.openecomp.appc.identity.url\" value=\"`$input.identity-url`\" />\n <parameter name=\"org.openecomp.appc.stack.id\" value =\"`$VNF.heat-stack-id`\" />\n <parameter name=\"org.openecomp.appc.snapshot.id\" value=\"`$input.snapshot-id`\" />",
+    "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='restoreStack' >\n <parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.onap.appc.instance.url\" value=\"`$VNF.VM[0].URL`\" />\n <parameter name=\"org.onap.appc.identity.url\" value=\"`$input.identity-url`\" />\n <parameter name=\"org.onap.appc.stack.id\" value =\"`$VNF.heat-stack-id`\" />\n <parameter name=\"org.onap.appc.snapshot.id\" value=\"`$input.snapshot-id`\" />",
     "comments": "",
     "outputs": 1,
     "x": 1235,
@@ -415,7 +415,7 @@
     "id": "da2d458c.b135f8",
     "type": "execute",
     "name": "execute_SendUEBEvent",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Error occured during rollback Stack '+$VNF.heat-stack-id + ' to snapshot ' + $snapshot-id`\"/>\n<parameter name='output.status.message' value=\"`'Error occured during rollback Stack '+$VNF.heat-stack-id + ' to snapshot ' + $snapshot-id`\"/>\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Error occured during rollback Stack '+$VNF.heat-stack-id + ' to snapshot ' + $snapshot-id`\"/>\n<parameter name='output.status.message' value=\"`'Error occured during rollback Stack '+$VNF.heat-stack-id + ' to snapshot ' + $snapshot-id`\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 1888,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC-API_2.0.0.0_method_VNF_Snapshot.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC-API_2.0.0.0_method_VNF_Snapshot.json
index c4d729f68..e60606d01 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC-API_2.0.0.0_method_VNF_Snapshot.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC-API_2.0.0.0_method_VNF_Snapshot.json
@@ -62,7 +62,7 @@
     "id": "af0a8fe0.da1b7",
     "type": "execute",
     "name": "execute_getVNF_Hierarchy",
-    "xml": "<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />",
     "comments": "",
     "outputs": 1,
     "x": 233.25001525878906,
@@ -268,7 +268,7 @@
     "id": "e2eaef09.070be",
     "type": "execute",
     "name": "execute_SendUEBEvent",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"Exception in getting VNF Hierachy\"/>\n<parameter name='output.status.message' value=\"Exception in getting VNF Hierachy\"/>\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"Exception in getting VNF Hierachy\"/>\n<parameter name='output.status.message' value=\"Exception in getting VNF Hierachy\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 1229.250015258789,
@@ -301,7 +301,7 @@
     "id": "bf7f84ce.5a7938",
     "type": "execute",
     "name": "execute_SendUEBEvent",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"VM Count is 0\"/>\n<parameter name='output.status.message' value=\"VM Count is 0\"/>\n\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"VM Count is 0\"/>\n<parameter name='output.status.message' value=\"VM Count is 0\"/>\n\n",
     "comments": "",
     "outputs": 1,
     "x": 1233.250015258789,
@@ -315,7 +315,7 @@
     "id": "3b9af4e2.33c62c",
     "type": "execute",
     "name": "execute_SnapshotStack",
-    "xml": "<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='snapshotStack' >\n <parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.openecomp.appc.instance.url\" value=\"`$VNF.VM[0].URL`\" />\n <parameter name=\"org.openecomp.appc.identity.url\" value=\"`$input.identity-url`\" />\n <parameter name=\"org.openecomp.appc.stack.id\" value=\"`$VNF.heat-stack-id`\"/>",
+    "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='snapshotStack' >\n <parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.onap.appc.instance.url\" value=\"`$VNF.VM[0].URL`\" />\n <parameter name=\"org.onap.appc.identity.url\" value=\"`$input.identity-url`\" />\n <parameter name=\"org.onap.appc.stack.id\" value=\"`$VNF.heat-stack-id`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 1150.250015258789,
@@ -384,7 +384,7 @@
     "id": "8a2adc3b.adcda",
     "type": "execute",
     "name": "execute_SendUEBEvent",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Error occured during snapshot of Stack '+$VNF.heat-stack-id`\"/>\n<parameter name='output.status.message' value=\"`'Error occured during snapshot of Stack '+$VNF.heat-stack-id`\"/>\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Error occured during snapshot of Stack '+$VNF.heat-stack-id`\"/>\n<parameter name='output.status.message' value=\"`'Error occured during snapshot of Stack '+$VNF.heat-stack-id`\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 1817.250015258789,
@@ -457,7 +457,7 @@
     "id": "5e66c189.09a2d",
     "type": "execute",
     "name": "execute: flatAndAddToContext",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
     "comments": "",
     "outputs": 1,
     "x": 188.9166717529297,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC-API_2.0.0_SSH_VNF_CONFIGURE.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC-API_2.0.0_SSH_VNF_CONFIGURE.json
index ca95d5f84..4716e8ab3 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC-API_2.0.0_SSH_VNF_CONFIGURE.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC-API_2.0.0_SSH_VNF_CONFIGURE.json
@@ -105,7 +105,7 @@
         "id": "63ff76d8.f656f8",
         "type": "execute",
         "name": "execute ssh command",
-        "xml": "<execute plugin='org.openecomp.appc.dg.ssh.SshService' method='execWithStatusCheck' >\n<parameter name='host' value='`$host`' />\n<parameter name='port' value='`$port`' />\n<parameter name='username' value='`$username`' />\n<parameter name='password' value='`$password`' />\n<parameter name='command' value='`$command`' />\n\n",
+        "xml": "<execute plugin='org.onap.appc.dg.ssh.SshService' method='execWithStatusCheck' >\n<parameter name='host' value='`$host`' />\n<parameter name='port' value='`$port`' />\n<parameter name='username' value='`$username`' />\n<parameter name='password' value='`$password`' />\n<parameter name='command' value='`$command`' />\n\n",
         "comments": "",
         "outputs": 1,
         "x": 189.17861938476562,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_2.0.0.0_NETCONF_CONFIGURE.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_2.0.0.0_NETCONF_CONFIGURE.json
index 2d128395c..609c73152 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_2.0.0.0_NETCONF_CONFIGURE.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_2.0.0.0_NETCONF_CONFIGURE.json
@@ -35,7 +35,7 @@
         "id": "1c0a1696.e3f5e9",
         "type": "execute",
         "name": "execute-netconf-config",
-        "xml": "<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='configure' >\n\t<parameter name=\"org.openecomp.appc.payload\" value=\"`$org.openecomp.appc.payload`\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='configure' >\n\t<parameter name=\"org.onap.appc.payload\" value=\"`$org.onap.appc.payload`\" />",
         "comments": "",
         "outputs": 1,
         "x": 511,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_2.0.0_HUB_CONFIGURE.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_2.0.0_HUB_CONFIGURE.json
index c9b841219..22923f871 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_2.0.0_HUB_CONFIGURE.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_2.0.0_HUB_CONFIGURE.json
@@ -17,7 +17,7 @@
         "id": "81ccbde2.50341",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.InputParameterValidation' method='validateAttribute' >\n<parameter name=\"VM_ID\" value=\"`$VM_ID`\"/>\n",
+        "xml": "<execute plugin='org.onap.appc.dg.util.InputParameterValidation' method='validateAttribute' >\n<parameter name=\"VM_ID\" value=\"`$VM_ID`\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 156,
@@ -106,7 +106,7 @@
         "id": "a8db1260.3b4d2",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.InputParameterValidation' method='validateAttributeCharacter' >\n<parameter name=\"VM_ID\" value=\"`$VM_ID`\"/>\n<parameter name=\"special_characters\" value=\"!@#$%^*()_\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.util.InputParameterValidation' method='validateAttributeCharacter' >\n<parameter name=\"VM_ID\" value=\"`$VM_ID`\"/>\n<parameter name=\"special_characters\" value=\"!@#$%^*()_\" />",
         "comments": "",
         "outputs": 1,
         "x": 414,
@@ -216,7 +216,7 @@
         "id": "da96bd6f.7bfa5",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.InputParameterValidation' method='validateAttributeLength' >\n<parameter name=\"VM_ID\" value=\"`$VM_ID`\"/>\n<parameter name=\"maximum_length_param\" value=\"50\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.util.InputParameterValidation' method='validateAttributeLength' >\n<parameter name=\"VM_ID\" value=\"`$VM_ID`\"/>\n<parameter name=\"maximum_length_param\" value=\"50\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 720,
@@ -368,7 +368,7 @@
         "id": "267702aa.29ecfe",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventTime\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"apiVer\" value=\"1.02\"/>\n<parameter name=\"eventId\" value=\"123\"/>\n<parameter name=\"reason\" value=\"Other\"/>\n",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventTime\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"apiVer\" value=\"1.02\"/>\n<parameter name=\"eventId\" value=\"123\"/>\n<parameter name=\"reason\" value=\"Other\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 1141,
@@ -384,7 +384,7 @@
         "id": "51a2c6.d2810d3c",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventTime\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"apiVer\" value=\"1.02\"/>\n<parameter name=\"eventId\" value=\"123\"/>\n<parameter name=\"reason\" value=\"Other\"/>",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventTime\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"apiVer\" value=\"1.02\"/>\n<parameter name=\"eventId\" value=\"123\"/>\n<parameter name=\"reason\" value=\"Other\"/>",
         "comments": "",
         "outputs": 1,
         "x": 267,
@@ -400,7 +400,7 @@
         "id": "828ae706.049e18",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventTime\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"apiVer\" value=\"1.02\"/>\n<parameter name=\"eventId\" value=\"123\"/>\n<parameter name=\"reason\" value=\"Other\"/>",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventTime\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"apiVer\" value=\"1.02\"/>\n<parameter name=\"eventId\" value=\"123\"/>\n<parameter name=\"reason\" value=\"Other\"/>",
         "comments": "",
         "outputs": 1,
         "x": 821,
@@ -416,7 +416,7 @@
         "id": "1ab8afcb.3c8a4",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventTime\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"apiVer\" value=\"1.02\"/>\n<parameter name=\"eventId\" value=\"123\"/>\n<parameter name=\"reason\" value=\"Other\"/>",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventTime\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"apiVer\" value=\"1.02\"/>\n<parameter name=\"eventId\" value=\"123\"/>\n<parameter name=\"reason\" value=\"Other\"/>",
         "comments": "",
         "outputs": 1,
         "x": 1205,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_2.0.0_VSRX_GetConfig.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_2.0.0_VSRX_GetConfig.json
index e663dfa60..c7c65ac45 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_2.0.0_VSRX_GetConfig.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_2.0.0_VSRX_GetConfig.json
@@ -51,7 +51,7 @@
         "id": "d4b59933.d26998",
         "type": "execute",
         "name": "execute_getVNF_Hierarchy",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"nodeName\" value=\"execute_getVNF_Hierarchy\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"nodeName\" value=\"execute_getVNF_Hierarchy\" />",
         "comments": "",
         "outputs": 1,
         "x": 362.5,
@@ -134,7 +134,7 @@
         "id": "2c2a06fe.98ddba",
         "type": "execute",
         "name": "retrieveVMSSHConfiguration",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.NetconfDBPlugin' method='retrieveVMDSConfiguration' >\n<parameter name=\"resourceKey\" value=\"`$VNF.VM[$i].vserver.vserver-name`\" />\n<parameter name=\"nodeName\" value=\"retrieveVMSSHConfiguration\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.util.NetconfDBPlugin' method='retrieveVMDSConfiguration' >\n<parameter name=\"resourceKey\" value=\"`$VNF.VM[$i].vserver.vserver-name`\" />\n<parameter name=\"nodeName\" value=\"retrieveVMSSHConfiguration\" />",
         "comments": "",
         "outputs": 1,
         "x": 738.5,
@@ -288,7 +288,7 @@
         "id": "1342848b.10b68b",
         "type": "execute",
         "name": "execute_DCAEReporterPlugin",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$org.openecomp.appc.apiversion`\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.util.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$org.onap.appc.apiversion`\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />",
         "comments": "",
         "outputs": 1,
         "x": 1843.5,
@@ -318,7 +318,7 @@
         "id": "7b04e7f0.163648",
         "type": "execute",
         "name": "get_Configuration",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.NetconfClientPlugin' method='getConfig' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.openecomp.appc.confid`\" />\n<parameter name=\"nodeName\" value=\"get_Configuration\" />\n\n",
+        "xml": "<execute plugin='org.onap.appc.dg.util.NetconfClientPlugin' method='getConfig' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.onap.appc.confid`\" />\n<parameter name=\"nodeName\" value=\"get_Configuration\" />\n\n",
         "comments": "",
         "outputs": 1,
         "x": 777.5,
@@ -465,7 +465,7 @@
         "id": "82e0381.f53dac8",
         "type": "execute",
         "name": "registerPayload",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.DGPayloadCleanupPlugin' method='registerPayload' >\n<parameter name=\"resourceKey\" value=\"`$org.openecomp.appc.confid+'.Configuration'`\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.util.DGPayloadCleanupPlugin' method='registerPayload' >\n<parameter name=\"resourceKey\" value=\"`$org.onap.appc.confid+'.Configuration'`\" />",
         "comments": "",
         "outputs": 1,
         "x": 1599,
@@ -528,7 +528,7 @@
         "id": "72ff50ec.62143",
         "type": "switchNode",
         "name": "switch",
-        "xml": "<switch test=\"`$org.openecomp.appc.confid`\">",
+        "xml": "<switch test=\"`$org.onap.appc.confid`\">",
         "comments": "",
         "outputs": 1,
         "x": 323.5,
@@ -577,7 +577,7 @@
         "id": "3b2964a3.c85eac",
         "type": "execute",
         "name": "getConfiguration",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.ConfigurationManagerPlugin' method='getConfig' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.openecomp.appc.confid`\" />\n<parameter name=\"nodeName\" value=\"getConfiguration\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.util.ConfigurationManagerPlugin' method='getConfig' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.onap.appc.confid`\" />\n<parameter name=\"nodeName\" value=\"getConfiguration\" />",
         "comments": "",
         "outputs": 1,
         "x": 696.5,
@@ -612,7 +612,7 @@
         "id": "f10ec3da.6e759",
         "type": "execute",
         "name": "ctxCleanup",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.DGPayloadCleanupPlugin' method='cleanup' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.openecomp.appc.confid`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.util.DGPayloadCleanupPlugin' method='cleanup' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.onap.appc.confid`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 143,
@@ -704,7 +704,7 @@
         "id": "fcbe0c1c.11c7d",
         "type": "execute",
         "name": "registerPayload",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.DGPayloadCleanupPlugin' method='registerPayload' >\n<parameter name=\"resourceKey\" value=\"`$VNF.VM[$i].vserver.vserver-name+'.Configuration'`\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.util.DGPayloadCleanupPlugin' method='registerPayload' >\n<parameter name=\"resourceKey\" value=\"`$VNF.VM[$i].vserver.vserver-name+'.Configuration'`\" />",
         "comments": "",
         "outputs": 1,
         "x": 1855,
@@ -783,7 +783,7 @@
         "id": "f0554fe0.4816e",
         "type": "execute",
         "name": "ctxCleanup",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.DGPayloadCleanupPlugin' method='cleanup' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.openecomp.appc.confid`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.util.DGPayloadCleanupPlugin' method='cleanup' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.onap.appc.confid`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 2199.5,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_2.0.0_method_vSRX_GetXmlRunningConfig.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_2.0.0_method_vSRX_GetXmlRunningConfig.json
index 68cfb0653..554b3c8dd 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_2.0.0_method_vSRX_GetXmlRunningConfig.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_2.0.0_method_vSRX_GetXmlRunningConfig.json
@@ -1 +1 @@
-[{"id":"81a75d19.d19de","type":"dgstart","name":"DGSTART","outputs":1,"x":102,"y":37,"z":"214d83f7.3c518c","wires":[["910e9ec4.7af88"]]},{"id":"910e9ec4.7af88","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":110.50000762939453,"y":109.75,"z":"214d83f7.3c518c","wires":[["26feaf5a.9171d"]]},{"id":"26feaf5a.9171d","type":"method","name":"GetRunningConfig","xml":"<method rpc='vSRX_GetXmlRunningConfig' mode='sync'>\n","comments":"","outputs":1,"x":148.75003051757812,"y":191.75,"z":"214d83f7.3c518c","wires":[["b1c0732b.61d2e"]]},{"id":"42ce5f64.d4dc7","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":485.5,"y":464,"z":"214d83f7.3c518c","wires":[]},{"id":"b1c0732b.61d2e","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":315,"y":308.25,"z":"214d83f7.3c518c","wires":[["42ce5f64.d4dc7","34a60a4b.c91646","14ef8882.fe0a17"]]},{"id":"34a60a4b.c91646","type":"execute","name":"get_Configuration","xml":"<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='getRunningConfig'>\n<parameter name=\"host-ip-address\" value=\"`$host-ip-address`\" />\n<parameter name=\"user-name\" value=\"`$USER-NAME`\" />\n<parameter name=\"password\" value=\"`$PASSWORD`\" />\n<parameter name=\"port-number\" value=\"`$PORT-NUMBER`\" />","comments":"","outputs":1,"x":472.75,"y":132.75,"z":"214d83f7.3c518c","wires":[["5931040.78065fc","f1a57725.85dd58","459d3ca2.15d404"]]},{"id":"f1a57725.85dd58","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":682.5,"y":77,"z":"214d83f7.3c518c","wires":[["6bf71909.695d08"]]},{"id":"882a18a4.de2258","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":851.25,"y":239.75,"z":"214d83f7.3c518c","wires":[["6bf71909.695d08"]]},{"id":"6fb7e232.a4781c","type":"switchNode","name":"switch","xml":"<switch test='`$getRunningConfig_Result`'>\n","comments":"","outputs":1,"x":792.5,"y":398,"z":"214d83f7.3c518c","wires":[["f312cd43.e2751","882a18a4.de2258"]]},{"id":"5931040.78065fc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":677.75,"y":250.25,"z":"214d83f7.3c518c","wires":[["6fb7e232.a4781c"]]},{"id":"f312cd43.e2751","type":"success","name":"success","xml":"<outcome value='Success'>\n","comments":"","outputs":1,"x":907.5,"y":495.5,"z":"214d83f7.3c518c","wires":[[]]},{"id":"6bf71909.695d08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`$org.openecomp.appc.dg.error`\" />\n","comments":"","x":984.5,"y":89.75,"z":"214d83f7.3c518c","wires":[]},{"id":"459d3ca2.15d404","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":690.5,"y":154.75,"z":"214d83f7.3c518c","wires":[["6bf71909.695d08"]]},{"id":"14ef8882.fe0a17","type":"set","name":"set","xml":"<set>\n<parameter name='device-running-config' value=\"`$running-config`\" />\n","comments":"","outputs":1,"x":537,"y":281,"z":"214d83f7.3c518c","wires":[[]]}]
+[{"id":"81a75d19.d19de","type":"dgstart","name":"DGSTART","outputs":1,"x":102,"y":37,"z":"214d83f7.3c518c","wires":[["910e9ec4.7af88"]]},{"id":"910e9ec4.7af88","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":110.50000762939453,"y":109.75,"z":"214d83f7.3c518c","wires":[["26feaf5a.9171d"]]},{"id":"26feaf5a.9171d","type":"method","name":"GetRunningConfig","xml":"<method rpc='vSRX_GetXmlRunningConfig' mode='sync'>\n","comments":"","outputs":1,"x":148.75003051757812,"y":191.75,"z":"214d83f7.3c518c","wires":[["b1c0732b.61d2e"]]},{"id":"42ce5f64.d4dc7","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":485.5,"y":464,"z":"214d83f7.3c518c","wires":[]},{"id":"b1c0732b.61d2e","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":315,"y":308.25,"z":"214d83f7.3c518c","wires":[["42ce5f64.d4dc7","34a60a4b.c91646","14ef8882.fe0a17"]]},{"id":"34a60a4b.c91646","type":"execute","name":"get_Configuration","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='getRunningConfig'>\n<parameter name=\"host-ip-address\" value=\"`$host-ip-address`\" />\n<parameter name=\"user-name\" value=\"`$USER-NAME`\" />\n<parameter name=\"password\" value=\"`$PASSWORD`\" />\n<parameter name=\"port-number\" value=\"`$PORT-NUMBER`\" />","comments":"","outputs":1,"x":472.75,"y":132.75,"z":"214d83f7.3c518c","wires":[["5931040.78065fc","f1a57725.85dd58","459d3ca2.15d404"]]},{"id":"f1a57725.85dd58","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":682.5,"y":77,"z":"214d83f7.3c518c","wires":[["6bf71909.695d08"]]},{"id":"882a18a4.de2258","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":851.25,"y":239.75,"z":"214d83f7.3c518c","wires":[["6bf71909.695d08"]]},{"id":"6fb7e232.a4781c","type":"switchNode","name":"switch","xml":"<switch test='`$getRunningConfig_Result`'>\n","comments":"","outputs":1,"x":792.5,"y":398,"z":"214d83f7.3c518c","wires":[["f312cd43.e2751","882a18a4.de2258"]]},{"id":"5931040.78065fc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":677.75,"y":250.25,"z":"214d83f7.3c518c","wires":[["6fb7e232.a4781c"]]},{"id":"f312cd43.e2751","type":"success","name":"success","xml":"<outcome value='Success'>\n","comments":"","outputs":1,"x":907.5,"y":495.5,"z":"214d83f7.3c518c","wires":[[]]},{"id":"6bf71909.695d08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","x":984.5,"y":89.75,"z":"214d83f7.3c518c","wires":[]},{"id":"459d3ca2.15d404","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":690.5,"y":154.75,"z":"214d83f7.3c518c","wires":[["6bf71909.695d08"]]},{"id":"14ef8882.fe0a17","type":"set","name":"set","xml":"<set>\n<parameter name='device-running-config' value=\"`$running-config`\" />\n","comments":"","outputs":1,"x":537,"y":281,"z":"214d83f7.3c518c","wires":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Check-Active_VNFC_vSCP.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Check-Active_VNFC_vSCP.json
index 9f3b2aec3..980244935 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Check-Active_VNFC_vSCP.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Check-Active_VNFC_vSCP.json
@@ -1 +1 @@
-[{"id":"49deed42.81d544","type":"method","name":"Check-Active_VNFC_vSCP","xml":"<method rpc='Check-Active_VNFC_vSCP' mode='sync'>\n","comments":"","outputs":1,"x":167.80625915527344,"y":252.00000762939453,"z":"c0682e3f.3173c","wires":[["2f73c48e.7de84c"]]},{"id":"56154020.16fac","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":153.80625915527344,"y":173.0000004768375,"z":"c0682e3f.3173c","wires":[["49deed42.81d544"]]},{"id":"5b09cf65.4228c","type":"dgstart","name":"DGSTART","outputs":1,"x":128.80625915527344,"y":98.0000004768375,"z":"c0682e3f.3173c","wires":[["56154020.16fac"]]},{"id":"906908fc.43cf18","type":"execute","name":"execute","xml":"<execute plugin='com.att.appc.dg.vSCP.v3_5_5.smp.SMPDGPlugin' method='checkIfActive' >\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />\n\n","comments":"","outputs":1,"x":920.306266784668,"y":601.0000061988834,"z":"c0682e3f.3173c","wires":[["7805d251.09c37c","5622b0c9.b2e2d","fcf85234.6afd8"]]},{"id":"f08644b.81ce3b8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":1151.8061981201172,"y":835.2500233650211,"z":"c0682e3f.3173c","wires":[]},{"id":"7805d251.09c37c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1121.806282043457,"y":696.5000138282779,"z":"c0682e3f.3173c","wires":[["f08644b.81ce3b8"]]},{"id":"5622b0c9.b2e2d","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1149.8061981201172,"y":639.2500233650211,"z":"c0682e3f.3173c","wires":[["fcc5b930.9c3858"]]},{"id":"2f73c48e.7de84c","type":"switchNode","name":"switch","xml":"<switch test='`length($connection-details) == 0`'>\n\n\n","comments":"","outputs":1,"x":290.80625915527344,"y":442.0000004768375,"z":"c0682e3f.3173c","wires":[["6a23cb1e.58a7a4","d7b3fd49.e8382"]]},{"id":"6a23cb1e.58a7a4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":454.55626678466797,"y":374.5000061988834,"z":"c0682e3f.3173c","wires":[["e548aab0.213398"]]},{"id":"d7b3fd49.e8382","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":454.05625915527344,"y":522.7500004768375,"z":"c0682e3f.3173c","wires":[["906908fc.43cf18"]]},{"id":"e548aab0.213398","type":"execute","name":"execute: retrieveConnectionDetails","xml":"<execute plugin='org.openecomp.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$vnf.type`\" />\n","comments":"","outputs":1,"x":743.3062744140625,"y":355.7500061988834,"z":"c0682e3f.3173c","wires":[["ae264d49.ae7ad","99b67ee2.a89a5"]]},{"id":"ae264d49.ae7ad","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":837.0562591552734,"y":469.5000004768375,"z":"c0682e3f.3173c","wires":[["906908fc.43cf18"]]},{"id":"99b67ee2.a89a5","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1007.0562591552734,"y":275.7500004768375,"z":"c0682e3f.3173c","wires":[["c78d1a7f.685198"]]},{"id":"2730046b.7b6b6c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1610.8061981201172,"y":752.7115101814273,"z":"c0682e3f.3173c","wires":[]},{"id":"2e2a4b44.42d064","type":"set","name":"set","xml":"<set>\n<parameter name=\"event-message\" value=\"`'Failed to retrieve connection details of the vnfc : ' + $vnfcType`\"/> ","comments":"","x":1529.287353515625,"y":187.00000143051182,"z":"c0682e3f.3173c","wires":[]},{"id":"c78d1a7f.685198","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1302.5179901123047,"y":297.8461232185367,"z":"c0682e3f.3173c","wires":[["2e2a4b44.42d064","2c80a8ba.83a878"]]},{"id":"fcf85234.6afd8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1144.8061981201172,"y":569.6667103767398,"z":"c0682e3f.3173c","wires":[["fcc5b930.9c3858"]]},{"id":"7171117c.85bcd","type":"set","name":"Set event message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'Failed to retrieve the role(Active/Passive) of the vnfc : ' + $vnfcType`\"/> ","comments":"","x":1482.8061981201172,"y":501.6666798591617,"z":"c0682e3f.3173c","wires":[]},{"id":"fcc5b930.9c3858","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1348.8062591552734,"y":577.6666646003727,"z":"c0682e3f.3173c","wires":[["7171117c.85bcd","2730046b.7b6b6c"]]},{"id":"2c80a8ba.83a878","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1495.8062286376953,"y":384.6666569709781,"z":"c0682e3f.3173c","wires":[]}]
+[{"id":"49deed42.81d544","type":"method","name":"Check-Active_VNFC_vSCP","xml":"<method rpc='Check-Active_VNFC_vSCP' mode='sync'>\n","comments":"","outputs":1,"x":167.80625915527344,"y":252.00000762939453,"z":"c0682e3f.3173c","wires":[["2f73c48e.7de84c"]]},{"id":"56154020.16fac","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":153.80625915527344,"y":173.0000004768375,"z":"c0682e3f.3173c","wires":[["49deed42.81d544"]]},{"id":"5b09cf65.4228c","type":"dgstart","name":"DGSTART","outputs":1,"x":128.80625915527344,"y":98.0000004768375,"z":"c0682e3f.3173c","wires":[["56154020.16fac"]]},{"id":"906908fc.43cf18","type":"execute","name":"execute","xml":"<execute plugin='com.att.appc.dg.vSCP.v3_5_5.smp.SMPDGPlugin' method='checkIfActive' >\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n\n","comments":"","outputs":1,"x":920.306266784668,"y":601.0000061988834,"z":"c0682e3f.3173c","wires":[["7805d251.09c37c","5622b0c9.b2e2d","fcf85234.6afd8"]]},{"id":"f08644b.81ce3b8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":1151.8061981201172,"y":835.2500233650211,"z":"c0682e3f.3173c","wires":[]},{"id":"7805d251.09c37c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1121.806282043457,"y":696.5000138282779,"z":"c0682e3f.3173c","wires":[["f08644b.81ce3b8"]]},{"id":"5622b0c9.b2e2d","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1149.8061981201172,"y":639.2500233650211,"z":"c0682e3f.3173c","wires":[["fcc5b930.9c3858"]]},{"id":"2f73c48e.7de84c","type":"switchNode","name":"switch","xml":"<switch test='`length($connection-details) == 0`'>\n\n\n","comments":"","outputs":1,"x":290.80625915527344,"y":442.0000004768375,"z":"c0682e3f.3173c","wires":[["6a23cb1e.58a7a4","d7b3fd49.e8382"]]},{"id":"6a23cb1e.58a7a4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":454.55626678466797,"y":374.5000061988834,"z":"c0682e3f.3173c","wires":[["e548aab0.213398"]]},{"id":"d7b3fd49.e8382","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":454.05625915527344,"y":522.7500004768375,"z":"c0682e3f.3173c","wires":[["906908fc.43cf18"]]},{"id":"e548aab0.213398","type":"execute","name":"execute: retrieveConnectionDetails","xml":"<execute plugin='org.onap.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$vnf.type`\" />\n","comments":"","outputs":1,"x":743.3062744140625,"y":355.7500061988834,"z":"c0682e3f.3173c","wires":[["ae264d49.ae7ad","99b67ee2.a89a5"]]},{"id":"ae264d49.ae7ad","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":837.0562591552734,"y":469.5000004768375,"z":"c0682e3f.3173c","wires":[["906908fc.43cf18"]]},{"id":"99b67ee2.a89a5","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1007.0562591552734,"y":275.7500004768375,"z":"c0682e3f.3173c","wires":[["c78d1a7f.685198"]]},{"id":"2730046b.7b6b6c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1610.8061981201172,"y":752.7115101814273,"z":"c0682e3f.3173c","wires":[]},{"id":"2e2a4b44.42d064","type":"set","name":"set","xml":"<set>\n<parameter name=\"event-message\" value=\"`'Failed to retrieve connection details of the vnfc : ' + $vnfcType`\"/> ","comments":"","x":1529.287353515625,"y":187.00000143051182,"z":"c0682e3f.3173c","wires":[]},{"id":"c78d1a7f.685198","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1302.5179901123047,"y":297.8461232185367,"z":"c0682e3f.3173c","wires":[["2e2a4b44.42d064","2c80a8ba.83a878"]]},{"id":"fcf85234.6afd8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1144.8061981201172,"y":569.6667103767398,"z":"c0682e3f.3173c","wires":[["fcc5b930.9c3858"]]},{"id":"7171117c.85bcd","type":"set","name":"Set event message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'Failed to retrieve the role(Active/Passive) of the vnfc : ' + $vnfcType`\"/> ","comments":"","x":1482.8061981201172,"y":501.6666798591617,"z":"c0682e3f.3173c","wires":[]},{"id":"fcc5b930.9c3858","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1348.8062591552734,"y":577.6666646003727,"z":"c0682e3f.3173c","wires":[["7171117c.85bcd","2730046b.7b6b6c"]]},{"id":"2c80a8ba.83a878","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1495.8062286376953,"y":384.6666569709781,"z":"c0682e3f.3173c","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_HealthCheck_VNF_vSCP.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_HealthCheck_VNF_vSCP.json
index cccba02d9..a9483cb55 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_HealthCheck_VNF_vSCP.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_HealthCheck_VNF_vSCP.json
@@ -1 +1 @@
-[{"id":"63ee9929.4f7758","type":"dgstart","name":"DGSTART","outputs":1,"x":167.80625915527344,"y":110.82500457763672,"z":"dc4cc75e.06b738","wires":[["cb9d6d77.df0cb"]]},{"id":"cb9d6d77.df0cb","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":266.80625915527344,"y":159.82500457763672,"z":"dc4cc75e.06b738","wires":[["c2c949ab.cfbdb8"]]},{"id":"c2c949ab.cfbdb8","type":"method","name":"HealthCheck_VNF_vSCP","xml":"<method rpc='HealthCheck_VNF_vSCP' mode='sync'>\n","comments":"","outputs":1,"x":322.80625915527344,"y":260.8250045776367,"z":"dc4cc75e.06b738","wires":[["ec7a529c.e62e5"]]},{"id":"c00f6c66.afecd","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1247.5750579833984,"y":498.28661346435547,"z":"dc4cc75e.06b738","wires":[]},{"id":"97e98dca.283de","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='400' />\n","comments":"","x":1140.8060150146484,"y":896.8251266479492,"z":"dc4cc75e.06b738","wires":[]},{"id":"f55bbc3a.10506","type":"execute","name":"execute: retrieveConnectionDetails","xml":"<execute plugin='org.openecomp.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$vnf.type`\" />\n","comments":"","outputs":1,"x":715.8061370849609,"y":413.82506561279297,"z":"dc4cc75e.06b738","wires":[["7b5a3bce.849884","c7f4caa4.4c7e88"]]},{"id":"83ed6d82.27f7b","type":"set","name":"set","xml":"<set>\n<parameter name=\"event-message\" value=\"`'Failed to retrieve connection details for vnfc : ' + $vnfcType`\"/> ","comments":"","x":1350.806137084961,"y":213.82512664794922,"z":"dc4cc75e.06b738","wires":[]},{"id":"7b5a3bce.849884","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":717.8061370849609,"y":545.825065612793,"z":"dc4cc75e.06b738","wires":[["3f7d06de.4adc9a"]]},{"id":"48769737.4cb898","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":848.8060150146484,"y":895.8251266479492,"z":"dc4cc75e.06b738","wires":[["97e98dca.283de"]]},{"id":"3f7d06de.4adc9a","type":"execute","name":"executeTest","xml":"<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='healthCheckVMs'>\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"retry-healthcheck\" value=\"`$retry-healthcheck`\"/>","comments":"","outputs":1,"x":741.8060150146484,"y":738.825065612793,"z":"dc4cc75e.06b738","wires":[["48769737.4cb898","51efdcf8.289614"]]},{"id":"5eaef937.ba54c8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1119.036849975586,"y":274.67125701904297,"z":"dc4cc75e.06b738","wires":[["83ed6d82.27f7b","de589d77.aee22","9d5c2e19.ae055"]]},{"id":"37d3c438.cac5ec","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":978.3442230224609,"y":460.4404830932617,"z":"dc4cc75e.06b738","wires":[["f52994d0.a42ec8","c00f6c66.afecd","ec0b5de3.efb66"]]},{"id":"ec7a529c.e62e5","type":"switchNode","name":"switch","xml":"<switch test='`length($connection-details) == 0`'>\n\n\n","comments":"","outputs":1,"x":302.80625915527344,"y":379.5750045776367,"z":"dc4cc75e.06b738","wires":[["f28dc950.083398","d4c1bf0.970e44"]]},{"id":"f28dc950.083398","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":472.80625915527344,"y":324.5750045776367,"z":"dc4cc75e.06b738","wires":[["f55bbc3a.10506"]]},{"id":"d4c1bf0.970e44","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":429.80625915527344,"y":461.5750045776367,"z":"dc4cc75e.06b738","wires":[["3f7d06de.4adc9a"]]},{"id":"c7f4caa4.4c7e88","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":953.8062591552734,"y":287.8250045776367,"z":"dc4cc75e.06b738","wires":[["5eaef937.ba54c8"]]},{"id":"51efdcf8.289614","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":881.8062591552734,"y":670.8250045776367,"z":"dc4cc75e.06b738","wires":[["37d3c438.cac5ec"]]},{"id":"f52994d0.a42ec8","type":"set","name":"set","xml":"<set>\n<parameter name=\"event-message\" value=\"`'Failed to do health check of the vnfc : ' + $vnfcType`\"/> ","comments":"","x":1226.8062591552734,"y":400.8250045776367,"z":"dc4cc75e.06b738","wires":[]},{"id":"de589d77.aee22","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1359.8062591552734,"y":273.8250045776367,"z":"dc4cc75e.06b738","wires":[[]]},{"id":"ec0b5de3.efb66","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1236.8062591552734,"y":454.8250045776367,"z":"dc4cc75e.06b738","wires":[[]]},{"id":"9d5c2e19.ae055","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1358.6552276611328,"y":336.3406295776367,"z":"dc4cc75e.06b738","wires":[]}]
+[{"id":"63ee9929.4f7758","type":"dgstart","name":"DGSTART","outputs":1,"x":167.80625915527344,"y":110.82500457763672,"z":"dc4cc75e.06b738","wires":[["cb9d6d77.df0cb"]]},{"id":"cb9d6d77.df0cb","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":266.80625915527344,"y":159.82500457763672,"z":"dc4cc75e.06b738","wires":[["c2c949ab.cfbdb8"]]},{"id":"c2c949ab.cfbdb8","type":"method","name":"HealthCheck_VNF_vSCP","xml":"<method rpc='HealthCheck_VNF_vSCP' mode='sync'>\n","comments":"","outputs":1,"x":322.80625915527344,"y":260.8250045776367,"z":"dc4cc75e.06b738","wires":[["ec7a529c.e62e5"]]},{"id":"c00f6c66.afecd","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1247.5750579833984,"y":498.28661346435547,"z":"dc4cc75e.06b738","wires":[]},{"id":"97e98dca.283de","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='400' />\n","comments":"","x":1140.8060150146484,"y":896.8251266479492,"z":"dc4cc75e.06b738","wires":[]},{"id":"f55bbc3a.10506","type":"execute","name":"execute: retrieveConnectionDetails","xml":"<execute plugin='org.onap.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$vnf.type`\" />\n","comments":"","outputs":1,"x":715.8061370849609,"y":413.82506561279297,"z":"dc4cc75e.06b738","wires":[["7b5a3bce.849884","c7f4caa4.4c7e88"]]},{"id":"83ed6d82.27f7b","type":"set","name":"set","xml":"<set>\n<parameter name=\"event-message\" value=\"`'Failed to retrieve connection details for vnfc : ' + $vnfcType`\"/> ","comments":"","x":1350.806137084961,"y":213.82512664794922,"z":"dc4cc75e.06b738","wires":[]},{"id":"7b5a3bce.849884","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":717.8061370849609,"y":545.825065612793,"z":"dc4cc75e.06b738","wires":[["3f7d06de.4adc9a"]]},{"id":"48769737.4cb898","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":848.8060150146484,"y":895.8251266479492,"z":"dc4cc75e.06b738","wires":[["97e98dca.283de"]]},{"id":"3f7d06de.4adc9a","type":"execute","name":"executeTest","xml":"<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='healthCheckVMs'>\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"retry-healthcheck\" value=\"`$retry-healthcheck`\"/>","comments":"","outputs":1,"x":741.8060150146484,"y":738.825065612793,"z":"dc4cc75e.06b738","wires":[["48769737.4cb898","51efdcf8.289614"]]},{"id":"5eaef937.ba54c8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1119.036849975586,"y":274.67125701904297,"z":"dc4cc75e.06b738","wires":[["83ed6d82.27f7b","de589d77.aee22","9d5c2e19.ae055"]]},{"id":"37d3c438.cac5ec","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":978.3442230224609,"y":460.4404830932617,"z":"dc4cc75e.06b738","wires":[["f52994d0.a42ec8","c00f6c66.afecd","ec0b5de3.efb66"]]},{"id":"ec7a529c.e62e5","type":"switchNode","name":"switch","xml":"<switch test='`length($connection-details) == 0`'>\n\n\n","comments":"","outputs":1,"x":302.80625915527344,"y":379.5750045776367,"z":"dc4cc75e.06b738","wires":[["f28dc950.083398","d4c1bf0.970e44"]]},{"id":"f28dc950.083398","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":472.80625915527344,"y":324.5750045776367,"z":"dc4cc75e.06b738","wires":[["f55bbc3a.10506"]]},{"id":"d4c1bf0.970e44","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":429.80625915527344,"y":461.5750045776367,"z":"dc4cc75e.06b738","wires":[["3f7d06de.4adc9a"]]},{"id":"c7f4caa4.4c7e88","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":953.8062591552734,"y":287.8250045776367,"z":"dc4cc75e.06b738","wires":[["5eaef937.ba54c8"]]},{"id":"51efdcf8.289614","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":881.8062591552734,"y":670.8250045776367,"z":"dc4cc75e.06b738","wires":[["37d3c438.cac5ec"]]},{"id":"f52994d0.a42ec8","type":"set","name":"set","xml":"<set>\n<parameter name=\"event-message\" value=\"`'Failed to do health check of the vnfc : ' + $vnfcType`\"/> ","comments":"","x":1226.8062591552734,"y":400.8250045776367,"z":"dc4cc75e.06b738","wires":[]},{"id":"de589d77.aee22","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1359.8062591552734,"y":273.8250045776367,"z":"dc4cc75e.06b738","wires":[[]]},{"id":"ec0b5de3.efb66","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1236.8062591552734,"y":454.8250045776367,"z":"dc4cc75e.06b738","wires":[[]]},{"id":"9d5c2e19.ae055","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1358.6552276611328,"y":336.3406295776367,"z":"dc4cc75e.06b738","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Rebuild_VM.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Rebuild_VM.json
index 008337e46..8752402b8 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Rebuild_VM.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Rebuild_VM.json
@@ -1 +1 @@
-[{"id":"40b86792.424e28","type":"dgstart","name":"DGSTART","outputs":1,"x":118.88888549804688,"y":77.88888549804688,"z":"d53a62cc.c8145","wires":[["bc032b26.e89658"]]},{"id":"bc032b26.e89658","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":295.88897705078125,"y":77.45555877685547,"z":"d53a62cc.c8145","wires":[["cd1bcdc.c4f313"]]},{"id":"cd1bcdc.c4f313","type":"method","name":"Rebuild_VM","xml":"<method rpc='Rebuild_VM' mode='sync'>\n","comments":"","outputs":1,"x":238.3532485961914,"y":169.27698135375977,"z":"d53a62cc.c8145","wires":[["b74d1e6.3a22ce"]]},{"id":"34f167f4.74fba8","type":"execute","name":"Rebuild","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='rebuildServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$rebuild-vm-url`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />\n","comments":"","outputs":1,"x":786.5222053527832,"y":474.9246606826782,"z":"d53a62cc.c8145","wires":[["c389f8ca.0d8db8","63bb4f30.2be92"]]},{"id":"c389f8ca.0d8db8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":903.6770362854004,"y":734.2462749481201,"z":"d53a62cc.c8145","wires":[["45b189ba.d7c4e8"]]},{"id":"63bb4f30.2be92","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":942.6393356323242,"y":441.8532495498657,"z":"d53a62cc.c8145","wires":[["96e74630.8df888"]]},{"id":"a546e205.8a738","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1582.3176345825195,"y":724.8893241882324,"z":"d53a62cc.c8145","wires":[["17c11aa2.c734e5","27d3846c.08be6c","d38bac72.40eca"]]},{"id":"17c11aa2.c734e5","type":"set","name":"Set error message","xml":"<set>\n<parameter name='event-message' value=\"`'Failure while rebuilding the server: ' + $rebuild-vm-url`\"/>\n","comments":"","x":1843.6394386291504,"y":676.8535795211792,"z":"d53a62cc.c8145","wires":[]},{"id":"27d3846c.08be6c","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1836.0683631896973,"y":717.043927192688,"z":"d53a62cc.c8145","wires":[[]]},{"id":"de90dda7.71a4e","type":"set","name":"Set Success Message","xml":"<set>\n<parameter name='success-message' value=\"`'Rebuild succeeded for the server : ' + $rebuild-vm-url`\"/>\n\n\n","comments":"","x":1597.3530807495117,"y":272.99626636505127,"z":"d53a62cc.c8145","wires":[]},{"id":"ee54bf93.e9baa","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1587.2102661132812,"y":324.5676784515381,"z":"d53a62cc.c8145","wires":[[]]},{"id":"d7feb7b1.3b6cd8","type":"switchNode","name":"switch:Last Attempt","xml":"<switch test='`$rebuildRetryCount == $retryIndex`'>\n","comments":"","outputs":1,"x":1232.3013343811035,"y":730.460786819458,"z":"d53a62cc.c8145","wires":[["2cc28296.df8a6e","9c67fa27.c3ff98"]]},{"id":"9c67fa27.c3ff98","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1441.1940994262695,"y":722.7822074890137,"z":"d53a62cc.c8145","wires":[["a546e205.8a738"]]},{"id":"2cc28296.df8a6e","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1426.5510845184326,"y":835.4961585998535,"z":"d53a62cc.c8145","wires":[["b3cb1d2b.62265"]]},{"id":"87033bf0.a89218","type":"for","name":"Loop","xml":"<for index=\"retryIndex\" start=\"1\" end=\"`$rebuildRetryCount + 1`\" >","comments":"","outputs":1,"x":295.7502975463867,"y":479.8532304763794,"z":"d53a62cc.c8145","wires":[["8f0dac95.828bd"]]},{"id":"b3cb1d2b.62265","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Rebuild attempt ' + $retryIndex + ' of ' + $rebuildRetryCount + ' failed for server : ' + $rebuild-vm-url + '. Retrying.'`\"/>\n","comments":"","outputs":1,"x":1669.6347026824951,"y":833.7461585998535,"z":"d53a62cc.c8145","wires":[[]]},{"id":"d38bac72.40eca","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1852.0837440490723,"y":766.282208442688,"z":"d53a62cc.c8145","wires":[]},{"id":"8187513d.589d1","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1595.4485092163086,"y":449.1390333175659,"z":"d53a62cc.c8145","wires":[]},{"id":"96e74630.8df888","type":"switchNode","name":"switch STATUS","xml":"<switch test='`$REBUILD_STATUS`'>\n","comments":"","outputs":1,"x":1103.4325485229492,"y":443.4086961746216,"z":"d53a62cc.c8145","wires":[["ae2b10cb.cec5a","cd52c85b.5249d8","59307536.ee844c"]]},{"id":"ae2b10cb.cec5a","type":"other","name":"ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":1184.9563446044922,"y":529.3134174346924,"z":"d53a62cc.c8145","wires":[["45b189ba.d7c4e8"]]},{"id":"cd52c85b.5249d8","type":"success","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1350.3850173950195,"y":412.3134517669678,"z":"d53a62cc.c8145","wires":[["f91485e2.798dc8"]]},{"id":"45b189ba.d7c4e8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1064.6191062927246,"y":731.3493366241455,"z":"d53a62cc.c8145","wires":[["d7feb7b1.3b6cd8"]]},{"id":"59307536.ee844c","type":"other","name":"CONTEXT_NOT_FOUND","xml":"<outcome value='CONTEXT_NOT_FOUND'>\n","comments":"","outputs":1,"x":1413.8692588806152,"y":507.0785312652588,"z":"d53a62cc.c8145","wires":[["9a2a7a92.885b08"]]},{"id":"b74d1e6.3a22ce","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":297.7976417541504,"y":386.36428356170654,"z":"d53a62cc.c8145","wires":[["8c5bde88.c0aee","87033bf0.a89218","2d98dcb5.d16b44"]]},{"id":"8c5bde88.c0aee","type":"switchNode","name":"switch : rebuildRetryCount >= 0","xml":"<switch test='`$rebuildRetryCount >= 0`'>\n","comments":"","outputs":1,"x":567.797679901123,"y":317.7928533554077,"z":"d53a62cc.c8145","wires":[["2451c726.0ffbe8","6a4082a3.a5778c"]]},{"id":"2451c726.0ffbe8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":784.9404716491699,"y":276.3643217086792,"z":"d53a62cc.c8145","wires":[["23f87454.807cfc"]]},{"id":"6a4082a3.a5778c","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":792.0833587646484,"y":353.5072250366211,"z":"d53a62cc.c8145","wires":[["39be1fd1.165f6"]]},{"id":"39be1fd1.165f6","type":"set","name":"increment rebuildRetryCount","xml":"<set>\n<parameter name=\"rebuildRetryCount\" value=\"`$rebuildRetryCount + 1`\" />\n","comments":"","x":974.9404563903809,"y":352.0786123275757,"z":"d53a62cc.c8145","wires":[]},{"id":"23f87454.807cfc","type":"set","name":"set rebuildRetryCount","xml":"<set>\n<parameter name='rebuildRetryCount' value='1' />\n","comments":"","x":956.3690452575684,"y":274.93574237823486,"z":"d53a62cc.c8145","wires":[]},{"id":"f91485e2.798dc8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1372.6388702392578,"y":319.85316371917725,"z":"d53a62cc.c8145","wires":[["de90dda7.71a4e","ee54bf93.e9baa","8187513d.589d1","8fdfd6a.1692b28"]]},{"id":"2d98dcb5.d16b44","type":"set","name":"initialize exitLoop","xml":"<set>\n<parameter name='exitLoop' value='false' />\n","comments":"","x":532.6389007568359,"y":209.85318422317505,"z":"d53a62cc.c8145","wires":[]},{"id":"8fdfd6a.1692b28","type":"set","name":"set exitLoop","xml":"<set>\n<parameter name='exitLoop' value='true' />\n","comments":"","x":1602.6389770507812,"y":384.1389150619507,"z":"d53a62cc.c8145","wires":[]},{"id":"8f0dac95.828bd","type":"switchNode","name":"switch exitLoop","xml":"<switch test='`$exitLoop`'>\n","comments":"","outputs":1,"x":462.63885498046875,"y":478.4245901107788,"z":"d53a62cc.c8145","wires":[["82ddebcb.4c72e8","e243de19.25b81"]]},{"id":"82ddebcb.4c72e8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":631.2102127075195,"y":479.853196144104,"z":"d53a62cc.c8145","wires":[["34f167f4.74fba8"]]},{"id":"e243de19.25b81","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":628.3532104492188,"y":545.5675039291382,"z":"d53a62cc.c8145","wires":[[]]},{"id":"9a2a7a92.885b08","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1578.263916015625,"y":657.8888959884644,"z":"d53a62cc.c8145","wires":[["63a3f95c.1a3338","27d3846c.08be6c","d38bac72.40eca"]]},{"id":"63a3f95c.1a3338","type":"set","name":"Set error message","xml":"<set>\n<parameter name='event-message' value=\"`'Failure while rebuilding the server: ' + $rebuild-vm-url + ' due to Invalid AICIdentity or tenant or credentials. Skipping all other VMs'`\"/>\n","comments":"","x":1837.0139465332031,"y":611.6389179229736,"z":"d53a62cc.c8145","wires":[]}]
+[{"id":"40b86792.424e28","type":"dgstart","name":"DGSTART","outputs":1,"x":118.88888549804688,"y":77.88888549804688,"z":"d53a62cc.c8145","wires":[["bc032b26.e89658"]]},{"id":"bc032b26.e89658","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":295.88897705078125,"y":77.45555877685547,"z":"d53a62cc.c8145","wires":[["cd1bcdc.c4f313"]]},{"id":"cd1bcdc.c4f313","type":"method","name":"Rebuild_VM","xml":"<method rpc='Rebuild_VM' mode='sync'>\n","comments":"","outputs":1,"x":238.3532485961914,"y":169.27698135375977,"z":"d53a62cc.c8145","wires":[["b74d1e6.3a22ce"]]},{"id":"34f167f4.74fba8","type":"execute","name":"Rebuild","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='rebuildServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$rebuild-vm-url`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n","comments":"","outputs":1,"x":786.5222053527832,"y":474.9246606826782,"z":"d53a62cc.c8145","wires":[["c389f8ca.0d8db8","63bb4f30.2be92"]]},{"id":"c389f8ca.0d8db8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":903.6770362854004,"y":734.2462749481201,"z":"d53a62cc.c8145","wires":[["45b189ba.d7c4e8"]]},{"id":"63bb4f30.2be92","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":942.6393356323242,"y":441.8532495498657,"z":"d53a62cc.c8145","wires":[["96e74630.8df888"]]},{"id":"a546e205.8a738","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1582.3176345825195,"y":724.8893241882324,"z":"d53a62cc.c8145","wires":[["17c11aa2.c734e5","27d3846c.08be6c","d38bac72.40eca"]]},{"id":"17c11aa2.c734e5","type":"set","name":"Set error message","xml":"<set>\n<parameter name='event-message' value=\"`'Failure while rebuilding the server: ' + $rebuild-vm-url`\"/>\n","comments":"","x":1843.6394386291504,"y":676.8535795211792,"z":"d53a62cc.c8145","wires":[]},{"id":"27d3846c.08be6c","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1836.0683631896973,"y":717.043927192688,"z":"d53a62cc.c8145","wires":[[]]},{"id":"de90dda7.71a4e","type":"set","name":"Set Success Message","xml":"<set>\n<parameter name='success-message' value=\"`'Rebuild succeeded for the server : ' + $rebuild-vm-url`\"/>\n\n\n","comments":"","x":1597.3530807495117,"y":272.99626636505127,"z":"d53a62cc.c8145","wires":[]},{"id":"ee54bf93.e9baa","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1587.2102661132812,"y":324.5676784515381,"z":"d53a62cc.c8145","wires":[[]]},{"id":"d7feb7b1.3b6cd8","type":"switchNode","name":"switch:Last Attempt","xml":"<switch test='`$rebuildRetryCount == $retryIndex`'>\n","comments":"","outputs":1,"x":1232.3013343811035,"y":730.460786819458,"z":"d53a62cc.c8145","wires":[["2cc28296.df8a6e","9c67fa27.c3ff98"]]},{"id":"9c67fa27.c3ff98","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1441.1940994262695,"y":722.7822074890137,"z":"d53a62cc.c8145","wires":[["a546e205.8a738"]]},{"id":"2cc28296.df8a6e","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1426.5510845184326,"y":835.4961585998535,"z":"d53a62cc.c8145","wires":[["b3cb1d2b.62265"]]},{"id":"87033bf0.a89218","type":"for","name":"Loop","xml":"<for index=\"retryIndex\" start=\"1\" end=\"`$rebuildRetryCount + 1`\" >","comments":"","outputs":1,"x":295.7502975463867,"y":479.8532304763794,"z":"d53a62cc.c8145","wires":[["8f0dac95.828bd"]]},{"id":"b3cb1d2b.62265","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Rebuild attempt ' + $retryIndex + ' of ' + $rebuildRetryCount + ' failed for server : ' + $rebuild-vm-url + '. Retrying.'`\"/>\n","comments":"","outputs":1,"x":1669.6347026824951,"y":833.7461585998535,"z":"d53a62cc.c8145","wires":[[]]},{"id":"d38bac72.40eca","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1852.0837440490723,"y":766.282208442688,"z":"d53a62cc.c8145","wires":[]},{"id":"8187513d.589d1","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1595.4485092163086,"y":449.1390333175659,"z":"d53a62cc.c8145","wires":[]},{"id":"96e74630.8df888","type":"switchNode","name":"switch STATUS","xml":"<switch test='`$REBUILD_STATUS`'>\n","comments":"","outputs":1,"x":1103.4325485229492,"y":443.4086961746216,"z":"d53a62cc.c8145","wires":[["ae2b10cb.cec5a","cd52c85b.5249d8","59307536.ee844c"]]},{"id":"ae2b10cb.cec5a","type":"other","name":"ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":1184.9563446044922,"y":529.3134174346924,"z":"d53a62cc.c8145","wires":[["45b189ba.d7c4e8"]]},{"id":"cd52c85b.5249d8","type":"success","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1350.3850173950195,"y":412.3134517669678,"z":"d53a62cc.c8145","wires":[["f91485e2.798dc8"]]},{"id":"45b189ba.d7c4e8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1064.6191062927246,"y":731.3493366241455,"z":"d53a62cc.c8145","wires":[["d7feb7b1.3b6cd8"]]},{"id":"59307536.ee844c","type":"other","name":"CONTEXT_NOT_FOUND","xml":"<outcome value='CONTEXT_NOT_FOUND'>\n","comments":"","outputs":1,"x":1413.8692588806152,"y":507.0785312652588,"z":"d53a62cc.c8145","wires":[["9a2a7a92.885b08"]]},{"id":"b74d1e6.3a22ce","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":297.7976417541504,"y":386.36428356170654,"z":"d53a62cc.c8145","wires":[["8c5bde88.c0aee","87033bf0.a89218","2d98dcb5.d16b44"]]},{"id":"8c5bde88.c0aee","type":"switchNode","name":"switch : rebuildRetryCount >= 0","xml":"<switch test='`$rebuildRetryCount >= 0`'>\n","comments":"","outputs":1,"x":567.797679901123,"y":317.7928533554077,"z":"d53a62cc.c8145","wires":[["2451c726.0ffbe8","6a4082a3.a5778c"]]},{"id":"2451c726.0ffbe8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":784.9404716491699,"y":276.3643217086792,"z":"d53a62cc.c8145","wires":[["23f87454.807cfc"]]},{"id":"6a4082a3.a5778c","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":792.0833587646484,"y":353.5072250366211,"z":"d53a62cc.c8145","wires":[["39be1fd1.165f6"]]},{"id":"39be1fd1.165f6","type":"set","name":"increment rebuildRetryCount","xml":"<set>\n<parameter name=\"rebuildRetryCount\" value=\"`$rebuildRetryCount + 1`\" />\n","comments":"","x":974.9404563903809,"y":352.0786123275757,"z":"d53a62cc.c8145","wires":[]},{"id":"23f87454.807cfc","type":"set","name":"set rebuildRetryCount","xml":"<set>\n<parameter name='rebuildRetryCount' value='1' />\n","comments":"","x":956.3690452575684,"y":274.93574237823486,"z":"d53a62cc.c8145","wires":[]},{"id":"f91485e2.798dc8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1372.6388702392578,"y":319.85316371917725,"z":"d53a62cc.c8145","wires":[["de90dda7.71a4e","ee54bf93.e9baa","8187513d.589d1","8fdfd6a.1692b28"]]},{"id":"2d98dcb5.d16b44","type":"set","name":"initialize exitLoop","xml":"<set>\n<parameter name='exitLoop' value='false' />\n","comments":"","x":532.6389007568359,"y":209.85318422317505,"z":"d53a62cc.c8145","wires":[]},{"id":"8fdfd6a.1692b28","type":"set","name":"set exitLoop","xml":"<set>\n<parameter name='exitLoop' value='true' />\n","comments":"","x":1602.6389770507812,"y":384.1389150619507,"z":"d53a62cc.c8145","wires":[]},{"id":"8f0dac95.828bd","type":"switchNode","name":"switch exitLoop","xml":"<switch test='`$exitLoop`'>\n","comments":"","outputs":1,"x":462.63885498046875,"y":478.4245901107788,"z":"d53a62cc.c8145","wires":[["82ddebcb.4c72e8","e243de19.25b81"]]},{"id":"82ddebcb.4c72e8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":631.2102127075195,"y":479.853196144104,"z":"d53a62cc.c8145","wires":[["34f167f4.74fba8"]]},{"id":"e243de19.25b81","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":628.3532104492188,"y":545.5675039291382,"z":"d53a62cc.c8145","wires":[[]]},{"id":"9a2a7a92.885b08","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1578.263916015625,"y":657.8888959884644,"z":"d53a62cc.c8145","wires":[["63a3f95c.1a3338","27d3846c.08be6c","d38bac72.40eca"]]},{"id":"63a3f95c.1a3338","type":"set","name":"Set error message","xml":"<set>\n<parameter name='event-message' value=\"`'Failure while rebuilding the server: ' + $rebuild-vm-url + ' due to Invalid AICIdentity or tenant or credentials. Skipping all other VMs'`\"/>\n","comments":"","x":1837.0139465332031,"y":611.6389179229736,"z":"d53a62cc.c8145","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Rebuild_VNF.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Rebuild_VNF.json
index 4ae43dfde..515600dbc 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Rebuild_VNF.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Rebuild_VNF.json
@@ -1 +1 @@
-[{"id":"99f53284.c7a4f","type":"dgstart","name":"DGSTART","outputs":1,"x":235.31257247924805,"y":119.68750190734863,"z":"f77957d3.436788","wires":[["a9b40552.94aed8"]]},{"id":"a9b40552.94aed8","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":410.31257247924805,"y":118.68750190734863,"z":"f77957d3.436788","wires":[["da95e894.c26c18"]]},{"id":"da95e894.c26c18","type":"method","name":"Rebuild_VNF","xml":"<method rpc='Rebuild_VNF' mode='sync'>\n","comments":"","outputs":1,"x":255.0626335144043,"y":223.18749523162842,"z":"f77957d3.436788","wires":[["5ad7a0e2.e23a5"]]},{"id":"3b455418.9d0d5c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":540.3129081726074,"y":236.68750190734863,"z":"f77957d3.436788","wires":[["b2aedd26.cf3c9"]]},{"id":"8fe42265.357f9","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":539.3129081726074,"y":186.68750190734863,"z":"f77957d3.436788","wires":[["b2aedd26.cf3c9"]]},{"id":"9790f27c.2ad33","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":533.3129081726074,"y":291.6875171661377,"z":"f77957d3.436788","wires":[["b2aedd26.cf3c9"]]},{"id":"5ad7a0e2.e23a5","type":"execute","name":"Set payload in Context","xml":"<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />","comments":"","outputs":1,"x":313.3126640319824,"y":290.68753242492676,"z":"f77957d3.436788","wires":[["3b455418.9d0d5c","8fe42265.357f9","9790f27c.2ad33","410c982.243e868"]]},{"id":"410c982.243e868","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":539.3126029968262,"y":354.68753242492676,"z":"f77957d3.436788","wires":[["75980c6e.458ef4"]]},{"id":"75980c6e.458ef4","type":"execute","name":"Get Vnf Hierarchy","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":710.9792594909668,"y":354.68753242492676,"z":"f77957d3.436788","wires":[["efa01d4c.daf8a","feae5d34.8a474"]]},{"id":"feae5d34.8a474","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":898.979320526123,"y":313.68753242492676,"z":"f77957d3.436788","wires":[["215e20aa.17f1c"]]},{"id":"efa01d4c.daf8a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":886.9792747497559,"y":391.6874713897705,"z":"f77957d3.436788","wires":[["377be37d.dbad3c"]]},{"id":"377be37d.dbad3c","type":"switchNode","name":"getVnfHierarchy_result ?","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":1047.9791984558105,"y":459.79861640930176,"z":"f77957d3.436788","wires":[["11ebb613.07c99a","43836cda.890e74"]]},{"id":"11ebb613.07c99a","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1254.97953414917,"y":520.7986755371094,"z":"f77957d3.436788","wires":[["ef94726d.4aae5"]]},{"id":"43836cda.890e74","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1253.9794425964355,"y":399.79861640930176,"z":"f77957d3.436788","wires":[["215e20aa.17f1c"]]},{"id":"ef94726d.4aae5","type":"switchNode","name":"VNF_VMCount ?","xml":"<switch test='`$VNF.VMCount`'>","comments":"","outputs":1,"x":1288.97953414917,"y":588.9095458984375,"z":"f77957d3.436788","wires":[["952ce3f8.01a9e","eb66eab0.036e88"]]},{"id":"952ce3f8.01a9e","type":"outcome","name":"0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1474.9791679382324,"y":521.9096984863281,"z":"f77957d3.436788","wires":[["3a947231.c5d04e"]]},{"id":"eb66eab0.036e88","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1394.9791679382324,"y":654.90966796875,"z":"f77957d3.436788","wires":[["777e65f.8ffec9c"]]},{"id":"777e65f.8ffec9c","type":"execute","name":"Get Execution Flow","xml":"<execute plugin='org.openecomp.appc.dg.common.VnfExecutionFlow' method='getVnfExecutionFlowData' >\n<parameter name=\"DependencyType\" value='RESOURCE' />\n<parameter name=\"FlowStrategy\" value='FORWARD' />\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfVersion\" value='`$vnf.version`' />\n","comments":"","outputs":1,"x":1452.9791679382324,"y":730.0208740234375,"z":"f77957d3.436788","wires":[["522a1860.9fb9c8","b54140f0.04101"]]},{"id":"522a1860.9fb9c8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1644.9789848327637,"y":730.0207233428955,"z":"f77957d3.436788","wires":[["1e3f1032.b213d"]]},{"id":"b54140f0.04101","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1643.97904586792,"y":651.020751953125,"z":"f77957d3.436788","wires":[["328235af.1f26fa"]]},{"id":"b2aedd26.cf3c9","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":713.979564666748,"y":237.68750190734863,"z":"f77957d3.436788","wires":[["a17353c8.0a34b","76da6170.dde8f"]]},{"id":"a17353c8.0a34b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","x":911.3125114440918,"y":238.21122932434082,"z":"f77957d3.436788","wires":[]},{"id":"215e20aa.17f1c","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1408.7570457458496,"y":316.57641792297363,"z":"f77957d3.436788","wires":[["4fe9b7ed.1601f8","ca19586f.86d648"]]},{"id":"4fe9b7ed.1601f8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1597.7572135925293,"y":377.57641792297363,"z":"f77957d3.436788","wires":[]},{"id":"3a947231.c5d04e","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1605.3126640319824,"y":520.9097595214844,"z":"f77957d3.436788","wires":[["97f70dfc.79444","e1d3466f.0e7098"]]},{"id":"97f70dfc.79444","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1794.3126640319824,"y":549.9098205566406,"z":"f77957d3.436788","wires":[]},{"id":"328235af.1f26fa","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1778.3126640319824,"y":652.1318073272705,"z":"f77957d3.436788","wires":[["24b5e0d0.c01c6","d3f21815.793788"]]},{"id":"24b5e0d0.c01c6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1967.3131523132324,"y":687.131929397583,"z":"f77957d3.436788","wires":[]},{"id":"93d0ecc5.6556b","type":"for","name":"For each VNFC","xml":"<for index='i' start='0' end='`$vnfcFlowCount`' >\n","comments":"","outputs":1,"x":2342.5345039367676,"y":866.3541383743286,"z":"f77957d3.436788","wires":[["11fb64b5.aabd0b"]]},{"id":"67a8f3f3.8d9cbc","type":"call","name":"call VNFC DG","xml":"<call module='`$Rebuild.dg_module`' rpc='`$Rebuild.dg_name`' mode='sync' version='`$Rebuild.dg_version`'>\n","comments":"","outputs":1,"x":2754.534282684326,"y":950.4653339385986,"z":"f77957d3.436788","wires":[["d9556b49.ff6288","5d547b5d.13dd54","259d70ea.9205b"]]},{"id":"4a7f68fb.0b9158","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2137.534770965576,"y":864.3543109893799,"z":"f77957d3.436788","wires":[["93d0ecc5.6556b","ccca5726.839cc8","1ab58ce2.ef51e3"]]},{"id":"44559cc.a01e864","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2990.534526824951,"y":717.3544635772705,"z":"f77957d3.436788","wires":[["2596cb0e.a268b4"]]},{"id":"c8863e0a.cada4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2986.534282684326,"y":799.3544635772705,"z":"f77957d3.436788","wires":[["a339e96.0db2d18"]]},{"id":"a339e96.0db2d18","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3132.819637298584,"y":796.3544721603394,"z":"f77957d3.436788","wires":[["b6d198f4.0d1278","b0d45e14.49d5c"]]},{"id":"b6d198f4.0d1278","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3354.534038543701,"y":799.3544635772705,"z":"f77957d3.436788","wires":[]},{"id":"259d70ea.9205b","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2950.311870574951,"y":998.5765399932861,"z":"f77957d3.436788","wires":[["926558dc.646c48"]]},{"id":"5d547b5d.13dd54","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2948.312114715576,"y":906.576509475708,"z":"f77957d3.436788","wires":[["50a44cd4.d414e4"]]},{"id":"d9556b49.ff6288","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2960.312358856201,"y":950.5765399932861,"z":"f77957d3.436788","wires":[["99a282c4.2df92"]]},{"id":"11fb64b5.aabd0b","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2513.2009086608887,"y":865.5765399932861,"z":"f77957d3.436788","wires":[["67a8f3f3.8d9cbc","7b35db37.4c0c44","f46a554a.bb3ab8","404a068e.f88bb8"]]},{"id":"1e3f1032.b213d","type":"switchNode","name":"dependencyModelFound","xml":"<switch test='`$dependencyModelFound`'>\n","comments":"","outputs":1,"x":1790.9791679382324,"y":809.4653015136719,"z":"f77957d3.436788","wires":[["22bf2bd5.9d34d4","dc4848ab.c0f558"]]},{"id":"22bf2bd5.9d34d4","type":"outcome","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1988.6460990905762,"y":754.5763874053955,"z":"f77957d3.436788","wires":[["d3204260.85134"]]},{"id":"d3204260.85134","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2114.0908012390137,"y":754.6874713897705,"z":"f77957d3.436788","wires":[["52cba35.33bcb5c","58b344dc.ff91ec"]]},{"id":"52cba35.33bcb5c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2294.0905570983887,"y":754.6874713897705,"z":"f77957d3.436788","wires":[]},{"id":"dc4848ab.c0f558","type":"outcome","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1995.9791069030762,"y":864.4655170440674,"z":"f77957d3.436788","wires":[["4a7f68fb.0b9158"]]},{"id":"7b35db37.4c0c44","type":"execute","name":"Resolve VNFC DG","xml":"<execute plugin='org.openecomp.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcFlow[$i].vnfcType`' />\n<parameter name=\"action\" value=\"Rebuild\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"Rebuild\" />\n","comments":"","outputs":1,"x":2747.312114715576,"y":758.437593460083,"z":"f77957d3.436788","wires":[["44559cc.a01e864","c8863e0a.cada4"]]},{"id":"f46a554a.bb3ab8","type":"set","name":"set DG Parameters","xml":"<set>\n<parameter name='vnfcName' value='`$vnfcFlow[$i].vnfcName`' />\n<parameter name='vnfcType' value='`$vnfcFlow[$i].vnfcType`' />\n<parameter name='resilienceType' value='`$vnfcFlow[$i].resilienceType`' />\n<parameter name='vmCount' value='`$vnfcFlow[$i].vmCount`' />\n<parameter name='input.action' value='`$input.action`' />\n<parameter name='HealthyVMCountAfterRebuild' value='0' />\n<parameter name='AAIUpdateSuccessFlag' value='false' />\n<parameter name='HealthcheckDGResolutionFlag' value='false' />","comments":"","x":2748.3394660949707,"y":809.5209503173828,"z":"f77957d3.436788","wires":[]},{"id":"404a068e.f88bb8","type":"for","name":"For Each VM","xml":"<for index='j' start='0' end='`$vnfcFlow[$i].vmCount`' >\n","comments":"","outputs":1,"x":2742.11727142334,"y":864.4929323196411,"z":"f77957d3.436788","wires":[["278b0a4a.a73a06"]]},{"id":"278b0a4a.a73a06","type":"set","name":"Set VM URL","xml":"<set>\n<parameter name=\"$vm[$j].url\" value='`$vnfcFlow[$i].vm[$j].url`' />","comments":"","x":2940.117290496826,"y":858.4928302764893,"z":"f77957d3.436788","wires":[]},{"id":"50a44cd4.d414e4","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3111.201030731201,"y":905.6875324249268,"z":"f77957d3.436788","wires":[["caad9bb9.958e28","788bd40a.39f6cc"]]},{"id":"caad9bb9.958e28","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3337.201274871826,"y":903.6875629425049,"z":"f77957d3.436788","wires":[]},{"id":"99a282c4.2df92","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3126.201030731201,"y":951.6875629425049,"z":"f77957d3.436788","wires":[["c1c2198e.b73818"]]},{"id":"ae52a5c8.97a288","type":"switchNode","name":"switch_vm_rebuild_success","xml":"<switch test='`$HealthyVMCountAfterRebuild >= 1 and $AAIUpdateSuccessFlag == true`'>\n","comments":"","outputs":1,"x":3738.7842330932617,"y":953.0489025115967,"z":"f77957d3.436788","wires":[["b21bf1ff.bd44","5b5f2276.10bb4c"]]},{"id":"5b5f2276.10bb4c","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":3945.062313079834,"y":896.7989635467529,"z":"f77957d3.436788","wires":[["f4ce492.fb423b8"]]},{"id":"b21bf1ff.bd44","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3929.062313079834,"y":1008.5488433837891,"z":"f77957d3.436788","wires":[["a294dfb8.f861e"]]},{"id":"f4ce492.fb423b8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":4081.0620727539062,"y":898.0489025115967,"z":"f77957d3.436788","wires":[["122dbb1e.5a5a05","e05695d0.20cab8","1a818ff1.7d3c","e479b650.bda0f8","96766d41.3d0c2"]]},{"id":"91041bf9.e984f8","type":"set","name":"update failed VNFC count","xml":"<set>\n<parameter name=\"FailedVNFCCount\" value=\"`$FailedVNFCCount + 1`\" />\n","comments":"","x":4266.229263305664,"y":1062.7987823486328,"z":"f77957d3.436788","wires":[]},{"id":"122dbb1e.5a5a05","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":4265.367492675781,"y":953.5490856170654,"z":"f77957d3.436788","wires":[]},{"id":"a294dfb8.f861e","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":4065.423107147217,"y":1009.9099273681641,"z":"f77957d3.436788","wires":[["91041bf9.e984f8","6f1de83d.2a2998"]]},{"id":"1ab58ce2.ef51e3","type":"switchNode","name":"switch_vnfc_rebuild_success","xml":"<switch test='`$FailedVNFCCount == 0`'>\n","comments":"","outputs":1,"x":2389.756694793701,"y":1038.687593460083,"z":"f77957d3.436788","wires":[["637851ad.9627a","f0efea53.43f2c8"]]},{"id":"637851ad.9627a","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2603.756694793701,"y":1000.6875324249268,"z":"f77957d3.436788","wires":[["cc826579.efac68"]]},{"id":"f0efea53.43f2c8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2604.256938934326,"y":1077.687593460083,"z":"f77957d3.436788","wires":[["e4468fd0.07a52"]]},{"id":"cc826579.efac68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2762.025737762451,"y":1000.2043781280518,"z":"f77957d3.436788","wires":[]},{"id":"e4468fd0.07a52","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":2765.256694793701,"y":1076.6044025421143,"z":"f77957d3.436788","wires":[]},{"id":"ccca5726.839cc8","type":"set","name":"set Failed VNFC Count","xml":"<set>\n<parameter name='FailedVNFCCount' value='0' />","comments":"","x":2359.756694793701,"y":806.6875629425049,"z":"f77957d3.436788","wires":[]},{"id":"926558dc.646c48","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Rebuild successful for VNFC : ' + $vnfcName `\"/>\n","comments":"","outputs":1,"x":3130.0897178649902,"y":999.6878213882446,"z":"f77957d3.436788","wires":[[]]},{"id":"e05695d0.20cab8","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":4282.089900970459,"y":831.4378781318665,"z":"f77957d3.436788","wires":[[]]},{"id":"6f1de83d.2a2998","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Failed to Rebuild all VMs for VNFC : ' + $vnfcName + '. But successfully Rebuilt '+ $HealthyVMCountAfterRebuild +' VM/s so continue to next VNFC'`\"/>\n","comments":"","outputs":1,"x":4232.768569946289,"y":1006.5807037353516,"z":"f77957d3.436788","wires":[[]]},{"id":"2596cb0e.a268b4","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'VNFC DG for ' + $vnfcName + ' resolves to rpc: ' + $Rebuild.dg_name + ', module: ' + $Rebuild.dg_module + ', version: ' + $Rebuild.dg_version `\"/>\n","comments":"","outputs":1,"x":3148.201274871826,"y":717.6877765655518,"z":"f77957d3.436788","wires":[[]]},{"id":"67776999.51d8f8","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'None of the VMs of VNFC ' + $vnfcName + ' are Rebuilt successfully. Not proceeding to the next VNFC.'`\" />","comments":"","x":4692.192939758301,"y":825.5412721633911,"z":"f77957d3.436788","wires":[]},{"id":"1a818ff1.7d3c","type":"switchNode","name":"switch_aai_update_success","xml":"<switch test='`$AAIUpdateSuccessFlag`'>\n","comments":"","outputs":1,"x":4300.367980957031,"y":791.6320915222168,"z":"f77957d3.436788","wires":[["65446424.620e0c","ae30b408.0a1e68"]]},{"id":"ae30b408.0a1e68","type":"outcomeFalse","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":4508.146545410156,"y":825.3822145462036,"z":"f77957d3.436788","wires":[["67776999.51d8f8"]]},{"id":"65446424.620e0c","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":4507.146789550781,"y":760.6319689750671,"z":"f77957d3.436788","wires":[["261792e6.bf79be"]]},{"id":"261792e6.bf79be","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'AAI update for VNFC ' + $vnfcName + '  failed. Not proceeding to the next VNFC.'`\" />","comments":"","x":4697.479560852051,"y":760.3822135925293,"z":"f77957d3.436788","wires":[]},{"id":"76da6170.dde8f","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failure in flattening payload Json\" />","comments":"","outputs":1,"x":944.3126335144043,"y":189.5763874053955,"z":"f77957d3.436788","wires":[["87b305c2.55be58"]]},{"id":"24fda060.75b99","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1792.3126029968262,"y":268.5763874053955,"z":"f77957d3.436788","wires":[["a4743018.e3d08"]]},{"id":"a4743018.e3d08","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1970.8841361999512,"y":268.29065132141113,"z":"f77957d3.436788","wires":[[]]},{"id":"ca19586f.86d648","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failed to retrieve VNF details from A&amp;AI\" />","comments":"","outputs":1,"x":1613.3126335144043,"y":267.5763874053955,"z":"f77957d3.436788","wires":[["24fda060.75b99"]]},{"id":"6d00b87f.e84a98","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1353.9791984558105,"y":188.5763874053955,"z":"f77957d3.436788","wires":[[]]},{"id":"87b305c2.55be58","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1152.4076652526855,"y":188.86212348937988,"z":"f77957d3.436788","wires":[["6d00b87f.e84a98"]]},{"id":"e1d3466f.0e7098","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Server/VNFC does not exists in A&amp;AI for the VNF\" />","comments":"","outputs":1,"x":1803.97953414917,"y":488.6875,"z":"f77957d3.436788","wires":[["2b410a66.bb6ac6"]]},{"id":"2b410a66.bb6ac6","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2348.9794731140137,"y":486.68750190734863,"z":"f77957d3.436788","wires":[["9e2af8d.3cbc608"]]},{"id":"9e2af8d.3cbc608","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2522.5510063171387,"y":486.40176582336426,"z":"f77957d3.436788","wires":[[]]},{"id":"d3f21815.793788","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />","comments":"","outputs":1,"x":1994.9794692993164,"y":611.7985947132111,"z":"f77957d3.436788","wires":[["2b410a66.bb6ac6"]]},{"id":"58b344dc.ff91ec","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />","comments":"","outputs":1,"x":2281.6454887390137,"y":665.7985553741455,"z":"f77957d3.436788","wires":[["2b410a66.bb6ac6"]]},{"id":"b0d45e14.49d5c","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Failed to retrieve VNFC DG for : ' + $vnfcFlow[$i].vnfcType`\"/>","comments":"","outputs":1,"x":3381.7571983337402,"y":752.9097415208817,"z":"f77957d3.436788","wires":[["72dfca4f.62a4d4"]]},{"id":"72dfca4f.62a4d4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3618.8770141601562,"y":750.8344230651855,"z":"f77957d3.436788","wires":[["dc2979a5.4b84e8"]]},{"id":"dc2979a5.4b84e8","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":3845.4485473632812,"y":750.1200675964355,"z":"f77957d3.436788","wires":[[]]},{"id":"788bd40a.39f6cc","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'VNFC DG not found for : ' + $vnfcName`\"/>","comments":"","outputs":1,"x":3346.8682823181152,"y":858.9097442626953,"z":"f77957d3.436788","wires":[["72dfca4f.62a4d4"]]},{"id":"33642eb2.ef4d82","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\"/>","comments":"","outputs":1,"x":4630.340351104736,"y":912.9097423553467,"z":"f77957d3.436788","wires":[["aa0c5a08.e34788"]]},{"id":"aa0c5a08.e34788","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4820.56333732605,"y":912.5487775802612,"z":"f77957d3.436788","wires":[["729c89d.f391b78"]]},{"id":"729c89d.f391b78","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":5005.31268119812,"y":912.187593460083,"z":"f77957d3.436788","wires":[[]]},{"id":"e479b650.bda0f8","type":"set","name":"Set last count","xml":"<set>\n<parameter name='lastVNFCIndex' value='`$vnfcFlowCount - 1`' />","comments":"","x":4276.250019073486,"y":874.6875133514404,"z":"f77957d3.436788","wires":[]},{"id":"96766d41.3d0c2","type":"switchNode","name":"Last vnfc?","xml":"<switch test='`$i >= $lastVNFCIndex`'>\n","comments":"","outputs":1,"x":4285.6250648498535,"y":912.1875133514404,"z":"f77957d3.436788","wires":[["16047b15.b41365"]]},{"id":"16047b15.b41365","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":4444.687517166138,"y":912.8125133514404,"z":"f77957d3.436788","wires":[["33642eb2.ef4d82"]]},{"id":"c1c2198e.b73818","type":"switchNode","name":"switch_healthcheck_res_flag","xml":"<switch test='`$HealthcheckDGResolutionFlag`'>\n","comments":"","outputs":1,"x":3334.6875534057617,"y":952.1875152587891,"z":"f77957d3.436788","wires":[["4727ccbc.cc3de4","27793737.47e1b8"]]},{"id":"4727ccbc.cc3de4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3539.6875534057617,"y":952.1875143051147,"z":"f77957d3.436788","wires":[["ae52a5c8.97a288"]]},{"id":"27793737.47e1b8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":3544.6875,"y":1029.6875,"z":"f77957d3.436788","wires":[["47b9a4c3.5580bc"]]},{"id":"47b9a4c3.5580bc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3722.1875534057617,"y":1029.687515258789,"z":"f77957d3.436788","wires":[]}]
+[{"id":"99f53284.c7a4f","type":"dgstart","name":"DGSTART","outputs":1,"x":235.31257247924805,"y":119.68750190734863,"z":"f77957d3.436788","wires":[["a9b40552.94aed8"]]},{"id":"a9b40552.94aed8","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":410.31257247924805,"y":118.68750190734863,"z":"f77957d3.436788","wires":[["da95e894.c26c18"]]},{"id":"da95e894.c26c18","type":"method","name":"Rebuild_VNF","xml":"<method rpc='Rebuild_VNF' mode='sync'>\n","comments":"","outputs":1,"x":255.0626335144043,"y":223.18749523162842,"z":"f77957d3.436788","wires":[["5ad7a0e2.e23a5"]]},{"id":"3b455418.9d0d5c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":540.3129081726074,"y":236.68750190734863,"z":"f77957d3.436788","wires":[["b2aedd26.cf3c9"]]},{"id":"8fe42265.357f9","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":539.3129081726074,"y":186.68750190734863,"z":"f77957d3.436788","wires":[["b2aedd26.cf3c9"]]},{"id":"9790f27c.2ad33","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":533.3129081726074,"y":291.6875171661377,"z":"f77957d3.436788","wires":[["b2aedd26.cf3c9"]]},{"id":"5ad7a0e2.e23a5","type":"execute","name":"Set payload in Context","xml":"<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />","comments":"","outputs":1,"x":313.3126640319824,"y":290.68753242492676,"z":"f77957d3.436788","wires":[["3b455418.9d0d5c","8fe42265.357f9","9790f27c.2ad33","410c982.243e868"]]},{"id":"410c982.243e868","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":539.3126029968262,"y":354.68753242492676,"z":"f77957d3.436788","wires":[["75980c6e.458ef4"]]},{"id":"75980c6e.458ef4","type":"execute","name":"Get Vnf Hierarchy","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":710.9792594909668,"y":354.68753242492676,"z":"f77957d3.436788","wires":[["efa01d4c.daf8a","feae5d34.8a474"]]},{"id":"feae5d34.8a474","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":898.979320526123,"y":313.68753242492676,"z":"f77957d3.436788","wires":[["215e20aa.17f1c"]]},{"id":"efa01d4c.daf8a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":886.9792747497559,"y":391.6874713897705,"z":"f77957d3.436788","wires":[["377be37d.dbad3c"]]},{"id":"377be37d.dbad3c","type":"switchNode","name":"getVnfHierarchy_result ?","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":1047.9791984558105,"y":459.79861640930176,"z":"f77957d3.436788","wires":[["11ebb613.07c99a","43836cda.890e74"]]},{"id":"11ebb613.07c99a","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1254.97953414917,"y":520.7986755371094,"z":"f77957d3.436788","wires":[["ef94726d.4aae5"]]},{"id":"43836cda.890e74","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1253.9794425964355,"y":399.79861640930176,"z":"f77957d3.436788","wires":[["215e20aa.17f1c"]]},{"id":"ef94726d.4aae5","type":"switchNode","name":"VNF_VMCount ?","xml":"<switch test='`$VNF.VMCount`'>","comments":"","outputs":1,"x":1288.97953414917,"y":588.9095458984375,"z":"f77957d3.436788","wires":[["952ce3f8.01a9e","eb66eab0.036e88"]]},{"id":"952ce3f8.01a9e","type":"outcome","name":"0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1474.9791679382324,"y":521.9096984863281,"z":"f77957d3.436788","wires":[["3a947231.c5d04e"]]},{"id":"eb66eab0.036e88","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1394.9791679382324,"y":654.90966796875,"z":"f77957d3.436788","wires":[["777e65f.8ffec9c"]]},{"id":"777e65f.8ffec9c","type":"execute","name":"Get Execution Flow","xml":"<execute plugin='org.onap.appc.dg.common.VnfExecutionFlow' method='getVnfExecutionFlowData' >\n<parameter name=\"DependencyType\" value='RESOURCE' />\n<parameter name=\"FlowStrategy\" value='FORWARD' />\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfVersion\" value='`$vnf.version`' />\n","comments":"","outputs":1,"x":1452.9791679382324,"y":730.0208740234375,"z":"f77957d3.436788","wires":[["522a1860.9fb9c8","b54140f0.04101"]]},{"id":"522a1860.9fb9c8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1644.9789848327637,"y":730.0207233428955,"z":"f77957d3.436788","wires":[["1e3f1032.b213d"]]},{"id":"b54140f0.04101","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1643.97904586792,"y":651.020751953125,"z":"f77957d3.436788","wires":[["328235af.1f26fa"]]},{"id":"b2aedd26.cf3c9","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":713.979564666748,"y":237.68750190734863,"z":"f77957d3.436788","wires":[["a17353c8.0a34b","76da6170.dde8f"]]},{"id":"a17353c8.0a34b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","x":911.3125114440918,"y":238.21122932434082,"z":"f77957d3.436788","wires":[]},{"id":"215e20aa.17f1c","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1408.7570457458496,"y":316.57641792297363,"z":"f77957d3.436788","wires":[["4fe9b7ed.1601f8","ca19586f.86d648"]]},{"id":"4fe9b7ed.1601f8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1597.7572135925293,"y":377.57641792297363,"z":"f77957d3.436788","wires":[]},{"id":"3a947231.c5d04e","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1605.3126640319824,"y":520.9097595214844,"z":"f77957d3.436788","wires":[["97f70dfc.79444","e1d3466f.0e7098"]]},{"id":"97f70dfc.79444","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1794.3126640319824,"y":549.9098205566406,"z":"f77957d3.436788","wires":[]},{"id":"328235af.1f26fa","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1778.3126640319824,"y":652.1318073272705,"z":"f77957d3.436788","wires":[["24b5e0d0.c01c6","d3f21815.793788"]]},{"id":"24b5e0d0.c01c6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1967.3131523132324,"y":687.131929397583,"z":"f77957d3.436788","wires":[]},{"id":"93d0ecc5.6556b","type":"for","name":"For each VNFC","xml":"<for index='i' start='0' end='`$vnfcFlowCount`' >\n","comments":"","outputs":1,"x":2342.5345039367676,"y":866.3541383743286,"z":"f77957d3.436788","wires":[["11fb64b5.aabd0b"]]},{"id":"67a8f3f3.8d9cbc","type":"call","name":"call VNFC DG","xml":"<call module='`$Rebuild.dg_module`' rpc='`$Rebuild.dg_name`' mode='sync' version='`$Rebuild.dg_version`'>\n","comments":"","outputs":1,"x":2754.534282684326,"y":950.4653339385986,"z":"f77957d3.436788","wires":[["d9556b49.ff6288","5d547b5d.13dd54","259d70ea.9205b"]]},{"id":"4a7f68fb.0b9158","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2137.534770965576,"y":864.3543109893799,"z":"f77957d3.436788","wires":[["93d0ecc5.6556b","ccca5726.839cc8","1ab58ce2.ef51e3"]]},{"id":"44559cc.a01e864","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2990.534526824951,"y":717.3544635772705,"z":"f77957d3.436788","wires":[["2596cb0e.a268b4"]]},{"id":"c8863e0a.cada4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2986.534282684326,"y":799.3544635772705,"z":"f77957d3.436788","wires":[["a339e96.0db2d18"]]},{"id":"a339e96.0db2d18","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3132.819637298584,"y":796.3544721603394,"z":"f77957d3.436788","wires":[["b6d198f4.0d1278","b0d45e14.49d5c"]]},{"id":"b6d198f4.0d1278","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3354.534038543701,"y":799.3544635772705,"z":"f77957d3.436788","wires":[]},{"id":"259d70ea.9205b","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2950.311870574951,"y":998.5765399932861,"z":"f77957d3.436788","wires":[["926558dc.646c48"]]},{"id":"5d547b5d.13dd54","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2948.312114715576,"y":906.576509475708,"z":"f77957d3.436788","wires":[["50a44cd4.d414e4"]]},{"id":"d9556b49.ff6288","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2960.312358856201,"y":950.5765399932861,"z":"f77957d3.436788","wires":[["99a282c4.2df92"]]},{"id":"11fb64b5.aabd0b","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2513.2009086608887,"y":865.5765399932861,"z":"f77957d3.436788","wires":[["67a8f3f3.8d9cbc","7b35db37.4c0c44","f46a554a.bb3ab8","404a068e.f88bb8"]]},{"id":"1e3f1032.b213d","type":"switchNode","name":"dependencyModelFound","xml":"<switch test='`$dependencyModelFound`'>\n","comments":"","outputs":1,"x":1790.9791679382324,"y":809.4653015136719,"z":"f77957d3.436788","wires":[["22bf2bd5.9d34d4","dc4848ab.c0f558"]]},{"id":"22bf2bd5.9d34d4","type":"outcome","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1988.6460990905762,"y":754.5763874053955,"z":"f77957d3.436788","wires":[["d3204260.85134"]]},{"id":"d3204260.85134","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2114.0908012390137,"y":754.6874713897705,"z":"f77957d3.436788","wires":[["52cba35.33bcb5c","58b344dc.ff91ec"]]},{"id":"52cba35.33bcb5c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2294.0905570983887,"y":754.6874713897705,"z":"f77957d3.436788","wires":[]},{"id":"dc4848ab.c0f558","type":"outcome","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1995.9791069030762,"y":864.4655170440674,"z":"f77957d3.436788","wires":[["4a7f68fb.0b9158"]]},{"id":"7b35db37.4c0c44","type":"execute","name":"Resolve VNFC DG","xml":"<execute plugin='org.onap.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcFlow[$i].vnfcType`' />\n<parameter name=\"action\" value=\"Rebuild\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"Rebuild\" />\n","comments":"","outputs":1,"x":2747.312114715576,"y":758.437593460083,"z":"f77957d3.436788","wires":[["44559cc.a01e864","c8863e0a.cada4"]]},{"id":"f46a554a.bb3ab8","type":"set","name":"set DG Parameters","xml":"<set>\n<parameter name='vnfcName' value='`$vnfcFlow[$i].vnfcName`' />\n<parameter name='vnfcType' value='`$vnfcFlow[$i].vnfcType`' />\n<parameter name='resilienceType' value='`$vnfcFlow[$i].resilienceType`' />\n<parameter name='vmCount' value='`$vnfcFlow[$i].vmCount`' />\n<parameter name='input.action' value='`$input.action`' />\n<parameter name='HealthyVMCountAfterRebuild' value='0' />\n<parameter name='AAIUpdateSuccessFlag' value='false' />\n<parameter name='HealthcheckDGResolutionFlag' value='false' />","comments":"","x":2748.3394660949707,"y":809.5209503173828,"z":"f77957d3.436788","wires":[]},{"id":"404a068e.f88bb8","type":"for","name":"For Each VM","xml":"<for index='j' start='0' end='`$vnfcFlow[$i].vmCount`' >\n","comments":"","outputs":1,"x":2742.11727142334,"y":864.4929323196411,"z":"f77957d3.436788","wires":[["278b0a4a.a73a06"]]},{"id":"278b0a4a.a73a06","type":"set","name":"Set VM URL","xml":"<set>\n<parameter name=\"$vm[$j].url\" value='`$vnfcFlow[$i].vm[$j].url`' />","comments":"","x":2940.117290496826,"y":858.4928302764893,"z":"f77957d3.436788","wires":[]},{"id":"50a44cd4.d414e4","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3111.201030731201,"y":905.6875324249268,"z":"f77957d3.436788","wires":[["caad9bb9.958e28","788bd40a.39f6cc"]]},{"id":"caad9bb9.958e28","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3337.201274871826,"y":903.6875629425049,"z":"f77957d3.436788","wires":[]},{"id":"99a282c4.2df92","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3126.201030731201,"y":951.6875629425049,"z":"f77957d3.436788","wires":[["c1c2198e.b73818"]]},{"id":"ae52a5c8.97a288","type":"switchNode","name":"switch_vm_rebuild_success","xml":"<switch test='`$HealthyVMCountAfterRebuild >= 1 and $AAIUpdateSuccessFlag == true`'>\n","comments":"","outputs":1,"x":3738.7842330932617,"y":953.0489025115967,"z":"f77957d3.436788","wires":[["b21bf1ff.bd44","5b5f2276.10bb4c"]]},{"id":"5b5f2276.10bb4c","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":3945.062313079834,"y":896.7989635467529,"z":"f77957d3.436788","wires":[["f4ce492.fb423b8"]]},{"id":"b21bf1ff.bd44","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3929.062313079834,"y":1008.5488433837891,"z":"f77957d3.436788","wires":[["a294dfb8.f861e"]]},{"id":"f4ce492.fb423b8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":4081.0620727539062,"y":898.0489025115967,"z":"f77957d3.436788","wires":[["122dbb1e.5a5a05","e05695d0.20cab8","1a818ff1.7d3c","e479b650.bda0f8","96766d41.3d0c2"]]},{"id":"91041bf9.e984f8","type":"set","name":"update failed VNFC count","xml":"<set>\n<parameter name=\"FailedVNFCCount\" value=\"`$FailedVNFCCount + 1`\" />\n","comments":"","x":4266.229263305664,"y":1062.7987823486328,"z":"f77957d3.436788","wires":[]},{"id":"122dbb1e.5a5a05","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":4265.367492675781,"y":953.5490856170654,"z":"f77957d3.436788","wires":[]},{"id":"a294dfb8.f861e","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":4065.423107147217,"y":1009.9099273681641,"z":"f77957d3.436788","wires":[["91041bf9.e984f8","6f1de83d.2a2998"]]},{"id":"1ab58ce2.ef51e3","type":"switchNode","name":"switch_vnfc_rebuild_success","xml":"<switch test='`$FailedVNFCCount == 0`'>\n","comments":"","outputs":1,"x":2389.756694793701,"y":1038.687593460083,"z":"f77957d3.436788","wires":[["637851ad.9627a","f0efea53.43f2c8"]]},{"id":"637851ad.9627a","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2603.756694793701,"y":1000.6875324249268,"z":"f77957d3.436788","wires":[["cc826579.efac68"]]},{"id":"f0efea53.43f2c8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2604.256938934326,"y":1077.687593460083,"z":"f77957d3.436788","wires":[["e4468fd0.07a52"]]},{"id":"cc826579.efac68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2762.025737762451,"y":1000.2043781280518,"z":"f77957d3.436788","wires":[]},{"id":"e4468fd0.07a52","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":2765.256694793701,"y":1076.6044025421143,"z":"f77957d3.436788","wires":[]},{"id":"ccca5726.839cc8","type":"set","name":"set Failed VNFC Count","xml":"<set>\n<parameter name='FailedVNFCCount' value='0' />","comments":"","x":2359.756694793701,"y":806.6875629425049,"z":"f77957d3.436788","wires":[]},{"id":"926558dc.646c48","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Rebuild successful for VNFC : ' + $vnfcName `\"/>\n","comments":"","outputs":1,"x":3130.0897178649902,"y":999.6878213882446,"z":"f77957d3.436788","wires":[[]]},{"id":"e05695d0.20cab8","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":4282.089900970459,"y":831.4378781318665,"z":"f77957d3.436788","wires":[[]]},{"id":"6f1de83d.2a2998","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Failed to Rebuild all VMs for VNFC : ' + $vnfcName + '. But successfully Rebuilt '+ $HealthyVMCountAfterRebuild +' VM/s so continue to next VNFC'`\"/>\n","comments":"","outputs":1,"x":4232.768569946289,"y":1006.5807037353516,"z":"f77957d3.436788","wires":[[]]},{"id":"2596cb0e.a268b4","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'VNFC DG for ' + $vnfcName + ' resolves to rpc: ' + $Rebuild.dg_name + ', module: ' + $Rebuild.dg_module + ', version: ' + $Rebuild.dg_version `\"/>\n","comments":"","outputs":1,"x":3148.201274871826,"y":717.6877765655518,"z":"f77957d3.436788","wires":[[]]},{"id":"67776999.51d8f8","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'None of the VMs of VNFC ' + $vnfcName + ' are Rebuilt successfully. Not proceeding to the next VNFC.'`\" />","comments":"","x":4692.192939758301,"y":825.5412721633911,"z":"f77957d3.436788","wires":[]},{"id":"1a818ff1.7d3c","type":"switchNode","name":"switch_aai_update_success","xml":"<switch test='`$AAIUpdateSuccessFlag`'>\n","comments":"","outputs":1,"x":4300.367980957031,"y":791.6320915222168,"z":"f77957d3.436788","wires":[["65446424.620e0c","ae30b408.0a1e68"]]},{"id":"ae30b408.0a1e68","type":"outcomeFalse","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":4508.146545410156,"y":825.3822145462036,"z":"f77957d3.436788","wires":[["67776999.51d8f8"]]},{"id":"65446424.620e0c","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":4507.146789550781,"y":760.6319689750671,"z":"f77957d3.436788","wires":[["261792e6.bf79be"]]},{"id":"261792e6.bf79be","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'AAI update for VNFC ' + $vnfcName + '  failed. Not proceeding to the next VNFC.'`\" />","comments":"","x":4697.479560852051,"y":760.3822135925293,"z":"f77957d3.436788","wires":[]},{"id":"76da6170.dde8f","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failure in flattening payload Json\" />","comments":"","outputs":1,"x":944.3126335144043,"y":189.5763874053955,"z":"f77957d3.436788","wires":[["87b305c2.55be58"]]},{"id":"24fda060.75b99","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1792.3126029968262,"y":268.5763874053955,"z":"f77957d3.436788","wires":[["a4743018.e3d08"]]},{"id":"a4743018.e3d08","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1970.8841361999512,"y":268.29065132141113,"z":"f77957d3.436788","wires":[[]]},{"id":"ca19586f.86d648","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failed to retrieve VNF details from A&amp;AI\" />","comments":"","outputs":1,"x":1613.3126335144043,"y":267.5763874053955,"z":"f77957d3.436788","wires":[["24fda060.75b99"]]},{"id":"6d00b87f.e84a98","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1353.9791984558105,"y":188.5763874053955,"z":"f77957d3.436788","wires":[[]]},{"id":"87b305c2.55be58","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1152.4076652526855,"y":188.86212348937988,"z":"f77957d3.436788","wires":[["6d00b87f.e84a98"]]},{"id":"e1d3466f.0e7098","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Server/VNFC does not exists in A&amp;AI for the VNF\" />","comments":"","outputs":1,"x":1803.97953414917,"y":488.6875,"z":"f77957d3.436788","wires":[["2b410a66.bb6ac6"]]},{"id":"2b410a66.bb6ac6","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2348.9794731140137,"y":486.68750190734863,"z":"f77957d3.436788","wires":[["9e2af8d.3cbc608"]]},{"id":"9e2af8d.3cbc608","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2522.5510063171387,"y":486.40176582336426,"z":"f77957d3.436788","wires":[[]]},{"id":"d3f21815.793788","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />","comments":"","outputs":1,"x":1994.9794692993164,"y":611.7985947132111,"z":"f77957d3.436788","wires":[["2b410a66.bb6ac6"]]},{"id":"58b344dc.ff91ec","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />","comments":"","outputs":1,"x":2281.6454887390137,"y":665.7985553741455,"z":"f77957d3.436788","wires":[["2b410a66.bb6ac6"]]},{"id":"b0d45e14.49d5c","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Failed to retrieve VNFC DG for : ' + $vnfcFlow[$i].vnfcType`\"/>","comments":"","outputs":1,"x":3381.7571983337402,"y":752.9097415208817,"z":"f77957d3.436788","wires":[["72dfca4f.62a4d4"]]},{"id":"72dfca4f.62a4d4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3618.8770141601562,"y":750.8344230651855,"z":"f77957d3.436788","wires":[["dc2979a5.4b84e8"]]},{"id":"dc2979a5.4b84e8","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":3845.4485473632812,"y":750.1200675964355,"z":"f77957d3.436788","wires":[[]]},{"id":"788bd40a.39f6cc","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'VNFC DG not found for : ' + $vnfcName`\"/>","comments":"","outputs":1,"x":3346.8682823181152,"y":858.9097442626953,"z":"f77957d3.436788","wires":[["72dfca4f.62a4d4"]]},{"id":"33642eb2.ef4d82","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\"/>","comments":"","outputs":1,"x":4630.340351104736,"y":912.9097423553467,"z":"f77957d3.436788","wires":[["aa0c5a08.e34788"]]},{"id":"aa0c5a08.e34788","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4820.56333732605,"y":912.5487775802612,"z":"f77957d3.436788","wires":[["729c89d.f391b78"]]},{"id":"729c89d.f391b78","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":5005.31268119812,"y":912.187593460083,"z":"f77957d3.436788","wires":[[]]},{"id":"e479b650.bda0f8","type":"set","name":"Set last count","xml":"<set>\n<parameter name='lastVNFCIndex' value='`$vnfcFlowCount - 1`' />","comments":"","x":4276.250019073486,"y":874.6875133514404,"z":"f77957d3.436788","wires":[]},{"id":"96766d41.3d0c2","type":"switchNode","name":"Last vnfc?","xml":"<switch test='`$i >= $lastVNFCIndex`'>\n","comments":"","outputs":1,"x":4285.6250648498535,"y":912.1875133514404,"z":"f77957d3.436788","wires":[["16047b15.b41365"]]},{"id":"16047b15.b41365","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":4444.687517166138,"y":912.8125133514404,"z":"f77957d3.436788","wires":[["33642eb2.ef4d82"]]},{"id":"c1c2198e.b73818","type":"switchNode","name":"switch_healthcheck_res_flag","xml":"<switch test='`$HealthcheckDGResolutionFlag`'>\n","comments":"","outputs":1,"x":3334.6875534057617,"y":952.1875152587891,"z":"f77957d3.436788","wires":[["4727ccbc.cc3de4","27793737.47e1b8"]]},{"id":"4727ccbc.cc3de4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3539.6875534057617,"y":952.1875143051147,"z":"f77957d3.436788","wires":[["ae52a5c8.97a288"]]},{"id":"27793737.47e1b8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":3544.6875,"y":1029.6875,"z":"f77957d3.436788","wires":[["47b9a4c3.5580bc"]]},{"id":"47b9a4c3.5580bc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3722.1875534057617,"y":1029.687515258789,"z":"f77957d3.436788","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Rebuild_VNFC.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Rebuild_VNFC.json
index 8c0d169c0..f9aeb293f 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Rebuild_VNFC.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Rebuild_VNFC.json
@@ -1 +1 @@
-[{"id":"d0c7cb01.587088","type":"dgstart","name":"DGSTART","outputs":1,"x":95.80625915527344,"y":66.82500457763672,"z":"1d241215.b25dde","wires":[["dd12bd67.a0f56"]]},{"id":"dd12bd67.a0f56","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":254.8063735961914,"y":66.8249921798706,"z":"1d241215.b25dde","wires":[["5f7f02ec.a69dbc"]]},{"id":"5f7f02ec.a69dbc","type":"method","name":"Rebuild_VNFC","xml":"<method rpc='Rebuild_VNFC' mode='sync'>\n","comments":"","outputs":1,"x":168.80636978149414,"y":213.8249807357788,"z":"1d241215.b25dde","wires":[["4d5149f1.260ce8"]]},{"id":"4d5149f1.260ce8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"false","comments":"","outputs":1,"x":170.16352081298828,"y":986.6821060180664,"z":"1d241215.b25dde","wires":[["ebd0580f.b36a18","758341ee.5afe2","8f3931fa.2e44a","67cc2227.82d17c","86eb9e9c.6b536"]]},{"id":"ebd0580f.b36a18","type":"execute","name":"Resolve Healthcheck DG","xml":"<execute plugin='org.openecomp.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"HealthCheck\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"HealthCheckDG\" />\n","comments":"","outputs":1,"x":617.806396484375,"y":436.07499980926514,"z":"1d241215.b25dde","wires":[["3adb353.99b99ca","c46da7cb.0edfd8","62240bdd.b27214"]]},{"id":"3adb353.99b99ca","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":912.806396484375,"y":381.32499980926514,"z":"1d241215.b25dde","wires":[["ae0cdeda.66656"]]},{"id":"ae0cdeda.66656","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1099.5286884307861,"y":380.49382305145264,"z":"1d241215.b25dde","wires":[["5c9c676a.abbfb8","65d3ed59.5345c4","57e27acc.e98974","1aebb7be.5306f8"]]},{"id":"5c9c676a.abbfb8","type":"set","name":"Set Message","xml":"<set>\n<parameter name='event-message' value=\"`'Healthcheck DG resolution plugin not found for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1285.0564041137695,"y":368.0749988555908,"z":"1d241215.b25dde","wires":[]},{"id":"c46da7cb.0edfd8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":929.5564575195312,"y":435.07499980926514,"z":"1d241215.b25dde","wires":[["befd0327.5a538"]]},{"id":"befd0327.5a538","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1076.0286903381348,"y":434.9638547897339,"z":"1d241215.b25dde","wires":[["f008480f.166a88","65d3ed59.5345c4","57e27acc.e98974","1aebb7be.5306f8"]]},{"id":"f008480f.166a88","type":"set","name":"Set Message","xml":"<set>\n<parameter name='event-message' value=\"`'Error while resolving Healthcheck DG for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1286.278450012207,"y":408.96391582489014,"z":"1d241215.b25dde","wires":[]},{"id":"62240bdd.b27214","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":818.9451293945312,"y":499.7138566970825,"z":"1d241215.b25dde","wires":[["6080e29d.eac52c"]]},{"id":"2940d020.da57b","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Healthchek DG resolved to : ' + $HealthCheckDG.dg_name`\"/>\n","comments":"","outputs":1,"x":1111.3619422912598,"y":492.2138566970825,"z":"1d241215.b25dde","wires":[[]]},{"id":"65d3ed59.5345c4","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1307.8472995758057,"y":450.263783454895,"z":"1d241215.b25dde","wires":[[]]},{"id":"1aebb7be.5306f8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1349.7229080200195,"y":489.07500171661377,"z":"1d241215.b25dde","wires":[["d60d692e.990628"]]},{"id":"57e27acc.e98974","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value=\"`$error-message`\"/>","comments":"","x":1318.834186553955,"y":528.4339361190796,"z":"1d241215.b25dde","wires":[]},{"id":"d60d692e.990628","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1844.722339630127,"y":496.07498836517334,"z":"1d241215.b25dde","wires":[["145d9131.e1d4cf"]]},{"id":"145d9131.e1d4cf","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2030.2939949035645,"y":495.78925228118896,"z":"1d241215.b25dde","wires":[[]]},{"id":"758341ee.5afe2","type":"execute","name":"Update AAI Status","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Rebuilding\" />","comments":"","outputs":1,"x":652.3063011169434,"y":724.0750169754028,"z":"1d241215.b25dde","wires":[["dfd330fa.83396","bc51b6b6.be5498"]]},{"id":"dfd330fa.83396","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":857.3057975769043,"y":724.0750017166138,"z":"1d241215.b25dde","wires":[["13d3c724.57ca69"]]},{"id":"13d3c724.57ca69","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1020.2739448547363,"y":722.1067428588867,"z":"1d241215.b25dde","wires":[["28827390.015fdc","52dcec48.33a434","d0b6d307.edd5e"]]},{"id":"a2de3da7.a56b5","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1411.9095191955566,"y":725.9639024734497,"z":"1d241215.b25dde","wires":[["993e98c.e0c8868","7b879bdd.4e64d4"]]},{"id":"7b879bdd.4e64d4","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNFC details in A&amp;AI for VNFC ' + $vnfcName`\" />","comments":"","outputs":1,"x":1599.9565200805664,"y":687.0750160217285,"z":"1d241215.b25dde","wires":[["d60d692e.990628"]]},{"id":"993e98c.e0c8868","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1573.8138542175293,"y":752.356743812561,"z":"1d241215.b25dde","wires":[]},{"id":"8f3931fa.2e44a","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":484.8062400817871,"y":919.1107482910156,"z":"1d241215.b25dde","wires":[["888c87ed.367a08","51109337.2748fc"]]},{"id":"888c87ed.367a08","type":"set","name":"init","xml":"<set>\n<parameter name='rebuildFailedCount' value='0' />\n<parameter name='rebuildSuccessCount' value='0' />\n","comments":"","x":680.7853965759277,"y":875.3965349197388,"z":"1d241215.b25dde","wires":[]},{"id":"51109337.2748fc","type":"for","name":"For Each VM","xml":"<for index=\"index1\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":686.820613861084,"y":969.1465358734131,"z":"1d241215.b25dde","wires":[["8db2e331.18b49"]]},{"id":"adb5e84a.4c3068","type":"comment","name":"Rebuild server","info":"","comments":"","x":489.7518119812012,"y":872.405366897583,"z":"1d241215.b25dde","wires":[]},{"id":"e9be6721.06d0e8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1340.6279067993164,"y":978.9679269790649,"z":"1d241215.b25dde","wires":[["cebfb71a.399308","45d955de.ffd76c","257e0cb.97519f4"]]},{"id":"cebfb71a.399308","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Attempting to rebuild the server : ' + $vm[$index1].url`\"/>\n","comments":"","outputs":1,"x":1540.4853630065918,"y":939.2535924911499,"z":"1d241215.b25dde","wires":[[]]},{"id":"257e0cb.97519f4","type":"set","name":"Set Parameters","xml":"<set>\n<parameter name=\"rebuild-vm-url\" value=\"`$vm[$index1].url`\" />\n<parameter name='rebuildRetryCount' value='3'/>\n","comments":"","x":1530.1462478637695,"y":986.6823034286499,"z":"1d241215.b25dde","wires":[]},{"id":"45d955de.ffd76c","type":"call","name":"Rebuild","xml":"<call module='APPC' rpc='Rebuild_VM' mode='sync' >\n","comments":"","outputs":1,"x":1537.1463737487793,"y":1037.6820602416992,"z":"1d241215.b25dde","wires":[["4821dca9.597c04","acffa2c8.84ab5","3b311d1c.0273c2"]]},{"id":"3b311d1c.0273c2","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1733.4795379638672,"y":958.6821508407593,"z":"1d241215.b25dde","wires":[["a831888e.1f1638"]]},{"id":"4821dca9.597c04","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1741.3467254638672,"y":1039.6107397079468,"z":"1d241215.b25dde","wires":[["4229269a.bab898"]]},{"id":"acffa2c8.84ab5","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1734.7016906738281,"y":1123.6821508407593,"z":"1d241215.b25dde","wires":[["3727c6bd.c3842a"]]},{"id":"a831888e.1f1638","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1869.4795379638672,"y":958.682089805603,"z":"1d241215.b25dde","wires":[["6c160aea.84b384","be1298ee.227198","8541099f.4e46e8"]]},{"id":"4229269a.bab898","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1887.1304168701172,"y":1039.539267539978,"z":"1d241215.b25dde","wires":[["be1298ee.227198","8541099f.4e46e8","faf4f9eb.717e58"]]},{"id":"3727c6bd.c3842a","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1887.8442687988281,"y":1123.8250341415405,"z":"1d241215.b25dde","wires":[["5192b20a.4107fc","d7a887d6.a9e708","6158eeca.5f084"]]},{"id":"6c160aea.84b384","type":"set","name":"Set message","xml":"<set>\n<parameter name='event-message' value=\"`'DG to execute Rebuild action not found for VM: ' + $vm[$index1].url`\"/>\n<parameter name=\"rebuildFailedCount\" value=\"`$rebuildFailedCount + 1`\" />","comments":"","x":2116.550678253174,"y":900.6465406417847,"z":"1d241215.b25dde","wires":[]},{"id":"be1298ee.227198","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2109.381244659424,"y":994.1226167678833,"z":"1d241215.b25dde","wires":[[]]},{"id":"8541099f.4e46e8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2125.7230377197266,"y":1040.6504487991333,"z":"1d241215.b25dde","wires":[["951f2311.e3f1b"]]},{"id":"d7a887d6.a9e708","type":"set","name":"Increment Rebuilt vm count","xml":"<set>\n<parameter name='rebuildSuccessCount' value='`$rebuildSuccessCount+1`' />\n","comments":"","x":2121.9837799072266,"y":1138.459776878357,"z":"1d241215.b25dde","wires":[]},{"id":"5192b20a.4107fc","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Rebuild succeeded for the server : ' + $vm[$index1].url`\"/>\n","comments":"","outputs":1,"x":2081.2371978759766,"y":1188.2535953521729,"z":"1d241215.b25dde","wires":[[]]},{"id":"134d6532.cc4ccb","type":"call","name":"Call Healthcheck DG","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":1127.7873611450195,"y":1460.7326030731201,"z":"1d241215.b25dde","wires":[["9955c6b2.3a20f8","c3075985.85d5c8","eb07eb85.4d0ce8"]]},{"id":"9955c6b2.3a20f8","type":"outcome","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1334.4823684692383,"y":1460.4997491836548,"z":"1d241215.b25dde","wires":[["e108e61a.0b54c8"]]},{"id":"c3075985.85d5c8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1342.9990921020508,"y":1418.8376398086548,"z":"1d241215.b25dde","wires":[["db553441.3b6ad8"]]},{"id":"eb07eb85.4d0ce8","type":"outcome","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1341.7326126098633,"y":1508.9996271133423,"z":"1d241215.b25dde","wires":[["aaccc107.0bdfa"]]},{"id":"aaccc107.0bdfa","type":"for","name":"For Each VM","xml":"<for index=\"index1\" start=\"0\" end=\"`$healthcheck.vmCount`\" >","comments":"","outputs":1,"x":1526.2326736450195,"y":1530.8212323188782,"z":"1d241215.b25dde","wires":[["43ac397d.ec34c8"]]},{"id":"db553441.3b6ad8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1532.4824829101562,"y":1417.2497177124023,"z":"1d241215.b25dde","wires":[["b734f6e2.e9c078","c9cb0dac.8ad56","aeea61b7.91b7d","c4c875e.5363488"]]},{"id":"e108e61a.0b54c8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1537.232494354248,"y":1464.249656677246,"z":"1d241215.b25dde","wires":[["7f1fd1b5.693fb","b734f6e2.e9c078","aeea61b7.91b7d","c4c875e.5363488"]]},{"id":"43ac397d.ec34c8","type":"switchNode","name":"Healthcheck status ?","xml":"<switch test=\"`$healthcheck.vm[$index1].status`\">\n","comments":"","outputs":1,"x":1789.947036743164,"y":1530.8209829330444,"z":"1d241215.b25dde","wires":[["dceaf505.ff0098","f36ff68e.abe4e8"]]},{"id":"dceaf505.ff0098","type":"other","name":"UP","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":2042.483139038086,"y":1562.1426229476929,"z":"1d241215.b25dde","wires":[["51697d75.cd6674"]]},{"id":"7f1fd1b5.693fb","type":"set","name":"Set Message","xml":"<set>\n<parameter name='event-message' value=\"Error occurred during health check of the rebuilt servers\"/>","comments":"","x":1785.2325592041016,"y":1315.249568939209,"z":"1d241215.b25dde","wires":[]},{"id":"c9cb0dac.8ad56","type":"set","name":"Set Message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1783.8995513916016,"y":1352.2495698928833,"z":"1d241215.b25dde","wires":[]},{"id":"b734f6e2.e9c078","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1771.3658599853516,"y":1389.0623140335083,"z":"1d241215.b25dde","wires":[[]]},{"id":"d45c9614.ff8588","type":"set","name":"Set Message","xml":"<set>\n<parameter name='event-message' value=\"`'Health check failed for the rebuilt server : ' + $healthcheck.vm[$index1].url`\"/>\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthCheckFailedCount + 1`\" />","comments":"","x":2491.161521911621,"y":1413.5354585647583,"z":"1d241215.b25dde","wires":[]},{"id":"89862589.b9b638","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2485.857322692871,"y":1457.8856801986694,"z":"1d241215.b25dde","wires":[[]]},{"id":"10d8313b.6051bf","type":"set","name":"Set Success Message","xml":"<set>\n<parameter name='success-message' value=\"`'Rebuild succeeded for the server : ' + $healthcheck.vm[$index1].url`\"/>\n<parameter name=\"HealthyVMCountAfterRebuild\" value=\"`$HealthyVMCountAfterRebuild + 1`\" />\n\n","comments":"","x":2447.537498474121,"y":1598.0661010742188,"z":"1d241215.b25dde","wires":[]},{"id":"df716347.e6da2","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":2429.359275817871,"y":1639.2800912857056,"z":"1d241215.b25dde","wires":[[]]},{"id":"ed2f324f.da23d","type":"execute","name":"Report Success","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\" />\n\n","comments":"","outputs":1,"x":2430.697410583496,"y":1682.8208627700806,"z":"1d241215.b25dde","wires":[[]]},{"id":"951f2311.e3f1b","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2333.702350616455,"y":1039.4829206466675,"z":"1d241215.b25dde","wires":[["64179684.35f708"]]},{"id":"64179684.35f708","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2536.218650817871,"y":1037.9474458694458,"z":"1d241215.b25dde","wires":[[]]},{"id":"aeea61b7.91b7d","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1802.5201034545898,"y":1464.2884397506714,"z":"1d241215.b25dde","wires":[["1e2450dd.4a0e2f"]]},{"id":"cc6dfd01.896b3","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2517.595359802246,"y":1494.3715200424194,"z":"1d241215.b25dde","wires":[["b4a8bb45.c9f6d8"]]},{"id":"c4c875e.5363488","type":"set","name":"update failed count","xml":"<set>\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthcheck.vmCount`\" />\n","comments":"","x":1802.7420806884766,"y":1426.6218852996826,"z":"1d241215.b25dde","wires":[]},{"id":"b4a8bb45.c9f6d8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2708.318546295166,"y":1493.8884372711182,"z":"1d241215.b25dde","wires":[["716d9887.b27778"]]},{"id":"716d9887.b27778","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2885.3351135253906,"y":1493.6029653549194,"z":"1d241215.b25dde","wires":[[]]},{"id":"414e92f3.6ca7cc","type":"execute","name":"Update_AAI_Status_Success","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Running\" />\n","comments":"","outputs":1,"x":1017.029541015625,"y":1923.084303855896,"z":"1d241215.b25dde","wires":[["e4f8a2ae.c664b","8830d2e7.45daa"]]},{"id":"dd55a83.d95aa58","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":992.0296249389648,"y":2025.084433555603,"z":"1d241215.b25dde","wires":[]},{"id":"cb3909f7.d8a288","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":797.4740219116211,"y":1923.0842504501343,"z":"1d241215.b25dde","wires":[["414e92f3.6ca7cc","dd55a83.d95aa58","a61ca9c.4fa5b58"]]},{"id":"a61ca9c.4fa5b58","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'VNFC Rebuilt successfully : ' + $vnfcName`\"/>\n","comments":"","outputs":1,"x":1001.91845703125,"y":1971.9732208251953,"z":"1d241215.b25dde","wires":[[]]},{"id":"8029027e.f9658","type":"execute","name":"Update_AAI_Status_Failure","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />","comments":"","outputs":1,"x":1007.0296630859375,"y":1780.08429813385,"z":"1d241215.b25dde","wires":[["e4f8a2ae.c664b","8830d2e7.45daa"]]},{"id":"2cac2089.b4761","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":979.0297470092773,"y":1857.084891319275,"z":"1d241215.b25dde","wires":[]},{"id":"4ac23437.50ab0c","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":790.8073348999023,"y":1780.9731664657593,"z":"1d241215.b25dde","wires":[["2cac2089.b4761","8029027e.f9658"]]},{"id":"e4f8a2ae.c664b","type":"not-found","name":"not-found/failure","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1314.743911743164,"y":1797.2271070480347,"z":"1d241215.b25dde","wires":[["9b043e36.9d60c"]]},{"id":"8830d2e7.45daa","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1263.0293502807617,"y":1922.0841588974,"z":"1d241215.b25dde","wires":[["10442df8.10d6a2"]]},{"id":"9b043e36.9d60c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1768.918628692627,"y":1801.8659811019897,"z":"1d241215.b25dde","wires":[["868194ed.771f68","5c1ea7a.87a7d58","91badf68.35f46"]]},{"id":"10442df8.10d6a2","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1390.1400680541992,"y":1921.973074913025,"z":"1d241215.b25dde","wires":[["10aa9304.7c72bd","a63ab149.af106"]]},{"id":"10aa9304.7c72bd","type":"outcome","name":"NOT_FOUND/FAILURE","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1587.9982528686523,"y":1911.1159162521362,"z":"1d241215.b25dde","wires":[["9b043e36.9d60c"]]},{"id":"868194ed.771f68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1935.1451568603516,"y":1882.1873254776,"z":"1d241215.b25dde","wires":[]},{"id":"67cc2227.82d17c","type":"switchNode","name":"switch_server_rebuild_success","xml":"<switch test='`$rebuildFailedCount == 0 and $healthCheckFailedCount == 0`'>\n","comments":"","outputs":1,"x":426.8077926635742,"y":1807.94855594635,"z":"1d241215.b25dde","wires":[["4e97dabd.435314","167e8229.670afe"]]},{"id":"167e8229.670afe","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":648.5578231811523,"y":1923.6986303329468,"z":"1d241215.b25dde","wires":[["cb3909f7.d8a288"]]},{"id":"4e97dabd.435314","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":654.0578231811523,"y":1780.698691368103,"z":"1d241215.b25dde","wires":[["4ac23437.50ab0c"]]},{"id":"a63ab149.af106","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1567.8079071044922,"y":1967.0047960281372,"z":"1d241215.b25dde","wires":[["ec1e6eda.5ef93"]]},{"id":"ec1e6eda.5ef93","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='true' />\n","comments":"","x":1760.3475456237793,"y":1967.0049495697021,"z":"1d241215.b25dde","wires":[]},{"id":"5c1ea7a.87a7d58","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNFC details in A&amp;AI for VNFC ' + $vnfcName`\" />","comments":"","outputs":1,"x":1947.2247467041016,"y":1773.7151613235474,"z":"1d241215.b25dde","wires":[["d297d0a9.cd082"]]},{"id":"d297d0a9.cd082","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2171.545925140381,"y":1812.0364608764648,"z":"1d241215.b25dde","wires":[["fef71859.ed0688"]]},{"id":"fef71859.ed0688","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2388.553768157959,"y":1811.8262910842896,"z":"1d241215.b25dde","wires":[[]]},{"id":"8db2e331.18b49","type":"switchNode","name":"switch STATUS","xml":"<switch test='`$REBUILD_STATUS`'>\n","comments":"","outputs":1,"x":932.1458740234375,"y":970.3964147567749,"z":"1d241215.b25dde","wires":[["695a1648.2fabf8","dc52391e.29dc48","6cbcba39.209574"]]},{"id":"dc52391e.29dc48","type":"other","name":"ERROR/EMPTY","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1142.1458587646484,"y":1018.9678344726562,"z":"1d241215.b25dde","wires":[["e9be6721.06d0e8"]]},{"id":"695a1648.2fabf8","type":"success","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1137.5746994018555,"y":907.6821279525757,"z":"1d241215.b25dde","wires":[["e9be6721.06d0e8"]]},{"id":"6cbcba39.209574","type":"other","name":"CONTEXT_NOT_FOUND","xml":"<outcome value='CONTEXT_NOT_FOUND'>\n","comments":"","outputs":1,"x":1113.5743942260742,"y":1123.2534818649292,"z":"1d241215.b25dde","wires":[["4ac23437.50ab0c"]]},{"id":"faf4f9eb.717e58","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`$error-message`\"/>\n<parameter name=\"rebuildFailedCount\" value=\"`$rebuildFailedCount + 1`\" />","comments":"","x":2132.056537628174,"y":945.2179517745972,"z":"1d241215.b25dde","wires":[]},{"id":"1e2450dd.4a0e2f","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1989.2350997924805,"y":1356.372338294983,"z":"1d241215.b25dde","wires":[["b3f01f64.5a4bb"]]},{"id":"b3f01f64.5a4bb","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2191.751609802246,"y":1359.122859954834,"z":"1d241215.b25dde","wires":[[]]},{"id":"51697d75.cd6674","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2201.734573364258,"y":1632.0866012573242,"z":"1d241215.b25dde","wires":[["10d8313b.6051bf","df716347.e6da2","ed2f324f.da23d"]]},{"id":"6cc7ff9b.69bb7","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2259.2346572875977,"y":1483.5153160095215,"z":"1d241215.b25dde","wires":[["d45c9614.ff8588","89862589.b9b638","cc6dfd01.896b3"]]},{"id":"bc51b6b6.be5498","type":"failure","name":"failure/notFound","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1068.0204811096191,"y":788.6107168197632,"z":"1d241215.b25dde","wires":[["a2de3da7.a56b5"]]},{"id":"86eb9e9c.6b536","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":587.4069175720215,"y":1158.584038734436,"z":"1d241215.b25dde","wires":[["c43287cc.92e448","2a43c35e.5e84ac"]]},{"id":"6158eeca.5f084","type":"set","name":"Mark vm Started","xml":"<set>\n<parameter name=\"rebuildServerList[$rebuildSuccessCount].url\" value=\"`$vm[$index1].url`\" />\n","comments":"","x":2082.5562896728516,"y":1090.2626266479492,"z":"1d241215.b25dde","wires":[]},{"id":"2a43c35e.5e84ac","type":"set","name":"init","xml":"<set>\n<parameter name='healthCheckFailedCount' value='0' />\n","comments":"","x":774.9135131835938,"y":1155.896544456482,"z":"1d241215.b25dde","wires":[]},{"id":"c43287cc.92e448","type":"switchNode","name":"rebuilt server > 0","xml":"<switch test='`$rebuildSuccessCount > 0`'>\n","comments":"","outputs":1,"x":755.5587158203125,"y":1207.3251333236694,"z":"1d241215.b25dde","wires":[["4b48e794.82cd18"]]},{"id":"4b48e794.82cd18","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":902.594482421875,"y":1286.360993385315,"z":"1d241215.b25dde","wires":[["d6ae113.fa83bf"]]},{"id":"d6ae113.fa83bf","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1033.056411743164,"y":1286.6108713150024,"z":"1d241215.b25dde","wires":[["dbe107fc.610df8","6ce69f34.f7c1c","7b94b5cb.b2ec5c","134d6532.cc4ccb"]]},{"id":"dbe107fc.610df8","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"Attempting to health check the rebuilt servers of the VNFC\"/>\n","comments":"","outputs":1,"x":1244.913459777832,"y":1254.468073606491,"z":"1d241215.b25dde","wires":[[]]},{"id":"6ce69f34.f7c1c","type":"for","name":"for_each_vm","xml":"<for index=\"index1\" start=\"0\" end=\"`$rebuildSuccessCount`\" >","comments":"","outputs":1,"x":1249.004035949707,"y":1299.087098121643,"z":"1d241215.b25dde","wires":[["abaea328.b02c7"]]},{"id":"7b94b5cb.b2ec5c","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$rebuildSuccessCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":1235.003791809082,"y":1342.0870933532715,"z":"1d241215.b25dde","wires":[]},{"id":"abaea328.b02c7","type":"set","name":"set : health check input list","xml":"<set>\n<parameter name=\"healthcheck.vm[$index1].url\" value=\"`$rebuildServerList[$index1].url`\" />\n","comments":"","x":1467.448257446289,"y":1300.1979331970215,"z":"1d241215.b25dde","wires":[]},{"id":"a3f09da0.00751","type":"comment","name":"Healthcheck Rebuilt servers","info":"","comments":"","x":564.9135284423828,"y":1243.0394353866577,"z":"1d241215.b25dde","wires":[]},{"id":"f36ff68e.abe4e8","type":"other","name":"UNKNOWN/DOWN","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2058.485061645508,"y":1484.4680242538452,"z":"1d241215.b25dde","wires":[["6cc7ff9b.69bb7"]]},{"id":"28827390.015fdc","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1204.02054977417,"y":696.646445274353,"z":"1d241215.b25dde","wires":[["a2de3da7.a56b5"]]},{"id":"52dcec48.33a434","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1191.020793914795,"y":744.646445274353,"z":"1d241215.b25dde","wires":[["a2de3da7.a56b5"]]},{"id":"55a13b8.748e8c4","type":"set","name":"Set flag","xml":"<set>\n<parameter name='HealthcheckDGResolutionFlag' value=\"true\"/>\n","comments":"","x":1112.3687782287598,"y":535.2625017166138,"z":"1d241215.b25dde","wires":[]},{"id":"6080e29d.eac52c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":957.3687782287598,"y":500.26250171661377,"z":"1d241215.b25dde","wires":[["2940d020.da57b","55a13b8.748e8c4"]]},{"id":"d0b6d307.edd5e","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1193.618782043457,"y":642.7625036239624,"z":"1d241215.b25dde","wires":[["b1345184.f11"]]},{"id":"b1345184.f11","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='true' />\n","comments":"","x":1401.118782043457,"y":644.0125036239624,"z":"1d241215.b25dde","wires":[]},{"id":"91badf68.35f46","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='false' />\n","comments":"","x":1966.1187896728516,"y":1825.2625207901,"z":"1d241215.b25dde","wires":[]}]
+[{"id":"d0c7cb01.587088","type":"dgstart","name":"DGSTART","outputs":1,"x":95.80625915527344,"y":66.82500457763672,"z":"1d241215.b25dde","wires":[["dd12bd67.a0f56"]]},{"id":"dd12bd67.a0f56","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":254.8063735961914,"y":66.8249921798706,"z":"1d241215.b25dde","wires":[["5f7f02ec.a69dbc"]]},{"id":"5f7f02ec.a69dbc","type":"method","name":"Rebuild_VNFC","xml":"<method rpc='Rebuild_VNFC' mode='sync'>\n","comments":"","outputs":1,"x":168.80636978149414,"y":213.8249807357788,"z":"1d241215.b25dde","wires":[["4d5149f1.260ce8"]]},{"id":"4d5149f1.260ce8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"false","comments":"","outputs":1,"x":170.16352081298828,"y":986.6821060180664,"z":"1d241215.b25dde","wires":[["ebd0580f.b36a18","758341ee.5afe2","8f3931fa.2e44a","67cc2227.82d17c","86eb9e9c.6b536"]]},{"id":"ebd0580f.b36a18","type":"execute","name":"Resolve Healthcheck DG","xml":"<execute plugin='org.onap.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"HealthCheck\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"HealthCheckDG\" />\n","comments":"","outputs":1,"x":617.806396484375,"y":436.07499980926514,"z":"1d241215.b25dde","wires":[["3adb353.99b99ca","c46da7cb.0edfd8","62240bdd.b27214"]]},{"id":"3adb353.99b99ca","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":912.806396484375,"y":381.32499980926514,"z":"1d241215.b25dde","wires":[["ae0cdeda.66656"]]},{"id":"ae0cdeda.66656","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1099.5286884307861,"y":380.49382305145264,"z":"1d241215.b25dde","wires":[["5c9c676a.abbfb8","65d3ed59.5345c4","57e27acc.e98974","1aebb7be.5306f8"]]},{"id":"5c9c676a.abbfb8","type":"set","name":"Set Message","xml":"<set>\n<parameter name='event-message' value=\"`'Healthcheck DG resolution plugin not found for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1285.0564041137695,"y":368.0749988555908,"z":"1d241215.b25dde","wires":[]},{"id":"c46da7cb.0edfd8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":929.5564575195312,"y":435.07499980926514,"z":"1d241215.b25dde","wires":[["befd0327.5a538"]]},{"id":"befd0327.5a538","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1076.0286903381348,"y":434.9638547897339,"z":"1d241215.b25dde","wires":[["f008480f.166a88","65d3ed59.5345c4","57e27acc.e98974","1aebb7be.5306f8"]]},{"id":"f008480f.166a88","type":"set","name":"Set Message","xml":"<set>\n<parameter name='event-message' value=\"`'Error while resolving Healthcheck DG for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1286.278450012207,"y":408.96391582489014,"z":"1d241215.b25dde","wires":[]},{"id":"62240bdd.b27214","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":818.9451293945312,"y":499.7138566970825,"z":"1d241215.b25dde","wires":[["6080e29d.eac52c"]]},{"id":"2940d020.da57b","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Healthchek DG resolved to : ' + $HealthCheckDG.dg_name`\"/>\n","comments":"","outputs":1,"x":1111.3619422912598,"y":492.2138566970825,"z":"1d241215.b25dde","wires":[[]]},{"id":"65d3ed59.5345c4","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1307.8472995758057,"y":450.263783454895,"z":"1d241215.b25dde","wires":[[]]},{"id":"1aebb7be.5306f8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1349.7229080200195,"y":489.07500171661377,"z":"1d241215.b25dde","wires":[["d60d692e.990628"]]},{"id":"57e27acc.e98974","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value=\"`$error-message`\"/>","comments":"","x":1318.834186553955,"y":528.4339361190796,"z":"1d241215.b25dde","wires":[]},{"id":"d60d692e.990628","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1844.722339630127,"y":496.07498836517334,"z":"1d241215.b25dde","wires":[["145d9131.e1d4cf"]]},{"id":"145d9131.e1d4cf","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2030.2939949035645,"y":495.78925228118896,"z":"1d241215.b25dde","wires":[[]]},{"id":"758341ee.5afe2","type":"execute","name":"Update AAI Status","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Rebuilding\" />","comments":"","outputs":1,"x":652.3063011169434,"y":724.0750169754028,"z":"1d241215.b25dde","wires":[["dfd330fa.83396","bc51b6b6.be5498"]]},{"id":"dfd330fa.83396","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":857.3057975769043,"y":724.0750017166138,"z":"1d241215.b25dde","wires":[["13d3c724.57ca69"]]},{"id":"13d3c724.57ca69","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1020.2739448547363,"y":722.1067428588867,"z":"1d241215.b25dde","wires":[["28827390.015fdc","52dcec48.33a434","d0b6d307.edd5e"]]},{"id":"a2de3da7.a56b5","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1411.9095191955566,"y":725.9639024734497,"z":"1d241215.b25dde","wires":[["993e98c.e0c8868","7b879bdd.4e64d4"]]},{"id":"7b879bdd.4e64d4","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNFC details in A&amp;AI for VNFC ' + $vnfcName`\" />","comments":"","outputs":1,"x":1599.9565200805664,"y":687.0750160217285,"z":"1d241215.b25dde","wires":[["d60d692e.990628"]]},{"id":"993e98c.e0c8868","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1573.8138542175293,"y":752.356743812561,"z":"1d241215.b25dde","wires":[]},{"id":"8f3931fa.2e44a","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":484.8062400817871,"y":919.1107482910156,"z":"1d241215.b25dde","wires":[["888c87ed.367a08","51109337.2748fc"]]},{"id":"888c87ed.367a08","type":"set","name":"init","xml":"<set>\n<parameter name='rebuildFailedCount' value='0' />\n<parameter name='rebuildSuccessCount' value='0' />\n","comments":"","x":680.7853965759277,"y":875.3965349197388,"z":"1d241215.b25dde","wires":[]},{"id":"51109337.2748fc","type":"for","name":"For Each VM","xml":"<for index=\"index1\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":686.820613861084,"y":969.1465358734131,"z":"1d241215.b25dde","wires":[["8db2e331.18b49"]]},{"id":"adb5e84a.4c3068","type":"comment","name":"Rebuild server","info":"","comments":"","x":489.7518119812012,"y":872.405366897583,"z":"1d241215.b25dde","wires":[]},{"id":"e9be6721.06d0e8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1340.6279067993164,"y":978.9679269790649,"z":"1d241215.b25dde","wires":[["cebfb71a.399308","45d955de.ffd76c","257e0cb.97519f4"]]},{"id":"cebfb71a.399308","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Attempting to rebuild the server : ' + $vm[$index1].url`\"/>\n","comments":"","outputs":1,"x":1540.4853630065918,"y":939.2535924911499,"z":"1d241215.b25dde","wires":[[]]},{"id":"257e0cb.97519f4","type":"set","name":"Set Parameters","xml":"<set>\n<parameter name=\"rebuild-vm-url\" value=\"`$vm[$index1].url`\" />\n<parameter name='rebuildRetryCount' value='3'/>\n","comments":"","x":1530.1462478637695,"y":986.6823034286499,"z":"1d241215.b25dde","wires":[]},{"id":"45d955de.ffd76c","type":"call","name":"Rebuild","xml":"<call module='APPC' rpc='Rebuild_VM' mode='sync' >\n","comments":"","outputs":1,"x":1537.1463737487793,"y":1037.6820602416992,"z":"1d241215.b25dde","wires":[["4821dca9.597c04","acffa2c8.84ab5","3b311d1c.0273c2"]]},{"id":"3b311d1c.0273c2","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1733.4795379638672,"y":958.6821508407593,"z":"1d241215.b25dde","wires":[["a831888e.1f1638"]]},{"id":"4821dca9.597c04","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1741.3467254638672,"y":1039.6107397079468,"z":"1d241215.b25dde","wires":[["4229269a.bab898"]]},{"id":"acffa2c8.84ab5","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1734.7016906738281,"y":1123.6821508407593,"z":"1d241215.b25dde","wires":[["3727c6bd.c3842a"]]},{"id":"a831888e.1f1638","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1869.4795379638672,"y":958.682089805603,"z":"1d241215.b25dde","wires":[["6c160aea.84b384","be1298ee.227198","8541099f.4e46e8"]]},{"id":"4229269a.bab898","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1887.1304168701172,"y":1039.539267539978,"z":"1d241215.b25dde","wires":[["be1298ee.227198","8541099f.4e46e8","faf4f9eb.717e58"]]},{"id":"3727c6bd.c3842a","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1887.8442687988281,"y":1123.8250341415405,"z":"1d241215.b25dde","wires":[["5192b20a.4107fc","d7a887d6.a9e708","6158eeca.5f084"]]},{"id":"6c160aea.84b384","type":"set","name":"Set message","xml":"<set>\n<parameter name='event-message' value=\"`'DG to execute Rebuild action not found for VM: ' + $vm[$index1].url`\"/>\n<parameter name=\"rebuildFailedCount\" value=\"`$rebuildFailedCount + 1`\" />","comments":"","x":2116.550678253174,"y":900.6465406417847,"z":"1d241215.b25dde","wires":[]},{"id":"be1298ee.227198","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2109.381244659424,"y":994.1226167678833,"z":"1d241215.b25dde","wires":[[]]},{"id":"8541099f.4e46e8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2125.7230377197266,"y":1040.6504487991333,"z":"1d241215.b25dde","wires":[["951f2311.e3f1b"]]},{"id":"d7a887d6.a9e708","type":"set","name":"Increment Rebuilt vm count","xml":"<set>\n<parameter name='rebuildSuccessCount' value='`$rebuildSuccessCount+1`' />\n","comments":"","x":2121.9837799072266,"y":1138.459776878357,"z":"1d241215.b25dde","wires":[]},{"id":"5192b20a.4107fc","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Rebuild succeeded for the server : ' + $vm[$index1].url`\"/>\n","comments":"","outputs":1,"x":2081.2371978759766,"y":1188.2535953521729,"z":"1d241215.b25dde","wires":[[]]},{"id":"134d6532.cc4ccb","type":"call","name":"Call Healthcheck DG","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":1127.7873611450195,"y":1460.7326030731201,"z":"1d241215.b25dde","wires":[["9955c6b2.3a20f8","c3075985.85d5c8","eb07eb85.4d0ce8"]]},{"id":"9955c6b2.3a20f8","type":"outcome","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1334.4823684692383,"y":1460.4997491836548,"z":"1d241215.b25dde","wires":[["e108e61a.0b54c8"]]},{"id":"c3075985.85d5c8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1342.9990921020508,"y":1418.8376398086548,"z":"1d241215.b25dde","wires":[["db553441.3b6ad8"]]},{"id":"eb07eb85.4d0ce8","type":"outcome","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1341.7326126098633,"y":1508.9996271133423,"z":"1d241215.b25dde","wires":[["aaccc107.0bdfa"]]},{"id":"aaccc107.0bdfa","type":"for","name":"For Each VM","xml":"<for index=\"index1\" start=\"0\" end=\"`$healthcheck.vmCount`\" >","comments":"","outputs":1,"x":1526.2326736450195,"y":1530.8212323188782,"z":"1d241215.b25dde","wires":[["43ac397d.ec34c8"]]},{"id":"db553441.3b6ad8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1532.4824829101562,"y":1417.2497177124023,"z":"1d241215.b25dde","wires":[["b734f6e2.e9c078","c9cb0dac.8ad56","aeea61b7.91b7d","c4c875e.5363488"]]},{"id":"e108e61a.0b54c8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1537.232494354248,"y":1464.249656677246,"z":"1d241215.b25dde","wires":[["7f1fd1b5.693fb","b734f6e2.e9c078","aeea61b7.91b7d","c4c875e.5363488"]]},{"id":"43ac397d.ec34c8","type":"switchNode","name":"Healthcheck status ?","xml":"<switch test=\"`$healthcheck.vm[$index1].status`\">\n","comments":"","outputs":1,"x":1789.947036743164,"y":1530.8209829330444,"z":"1d241215.b25dde","wires":[["dceaf505.ff0098","f36ff68e.abe4e8"]]},{"id":"dceaf505.ff0098","type":"other","name":"UP","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":2042.483139038086,"y":1562.1426229476929,"z":"1d241215.b25dde","wires":[["51697d75.cd6674"]]},{"id":"7f1fd1b5.693fb","type":"set","name":"Set Message","xml":"<set>\n<parameter name='event-message' value=\"Error occurred during health check of the rebuilt servers\"/>","comments":"","x":1785.2325592041016,"y":1315.249568939209,"z":"1d241215.b25dde","wires":[]},{"id":"c9cb0dac.8ad56","type":"set","name":"Set Message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1783.8995513916016,"y":1352.2495698928833,"z":"1d241215.b25dde","wires":[]},{"id":"b734f6e2.e9c078","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1771.3658599853516,"y":1389.0623140335083,"z":"1d241215.b25dde","wires":[[]]},{"id":"d45c9614.ff8588","type":"set","name":"Set Message","xml":"<set>\n<parameter name='event-message' value=\"`'Health check failed for the rebuilt server : ' + $healthcheck.vm[$index1].url`\"/>\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthCheckFailedCount + 1`\" />","comments":"","x":2491.161521911621,"y":1413.5354585647583,"z":"1d241215.b25dde","wires":[]},{"id":"89862589.b9b638","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2485.857322692871,"y":1457.8856801986694,"z":"1d241215.b25dde","wires":[[]]},{"id":"10d8313b.6051bf","type":"set","name":"Set Success Message","xml":"<set>\n<parameter name='success-message' value=\"`'Rebuild succeeded for the server : ' + $healthcheck.vm[$index1].url`\"/>\n<parameter name=\"HealthyVMCountAfterRebuild\" value=\"`$HealthyVMCountAfterRebuild + 1`\" />\n\n","comments":"","x":2447.537498474121,"y":1598.0661010742188,"z":"1d241215.b25dde","wires":[]},{"id":"df716347.e6da2","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":2429.359275817871,"y":1639.2800912857056,"z":"1d241215.b25dde","wires":[[]]},{"id":"ed2f324f.da23d","type":"execute","name":"Report Success","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\" />\n\n","comments":"","outputs":1,"x":2430.697410583496,"y":1682.8208627700806,"z":"1d241215.b25dde","wires":[[]]},{"id":"951f2311.e3f1b","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2333.702350616455,"y":1039.4829206466675,"z":"1d241215.b25dde","wires":[["64179684.35f708"]]},{"id":"64179684.35f708","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2536.218650817871,"y":1037.9474458694458,"z":"1d241215.b25dde","wires":[[]]},{"id":"aeea61b7.91b7d","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1802.5201034545898,"y":1464.2884397506714,"z":"1d241215.b25dde","wires":[["1e2450dd.4a0e2f"]]},{"id":"cc6dfd01.896b3","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2517.595359802246,"y":1494.3715200424194,"z":"1d241215.b25dde","wires":[["b4a8bb45.c9f6d8"]]},{"id":"c4c875e.5363488","type":"set","name":"update failed count","xml":"<set>\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthcheck.vmCount`\" />\n","comments":"","x":1802.7420806884766,"y":1426.6218852996826,"z":"1d241215.b25dde","wires":[]},{"id":"b4a8bb45.c9f6d8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2708.318546295166,"y":1493.8884372711182,"z":"1d241215.b25dde","wires":[["716d9887.b27778"]]},{"id":"716d9887.b27778","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2885.3351135253906,"y":1493.6029653549194,"z":"1d241215.b25dde","wires":[[]]},{"id":"414e92f3.6ca7cc","type":"execute","name":"Update_AAI_Status_Success","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Running\" />\n","comments":"","outputs":1,"x":1017.029541015625,"y":1923.084303855896,"z":"1d241215.b25dde","wires":[["e4f8a2ae.c664b","8830d2e7.45daa"]]},{"id":"dd55a83.d95aa58","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":992.0296249389648,"y":2025.084433555603,"z":"1d241215.b25dde","wires":[]},{"id":"cb3909f7.d8a288","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":797.4740219116211,"y":1923.0842504501343,"z":"1d241215.b25dde","wires":[["414e92f3.6ca7cc","dd55a83.d95aa58","a61ca9c.4fa5b58"]]},{"id":"a61ca9c.4fa5b58","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'VNFC Rebuilt successfully : ' + $vnfcName`\"/>\n","comments":"","outputs":1,"x":1001.91845703125,"y":1971.9732208251953,"z":"1d241215.b25dde","wires":[[]]},{"id":"8029027e.f9658","type":"execute","name":"Update_AAI_Status_Failure","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />","comments":"","outputs":1,"x":1007.0296630859375,"y":1780.08429813385,"z":"1d241215.b25dde","wires":[["e4f8a2ae.c664b","8830d2e7.45daa"]]},{"id":"2cac2089.b4761","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":979.0297470092773,"y":1857.084891319275,"z":"1d241215.b25dde","wires":[]},{"id":"4ac23437.50ab0c","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":790.8073348999023,"y":1780.9731664657593,"z":"1d241215.b25dde","wires":[["2cac2089.b4761","8029027e.f9658"]]},{"id":"e4f8a2ae.c664b","type":"not-found","name":"not-found/failure","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1314.743911743164,"y":1797.2271070480347,"z":"1d241215.b25dde","wires":[["9b043e36.9d60c"]]},{"id":"8830d2e7.45daa","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1263.0293502807617,"y":1922.0841588974,"z":"1d241215.b25dde","wires":[["10442df8.10d6a2"]]},{"id":"9b043e36.9d60c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1768.918628692627,"y":1801.8659811019897,"z":"1d241215.b25dde","wires":[["868194ed.771f68","5c1ea7a.87a7d58","91badf68.35f46"]]},{"id":"10442df8.10d6a2","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1390.1400680541992,"y":1921.973074913025,"z":"1d241215.b25dde","wires":[["10aa9304.7c72bd","a63ab149.af106"]]},{"id":"10aa9304.7c72bd","type":"outcome","name":"NOT_FOUND/FAILURE","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1587.9982528686523,"y":1911.1159162521362,"z":"1d241215.b25dde","wires":[["9b043e36.9d60c"]]},{"id":"868194ed.771f68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1935.1451568603516,"y":1882.1873254776,"z":"1d241215.b25dde","wires":[]},{"id":"67cc2227.82d17c","type":"switchNode","name":"switch_server_rebuild_success","xml":"<switch test='`$rebuildFailedCount == 0 and $healthCheckFailedCount == 0`'>\n","comments":"","outputs":1,"x":426.8077926635742,"y":1807.94855594635,"z":"1d241215.b25dde","wires":[["4e97dabd.435314","167e8229.670afe"]]},{"id":"167e8229.670afe","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":648.5578231811523,"y":1923.6986303329468,"z":"1d241215.b25dde","wires":[["cb3909f7.d8a288"]]},{"id":"4e97dabd.435314","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":654.0578231811523,"y":1780.698691368103,"z":"1d241215.b25dde","wires":[["4ac23437.50ab0c"]]},{"id":"a63ab149.af106","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1567.8079071044922,"y":1967.0047960281372,"z":"1d241215.b25dde","wires":[["ec1e6eda.5ef93"]]},{"id":"ec1e6eda.5ef93","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='true' />\n","comments":"","x":1760.3475456237793,"y":1967.0049495697021,"z":"1d241215.b25dde","wires":[]},{"id":"5c1ea7a.87a7d58","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNFC details in A&amp;AI for VNFC ' + $vnfcName`\" />","comments":"","outputs":1,"x":1947.2247467041016,"y":1773.7151613235474,"z":"1d241215.b25dde","wires":[["d297d0a9.cd082"]]},{"id":"d297d0a9.cd082","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2171.545925140381,"y":1812.0364608764648,"z":"1d241215.b25dde","wires":[["fef71859.ed0688"]]},{"id":"fef71859.ed0688","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2388.553768157959,"y":1811.8262910842896,"z":"1d241215.b25dde","wires":[[]]},{"id":"8db2e331.18b49","type":"switchNode","name":"switch STATUS","xml":"<switch test='`$REBUILD_STATUS`'>\n","comments":"","outputs":1,"x":932.1458740234375,"y":970.3964147567749,"z":"1d241215.b25dde","wires":[["695a1648.2fabf8","dc52391e.29dc48","6cbcba39.209574"]]},{"id":"dc52391e.29dc48","type":"other","name":"ERROR/EMPTY","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1142.1458587646484,"y":1018.9678344726562,"z":"1d241215.b25dde","wires":[["e9be6721.06d0e8"]]},{"id":"695a1648.2fabf8","type":"success","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1137.5746994018555,"y":907.6821279525757,"z":"1d241215.b25dde","wires":[["e9be6721.06d0e8"]]},{"id":"6cbcba39.209574","type":"other","name":"CONTEXT_NOT_FOUND","xml":"<outcome value='CONTEXT_NOT_FOUND'>\n","comments":"","outputs":1,"x":1113.5743942260742,"y":1123.2534818649292,"z":"1d241215.b25dde","wires":[["4ac23437.50ab0c"]]},{"id":"faf4f9eb.717e58","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`$error-message`\"/>\n<parameter name=\"rebuildFailedCount\" value=\"`$rebuildFailedCount + 1`\" />","comments":"","x":2132.056537628174,"y":945.2179517745972,"z":"1d241215.b25dde","wires":[]},{"id":"1e2450dd.4a0e2f","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1989.2350997924805,"y":1356.372338294983,"z":"1d241215.b25dde","wires":[["b3f01f64.5a4bb"]]},{"id":"b3f01f64.5a4bb","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2191.751609802246,"y":1359.122859954834,"z":"1d241215.b25dde","wires":[[]]},{"id":"51697d75.cd6674","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2201.734573364258,"y":1632.0866012573242,"z":"1d241215.b25dde","wires":[["10d8313b.6051bf","df716347.e6da2","ed2f324f.da23d"]]},{"id":"6cc7ff9b.69bb7","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2259.2346572875977,"y":1483.5153160095215,"z":"1d241215.b25dde","wires":[["d45c9614.ff8588","89862589.b9b638","cc6dfd01.896b3"]]},{"id":"bc51b6b6.be5498","type":"failure","name":"failure/notFound","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1068.0204811096191,"y":788.6107168197632,"z":"1d241215.b25dde","wires":[["a2de3da7.a56b5"]]},{"id":"86eb9e9c.6b536","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":587.4069175720215,"y":1158.584038734436,"z":"1d241215.b25dde","wires":[["c43287cc.92e448","2a43c35e.5e84ac"]]},{"id":"6158eeca.5f084","type":"set","name":"Mark vm Started","xml":"<set>\n<parameter name=\"rebuildServerList[$rebuildSuccessCount].url\" value=\"`$vm[$index1].url`\" />\n","comments":"","x":2082.5562896728516,"y":1090.2626266479492,"z":"1d241215.b25dde","wires":[]},{"id":"2a43c35e.5e84ac","type":"set","name":"init","xml":"<set>\n<parameter name='healthCheckFailedCount' value='0' />\n","comments":"","x":774.9135131835938,"y":1155.896544456482,"z":"1d241215.b25dde","wires":[]},{"id":"c43287cc.92e448","type":"switchNode","name":"rebuilt server > 0","xml":"<switch test='`$rebuildSuccessCount > 0`'>\n","comments":"","outputs":1,"x":755.5587158203125,"y":1207.3251333236694,"z":"1d241215.b25dde","wires":[["4b48e794.82cd18"]]},{"id":"4b48e794.82cd18","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":902.594482421875,"y":1286.360993385315,"z":"1d241215.b25dde","wires":[["d6ae113.fa83bf"]]},{"id":"d6ae113.fa83bf","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1033.056411743164,"y":1286.6108713150024,"z":"1d241215.b25dde","wires":[["dbe107fc.610df8","6ce69f34.f7c1c","7b94b5cb.b2ec5c","134d6532.cc4ccb"]]},{"id":"dbe107fc.610df8","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"Attempting to health check the rebuilt servers of the VNFC\"/>\n","comments":"","outputs":1,"x":1244.913459777832,"y":1254.468073606491,"z":"1d241215.b25dde","wires":[[]]},{"id":"6ce69f34.f7c1c","type":"for","name":"for_each_vm","xml":"<for index=\"index1\" start=\"0\" end=\"`$rebuildSuccessCount`\" >","comments":"","outputs":1,"x":1249.004035949707,"y":1299.087098121643,"z":"1d241215.b25dde","wires":[["abaea328.b02c7"]]},{"id":"7b94b5cb.b2ec5c","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$rebuildSuccessCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":1235.003791809082,"y":1342.0870933532715,"z":"1d241215.b25dde","wires":[]},{"id":"abaea328.b02c7","type":"set","name":"set : health check input list","xml":"<set>\n<parameter name=\"healthcheck.vm[$index1].url\" value=\"`$rebuildServerList[$index1].url`\" />\n","comments":"","x":1467.448257446289,"y":1300.1979331970215,"z":"1d241215.b25dde","wires":[]},{"id":"a3f09da0.00751","type":"comment","name":"Healthcheck Rebuilt servers","info":"","comments":"","x":564.9135284423828,"y":1243.0394353866577,"z":"1d241215.b25dde","wires":[]},{"id":"f36ff68e.abe4e8","type":"other","name":"UNKNOWN/DOWN","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2058.485061645508,"y":1484.4680242538452,"z":"1d241215.b25dde","wires":[["6cc7ff9b.69bb7"]]},{"id":"28827390.015fdc","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1204.02054977417,"y":696.646445274353,"z":"1d241215.b25dde","wires":[["a2de3da7.a56b5"]]},{"id":"52dcec48.33a434","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1191.020793914795,"y":744.646445274353,"z":"1d241215.b25dde","wires":[["a2de3da7.a56b5"]]},{"id":"55a13b8.748e8c4","type":"set","name":"Set flag","xml":"<set>\n<parameter name='HealthcheckDGResolutionFlag' value=\"true\"/>\n","comments":"","x":1112.3687782287598,"y":535.2625017166138,"z":"1d241215.b25dde","wires":[]},{"id":"6080e29d.eac52c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":957.3687782287598,"y":500.26250171661377,"z":"1d241215.b25dde","wires":[["2940d020.da57b","55a13b8.748e8c4"]]},{"id":"d0b6d307.edd5e","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1193.618782043457,"y":642.7625036239624,"z":"1d241215.b25dde","wires":[["b1345184.f11"]]},{"id":"b1345184.f11","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='true' />\n","comments":"","x":1401.118782043457,"y":644.0125036239624,"z":"1d241215.b25dde","wires":[]},{"id":"91badf68.35f46","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='false' />\n","comments":"","x":1966.1187896728516,"y":1825.2625207901,"z":"1d241215.b25dde","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart-Active-Active_VNFC.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart-Active-Active_VNFC.json
index e0273cb5f..6b4ba54f3 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart-Active-Active_VNFC.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart-Active-Active_VNFC.json
@@ -1 +1 @@
-[{"id":"cd34f9f0.1d9868","type":"dgstart","name":"DGSTART","outputs":1,"x":127.28811645507812,"y":20.999963760375977,"z":"ae41b0e9.09ae2","wires":[["f6b6354f.0ddf38"]]},{"id":"f6b6354f.0ddf38","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":132.28817749023438,"y":70.56663703918457,"z":"ae41b0e9.09ae2","wires":[["8c403f40.821b5"]]},{"id":"8c403f40.821b5","type":"method","name":"Restart-Active-Active_VNFC","xml":"<method rpc='Restart-Active-Active_VNFC' mode='sync'>\n","comments":"","outputs":1,"x":387.03822326660156,"y":71.81661415100098,"z":"ae41b0e9.09ae2","wires":[["ed7c3c6d.a984c"]]},{"id":"45276a62.7c92c4","type":"for","name":"for_each_vm","xml":"<for index=\"vmIndex\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":480.28807067871094,"y":455.0000247955322,"z":"ae41b0e9.09ae2","wires":[["b0f68ecc.113e"]]},{"id":"ed7c3c6d.a984c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"false","comments":"","outputs":1,"x":75.5,"y":222.75000190734863,"z":"ae41b0e9.09ae2","wires":[["5b372d0b.047e04","f72d65c7.04b878","860a3ff7.f7ce8","2e70b639.278d4a","ce24660a.70bd38"]]},{"id":"3fc5910d.6ff2ae","type":"for","name":"for_each_vm","xml":"<for index=\"vmIndex\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":468.3783874511719,"y":719.5356998443604,"z":"ae41b0e9.09ae2","wires":[["793be6bd.8ef148"]]},{"id":"74b788b3.2be2f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1629.9331359863281,"y":707.9285507202148,"z":"ae41b0e9.09ae2","wires":[["aed13d59.d33b6"]]},{"id":"e546a2e8.8d275","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":804.8614959716797,"y":1335.7500252723694,"z":"ae41b0e9.09ae2","wires":[]},{"id":"b8f2e995.5da048","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":805.0924224853516,"y":1275.1499276161194,"z":"ae41b0e9.09ae2","wires":[]},{"id":"5b372d0b.047e04","type":"switchNode","name":"switch_server_restart_success","xml":"<switch test='`$restartFailedCount == 0 and $restartSkippedCount == 0 and $healthCheckFailedCount == 0`'>\n","comments":"","outputs":1,"x":371.34271240234375,"y":1302.4832401275635,"z":"ae41b0e9.09ae2","wires":[["a64987ff.3681c8","369d7bad.6115d4"]]},{"id":"a64987ff.3681c8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":594.5927124023438,"y":1335.2332711219788,"z":"ae41b0e9.09ae2","wires":[["e546a2e8.8d275"]]},{"id":"369d7bad.6115d4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":596.0927429199219,"y":1275.233332157135,"z":"ae41b0e9.09ae2","wires":[["b8f2e995.5da048"]]},{"id":"c833ddce.53e9a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1556.2881164550781,"y":796.9999618530273,"z":"ae41b0e9.09ae2","wires":[["3c5daadb.8b49d6"]]},{"id":"c78696a0.1c9918","type":"set","name":"set_mark_vm_failed","xml":"<set>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n","comments":"","x":2186.7174072265625,"y":618.7618103027344,"z":"ae41b0e9.09ae2","wires":[]},{"id":"2d7e5cc9.758c64","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2156.717803955078,"y":684.7618637084961,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"a1fe0884.e414e8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2183.584560394287,"y":727.9492416381836,"z":"ae41b0e9.09ae2","wires":[["de56e9e1.0fb738"]]},{"id":"4019eb71.f46704","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"Attempting to restart DOWN servers\"/>\n","comments":"","outputs":1,"x":497.2881317138672,"y":385.6665897369385,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"ccd05e9a.19417","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"Attempting to restart UP servers\"/>\n","comments":"","outputs":1,"x":471.28812408447266,"y":662.9166669845581,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"4dbab17.c93485","type":"comment","name":"Restart Up servers","info":"","comments":"","x":319.2881164550781,"y":618.6666507720947,"z":"ae41b0e9.09ae2","wires":[]},{"id":"45176027.28e49","type":"comment","name":"Restart Down servers","info":"","comments":"","x":311.0381164550781,"y":322.1666202545166,"z":"ae41b0e9.09ae2","wires":[]},{"id":"aed13d59.d33b6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1846.7168273925781,"y":706.8571395874023,"z":"ae41b0e9.09ae2","wires":[["c78696a0.1c9918","2d7e5cc9.758c64","a1fe0884.e414e8"]]},{"id":"f7834d15.217b6","type":"comment","name":"Update VNFC restart status","info":"","comments":"","x":376.5739440917969,"y":1248.0000247955322,"z":"ae41b0e9.09ae2","wires":[]},{"id":"b0f68ecc.113e","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$vm[$vmIndex].status`\">\n","comments":"","outputs":1,"x":707.2881698608398,"y":457.99996185302734,"z":"ae41b0e9.09ae2","wires":[["d743b216.3511","a6315d8d.44126","3bfcb24a.fa473e"]]},{"id":"d743b216.3511","type":"other","name":"outcome_down","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":975.5737915039062,"y":585.7142581939697,"z":"ae41b0e9.09ae2","wires":[["8ff4886b.b72338"]]},{"id":"7e312494.69dbec","type":"set","name":"set_mark_vm_restarted","xml":"<set>\n<parameter name=\"restartedServerList[$restartSuccessCount].url\" value=\"`$vm[$vmIndex].url`\" />\n","comments":"","x":1987.4308776855469,"y":766.1429386138916,"z":"ae41b0e9.09ae2","wires":[]},{"id":"72be6190.108dc","type":"set","name":"init","xml":"<set>\n<parameter name='restartFailedCount' value='0' />\n<parameter name='restartSkippedCount' value='0' />\n<parameter name='restartSuccessCount' value='0' />\n","comments":"","x":459.14527893066406,"y":342.2856693267822,"z":"ae41b0e9.09ae2","wires":[]},{"id":"ff29c3ed.900ee","type":"comment","name":"Health check restarted servers","info":"","comments":"","x":342.2881164550781,"y":819.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"4b594278.ba7cac","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Restart succeeded for the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1961.4308776855469,"y":854.1428775787354,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"3c5daadb.8b49d6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1734.4309387207031,"y":799.1429080963135,"z":"ae41b0e9.09ae2","wires":[["4b594278.ba7cac","7e312494.69dbec","3908f3bc.3be64c"]]},{"id":"a6315d8d.44126","type":"other","name":"outcome_unknown","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":986.6428833007812,"y":522.2856693267822,"z":"ae41b0e9.09ae2","wires":[["8ff4886b.b72338"]]},{"id":"ba04eada.28e368","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Attempting to restart the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1387.0715637207031,"y":531.5713729858398,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"8ff4886b.b72338","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1183.642822265625,"y":588.8570804595947,"z":"ae41b0e9.09ae2","wires":[["ba04eada.28e368","5a80da73.594524","239f297a.71d536"]]},{"id":"f72d65c7.04b878","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":301.5,"y":234.00002479553223,"z":"ae41b0e9.09ae2","wires":[["8f74d90e.2b6ca8","5bf4a4d7.86b44c","e5c61a50.5fd478","628f7207.6b94dc"]]},{"id":"8f74d90e.2b6ca8","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":658.5,"y":214.00002479553223,"z":"ae41b0e9.09ae2","wires":[["c2e18a4b.2976a8"]]},{"id":"c2e18a4b.2976a8","type":"set","name":"set : health check input list","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$vm[$i].url`\" />\n","comments":"","x":877.5000610351562,"y":213.99996376037598,"z":"ae41b0e9.09ae2","wires":[]},{"id":"5bf4a4d7.86b44c","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":693.8046875,"y":319.2333011627197,"z":"ae41b0e9.09ae2","wires":[["4139fead.003ea","f72b1721.a74a38","f4cc1b80.ecfd88"]]},{"id":"793be6bd.8ef148","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$vm[$vmIndex].status`\">\n","comments":"","outputs":1,"x":703.5,"y":718.9999713897705,"z":"ae41b0e9.09ae2","wires":[["ab80f920.4408b8"]]},{"id":"ab80f920.4408b8","type":"other","name":"outcome_up","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":958.0716552734375,"y":719.2856693267822,"z":"ae41b0e9.09ae2","wires":[["8ff4886b.b72338"]]},{"id":"2318f81f.7133f8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":699.5,"y":948.999963760376,"z":"ae41b0e9.09ae2","wires":[["7cccdfff.d92d3","80621325.2ca61","f5a17c54.48543","248ea7ff.fe9d18"]]},{"id":"7cccdfff.d92d3","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$restartSuccessCount`\" >","comments":"","outputs":1,"x":906.5,"y":926.999963760376,"z":"ae41b0e9.09ae2","wires":[["68eeb3e8.99f9ac"]]},{"id":"68eeb3e8.99f9ac","type":"set","name":"set : health check input list","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$restartedServerList[$i].url`\" />\n","comments":"","x":1126.9444999694824,"y":927.1109943389893,"z":"ae41b0e9.09ae2","wires":[]},{"id":"80621325.2ca61","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":947.8046875,"y":1025.2332401275635,"z":"ae41b0e9.09ae2","wires":[["ad8e8d3.979a07","4d6bfe7.14324","30227c5f.41a2b4"]]},{"id":"f5a17c54.48543","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$restartSuccessCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":887.5,"y":975.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"ad8e8d3.979a07","type":"outcome","name":"healthcheck_failed","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1211.5,"y":985.9999961853027,"z":"ae41b0e9.09ae2","wires":[["bead2929.f122e8"]]},{"id":"4d6bfe7.14324","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1183.0164947509766,"y":1038.3381748199463,"z":"ae41b0e9.09ae2","wires":[["67509b2d.7a3494"]]},{"id":"30227c5f.41a2b4","type":"outcome","name":"healthcheck_success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1220.75,"y":1148.5000247955322,"z":"ae41b0e9.09ae2","wires":[["ccdf433.6eb21c"]]},{"id":"ccdf433.6eb21c","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$restartSuccessCount`\" >","comments":"","outputs":1,"x":1022.5,"y":1240.999963760376,"z":"ae41b0e9.09ae2","wires":[["61a58ac8.9830e4"]]},{"id":"61a58ac8.9830e4","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[$i].status`\">\n","comments":"","outputs":1,"x":1232.5,"y":1278.999963760376,"z":"ae41b0e9.09ae2","wires":[["7e3e3230.6dba1c","db1f7fae.3cb2f","bf70ffe6.d3a17"]]},{"id":"7e3e3230.6dba1c","type":"other","name":"outcome_up","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":1474.5000305175781,"y":1324.9999985694885,"z":"ae41b0e9.09ae2","wires":[["1652d018.e2aee"]]},{"id":"1652d018.e2aee","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1737.5,"y":1425.999963760376,"z":"ae41b0e9.09ae2","wires":[["1c064d7.3edc6b3","ba547465.f89908","8add556a.b92a78"]]},{"id":"1c064d7.3edc6b3","type":"execute","name":"Report_Success","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\"/>","comments":"","outputs":1,"x":1994.5001068115234,"y":1533.5714511871338,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"ba547465.f89908","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1983.5548553466797,"y":1476.0666618347168,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"8add556a.b92a78","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Restart succeeded for the server : ' + $restartedServerList[$i].url`\"/>\n<parameter name=\"RestartSuccessVMCount\" value=\"`$RestartSuccessVMCount + 1`\" />\n\n","comments":"","x":2006.5548553466797,"y":1426.0666618347168,"z":"ae41b0e9.09ae2","wires":[]},{"id":"bf70ffe6.d3a17","type":"other","name":"outcome_down","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":1484.5000305175781,"y":1232.9999985694885,"z":"ae41b0e9.09ae2","wires":[["22071ff1.487f5"]]},{"id":"db1f7fae.3cb2f","type":"other","name":"outcome_unknown","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":1495.283447265625,"y":1279.142786026001,"z":"ae41b0e9.09ae2","wires":[["22071ff1.487f5"]]},{"id":"22071ff1.487f5","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1731.21435546875,"y":1218.285608291626,"z":"ae41b0e9.09ae2","wires":[["d4d99d29.7a253","92aa83bf.6feed","f7e19e76.fbb7c","edeab88e.243dd8"]]},{"id":"d4d99d29.7a253","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Health check failed for the restarted server : ' + $restartedServerList[$i].url`\"/>\n","comments":"","x":1993.2144012451172,"y":1218.2856559753418,"z":"ae41b0e9.09ae2","wires":[]},{"id":"92aa83bf.6feed","type":"set","name":"increment healthCheck failed VM count","xml":"<set>\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthCheckFailedCount + 1`\" />\n","comments":"","x":2061.214401245117,"y":1267.2856559753418,"z":"ae41b0e9.09ae2","wires":[]},{"id":"f7e19e76.fbb7c","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1968.1606903076172,"y":1315.8857536315918,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"edeab88e.243dd8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2009.0274658203125,"y":1364.0730838775635,"z":"ae41b0e9.09ae2","wires":[["de56e9e1.0fb738"]]},{"id":"146acfc4.db634","type":"set","name":"init","xml":"<set>\n<parameter name='healthCheckFailedCount' value='0' />\n","comments":"","x":468.5000305175781,"y":867.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"248ea7ff.fe9d18","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"Attempting to health check the restarted servers of the VNFC\"/>\n","comments":"","outputs":1,"x":909.4097290039062,"y":878.3809452056885,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"3bfcb24a.fa473e","type":"other","name":"outcome_failure","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":982.5,"y":457.999963760376,"z":"ae41b0e9.09ae2","wires":[["afe6d608.6433a8"]]},{"id":"f2029c3c.86a2f","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Error occurred during pre-health check : ' + $vm[$vmIndex].url + '. Hence skipping its restart.'`\"/>","comments":"","x":1763.5,"y":370.9999942779541,"z":"ae41b0e9.09ae2","wires":[]},{"id":"afe6d608.6433a8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1373.833251953125,"y":456.9999942779541,"z":"ae41b0e9.09ae2","wires":[["f2029c3c.86a2f","bc689a04.21c6e8","77824ab1.d42474","c92c539c.fc047"]]},{"id":"bc689a04.21c6e8","type":"set","name":"set_mark_vm_skipped","xml":"<set>\n<parameter name=\"restartSkippedCount\" value=\"`$restartSkippedCount + 1`\" />\n","comments":"","x":1777.5,"y":417.9999942779541,"z":"ae41b0e9.09ae2","wires":[]},{"id":"4139fead.003ea","type":"outcome","name":"healthcheck_failed","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1052.5,"y":340.999963760376,"z":"ae41b0e9.09ae2","wires":[["d5d15505.317458"]]},{"id":"f72b1721.a74a38","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1031.0164794921875,"y":395.3381290435791,"z":"ae41b0e9.09ae2","wires":[["8a1531f1.c2158"]]},{"id":"f4cc1b80.ecfd88","type":"outcome","name":"healthcheck_success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1048.97216796875,"y":277.5000247955322,"z":"ae41b0e9.09ae2","wires":[["4c08ade6.fe4dd4"]]},{"id":"e5c61a50.5fd478","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$vmCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"false\"/>\n","comments":"","x":643.5,"y":262.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"67509b2d.7a3494","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1429.5,"y":1038.999963760376,"z":"ae41b0e9.09ae2","wires":[["cbd3bc29.1cecd","15a249d1.cb3bc6","8fd2ec2e.de8f1","cfc2f0d9.4cf62"]]},{"id":"cfc2f0d9.4cf62","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1704.166748046875,"y":1039.999948501587,"z":"ae41b0e9.09ae2","wires":[]},{"id":"8fd2ec2e.de8f1","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1675.6329345703125,"y":1085.8125858306885,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"cbd3bc29.1cecd","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1714.5001525878906,"y":1129.999963760376,"z":"ae41b0e9.09ae2","wires":[["de56e9e1.0fb738"]]},{"id":"15a249d1.cb3bc6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1684.2607421875,"y":1175.187952041626,"z":"ae41b0e9.09ae2","wires":[]},{"id":"bead2929.f122e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1433.5,"y":985.999963760376,"z":"ae41b0e9.09ae2","wires":[["207fed09.9a8492","8fd2ec2e.de8f1","cbd3bc29.1cecd","15a249d1.cb3bc6"]]},{"id":"207fed09.9a8492","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"Error occurred during post-health check of the restarted servers\"/>","comments":"","x":1700.5,"y":984.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"d5d15505.317458","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1397.5,"y":344.999963760376,"z":"ae41b0e9.09ae2","wires":[["2c8c1b1d.016d24","77824ab1.d42474","c92c539c.fc047","428cb220.cb137c"]]},{"id":"8a1531f1.c2158","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1387.5,"y":400.999963760376,"z":"ae41b0e9.09ae2","wires":[["c92c539c.fc047","428cb220.cb137c","77824ab1.d42474","fd9d4346.08f21"]]},{"id":"2c8c1b1d.016d24","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"Error occurred during pre-health check\"/>","comments":"","x":1756.5,"y":269.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"fd9d4346.08f21","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1760.166748046875,"y":321.9999485015869,"z":"ae41b0e9.09ae2","wires":[]},{"id":"77824ab1.d42474","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1734.6329345703125,"y":462.8125858306885,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"c92c539c.fc047","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1771.5001220703125,"y":510.999963760376,"z":"ae41b0e9.09ae2","wires":[["de56e9e1.0fb738"]]},{"id":"428cb220.cb137c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1746.2607421875,"y":559.187952041626,"z":"ae41b0e9.09ae2","wires":[]},{"id":"860a3ff7.f7ce8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":296.5,"y":360.999963760376,"z":"ae41b0e9.09ae2","wires":[["72be6190.108dc","4019eb71.f46704","45276a62.7c92c4"]]},{"id":"2e70b639.278d4a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":303.5,"y":662.999963760376,"z":"ae41b0e9.09ae2","wires":[["ccd05e9a.19417","3fc5910d.6ff2ae"]]},{"id":"8c13cfcc.6b30e","type":"comment","name":"Health check servers","info":"","comments":"","x":340.5000305175781,"y":194.99996376037598,"z":"ae41b0e9.09ae2","wires":[]},{"id":"628f7207.6b94dc","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"Attempting to health check the servers of the VNFC before restarting them.\"/>\n","comments":"","outputs":1,"x":665.611083984375,"y":160.88884925842285,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"3908f3bc.3be64c","type":"set","name":"increment_restarted_vm_count","xml":"<set>\n<parameter name='restartSuccessCount' value='`$restartSuccessCount+1`' />\n","comments":"","x":2014.1769714355469,"y":812.7777652740479,"z":"ae41b0e9.09ae2","wires":[]},{"id":"76ce77bd.4cacc8","type":"switchNode","name":"switch : restarted server > 0","xml":"<switch test='`$restartSuccessCount > 0`'>\n","comments":"","outputs":1,"x":347.2881164550781,"y":948.999963760376,"z":"ae41b0e9.09ae2","wires":[["9cfcf21e.faba1","c7044ad3.bc0ca8"]]},{"id":"c7044ad3.bc0ca8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":544.0381469726562,"y":948.7500858306885,"z":"ae41b0e9.09ae2","wires":[["2318f81f.7133f8"]]},{"id":"9cfcf21e.faba1","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":542.5381164550781,"y":998.7500247955322,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"ce24660a.70bd38","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":304.2881164550781,"y":867.999963760376,"z":"ae41b0e9.09ae2","wires":[["76ce77bd.4cacc8","146acfc4.db634"]]},{"id":"5a80da73.594524","type":"call","name":"Restart","xml":"<call module='APPC' rpc='Restart_VM' mode='sync' >\n","comments":"","outputs":1,"x":1370.7325744628906,"y":655.999963760376,"z":"ae41b0e9.09ae2","wires":[["74b788b3.2be2f8","c833ddce.53e9a","f8a530a5.dc002"]]},{"id":"239f297a.71d536","type":"set","name":"set restart parameters","xml":"<set>\n<parameter name=\"restart-vm-url\" value=\"`$vm[$vmIndex].url`\" />\n<parameter name=\"application-node-name\" value=\"`$vm[$vmIndex].node-name`\" />\n<parameter name=\"application-status\" value=\"`$vm[$vmIndex].status`\" />\n<parameter name='restartRetryCount' value='3'/>\n","comments":"","x":1416.7325744628906,"y":590.0000247955322,"z":"ae41b0e9.09ae2","wires":[]},{"id":"f8a530a5.dc002","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1618.0659484863281,"y":636.9999618530273,"z":"ae41b0e9.09ae2","wires":[["a7ed0995.4f2518"]]},{"id":"a7ed0995.4f2518","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1837.0659484863281,"y":636.9999618530273,"z":"ae41b0e9.09ae2","wires":[["78403997.4e6fc8","c78696a0.1c9918","2d7e5cc9.758c64","a1fe0884.e414e8"]]},{"id":"78403997.4e6fc8","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'DG to execute Restart action not found for VM: ' + $vm[$vmIndex].url`\"/>\n","comments":"","x":2131.637237548828,"y":515.7141952514648,"z":"ae41b0e9.09ae2","wires":[]},{"id":"de56e9e1.0fb738","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2612.803741455078,"y":967.515588760376,"z":"ae41b0e9.09ae2","wires":[["3a327862.942808"]]},{"id":"3a327862.942808","type":"execute","name":"Report_Error_To_DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":3142.303741455078,"y":958.515588760376,"z":"ae41b0e9.09ae2","wires":[["d990af07.e6417"]]},{"id":"d990af07.e6417","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3396.589141845703,"y":965.944299697876,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"4c08ade6.fe4dd4","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":1261.8436279296875,"y":278.88884925842285,"z":"ae41b0e9.09ae2","wires":[["5866543a.6d051c"]]},{"id":"5866543a.6d051c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1456.544921875,"y":278.24883460998535,"z":"ae41b0e9.09ae2","wires":[["5cdd015c.a3958"]]},{"id":"5cdd015c.a3958","type":"set","name":"set VM params","xml":"<set>\n<parameter name=\"vm[$i].status\" value=\"`$healthcheck.vm[$i].status`\" />\n<parameter name=\"vm[$i].node-name\" value=\"`$healthcheck.vm[$i].nodeName`\" />\n","comments":"","x":1697.544921875,"y":199.24883460998535,"z":"ae41b0e9.09ae2","wires":[]}]
+[{"id":"cd34f9f0.1d9868","type":"dgstart","name":"DGSTART","outputs":1,"x":127.28811645507812,"y":20.999963760375977,"z":"ae41b0e9.09ae2","wires":[["f6b6354f.0ddf38"]]},{"id":"f6b6354f.0ddf38","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":132.28817749023438,"y":70.56663703918457,"z":"ae41b0e9.09ae2","wires":[["8c403f40.821b5"]]},{"id":"8c403f40.821b5","type":"method","name":"Restart-Active-Active_VNFC","xml":"<method rpc='Restart-Active-Active_VNFC' mode='sync'>\n","comments":"","outputs":1,"x":387.03822326660156,"y":71.81661415100098,"z":"ae41b0e9.09ae2","wires":[["ed7c3c6d.a984c"]]},{"id":"45276a62.7c92c4","type":"for","name":"for_each_vm","xml":"<for index=\"vmIndex\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":480.28807067871094,"y":455.0000247955322,"z":"ae41b0e9.09ae2","wires":[["b0f68ecc.113e"]]},{"id":"ed7c3c6d.a984c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"false","comments":"","outputs":1,"x":75.5,"y":222.75000190734863,"z":"ae41b0e9.09ae2","wires":[["5b372d0b.047e04","f72d65c7.04b878","860a3ff7.f7ce8","2e70b639.278d4a","ce24660a.70bd38"]]},{"id":"3fc5910d.6ff2ae","type":"for","name":"for_each_vm","xml":"<for index=\"vmIndex\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":468.3783874511719,"y":719.5356998443604,"z":"ae41b0e9.09ae2","wires":[["793be6bd.8ef148"]]},{"id":"74b788b3.2be2f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1629.9331359863281,"y":707.9285507202148,"z":"ae41b0e9.09ae2","wires":[["aed13d59.d33b6"]]},{"id":"e546a2e8.8d275","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":804.8614959716797,"y":1335.7500252723694,"z":"ae41b0e9.09ae2","wires":[]},{"id":"b8f2e995.5da048","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":805.0924224853516,"y":1275.1499276161194,"z":"ae41b0e9.09ae2","wires":[]},{"id":"5b372d0b.047e04","type":"switchNode","name":"switch_server_restart_success","xml":"<switch test='`$restartFailedCount == 0 and $restartSkippedCount == 0 and $healthCheckFailedCount == 0`'>\n","comments":"","outputs":1,"x":371.34271240234375,"y":1302.4832401275635,"z":"ae41b0e9.09ae2","wires":[["a64987ff.3681c8","369d7bad.6115d4"]]},{"id":"a64987ff.3681c8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":594.5927124023438,"y":1335.2332711219788,"z":"ae41b0e9.09ae2","wires":[["e546a2e8.8d275"]]},{"id":"369d7bad.6115d4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":596.0927429199219,"y":1275.233332157135,"z":"ae41b0e9.09ae2","wires":[["b8f2e995.5da048"]]},{"id":"c833ddce.53e9a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1556.2881164550781,"y":796.9999618530273,"z":"ae41b0e9.09ae2","wires":[["3c5daadb.8b49d6"]]},{"id":"c78696a0.1c9918","type":"set","name":"set_mark_vm_failed","xml":"<set>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n","comments":"","x":2186.7174072265625,"y":618.7618103027344,"z":"ae41b0e9.09ae2","wires":[]},{"id":"2d7e5cc9.758c64","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2156.717803955078,"y":684.7618637084961,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"a1fe0884.e414e8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2183.584560394287,"y":727.9492416381836,"z":"ae41b0e9.09ae2","wires":[["de56e9e1.0fb738"]]},{"id":"4019eb71.f46704","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"Attempting to restart DOWN servers\"/>\n","comments":"","outputs":1,"x":497.2881317138672,"y":385.6665897369385,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"ccd05e9a.19417","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"Attempting to restart UP servers\"/>\n","comments":"","outputs":1,"x":471.28812408447266,"y":662.9166669845581,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"4dbab17.c93485","type":"comment","name":"Restart Up servers","info":"","comments":"","x":319.2881164550781,"y":618.6666507720947,"z":"ae41b0e9.09ae2","wires":[]},{"id":"45176027.28e49","type":"comment","name":"Restart Down servers","info":"","comments":"","x":311.0381164550781,"y":322.1666202545166,"z":"ae41b0e9.09ae2","wires":[]},{"id":"aed13d59.d33b6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1846.7168273925781,"y":706.8571395874023,"z":"ae41b0e9.09ae2","wires":[["c78696a0.1c9918","2d7e5cc9.758c64","a1fe0884.e414e8"]]},{"id":"f7834d15.217b6","type":"comment","name":"Update VNFC restart status","info":"","comments":"","x":376.5739440917969,"y":1248.0000247955322,"z":"ae41b0e9.09ae2","wires":[]},{"id":"b0f68ecc.113e","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$vm[$vmIndex].status`\">\n","comments":"","outputs":1,"x":707.2881698608398,"y":457.99996185302734,"z":"ae41b0e9.09ae2","wires":[["d743b216.3511","a6315d8d.44126","3bfcb24a.fa473e"]]},{"id":"d743b216.3511","type":"other","name":"outcome_down","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":975.5737915039062,"y":585.7142581939697,"z":"ae41b0e9.09ae2","wires":[["8ff4886b.b72338"]]},{"id":"7e312494.69dbec","type":"set","name":"set_mark_vm_restarted","xml":"<set>\n<parameter name=\"restartedServerList[$restartSuccessCount].url\" value=\"`$vm[$vmIndex].url`\" />\n","comments":"","x":1987.4308776855469,"y":766.1429386138916,"z":"ae41b0e9.09ae2","wires":[]},{"id":"72be6190.108dc","type":"set","name":"init","xml":"<set>\n<parameter name='restartFailedCount' value='0' />\n<parameter name='restartSkippedCount' value='0' />\n<parameter name='restartSuccessCount' value='0' />\n","comments":"","x":459.14527893066406,"y":342.2856693267822,"z":"ae41b0e9.09ae2","wires":[]},{"id":"ff29c3ed.900ee","type":"comment","name":"Health check restarted servers","info":"","comments":"","x":342.2881164550781,"y":819.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"4b594278.ba7cac","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Restart succeeded for the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1961.4308776855469,"y":854.1428775787354,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"3c5daadb.8b49d6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1734.4309387207031,"y":799.1429080963135,"z":"ae41b0e9.09ae2","wires":[["4b594278.ba7cac","7e312494.69dbec","3908f3bc.3be64c"]]},{"id":"a6315d8d.44126","type":"other","name":"outcome_unknown","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":986.6428833007812,"y":522.2856693267822,"z":"ae41b0e9.09ae2","wires":[["8ff4886b.b72338"]]},{"id":"ba04eada.28e368","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Attempting to restart the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1387.0715637207031,"y":531.5713729858398,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"8ff4886b.b72338","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1183.642822265625,"y":588.8570804595947,"z":"ae41b0e9.09ae2","wires":[["ba04eada.28e368","5a80da73.594524","239f297a.71d536"]]},{"id":"f72d65c7.04b878","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":301.5,"y":234.00002479553223,"z":"ae41b0e9.09ae2","wires":[["8f74d90e.2b6ca8","5bf4a4d7.86b44c","e5c61a50.5fd478","628f7207.6b94dc"]]},{"id":"8f74d90e.2b6ca8","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":658.5,"y":214.00002479553223,"z":"ae41b0e9.09ae2","wires":[["c2e18a4b.2976a8"]]},{"id":"c2e18a4b.2976a8","type":"set","name":"set : health check input list","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$vm[$i].url`\" />\n","comments":"","x":877.5000610351562,"y":213.99996376037598,"z":"ae41b0e9.09ae2","wires":[]},{"id":"5bf4a4d7.86b44c","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":693.8046875,"y":319.2333011627197,"z":"ae41b0e9.09ae2","wires":[["4139fead.003ea","f72b1721.a74a38","f4cc1b80.ecfd88"]]},{"id":"793be6bd.8ef148","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$vm[$vmIndex].status`\">\n","comments":"","outputs":1,"x":703.5,"y":718.9999713897705,"z":"ae41b0e9.09ae2","wires":[["ab80f920.4408b8"]]},{"id":"ab80f920.4408b8","type":"other","name":"outcome_up","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":958.0716552734375,"y":719.2856693267822,"z":"ae41b0e9.09ae2","wires":[["8ff4886b.b72338"]]},{"id":"2318f81f.7133f8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":699.5,"y":948.999963760376,"z":"ae41b0e9.09ae2","wires":[["7cccdfff.d92d3","80621325.2ca61","f5a17c54.48543","248ea7ff.fe9d18"]]},{"id":"7cccdfff.d92d3","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$restartSuccessCount`\" >","comments":"","outputs":1,"x":906.5,"y":926.999963760376,"z":"ae41b0e9.09ae2","wires":[["68eeb3e8.99f9ac"]]},{"id":"68eeb3e8.99f9ac","type":"set","name":"set : health check input list","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$restartedServerList[$i].url`\" />\n","comments":"","x":1126.9444999694824,"y":927.1109943389893,"z":"ae41b0e9.09ae2","wires":[]},{"id":"80621325.2ca61","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":947.8046875,"y":1025.2332401275635,"z":"ae41b0e9.09ae2","wires":[["ad8e8d3.979a07","4d6bfe7.14324","30227c5f.41a2b4"]]},{"id":"f5a17c54.48543","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$restartSuccessCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":887.5,"y":975.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"ad8e8d3.979a07","type":"outcome","name":"healthcheck_failed","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1211.5,"y":985.9999961853027,"z":"ae41b0e9.09ae2","wires":[["bead2929.f122e8"]]},{"id":"4d6bfe7.14324","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1183.0164947509766,"y":1038.3381748199463,"z":"ae41b0e9.09ae2","wires":[["67509b2d.7a3494"]]},{"id":"30227c5f.41a2b4","type":"outcome","name":"healthcheck_success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1220.75,"y":1148.5000247955322,"z":"ae41b0e9.09ae2","wires":[["ccdf433.6eb21c"]]},{"id":"ccdf433.6eb21c","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$restartSuccessCount`\" >","comments":"","outputs":1,"x":1022.5,"y":1240.999963760376,"z":"ae41b0e9.09ae2","wires":[["61a58ac8.9830e4"]]},{"id":"61a58ac8.9830e4","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[$i].status`\">\n","comments":"","outputs":1,"x":1232.5,"y":1278.999963760376,"z":"ae41b0e9.09ae2","wires":[["7e3e3230.6dba1c","db1f7fae.3cb2f","bf70ffe6.d3a17"]]},{"id":"7e3e3230.6dba1c","type":"other","name":"outcome_up","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":1474.5000305175781,"y":1324.9999985694885,"z":"ae41b0e9.09ae2","wires":[["1652d018.e2aee"]]},{"id":"1652d018.e2aee","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1737.5,"y":1425.999963760376,"z":"ae41b0e9.09ae2","wires":[["1c064d7.3edc6b3","ba547465.f89908","8add556a.b92a78"]]},{"id":"1c064d7.3edc6b3","type":"execute","name":"Report_Success","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\"/>","comments":"","outputs":1,"x":1994.5001068115234,"y":1533.5714511871338,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"ba547465.f89908","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1983.5548553466797,"y":1476.0666618347168,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"8add556a.b92a78","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Restart succeeded for the server : ' + $restartedServerList[$i].url`\"/>\n<parameter name=\"RestartSuccessVMCount\" value=\"`$RestartSuccessVMCount + 1`\" />\n\n","comments":"","x":2006.5548553466797,"y":1426.0666618347168,"z":"ae41b0e9.09ae2","wires":[]},{"id":"bf70ffe6.d3a17","type":"other","name":"outcome_down","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":1484.5000305175781,"y":1232.9999985694885,"z":"ae41b0e9.09ae2","wires":[["22071ff1.487f5"]]},{"id":"db1f7fae.3cb2f","type":"other","name":"outcome_unknown","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":1495.283447265625,"y":1279.142786026001,"z":"ae41b0e9.09ae2","wires":[["22071ff1.487f5"]]},{"id":"22071ff1.487f5","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1731.21435546875,"y":1218.285608291626,"z":"ae41b0e9.09ae2","wires":[["d4d99d29.7a253","92aa83bf.6feed","f7e19e76.fbb7c","edeab88e.243dd8"]]},{"id":"d4d99d29.7a253","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Health check failed for the restarted server : ' + $restartedServerList[$i].url`\"/>\n","comments":"","x":1993.2144012451172,"y":1218.2856559753418,"z":"ae41b0e9.09ae2","wires":[]},{"id":"92aa83bf.6feed","type":"set","name":"increment healthCheck failed VM count","xml":"<set>\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthCheckFailedCount + 1`\" />\n","comments":"","x":2061.214401245117,"y":1267.2856559753418,"z":"ae41b0e9.09ae2","wires":[]},{"id":"f7e19e76.fbb7c","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1968.1606903076172,"y":1315.8857536315918,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"edeab88e.243dd8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2009.0274658203125,"y":1364.0730838775635,"z":"ae41b0e9.09ae2","wires":[["de56e9e1.0fb738"]]},{"id":"146acfc4.db634","type":"set","name":"init","xml":"<set>\n<parameter name='healthCheckFailedCount' value='0' />\n","comments":"","x":468.5000305175781,"y":867.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"248ea7ff.fe9d18","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"Attempting to health check the restarted servers of the VNFC\"/>\n","comments":"","outputs":1,"x":909.4097290039062,"y":878.3809452056885,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"3bfcb24a.fa473e","type":"other","name":"outcome_failure","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":982.5,"y":457.999963760376,"z":"ae41b0e9.09ae2","wires":[["afe6d608.6433a8"]]},{"id":"f2029c3c.86a2f","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Error occurred during pre-health check : ' + $vm[$vmIndex].url + '. Hence skipping its restart.'`\"/>","comments":"","x":1763.5,"y":370.9999942779541,"z":"ae41b0e9.09ae2","wires":[]},{"id":"afe6d608.6433a8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1373.833251953125,"y":456.9999942779541,"z":"ae41b0e9.09ae2","wires":[["f2029c3c.86a2f","bc689a04.21c6e8","77824ab1.d42474","c92c539c.fc047"]]},{"id":"bc689a04.21c6e8","type":"set","name":"set_mark_vm_skipped","xml":"<set>\n<parameter name=\"restartSkippedCount\" value=\"`$restartSkippedCount + 1`\" />\n","comments":"","x":1777.5,"y":417.9999942779541,"z":"ae41b0e9.09ae2","wires":[]},{"id":"4139fead.003ea","type":"outcome","name":"healthcheck_failed","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1052.5,"y":340.999963760376,"z":"ae41b0e9.09ae2","wires":[["d5d15505.317458"]]},{"id":"f72b1721.a74a38","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1031.0164794921875,"y":395.3381290435791,"z":"ae41b0e9.09ae2","wires":[["8a1531f1.c2158"]]},{"id":"f4cc1b80.ecfd88","type":"outcome","name":"healthcheck_success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1048.97216796875,"y":277.5000247955322,"z":"ae41b0e9.09ae2","wires":[["4c08ade6.fe4dd4"]]},{"id":"e5c61a50.5fd478","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$vmCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"false\"/>\n","comments":"","x":643.5,"y":262.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"67509b2d.7a3494","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1429.5,"y":1038.999963760376,"z":"ae41b0e9.09ae2","wires":[["cbd3bc29.1cecd","15a249d1.cb3bc6","8fd2ec2e.de8f1","cfc2f0d9.4cf62"]]},{"id":"cfc2f0d9.4cf62","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1704.166748046875,"y":1039.999948501587,"z":"ae41b0e9.09ae2","wires":[]},{"id":"8fd2ec2e.de8f1","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1675.6329345703125,"y":1085.8125858306885,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"cbd3bc29.1cecd","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1714.5001525878906,"y":1129.999963760376,"z":"ae41b0e9.09ae2","wires":[["de56e9e1.0fb738"]]},{"id":"15a249d1.cb3bc6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1684.2607421875,"y":1175.187952041626,"z":"ae41b0e9.09ae2","wires":[]},{"id":"bead2929.f122e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1433.5,"y":985.999963760376,"z":"ae41b0e9.09ae2","wires":[["207fed09.9a8492","8fd2ec2e.de8f1","cbd3bc29.1cecd","15a249d1.cb3bc6"]]},{"id":"207fed09.9a8492","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"Error occurred during post-health check of the restarted servers\"/>","comments":"","x":1700.5,"y":984.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"d5d15505.317458","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1397.5,"y":344.999963760376,"z":"ae41b0e9.09ae2","wires":[["2c8c1b1d.016d24","77824ab1.d42474","c92c539c.fc047","428cb220.cb137c"]]},{"id":"8a1531f1.c2158","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1387.5,"y":400.999963760376,"z":"ae41b0e9.09ae2","wires":[["c92c539c.fc047","428cb220.cb137c","77824ab1.d42474","fd9d4346.08f21"]]},{"id":"2c8c1b1d.016d24","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"Error occurred during pre-health check\"/>","comments":"","x":1756.5,"y":269.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"fd9d4346.08f21","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1760.166748046875,"y":321.9999485015869,"z":"ae41b0e9.09ae2","wires":[]},{"id":"77824ab1.d42474","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1734.6329345703125,"y":462.8125858306885,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"c92c539c.fc047","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1771.5001220703125,"y":510.999963760376,"z":"ae41b0e9.09ae2","wires":[["de56e9e1.0fb738"]]},{"id":"428cb220.cb137c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1746.2607421875,"y":559.187952041626,"z":"ae41b0e9.09ae2","wires":[]},{"id":"860a3ff7.f7ce8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":296.5,"y":360.999963760376,"z":"ae41b0e9.09ae2","wires":[["72be6190.108dc","4019eb71.f46704","45276a62.7c92c4"]]},{"id":"2e70b639.278d4a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":303.5,"y":662.999963760376,"z":"ae41b0e9.09ae2","wires":[["ccd05e9a.19417","3fc5910d.6ff2ae"]]},{"id":"8c13cfcc.6b30e","type":"comment","name":"Health check servers","info":"","comments":"","x":340.5000305175781,"y":194.99996376037598,"z":"ae41b0e9.09ae2","wires":[]},{"id":"628f7207.6b94dc","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"Attempting to health check the servers of the VNFC before restarting them.\"/>\n","comments":"","outputs":1,"x":665.611083984375,"y":160.88884925842285,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"3908f3bc.3be64c","type":"set","name":"increment_restarted_vm_count","xml":"<set>\n<parameter name='restartSuccessCount' value='`$restartSuccessCount+1`' />\n","comments":"","x":2014.1769714355469,"y":812.7777652740479,"z":"ae41b0e9.09ae2","wires":[]},{"id":"76ce77bd.4cacc8","type":"switchNode","name":"switch : restarted server > 0","xml":"<switch test='`$restartSuccessCount > 0`'>\n","comments":"","outputs":1,"x":347.2881164550781,"y":948.999963760376,"z":"ae41b0e9.09ae2","wires":[["9cfcf21e.faba1","c7044ad3.bc0ca8"]]},{"id":"c7044ad3.bc0ca8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":544.0381469726562,"y":948.7500858306885,"z":"ae41b0e9.09ae2","wires":[["2318f81f.7133f8"]]},{"id":"9cfcf21e.faba1","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":542.5381164550781,"y":998.7500247955322,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"ce24660a.70bd38","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":304.2881164550781,"y":867.999963760376,"z":"ae41b0e9.09ae2","wires":[["76ce77bd.4cacc8","146acfc4.db634"]]},{"id":"5a80da73.594524","type":"call","name":"Restart","xml":"<call module='APPC' rpc='Restart_VM' mode='sync' >\n","comments":"","outputs":1,"x":1370.7325744628906,"y":655.999963760376,"z":"ae41b0e9.09ae2","wires":[["74b788b3.2be2f8","c833ddce.53e9a","f8a530a5.dc002"]]},{"id":"239f297a.71d536","type":"set","name":"set restart parameters","xml":"<set>\n<parameter name=\"restart-vm-url\" value=\"`$vm[$vmIndex].url`\" />\n<parameter name=\"application-node-name\" value=\"`$vm[$vmIndex].node-name`\" />\n<parameter name=\"application-status\" value=\"`$vm[$vmIndex].status`\" />\n<parameter name='restartRetryCount' value='3'/>\n","comments":"","x":1416.7325744628906,"y":590.0000247955322,"z":"ae41b0e9.09ae2","wires":[]},{"id":"f8a530a5.dc002","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1618.0659484863281,"y":636.9999618530273,"z":"ae41b0e9.09ae2","wires":[["a7ed0995.4f2518"]]},{"id":"a7ed0995.4f2518","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1837.0659484863281,"y":636.9999618530273,"z":"ae41b0e9.09ae2","wires":[["78403997.4e6fc8","c78696a0.1c9918","2d7e5cc9.758c64","a1fe0884.e414e8"]]},{"id":"78403997.4e6fc8","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'DG to execute Restart action not found for VM: ' + $vm[$vmIndex].url`\"/>\n","comments":"","x":2131.637237548828,"y":515.7141952514648,"z":"ae41b0e9.09ae2","wires":[]},{"id":"de56e9e1.0fb738","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2612.803741455078,"y":967.515588760376,"z":"ae41b0e9.09ae2","wires":[["3a327862.942808"]]},{"id":"3a327862.942808","type":"execute","name":"Report_Error_To_DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":3142.303741455078,"y":958.515588760376,"z":"ae41b0e9.09ae2","wires":[["d990af07.e6417"]]},{"id":"d990af07.e6417","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3396.589141845703,"y":965.944299697876,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"4c08ade6.fe4dd4","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":1261.8436279296875,"y":278.88884925842285,"z":"ae41b0e9.09ae2","wires":[["5866543a.6d051c"]]},{"id":"5866543a.6d051c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1456.544921875,"y":278.24883460998535,"z":"ae41b0e9.09ae2","wires":[["5cdd015c.a3958"]]},{"id":"5cdd015c.a3958","type":"set","name":"set VM params","xml":"<set>\n<parameter name=\"vm[$i].status\" value=\"`$healthcheck.vm[$i].status`\" />\n<parameter name=\"vm[$i].node-name\" value=\"`$healthcheck.vm[$i].nodeName`\" />\n","comments":"","x":1697.544921875,"y":199.24883460998535,"z":"ae41b0e9.09ae2","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart-Active-Passive_VNFC.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart-Active-Passive_VNFC.json
index 842e9ee9e..7065c3044 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart-Active-Passive_VNFC.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart-Active-Passive_VNFC.json
@@ -1 +1 @@
-[{"id":"565d7830.671f38","type":"dgstart","name":"DGSTART","outputs":1,"x":120,"y":46,"z":"3fd3b806.3e5988","wires":[["ac4eea18.913ab8"]]},{"id":"59101988.5e8918","type":"method","name":"Restart-Active-Passive_VNFC","xml":"<method rpc='Restart-Active-Passive_VNFC' mode='sync'>\n","comments":"","outputs":1,"x":140,"y":169,"z":"3fd3b806.3e5988","wires":[["794ec84e.03f458"]]},{"id":"ac4eea18.913ab8","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":301,"y":45,"z":"3fd3b806.3e5988","wires":[["59101988.5e8918"]]},{"id":"794ec84e.03f458","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":213.10713958740234,"y":1121.833251953125,"z":"3fd3b806.3e5988","wires":[["4be16fa8.af873","e7b3ea7a.c2c148","fcff96c4.ade008","1c612bb4.7e9b94","f4113929.049f68","c5cfc802.b4cf68","3a78a34c.56b16c","b35d1ce3.c179b","1ba5abd.58e3954","bbe6528e.9f013","6c87077e.9e46d8"]]},{"id":"1c67b9e.8d46346","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":782.4375,"y":246.1875,"z":"3fd3b806.3e5988","wires":[["49de287f.6f6438","83c8d474.49add8","dfe164aa.2d4e48"]]},{"id":"49de287f.6f6438","type":"for","name":"for_each_vm","xml":"<for index='i' start='0' end='`$vmCount`' >","comments":"","outputs":1,"x":956.9376068115234,"y":163.6875,"z":"3fd3b806.3e5988","wires":[["439a312b.1157c"]]},{"id":"dfe164aa.2d4e48","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$vmCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"false\"/>\n","comments":"","x":1000.6875152587891,"y":245.9373836517334,"z":"3fd3b806.3e5988","wires":[]},{"id":"83c8d474.49add8","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":962.7422485351562,"y":317.4207763671875,"z":"3fd3b806.3e5988","wires":[["14a8bba.80caa44","fd8d5af4.7df798","fff32611.8ae708"]]},{"id":"14a8bba.80caa44","type":"outcome","name":"healthcheck_failed","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1225.4375610351562,"y":264.9375,"z":"3fd3b806.3e5988","wires":[["ae67c815.dcdce8"]]},{"id":"fd8d5af4.7df798","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1200.9542846679688,"y":317.2757568359375,"z":"3fd3b806.3e5988","wires":[["fa98825d.3010c"]]},{"id":"fff32611.8ae708","type":"outcome","name":"healthcheck_success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1229.7233276367188,"y":368.7589111328125,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"98d9e8d0.be81a8","type":"comment","name":"Healthcheck VMs","info":"","comments":"","x":492.6597900390625,"y":199.29833984375,"z":"3fd3b806.3e5988","wires":[]},{"id":"439a312b.1157c","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$vm[$i].url`\" />\n","comments":"","x":1104.0765571594238,"y":162.71521377563477,"z":"3fd3b806.3e5988","wires":[]},{"id":"fa98825d.3010c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1581.8818969726562,"y":313.1596670150757,"z":"3fd3b806.3e5988","wires":[["4059468e.bea478","3662a5a.682225a","94c4b9c3.257ef8","2c062cf5.3f4d74"]]},{"id":"2c062cf5.3f4d74","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1978.7986450195312,"y":247.65954399108887,"z":"3fd3b806.3e5988","wires":[]},{"id":"94c4b9c3.257ef8","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1953.5149536132812,"y":320.72228813171387,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"4059468e.bea478","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2043.3825073242188,"y":366.6596984863281,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"3662a5a.682225a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1959.3928833007812,"y":409.5977153778076,"z":"3fd3b806.3e5988","wires":[]},{"id":"ae67c815.dcdce8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1585.8818969726562,"y":260.1596670150757,"z":"3fd3b806.3e5988","wires":[["94c4b9c3.257ef8","4059468e.bea478","3662a5a.682225a"]]},{"id":"4be16fa8.af873","type":"switchNode","name":"switch_any_vm_to_healthcheck","xml":"<switch test='`$vmCount>=1`'>\n","comments":"","outputs":1,"x":507.96527099609375,"y":247.4375,"z":"3fd3b806.3e5988","wires":[["9613c9c6.03d988","584f2018.2bde8"]]},{"id":"9613c9c6.03d988","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":662.9652862548828,"y":181.43753147125244,"z":"3fd3b806.3e5988","wires":[["1c67b9e.8d46346"]]},{"id":"584f2018.2bde8","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":678.9652709960938,"y":343.4375,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"4724f50a.19007c","type":"execute","name":"Resolve_Check-Active_VNFC_vSCP","xml":"<execute plugin='org.openecomp.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"IsActive\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"IsActiveDG\" />\n","comments":"","outputs":1,"x":1379.895980834961,"y":652.5207901000977,"z":"3fd3b806.3e5988","wires":[["1130e674.0489ea","2eb496e0.0cef8a","79cfc4c5.caf0ac"]]},{"id":"9cd35f9f.becbb","type":"call","name":"call_checkActive_DG","xml":"<call rpc='`$IsActiveDG.dg_name`' version='`$IsActiveDG.dg_version`' module='`$IsActiveDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":1750.6736450195312,"y":827.6320190429688,"z":"3fd3b806.3e5988","wires":[["f1fd8fe2.c9c05","fde23278.98f7d","fc061fd9.a985d"]]},{"id":"52572003.4e273","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"false","comments":"","outputs":1,"x":1709.7014770507812,"y":759.6875,"z":"3fd3b806.3e5988","wires":[["9cd35f9f.becbb"]]},{"id":"1130e674.0489ea","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1600.8959350585938,"y":704.5208129882812,"z":"3fd3b806.3e5988","wires":[["52572003.4e273"]]},{"id":"2eb496e0.0cef8a","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1614.8958129882812,"y":607.5208129882812,"z":"3fd3b806.3e5988","wires":[["5c094025.a30ec"]]},{"id":"79cfc4c5.caf0ac","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1625.8958740234375,"y":655.5208435058594,"z":"3fd3b806.3e5988","wires":[["be24d9c9.561338"]]},{"id":"5c094025.a30ec","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1796.1182250976562,"y":604.939697265625,"z":"3fd3b806.3e5988","wires":[["f306145d.fdc398","5c26451c.10c92c","2e7608a5.5732a8","d8d5bc0a.b708c"]]},{"id":"f306145d.fdc398","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'IsActive DG resolution plugin not found for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":2047.8960571289062,"y":540.5208129882812,"z":"3fd3b806.3e5988","wires":[]},{"id":"be24d9c9.561338","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1767.1182250976562,"y":656.4097900390625,"z":"3fd3b806.3e5988","wires":[["a229ed4e.0dcb6","5c26451c.10c92c","2e7608a5.5732a8","d8d5bc0a.b708c"]]},{"id":"a229ed4e.0dcb6","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Error while resolving IsActive DG for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":2062.1179809570312,"y":578.4097900390625,"z":"3fd3b806.3e5988","wires":[]},{"id":"5c26451c.10c92c","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2084.6869506835938,"y":620.7096557617188,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"2e7608a5.5732a8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2203.5545043945312,"y":671.89697265625,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"d8d5bc0a.b708c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value=\"`$error-message`\"/>","comments":"","x":2079.6736450195312,"y":719.8798217773438,"z":"3fd3b806.3e5988","wires":[]},{"id":"f27f6bc.1549998","type":"comment","name":"Check Active Passive Status","info":"","comments":"","x":1373.5347900390625,"y":615.4929504394531,"z":"3fd3b806.3e5988","wires":[]},{"id":"fde23278.98f7d","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1946.2570190429688,"y":828.6876220703125,"z":"3fd3b806.3e5988","wires":[["211d3f71.d278e"]]},{"id":"211d3f71.d278e","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":2078.5066528320312,"y":828.076416015625,"z":"3fd3b806.3e5988","wires":[["57792db1.3c8d24","1f3a0577.6a147b","45ded8ec.fc9338"]]},{"id":"f1fd8fe2.c9c05","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1949.7850952148438,"y":771.1319580078125,"z":"3fd3b806.3e5988","wires":[["9bcb3092.a9072"]]},{"id":"9bcb3092.a9072","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2087.4519653320312,"y":770.7730712890625,"z":"3fd3b806.3e5988","wires":[["ab89d5f6.5f6638","57792db1.3c8d24","45ded8ec.fc9338","1f3a0577.6a147b"]]},{"id":"ab89d5f6.5f6638","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'IsActive DG not found for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":2306.0073852539062,"y":750.354248046875,"z":"3fd3b806.3e5988","wires":[]},{"id":"57792db1.3c8d24","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2315.8960571289062,"y":793.0208740234375,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"45ded8ec.fc9338","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value=\"`$error-message`\"/>","comments":"","x":2308.6738891601562,"y":886.6875610351562,"z":"3fd3b806.3e5988","wires":[]},{"id":"fc061fd9.a985d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1949.3959350585938,"y":903.4931030273438,"z":"3fd3b806.3e5988","wires":[["a5bcdddf.bc981"]]},{"id":"a5bcdddf.bc981","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":2096.1179809570312,"y":903.85400390625,"z":"3fd3b806.3e5988","wires":[["d6962e57.fda47"]]},{"id":"d6962e57.fda47","type":"record","name":"Log success","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"Active/Passive check succeeded\"/>\n","comments":"","outputs":1,"x":2283.0901489257812,"y":937.742919921875,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"e7b3ea7a.c2c148","type":"execute","name":"executePreRestart","xml":"<execute plugin='com.att.appc.dg.vSCP.v3_5_5.smp.SMPDGPlugin' method='restartSequenceGenerator' >\n","comments":"","outputs":1,"x":700.8542175292969,"y":846.7710266113281,"z":"3fd3b806.3e5988","wires":[["ff4b13d7.8ff6a","6e82fb15.444774","96ac29bf.e4a348"]]},{"id":"e598a9ef.046f68","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":873.5207977294922,"y":499.30663871765137,"z":"3fd3b806.3e5988","wires":[["794de1af.7fd7e"]]},{"id":"5ef368c3.4bd7b8","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[$i].status`\">\n","comments":"","outputs":1,"x":1294.5206909179688,"y":498.8065776824951,"z":"3fd3b806.3e5988","wires":[["f2e22899.360288","433d325f.0e0b7c","21588e29.a3cc32"]]},{"id":"f2e22899.360288","type":"other","name":"outcome_up","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":1541.5206909179688,"y":541.3066387176514,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"21588e29.a3cc32","type":"other","name":"outcome_down","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":1557.5206909179688,"y":451.30663871765137,"z":"3fd3b806.3e5988","wires":[["5950449e.d1cb4c"]]},{"id":"433d325f.0e0b7c","type":"other","name":"outcome_unknown","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":1559.3041381835938,"y":498.4493999481201,"z":"3fd3b806.3e5988","wires":[["5950449e.d1cb4c"]]},{"id":"5124c756.7348b8","type":"set","name":"set","xml":"<set>\n<parameter name=\"doCheckActive\" value=\"true\" />\n","comments":"","x":871.8689727783203,"y":435.59222412109375,"z":"3fd3b806.3e5988","wires":[]},{"id":"5950449e.d1cb4c","type":"set","name":"set_to_perform_checkActive","xml":"<set>\n<parameter name=\"doCheckActive\" value=\"false\" />\n","comments":"","x":1830.0833129882812,"y":470.3065776824951,"z":"3fd3b806.3e5988","wires":[]},{"id":"60571aaf.8d8604","type":"switchNode","name":"switch_Perform_check_active","xml":"<switch test='`$doCheckActive`'>\n","comments":"","outputs":1,"x":928.0833129882812,"y":652.7709045410156,"z":"3fd3b806.3e5988","wires":[["4b2bdd82.af31c4","36d8fdb0.8d2aa2"]]},{"id":"4b2bdd82.af31c4","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1157.3333740234375,"y":653.5208435058594,"z":"3fd3b806.3e5988","wires":[["4724f50a.19007c"]]},{"id":"6e82fb15.444774","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":971.6667175292969,"y":904.7709655761719,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"ff4b13d7.8ff6a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":948.1669464111328,"y":789.5208129882812,"z":"3fd3b806.3e5988","wires":[["6b9137e6.eeb0c8"]]},{"id":"3be108bc.20f958","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1368.2382507324219,"y":861.1994934082031,"z":"3fd3b806.3e5988","wires":[]},{"id":"30d0cd36.793752","type":"set","name":"set event message","xml":"<set>\n<parameter name='event-message' value='Pre-Restart Execution failed' />\n","comments":"","x":1387.9694519042969,"y":777.9878234863281,"z":"3fd3b806.3e5988","wires":[]},{"id":"691ca8da.821e88","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1366.9694519042969,"y":815.9878234863281,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"1c612bb4.7e9b94","type":"for","name":"for_first_list","xml":"<for index='vmIndex' start='0' end='`$vmCount`' >\n","comments":"","outputs":1,"x":486.75013732910156,"y":1122.166748046875,"z":"3fd3b806.3e5988","wires":[["38e206a3.cc06fa"]]},{"id":"25ad81f2.75882e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1361.2500610351562,"y":1148.4169311523438,"z":"3fd3b806.3e5988","wires":[["3e050b23.00ef54"]]},{"id":"4d653382.a429ec","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1366.2501983642578,"y":1239.4169917106624,"z":"3fd3b806.3e5988","wires":[["fd9f91c4.d80c9"]]},{"id":"b35d1ce3.c179b","type":"switchNode","name":"switch_any_firstList_vm_restarted","xml":"<switch test='`$restartedFirstVMListCount>=1`'>\n","comments":"","outputs":1,"x":658.7777938842773,"y":1780.138671875,"z":"3fd3b806.3e5988","wires":[["c7ae14aa.457d88","2f4154b1.cffeac"]]},{"id":"c7ae14aa.457d88","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":903.5277938842773,"y":1864.1387939453125,"z":"3fd3b806.3e5988","wires":[["90e673f0.925cf"]]},{"id":"2f4154b1.cffeac","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":905.7777633666992,"y":1704.1387939453125,"z":"3fd3b806.3e5988","wires":[["4047d58d.27a18c"]]},{"id":"4047d58d.27a18c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":1105.5278854370117,"y":1702.8887939453125,"z":"3fd3b806.3e5988","wires":[]},{"id":"b7d474af.5c9d58","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1849.000087738037,"y":1919.555528640747,"z":"3fd3b806.3e5988","wires":[["1601f900.8eba77"]]},{"id":"48e8232b.a696ec","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1867.000087738037,"y":2039.4445667266846,"z":"3fd3b806.3e5988","wires":[["a762c339.2cf29"]]},{"id":"db44a408.35fa18","type":"set","name":"Mark VM failed","xml":"<set>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n","comments":"","x":1790.500015258789,"y":1061.1669917106624,"z":"3fd3b806.3e5988","wires":[]},{"id":"33b4c1af.2c1a5e","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1783.679702758789,"y":1104.6076655387874,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"e4f324e3.458468","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1818.7965240478516,"y":1151.5446772575374,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"3e050b23.00ef54","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1541.7501373291016,"y":1147.91686964035,"z":"3fd3b806.3e5988","wires":[["db44a408.35fa18","33b4c1af.2c1a5e","e4f324e3.458468"]]},{"id":"f44e0dc2.7f05c","type":"set","name":"Set event message and update counters","xml":"<set>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n","comments":"","x":2412.4722290039062,"y":1807.9716796875,"z":"3fd3b806.3e5988","wires":[]},{"id":"2761c6df.41b09a","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2331.1519775390625,"y":1905.912133216858,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"bc22b70f.0c2028","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2721.7694702148438,"y":1948.0997314453125,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"1601f900.8eba77","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2080.389019012451,"y":1922.388557434082,"z":"3fd3b806.3e5988","wires":[["f44e0dc2.7f05c","2761c6df.41b09a","bc22b70f.0c2028"]]},{"id":"98dcf986.aced38","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Restart succeed for the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1777.4445190429688,"y":1334.6119995117188,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"f4113929.049f68","type":"set","name":"Initialize_restartedFirstList_Count","xml":"<set>\n<parameter name='restartedFirstVMListCount' value='0' />\n\n","comments":"","x":692.1666870117188,"y":1264.0274658203125,"z":"3fd3b806.3e5988","wires":[]},{"id":"fcff96c4.ade008","type":"set","name":"Initialize_restart_parameters","xml":"<set>\n<parameter name='restartFailedCount' value='0' />\n<parameter name='restartSuccessCount' value='0' />","comments":"","x":709.7500915527344,"y":971.4163818359375,"z":"3fd3b806.3e5988","wires":[]},{"id":"bbe6528e.9f013","type":"switchNode","name":"If_any_restart_failed","xml":"<switch test='`$restartFailedCount>=1`'>\n","comments":"","outputs":1,"x":626.250078201294,"y":2505.583155632019,"z":"3fd3b806.3e5988","wires":[["2ac4791e.46f246","159116ac.51a699"]]},{"id":"2ac4791e.46f246","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":892.5556812286377,"y":2452.305316925049,"z":"3fd3b806.3e5988","wires":[["7a649831.9f1858"]]},{"id":"159116ac.51a699","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":899.750078201294,"y":2556.583148956299,"z":"3fd3b806.3e5988","wires":[["37709497.487aec"]]},{"id":"37709497.487aec","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":1123.000078201294,"y":2557.083148956299,"z":"3fd3b806.3e5988","wires":[]},{"id":"7a649831.9f1858","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1102.3056201934814,"y":2451.832904815674,"z":"3fd3b806.3e5988","wires":[]},{"id":"9c2d1d30.44395","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1107.7500610351562,"y":1380.6666259765625,"z":"3fd3b806.3e5988","wires":[["e32d3076.62496","9c6ca981.cf3198","9a0c3b86.dcc888"]]},{"id":"e32d3076.62496","type":"for","name":"for_each_vm","xml":"<for index='i' start='0' end='`$restartSuccessCount`' >","comments":"","outputs":1,"x":1339.2500610351562,"y":1382.4166259765625,"z":"3fd3b806.3e5988","wires":[["c4ab230a.95c29"]]},{"id":"c4ab230a.95c29","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$restartedServerList[$i].url`\" />\n","comments":"","x":1524.2500610351562,"y":1377.9166259765625,"z":"3fd3b806.3e5988","wires":[]},{"id":"9a0c3b86.dcc888","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$restartSuccessCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":1358.5000610351562,"y":1439.4166259765625,"z":"3fd3b806.3e5988","wires":[]},{"id":"9c6ca981.cf3198","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":1400.8048706054688,"y":1493.89990234375,"z":"3fd3b806.3e5988","wires":[["e30a91c0.1f657","d32c2422.06b3d8","d703536.35151b"]]},{"id":"e30a91c0.1f657","type":"outcome","name":"healthcheck_failed","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1711.2500610351562,"y":1495.4166259765625,"z":"3fd3b806.3e5988","wires":[["e2ffb1de.b124e"]]},{"id":"d32c2422.06b3d8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1706.7665405273438,"y":1554.7547607421875,"z":"3fd3b806.3e5988","wires":[["3298d778.916828"]]},{"id":"d703536.35151b","type":"outcome","name":"healthcheck_success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1687.5000610351562,"y":1623.1666259765625,"z":"3fd3b806.3e5988","wires":[["2bd9fac.f2e7606"]]},{"id":"2bd9fac.f2e7606","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$restartSuccessCount`\" >","comments":"","outputs":1,"x":1905.4168090820312,"y":1686.4166259765625,"z":"3fd3b806.3e5988","wires":[["c4c4885d.681c88"]]},{"id":"c4c4885d.681c88","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[$i].status`\">\n","comments":"","outputs":1,"x":2161.5001831054688,"y":1693.9166259765625,"z":"3fd3b806.3e5988","wires":[["2e9fc35d.edaf5c","66adef5.39ab51","49abe035.4ef46"]]},{"id":"ef47ba9d.0acfa8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":992.9722766876221,"y":2186.916627883911,"z":"3fd3b806.3e5988","wires":[["f26ebaaf.f84c68","c45137da.947918","cb92c687.45d9b8"]]},{"id":"f26ebaaf.f84c68","type":"for","name":"for_each_vm","xml":"<for index='i' start='0' end='`$restartSuccessCount`' >","comments":"","outputs":1,"x":1166.222276687622,"y":2133.166626930237,"z":"3fd3b806.3e5988","wires":[["47769042.b3fd5"]]},{"id":"cb92c687.45d9b8","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$restartSuccessCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":1192.4722805023193,"y":2191.6665058135986,"z":"3fd3b806.3e5988","wires":[]},{"id":"c45137da.947918","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":1173.276964187622,"y":2258.1499042510986,"z":"3fd3b806.3e5988","wires":[["fbea3fd2.46312","c08ecaf2.836998","5bf097d5.7d4a38"]]},{"id":"fbea3fd2.46312","type":"outcome","name":"healthcheck_failed","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1432.4722805023193,"y":2197.666627883911,"z":"3fd3b806.3e5988","wires":[["7c565f0f.63661"]]},{"id":"c08ecaf2.836998","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1443.4889698028564,"y":2250.0048265457153,"z":"3fd3b806.3e5988","wires":[["21eda6fd.da801a"]]},{"id":"5bf097d5.7d4a38","type":"outcome","name":"healthcheck_success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1449.2223682403564,"y":2321.416569709778,"z":"3fd3b806.3e5988","wires":[["29bda719.f445f8"]]},{"id":"ed661fb6.7a7a3","type":"set","name":"set_mark_vm_restarted","xml":"<set>\n<parameter name=\"restartedServerList[$restartSuccessCount].url\" value=\"`$vm[$vmIndex].url`\" />\n","comments":"","x":1788.5276336669922,"y":1240.5278930664062,"z":"3fd3b806.3e5988","wires":[]},{"id":"3ee9ae0.e12b052","type":"set","name":"increment_restarted_vm_count","xml":"<set>\n<parameter name='restartSuccessCount' value='`$restartSuccessCount+1`' />\n","comments":"","x":1813.7740478515625,"y":1286.6627807617188,"z":"3fd3b806.3e5988","wires":[]},{"id":"fd9f91c4.d80c9","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1535.4167938232422,"y":1239.6115112304688,"z":"3fd3b806.3e5988","wires":[["98dcf986.aced38","ed661fb6.7a7a3","3ee9ae0.e12b052"]]},{"id":"3298d778.916828","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1890.1111450195312,"y":1553.4442138671875,"z":"3fd3b806.3e5988","wires":[["e42b2698.ff0c28","d6472f50.eeb0f","66766044.0bc98","f286d57a.a53198"]]},{"id":"f286d57a.a53198","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":2182.7781372070312,"y":1504.4442138671875,"z":"3fd3b806.3e5988","wires":[]},{"id":"66766044.0bc98","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2180.2444458007812,"y":1546.2568359375,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"e42b2698.ff0c28","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2203.1113891601562,"y":1588.4442138671875,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"d6472f50.eeb0f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2176.6221313476562,"y":1630.3822021484375,"z":"3fd3b806.3e5988","wires":[]},{"id":"e2ffb1de.b124e","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1922.1111450195312,"y":1495.4442138671875,"z":"3fd3b806.3e5988","wires":[["66766044.0bc98","e42b2698.ff0c28","d6472f50.eeb0f","7fe2609.cd44ea"]]},{"id":"7fe2609.cd44ea","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"Error occured during health check of the Restarted servers\"/>","comments":"","x":2182.3613891601562,"y":1459.4442138671875,"z":"3fd3b806.3e5988","wires":[]},{"id":"49abe035.4ef46","type":"other","name":"outcome_up","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":2390.7504272460938,"y":1749.7222900390625,"z":"3fd3b806.3e5988","wires":[["8ae3ec83.85715"]]},{"id":"8ae3ec83.85715","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2611.0006713867188,"y":1747.2222900390625,"z":"3fd3b806.3e5988","wires":[["1fc212be.5390ed","4a8cea9d.531f74","ae266efa.9b164"]]},{"id":"1fc212be.5390ed","type":"execute","name":"Report_Success","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\" />\n","comments":"","outputs":1,"x":2848.7504272460938,"y":1837.7939453125,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"4a8cea9d.531f74","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":2849.8053588867188,"y":1793.2889404296875,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"ae266efa.9b164","type":"set","name":"Set success message and update counters","xml":"<set>\n<parameter name='success-message' value=\"`'Restart succeeded for the server : ' + $restartedServerList[$i].url`\"/>\n<parameter name='restartedFirstVMListCount' value='`$restartedFirstVMListCount+1`' />\n<parameter name=\"RestartSuccessVMCount\" value=\"`$RestartSuccessVMCount + 1`\" />\n\n","comments":"","x":2923.8053588867188,"y":1748.2890625,"z":"3fd3b806.3e5988","wires":[]},{"id":"2e9fc35d.edaf5c","type":"other","name":"outcome_down","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":2400.7501831054688,"y":1640.72216796875,"z":"3fd3b806.3e5988","wires":[["722f7db.ad64184"]]},{"id":"66adef5.39ab51","type":"other","name":"outcome_unknown","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":2414.5336303710938,"y":1696.8648681640625,"z":"3fd3b806.3e5988","wires":[["722f7db.ad64184"]]},{"id":"722f7db.ad64184","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2626.7147827148438,"y":1643.5078125,"z":"3fd3b806.3e5988","wires":[["2420dfd1.3d3f6","6aea1090.d7e6b","f6a19c69.5f799"]]},{"id":"2420dfd1.3d3f6","type":"set","name":"Set event message and update Counters","xml":"<set>\n<parameter name='event-message' value=\"`'Health check failed for the Restarted server : ' + $restartedServerList[$i].url`\"/>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthCheckFailedCount + 1`\" />\n","comments":"","x":2914.7147827148438,"y":1596.508056640625,"z":"3fd3b806.3e5988","wires":[]},{"id":"6aea1090.d7e6b","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2842.6610717773438,"y":1643.1077880859375,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"f6a19c69.5f799","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2858.5282592773438,"y":1685.2952880859375,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"202bd856.91c528","type":"comment","name":"Restart First List","info":"","comments":"","x":497.66676330566406,"y":1078.333251953125,"z":"3fd3b806.3e5988","wires":[]},{"id":"ded1e319.f55dd","type":"comment","name":"Healthcheck First List","info":"","comments":"","x":701.77783203125,"y":1379.9166259765625,"z":"3fd3b806.3e5988","wires":[]},{"id":"3676ee92.49abb2","type":"comment","name":"Restart Second List","info":"","comments":"","x":681.1111679077148,"y":1722.9163818359375,"z":"3fd3b806.3e5988","wires":[]},{"id":"72122241.50003c","type":"comment","name":"Healthcheck SecondList","info":"","comments":"","x":703.19455909729,"y":2140.027466773987,"z":"3fd3b806.3e5988","wires":[]},{"id":"e035a23b.7b864","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Restart succeeded for the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":2313.083854675293,"y":2155.361406326294,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"58515fa3.8d588","type":"set","name":"set_mark_vm_restarted","xml":"<set>\n<parameter name=\"restartedServerList[$restartSuccessCount].url\" value=\"`$vm[$vmIndex].url`\" />\n","comments":"","x":2366.667251586914,"y":2062.777953624725,"z":"3fd3b806.3e5988","wires":[]},{"id":"a242df26.53c36","type":"set","name":"increment_restarted_vm_count","xml":"<set>\n<parameter name='restartSuccessCount' value='`$restartSuccessCount+1`' />\n","comments":"","x":2342.663101196289,"y":2105.4125971794124,"z":"3fd3b806.3e5988","wires":[]},{"id":"a762c339.2cf29","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2082.8056640625,"y":2106.1110653877254,"z":"3fd3b806.3e5988","wires":[["e035a23b.7b864","58515fa3.8d588","a242df26.53c36"]]},{"id":"47769042.b3fd5","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$restartedServerList[$i].url`\" />\n","comments":"","x":1429.8610744476318,"y":2136.6943378448486,"z":"3fd3b806.3e5988","wires":[]},{"id":"21eda6fd.da801a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1633.6666202545166,"y":2251.3887977600098,"z":"3fd3b806.3e5988","wires":[["11eddd5.8a0d223","1627b80.c24f648","448eea91.f58eb4","51d1e08a.45697"]]},{"id":"51d1e08a.45697","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1892.8333759307861,"y":2237.888620376587,"z":"3fd3b806.3e5988","wires":[]},{"id":"448eea91.f58eb4","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1908.2995624542236,"y":2300.451364517212,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"11eddd5.8a0d223","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2569.1669311523438,"y":2206.8887939453125,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"1627b80.c24f648","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1907.9274921417236,"y":2366.0767879486084,"z":"3fd3b806.3e5988","wires":[]},{"id":"7c565f0f.63661","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1637.6666202545166,"y":2198.3887977600098,"z":"3fd3b806.3e5988","wires":[["448eea91.f58eb4","11eddd5.8a0d223","1627b80.c24f648","37b0d881.eecf48"]]},{"id":"37b0d881.eecf48","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"Error occured during health check of the restarted servers\"/>","comments":"","x":1926.1666278839111,"y":2167.888864517212,"z":"3fd3b806.3e5988","wires":[]},{"id":"29bda719.f445f8","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$restartSuccessCount`\" >","comments":"","outputs":1,"x":1421.611177444458,"y":2438.1107234954834,"z":"3fd3b806.3e5988","wires":[["1cf0221.15704de"]]},{"id":"1cf0221.15704de","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[$i].status`\">\n","comments":"","outputs":1,"x":1641.2221240997314,"y":2440.9440364837646,"z":"3fd3b806.3e5988","wires":[["78917505.3d9e0c","309b8ddd.a96422","aaa07653.033a58"]]},{"id":"aaa07653.033a58","type":"other","name":"outcome_up","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":1986.9721698760986,"y":2570.749397277832,"z":"3fd3b806.3e5988","wires":[["f1e0d6b3.20cc08"]]},{"id":"f1e0d6b3.20cc08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2232.972291946411,"y":2571.749274253845,"z":"3fd3b806.3e5988","wires":[["34f66625.125b7a","3eee9a01.5d0826","3502f29e.fa060e"]]},{"id":"34f66625.125b7a","type":"execute","name":"Report_Success","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\" />","comments":"","outputs":1,"x":2558.9724254608154,"y":2643.82080745697,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"3eee9a01.5d0826","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":2553.027109146118,"y":2599.31592464447,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"3502f29e.fa060e","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Restart succeeded for the server : ' + $restartedServerList[$i].url`\"/>\n<parameter name=\"RestartSuccessVMCount\" value=\"`$RestartSuccessVMCount + 1`\" />\n","comments":"","x":2552.0271129608154,"y":2551.316167831421,"z":"3fd3b806.3e5988","wires":[]},{"id":"78917505.3d9e0c","type":"other","name":"outcome_down","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":1990.9720478057861,"y":2439.749397277832,"z":"3fd3b806.3e5988","wires":[["a5c41de1.d7dfd"]]},{"id":"309b8ddd.a96422","type":"other","name":"outcome_unknown","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":1989.7556171417236,"y":2491.892219543457,"z":"3fd3b806.3e5988","wires":[["a5c41de1.d7dfd"]]},{"id":"a5c41de1.d7dfd","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2233.686647415161,"y":2457.034918785095,"z":"3fd3b806.3e5988","wires":[["82a52a17.726898","473fa11c.d8f88","d56783d5.be2b6"]]},{"id":"82a52a17.726898","type":"set","name":"Set event message and update counters","xml":"<set>\n<parameter name='event-message' value=\"`'Health check failed for the Restarted server : ' + $restartedServerList[$i].url`\"/>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthCheckFailedCount + 1`\" />\n","comments":"","x":2527.6867065429688,"y":2394.535400390625,"z":"3fd3b806.3e5988","wires":[]},{"id":"473fa11c.d8f88","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2496.633062362671,"y":2445.1352586746216,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"d56783d5.be2b6","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2520.499765396118,"y":2496.3225145339966,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"3a78a34c.56b16c","type":"set","name":"Re Initialize_restart_success_count","xml":"<set>\n<parameter name='restartSuccessCount' value='0' />","comments":"","x":684.7499847412109,"y":1611.0831298828125,"z":"3fd3b806.3e5988","wires":[]},{"id":"1ba5abd.58e3954","type":"switchNode","name":"switch_any_vm_to_healthcheck","xml":"<switch test='`$restartSuccessCount>=1`'>\n","comments":"","outputs":1,"x":718.5000400543213,"y":2188.166627883911,"z":"3fd3b806.3e5988","wires":[["aedcde25.7a86b","76918471.5d839c"]]},{"id":"aedcde25.7a86b","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":883.5000457763672,"y":2136.6666259765625,"z":"3fd3b806.3e5988","wires":[["ef47ba9d.0acfa8"]]},{"id":"76918471.5d839c","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":889.5000171661377,"y":2284.166569709778,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"c5cfc802.b4cf68","type":"switchNode","name":"switch_any_vm_to_healthcheck","xml":"<switch test='`$restartSuccessCount>=1`'>\n","comments":"","outputs":1,"x":672.5000610351562,"y":1447.1666259765625,"z":"3fd3b806.3e5988","wires":[["a643ee70.b4dd9","adcaa36a.61cef"]]},{"id":"a643ee70.b4dd9","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":921.5,"y":1381.4166259765625,"z":"3fd3b806.3e5988","wires":[["9c2d1d30.44395"]]},{"id":"adcaa36a.61cef","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":910.7499847412109,"y":1508.1666259765625,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"66b6402.a4e8bc","type":"block","name":"block","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":927.9722900390625,"y":1083.0560913085938,"z":"3fd3b806.3e5988","wires":[["2c8da896.df9298","7c143892.7a48a8","6fce4d93.f36c94"]]},{"id":"2c8da896.df9298","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Attempting to restart the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1102.4011840820312,"y":1025.2701416015625,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"6fce4d93.f36c94","type":"set","name":"set restart parameters","xml":"<set>\n<parameter name=\"restart-vm-url\" value=\"`$vm[$vmIndex].url`\" />\n<parameter name='restartRetryCount' value='3'/>\n<parameter name='application-node-name' value=\"`$vm[$vmIndex].node-name`\"/>\n<parameter name='application-status ' value=\"`$vm[$vmIndex].status`\"/>\n","comments":"","x":1130.8120346069336,"y":1082.4486465454102,"z":"3fd3b806.3e5988","wires":[]},{"id":"7c143892.7a48a8","type":"call","name":"Restart_VM","xml":"<call module='APPC' rpc='Restart_VM' mode='sync' >\n","comments":"","outputs":1,"x":1090.5618286132812,"y":1146.4487915039062,"z":"3fd3b806.3e5988","wires":[["25ad81f2.75882e","4d653382.a429ec","ced444de.57c2f8"]]},{"id":"47f00996.18f8a8","type":"block","name":"block","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1480.5556259155273,"y":1864.7220458984375,"z":"3fd3b806.3e5988","wires":[["ed660e4a.df05a","4a73526b.75205c","4a729f7d.1e76c"]]},{"id":"ed660e4a.df05a","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Attempting to restart the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1673.2345809936523,"y":1797.6864013671875,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"4a73526b.75205c","type":"call","name":"Restart_VM","xml":"<call module='APPC' rpc='Restart_VM' mode='sync' >\n","comments":"","outputs":1,"x":1655.6453857421875,"y":1970.364990234375,"z":"3fd3b806.3e5988","wires":[["b7d474af.5c9d58","48e8232b.a696ec","61c3630a.cc9c9c"]]},{"id":"ced444de.57c2f8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1368.4495239257812,"y":1071.4140014648438,"z":"3fd3b806.3e5988","wires":[["7ad527cc.c40e28"]]},{"id":"7ad527cc.c40e28","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1541.4495239257812,"y":1072.4140014648438,"z":"3fd3b806.3e5988","wires":[["33b4c1af.2c1a5e","e4f324e3.458468","5abc7a5f.2be054","6fb4cf51.1634b"]]},{"id":"5abc7a5f.2be054","type":"set","name":"Set event message and Mark VM failed","xml":"<set>\n<parameter name='event-message' value=\"`'DG to execute Restart action not found for VM: ' + $vm[$vmIndex].url`\"/>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n","comments":"","x":1843.520767211914,"y":1007.8781733512874,"z":"3fd3b806.3e5988","wires":[]},{"id":"61c3630a.cc9c9c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1854.1993980407715,"y":1973.4134702682495,"z":"3fd3b806.3e5988","wires":[["8fddaeff.19854"]]},{"id":"8fddaeff.19854","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2096.6993522644043,"y":1976.9134912490845,"z":"3fd3b806.3e5988","wires":[["2761c6df.41b09a","bc22b70f.0c2028","df04b667.517118","65123b76.9ed874"]]},{"id":"df04b667.517118","type":"set","name":"Set event message and Mark VM failed","xml":"<set>\n<parameter name='event-message' value=\"`'DG to execute Restart action not found for VM: ' + $vm[$vmIndex].url`\"/>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n","comments":"","x":2416.5051879882812,"y":1852.16357421875,"z":"3fd3b806.3e5988","wires":[]},{"id":"36d8fdb0.8d2aa2","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1148.3214263916016,"y":720.1786422729492,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"6b9137e6.eeb0c8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1146.6071472167969,"y":815.4643859863281,"z":"3fd3b806.3e5988","wires":[["30d0cd36.793752","3be108bc.20f958","691ca8da.821e88"]]},{"id":"96ac29bf.e4a348","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":948.0358581542969,"y":846.4644470214844,"z":"3fd3b806.3e5988","wires":[["6b9137e6.eeb0c8"]]},{"id":"6c87077e.9e46d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":669.7500457763672,"y":497.0357036590576,"z":"3fd3b806.3e5988","wires":[["5124c756.7348b8","e598a9ef.046f68","60571aaf.8d8604"]]},{"id":"52451ef0.748c5","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3488.7737426757812,"y":1440.0001220703125,"z":"3fd3b806.3e5988","wires":[["9a608560.1a75b8"]]},{"id":"9a608560.1a75b8","type":"execute","name":"Report_Error_To_DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":4340.773887634277,"y":1641.0000228881836,"z":"3fd3b806.3e5988","wires":[["929c559b.07cf48"]]},{"id":"929c559b.07cf48","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4667.059288024902,"y":1618.4287338256836,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"1f3a0577.6a147b","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2343.4407348632812,"y":835.0000610351562,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"794de1af.7fd7e","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1058.2222137451172,"y":499.66662406921387,"z":"3fd3b806.3e5988","wires":[["5ef368c3.4bd7b8","63f52d2.4830bd4"]]},{"id":"63f52d2.4830bd4","type":"set","name":"set VM status","xml":"<set>\n<parameter name=\"vm[$i].status\" value=\"`$healthcheck.vm[$i].status`\" />\n<parameter name=\"vm[$i].node-name\" value=\"`$healthcheck.vm[$i].nodeName`\" />\n","comments":"","x":1267.22216796875,"y":433.6666259765625,"z":"3fd3b806.3e5988","wires":[]},{"id":"38e206a3.cc06fa","type":"switchNode","name":"Order ?","xml":"<switch test='`$vm[$vmIndex].order`'>\n","comments":"","outputs":1,"x":637.2222442626953,"y":1122.2225341796875,"z":"3fd3b806.3e5988","wires":[["a8c2ec5e.735c3","68251e28.9d153"]]},{"id":"a8c2ec5e.735c3","type":"other","name":"first","xml":"<outcome value='first'>\n","comments":"","outputs":1,"x":792.2222442626953,"y":1082.4725952148438,"z":"3fd3b806.3e5988","wires":[["66b6402.a4e8bc"]]},{"id":"68251e28.9d153","type":"outcomeTrue","name":"second","xml":"<outcome value='second'>\n","comments":"","outputs":1,"x":783.4722290039062,"y":1169.2225952148438,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"90e673f0.925cf","type":"for","name":"for_first_list","xml":"<for index='vmIndex' start='0' end='`$vmCount`' >\n","comments":"","outputs":1,"x":1056.2222518920898,"y":1863.77783203125,"z":"3fd3b806.3e5988","wires":[["41e7de35.4909a"]]},{"id":"41e7de35.4909a","type":"switchNode","name":"Order ?","xml":"<switch test='`$vm[$vmIndex].order`'>\n","comments":"","outputs":1,"x":1202.6944198608398,"y":1865.8336181640625,"z":"3fd3b806.3e5988","wires":[["9f13b01a.2bea1","24e3bd72.508902"]]},{"id":"9f13b01a.2bea1","type":"other","name":"first","xml":"<outcome value='first'>\n","comments":"","outputs":1,"x":1364.6942977905273,"y":1779.083740234375,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"24e3bd72.508902","type":"outcomeTrue","name":"second","xml":"<outcome value='second'>\n","comments":"","outputs":1,"x":1342.9442977905273,"y":1864.8336181640625,"z":"3fd3b806.3e5988","wires":[["47f00996.18f8a8"]]},{"id":"4a729f7d.1e76c","type":"set","name":"set restart parameters","xml":"<set>\n<parameter name=\"restart-vm-url\" value=\"`$vm[$vmIndex].url`\" />\n<parameter name='restartRetryCount' value='3'/>\n<parameter name='application-node-name' value=\"`$vm[$vmIndex].node-name`\"/>\n<parameter name='application-status ' value=\"`$vm[$vmIndex].status`\"/>\n","comments":"","x":1692.222412109375,"y":1864.5555419921875,"z":"3fd3b806.3e5988","wires":[]},{"id":"6fb4cf51.1634b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1798.599868774414,"y":1193.8249506950374,"z":"3fd3b806.3e5988","wires":[]},{"id":"65123b76.9ed874","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2282.600112915039,"y":2015.8249506950374,"z":"3fd3b806.3e5988","wires":[]}]
+[{"id":"565d7830.671f38","type":"dgstart","name":"DGSTART","outputs":1,"x":120,"y":46,"z":"3fd3b806.3e5988","wires":[["ac4eea18.913ab8"]]},{"id":"59101988.5e8918","type":"method","name":"Restart-Active-Passive_VNFC","xml":"<method rpc='Restart-Active-Passive_VNFC' mode='sync'>\n","comments":"","outputs":1,"x":140,"y":169,"z":"3fd3b806.3e5988","wires":[["794ec84e.03f458"]]},{"id":"ac4eea18.913ab8","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":301,"y":45,"z":"3fd3b806.3e5988","wires":[["59101988.5e8918"]]},{"id":"794ec84e.03f458","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":213.10713958740234,"y":1121.833251953125,"z":"3fd3b806.3e5988","wires":[["4be16fa8.af873","e7b3ea7a.c2c148","fcff96c4.ade008","1c612bb4.7e9b94","f4113929.049f68","c5cfc802.b4cf68","3a78a34c.56b16c","b35d1ce3.c179b","1ba5abd.58e3954","bbe6528e.9f013","6c87077e.9e46d8"]]},{"id":"1c67b9e.8d46346","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":782.4375,"y":246.1875,"z":"3fd3b806.3e5988","wires":[["49de287f.6f6438","83c8d474.49add8","dfe164aa.2d4e48"]]},{"id":"49de287f.6f6438","type":"for","name":"for_each_vm","xml":"<for index='i' start='0' end='`$vmCount`' >","comments":"","outputs":1,"x":956.9376068115234,"y":163.6875,"z":"3fd3b806.3e5988","wires":[["439a312b.1157c"]]},{"id":"dfe164aa.2d4e48","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$vmCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"false\"/>\n","comments":"","x":1000.6875152587891,"y":245.9373836517334,"z":"3fd3b806.3e5988","wires":[]},{"id":"83c8d474.49add8","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":962.7422485351562,"y":317.4207763671875,"z":"3fd3b806.3e5988","wires":[["14a8bba.80caa44","fd8d5af4.7df798","fff32611.8ae708"]]},{"id":"14a8bba.80caa44","type":"outcome","name":"healthcheck_failed","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1225.4375610351562,"y":264.9375,"z":"3fd3b806.3e5988","wires":[["ae67c815.dcdce8"]]},{"id":"fd8d5af4.7df798","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1200.9542846679688,"y":317.2757568359375,"z":"3fd3b806.3e5988","wires":[["fa98825d.3010c"]]},{"id":"fff32611.8ae708","type":"outcome","name":"healthcheck_success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1229.7233276367188,"y":368.7589111328125,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"98d9e8d0.be81a8","type":"comment","name":"Healthcheck VMs","info":"","comments":"","x":492.6597900390625,"y":199.29833984375,"z":"3fd3b806.3e5988","wires":[]},{"id":"439a312b.1157c","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$vm[$i].url`\" />\n","comments":"","x":1104.0765571594238,"y":162.71521377563477,"z":"3fd3b806.3e5988","wires":[]},{"id":"fa98825d.3010c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1581.8818969726562,"y":313.1596670150757,"z":"3fd3b806.3e5988","wires":[["4059468e.bea478","3662a5a.682225a","94c4b9c3.257ef8","2c062cf5.3f4d74"]]},{"id":"2c062cf5.3f4d74","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1978.7986450195312,"y":247.65954399108887,"z":"3fd3b806.3e5988","wires":[]},{"id":"94c4b9c3.257ef8","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1953.5149536132812,"y":320.72228813171387,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"4059468e.bea478","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2043.3825073242188,"y":366.6596984863281,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"3662a5a.682225a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1959.3928833007812,"y":409.5977153778076,"z":"3fd3b806.3e5988","wires":[]},{"id":"ae67c815.dcdce8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1585.8818969726562,"y":260.1596670150757,"z":"3fd3b806.3e5988","wires":[["94c4b9c3.257ef8","4059468e.bea478","3662a5a.682225a"]]},{"id":"4be16fa8.af873","type":"switchNode","name":"switch_any_vm_to_healthcheck","xml":"<switch test='`$vmCount>=1`'>\n","comments":"","outputs":1,"x":507.96527099609375,"y":247.4375,"z":"3fd3b806.3e5988","wires":[["9613c9c6.03d988","584f2018.2bde8"]]},{"id":"9613c9c6.03d988","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":662.9652862548828,"y":181.43753147125244,"z":"3fd3b806.3e5988","wires":[["1c67b9e.8d46346"]]},{"id":"584f2018.2bde8","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":678.9652709960938,"y":343.4375,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"4724f50a.19007c","type":"execute","name":"Resolve_Check-Active_VNFC_vSCP","xml":"<execute plugin='org.onap.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"IsActive\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"IsActiveDG\" />\n","comments":"","outputs":1,"x":1379.895980834961,"y":652.5207901000977,"z":"3fd3b806.3e5988","wires":[["1130e674.0489ea","2eb496e0.0cef8a","79cfc4c5.caf0ac"]]},{"id":"9cd35f9f.becbb","type":"call","name":"call_checkActive_DG","xml":"<call rpc='`$IsActiveDG.dg_name`' version='`$IsActiveDG.dg_version`' module='`$IsActiveDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":1750.6736450195312,"y":827.6320190429688,"z":"3fd3b806.3e5988","wires":[["f1fd8fe2.c9c05","fde23278.98f7d","fc061fd9.a985d"]]},{"id":"52572003.4e273","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"false","comments":"","outputs":1,"x":1709.7014770507812,"y":759.6875,"z":"3fd3b806.3e5988","wires":[["9cd35f9f.becbb"]]},{"id":"1130e674.0489ea","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1600.8959350585938,"y":704.5208129882812,"z":"3fd3b806.3e5988","wires":[["52572003.4e273"]]},{"id":"2eb496e0.0cef8a","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1614.8958129882812,"y":607.5208129882812,"z":"3fd3b806.3e5988","wires":[["5c094025.a30ec"]]},{"id":"79cfc4c5.caf0ac","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1625.8958740234375,"y":655.5208435058594,"z":"3fd3b806.3e5988","wires":[["be24d9c9.561338"]]},{"id":"5c094025.a30ec","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1796.1182250976562,"y":604.939697265625,"z":"3fd3b806.3e5988","wires":[["f306145d.fdc398","5c26451c.10c92c","2e7608a5.5732a8","d8d5bc0a.b708c"]]},{"id":"f306145d.fdc398","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'IsActive DG resolution plugin not found for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":2047.8960571289062,"y":540.5208129882812,"z":"3fd3b806.3e5988","wires":[]},{"id":"be24d9c9.561338","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1767.1182250976562,"y":656.4097900390625,"z":"3fd3b806.3e5988","wires":[["a229ed4e.0dcb6","5c26451c.10c92c","2e7608a5.5732a8","d8d5bc0a.b708c"]]},{"id":"a229ed4e.0dcb6","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Error while resolving IsActive DG for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":2062.1179809570312,"y":578.4097900390625,"z":"3fd3b806.3e5988","wires":[]},{"id":"5c26451c.10c92c","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2084.6869506835938,"y":620.7096557617188,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"2e7608a5.5732a8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2203.5545043945312,"y":671.89697265625,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"d8d5bc0a.b708c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value=\"`$error-message`\"/>","comments":"","x":2079.6736450195312,"y":719.8798217773438,"z":"3fd3b806.3e5988","wires":[]},{"id":"f27f6bc.1549998","type":"comment","name":"Check Active Passive Status","info":"","comments":"","x":1373.5347900390625,"y":615.4929504394531,"z":"3fd3b806.3e5988","wires":[]},{"id":"fde23278.98f7d","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1946.2570190429688,"y":828.6876220703125,"z":"3fd3b806.3e5988","wires":[["211d3f71.d278e"]]},{"id":"211d3f71.d278e","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":2078.5066528320312,"y":828.076416015625,"z":"3fd3b806.3e5988","wires":[["57792db1.3c8d24","1f3a0577.6a147b","45ded8ec.fc9338"]]},{"id":"f1fd8fe2.c9c05","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1949.7850952148438,"y":771.1319580078125,"z":"3fd3b806.3e5988","wires":[["9bcb3092.a9072"]]},{"id":"9bcb3092.a9072","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2087.4519653320312,"y":770.7730712890625,"z":"3fd3b806.3e5988","wires":[["ab89d5f6.5f6638","57792db1.3c8d24","45ded8ec.fc9338","1f3a0577.6a147b"]]},{"id":"ab89d5f6.5f6638","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'IsActive DG not found for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":2306.0073852539062,"y":750.354248046875,"z":"3fd3b806.3e5988","wires":[]},{"id":"57792db1.3c8d24","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2315.8960571289062,"y":793.0208740234375,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"45ded8ec.fc9338","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value=\"`$error-message`\"/>","comments":"","x":2308.6738891601562,"y":886.6875610351562,"z":"3fd3b806.3e5988","wires":[]},{"id":"fc061fd9.a985d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1949.3959350585938,"y":903.4931030273438,"z":"3fd3b806.3e5988","wires":[["a5bcdddf.bc981"]]},{"id":"a5bcdddf.bc981","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":2096.1179809570312,"y":903.85400390625,"z":"3fd3b806.3e5988","wires":[["d6962e57.fda47"]]},{"id":"d6962e57.fda47","type":"record","name":"Log success","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"Active/Passive check succeeded\"/>\n","comments":"","outputs":1,"x":2283.0901489257812,"y":937.742919921875,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"e7b3ea7a.c2c148","type":"execute","name":"executePreRestart","xml":"<execute plugin='com.att.appc.dg.vSCP.v3_5_5.smp.SMPDGPlugin' method='restartSequenceGenerator' >\n","comments":"","outputs":1,"x":700.8542175292969,"y":846.7710266113281,"z":"3fd3b806.3e5988","wires":[["ff4b13d7.8ff6a","6e82fb15.444774","96ac29bf.e4a348"]]},{"id":"e598a9ef.046f68","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":873.5207977294922,"y":499.30663871765137,"z":"3fd3b806.3e5988","wires":[["794de1af.7fd7e"]]},{"id":"5ef368c3.4bd7b8","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[$i].status`\">\n","comments":"","outputs":1,"x":1294.5206909179688,"y":498.8065776824951,"z":"3fd3b806.3e5988","wires":[["f2e22899.360288","433d325f.0e0b7c","21588e29.a3cc32"]]},{"id":"f2e22899.360288","type":"other","name":"outcome_up","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":1541.5206909179688,"y":541.3066387176514,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"21588e29.a3cc32","type":"other","name":"outcome_down","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":1557.5206909179688,"y":451.30663871765137,"z":"3fd3b806.3e5988","wires":[["5950449e.d1cb4c"]]},{"id":"433d325f.0e0b7c","type":"other","name":"outcome_unknown","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":1559.3041381835938,"y":498.4493999481201,"z":"3fd3b806.3e5988","wires":[["5950449e.d1cb4c"]]},{"id":"5124c756.7348b8","type":"set","name":"set","xml":"<set>\n<parameter name=\"doCheckActive\" value=\"true\" />\n","comments":"","x":871.8689727783203,"y":435.59222412109375,"z":"3fd3b806.3e5988","wires":[]},{"id":"5950449e.d1cb4c","type":"set","name":"set_to_perform_checkActive","xml":"<set>\n<parameter name=\"doCheckActive\" value=\"false\" />\n","comments":"","x":1830.0833129882812,"y":470.3065776824951,"z":"3fd3b806.3e5988","wires":[]},{"id":"60571aaf.8d8604","type":"switchNode","name":"switch_Perform_check_active","xml":"<switch test='`$doCheckActive`'>\n","comments":"","outputs":1,"x":928.0833129882812,"y":652.7709045410156,"z":"3fd3b806.3e5988","wires":[["4b2bdd82.af31c4","36d8fdb0.8d2aa2"]]},{"id":"4b2bdd82.af31c4","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1157.3333740234375,"y":653.5208435058594,"z":"3fd3b806.3e5988","wires":[["4724f50a.19007c"]]},{"id":"6e82fb15.444774","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":971.6667175292969,"y":904.7709655761719,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"ff4b13d7.8ff6a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":948.1669464111328,"y":789.5208129882812,"z":"3fd3b806.3e5988","wires":[["6b9137e6.eeb0c8"]]},{"id":"3be108bc.20f958","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1368.2382507324219,"y":861.1994934082031,"z":"3fd3b806.3e5988","wires":[]},{"id":"30d0cd36.793752","type":"set","name":"set event message","xml":"<set>\n<parameter name='event-message' value='Pre-Restart Execution failed' />\n","comments":"","x":1387.9694519042969,"y":777.9878234863281,"z":"3fd3b806.3e5988","wires":[]},{"id":"691ca8da.821e88","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1366.9694519042969,"y":815.9878234863281,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"1c612bb4.7e9b94","type":"for","name":"for_first_list","xml":"<for index='vmIndex' start='0' end='`$vmCount`' >\n","comments":"","outputs":1,"x":486.75013732910156,"y":1122.166748046875,"z":"3fd3b806.3e5988","wires":[["38e206a3.cc06fa"]]},{"id":"25ad81f2.75882e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1361.2500610351562,"y":1148.4169311523438,"z":"3fd3b806.3e5988","wires":[["3e050b23.00ef54"]]},{"id":"4d653382.a429ec","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1366.2501983642578,"y":1239.4169917106624,"z":"3fd3b806.3e5988","wires":[["fd9f91c4.d80c9"]]},{"id":"b35d1ce3.c179b","type":"switchNode","name":"switch_any_firstList_vm_restarted","xml":"<switch test='`$restartedFirstVMListCount>=1`'>\n","comments":"","outputs":1,"x":658.7777938842773,"y":1780.138671875,"z":"3fd3b806.3e5988","wires":[["c7ae14aa.457d88","2f4154b1.cffeac"]]},{"id":"c7ae14aa.457d88","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":903.5277938842773,"y":1864.1387939453125,"z":"3fd3b806.3e5988","wires":[["90e673f0.925cf"]]},{"id":"2f4154b1.cffeac","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":905.7777633666992,"y":1704.1387939453125,"z":"3fd3b806.3e5988","wires":[["4047d58d.27a18c"]]},{"id":"4047d58d.27a18c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":1105.5278854370117,"y":1702.8887939453125,"z":"3fd3b806.3e5988","wires":[]},{"id":"b7d474af.5c9d58","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1849.000087738037,"y":1919.555528640747,"z":"3fd3b806.3e5988","wires":[["1601f900.8eba77"]]},{"id":"48e8232b.a696ec","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1867.000087738037,"y":2039.4445667266846,"z":"3fd3b806.3e5988","wires":[["a762c339.2cf29"]]},{"id":"db44a408.35fa18","type":"set","name":"Mark VM failed","xml":"<set>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n","comments":"","x":1790.500015258789,"y":1061.1669917106624,"z":"3fd3b806.3e5988","wires":[]},{"id":"33b4c1af.2c1a5e","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1783.679702758789,"y":1104.6076655387874,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"e4f324e3.458468","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1818.7965240478516,"y":1151.5446772575374,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"3e050b23.00ef54","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1541.7501373291016,"y":1147.91686964035,"z":"3fd3b806.3e5988","wires":[["db44a408.35fa18","33b4c1af.2c1a5e","e4f324e3.458468"]]},{"id":"f44e0dc2.7f05c","type":"set","name":"Set event message and update counters","xml":"<set>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n","comments":"","x":2412.4722290039062,"y":1807.9716796875,"z":"3fd3b806.3e5988","wires":[]},{"id":"2761c6df.41b09a","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2331.1519775390625,"y":1905.912133216858,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"bc22b70f.0c2028","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2721.7694702148438,"y":1948.0997314453125,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"1601f900.8eba77","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2080.389019012451,"y":1922.388557434082,"z":"3fd3b806.3e5988","wires":[["f44e0dc2.7f05c","2761c6df.41b09a","bc22b70f.0c2028"]]},{"id":"98dcf986.aced38","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Restart succeed for the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1777.4445190429688,"y":1334.6119995117188,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"f4113929.049f68","type":"set","name":"Initialize_restartedFirstList_Count","xml":"<set>\n<parameter name='restartedFirstVMListCount' value='0' />\n\n","comments":"","x":692.1666870117188,"y":1264.0274658203125,"z":"3fd3b806.3e5988","wires":[]},{"id":"fcff96c4.ade008","type":"set","name":"Initialize_restart_parameters","xml":"<set>\n<parameter name='restartFailedCount' value='0' />\n<parameter name='restartSuccessCount' value='0' />","comments":"","x":709.7500915527344,"y":971.4163818359375,"z":"3fd3b806.3e5988","wires":[]},{"id":"bbe6528e.9f013","type":"switchNode","name":"If_any_restart_failed","xml":"<switch test='`$restartFailedCount>=1`'>\n","comments":"","outputs":1,"x":626.250078201294,"y":2505.583155632019,"z":"3fd3b806.3e5988","wires":[["2ac4791e.46f246","159116ac.51a699"]]},{"id":"2ac4791e.46f246","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":892.5556812286377,"y":2452.305316925049,"z":"3fd3b806.3e5988","wires":[["7a649831.9f1858"]]},{"id":"159116ac.51a699","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":899.750078201294,"y":2556.583148956299,"z":"3fd3b806.3e5988","wires":[["37709497.487aec"]]},{"id":"37709497.487aec","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":1123.000078201294,"y":2557.083148956299,"z":"3fd3b806.3e5988","wires":[]},{"id":"7a649831.9f1858","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1102.3056201934814,"y":2451.832904815674,"z":"3fd3b806.3e5988","wires":[]},{"id":"9c2d1d30.44395","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1107.7500610351562,"y":1380.6666259765625,"z":"3fd3b806.3e5988","wires":[["e32d3076.62496","9c6ca981.cf3198","9a0c3b86.dcc888"]]},{"id":"e32d3076.62496","type":"for","name":"for_each_vm","xml":"<for index='i' start='0' end='`$restartSuccessCount`' >","comments":"","outputs":1,"x":1339.2500610351562,"y":1382.4166259765625,"z":"3fd3b806.3e5988","wires":[["c4ab230a.95c29"]]},{"id":"c4ab230a.95c29","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$restartedServerList[$i].url`\" />\n","comments":"","x":1524.2500610351562,"y":1377.9166259765625,"z":"3fd3b806.3e5988","wires":[]},{"id":"9a0c3b86.dcc888","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$restartSuccessCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":1358.5000610351562,"y":1439.4166259765625,"z":"3fd3b806.3e5988","wires":[]},{"id":"9c6ca981.cf3198","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":1400.8048706054688,"y":1493.89990234375,"z":"3fd3b806.3e5988","wires":[["e30a91c0.1f657","d32c2422.06b3d8","d703536.35151b"]]},{"id":"e30a91c0.1f657","type":"outcome","name":"healthcheck_failed","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1711.2500610351562,"y":1495.4166259765625,"z":"3fd3b806.3e5988","wires":[["e2ffb1de.b124e"]]},{"id":"d32c2422.06b3d8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1706.7665405273438,"y":1554.7547607421875,"z":"3fd3b806.3e5988","wires":[["3298d778.916828"]]},{"id":"d703536.35151b","type":"outcome","name":"healthcheck_success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1687.5000610351562,"y":1623.1666259765625,"z":"3fd3b806.3e5988","wires":[["2bd9fac.f2e7606"]]},{"id":"2bd9fac.f2e7606","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$restartSuccessCount`\" >","comments":"","outputs":1,"x":1905.4168090820312,"y":1686.4166259765625,"z":"3fd3b806.3e5988","wires":[["c4c4885d.681c88"]]},{"id":"c4c4885d.681c88","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[$i].status`\">\n","comments":"","outputs":1,"x":2161.5001831054688,"y":1693.9166259765625,"z":"3fd3b806.3e5988","wires":[["2e9fc35d.edaf5c","66adef5.39ab51","49abe035.4ef46"]]},{"id":"ef47ba9d.0acfa8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":992.9722766876221,"y":2186.916627883911,"z":"3fd3b806.3e5988","wires":[["f26ebaaf.f84c68","c45137da.947918","cb92c687.45d9b8"]]},{"id":"f26ebaaf.f84c68","type":"for","name":"for_each_vm","xml":"<for index='i' start='0' end='`$restartSuccessCount`' >","comments":"","outputs":1,"x":1166.222276687622,"y":2133.166626930237,"z":"3fd3b806.3e5988","wires":[["47769042.b3fd5"]]},{"id":"cb92c687.45d9b8","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$restartSuccessCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":1192.4722805023193,"y":2191.6665058135986,"z":"3fd3b806.3e5988","wires":[]},{"id":"c45137da.947918","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":1173.276964187622,"y":2258.1499042510986,"z":"3fd3b806.3e5988","wires":[["fbea3fd2.46312","c08ecaf2.836998","5bf097d5.7d4a38"]]},{"id":"fbea3fd2.46312","type":"outcome","name":"healthcheck_failed","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1432.4722805023193,"y":2197.666627883911,"z":"3fd3b806.3e5988","wires":[["7c565f0f.63661"]]},{"id":"c08ecaf2.836998","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1443.4889698028564,"y":2250.0048265457153,"z":"3fd3b806.3e5988","wires":[["21eda6fd.da801a"]]},{"id":"5bf097d5.7d4a38","type":"outcome","name":"healthcheck_success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1449.2223682403564,"y":2321.416569709778,"z":"3fd3b806.3e5988","wires":[["29bda719.f445f8"]]},{"id":"ed661fb6.7a7a3","type":"set","name":"set_mark_vm_restarted","xml":"<set>\n<parameter name=\"restartedServerList[$restartSuccessCount].url\" value=\"`$vm[$vmIndex].url`\" />\n","comments":"","x":1788.5276336669922,"y":1240.5278930664062,"z":"3fd3b806.3e5988","wires":[]},{"id":"3ee9ae0.e12b052","type":"set","name":"increment_restarted_vm_count","xml":"<set>\n<parameter name='restartSuccessCount' value='`$restartSuccessCount+1`' />\n","comments":"","x":1813.7740478515625,"y":1286.6627807617188,"z":"3fd3b806.3e5988","wires":[]},{"id":"fd9f91c4.d80c9","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1535.4167938232422,"y":1239.6115112304688,"z":"3fd3b806.3e5988","wires":[["98dcf986.aced38","ed661fb6.7a7a3","3ee9ae0.e12b052"]]},{"id":"3298d778.916828","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1890.1111450195312,"y":1553.4442138671875,"z":"3fd3b806.3e5988","wires":[["e42b2698.ff0c28","d6472f50.eeb0f","66766044.0bc98","f286d57a.a53198"]]},{"id":"f286d57a.a53198","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":2182.7781372070312,"y":1504.4442138671875,"z":"3fd3b806.3e5988","wires":[]},{"id":"66766044.0bc98","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2180.2444458007812,"y":1546.2568359375,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"e42b2698.ff0c28","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2203.1113891601562,"y":1588.4442138671875,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"d6472f50.eeb0f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2176.6221313476562,"y":1630.3822021484375,"z":"3fd3b806.3e5988","wires":[]},{"id":"e2ffb1de.b124e","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1922.1111450195312,"y":1495.4442138671875,"z":"3fd3b806.3e5988","wires":[["66766044.0bc98","e42b2698.ff0c28","d6472f50.eeb0f","7fe2609.cd44ea"]]},{"id":"7fe2609.cd44ea","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"Error occured during health check of the Restarted servers\"/>","comments":"","x":2182.3613891601562,"y":1459.4442138671875,"z":"3fd3b806.3e5988","wires":[]},{"id":"49abe035.4ef46","type":"other","name":"outcome_up","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":2390.7504272460938,"y":1749.7222900390625,"z":"3fd3b806.3e5988","wires":[["8ae3ec83.85715"]]},{"id":"8ae3ec83.85715","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2611.0006713867188,"y":1747.2222900390625,"z":"3fd3b806.3e5988","wires":[["1fc212be.5390ed","4a8cea9d.531f74","ae266efa.9b164"]]},{"id":"1fc212be.5390ed","type":"execute","name":"Report_Success","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\" />\n","comments":"","outputs":1,"x":2848.7504272460938,"y":1837.7939453125,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"4a8cea9d.531f74","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":2849.8053588867188,"y":1793.2889404296875,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"ae266efa.9b164","type":"set","name":"Set success message and update counters","xml":"<set>\n<parameter name='success-message' value=\"`'Restart succeeded for the server : ' + $restartedServerList[$i].url`\"/>\n<parameter name='restartedFirstVMListCount' value='`$restartedFirstVMListCount+1`' />\n<parameter name=\"RestartSuccessVMCount\" value=\"`$RestartSuccessVMCount + 1`\" />\n\n","comments":"","x":2923.8053588867188,"y":1748.2890625,"z":"3fd3b806.3e5988","wires":[]},{"id":"2e9fc35d.edaf5c","type":"other","name":"outcome_down","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":2400.7501831054688,"y":1640.72216796875,"z":"3fd3b806.3e5988","wires":[["722f7db.ad64184"]]},{"id":"66adef5.39ab51","type":"other","name":"outcome_unknown","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":2414.5336303710938,"y":1696.8648681640625,"z":"3fd3b806.3e5988","wires":[["722f7db.ad64184"]]},{"id":"722f7db.ad64184","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2626.7147827148438,"y":1643.5078125,"z":"3fd3b806.3e5988","wires":[["2420dfd1.3d3f6","6aea1090.d7e6b","f6a19c69.5f799"]]},{"id":"2420dfd1.3d3f6","type":"set","name":"Set event message and update Counters","xml":"<set>\n<parameter name='event-message' value=\"`'Health check failed for the Restarted server : ' + $restartedServerList[$i].url`\"/>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthCheckFailedCount + 1`\" />\n","comments":"","x":2914.7147827148438,"y":1596.508056640625,"z":"3fd3b806.3e5988","wires":[]},{"id":"6aea1090.d7e6b","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2842.6610717773438,"y":1643.1077880859375,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"f6a19c69.5f799","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2858.5282592773438,"y":1685.2952880859375,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"202bd856.91c528","type":"comment","name":"Restart First List","info":"","comments":"","x":497.66676330566406,"y":1078.333251953125,"z":"3fd3b806.3e5988","wires":[]},{"id":"ded1e319.f55dd","type":"comment","name":"Healthcheck First List","info":"","comments":"","x":701.77783203125,"y":1379.9166259765625,"z":"3fd3b806.3e5988","wires":[]},{"id":"3676ee92.49abb2","type":"comment","name":"Restart Second List","info":"","comments":"","x":681.1111679077148,"y":1722.9163818359375,"z":"3fd3b806.3e5988","wires":[]},{"id":"72122241.50003c","type":"comment","name":"Healthcheck SecondList","info":"","comments":"","x":703.19455909729,"y":2140.027466773987,"z":"3fd3b806.3e5988","wires":[]},{"id":"e035a23b.7b864","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Restart succeeded for the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":2313.083854675293,"y":2155.361406326294,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"58515fa3.8d588","type":"set","name":"set_mark_vm_restarted","xml":"<set>\n<parameter name=\"restartedServerList[$restartSuccessCount].url\" value=\"`$vm[$vmIndex].url`\" />\n","comments":"","x":2366.667251586914,"y":2062.777953624725,"z":"3fd3b806.3e5988","wires":[]},{"id":"a242df26.53c36","type":"set","name":"increment_restarted_vm_count","xml":"<set>\n<parameter name='restartSuccessCount' value='`$restartSuccessCount+1`' />\n","comments":"","x":2342.663101196289,"y":2105.4125971794124,"z":"3fd3b806.3e5988","wires":[]},{"id":"a762c339.2cf29","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2082.8056640625,"y":2106.1110653877254,"z":"3fd3b806.3e5988","wires":[["e035a23b.7b864","58515fa3.8d588","a242df26.53c36"]]},{"id":"47769042.b3fd5","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$restartedServerList[$i].url`\" />\n","comments":"","x":1429.8610744476318,"y":2136.6943378448486,"z":"3fd3b806.3e5988","wires":[]},{"id":"21eda6fd.da801a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1633.6666202545166,"y":2251.3887977600098,"z":"3fd3b806.3e5988","wires":[["11eddd5.8a0d223","1627b80.c24f648","448eea91.f58eb4","51d1e08a.45697"]]},{"id":"51d1e08a.45697","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1892.8333759307861,"y":2237.888620376587,"z":"3fd3b806.3e5988","wires":[]},{"id":"448eea91.f58eb4","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1908.2995624542236,"y":2300.451364517212,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"11eddd5.8a0d223","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2569.1669311523438,"y":2206.8887939453125,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"1627b80.c24f648","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1907.9274921417236,"y":2366.0767879486084,"z":"3fd3b806.3e5988","wires":[]},{"id":"7c565f0f.63661","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1637.6666202545166,"y":2198.3887977600098,"z":"3fd3b806.3e5988","wires":[["448eea91.f58eb4","11eddd5.8a0d223","1627b80.c24f648","37b0d881.eecf48"]]},{"id":"37b0d881.eecf48","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"Error occured during health check of the restarted servers\"/>","comments":"","x":1926.1666278839111,"y":2167.888864517212,"z":"3fd3b806.3e5988","wires":[]},{"id":"29bda719.f445f8","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$restartSuccessCount`\" >","comments":"","outputs":1,"x":1421.611177444458,"y":2438.1107234954834,"z":"3fd3b806.3e5988","wires":[["1cf0221.15704de"]]},{"id":"1cf0221.15704de","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[$i].status`\">\n","comments":"","outputs":1,"x":1641.2221240997314,"y":2440.9440364837646,"z":"3fd3b806.3e5988","wires":[["78917505.3d9e0c","309b8ddd.a96422","aaa07653.033a58"]]},{"id":"aaa07653.033a58","type":"other","name":"outcome_up","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":1986.9721698760986,"y":2570.749397277832,"z":"3fd3b806.3e5988","wires":[["f1e0d6b3.20cc08"]]},{"id":"f1e0d6b3.20cc08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2232.972291946411,"y":2571.749274253845,"z":"3fd3b806.3e5988","wires":[["34f66625.125b7a","3eee9a01.5d0826","3502f29e.fa060e"]]},{"id":"34f66625.125b7a","type":"execute","name":"Report_Success","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\" />","comments":"","outputs":1,"x":2558.9724254608154,"y":2643.82080745697,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"3eee9a01.5d0826","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":2553.027109146118,"y":2599.31592464447,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"3502f29e.fa060e","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Restart succeeded for the server : ' + $restartedServerList[$i].url`\"/>\n<parameter name=\"RestartSuccessVMCount\" value=\"`$RestartSuccessVMCount + 1`\" />\n","comments":"","x":2552.0271129608154,"y":2551.316167831421,"z":"3fd3b806.3e5988","wires":[]},{"id":"78917505.3d9e0c","type":"other","name":"outcome_down","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":1990.9720478057861,"y":2439.749397277832,"z":"3fd3b806.3e5988","wires":[["a5c41de1.d7dfd"]]},{"id":"309b8ddd.a96422","type":"other","name":"outcome_unknown","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":1989.7556171417236,"y":2491.892219543457,"z":"3fd3b806.3e5988","wires":[["a5c41de1.d7dfd"]]},{"id":"a5c41de1.d7dfd","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2233.686647415161,"y":2457.034918785095,"z":"3fd3b806.3e5988","wires":[["82a52a17.726898","473fa11c.d8f88","d56783d5.be2b6"]]},{"id":"82a52a17.726898","type":"set","name":"Set event message and update counters","xml":"<set>\n<parameter name='event-message' value=\"`'Health check failed for the Restarted server : ' + $restartedServerList[$i].url`\"/>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthCheckFailedCount + 1`\" />\n","comments":"","x":2527.6867065429688,"y":2394.535400390625,"z":"3fd3b806.3e5988","wires":[]},{"id":"473fa11c.d8f88","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2496.633062362671,"y":2445.1352586746216,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"d56783d5.be2b6","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2520.499765396118,"y":2496.3225145339966,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"3a78a34c.56b16c","type":"set","name":"Re Initialize_restart_success_count","xml":"<set>\n<parameter name='restartSuccessCount' value='0' />","comments":"","x":684.7499847412109,"y":1611.0831298828125,"z":"3fd3b806.3e5988","wires":[]},{"id":"1ba5abd.58e3954","type":"switchNode","name":"switch_any_vm_to_healthcheck","xml":"<switch test='`$restartSuccessCount>=1`'>\n","comments":"","outputs":1,"x":718.5000400543213,"y":2188.166627883911,"z":"3fd3b806.3e5988","wires":[["aedcde25.7a86b","76918471.5d839c"]]},{"id":"aedcde25.7a86b","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":883.5000457763672,"y":2136.6666259765625,"z":"3fd3b806.3e5988","wires":[["ef47ba9d.0acfa8"]]},{"id":"76918471.5d839c","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":889.5000171661377,"y":2284.166569709778,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"c5cfc802.b4cf68","type":"switchNode","name":"switch_any_vm_to_healthcheck","xml":"<switch test='`$restartSuccessCount>=1`'>\n","comments":"","outputs":1,"x":672.5000610351562,"y":1447.1666259765625,"z":"3fd3b806.3e5988","wires":[["a643ee70.b4dd9","adcaa36a.61cef"]]},{"id":"a643ee70.b4dd9","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":921.5,"y":1381.4166259765625,"z":"3fd3b806.3e5988","wires":[["9c2d1d30.44395"]]},{"id":"adcaa36a.61cef","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":910.7499847412109,"y":1508.1666259765625,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"66b6402.a4e8bc","type":"block","name":"block","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":927.9722900390625,"y":1083.0560913085938,"z":"3fd3b806.3e5988","wires":[["2c8da896.df9298","7c143892.7a48a8","6fce4d93.f36c94"]]},{"id":"2c8da896.df9298","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Attempting to restart the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1102.4011840820312,"y":1025.2701416015625,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"6fce4d93.f36c94","type":"set","name":"set restart parameters","xml":"<set>\n<parameter name=\"restart-vm-url\" value=\"`$vm[$vmIndex].url`\" />\n<parameter name='restartRetryCount' value='3'/>\n<parameter name='application-node-name' value=\"`$vm[$vmIndex].node-name`\"/>\n<parameter name='application-status ' value=\"`$vm[$vmIndex].status`\"/>\n","comments":"","x":1130.8120346069336,"y":1082.4486465454102,"z":"3fd3b806.3e5988","wires":[]},{"id":"7c143892.7a48a8","type":"call","name":"Restart_VM","xml":"<call module='APPC' rpc='Restart_VM' mode='sync' >\n","comments":"","outputs":1,"x":1090.5618286132812,"y":1146.4487915039062,"z":"3fd3b806.3e5988","wires":[["25ad81f2.75882e","4d653382.a429ec","ced444de.57c2f8"]]},{"id":"47f00996.18f8a8","type":"block","name":"block","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1480.5556259155273,"y":1864.7220458984375,"z":"3fd3b806.3e5988","wires":[["ed660e4a.df05a","4a73526b.75205c","4a729f7d.1e76c"]]},{"id":"ed660e4a.df05a","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Attempting to restart the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1673.2345809936523,"y":1797.6864013671875,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"4a73526b.75205c","type":"call","name":"Restart_VM","xml":"<call module='APPC' rpc='Restart_VM' mode='sync' >\n","comments":"","outputs":1,"x":1655.6453857421875,"y":1970.364990234375,"z":"3fd3b806.3e5988","wires":[["b7d474af.5c9d58","48e8232b.a696ec","61c3630a.cc9c9c"]]},{"id":"ced444de.57c2f8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1368.4495239257812,"y":1071.4140014648438,"z":"3fd3b806.3e5988","wires":[["7ad527cc.c40e28"]]},{"id":"7ad527cc.c40e28","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1541.4495239257812,"y":1072.4140014648438,"z":"3fd3b806.3e5988","wires":[["33b4c1af.2c1a5e","e4f324e3.458468","5abc7a5f.2be054","6fb4cf51.1634b"]]},{"id":"5abc7a5f.2be054","type":"set","name":"Set event message and Mark VM failed","xml":"<set>\n<parameter name='event-message' value=\"`'DG to execute Restart action not found for VM: ' + $vm[$vmIndex].url`\"/>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n","comments":"","x":1843.520767211914,"y":1007.8781733512874,"z":"3fd3b806.3e5988","wires":[]},{"id":"61c3630a.cc9c9c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1854.1993980407715,"y":1973.4134702682495,"z":"3fd3b806.3e5988","wires":[["8fddaeff.19854"]]},{"id":"8fddaeff.19854","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2096.6993522644043,"y":1976.9134912490845,"z":"3fd3b806.3e5988","wires":[["2761c6df.41b09a","bc22b70f.0c2028","df04b667.517118","65123b76.9ed874"]]},{"id":"df04b667.517118","type":"set","name":"Set event message and Mark VM failed","xml":"<set>\n<parameter name='event-message' value=\"`'DG to execute Restart action not found for VM: ' + $vm[$vmIndex].url`\"/>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n","comments":"","x":2416.5051879882812,"y":1852.16357421875,"z":"3fd3b806.3e5988","wires":[]},{"id":"36d8fdb0.8d2aa2","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1148.3214263916016,"y":720.1786422729492,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"6b9137e6.eeb0c8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1146.6071472167969,"y":815.4643859863281,"z":"3fd3b806.3e5988","wires":[["30d0cd36.793752","3be108bc.20f958","691ca8da.821e88"]]},{"id":"96ac29bf.e4a348","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":948.0358581542969,"y":846.4644470214844,"z":"3fd3b806.3e5988","wires":[["6b9137e6.eeb0c8"]]},{"id":"6c87077e.9e46d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":669.7500457763672,"y":497.0357036590576,"z":"3fd3b806.3e5988","wires":[["5124c756.7348b8","e598a9ef.046f68","60571aaf.8d8604"]]},{"id":"52451ef0.748c5","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3488.7737426757812,"y":1440.0001220703125,"z":"3fd3b806.3e5988","wires":[["9a608560.1a75b8"]]},{"id":"9a608560.1a75b8","type":"execute","name":"Report_Error_To_DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":4340.773887634277,"y":1641.0000228881836,"z":"3fd3b806.3e5988","wires":[["929c559b.07cf48"]]},{"id":"929c559b.07cf48","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4667.059288024902,"y":1618.4287338256836,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"1f3a0577.6a147b","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2343.4407348632812,"y":835.0000610351562,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"794de1af.7fd7e","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1058.2222137451172,"y":499.66662406921387,"z":"3fd3b806.3e5988","wires":[["5ef368c3.4bd7b8","63f52d2.4830bd4"]]},{"id":"63f52d2.4830bd4","type":"set","name":"set VM status","xml":"<set>\n<parameter name=\"vm[$i].status\" value=\"`$healthcheck.vm[$i].status`\" />\n<parameter name=\"vm[$i].node-name\" value=\"`$healthcheck.vm[$i].nodeName`\" />\n","comments":"","x":1267.22216796875,"y":433.6666259765625,"z":"3fd3b806.3e5988","wires":[]},{"id":"38e206a3.cc06fa","type":"switchNode","name":"Order ?","xml":"<switch test='`$vm[$vmIndex].order`'>\n","comments":"","outputs":1,"x":637.2222442626953,"y":1122.2225341796875,"z":"3fd3b806.3e5988","wires":[["a8c2ec5e.735c3","68251e28.9d153"]]},{"id":"a8c2ec5e.735c3","type":"other","name":"first","xml":"<outcome value='first'>\n","comments":"","outputs":1,"x":792.2222442626953,"y":1082.4725952148438,"z":"3fd3b806.3e5988","wires":[["66b6402.a4e8bc"]]},{"id":"68251e28.9d153","type":"outcomeTrue","name":"second","xml":"<outcome value='second'>\n","comments":"","outputs":1,"x":783.4722290039062,"y":1169.2225952148438,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"90e673f0.925cf","type":"for","name":"for_first_list","xml":"<for index='vmIndex' start='0' end='`$vmCount`' >\n","comments":"","outputs":1,"x":1056.2222518920898,"y":1863.77783203125,"z":"3fd3b806.3e5988","wires":[["41e7de35.4909a"]]},{"id":"41e7de35.4909a","type":"switchNode","name":"Order ?","xml":"<switch test='`$vm[$vmIndex].order`'>\n","comments":"","outputs":1,"x":1202.6944198608398,"y":1865.8336181640625,"z":"3fd3b806.3e5988","wires":[["9f13b01a.2bea1","24e3bd72.508902"]]},{"id":"9f13b01a.2bea1","type":"other","name":"first","xml":"<outcome value='first'>\n","comments":"","outputs":1,"x":1364.6942977905273,"y":1779.083740234375,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"24e3bd72.508902","type":"outcomeTrue","name":"second","xml":"<outcome value='second'>\n","comments":"","outputs":1,"x":1342.9442977905273,"y":1864.8336181640625,"z":"3fd3b806.3e5988","wires":[["47f00996.18f8a8"]]},{"id":"4a729f7d.1e76c","type":"set","name":"set restart parameters","xml":"<set>\n<parameter name=\"restart-vm-url\" value=\"`$vm[$vmIndex].url`\" />\n<parameter name='restartRetryCount' value='3'/>\n<parameter name='application-node-name' value=\"`$vm[$vmIndex].node-name`\"/>\n<parameter name='application-status ' value=\"`$vm[$vmIndex].status`\"/>\n","comments":"","x":1692.222412109375,"y":1864.5555419921875,"z":"3fd3b806.3e5988","wires":[]},{"id":"6fb4cf51.1634b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1798.599868774414,"y":1193.8249506950374,"z":"3fd3b806.3e5988","wires":[]},{"id":"65123b76.9ed874","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2282.600112915039,"y":2015.8249506950374,"z":"3fd3b806.3e5988","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_RestartVM_VM.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_RestartVM_VM.json
index 324b0517e..e0262b087 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_RestartVM_VM.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_RestartVM_VM.json
@@ -1 +1 @@
-[{"id":"7f4de7a8.ac56b8","type":"dgstart","name":"DGSTART","outputs":1,"x":119.80625915527344,"y":126.4333267211914,"z":"b771fc5b.409cb","wires":[["256d787.026be88"]]},{"id":"256d787.026be88","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":312.80633544921875,"y":126,"z":"b771fc5b.409cb","wires":[["98e831ca.cf20f"]]},{"id":"98e831ca.cf20f","type":"method","name":"RestartVM_VM","xml":"<method rpc='RestartVM_VM' mode='sync'>\n","comments":"","outputs":1,"x":138.5563201904297,"y":222.2499771118164,"z":"b771fc5b.409cb","wires":[["72dbf7c2.2df8e8"]]},{"id":"a218356d.8a7768","type":"execute","name":"execute_restart","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='restartServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$restart-vm-url`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"skip-hypervisor-check\" value=\"`$skip-hypervisor-check`\" />","comments":"","outputs":1,"x":984.8326797485352,"y":496.218994140625,"z":"b771fc5b.409cb","wires":[["a79fc9de.660258","4f648386.c6afdc"]]},{"id":"a79fc9de.660258","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1240.4515228271484,"y":569.3620681762695,"z":"b771fc5b.409cb","wires":[["abb47796.fc7f08"]]},{"id":"4f648386.c6afdc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1107.8062591552734,"y":406.43335723876953,"z":"b771fc5b.409cb","wires":[["6795df77.7887d"]]},{"id":"6795df77.7887d","type":"switchNode","name":"switch","xml":"<switch test='`$RESTART_STATUS`'>\n","comments":"","outputs":1,"x":1232.6633758544922,"y":346.86197662353516,"z":"b771fc5b.409cb","wires":[["565819ab.6ea5f8","86f97daf.53db4"]]},{"id":"86f97daf.53db4","type":"other","name":"error","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":1273.9488372802734,"y":454.5762710571289,"z":"b771fc5b.409cb","wires":[["abb47796.fc7f08"]]},{"id":"565819ab.6ea5f8","type":"other","name":"success","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1372.3779754638672,"y":262.2905960083008,"z":"b771fc5b.409cb","wires":[["a981085a.cff378"]]},{"id":"a981085a.cff378","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1537.9490661621094,"y":199.57630157470703,"z":"b771fc5b.409cb","wires":[["b4c2d507.0578e8","78fc68f3.711408","1ab78a0a.88aaa6"]]},{"id":"47fadddd.26d6f4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1997.2352142333984,"y":571.2905960083008,"z":"b771fc5b.409cb","wires":[["529541dd.a26eb","418f8e8f.8feee","409705a1.942bdc"]]},{"id":"529541dd.a26eb","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Failure while restarting the server : ' + $restart-vm-url`\"/>\n","comments":"","x":2218.8069915771484,"y":498.0048294067383,"z":"b771fc5b.409cb","wires":[]},{"id":"418f8e8f.8feee","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2202.2359466552734,"y":571.1953201293945,"z":"b771fc5b.409cb","wires":[[]]},{"id":"78fc68f3.711408","type":"set","name":"Set Success Message","xml":"<set>\n<parameter name='success-message' value=\"`'Restart succeeded for the server : ' + $restart-vm-url`\"/>\n\n\n","comments":"","x":1765.9490661621094,"y":147.5763931274414,"z":"b771fc5b.409cb","wires":[]},{"id":"b4c2d507.0578e8","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1759.9490661621094,"y":198.57633209228516,"z":"b771fc5b.409cb","wires":[[]]},{"id":"3eae949.bf5786c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":699.8062591552734,"y":368.4333267211914,"z":"b771fc5b.409cb","wires":[["e1cc571.7242da8"]]},{"id":"80437160.c9765","type":"switchNode","name":"switch : Last Attempt","xml":"<switch test='`$restartRetryCount == $i`'>\n","comments":"","outputs":1,"x":1638.3616790771484,"y":506.43338775634766,"z":"b771fc5b.409cb","wires":[["c9437e52.f755d","84e517eb.b75708"]]},{"id":"84e517eb.b75708","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1839.111557006836,"y":572.1836013793945,"z":"b771fc5b.409cb","wires":[["47fadddd.26d6f4"]]},{"id":"c9437e52.f755d","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1844.6116180419922,"y":451.1834487915039,"z":"b771fc5b.409cb","wires":[["225e5cc2.bacbe4"]]},{"id":"e1cc571.7242da8","type":"for","name":"Loop","xml":"<for index=\"i\" start=\"1\" end=\"`$restartRetryCount + 1`\" >","comments":"","outputs":1,"x":868.9175872802734,"y":410.43341064453125,"z":"b771fc5b.409cb","wires":[["a218356d.8a7768"]]},{"id":"225e5cc2.bacbe4","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Restart attempt ' + $i + ' of ' + $restartRetryCount + ' failed for server : ' + $restart-vm-url + '. Retrying.'`\"/>\n","comments":"","outputs":1,"x":2018.6951141357422,"y":451.43338775634766,"z":"b771fc5b.409cb","wires":[[]]},{"id":"409705a1.942bdc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2230.2513275146484,"y":625.4333877563477,"z":"b771fc5b.409cb","wires":[]},{"id":"1ab78a0a.88aaa6","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1761.4729919433594,"y":250.43338775634766,"z":"b771fc5b.409cb","wires":[]},{"id":"abb47796.fc7f08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1427.0279388427734,"y":504.43335723876953,"z":"b771fc5b.409cb","wires":[["80437160.c9765"]]},{"id":"72dbf7c2.2df8e8","type":"execute","name":"execute_restart","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='restartServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$restart-vm-url`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />","comments":"","outputs":1,"x":308.36180114746094,"y":284.4333267211914,"z":"b771fc5b.409cb","wires":[["9097a072.2eda7","393cd209.7f961e"]]},{"id":"9097a072.2eda7","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":505.2508201599121,"y":196.4333267211914,"z":"b771fc5b.409cb","wires":[["8d1da1c0.8a6e3"]]},{"id":"393cd209.7f961e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":509.25075912475586,"y":369.4333267211914,"z":"b771fc5b.409cb","wires":[["3eae949.bf5786c"]]},{"id":"8d1da1c0.8a6e3","type":"switchNode","name":"switch","xml":"<switch test='`$RESTART_STATUS`'>\n","comments":"","outputs":1,"x":651.4728660583496,"y":197.4333267211914,"z":"b771fc5b.409cb","wires":[["56de1010.e3cfc","8f627675.a8bb68"]]},{"id":"56de1010.e3cfc","type":"other","name":"success","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1024.1874237060547,"y":131.86194610595703,"z":"b771fc5b.409cb","wires":[["a981085a.cff378"]]},{"id":"8f627675.a8bb68","type":"other","name":"error","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":662.7583923339844,"y":289.14762115478516,"z":"b771fc5b.409cb","wires":[["3eae949.bf5786c"]]}]
+[{"id":"7f4de7a8.ac56b8","type":"dgstart","name":"DGSTART","outputs":1,"x":119.80625915527344,"y":126.4333267211914,"z":"b771fc5b.409cb","wires":[["256d787.026be88"]]},{"id":"256d787.026be88","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":312.80633544921875,"y":126,"z":"b771fc5b.409cb","wires":[["98e831ca.cf20f"]]},{"id":"98e831ca.cf20f","type":"method","name":"RestartVM_VM","xml":"<method rpc='RestartVM_VM' mode='sync'>\n","comments":"","outputs":1,"x":138.5563201904297,"y":222.2499771118164,"z":"b771fc5b.409cb","wires":[["72dbf7c2.2df8e8"]]},{"id":"a218356d.8a7768","type":"execute","name":"execute_restart","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='restartServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$restart-vm-url`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"skip-hypervisor-check\" value=\"`$skip-hypervisor-check`\" />","comments":"","outputs":1,"x":984.8326797485352,"y":496.218994140625,"z":"b771fc5b.409cb","wires":[["a79fc9de.660258","4f648386.c6afdc"]]},{"id":"a79fc9de.660258","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1240.4515228271484,"y":569.3620681762695,"z":"b771fc5b.409cb","wires":[["abb47796.fc7f08"]]},{"id":"4f648386.c6afdc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1107.8062591552734,"y":406.43335723876953,"z":"b771fc5b.409cb","wires":[["6795df77.7887d"]]},{"id":"6795df77.7887d","type":"switchNode","name":"switch","xml":"<switch test='`$RESTART_STATUS`'>\n","comments":"","outputs":1,"x":1232.6633758544922,"y":346.86197662353516,"z":"b771fc5b.409cb","wires":[["565819ab.6ea5f8","86f97daf.53db4"]]},{"id":"86f97daf.53db4","type":"other","name":"error","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":1273.9488372802734,"y":454.5762710571289,"z":"b771fc5b.409cb","wires":[["abb47796.fc7f08"]]},{"id":"565819ab.6ea5f8","type":"other","name":"success","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1372.3779754638672,"y":262.2905960083008,"z":"b771fc5b.409cb","wires":[["a981085a.cff378"]]},{"id":"a981085a.cff378","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1537.9490661621094,"y":199.57630157470703,"z":"b771fc5b.409cb","wires":[["b4c2d507.0578e8","78fc68f3.711408","1ab78a0a.88aaa6"]]},{"id":"47fadddd.26d6f4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1997.2352142333984,"y":571.2905960083008,"z":"b771fc5b.409cb","wires":[["529541dd.a26eb","418f8e8f.8feee","409705a1.942bdc"]]},{"id":"529541dd.a26eb","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Failure while restarting the server : ' + $restart-vm-url`\"/>\n","comments":"","x":2218.8069915771484,"y":498.0048294067383,"z":"b771fc5b.409cb","wires":[]},{"id":"418f8e8f.8feee","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2202.2359466552734,"y":571.1953201293945,"z":"b771fc5b.409cb","wires":[[]]},{"id":"78fc68f3.711408","type":"set","name":"Set Success Message","xml":"<set>\n<parameter name='success-message' value=\"`'Restart succeeded for the server : ' + $restart-vm-url`\"/>\n\n\n","comments":"","x":1765.9490661621094,"y":147.5763931274414,"z":"b771fc5b.409cb","wires":[]},{"id":"b4c2d507.0578e8","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1759.9490661621094,"y":198.57633209228516,"z":"b771fc5b.409cb","wires":[[]]},{"id":"3eae949.bf5786c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":699.8062591552734,"y":368.4333267211914,"z":"b771fc5b.409cb","wires":[["e1cc571.7242da8"]]},{"id":"80437160.c9765","type":"switchNode","name":"switch : Last Attempt","xml":"<switch test='`$restartRetryCount == $i`'>\n","comments":"","outputs":1,"x":1638.3616790771484,"y":506.43338775634766,"z":"b771fc5b.409cb","wires":[["c9437e52.f755d","84e517eb.b75708"]]},{"id":"84e517eb.b75708","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1839.111557006836,"y":572.1836013793945,"z":"b771fc5b.409cb","wires":[["47fadddd.26d6f4"]]},{"id":"c9437e52.f755d","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1844.6116180419922,"y":451.1834487915039,"z":"b771fc5b.409cb","wires":[["225e5cc2.bacbe4"]]},{"id":"e1cc571.7242da8","type":"for","name":"Loop","xml":"<for index=\"i\" start=\"1\" end=\"`$restartRetryCount + 1`\" >","comments":"","outputs":1,"x":868.9175872802734,"y":410.43341064453125,"z":"b771fc5b.409cb","wires":[["a218356d.8a7768"]]},{"id":"225e5cc2.bacbe4","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Restart attempt ' + $i + ' of ' + $restartRetryCount + ' failed for server : ' + $restart-vm-url + '. Retrying.'`\"/>\n","comments":"","outputs":1,"x":2018.6951141357422,"y":451.43338775634766,"z":"b771fc5b.409cb","wires":[[]]},{"id":"409705a1.942bdc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2230.2513275146484,"y":625.4333877563477,"z":"b771fc5b.409cb","wires":[]},{"id":"1ab78a0a.88aaa6","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1761.4729919433594,"y":250.43338775634766,"z":"b771fc5b.409cb","wires":[]},{"id":"abb47796.fc7f08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1427.0279388427734,"y":504.43335723876953,"z":"b771fc5b.409cb","wires":[["80437160.c9765"]]},{"id":"72dbf7c2.2df8e8","type":"execute","name":"execute_restart","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='restartServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$restart-vm-url`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />","comments":"","outputs":1,"x":308.36180114746094,"y":284.4333267211914,"z":"b771fc5b.409cb","wires":[["9097a072.2eda7","393cd209.7f961e"]]},{"id":"9097a072.2eda7","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":505.2508201599121,"y":196.4333267211914,"z":"b771fc5b.409cb","wires":[["8d1da1c0.8a6e3"]]},{"id":"393cd209.7f961e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":509.25075912475586,"y":369.4333267211914,"z":"b771fc5b.409cb","wires":[["3eae949.bf5786c"]]},{"id":"8d1da1c0.8a6e3","type":"switchNode","name":"switch","xml":"<switch test='`$RESTART_STATUS`'>\n","comments":"","outputs":1,"x":651.4728660583496,"y":197.4333267211914,"z":"b771fc5b.409cb","wires":[["56de1010.e3cfc","8f627675.a8bb68"]]},{"id":"56de1010.e3cfc","type":"other","name":"success","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1024.1874237060547,"y":131.86194610595703,"z":"b771fc5b.409cb","wires":[["a981085a.cff378"]]},{"id":"8f627675.a8bb68","type":"other","name":"error","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":662.7583923339844,"y":289.14762115478516,"z":"b771fc5b.409cb","wires":[["3eae949.bf5786c"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart_VM.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart_VM.json
index a29485bbc..75e5cd60c 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart_VM.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart_VM.json
@@ -1 +1 @@
-[{"id":"a9512af0.2ec648","type":"dgstart","name":"DGSTART","outputs":1,"x":95,"y":42,"z":"b984f735.170a28","wires":[["9d497354.98d4d"]]},{"id":"9d497354.98d4d","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":134.0000762939453,"y":104.5666732788086,"z":"b984f735.170a28","wires":[["7525850b.012bec"]]},{"id":"7525850b.012bec","type":"method","name":"Restart_VM","xml":"<method rpc='Restart_VM' mode='sync'>\n","comments":"","outputs":1,"x":175.7500762939453,"y":160.81666564941406,"z":"b984f735.170a28","wires":[["3c44027b.eab53e"]]},{"id":"a0d8147d.9fd638","type":"execute","name":"Resolve Application Sop DG","xml":"<execute plugin='org.openecomp.appc.dg.common.DgResolverPlugin' method='resolveDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"Stop_Application\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"ApplicationStop\" />\n<parameter name=\"DGResolutionType\" value=\"VNFC\" />\n","comments":"","outputs":1,"x":574.0000152587891,"y":85.00001525878906,"z":"b984f735.170a28","wires":[["39b85a6a.3da766"]]},{"id":"39b85a6a.3da766","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":805.2223205566406,"y":84.91676330566406,"z":"b984f735.170a28","wires":[["fa92d96.4e4e928"]]},{"id":"7a2fb34.9a5cf4c","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1215,"y":173.00003051757812,"z":"b984f735.170a28","wires":[[]]},{"id":"fa92d96.4e4e928","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":986.0000610351562,"y":85.00001525878906,"z":"b984f735.170a28","wires":[["90706af8.c781f8","7a2fb34.9a5cf4c","f98f3898.faecf8"]]},{"id":"861e0104.35b31","type":"call","name":"Stop Application","xml":"<call module='`$ApplicationStop.dg_module`' rpc='`$ApplicationStop.dg_name`' version='`$ApplicationStop.dg_version`' mode='sync'  >\n","comments":"","outputs":1,"x":541.3175659179688,"y":354.99981689453125,"z":"b984f735.170a28","wires":[["847e984.ecc4868","8b93e1af.acf0a","d2e13936.d3ac68"]]},{"id":"d2e13936.d3ac68","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":772.6510620117188,"y":303.9996337890625,"z":"b984f735.170a28","wires":[["36c612c4.c0fcce"]]},{"id":"847e984.ecc4868","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":766.5182495117188,"y":480.92840576171875,"z":"b984f735.170a28","wires":[["64f7aa4b.531954"]]},{"id":"8b93e1af.acf0a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":767.873291015625,"y":394.999755859375,"z":"b984f735.170a28","wires":[["4933b52f.71e72c"]]},{"id":"64f7aa4b.531954","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":979.7615966796875,"y":480.99969768524375,"z":"b984f735.170a28","wires":[["a7a86bfe.db5a78","f89ae72.d92c718"]]},{"id":"f89ae72.d92c718","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Failure while stopping the server: ' + $restart-vm-url + ' at Application level.'`\"/>","comments":"","x":1239.5393981933594,"y":481.9996843337992,"z":"b984f735.170a28","wires":[]},{"id":"a7a86bfe.db5a78","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1225.6723327636719,"y":528.8123064041117,"z":"b984f735.170a28","wires":[[]]},{"id":"36c612c4.c0fcce","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":979.7615966796875,"y":303.9996337890625,"z":"b984f735.170a28","wires":[["af672dc5.7c144","6fbe061b.5a2d78","2e149572.9b4aea"]]},{"id":"af672dc5.7c144","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Application stop DG : ' + $ApplicationStop.dg_name + ' not found.'`\"/>","comments":"","x":1229.5394287109375,"y":264.99969482421875,"z":"b984f735.170a28","wires":[]},{"id":"6fbe061b.5a2d78","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1214.7615966796875,"y":345.9996337890625,"z":"b984f735.170a28","wires":[]},{"id":"4933b52f.71e72c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":986.872802734375,"y":394.999755859375,"z":"b984f735.170a28","wires":[["87599293.c745a","dc2add7.18f442"]]},{"id":"dc2add7.18f442","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Stop succeeded for the server : ' + $restart-vm-url` at application level.\"/>\n","comments":"","x":1245.9276123046875,"y":395.0665283203125,"z":"b984f735.170a28","wires":[]},{"id":"87599293.c745a","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1222.9276123046875,"y":438.0664978027344,"z":"b984f735.170a28","wires":[[]]},{"id":"21ee16d0.7c845a","type":"execute","name":"Resolve Application Start DG","xml":"<execute plugin='org.openecomp.appc.dg.common.DgResolverPlugin' method='resolveDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"Start_Application\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"ApplicationStart\" />\n<parameter name=\"DGResolutionType\" value=\"VNFC\" />\n","comments":"","outputs":1,"x":575,"y":175,"z":"b984f735.170a28","wires":[["11ee72e6.cf116d"]]},{"id":"11ee72e6.cf116d","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":804.2222900390625,"y":174.916748046875,"z":"b984f735.170a28","wires":[["95a44f48.850ee"]]},{"id":"95a44f48.850ee","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":986,"y":175,"z":"b984f735.170a28","wires":[["47e99597.7f430c","7a2fb34.9a5cf4c","f98f3898.faecf8"]]},{"id":"90706af8.c781f8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Failed to resolve Application stop DG for : ' + $vnfcType`\"/>","comments":"","x":1229,"y":85,"z":"b984f735.170a28","wires":[]},{"id":"47e99597.7f430c","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Failed to resolve Application start DG for : ' + $vnfcType`\"/>","comments":"","x":1231,"y":132,"z":"b984f735.170a28","wires":[]},{"id":"f98f3898.faecf8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1212,"y":216,"z":"b984f735.170a28","wires":[]},{"id":"e8324ff0.b7785","type":"call","name":"Restart VM","xml":"<call module='APPC' rpc='RestartVM_VM' mode='sync' >\n","comments":"","outputs":1,"x":509,"y":669,"z":"b984f735.170a28","wires":[["7c0c0d04.13c0c4","3aa07333.27bc0c","d7b6d480.c99688"]]},{"id":"7c0c0d04.13c0c4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":711.7998046875,"y":764,"z":"b984f735.170a28","wires":[["6e7a0094.c01bd"]]},{"id":"d7b6d480.c99688","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":721.5775756835938,"y":579,"z":"b984f735.170a28","wires":[["e5234f3a.f31fc"]]},{"id":"3aa07333.27bc0c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":710.44482421875,"y":668.928466796875,"z":"b984f735.170a28","wires":[["72e8010b.e80bb"]]},{"id":"2e149572.9b4aea","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1212,"y":304,"z":"b984f735.170a28","wires":[[]]},{"id":"3c44027b.eab53e","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":265,"y":557,"z":"b984f735.170a28","wires":[["21ee16d0.7c845a","e8324ff0.b7785","417783a9.d9a3dc","8293147d.835ab8","e852d328.2c314","a0d8147d.9fd638","861e0104.35b31"]]},{"id":"e5234f3a.f31fc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":903,"y":579,"z":"b984f735.170a28","wires":[["e786eccc.52ef5","9773ec20.4e23e","9cc414cf.e7c9e8"]]},{"id":"9773ec20.4e23e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1144,"y":710,"z":"b984f735.170a28","wires":[]},{"id":"9cc414cf.e7c9e8","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1141.2384033203125,"y":668.0003662109375,"z":"b984f735.170a28","wires":[[]]},{"id":"e786eccc.52ef5","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"VM Restart DG not found.\"/>","comments":"","x":1154.77783203125,"y":579.0000610351562,"z":"b984f735.170a28","wires":[]},{"id":"6e7a0094.c01bd","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":885.9999389648438,"y":765,"z":"b984f735.170a28","wires":[["a3c4853f.40b318","33fe1ee6.042e72"]]},{"id":"33fe1ee6.042e72","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Restart succeeded for the server : ' + $restart-vm-url`\"/>\n","comments":"","x":1172.0547485351562,"y":757.0667724609375,"z":"b984f735.170a28","wires":[]},{"id":"a3c4853f.40b318","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1147.0547485351562,"y":800.0667419433594,"z":"b984f735.170a28","wires":[[]]},{"id":"72e8010b.e80bb","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":882,"y":669,"z":"b984f735.170a28","wires":[["9cc414cf.e7c9e8","9773ec20.4e23e"]]},{"id":"5659bad0.a5df44","type":"call","name":"Start Application","xml":"<call module='`$ApplicationStart.dg_module`' rpc='`$ApplicationStart.dg_name`' version='`$ApplicationStart.dg_version`' mode='sync'  >\n","comments":"","outputs":1,"x":1804.0001220703125,"y":969.0000610351562,"z":"b984f735.170a28","wires":[["921b7a03.dc3578","26931ef5.273852","f0eafdd5.891c1"]]},{"id":"f0eafdd5.891c1","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2074.3336181640625,"y":883.9998779296875,"z":"b984f735.170a28","wires":[["647d9a28.b03584"]]},{"id":"921b7a03.dc3578","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2061.2008056640625,"y":970.9286499023438,"z":"b984f735.170a28","wires":[["498aae01.db4c8"]]},{"id":"26931ef5.273852","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2066.5558471679688,"y":1083.9999389648438,"z":"b984f735.170a28","wires":[["3b52a93.0a7f756"]]},{"id":"498aae01.db4c8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2236.4441528320312,"y":970.9999418258687,"z":"b984f735.170a28","wires":[["56221b95.e94674","7fc18918.d80b88","ed1928d0.c013d8"]]},{"id":"56221b95.e94674","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Failure while starting the server: ' + $restart-vm-url + ' at Application level.'`\"/>","comments":"","x":2494.221954345703,"y":903.9999284744242,"z":"b984f735.170a28","wires":[]},{"id":"647d9a28.b03584","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2243.4441528320312,"y":883.9998779296875,"z":"b984f735.170a28","wires":[["bc465d1a.8f2f8","ed1928d0.c013d8","7fc18918.d80b88"]]},{"id":"bc465d1a.8f2f8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Application start DG : ' + $ApplicationStart.dg_name + ' not found.'`\"/>","comments":"","x":2491.2219848632812,"y":854.9999389648438,"z":"b984f735.170a28","wires":[]},{"id":"ed1928d0.c013d8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2484.444091796875,"y":996.9998779296875,"z":"b984f735.170a28","wires":[]},{"id":"3b52a93.0a7f756","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2236.5553588867188,"y":1083.9999389648438,"z":"b984f735.170a28","wires":[["f056aa26.f7dff8","542ce20.b31862","442acb3.1d6a034"]]},{"id":"542ce20.b31862","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Start succeeded for the server : ' + $restart-vm-url` at application level.\"/>\n","comments":"","x":2513.6101684570312,"y":1041.0667114257812,"z":"b984f735.170a28","wires":[]},{"id":"f056aa26.f7dff8","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":2492.610107421875,"y":1085.066650390625,"z":"b984f735.170a28","wires":[[]]},{"id":"7fc18918.d80b88","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":2481.6824951171875,"y":955.000244140625,"z":"b984f735.170a28","wires":[[]]},{"id":"e546334b.650fb","type":"set","name":"set start parameters","xml":"<set>\n<parameter name=\"start-vm-url\" value=\"`$restart-vm-url`\" />","comments":"","x":1817.0001220703125,"y":919.0000610351562,"z":"b984f735.170a28","wires":[]},{"id":"417783a9.d9a3dc","type":"set","name":"set stop parameters","xml":"<set>\n<parameter name=\"stop-vm-url\" value=\"`$restart-vm-url`\" />","comments":"","x":553,"y":302,"z":"b984f735.170a28","wires":[]},{"id":"442acb3.1d6a034","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":2497.0001220703125,"y":1128.0000610351562,"z":"b984f735.170a28","wires":[]},{"id":"8293147d.835ab8","type":"set","name":"set healthcheck parameters","xml":"<set>\n<parameter name=\"healthcheck.vm[0].url\" value=\"`$restart-vm-url`\" />\n<parameter name=\"healthcheck.vmCount\" value=\"1\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":554,"y":859,"z":"b984f735.170a28","wires":[]},{"id":"e852d328.2c314","type":"call","name":"Healthcheck Application","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":538.3046875,"y":912.2333374023438,"z":"b984f735.170a28","wires":[["c45e9b3d.f04c68","eb378fb1.6a751","b683026f.8d186"]]},{"id":"c45e9b3d.f04c68","type":"outcome","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":824.47216796875,"y":874.5001220703125,"z":"b984f735.170a28","wires":[["1de23c81.8d2603"]]},{"id":"1de23c81.8d2603","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[0].status`\">\n","comments":"","outputs":1,"x":1118,"y":874.0000610351562,"z":"b984f735.170a28","wires":[["f22c3d56.f72a4","c82cd43c.aa1778","db3ee578.1b38c8"]]},{"id":"f22c3d56.f72a4","type":"other","name":"UP","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":1359,"y":826.0000610351562,"z":"b984f735.170a28","wires":[["23734e9f.70a3f2"]]},{"id":"23734e9f.70a3f2","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1563.99951171875,"y":824.0000610351562,"z":"b984f735.170a28","wires":[["788520dc.d8dd7","2f68662.8cfa69a","a1dd23cd.927a7"]]},{"id":"2f68662.8cfa69a","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Healthcheck succeeded for the restarted server : ' + $restart-vm-url`\"/>\n","comments":"","x":1824.0543212890625,"y":781.0668334960938,"z":"b984f735.170a28","wires":[]},{"id":"788520dc.d8dd7","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1800.0543212890625,"y":824.0668029785156,"z":"b984f735.170a28","wires":[[]]},{"id":"a1dd23cd.927a7","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":1804.4442749023438,"y":868.0001831054688,"z":"b984f735.170a28","wires":[]},{"id":"c82cd43c.aa1778","type":"other","name":"DOWN","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":1359,"y":875.0000610351562,"z":"b984f735.170a28","wires":[["e6e0685d.7d2e08"]]},{"id":"db3ee578.1b38c8","type":"other","name":"UNKNOWN","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":1375.783447265625,"y":924.1428833007812,"z":"b984f735.170a28","wires":[["e6e0685d.7d2e08"]]},{"id":"e6e0685d.7d2e08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1609,"y":942,"z":"b984f735.170a28","wires":[["e546334b.650fb","5659bad0.a5df44"]]},{"id":"eb378fb1.6a751","type":"outcome","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":812,"y":979,"z":"b984f735.170a28","wires":[["9cd90f6e.fcf8a"]]},{"id":"b683026f.8d186","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":815.5164794921875,"y":1067.338134765625,"z":"b984f735.170a28","wires":[["44e9943.917966c"]]},{"id":"9cd90f6e.fcf8a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1006,"y":979.0000610351562,"z":"b984f735.170a28","wires":[["67b277fb.8ee0c8","8e0f7825.4d1df8","cdc1c975.d33b68"]]},{"id":"44e9943.917966c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":996,"y":1067.0000610351562,"z":"b984f735.170a28","wires":[["cdc1c975.d33b68","8e0f7825.4d1df8","b1c7157.0ed5be8"]]},{"id":"67b277fb.8ee0c8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Error occurred during post-health check of the restarted server: ' + $restart-vm-url`\"/>","comments":"","x":1267,"y":980.0000610351562,"z":"b984f735.170a28","wires":[]},{"id":"b1c7157.0ed5be8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1265.666748046875,"y":1026.0000610351562,"z":"b984f735.170a28","wires":[]},{"id":"8e0f7825.4d1df8","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1238.1329345703125,"y":1071.8126831054688,"z":"b984f735.170a28","wires":[[]]},{"id":"cdc1c975.d33b68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1247.7607421875,"y":1116.1880493164062,"z":"b984f735.170a28","wires":[]}]
+[{"id":"a9512af0.2ec648","type":"dgstart","name":"DGSTART","outputs":1,"x":95,"y":42,"z":"b984f735.170a28","wires":[["9d497354.98d4d"]]},{"id":"9d497354.98d4d","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":134.0000762939453,"y":104.5666732788086,"z":"b984f735.170a28","wires":[["7525850b.012bec"]]},{"id":"7525850b.012bec","type":"method","name":"Restart_VM","xml":"<method rpc='Restart_VM' mode='sync'>\n","comments":"","outputs":1,"x":175.7500762939453,"y":160.81666564941406,"z":"b984f735.170a28","wires":[["3c44027b.eab53e"]]},{"id":"a0d8147d.9fd638","type":"execute","name":"Resolve Application Sop DG","xml":"<execute plugin='org.onap.appc.dg.common.DgResolverPlugin' method='resolveDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"Stop_Application\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"ApplicationStop\" />\n<parameter name=\"DGResolutionType\" value=\"VNFC\" />\n","comments":"","outputs":1,"x":574.0000152587891,"y":85.00001525878906,"z":"b984f735.170a28","wires":[["39b85a6a.3da766"]]},{"id":"39b85a6a.3da766","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":805.2223205566406,"y":84.91676330566406,"z":"b984f735.170a28","wires":[["fa92d96.4e4e928"]]},{"id":"7a2fb34.9a5cf4c","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1215,"y":173.00003051757812,"z":"b984f735.170a28","wires":[[]]},{"id":"fa92d96.4e4e928","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":986.0000610351562,"y":85.00001525878906,"z":"b984f735.170a28","wires":[["90706af8.c781f8","7a2fb34.9a5cf4c","f98f3898.faecf8"]]},{"id":"861e0104.35b31","type":"call","name":"Stop Application","xml":"<call module='`$ApplicationStop.dg_module`' rpc='`$ApplicationStop.dg_name`' version='`$ApplicationStop.dg_version`' mode='sync'  >\n","comments":"","outputs":1,"x":541.3175659179688,"y":354.99981689453125,"z":"b984f735.170a28","wires":[["847e984.ecc4868","8b93e1af.acf0a","d2e13936.d3ac68"]]},{"id":"d2e13936.d3ac68","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":772.6510620117188,"y":303.9996337890625,"z":"b984f735.170a28","wires":[["36c612c4.c0fcce"]]},{"id":"847e984.ecc4868","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":766.5182495117188,"y":480.92840576171875,"z":"b984f735.170a28","wires":[["64f7aa4b.531954"]]},{"id":"8b93e1af.acf0a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":767.873291015625,"y":394.999755859375,"z":"b984f735.170a28","wires":[["4933b52f.71e72c"]]},{"id":"64f7aa4b.531954","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":979.7615966796875,"y":480.99969768524375,"z":"b984f735.170a28","wires":[["a7a86bfe.db5a78","f89ae72.d92c718"]]},{"id":"f89ae72.d92c718","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Failure while stopping the server: ' + $restart-vm-url + ' at Application level.'`\"/>","comments":"","x":1239.5393981933594,"y":481.9996843337992,"z":"b984f735.170a28","wires":[]},{"id":"a7a86bfe.db5a78","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1225.6723327636719,"y":528.8123064041117,"z":"b984f735.170a28","wires":[[]]},{"id":"36c612c4.c0fcce","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":979.7615966796875,"y":303.9996337890625,"z":"b984f735.170a28","wires":[["af672dc5.7c144","6fbe061b.5a2d78","2e149572.9b4aea"]]},{"id":"af672dc5.7c144","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Application stop DG : ' + $ApplicationStop.dg_name + ' not found.'`\"/>","comments":"","x":1229.5394287109375,"y":264.99969482421875,"z":"b984f735.170a28","wires":[]},{"id":"6fbe061b.5a2d78","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1214.7615966796875,"y":345.9996337890625,"z":"b984f735.170a28","wires":[]},{"id":"4933b52f.71e72c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":986.872802734375,"y":394.999755859375,"z":"b984f735.170a28","wires":[["87599293.c745a","dc2add7.18f442"]]},{"id":"dc2add7.18f442","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Stop succeeded for the server : ' + $restart-vm-url` at application level.\"/>\n","comments":"","x":1245.9276123046875,"y":395.0665283203125,"z":"b984f735.170a28","wires":[]},{"id":"87599293.c745a","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1222.9276123046875,"y":438.0664978027344,"z":"b984f735.170a28","wires":[[]]},{"id":"21ee16d0.7c845a","type":"execute","name":"Resolve Application Start DG","xml":"<execute plugin='org.onap.appc.dg.common.DgResolverPlugin' method='resolveDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"Start_Application\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"ApplicationStart\" />\n<parameter name=\"DGResolutionType\" value=\"VNFC\" />\n","comments":"","outputs":1,"x":575,"y":175,"z":"b984f735.170a28","wires":[["11ee72e6.cf116d"]]},{"id":"11ee72e6.cf116d","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":804.2222900390625,"y":174.916748046875,"z":"b984f735.170a28","wires":[["95a44f48.850ee"]]},{"id":"95a44f48.850ee","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":986,"y":175,"z":"b984f735.170a28","wires":[["47e99597.7f430c","7a2fb34.9a5cf4c","f98f3898.faecf8"]]},{"id":"90706af8.c781f8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Failed to resolve Application stop DG for : ' + $vnfcType`\"/>","comments":"","x":1229,"y":85,"z":"b984f735.170a28","wires":[]},{"id":"47e99597.7f430c","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Failed to resolve Application start DG for : ' + $vnfcType`\"/>","comments":"","x":1231,"y":132,"z":"b984f735.170a28","wires":[]},{"id":"f98f3898.faecf8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1212,"y":216,"z":"b984f735.170a28","wires":[]},{"id":"e8324ff0.b7785","type":"call","name":"Restart VM","xml":"<call module='APPC' rpc='RestartVM_VM' mode='sync' >\n","comments":"","outputs":1,"x":509,"y":669,"z":"b984f735.170a28","wires":[["7c0c0d04.13c0c4","3aa07333.27bc0c","d7b6d480.c99688"]]},{"id":"7c0c0d04.13c0c4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":711.7998046875,"y":764,"z":"b984f735.170a28","wires":[["6e7a0094.c01bd"]]},{"id":"d7b6d480.c99688","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":721.5775756835938,"y":579,"z":"b984f735.170a28","wires":[["e5234f3a.f31fc"]]},{"id":"3aa07333.27bc0c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":710.44482421875,"y":668.928466796875,"z":"b984f735.170a28","wires":[["72e8010b.e80bb"]]},{"id":"2e149572.9b4aea","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1212,"y":304,"z":"b984f735.170a28","wires":[[]]},{"id":"3c44027b.eab53e","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":265,"y":557,"z":"b984f735.170a28","wires":[["21ee16d0.7c845a","e8324ff0.b7785","417783a9.d9a3dc","8293147d.835ab8","e852d328.2c314","a0d8147d.9fd638","861e0104.35b31"]]},{"id":"e5234f3a.f31fc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":903,"y":579,"z":"b984f735.170a28","wires":[["e786eccc.52ef5","9773ec20.4e23e","9cc414cf.e7c9e8"]]},{"id":"9773ec20.4e23e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1144,"y":710,"z":"b984f735.170a28","wires":[]},{"id":"9cc414cf.e7c9e8","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1141.2384033203125,"y":668.0003662109375,"z":"b984f735.170a28","wires":[[]]},{"id":"e786eccc.52ef5","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"VM Restart DG not found.\"/>","comments":"","x":1154.77783203125,"y":579.0000610351562,"z":"b984f735.170a28","wires":[]},{"id":"6e7a0094.c01bd","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":885.9999389648438,"y":765,"z":"b984f735.170a28","wires":[["a3c4853f.40b318","33fe1ee6.042e72"]]},{"id":"33fe1ee6.042e72","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Restart succeeded for the server : ' + $restart-vm-url`\"/>\n","comments":"","x":1172.0547485351562,"y":757.0667724609375,"z":"b984f735.170a28","wires":[]},{"id":"a3c4853f.40b318","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1147.0547485351562,"y":800.0667419433594,"z":"b984f735.170a28","wires":[[]]},{"id":"72e8010b.e80bb","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":882,"y":669,"z":"b984f735.170a28","wires":[["9cc414cf.e7c9e8","9773ec20.4e23e"]]},{"id":"5659bad0.a5df44","type":"call","name":"Start Application","xml":"<call module='`$ApplicationStart.dg_module`' rpc='`$ApplicationStart.dg_name`' version='`$ApplicationStart.dg_version`' mode='sync'  >\n","comments":"","outputs":1,"x":1804.0001220703125,"y":969.0000610351562,"z":"b984f735.170a28","wires":[["921b7a03.dc3578","26931ef5.273852","f0eafdd5.891c1"]]},{"id":"f0eafdd5.891c1","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2074.3336181640625,"y":883.9998779296875,"z":"b984f735.170a28","wires":[["647d9a28.b03584"]]},{"id":"921b7a03.dc3578","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2061.2008056640625,"y":970.9286499023438,"z":"b984f735.170a28","wires":[["498aae01.db4c8"]]},{"id":"26931ef5.273852","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2066.5558471679688,"y":1083.9999389648438,"z":"b984f735.170a28","wires":[["3b52a93.0a7f756"]]},{"id":"498aae01.db4c8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2236.4441528320312,"y":970.9999418258687,"z":"b984f735.170a28","wires":[["56221b95.e94674","7fc18918.d80b88","ed1928d0.c013d8"]]},{"id":"56221b95.e94674","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Failure while starting the server: ' + $restart-vm-url + ' at Application level.'`\"/>","comments":"","x":2494.221954345703,"y":903.9999284744242,"z":"b984f735.170a28","wires":[]},{"id":"647d9a28.b03584","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2243.4441528320312,"y":883.9998779296875,"z":"b984f735.170a28","wires":[["bc465d1a.8f2f8","ed1928d0.c013d8","7fc18918.d80b88"]]},{"id":"bc465d1a.8f2f8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Application start DG : ' + $ApplicationStart.dg_name + ' not found.'`\"/>","comments":"","x":2491.2219848632812,"y":854.9999389648438,"z":"b984f735.170a28","wires":[]},{"id":"ed1928d0.c013d8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2484.444091796875,"y":996.9998779296875,"z":"b984f735.170a28","wires":[]},{"id":"3b52a93.0a7f756","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2236.5553588867188,"y":1083.9999389648438,"z":"b984f735.170a28","wires":[["f056aa26.f7dff8","542ce20.b31862","442acb3.1d6a034"]]},{"id":"542ce20.b31862","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Start succeeded for the server : ' + $restart-vm-url` at application level.\"/>\n","comments":"","x":2513.6101684570312,"y":1041.0667114257812,"z":"b984f735.170a28","wires":[]},{"id":"f056aa26.f7dff8","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":2492.610107421875,"y":1085.066650390625,"z":"b984f735.170a28","wires":[[]]},{"id":"7fc18918.d80b88","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":2481.6824951171875,"y":955.000244140625,"z":"b984f735.170a28","wires":[[]]},{"id":"e546334b.650fb","type":"set","name":"set start parameters","xml":"<set>\n<parameter name=\"start-vm-url\" value=\"`$restart-vm-url`\" />","comments":"","x":1817.0001220703125,"y":919.0000610351562,"z":"b984f735.170a28","wires":[]},{"id":"417783a9.d9a3dc","type":"set","name":"set stop parameters","xml":"<set>\n<parameter name=\"stop-vm-url\" value=\"`$restart-vm-url`\" />","comments":"","x":553,"y":302,"z":"b984f735.170a28","wires":[]},{"id":"442acb3.1d6a034","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":2497.0001220703125,"y":1128.0000610351562,"z":"b984f735.170a28","wires":[]},{"id":"8293147d.835ab8","type":"set","name":"set healthcheck parameters","xml":"<set>\n<parameter name=\"healthcheck.vm[0].url\" value=\"`$restart-vm-url`\" />\n<parameter name=\"healthcheck.vmCount\" value=\"1\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":554,"y":859,"z":"b984f735.170a28","wires":[]},{"id":"e852d328.2c314","type":"call","name":"Healthcheck Application","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":538.3046875,"y":912.2333374023438,"z":"b984f735.170a28","wires":[["c45e9b3d.f04c68","eb378fb1.6a751","b683026f.8d186"]]},{"id":"c45e9b3d.f04c68","type":"outcome","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":824.47216796875,"y":874.5001220703125,"z":"b984f735.170a28","wires":[["1de23c81.8d2603"]]},{"id":"1de23c81.8d2603","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[0].status`\">\n","comments":"","outputs":1,"x":1118,"y":874.0000610351562,"z":"b984f735.170a28","wires":[["f22c3d56.f72a4","c82cd43c.aa1778","db3ee578.1b38c8"]]},{"id":"f22c3d56.f72a4","type":"other","name":"UP","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":1359,"y":826.0000610351562,"z":"b984f735.170a28","wires":[["23734e9f.70a3f2"]]},{"id":"23734e9f.70a3f2","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1563.99951171875,"y":824.0000610351562,"z":"b984f735.170a28","wires":[["788520dc.d8dd7","2f68662.8cfa69a","a1dd23cd.927a7"]]},{"id":"2f68662.8cfa69a","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Healthcheck succeeded for the restarted server : ' + $restart-vm-url`\"/>\n","comments":"","x":1824.0543212890625,"y":781.0668334960938,"z":"b984f735.170a28","wires":[]},{"id":"788520dc.d8dd7","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1800.0543212890625,"y":824.0668029785156,"z":"b984f735.170a28","wires":[[]]},{"id":"a1dd23cd.927a7","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":1804.4442749023438,"y":868.0001831054688,"z":"b984f735.170a28","wires":[]},{"id":"c82cd43c.aa1778","type":"other","name":"DOWN","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":1359,"y":875.0000610351562,"z":"b984f735.170a28","wires":[["e6e0685d.7d2e08"]]},{"id":"db3ee578.1b38c8","type":"other","name":"UNKNOWN","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":1375.783447265625,"y":924.1428833007812,"z":"b984f735.170a28","wires":[["e6e0685d.7d2e08"]]},{"id":"e6e0685d.7d2e08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1609,"y":942,"z":"b984f735.170a28","wires":[["e546334b.650fb","5659bad0.a5df44"]]},{"id":"eb378fb1.6a751","type":"outcome","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":812,"y":979,"z":"b984f735.170a28","wires":[["9cd90f6e.fcf8a"]]},{"id":"b683026f.8d186","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":815.5164794921875,"y":1067.338134765625,"z":"b984f735.170a28","wires":[["44e9943.917966c"]]},{"id":"9cd90f6e.fcf8a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1006,"y":979.0000610351562,"z":"b984f735.170a28","wires":[["67b277fb.8ee0c8","8e0f7825.4d1df8","cdc1c975.d33b68"]]},{"id":"44e9943.917966c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":996,"y":1067.0000610351562,"z":"b984f735.170a28","wires":[["cdc1c975.d33b68","8e0f7825.4d1df8","b1c7157.0ed5be8"]]},{"id":"67b277fb.8ee0c8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Error occurred during post-health check of the restarted server: ' + $restart-vm-url`\"/>","comments":"","x":1267,"y":980.0000610351562,"z":"b984f735.170a28","wires":[]},{"id":"b1c7157.0ed5be8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1265.666748046875,"y":1026.0000610351562,"z":"b984f735.170a28","wires":[]},{"id":"8e0f7825.4d1df8","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1238.1329345703125,"y":1071.8126831054688,"z":"b984f735.170a28","wires":[[]]},{"id":"cdc1c975.d33b68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1247.7607421875,"y":1116.1880493164062,"z":"b984f735.170a28","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart_VNF.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart_VNF.json
index 37362e1e7..0766c47d4 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart_VNF.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart_VNF.json
@@ -1 +1 @@
-[{"id":"9ac68df1.3eeeb","type":"dgstart","name":"DGSTART","outputs":1,"x":238.4375,"y":257.86907958984375,"z":"75c5f17a.eda5d","wires":[["273c5344.72899c"]]},{"id":"273c5344.72899c","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":422.4375,"y":257.86907958984375,"z":"75c5f17a.eda5d","wires":[["8dd8ca14.1d2288"]]},{"id":"8dd8ca14.1d2288","type":"method","name":"Restart_VNF","xml":"<method rpc='Restart_VNF' mode='sync'>\n","comments":"","outputs":1,"x":270.43756103515625,"y":339.86907958984375,"z":"75c5f17a.eda5d","wires":[["5d3382c5.b1f6ec"]]},{"id":"70aaf732.9e9648","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":834.4377136230469,"y":285.86907958984375,"z":"75c5f17a.eda5d","wires":[["9c8d5b92.af3218"]]},{"id":"d75599d9.2ac1c8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":836.4377136230469,"y":244.86907958984375,"z":"75c5f17a.eda5d","wires":[["9c8d5b92.af3218"]]},{"id":"e872f2e6.4460c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":835.4377136230469,"y":339.8690948486328,"z":"75c5f17a.eda5d","wires":[["9c8d5b92.af3218"]]},{"id":"5d3382c5.b1f6ec","type":"execute","name":"Set payload in Context","xml":"<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />","comments":"","outputs":1,"x":515.4375915527344,"y":340.8691101074219,"z":"75c5f17a.eda5d","wires":[["70aaf732.9e9648","d75599d9.2ac1c8","e872f2e6.4460c","ada92d8a.b912f"]]},{"id":"ada92d8a.b912f","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":687.4375305175781,"y":410.8690948486328,"z":"75c5f17a.eda5d","wires":[["bbde3d59.c9e7d"]]},{"id":"bbde3d59.c9e7d","type":"execute","name":"Get Vnf Hierarchy","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":605.1041259765625,"y":482.8691101074219,"z":"75c5f17a.eda5d","wires":[["fd4a217b.a9b57","7cc75d13.2aef74"]]},{"id":"7cc75d13.2aef74","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":930.1041564941406,"y":454.8691101074219,"z":"75c5f17a.eda5d","wires":[["b74a1f32.1d872"]]},{"id":"fd4a217b.a9b57","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":687.1041564941406,"y":554.8690490722656,"z":"75c5f17a.eda5d","wires":[["284ac8b0.ea6d28"]]},{"id":"284ac8b0.ea6d28","type":"switchNode","name":"switch_getVnfHierarchy_result","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":682.1041870117188,"y":617.9801940917969,"z":"75c5f17a.eda5d","wires":[["4ea4ea52.d70e44","53eb72ea.6a097c"]]},{"id":"4ea4ea52.d70e44","type":"outcome","name":"outcome_SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":720.1041870117188,"y":695.9802551269531,"z":"75c5f17a.eda5d","wires":[["9b95c3bd.6f8db"]]},{"id":"53eb72ea.6a097c","type":"outcome","name":"outcome_FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":999.1042175292969,"y":586.9801940917969,"z":"75c5f17a.eda5d","wires":[["24fa6be.3ab3c94"]]},{"id":"9b95c3bd.6f8db","type":"switchNode","name":"switch_VNF_VMCount","xml":"<switch test='`$VNF.VMCount`'>","comments":"","outputs":1,"x":721.1041870117188,"y":770.0912780761719,"z":"75c5f17a.eda5d","wires":[["279a19c4.a60a36","eb77493d.5744e8"]]},{"id":"279a19c4.a60a36","type":"outcome","name":"outcome_0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":953.1041564941406,"y":735.0912780761719,"z":"75c5f17a.eda5d","wires":[["6b2a2a0c.d9ce64"]]},{"id":"eb77493d.5744e8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":817.1041641235352,"y":831.0913391113281,"z":"75c5f17a.eda5d","wires":[["a4ecb63a.5c5838"]]},{"id":"a4ecb63a.5c5838","type":"execute","name":"Get VNFC Execution Flow Data","xml":"<execute plugin='org.openecomp.appc.dg.common.VnfExecutionFlow' method='getVnfExecutionFlowData' >\n<parameter name=\"DependencyType\" value='RESOURCE' />\n<parameter name=\"FlowStrategy\" value='FORWARD' />\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfVersion\" value='`$vnf.version`' />\n","comments":"","outputs":1,"x":765.1040420532227,"y":896.2024841308594,"z":"75c5f17a.eda5d","wires":[["892a65d2.ce83c8","d9875dc.74feda"]]},{"id":"892a65d2.ce83c8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":833.1041030883789,"y":954.2024230957031,"z":"75c5f17a.eda5d","wires":[["ae689d83.c6b01"]]},{"id":"d9875dc.74feda","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1008.1041030883789,"y":861.2023620605469,"z":"75c5f17a.eda5d","wires":[["ed720e24.72ff6"]]},{"id":"9c8d5b92.af3218","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1041.1044616699219,"y":282.8690872192383,"z":"75c5f17a.eda5d","wires":[["6da25f82.3ace7","8ebaa00a.5f127"]]},{"id":"8ebaa00a.5f127","type":"execute","name":"OutputMessageBuilde","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failure in flattening payload Json\"/>","comments":"","outputs":1,"x":1300.009033203125,"y":236.25,"z":"75c5f17a.eda5d","wires":[["3e85e6ac.70e63a"]]},{"id":"3e85e6ac.70e63a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1541.2948379516602,"y":236.67862701416016,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"6da25f82.3ace7","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","x":1271.4374084472656,"y":328.3927917480469,"z":"75c5f17a.eda5d","wires":[]},{"id":"b74a1f32.1d872","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1098.8819274902344,"y":454.75799560546875,"z":"75c5f17a.eda5d","wires":[["70eeb508.3e2e3c","a413144c.5a7408"]]},{"id":"a413144c.5a7408","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failed to retrieve VNF details from A&amp;AI\"/>\n\n","comments":"","outputs":1,"x":1320.8818054199219,"y":420.75799560546875,"z":"75c5f17a.eda5d","wires":[["1b02a128.9f020f"]]},{"id":"70eeb508.3e2e3c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1289.8818054199219,"y":485.75799560546875,"z":"75c5f17a.eda5d","wires":[]},{"id":"1b02a128.9f020f","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1530.8818740844727,"y":420.7579803466797,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"24fa6be.3ab3c94","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1207.7709045410156,"y":577.9801788330078,"z":"75c5f17a.eda5d","wires":[["ed3ddf12.9c052","b53931d8.8a057"]]},{"id":"7f3210ce.eac0e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1597.7707824707031,"y":545.9801864624023,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"ed3ddf12.9c052","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1430.7707824707031,"y":625.9801483154297,"z":"75c5f17a.eda5d","wires":[]},{"id":"6b2a2a0c.d9ce64","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1136.4375305175781,"y":736.0913391113281,"z":"75c5f17a.eda5d","wires":[["1824c2d.c22413d","dc0dbb4a.577668"]]},{"id":"dc0dbb4a.577668","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Server or VNFC not exists in A&amp;AI for the VNF\"/>\n\n","comments":"","outputs":1,"x":1414.4374160766602,"y":701.0913696289062,"z":"75c5f17a.eda5d","wires":[["7238540.2af54ac"]]},{"id":"7238540.2af54ac","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1620.4374084472656,"y":704.0913009643555,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"1824c2d.c22413d","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1392.4374160766602,"y":759.0914001464844,"z":"75c5f17a.eda5d","wires":[]},{"id":"ed720e24.72ff6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1176.4374771118164,"y":860.3135070800781,"z":"75c5f17a.eda5d","wires":[["dcc566b6.2ed2d8","1a34c826.e93e58"]]},{"id":"1a34c826.e93e58","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n","comments":"","outputs":1,"x":1439.4373779296875,"y":825.3134841918945,"z":"75c5f17a.eda5d","wires":[["1bb9b256.3c599e"]]},{"id":"1bb9b256.3c599e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1665.4374084472656,"y":820.3134689331055,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"dcc566b6.2ed2d8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1411.4374084472656,"y":877.3135299682617,"z":"75c5f17a.eda5d","wires":[]},{"id":"62c490ca.74454","type":"for","name":"For each VNFC","xml":"<for index='vnfcCounter' start='0' end='`$vnfcFlowCount`' >\n","comments":"","outputs":1,"x":968.6598510742188,"y":1312.535400390625,"z":"75c5f17a.eda5d","wires":[["38f732d.673eece"]]},{"id":"a9fb203e.05197","type":"call","name":"call VNFC DG","xml":"<call module='`$Restart.dg_module`' rpc='`$Restart.dg_name`' mode='sync' version='`$Restart.dg_version`'>\n","comments":"","outputs":1,"x":1372.659683227539,"y":1363.646728515625,"z":"75c5f17a.eda5d","wires":[["9534aa2d.196af8","2398588.9d68ea8","5c723b91.ee2874"]]},{"id":"46f195f5.40ae1c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":752.6597900390625,"y":1312.5357666015625,"z":"75c5f17a.eda5d","wires":[["62c490ca.74454","202a8d89.1b7fe2","f88e788.8616a88","17128b11.be84d5"]]},{"id":"783f06ad.7c3438","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1650.6599731445312,"y":1059.5357360839844,"z":"75c5f17a.eda5d","wires":[["2100653b.73255a"]]},{"id":"f7c5a47.39a1f58","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1648.65966796875,"y":1144.5357360839844,"z":"75c5f17a.eda5d","wires":[["58ab2482.9113bc"]]},{"id":"58ab2482.9113bc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1838.65966796875,"y":1143.5357360839844,"z":"75c5f17a.eda5d","wires":[["9644598c.158738","b9e17e61.e8e82"]]},{"id":"b9e17e61.e8e82","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Failed to retrieve VNFC DG for ' + $vnfcFlow[$i].vnfcType`\"/>\n","comments":"","outputs":1,"x":2066.65966796875,"y":1103.5357360839844,"z":"75c5f17a.eda5d","wires":[["440404e.5c865fc"]]},{"id":"440404e.5c865fc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2269.659912109375,"y":1103.5357360839844,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"9644598c.158738","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2035.65966796875,"y":1180.5357360839844,"z":"75c5f17a.eda5d","wires":[]},{"id":"5c723b91.ee2874","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1589.4374389648438,"y":1423.7578125,"z":"75c5f17a.eda5d","wires":[["c060c328.286b4"]]},{"id":"2398588.9d68ea8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1588.4374389648438,"y":1302.7578735351562,"z":"75c5f17a.eda5d","wires":[["4c8339c2.bc3ba8"]]},{"id":"9534aa2d.196af8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1590.4375610351562,"y":1360.7578125,"z":"75c5f17a.eda5d","wires":[["dec3e93f.1e0318"]]},{"id":"38f732d.673eece","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1157.3263549804688,"y":1208.7578430175781,"z":"75c5f17a.eda5d","wires":[["a9fb203e.05197","814ca941.4fa208","ddb8f914.46dbc8","a0732a1.d4944d8"]]},{"id":"ae689d83.c6b01","type":"switchNode","name":"switch_dependencyModelFound","xml":"<switch test='`$dependencyModelFound`'>\n","comments":"","outputs":1,"x":775.1040344238281,"y":1024.6469421386719,"z":"75c5f17a.eda5d","wires":[["b9c5cf99.51","19ad2d9a.c524d2"]]},{"id":"b9c5cf99.51","type":"outcome","name":"outcome_false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1068.770851135254,"y":965.7579650878906,"z":"75c5f17a.eda5d","wires":[["4fb101a5.38c5a"]]},{"id":"19ad2d9a.c524d2","type":"outcome","name":"outcome_true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":716.1041870117188,"y":1142.64697265625,"z":"75c5f17a.eda5d","wires":[["46f195f5.40ae1c"]]},{"id":"814ca941.4fa208","type":"execute","name":"execute_Resolve_VNFC_DG","xml":"<execute plugin='org.openecomp.appc.dg.common.DgResolverPlugin' method='resolveDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcFlow[$vnfcCounter].vnfcType`' />\n<parameter name=\"action\" value=\"Restart\" />\n<parameter name=\"prefix\" value=\"Restart\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"DGResolutionType\" value=\"VNFC\" />","comments":"","outputs":1,"x":1418.4374389648438,"y":1105.6189880371094,"z":"75c5f17a.eda5d","wires":[["783f06ad.7c3438","f7c5a47.39a1f58"]]},{"id":"ddb8f914.46dbc8","type":"set","name":"set DG Parameters","xml":"<set>\n<parameter name='vnfcName' value='`$vnfcFlow[$vnfcCounter].vnfcName`' />\n<parameter name='vnfcType' value='`$vnfcFlow[$vnfcCounter].vnfcType`' />\n<parameter name='resilienceType' value='`$vnfcFlow[$vnfcCounter].resilienceType`' />\n<parameter name='vmCount' value='`$vnfcFlow[$vnfcCounter].vmCount`' />\n<parameter name='input.action' value='`$input.action`' />\n<parameter name='RestartSuccessVMCount' value='0' />\n<parameter name='AAIUpdateSuccessFlag' value='false' />","comments":"","x":1402.4647827148438,"y":1172.7023315429688,"z":"75c5f17a.eda5d","wires":[]},{"id":"a0732a1.d4944d8","type":"for","name":"For Each VM","xml":"<for index='j' start='0' end='`$vnfcFlow[$vnfcCounter].vmCount`' >\n","comments":"","outputs":1,"x":1387.2424926757812,"y":1240.6742553710938,"z":"75c5f17a.eda5d","wires":[["b2c4cf28.5e7a5"]]},{"id":"b2c4cf28.5e7a5","type":"set","name":"Set VM URL","xml":"<set>\n<parameter name=\"$vm[$j].url\" value='`$vnfcFlow[$vnfcCounter].vm[$j].url`' />","comments":"","x":1629.2425231933594,"y":1238.6742782592773,"z":"75c5f17a.eda5d","wires":[]},{"id":"4c8339c2.bc3ba8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1768.3264770507812,"y":1302.8689575195312,"z":"75c5f17a.eda5d","wires":[["8a8ff00d.9d0b3","eb3b629b.35cb"]]},{"id":"8a8ff00d.9d0b3","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1973.3266296386719,"y":1331.8689804077148,"z":"75c5f17a.eda5d","wires":[]},{"id":"a68d3770.e2f208","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2229.3267211914062,"y":1257.8689575195312,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"eb3b629b.35cb","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'VNFC DG not found for : ' + $vnfcName`\"/>","comments":"","outputs":1,"x":2011.3264770507812,"y":1257.8689575195312,"z":"75c5f17a.eda5d","wires":[["a68d3770.e2f208"]]},{"id":"dec3e93f.1e0318","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1756.3265991210938,"y":1359.8689575195312,"z":"75c5f17a.eda5d","wires":[["4848825e.eb8f0c"]]},{"id":"4848825e.eb8f0c","type":"switchNode","name":"switch_vm_restart_success","xml":"<switch test='`$RestartSuccessVMCount >= 1 and $AAIUpdateSuccessFlag == true`'>\n","comments":"","outputs":1,"x":1997.6597595214844,"y":1403.9799194335938,"z":"75c5f17a.eda5d","wires":[["67708009.ef876","a837107b.524fa"]]},{"id":"a837107b.524fa","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2189.4378662109375,"y":1348.9801025390625,"z":"75c5f17a.eda5d","wires":[["8d01a890.2fbeb8"]]},{"id":"67708009.ef876","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2194.9378051757812,"y":1458.9800415039062,"z":"75c5f17a.eda5d","wires":[["30ca3ed4.6640a2"]]},{"id":"8d01a890.2fbeb8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2359.4378051757812,"y":1348.9800415039062,"z":"75c5f17a.eda5d","wires":[["569739a0.423578","eaec519f.214dc","89bc175a.1df198","8cdac361.a8e5c"]]},{"id":"902f4f1d.36ed3","type":"set","name":"update failed VNFC count","xml":"<set>\n<parameter name=\"FailedVNFCCount\" value=\"`$FailedVNFCCount + 1`\" />\n","comments":"","x":2600.1043701171875,"y":1486.9801025390625,"z":"75c5f17a.eda5d","wires":[]},{"id":"569739a0.423578","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2577.992950439453,"y":1372.9800720214844,"z":"75c5f17a.eda5d","wires":[]},{"id":"30ca3ed4.6640a2","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2355.5486450195312,"y":1459.0912475585938,"z":"75c5f17a.eda5d","wires":[["902f4f1d.36ed3","d4c030eb.6cec9"]]},{"id":"f88e788.8616a88","type":"switchNode","name":"switch_vnfc_restart_success","xml":"<switch test='`$FailedVNFCCount == 0`'>\n","comments":"","outputs":1,"x":993.8818969726562,"y":1542.8690185546875,"z":"75c5f17a.eda5d","wires":[["df26bc01.d7fa1","2bcfdfc8.8bf36"]]},{"id":"df26bc01.d7fa1","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1229.8818969726562,"y":1497.8689575195312,"z":"75c5f17a.eda5d","wires":[["1a89739d.14981c"]]},{"id":"2bcfdfc8.8bf36","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1225.3820190429688,"y":1584.8689575195312,"z":"75c5f17a.eda5d","wires":[["471bece0.a1cdc4"]]},{"id":"1a89739d.14981c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1409.6318969726562,"y":1497.3412475585938,"z":"75c5f17a.eda5d","wires":[["f29375ef.e47478"]]},{"id":"f29375ef.e47478","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1619.1508178710938,"y":1498.3858032226562,"z":"75c5f17a.eda5d","wires":[]},{"id":"471bece0.a1cdc4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1415.6320190429688,"y":1584.3412475585938,"z":"75c5f17a.eda5d","wires":[["ae8ad841.b59cb8"]]},{"id":"ae8ad841.b59cb8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":1616.3817749023438,"y":1583.7857055664062,"z":"75c5f17a.eda5d","wires":[]},{"id":"202a8d89.1b7fe2","type":"set","name":"set Failed VNFC Count","xml":"<set>\n<parameter name='FailedVNFCCount' value='0' />","comments":"","x":963.8819580078125,"y":1104.8689575195312,"z":"75c5f17a.eda5d","wires":[]},{"id":"c060c328.286b4","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Restart successfull for VNFC : ' + $vnfcName `\"/>\n","comments":"","outputs":1,"x":1766.2151489257812,"y":1422.869140625,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"eaec519f.214dc","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2575.215591430664,"y":1211.869140625,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"d4c030eb.6cec9","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Failed to restart all VMs for VNFC : ' + $vnfcName + '. But successfully restarted '+ $RestartSuccessVMCount +' VM/s so continue to next VNFC'`\"/>\n","comments":"","outputs":1,"x":2563.2149963378906,"y":1434.8690795898438,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"2100653b.73255a","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'VNFC DG for ' + $vnfcName + ' resolves to rpc: ' + $Restart.dg_name + ', module: ' + $Restart.dg_module + ', version: ' + $Restart.dg_version `\"/>\n","comments":"","outputs":1,"x":1844.3265991210938,"y":1056.8691711425781,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"31d62dbc.3761f2","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\"/>","comments":"","outputs":1,"x":3125.1048736572266,"y":1339.758056640625,"z":"75c5f17a.eda5d","wires":[["1dd07e2b.67d132"]]},{"id":"1dd07e2b.67d132","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3345.1048736572266,"y":1322.758056640625,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"89bc175a.1df198","type":"switchNode","name":"switch_vm_restart_success","xml":"<switch test='`$RestartSuccessVMCount >= 1`'>\n","comments":"","outputs":1,"x":2569.881607055664,"y":1144.64697265625,"z":"75c5f17a.eda5d","wires":[["572b73b.db5c88c","14fb62d3.c79b1d"]]},{"id":"572b73b.db5c88c","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2801.160171508789,"y":1092.64697265625,"z":"75c5f17a.eda5d","wires":[["7c40c2f3.e0b87c"]]},{"id":"14fb62d3.c79b1d","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2778.6610260009766,"y":1189.6470947265625,"z":"75c5f17a.eda5d","wires":[["f8b19ae6.fe6ca8"]]},{"id":"7c40c2f3.e0b87c","type":"set","name":"Set event message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'AAI update for VNFC ' + $vnfcName + '  failed. '`\" />","comments":"","x":3021.993179321289,"y":1079.6470947265625,"z":"75c5f17a.eda5d","wires":[]},{"id":"f8b19ae6.fe6ca8","type":"set","name":"Set event message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'None of the VMs of VNFC ' + $vnfcName + ' are Restarted. Not proceeding to next VNFC'`\" />","comments":"","x":3001.9925689697266,"y":1168.091796875,"z":"75c5f17a.eda5d","wires":[]},{"id":"6568c60d.62fbd8","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":3152.837677001953,"y":427.8690643310547,"z":"75c5f17a.eda5d","wires":[["13d3844f.cd4abc"]]},{"id":"13d3844f.cd4abc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3444.123321533203,"y":445.2976837158203,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"b53931d8.8a057","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failed to retrieve VNF details from A&amp;AI\"/>\n\n","comments":"","outputs":1,"x":1425.9708557128906,"y":544.8690643310547,"z":"75c5f17a.eda5d","wires":[["7f3210ce.eac0e"]]},{"id":"4fb101a5.38c5a","type":"call","name":"call Generic Restart without Model DG","xml":"<call module='APPC' rpc='Generic_Restart' version='2.0.1' mode='sync' >\n","comments":"","outputs":1,"x":1390.4375,"y":958.8690795898438,"z":"75c5f17a.eda5d","wires":[["a0f3b6b2.4c3988","cdb0db18.a743c8","618f6f6e.254cf"]]},{"id":"a0f3b6b2.4c3988","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1657.21533203125,"y":919.980224609375,"z":"75c5f17a.eda5d","wires":[["3a86e05a.69adc"]]},{"id":"cdb0db18.a743c8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1660.21533203125,"y":960.980224609375,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"618f6f6e.254cf","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1669.2153778076172,"y":1000.9801940917969,"z":"75c5f17a.eda5d","wires":[["bcfdc7ad.06d448"]]},{"id":"bcfdc7ad.06d448","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":1903.21533203125,"y":999.980224609375,"z":"75c5f17a.eda5d","wires":[]},{"id":"3a86e05a.69adc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1848.65966796875,"y":897.980224609375,"z":"75c5f17a.eda5d","wires":[["857666e2.60b258","5400697c.4b3de8"]]},{"id":"5400697c.4b3de8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Restart DG not found\"/>","comments":"","outputs":1,"x":2055.659912109375,"y":847.980224609375,"z":"75c5f17a.eda5d","wires":[["3e41a3d3.9fb8fc"]]},{"id":"857666e2.60b258","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2020.659912109375,"y":947.9802856445312,"z":"75c5f17a.eda5d","wires":[]},{"id":"3e41a3d3.9fb8fc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2330.4375,"y":793.8690795898438,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"8cdac361.a8e5c","type":"switchNode","name":"switch last vnfc","xml":"<switch test='`$secondLastVnfcCounter == $vnfcCounter`'>\n","comments":"","outputs":1,"x":2607.037612915039,"y":1312.074951171875,"z":"75c5f17a.eda5d","wires":[["8f658fcd.5fbcc","7ffa8431.bbdbbc"]]},{"id":"17128b11.be84d5","type":"set","name":"set secondLastVnfcCounter","xml":"<set>\n<parameter name='secondLastVnfcCounter' value='`$vnfcFlowCount - 1`' />\n","comments":"","x":1003.4375,"y":1158.074951171875,"z":"75c5f17a.eda5d","wires":[]},{"id":"8f658fcd.5fbcc","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2772.8373943138176,"y":1258.0749688148517,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"7ffa8431.bbdbbc","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2803.8373943138176,"y":1346.0749688148517,"z":"75c5f17a.eda5d","wires":[["31d62dbc.3761f2"]]}]
+[{"id":"9ac68df1.3eeeb","type":"dgstart","name":"DGSTART","outputs":1,"x":238.4375,"y":257.86907958984375,"z":"75c5f17a.eda5d","wires":[["273c5344.72899c"]]},{"id":"273c5344.72899c","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":422.4375,"y":257.86907958984375,"z":"75c5f17a.eda5d","wires":[["8dd8ca14.1d2288"]]},{"id":"8dd8ca14.1d2288","type":"method","name":"Restart_VNF","xml":"<method rpc='Restart_VNF' mode='sync'>\n","comments":"","outputs":1,"x":270.43756103515625,"y":339.86907958984375,"z":"75c5f17a.eda5d","wires":[["5d3382c5.b1f6ec"]]},{"id":"70aaf732.9e9648","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":834.4377136230469,"y":285.86907958984375,"z":"75c5f17a.eda5d","wires":[["9c8d5b92.af3218"]]},{"id":"d75599d9.2ac1c8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":836.4377136230469,"y":244.86907958984375,"z":"75c5f17a.eda5d","wires":[["9c8d5b92.af3218"]]},{"id":"e872f2e6.4460c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":835.4377136230469,"y":339.8690948486328,"z":"75c5f17a.eda5d","wires":[["9c8d5b92.af3218"]]},{"id":"5d3382c5.b1f6ec","type":"execute","name":"Set payload in Context","xml":"<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />","comments":"","outputs":1,"x":515.4375915527344,"y":340.8691101074219,"z":"75c5f17a.eda5d","wires":[["70aaf732.9e9648","d75599d9.2ac1c8","e872f2e6.4460c","ada92d8a.b912f"]]},{"id":"ada92d8a.b912f","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":687.4375305175781,"y":410.8690948486328,"z":"75c5f17a.eda5d","wires":[["bbde3d59.c9e7d"]]},{"id":"bbde3d59.c9e7d","type":"execute","name":"Get Vnf Hierarchy","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":605.1041259765625,"y":482.8691101074219,"z":"75c5f17a.eda5d","wires":[["fd4a217b.a9b57","7cc75d13.2aef74"]]},{"id":"7cc75d13.2aef74","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":930.1041564941406,"y":454.8691101074219,"z":"75c5f17a.eda5d","wires":[["b74a1f32.1d872"]]},{"id":"fd4a217b.a9b57","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":687.1041564941406,"y":554.8690490722656,"z":"75c5f17a.eda5d","wires":[["284ac8b0.ea6d28"]]},{"id":"284ac8b0.ea6d28","type":"switchNode","name":"switch_getVnfHierarchy_result","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":682.1041870117188,"y":617.9801940917969,"z":"75c5f17a.eda5d","wires":[["4ea4ea52.d70e44","53eb72ea.6a097c"]]},{"id":"4ea4ea52.d70e44","type":"outcome","name":"outcome_SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":720.1041870117188,"y":695.9802551269531,"z":"75c5f17a.eda5d","wires":[["9b95c3bd.6f8db"]]},{"id":"53eb72ea.6a097c","type":"outcome","name":"outcome_FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":999.1042175292969,"y":586.9801940917969,"z":"75c5f17a.eda5d","wires":[["24fa6be.3ab3c94"]]},{"id":"9b95c3bd.6f8db","type":"switchNode","name":"switch_VNF_VMCount","xml":"<switch test='`$VNF.VMCount`'>","comments":"","outputs":1,"x":721.1041870117188,"y":770.0912780761719,"z":"75c5f17a.eda5d","wires":[["279a19c4.a60a36","eb77493d.5744e8"]]},{"id":"279a19c4.a60a36","type":"outcome","name":"outcome_0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":953.1041564941406,"y":735.0912780761719,"z":"75c5f17a.eda5d","wires":[["6b2a2a0c.d9ce64"]]},{"id":"eb77493d.5744e8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":817.1041641235352,"y":831.0913391113281,"z":"75c5f17a.eda5d","wires":[["a4ecb63a.5c5838"]]},{"id":"a4ecb63a.5c5838","type":"execute","name":"Get VNFC Execution Flow Data","xml":"<execute plugin='org.onap.appc.dg.common.VnfExecutionFlow' method='getVnfExecutionFlowData' >\n<parameter name=\"DependencyType\" value='RESOURCE' />\n<parameter name=\"FlowStrategy\" value='FORWARD' />\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfVersion\" value='`$vnf.version`' />\n","comments":"","outputs":1,"x":765.1040420532227,"y":896.2024841308594,"z":"75c5f17a.eda5d","wires":[["892a65d2.ce83c8","d9875dc.74feda"]]},{"id":"892a65d2.ce83c8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":833.1041030883789,"y":954.2024230957031,"z":"75c5f17a.eda5d","wires":[["ae689d83.c6b01"]]},{"id":"d9875dc.74feda","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1008.1041030883789,"y":861.2023620605469,"z":"75c5f17a.eda5d","wires":[["ed720e24.72ff6"]]},{"id":"9c8d5b92.af3218","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1041.1044616699219,"y":282.8690872192383,"z":"75c5f17a.eda5d","wires":[["6da25f82.3ace7","8ebaa00a.5f127"]]},{"id":"8ebaa00a.5f127","type":"execute","name":"OutputMessageBuilde","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failure in flattening payload Json\"/>","comments":"","outputs":1,"x":1300.009033203125,"y":236.25,"z":"75c5f17a.eda5d","wires":[["3e85e6ac.70e63a"]]},{"id":"3e85e6ac.70e63a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1541.2948379516602,"y":236.67862701416016,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"6da25f82.3ace7","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","x":1271.4374084472656,"y":328.3927917480469,"z":"75c5f17a.eda5d","wires":[]},{"id":"b74a1f32.1d872","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1098.8819274902344,"y":454.75799560546875,"z":"75c5f17a.eda5d","wires":[["70eeb508.3e2e3c","a413144c.5a7408"]]},{"id":"a413144c.5a7408","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failed to retrieve VNF details from A&amp;AI\"/>\n\n","comments":"","outputs":1,"x":1320.8818054199219,"y":420.75799560546875,"z":"75c5f17a.eda5d","wires":[["1b02a128.9f020f"]]},{"id":"70eeb508.3e2e3c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1289.8818054199219,"y":485.75799560546875,"z":"75c5f17a.eda5d","wires":[]},{"id":"1b02a128.9f020f","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1530.8818740844727,"y":420.7579803466797,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"24fa6be.3ab3c94","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1207.7709045410156,"y":577.9801788330078,"z":"75c5f17a.eda5d","wires":[["ed3ddf12.9c052","b53931d8.8a057"]]},{"id":"7f3210ce.eac0e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1597.7707824707031,"y":545.9801864624023,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"ed3ddf12.9c052","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1430.7707824707031,"y":625.9801483154297,"z":"75c5f17a.eda5d","wires":[]},{"id":"6b2a2a0c.d9ce64","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1136.4375305175781,"y":736.0913391113281,"z":"75c5f17a.eda5d","wires":[["1824c2d.c22413d","dc0dbb4a.577668"]]},{"id":"dc0dbb4a.577668","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Server or VNFC not exists in A&amp;AI for the VNF\"/>\n\n","comments":"","outputs":1,"x":1414.4374160766602,"y":701.0913696289062,"z":"75c5f17a.eda5d","wires":[["7238540.2af54ac"]]},{"id":"7238540.2af54ac","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1620.4374084472656,"y":704.0913009643555,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"1824c2d.c22413d","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1392.4374160766602,"y":759.0914001464844,"z":"75c5f17a.eda5d","wires":[]},{"id":"ed720e24.72ff6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1176.4374771118164,"y":860.3135070800781,"z":"75c5f17a.eda5d","wires":[["dcc566b6.2ed2d8","1a34c826.e93e58"]]},{"id":"1a34c826.e93e58","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n","comments":"","outputs":1,"x":1439.4373779296875,"y":825.3134841918945,"z":"75c5f17a.eda5d","wires":[["1bb9b256.3c599e"]]},{"id":"1bb9b256.3c599e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1665.4374084472656,"y":820.3134689331055,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"dcc566b6.2ed2d8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1411.4374084472656,"y":877.3135299682617,"z":"75c5f17a.eda5d","wires":[]},{"id":"62c490ca.74454","type":"for","name":"For each VNFC","xml":"<for index='vnfcCounter' start='0' end='`$vnfcFlowCount`' >\n","comments":"","outputs":1,"x":968.6598510742188,"y":1312.535400390625,"z":"75c5f17a.eda5d","wires":[["38f732d.673eece"]]},{"id":"a9fb203e.05197","type":"call","name":"call VNFC DG","xml":"<call module='`$Restart.dg_module`' rpc='`$Restart.dg_name`' mode='sync' version='`$Restart.dg_version`'>\n","comments":"","outputs":1,"x":1372.659683227539,"y":1363.646728515625,"z":"75c5f17a.eda5d","wires":[["9534aa2d.196af8","2398588.9d68ea8","5c723b91.ee2874"]]},{"id":"46f195f5.40ae1c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":752.6597900390625,"y":1312.5357666015625,"z":"75c5f17a.eda5d","wires":[["62c490ca.74454","202a8d89.1b7fe2","f88e788.8616a88","17128b11.be84d5"]]},{"id":"783f06ad.7c3438","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1650.6599731445312,"y":1059.5357360839844,"z":"75c5f17a.eda5d","wires":[["2100653b.73255a"]]},{"id":"f7c5a47.39a1f58","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1648.65966796875,"y":1144.5357360839844,"z":"75c5f17a.eda5d","wires":[["58ab2482.9113bc"]]},{"id":"58ab2482.9113bc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1838.65966796875,"y":1143.5357360839844,"z":"75c5f17a.eda5d","wires":[["9644598c.158738","b9e17e61.e8e82"]]},{"id":"b9e17e61.e8e82","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Failed to retrieve VNFC DG for ' + $vnfcFlow[$i].vnfcType`\"/>\n","comments":"","outputs":1,"x":2066.65966796875,"y":1103.5357360839844,"z":"75c5f17a.eda5d","wires":[["440404e.5c865fc"]]},{"id":"440404e.5c865fc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2269.659912109375,"y":1103.5357360839844,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"9644598c.158738","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2035.65966796875,"y":1180.5357360839844,"z":"75c5f17a.eda5d","wires":[]},{"id":"5c723b91.ee2874","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1589.4374389648438,"y":1423.7578125,"z":"75c5f17a.eda5d","wires":[["c060c328.286b4"]]},{"id":"2398588.9d68ea8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1588.4374389648438,"y":1302.7578735351562,"z":"75c5f17a.eda5d","wires":[["4c8339c2.bc3ba8"]]},{"id":"9534aa2d.196af8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1590.4375610351562,"y":1360.7578125,"z":"75c5f17a.eda5d","wires":[["dec3e93f.1e0318"]]},{"id":"38f732d.673eece","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1157.3263549804688,"y":1208.7578430175781,"z":"75c5f17a.eda5d","wires":[["a9fb203e.05197","814ca941.4fa208","ddb8f914.46dbc8","a0732a1.d4944d8"]]},{"id":"ae689d83.c6b01","type":"switchNode","name":"switch_dependencyModelFound","xml":"<switch test='`$dependencyModelFound`'>\n","comments":"","outputs":1,"x":775.1040344238281,"y":1024.6469421386719,"z":"75c5f17a.eda5d","wires":[["b9c5cf99.51","19ad2d9a.c524d2"]]},{"id":"b9c5cf99.51","type":"outcome","name":"outcome_false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1068.770851135254,"y":965.7579650878906,"z":"75c5f17a.eda5d","wires":[["4fb101a5.38c5a"]]},{"id":"19ad2d9a.c524d2","type":"outcome","name":"outcome_true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":716.1041870117188,"y":1142.64697265625,"z":"75c5f17a.eda5d","wires":[["46f195f5.40ae1c"]]},{"id":"814ca941.4fa208","type":"execute","name":"execute_Resolve_VNFC_DG","xml":"<execute plugin='org.onap.appc.dg.common.DgResolverPlugin' method='resolveDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcFlow[$vnfcCounter].vnfcType`' />\n<parameter name=\"action\" value=\"Restart\" />\n<parameter name=\"prefix\" value=\"Restart\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"DGResolutionType\" value=\"VNFC\" />","comments":"","outputs":1,"x":1418.4374389648438,"y":1105.6189880371094,"z":"75c5f17a.eda5d","wires":[["783f06ad.7c3438","f7c5a47.39a1f58"]]},{"id":"ddb8f914.46dbc8","type":"set","name":"set DG Parameters","xml":"<set>\n<parameter name='vnfcName' value='`$vnfcFlow[$vnfcCounter].vnfcName`' />\n<parameter name='vnfcType' value='`$vnfcFlow[$vnfcCounter].vnfcType`' />\n<parameter name='resilienceType' value='`$vnfcFlow[$vnfcCounter].resilienceType`' />\n<parameter name='vmCount' value='`$vnfcFlow[$vnfcCounter].vmCount`' />\n<parameter name='input.action' value='`$input.action`' />\n<parameter name='RestartSuccessVMCount' value='0' />\n<parameter name='AAIUpdateSuccessFlag' value='false' />","comments":"","x":1402.4647827148438,"y":1172.7023315429688,"z":"75c5f17a.eda5d","wires":[]},{"id":"a0732a1.d4944d8","type":"for","name":"For Each VM","xml":"<for index='j' start='0' end='`$vnfcFlow[$vnfcCounter].vmCount`' >\n","comments":"","outputs":1,"x":1387.2424926757812,"y":1240.6742553710938,"z":"75c5f17a.eda5d","wires":[["b2c4cf28.5e7a5"]]},{"id":"b2c4cf28.5e7a5","type":"set","name":"Set VM URL","xml":"<set>\n<parameter name=\"$vm[$j].url\" value='`$vnfcFlow[$vnfcCounter].vm[$j].url`' />","comments":"","x":1629.2425231933594,"y":1238.6742782592773,"z":"75c5f17a.eda5d","wires":[]},{"id":"4c8339c2.bc3ba8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1768.3264770507812,"y":1302.8689575195312,"z":"75c5f17a.eda5d","wires":[["8a8ff00d.9d0b3","eb3b629b.35cb"]]},{"id":"8a8ff00d.9d0b3","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1973.3266296386719,"y":1331.8689804077148,"z":"75c5f17a.eda5d","wires":[]},{"id":"a68d3770.e2f208","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2229.3267211914062,"y":1257.8689575195312,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"eb3b629b.35cb","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'VNFC DG not found for : ' + $vnfcName`\"/>","comments":"","outputs":1,"x":2011.3264770507812,"y":1257.8689575195312,"z":"75c5f17a.eda5d","wires":[["a68d3770.e2f208"]]},{"id":"dec3e93f.1e0318","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1756.3265991210938,"y":1359.8689575195312,"z":"75c5f17a.eda5d","wires":[["4848825e.eb8f0c"]]},{"id":"4848825e.eb8f0c","type":"switchNode","name":"switch_vm_restart_success","xml":"<switch test='`$RestartSuccessVMCount >= 1 and $AAIUpdateSuccessFlag == true`'>\n","comments":"","outputs":1,"x":1997.6597595214844,"y":1403.9799194335938,"z":"75c5f17a.eda5d","wires":[["67708009.ef876","a837107b.524fa"]]},{"id":"a837107b.524fa","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2189.4378662109375,"y":1348.9801025390625,"z":"75c5f17a.eda5d","wires":[["8d01a890.2fbeb8"]]},{"id":"67708009.ef876","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2194.9378051757812,"y":1458.9800415039062,"z":"75c5f17a.eda5d","wires":[["30ca3ed4.6640a2"]]},{"id":"8d01a890.2fbeb8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2359.4378051757812,"y":1348.9800415039062,"z":"75c5f17a.eda5d","wires":[["569739a0.423578","eaec519f.214dc","89bc175a.1df198","8cdac361.a8e5c"]]},{"id":"902f4f1d.36ed3","type":"set","name":"update failed VNFC count","xml":"<set>\n<parameter name=\"FailedVNFCCount\" value=\"`$FailedVNFCCount + 1`\" />\n","comments":"","x":2600.1043701171875,"y":1486.9801025390625,"z":"75c5f17a.eda5d","wires":[]},{"id":"569739a0.423578","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2577.992950439453,"y":1372.9800720214844,"z":"75c5f17a.eda5d","wires":[]},{"id":"30ca3ed4.6640a2","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2355.5486450195312,"y":1459.0912475585938,"z":"75c5f17a.eda5d","wires":[["902f4f1d.36ed3","d4c030eb.6cec9"]]},{"id":"f88e788.8616a88","type":"switchNode","name":"switch_vnfc_restart_success","xml":"<switch test='`$FailedVNFCCount == 0`'>\n","comments":"","outputs":1,"x":993.8818969726562,"y":1542.8690185546875,"z":"75c5f17a.eda5d","wires":[["df26bc01.d7fa1","2bcfdfc8.8bf36"]]},{"id":"df26bc01.d7fa1","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1229.8818969726562,"y":1497.8689575195312,"z":"75c5f17a.eda5d","wires":[["1a89739d.14981c"]]},{"id":"2bcfdfc8.8bf36","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1225.3820190429688,"y":1584.8689575195312,"z":"75c5f17a.eda5d","wires":[["471bece0.a1cdc4"]]},{"id":"1a89739d.14981c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1409.6318969726562,"y":1497.3412475585938,"z":"75c5f17a.eda5d","wires":[["f29375ef.e47478"]]},{"id":"f29375ef.e47478","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1619.1508178710938,"y":1498.3858032226562,"z":"75c5f17a.eda5d","wires":[]},{"id":"471bece0.a1cdc4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1415.6320190429688,"y":1584.3412475585938,"z":"75c5f17a.eda5d","wires":[["ae8ad841.b59cb8"]]},{"id":"ae8ad841.b59cb8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":1616.3817749023438,"y":1583.7857055664062,"z":"75c5f17a.eda5d","wires":[]},{"id":"202a8d89.1b7fe2","type":"set","name":"set Failed VNFC Count","xml":"<set>\n<parameter name='FailedVNFCCount' value='0' />","comments":"","x":963.8819580078125,"y":1104.8689575195312,"z":"75c5f17a.eda5d","wires":[]},{"id":"c060c328.286b4","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Restart successfull for VNFC : ' + $vnfcName `\"/>\n","comments":"","outputs":1,"x":1766.2151489257812,"y":1422.869140625,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"eaec519f.214dc","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2575.215591430664,"y":1211.869140625,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"d4c030eb.6cec9","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Failed to restart all VMs for VNFC : ' + $vnfcName + '. But successfully restarted '+ $RestartSuccessVMCount +' VM/s so continue to next VNFC'`\"/>\n","comments":"","outputs":1,"x":2563.2149963378906,"y":1434.8690795898438,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"2100653b.73255a","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'VNFC DG for ' + $vnfcName + ' resolves to rpc: ' + $Restart.dg_name + ', module: ' + $Restart.dg_module + ', version: ' + $Restart.dg_version `\"/>\n","comments":"","outputs":1,"x":1844.3265991210938,"y":1056.8691711425781,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"31d62dbc.3761f2","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\"/>","comments":"","outputs":1,"x":3125.1048736572266,"y":1339.758056640625,"z":"75c5f17a.eda5d","wires":[["1dd07e2b.67d132"]]},{"id":"1dd07e2b.67d132","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3345.1048736572266,"y":1322.758056640625,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"89bc175a.1df198","type":"switchNode","name":"switch_vm_restart_success","xml":"<switch test='`$RestartSuccessVMCount >= 1`'>\n","comments":"","outputs":1,"x":2569.881607055664,"y":1144.64697265625,"z":"75c5f17a.eda5d","wires":[["572b73b.db5c88c","14fb62d3.c79b1d"]]},{"id":"572b73b.db5c88c","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2801.160171508789,"y":1092.64697265625,"z":"75c5f17a.eda5d","wires":[["7c40c2f3.e0b87c"]]},{"id":"14fb62d3.c79b1d","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2778.6610260009766,"y":1189.6470947265625,"z":"75c5f17a.eda5d","wires":[["f8b19ae6.fe6ca8"]]},{"id":"7c40c2f3.e0b87c","type":"set","name":"Set event message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'AAI update for VNFC ' + $vnfcName + '  failed. '`\" />","comments":"","x":3021.993179321289,"y":1079.6470947265625,"z":"75c5f17a.eda5d","wires":[]},{"id":"f8b19ae6.fe6ca8","type":"set","name":"Set event message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'None of the VMs of VNFC ' + $vnfcName + ' are Restarted. Not proceeding to next VNFC'`\" />","comments":"","x":3001.9925689697266,"y":1168.091796875,"z":"75c5f17a.eda5d","wires":[]},{"id":"6568c60d.62fbd8","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":3152.837677001953,"y":427.8690643310547,"z":"75c5f17a.eda5d","wires":[["13d3844f.cd4abc"]]},{"id":"13d3844f.cd4abc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3444.123321533203,"y":445.2976837158203,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"b53931d8.8a057","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failed to retrieve VNF details from A&amp;AI\"/>\n\n","comments":"","outputs":1,"x":1425.9708557128906,"y":544.8690643310547,"z":"75c5f17a.eda5d","wires":[["7f3210ce.eac0e"]]},{"id":"4fb101a5.38c5a","type":"call","name":"call Generic Restart without Model DG","xml":"<call module='APPC' rpc='Generic_Restart' version='2.0.1' mode='sync' >\n","comments":"","outputs":1,"x":1390.4375,"y":958.8690795898438,"z":"75c5f17a.eda5d","wires":[["a0f3b6b2.4c3988","cdb0db18.a743c8","618f6f6e.254cf"]]},{"id":"a0f3b6b2.4c3988","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1657.21533203125,"y":919.980224609375,"z":"75c5f17a.eda5d","wires":[["3a86e05a.69adc"]]},{"id":"cdb0db18.a743c8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1660.21533203125,"y":960.980224609375,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"618f6f6e.254cf","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1669.2153778076172,"y":1000.9801940917969,"z":"75c5f17a.eda5d","wires":[["bcfdc7ad.06d448"]]},{"id":"bcfdc7ad.06d448","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":1903.21533203125,"y":999.980224609375,"z":"75c5f17a.eda5d","wires":[]},{"id":"3a86e05a.69adc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1848.65966796875,"y":897.980224609375,"z":"75c5f17a.eda5d","wires":[["857666e2.60b258","5400697c.4b3de8"]]},{"id":"5400697c.4b3de8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Restart DG not found\"/>","comments":"","outputs":1,"x":2055.659912109375,"y":847.980224609375,"z":"75c5f17a.eda5d","wires":[["3e41a3d3.9fb8fc"]]},{"id":"857666e2.60b258","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2020.659912109375,"y":947.9802856445312,"z":"75c5f17a.eda5d","wires":[]},{"id":"3e41a3d3.9fb8fc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2330.4375,"y":793.8690795898438,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"8cdac361.a8e5c","type":"switchNode","name":"switch last vnfc","xml":"<switch test='`$secondLastVnfcCounter == $vnfcCounter`'>\n","comments":"","outputs":1,"x":2607.037612915039,"y":1312.074951171875,"z":"75c5f17a.eda5d","wires":[["8f658fcd.5fbcc","7ffa8431.bbdbbc"]]},{"id":"17128b11.be84d5","type":"set","name":"set secondLastVnfcCounter","xml":"<set>\n<parameter name='secondLastVnfcCounter' value='`$vnfcFlowCount - 1`' />\n","comments":"","x":1003.4375,"y":1158.074951171875,"z":"75c5f17a.eda5d","wires":[]},{"id":"8f658fcd.5fbcc","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2772.8373943138176,"y":1258.0749688148517,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"7ffa8431.bbdbbc","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2803.8373943138176,"y":1346.0749688148517,"z":"75c5f17a.eda5d","wires":[["31d62dbc.3761f2"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart_VNFC.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart_VNFC.json
index f5829fdce..8637e7353 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart_VNFC.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart_VNFC.json
@@ -1 +1 @@
-[{"id":"3999b2fb.e7e18e","type":"dgstart","name":"DGSTART","outputs":1,"x":93.80625915527344,"y":73,"z":"4854885a.f23e18","wires":[["b5e49950.85b5a8"]]},{"id":"b5e49950.85b5a8","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":242.80638122558594,"y":71,"z":"4854885a.f23e18","wires":[["bdcf7e7f.4e437"]]},{"id":"bdcf7e7f.4e437","type":"method","name":"Restart_VNFC","xml":"<method rpc='Restart_VNFC' mode='sync'>\n","comments":"","outputs":1,"x":179.8064422607422,"y":195,"z":"4854885a.f23e18","wires":[["a5783312.b327c"]]},{"id":"1bd84ac3.7fcfd5","type":"execute","name":"Resolve_VNFC_Healthcheck_DG","xml":"<execute plugin='org.openecomp.appc.dg.common.DgResolverPlugin' method='resolveDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"HealthCheck\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"HealthCheckDG\" />\n<parameter name=\"DGResolutionType\" value=\"VNFC\" />","comments":"","outputs":1,"x":556.8065338134766,"y":131,"z":"4854885a.f23e18","wires":[["53648e0a.881e6","a7ddd2a4.8b0b1","cbf0e15a.5803f"]]},{"id":"53648e0a.881e6","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":820.8063812255859,"y":73,"z":"4854885a.f23e18","wires":[["725f6041.883d9"]]},{"id":"a7ddd2a4.8b0b1","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":815.8064422607422,"y":153,"z":"4854885a.f23e18","wires":[["97c69f2.728956"]]},{"id":"a5783312.b327c","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"false","comments":"","outputs":1,"x":317.80638122558594,"y":335,"z":"4854885a.f23e18","wires":[["1bd84ac3.7fcfd5","d71f5937.f14218","936e1ac5.afa968"]]},{"id":"d71f5937.f14218","type":"execute","name":"Update AAI ","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Restarting\" />","comments":"","outputs":1,"x":1197.8065185546875,"y":332.00000762939453,"z":"4854885a.f23e18","wires":[["bea680bc.2d4ac","c88e6fc7.c8b1a","b684c3af.4fe9d"]]},{"id":"936e1ac5.afa968","type":"switchNode","name":"Resilence Type ?","xml":"<switch test='`$resilienceType`'>\n","comments":"","outputs":1,"x":488.80633544921875,"y":589.0002136230469,"z":"4854885a.f23e18","wires":[["c45e35f9.dc3078","f08e1f81.6c0c6","2a0b09fd.8888e6"]]},{"id":"c45e35f9.dc3078","type":"outcome","name":"Active_Active","xml":"<outcome value='Active-Active'>\n","comments":"","outputs":1,"x":685.8064117431641,"y":517.0001220703125,"z":"4854885a.f23e18","wires":[["da64233c.b93ea"]]},{"id":"f08e1f81.6c0c6","type":"outcome","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":669.8064727783203,"y":590.0001525878906,"z":"4854885a.f23e18","wires":[["da64233c.b93ea"]]},{"id":"2a0b09fd.8888e6","type":"outcome","name":"Active_Passive","xml":"<outcome value='Active-Passive'>\n","comments":"","outputs":1,"x":699.8064270019531,"y":673.0003356933594,"z":"4854885a.f23e18","wires":[["c062a5d9.ab8188"]]},{"id":"da64233c.b93ea","type":"call","name":"Restart-Active-Active_VNFC","xml":"<call module='APPC' rpc='Restart-Active-Active_VNFC' mode='sync' >\n","comments":"","outputs":1,"x":902.8066558837891,"y":517.0000915527344,"z":"4854885a.f23e18","wires":[["76b0f0de.90c76","31b4e906.be1f16","f041df7c.46d81"]]},{"id":"c062a5d9.ab8188","type":"call","name":"Restart-Active-Passive_VNFC","xml":"<call module='APPC' rpc='Restart-Active-Passive_VNFC' mode='sync' >\n","comments":"","outputs":1,"x":905.8065338134766,"y":673.0001983642578,"z":"4854885a.f23e18","wires":[["76b0f0de.90c76","31b4e906.be1f16","f041df7c.46d81"]]},{"id":"76b0f0de.90c76","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1157.8064880371094,"y":517.0000915527344,"z":"4854885a.f23e18","wires":[["ebbd3602.006ea8"]]},{"id":"31b4e906.be1f16","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1164.8068542480469,"y":592.0001373291016,"z":"4854885a.f23e18","wires":[["b02a2f12.c650d"]]},{"id":"d9102a6.6c83ed8","type":"execute","name":"Update AAI Error","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />","comments":"","outputs":1,"x":1487.8067474365234,"y":424.000244140625,"z":"4854885a.f23e18","wires":[["bea680bc.2d4ac","c88e6fc7.c8b1a","b684c3af.4fe9d"]]},{"id":"5f6c2b04.563a64","type":"execute","name":"Update AAI Success","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Running\" />\n","comments":"","outputs":1,"x":1499.8065032958984,"y":678.0003662109375,"z":"4854885a.f23e18","wires":[["bea680bc.2d4ac","c88e6fc7.c8b1a","b684c3af.4fe9d"]]},{"id":"f2b5d348.d725c","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":1480.8064880371094,"y":831.0003814697266,"z":"4854885a.f23e18","wires":[]},{"id":"725f6041.883d9","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":963.0286712646484,"y":73.41883087158203,"z":"4854885a.f23e18","wires":[["938f579b.411248","7176b2b1.aefe5c","f1e55ee7.25d16","ecd3f4e6.878f68","92cc8ec.5ca637"]]},{"id":"938f579b.411248","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Healthcheck DG resolution plugin not found for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1214.8065643310547,"y":54,"z":"4854885a.f23e18","wires":[]},{"id":"97c69f2.728956","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":963.0286712646484,"y":132.88888549804688,"z":"4854885a.f23e18","wires":[["ebdfd4f1.4d8308","7176b2b1.aefe5c","f1e55ee7.25d16","ecd3f4e6.878f68","92cc8ec.5ca637"]]},{"id":"ebdfd4f1.4d8308","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Error while resolving Healthcheck DG for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1225.0286102294922,"y":95.88888549804688,"z":"4854885a.f23e18","wires":[]},{"id":"7176b2b1.aefe5c","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1206.5973358154297,"y":133.18878173828125,"z":"4854885a.f23e18","wires":[[]]},{"id":"f1e55ee7.25d16","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1247.4647064208984,"y":172.37603759765625,"z":"4854885a.f23e18","wires":[[]]},{"id":"ecd3f4e6.878f68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value=\"`$error-message`\"/>","comments":"","x":1216.5843353271484,"y":250.35894775390625,"z":"4854885a.f23e18","wires":[]},{"id":"8c69089c.629f08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":1499.806625366211,"y":633.00048828125,"z":"4854885a.f23e18","wires":[]},{"id":"b02a2f12.c650d","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1311.2509460449219,"y":591.0002593994141,"z":"4854885a.f23e18","wires":[["d9102a6.6c83ed8","8c69089c.629f08","518c8bec.70b344"]]},{"id":"51555c54.d61924","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1294.2510223388672,"y":673.0003356933594,"z":"4854885a.f23e18","wires":[["5f6c2b04.563a64","f2b5d348.d725c","39261310.3b1cac","e457098a.bbf808"]]},{"id":"39261310.3b1cac","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'VNFC restarted successfully : ' + $vnfcName`\"/>\n","comments":"","outputs":1,"x":1488.695297241211,"y":782.888916015625,"z":"4854885a.f23e18","wires":[[]]},{"id":"ebbd3602.006ea8","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1288.5841827392578,"y":516.8889465332031,"z":"4854885a.f23e18","wires":[["8c69089c.629f08","c16bef1.90f251","d9102a6.6c83ed8","518c8bec.70b344","ed0a15aa.d0fb28"]]},{"id":"c16bef1.90f251","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'VNFC Restart DG not found for resilience type : ' + $resilienceType`\" />","comments":"","outputs":1,"x":1530.5840911865234,"y":527.888916015625,"z":"4854885a.f23e18","wires":[[]]},{"id":"bea680bc.2d4ac","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1837.9176025390625,"y":220.11121368408203,"z":"4854885a.f23e18","wires":[["355e292.0ccebd6"]]},{"id":"c88e6fc7.c8b1a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1832.9173583984375,"y":274.11112213134766,"z":"4854885a.f23e18","wires":[["bc52d02f.83b3b"]]},{"id":"b684c3af.4fe9d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1792.9172668457031,"y":371.11112213134766,"z":"4854885a.f23e18","wires":[["564492cb.9e00cc"]]},{"id":"564492cb.9e00cc","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1919.0279541015625,"y":371.0000991821289,"z":"4854885a.f23e18","wires":[["8bd18854.c20b98","f0c03ee4.fd60e"]]},{"id":"8bd18854.c20b98","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2081.0286865234375,"y":324.0000991821289,"z":"4854885a.f23e18","wires":[["74288e2b.a3955"]]},{"id":"f0c03ee4.fd60e","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2078.029052734375,"y":403.0000991821289,"z":"4854885a.f23e18","wires":[["7d7bf29.5cc980c"]]},{"id":"74288e2b.a3955","type":"block","name":"block","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":2230.028564453125,"y":324.0000991821289,"z":"4854885a.f23e18","wires":[["3589aab3.2a6646","e9478caf.5709c","51856197.1ce12"]]},{"id":"7d7bf29.5cc980c","type":"block","name":"block","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":2218.028564453125,"y":370.0000991821289,"z":"4854885a.f23e18","wires":[["3589aab3.2a6646","8a498524.f57948","51856197.1ce12"]]},{"id":"3589aab3.2a6646","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2438.0296478271484,"y":538.0001220703125,"z":"4854885a.f23e18","wires":[]},{"id":"f041df7c.46d81","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1155.8069610595703,"y":673.0000915527344,"z":"4854885a.f23e18","wires":[["51555c54.d61924"]]},{"id":"bc52d02f.83b3b","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2241.806396484375,"y":272.47013092041016,"z":"4854885a.f23e18","wires":[["3589aab3.2a6646","f0d258f1.eac3c8"]]},{"id":"355e292.0ccebd6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2241.806396484375,"y":221.00012969970703,"z":"4854885a.f23e18","wires":[["3589aab3.2a6646","d0f8911a.f3c29","51856197.1ce12"]]},{"id":"d0f8911a.f3c29","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>\n\n","comments":"","outputs":1,"x":2491.6238861083984,"y":118.484375,"z":"4854885a.f23e18","wires":[[]]},{"id":"f0d258f1.eac3c8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>","comments":"","outputs":1,"x":2476.6241302490234,"y":224.484375,"z":"4854885a.f23e18","wires":[[]]},{"id":"e9478caf.5709c","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNF details in A&amp;AI for : '+ $vnfcName`\"/>\n\n","comments":"","outputs":1,"x":2453.6240844726562,"y":279.48438262939453,"z":"4854885a.f23e18","wires":[[]]},{"id":"8a498524.f57948","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>","comments":"","outputs":1,"x":2453.6241302490234,"y":326.484375,"z":"4854885a.f23e18","wires":[[]]},{"id":"e457098a.bbf808","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='true' />\n","comments":"","x":1499.8062591552734,"y":725,"z":"4854885a.f23e18","wires":[]},{"id":"518c8bec.70b344","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='true' />\n","comments":"","x":1516.3062591552734,"y":477,"z":"4854885a.f23e18","wires":[]},{"id":"51856197.1ce12","type":"execute","name":"Report_Error_To_DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2460.8062591552734,"y":399.515625,"z":"4854885a.f23e18","wires":[[]]},{"id":"ed0a15aa.d0fb28","type":"execute","name":"Report_Error_To_DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1536.3062591552734,"y":582.515625,"z":"4854885a.f23e18","wires":[[]]},{"id":"92cc8ec.5ca637","type":"execute","name":"Report_Error_To_DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1238.3062591552734,"y":210.515625,"z":"4854885a.f23e18","wires":[[]]},{"id":"86490b1e.e7c3e8","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Hleathchek DG resolved to : ' + $HealthCheckDG.dg_name`\"/>\n","comments":"","outputs":1,"x":910.8062591552734,"y":220.515625,"z":"4854885a.f23e18","wires":[[]]},{"id":"cbf0e15a.5803f","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":742.8062591552734,"y":228.51560711860702,"z":"4854885a.f23e18","wires":[["86490b1e.e7c3e8"]]}]
+[{"id":"3999b2fb.e7e18e","type":"dgstart","name":"DGSTART","outputs":1,"x":93.80625915527344,"y":73,"z":"4854885a.f23e18","wires":[["b5e49950.85b5a8"]]},{"id":"b5e49950.85b5a8","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":242.80638122558594,"y":71,"z":"4854885a.f23e18","wires":[["bdcf7e7f.4e437"]]},{"id":"bdcf7e7f.4e437","type":"method","name":"Restart_VNFC","xml":"<method rpc='Restart_VNFC' mode='sync'>\n","comments":"","outputs":1,"x":179.8064422607422,"y":195,"z":"4854885a.f23e18","wires":[["a5783312.b327c"]]},{"id":"1bd84ac3.7fcfd5","type":"execute","name":"Resolve_VNFC_Healthcheck_DG","xml":"<execute plugin='org.onap.appc.dg.common.DgResolverPlugin' method='resolveDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"HealthCheck\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"HealthCheckDG\" />\n<parameter name=\"DGResolutionType\" value=\"VNFC\" />","comments":"","outputs":1,"x":556.8065338134766,"y":131,"z":"4854885a.f23e18","wires":[["53648e0a.881e6","a7ddd2a4.8b0b1","cbf0e15a.5803f"]]},{"id":"53648e0a.881e6","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":820.8063812255859,"y":73,"z":"4854885a.f23e18","wires":[["725f6041.883d9"]]},{"id":"a7ddd2a4.8b0b1","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":815.8064422607422,"y":153,"z":"4854885a.f23e18","wires":[["97c69f2.728956"]]},{"id":"a5783312.b327c","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"false","comments":"","outputs":1,"x":317.80638122558594,"y":335,"z":"4854885a.f23e18","wires":[["1bd84ac3.7fcfd5","d71f5937.f14218","936e1ac5.afa968"]]},{"id":"d71f5937.f14218","type":"execute","name":"Update AAI ","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Restarting\" />","comments":"","outputs":1,"x":1197.8065185546875,"y":332.00000762939453,"z":"4854885a.f23e18","wires":[["bea680bc.2d4ac","c88e6fc7.c8b1a","b684c3af.4fe9d"]]},{"id":"936e1ac5.afa968","type":"switchNode","name":"Resilence Type ?","xml":"<switch test='`$resilienceType`'>\n","comments":"","outputs":1,"x":488.80633544921875,"y":589.0002136230469,"z":"4854885a.f23e18","wires":[["c45e35f9.dc3078","f08e1f81.6c0c6","2a0b09fd.8888e6"]]},{"id":"c45e35f9.dc3078","type":"outcome","name":"Active_Active","xml":"<outcome value='Active-Active'>\n","comments":"","outputs":1,"x":685.8064117431641,"y":517.0001220703125,"z":"4854885a.f23e18","wires":[["da64233c.b93ea"]]},{"id":"f08e1f81.6c0c6","type":"outcome","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":669.8064727783203,"y":590.0001525878906,"z":"4854885a.f23e18","wires":[["da64233c.b93ea"]]},{"id":"2a0b09fd.8888e6","type":"outcome","name":"Active_Passive","xml":"<outcome value='Active-Passive'>\n","comments":"","outputs":1,"x":699.8064270019531,"y":673.0003356933594,"z":"4854885a.f23e18","wires":[["c062a5d9.ab8188"]]},{"id":"da64233c.b93ea","type":"call","name":"Restart-Active-Active_VNFC","xml":"<call module='APPC' rpc='Restart-Active-Active_VNFC' mode='sync' >\n","comments":"","outputs":1,"x":902.8066558837891,"y":517.0000915527344,"z":"4854885a.f23e18","wires":[["76b0f0de.90c76","31b4e906.be1f16","f041df7c.46d81"]]},{"id":"c062a5d9.ab8188","type":"call","name":"Restart-Active-Passive_VNFC","xml":"<call module='APPC' rpc='Restart-Active-Passive_VNFC' mode='sync' >\n","comments":"","outputs":1,"x":905.8065338134766,"y":673.0001983642578,"z":"4854885a.f23e18","wires":[["76b0f0de.90c76","31b4e906.be1f16","f041df7c.46d81"]]},{"id":"76b0f0de.90c76","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1157.8064880371094,"y":517.0000915527344,"z":"4854885a.f23e18","wires":[["ebbd3602.006ea8"]]},{"id":"31b4e906.be1f16","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1164.8068542480469,"y":592.0001373291016,"z":"4854885a.f23e18","wires":[["b02a2f12.c650d"]]},{"id":"d9102a6.6c83ed8","type":"execute","name":"Update AAI Error","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />","comments":"","outputs":1,"x":1487.8067474365234,"y":424.000244140625,"z":"4854885a.f23e18","wires":[["bea680bc.2d4ac","c88e6fc7.c8b1a","b684c3af.4fe9d"]]},{"id":"5f6c2b04.563a64","type":"execute","name":"Update AAI Success","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Running\" />\n","comments":"","outputs":1,"x":1499.8065032958984,"y":678.0003662109375,"z":"4854885a.f23e18","wires":[["bea680bc.2d4ac","c88e6fc7.c8b1a","b684c3af.4fe9d"]]},{"id":"f2b5d348.d725c","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":1480.8064880371094,"y":831.0003814697266,"z":"4854885a.f23e18","wires":[]},{"id":"725f6041.883d9","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":963.0286712646484,"y":73.41883087158203,"z":"4854885a.f23e18","wires":[["938f579b.411248","7176b2b1.aefe5c","f1e55ee7.25d16","ecd3f4e6.878f68","92cc8ec.5ca637"]]},{"id":"938f579b.411248","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Healthcheck DG resolution plugin not found for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1214.8065643310547,"y":54,"z":"4854885a.f23e18","wires":[]},{"id":"97c69f2.728956","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":963.0286712646484,"y":132.88888549804688,"z":"4854885a.f23e18","wires":[["ebdfd4f1.4d8308","7176b2b1.aefe5c","f1e55ee7.25d16","ecd3f4e6.878f68","92cc8ec.5ca637"]]},{"id":"ebdfd4f1.4d8308","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Error while resolving Healthcheck DG for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1225.0286102294922,"y":95.88888549804688,"z":"4854885a.f23e18","wires":[]},{"id":"7176b2b1.aefe5c","type":"record","name":"Log event","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1206.5973358154297,"y":133.18878173828125,"z":"4854885a.f23e18","wires":[[]]},{"id":"f1e55ee7.25d16","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1247.4647064208984,"y":172.37603759765625,"z":"4854885a.f23e18","wires":[[]]},{"id":"ecd3f4e6.878f68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value=\"`$error-message`\"/>","comments":"","x":1216.5843353271484,"y":250.35894775390625,"z":"4854885a.f23e18","wires":[]},{"id":"8c69089c.629f08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":1499.806625366211,"y":633.00048828125,"z":"4854885a.f23e18","wires":[]},{"id":"b02a2f12.c650d","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1311.2509460449219,"y":591.0002593994141,"z":"4854885a.f23e18","wires":[["d9102a6.6c83ed8","8c69089c.629f08","518c8bec.70b344"]]},{"id":"51555c54.d61924","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1294.2510223388672,"y":673.0003356933594,"z":"4854885a.f23e18","wires":[["5f6c2b04.563a64","f2b5d348.d725c","39261310.3b1cac","e457098a.bbf808"]]},{"id":"39261310.3b1cac","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'VNFC restarted successfully : ' + $vnfcName`\"/>\n","comments":"","outputs":1,"x":1488.695297241211,"y":782.888916015625,"z":"4854885a.f23e18","wires":[[]]},{"id":"ebbd3602.006ea8","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1288.5841827392578,"y":516.8889465332031,"z":"4854885a.f23e18","wires":[["8c69089c.629f08","c16bef1.90f251","d9102a6.6c83ed8","518c8bec.70b344","ed0a15aa.d0fb28"]]},{"id":"c16bef1.90f251","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'VNFC Restart DG not found for resilience type : ' + $resilienceType`\" />","comments":"","outputs":1,"x":1530.5840911865234,"y":527.888916015625,"z":"4854885a.f23e18","wires":[[]]},{"id":"bea680bc.2d4ac","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1837.9176025390625,"y":220.11121368408203,"z":"4854885a.f23e18","wires":[["355e292.0ccebd6"]]},{"id":"c88e6fc7.c8b1a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1832.9173583984375,"y":274.11112213134766,"z":"4854885a.f23e18","wires":[["bc52d02f.83b3b"]]},{"id":"b684c3af.4fe9d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1792.9172668457031,"y":371.11112213134766,"z":"4854885a.f23e18","wires":[["564492cb.9e00cc"]]},{"id":"564492cb.9e00cc","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1919.0279541015625,"y":371.0000991821289,"z":"4854885a.f23e18","wires":[["8bd18854.c20b98","f0c03ee4.fd60e"]]},{"id":"8bd18854.c20b98","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2081.0286865234375,"y":324.0000991821289,"z":"4854885a.f23e18","wires":[["74288e2b.a3955"]]},{"id":"f0c03ee4.fd60e","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2078.029052734375,"y":403.0000991821289,"z":"4854885a.f23e18","wires":[["7d7bf29.5cc980c"]]},{"id":"74288e2b.a3955","type":"block","name":"block","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":2230.028564453125,"y":324.0000991821289,"z":"4854885a.f23e18","wires":[["3589aab3.2a6646","e9478caf.5709c","51856197.1ce12"]]},{"id":"7d7bf29.5cc980c","type":"block","name":"block","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":2218.028564453125,"y":370.0000991821289,"z":"4854885a.f23e18","wires":[["3589aab3.2a6646","8a498524.f57948","51856197.1ce12"]]},{"id":"3589aab3.2a6646","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2438.0296478271484,"y":538.0001220703125,"z":"4854885a.f23e18","wires":[]},{"id":"f041df7c.46d81","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1155.8069610595703,"y":673.0000915527344,"z":"4854885a.f23e18","wires":[["51555c54.d61924"]]},{"id":"bc52d02f.83b3b","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2241.806396484375,"y":272.47013092041016,"z":"4854885a.f23e18","wires":[["3589aab3.2a6646","f0d258f1.eac3c8"]]},{"id":"355e292.0ccebd6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2241.806396484375,"y":221.00012969970703,"z":"4854885a.f23e18","wires":[["3589aab3.2a6646","d0f8911a.f3c29","51856197.1ce12"]]},{"id":"d0f8911a.f3c29","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>\n\n","comments":"","outputs":1,"x":2491.6238861083984,"y":118.484375,"z":"4854885a.f23e18","wires":[[]]},{"id":"f0d258f1.eac3c8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>","comments":"","outputs":1,"x":2476.6241302490234,"y":224.484375,"z":"4854885a.f23e18","wires":[[]]},{"id":"e9478caf.5709c","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNF details in A&amp;AI for : '+ $vnfcName`\"/>\n\n","comments":"","outputs":1,"x":2453.6240844726562,"y":279.48438262939453,"z":"4854885a.f23e18","wires":[[]]},{"id":"8a498524.f57948","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>","comments":"","outputs":1,"x":2453.6241302490234,"y":326.484375,"z":"4854885a.f23e18","wires":[[]]},{"id":"e457098a.bbf808","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='true' />\n","comments":"","x":1499.8062591552734,"y":725,"z":"4854885a.f23e18","wires":[]},{"id":"518c8bec.70b344","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='true' />\n","comments":"","x":1516.3062591552734,"y":477,"z":"4854885a.f23e18","wires":[]},{"id":"51856197.1ce12","type":"execute","name":"Report_Error_To_DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2460.8062591552734,"y":399.515625,"z":"4854885a.f23e18","wires":[[]]},{"id":"ed0a15aa.d0fb28","type":"execute","name":"Report_Error_To_DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1536.3062591552734,"y":582.515625,"z":"4854885a.f23e18","wires":[[]]},{"id":"92cc8ec.5ca637","type":"execute","name":"Report_Error_To_DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1238.3062591552734,"y":210.515625,"z":"4854885a.f23e18","wires":[[]]},{"id":"86490b1e.e7c3e8","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Hleathchek DG resolved to : ' + $HealthCheckDG.dg_name`\"/>\n","comments":"","outputs":1,"x":910.8062591552734,"y":220.515625,"z":"4854885a.f23e18","wires":[[]]},{"id":"cbf0e15a.5803f","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":742.8062591552734,"y":228.51560711860702,"z":"4854885a.f23e18","wires":[["86490b1e.e7c3e8"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StartApplication_VM_vSCP.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StartApplication_VM_vSCP.json
index a38de326f..d0bcc7d21 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StartApplication_VM_vSCP.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StartApplication_VM_vSCP.json
@@ -1 +1 @@
-[{"id":"bab79b58.ed1388","type":"dgstart","name":"DGSTART","outputs":1,"x":108.88888549804688,"y":71.88888549804688,"z":"98dae834.cf1368","wires":[["8e43a11f.9f02f"]]},{"id":"8e43a11f.9f02f","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":301.8889617919922,"y":71.45555877685547,"z":"98dae834.cf1368","wires":[["e154cdd4.86eff"]]},{"id":"e154cdd4.86eff","type":"method","name":"vSCP Start Application","xml":"<method rpc='StartApplication_VM_vSCP' mode='sync'>\n","comments":"","outputs":1,"x":242.63894653320312,"y":183.70553588867188,"z":"98dae834.cf1368","wires":[["d2374304.9bac6"]]},{"id":"5fb00be2.55cd14","type":"execute","name":"Start Application ","xml":"<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='startNode'>\n<parameter name=\"node-name\" value=\"`$node-name`\" />\n<parameter name=\"vm-url\" value=\"`$start-vm-url`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />","comments":"","outputs":1,"x":575.470588684082,"y":548.2461242675781,"z":"98dae834.cf1368","wires":[["ac3d6e4.2692c9","d3d3e78a.0af1a8"]]},{"id":"ac3d6e4.2692c9","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":779.089485168457,"y":628.3890686035156,"z":"98dae834.cf1368","wires":[["232b6f89.0c20d"]]},{"id":"d3d3e78a.0af1a8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":784.444221496582,"y":455.4604187011719,"z":"98dae834.cf1368","wires":[["ae3b9746.49e278"]]},{"id":"232b6f89.0c20d","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":966.873176574707,"y":628.3175354003906,"z":"98dae834.cf1368","wires":[["723d563d.137518","5235d365.f9647c","d4e4f8ab.aa9cb8"]]},{"id":"723d563d.137518","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1175.8739395141602,"y":630.2221984863281,"z":"98dae834.cf1368","wires":[[]]},{"id":"d2374304.9bac6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":321.4443359375,"y":285.4603271484375,"z":"98dae834.cf1368","wires":[["5fb00be2.55cd14","4151a0ce.20144","6c8ebab7.6be074"]]},{"id":"5235d365.f9647c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1185.8893203735352,"y":676.4602355957031,"z":"98dae834.cf1368","wires":[]},{"id":"d4e4f8ab.aa9cb8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Failure while starting the server: ' + $start-vm-url + ' at Application level.'`\"/>\n\n","comments":"","x":1201.6667861938477,"y":581.1110534667969,"z":"98dae834.cf1368","wires":[]},{"id":"ae3b9746.49e278","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":969.111213684082,"y":454.8889465332031,"z":"98dae834.cf1368","wires":[["3461b18d.58599e","da6895a5.557dd8","8734b67.1dc5248"]]},{"id":"3461b18d.58599e","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\"  value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1191.166145324707,"y":453.9555969238281,"z":"98dae834.cf1368","wires":[[]]},{"id":"da6895a5.557dd8","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Start succeeded for the server : ' + $start-vm-url`\"/>\n\n\n","comments":"","x":1208.166145324707,"y":406.9556579589844,"z":"98dae834.cf1368","wires":[]},{"id":"8734b67.1dc5248","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":1187.9995193481445,"y":502.888916015625,"z":"98dae834.cf1368","wires":[]},{"id":"67ff62e7.beb08c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>","comments":"","x":1151.5073318481445,"y":335.5582580566406,"z":"98dae834.cf1368","wires":[]},{"id":"4151a0ce.20144","type":"switchNode","name":"connection-details empty ?","xml":"<switch test='`length($connection-details) == 0`'>\n\n\n","comments":"","outputs":1,"x":622.888916015625,"y":124.20541381835938,"z":"98dae834.cf1368","wires":[["b3b5bdd2.0b38"]]},{"id":"b3b5bdd2.0b38","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":820.888916015625,"y":124.20541381835938,"z":"98dae834.cf1368","wires":[["cc11913a.48f44"]]},{"id":"cc11913a.48f44","type":"execute","name":"Retrieve connection details","xml":"<execute plugin='org.openecomp.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$vnf.type`\" />\n","comments":"","outputs":1,"x":1057.8887939453125,"y":123.45547485351562,"z":"98dae834.cf1368","wires":[["391d6e3c.8a72d2"]]},{"id":"391d6e3c.8a72d2","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1289.888916015625,"y":123.45541381835938,"z":"98dae834.cf1368","wires":[["8f9ebcf.1ede04"]]},{"id":"8f9ebcf.1ede04","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1468.1195068359375,"y":123.30166625976562,"z":"98dae834.cf1368","wires":[["1d1d1d57.9e78e3","d0e4817e.f3eeb","23f88ee8.fe2732"]]},{"id":"1d1d1d57.9e78e3","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'Failed to retrieve connection details for vnfc : ' + $vnfcType`\"/> ","comments":"","x":1705.8888244628906,"y":62.455535888671875,"z":"98dae834.cf1368","wires":[]},{"id":"d0e4817e.f3eeb","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1675.888916015625,"y":122.45541381835938,"z":"98dae834.cf1368","wires":[[]]},{"id":"23f88ee8.fe2732","type":"returnFailure","name":"return failure","xml":"<return status='failure'>","comments":"","x":1690.7378845214844,"y":181.97103881835938,"z":"98dae834.cf1368","wires":[]},{"id":"6c8ebab7.6be074","type":"execute","name":"Get Node Name","xml":"<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='getNodeName'>\n<parameter name=\"vm-url\" value=\"`$start-vm-url`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n","comments":"","outputs":1,"x":595.888916015625,"y":285.45556640625,"z":"98dae834.cf1368","wires":[["1a21ec6a.914c44"]]},{"id":"1a21ec6a.914c44","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":771.888916015625,"y":285.45556640625,"z":"98dae834.cf1368","wires":[["3c007341.3351ec"]]},{"id":"3c007341.3351ec","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":926.888916015625,"y":284.8888931274414,"z":"98dae834.cf1368","wires":[["e857a16c.03b3b","3b7e8926.862e86","67ff62e7.beb08c"]]},{"id":"e857a16c.03b3b","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'Failed to retrieve node name for server : ' + $start-vm-url`\"/> ","comments":"","x":1163.6582336425781,"y":228.04276275634766,"z":"98dae834.cf1368","wires":[]},{"id":"3b7e8926.862e86","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1134.6583251953125,"y":284.04264068603516,"z":"98dae834.cf1368","wires":[[]]}]
+[{"id":"bab79b58.ed1388","type":"dgstart","name":"DGSTART","outputs":1,"x":108.88888549804688,"y":71.88888549804688,"z":"98dae834.cf1368","wires":[["8e43a11f.9f02f"]]},{"id":"8e43a11f.9f02f","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":301.8889617919922,"y":71.45555877685547,"z":"98dae834.cf1368","wires":[["e154cdd4.86eff"]]},{"id":"e154cdd4.86eff","type":"method","name":"vSCP Start Application","xml":"<method rpc='StartApplication_VM_vSCP' mode='sync'>\n","comments":"","outputs":1,"x":242.63894653320312,"y":183.70553588867188,"z":"98dae834.cf1368","wires":[["d2374304.9bac6"]]},{"id":"5fb00be2.55cd14","type":"execute","name":"Start Application ","xml":"<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='startNode'>\n<parameter name=\"node-name\" value=\"`$node-name`\" />\n<parameter name=\"vm-url\" value=\"`$start-vm-url`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />","comments":"","outputs":1,"x":575.470588684082,"y":548.2461242675781,"z":"98dae834.cf1368","wires":[["ac3d6e4.2692c9","d3d3e78a.0af1a8"]]},{"id":"ac3d6e4.2692c9","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":779.089485168457,"y":628.3890686035156,"z":"98dae834.cf1368","wires":[["232b6f89.0c20d"]]},{"id":"d3d3e78a.0af1a8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":784.444221496582,"y":455.4604187011719,"z":"98dae834.cf1368","wires":[["ae3b9746.49e278"]]},{"id":"232b6f89.0c20d","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":966.873176574707,"y":628.3175354003906,"z":"98dae834.cf1368","wires":[["723d563d.137518","5235d365.f9647c","d4e4f8ab.aa9cb8"]]},{"id":"723d563d.137518","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1175.8739395141602,"y":630.2221984863281,"z":"98dae834.cf1368","wires":[[]]},{"id":"d2374304.9bac6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":321.4443359375,"y":285.4603271484375,"z":"98dae834.cf1368","wires":[["5fb00be2.55cd14","4151a0ce.20144","6c8ebab7.6be074"]]},{"id":"5235d365.f9647c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1185.8893203735352,"y":676.4602355957031,"z":"98dae834.cf1368","wires":[]},{"id":"d4e4f8ab.aa9cb8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Failure while starting the server: ' + $start-vm-url + ' at Application level.'`\"/>\n\n","comments":"","x":1201.6667861938477,"y":581.1110534667969,"z":"98dae834.cf1368","wires":[]},{"id":"ae3b9746.49e278","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":969.111213684082,"y":454.8889465332031,"z":"98dae834.cf1368","wires":[["3461b18d.58599e","da6895a5.557dd8","8734b67.1dc5248"]]},{"id":"3461b18d.58599e","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\"  value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1191.166145324707,"y":453.9555969238281,"z":"98dae834.cf1368","wires":[[]]},{"id":"da6895a5.557dd8","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Start succeeded for the server : ' + $start-vm-url`\"/>\n\n\n","comments":"","x":1208.166145324707,"y":406.9556579589844,"z":"98dae834.cf1368","wires":[]},{"id":"8734b67.1dc5248","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":1187.9995193481445,"y":502.888916015625,"z":"98dae834.cf1368","wires":[]},{"id":"67ff62e7.beb08c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>","comments":"","x":1151.5073318481445,"y":335.5582580566406,"z":"98dae834.cf1368","wires":[]},{"id":"4151a0ce.20144","type":"switchNode","name":"connection-details empty ?","xml":"<switch test='`length($connection-details) == 0`'>\n\n\n","comments":"","outputs":1,"x":622.888916015625,"y":124.20541381835938,"z":"98dae834.cf1368","wires":[["b3b5bdd2.0b38"]]},{"id":"b3b5bdd2.0b38","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":820.888916015625,"y":124.20541381835938,"z":"98dae834.cf1368","wires":[["cc11913a.48f44"]]},{"id":"cc11913a.48f44","type":"execute","name":"Retrieve connection details","xml":"<execute plugin='org.onap.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$vnf.type`\" />\n","comments":"","outputs":1,"x":1057.8887939453125,"y":123.45547485351562,"z":"98dae834.cf1368","wires":[["391d6e3c.8a72d2"]]},{"id":"391d6e3c.8a72d2","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1289.888916015625,"y":123.45541381835938,"z":"98dae834.cf1368","wires":[["8f9ebcf.1ede04"]]},{"id":"8f9ebcf.1ede04","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1468.1195068359375,"y":123.30166625976562,"z":"98dae834.cf1368","wires":[["1d1d1d57.9e78e3","d0e4817e.f3eeb","23f88ee8.fe2732"]]},{"id":"1d1d1d57.9e78e3","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'Failed to retrieve connection details for vnfc : ' + $vnfcType`\"/> ","comments":"","x":1705.8888244628906,"y":62.455535888671875,"z":"98dae834.cf1368","wires":[]},{"id":"d0e4817e.f3eeb","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1675.888916015625,"y":122.45541381835938,"z":"98dae834.cf1368","wires":[[]]},{"id":"23f88ee8.fe2732","type":"returnFailure","name":"return failure","xml":"<return status='failure'>","comments":"","x":1690.7378845214844,"y":181.97103881835938,"z":"98dae834.cf1368","wires":[]},{"id":"6c8ebab7.6be074","type":"execute","name":"Get Node Name","xml":"<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='getNodeName'>\n<parameter name=\"vm-url\" value=\"`$start-vm-url`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n","comments":"","outputs":1,"x":595.888916015625,"y":285.45556640625,"z":"98dae834.cf1368","wires":[["1a21ec6a.914c44"]]},{"id":"1a21ec6a.914c44","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":771.888916015625,"y":285.45556640625,"z":"98dae834.cf1368","wires":[["3c007341.3351ec"]]},{"id":"3c007341.3351ec","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":926.888916015625,"y":284.8888931274414,"z":"98dae834.cf1368","wires":[["e857a16c.03b3b","3b7e8926.862e86","67ff62e7.beb08c"]]},{"id":"e857a16c.03b3b","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'Failed to retrieve node name for server : ' + $start-vm-url`\"/> ","comments":"","x":1163.6582336425781,"y":228.04276275634766,"z":"98dae834.cf1368","wires":[]},{"id":"3b7e8926.862e86","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1134.6583251953125,"y":284.04264068603516,"z":"98dae834.cf1368","wires":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Start_VM.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Start_VM.json
index 2592dfaf6..0ddff5b4a 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Start_VM.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Start_VM.json
@@ -112,7 +112,7 @@
     "id": "c47aa6c9.8c9378",
     "type": "execute",
     "name": "Resolve Application Start DG",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DgResolverPlugin' method='resolveDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"Start_Application\" />\n<parameter name=\"api-ver\" value=\"2.0.0\" />\n<parameter name=\"prefix\" value=\"ApplicationStart\" />\n<parameter name=\"DGResolutionType\" value=\"VNFC\" />\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DgResolverPlugin' method='resolveDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"Start_Application\" />\n<parameter name=\"api-ver\" value=\"2.0.0\" />\n<parameter name=\"prefix\" value=\"ApplicationStart\" />\n<parameter name=\"DGResolutionType\" value=\"VNFC\" />\n",
     "comments": "",
     "outputs": 1,
     "x": 349,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Start_VNF.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Start_VNF.json
index ea302be2e..cb4001c5e 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Start_VNF.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Start_VNF.json
@@ -1 +1 @@
-[{"id":"299910f3.66048","type":"dgstart","name":"DGSTART","outputs":1,"x":108.88888549804688,"y":43.888885498046875,"z":"5c4aa102.e34ff","wires":[["4c139e83.c4319"]]},{"id":"4c139e83.c4319","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":283.8888854980469,"y":42.888885498046875,"z":"5c4aa102.e34ff","wires":[["bfb729c1.a8e6c8"]]},{"id":"bfb729c1.a8e6c8","type":"method","name":"Start_VNF","xml":"<method rpc='Start_VNF' mode='sync'>\n","comments":"","outputs":1,"x":134.88894653320312,"y":134.88888549804688,"z":"5c4aa102.e34ff","wires":[["6ec09531.21892c"]]},{"id":"3c8b6771.447f48","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":413.88922119140625,"y":160.88888549804688,"z":"5c4aa102.e34ff","wires":[["c9c46d3e.b8431"]]},{"id":"50133d6a.76f334","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":412.88922119140625,"y":110.88888549804688,"z":"5c4aa102.e34ff","wires":[["c9c46d3e.b8431"]]},{"id":"29442299.20a70e","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":406.88922119140625,"y":215.88890075683594,"z":"5c4aa102.e34ff","wires":[["c9c46d3e.b8431"]]},{"id":"6ec09531.21892c","type":"execute","name":"Set payload in Context","xml":"<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />","comments":"","outputs":1,"x":186.88897705078125,"y":214.888916015625,"z":"5c4aa102.e34ff","wires":[["3c8b6771.447f48","50133d6a.76f334","29442299.20a70e","c1780f4e.03327"]]},{"id":"c1780f4e.03327","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":412.888916015625,"y":278.888916015625,"z":"5c4aa102.e34ff","wires":[["2f541c3b.cee8b4"]]},{"id":"2f541c3b.cee8b4","type":"execute","name":"Get Vnf Hierarchy","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":584.5555725097656,"y":278.888916015625,"z":"5c4aa102.e34ff","wires":[["ef6bc2fa.faa29","9bba9c55.7f49d"]]},{"id":"9bba9c55.7f49d","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":772.5556335449219,"y":237.888916015625,"z":"5c4aa102.e34ff","wires":[["2e270a1.07ca7f6"]]},{"id":"ef6bc2fa.faa29","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":760.5555877685547,"y":315.88885498046875,"z":"5c4aa102.e34ff","wires":[["1e6364a8.66f95b"]]},{"id":"1e6364a8.66f95b","type":"switchNode","name":"getVnfHierarchy_result ?","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":921.5555114746094,"y":384,"z":"5c4aa102.e34ff","wires":[["c8100453.9d35b8","99c4ec1e.ee054"]]},{"id":"c8100453.9d35b8","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1128.5558471679688,"y":445.0000591278076,"z":"5c4aa102.e34ff","wires":[["3ff31edf.ede1c2"]]},{"id":"99c4ec1e.ee054","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1127.5557556152344,"y":324,"z":"5c4aa102.e34ff","wires":[["2e270a1.07ca7f6"]]},{"id":"3ff31edf.ede1c2","type":"switchNode","name":"VNF_VMCount ?","xml":"<switch test='`$VNF.VMCount`'>","comments":"","outputs":1,"x":1162.5558471679688,"y":513.1109294891357,"z":"5c4aa102.e34ff","wires":[["1416e132.1c0aaf","eb4fad9c.bce16"]]},{"id":"1416e132.1c0aaf","type":"outcome","name":"0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1348.5554809570312,"y":446.11108207702637,"z":"5c4aa102.e34ff","wires":[["b17b296.f6d01d8"]]},{"id":"eb4fad9c.bce16","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1268.5554809570312,"y":579.1110515594482,"z":"5c4aa102.e34ff","wires":[["11321978.17eea7"]]},{"id":"11321978.17eea7","type":"execute","name":"Get Execution Flow","xml":"<execute plugin='org.openecomp.appc.dg.common.VnfExecutionFlow' method='getVnfExecutionFlowData' >\n<parameter name=\"DependencyType\" value='RESOURCE' />\n<parameter name=\"FlowStrategy\" value='FORWARD' />\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfVersion\" value='`$vnf.version`' />\n","comments":"","outputs":1,"x":1326.5554809570312,"y":654.2222576141357,"z":"5c4aa102.e34ff","wires":[["c56fb547.a74a68","2e8596f1.80158a"]]},{"id":"c56fb547.a74a68","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1518.5552978515625,"y":654.2221069335938,"z":"5c4aa102.e34ff","wires":[["499f0443.9d41ec"]]},{"id":"2e8596f1.80158a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1517.5553588867188,"y":575.2221355438232,"z":"5c4aa102.e34ff","wires":[["f2bd14d8.012ae8"]]},{"id":"c9c46d3e.b8431","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":587.5558776855469,"y":161.88888549804688,"z":"5c4aa102.e34ff","wires":[["9db67ad0.c72e08","8a01f366.7f8b3"]]},{"id":"9db67ad0.c72e08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","x":784.8888244628906,"y":162.41261291503906,"z":"5c4aa102.e34ff","wires":[]},{"id":"2e270a1.07ca7f6","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1282.3333587646484,"y":240.77780151367188,"z":"5c4aa102.e34ff","wires":[["c7ba02c4.f3caf","62ddf370.b593cc"]]},{"id":"c7ba02c4.f3caf","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1471.3335266113281,"y":301.7778015136719,"z":"5c4aa102.e34ff","wires":[]},{"id":"b17b296.f6d01d8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1478.8889770507812,"y":445.1111431121826,"z":"5c4aa102.e34ff","wires":[["8936d091.5239b","abde09fa.791d28"]]},{"id":"8936d091.5239b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1667.8889770507812,"y":474.11120414733887,"z":"5c4aa102.e34ff","wires":[]},{"id":"f2bd14d8.012ae8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1651.8889770507812,"y":576.3331909179688,"z":"5c4aa102.e34ff","wires":[["c62e4740.de62c8","d289f63d.66e818"]]},{"id":"c62e4740.de62c8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1840.8894653320312,"y":611.3333129882812,"z":"5c4aa102.e34ff","wires":[]},{"id":"17cf107e.7f886","type":"for","name":"For each VNFC","xml":"<for index='vnfcIndex' start='0' end='`$vnfcFlowCount`' >\n","comments":"","outputs":1,"x":2216.1107177734375,"y":790.5554504394531,"z":"5c4aa102.e34ff","wires":[["f8177f2d.a6291"]]},{"id":"17f10685.cdf999","type":"call","name":"call VNFC DG","xml":"<call module='`$Start.dg_module`' rpc='`$Start.dg_name`' mode='sync' version='`$Start.dg_version`'>\n","comments":"","outputs":1,"x":2628.110595703125,"y":874.6667175292969,"z":"5c4aa102.e34ff","wires":[["8a3cbe9b.5b621","27952ef7.62ca42","c4f76289.bdede"]]},{"id":"be1f667a.981e38","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2011.111083984375,"y":788.5556945800781,"z":"5c4aa102.e34ff","wires":[["17cf107e.7f886","c5f7ab23.b45e78","81405549.a04ab8"]]},{"id":"212c800c.bdb73","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2864.11083984375,"y":641.5558471679688,"z":"5c4aa102.e34ff","wires":[["2a011c5b.f9d6d4"]]},{"id":"d9418288.26914","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2860.110595703125,"y":723.5558471679688,"z":"5c4aa102.e34ff","wires":[["d652f7c2.e41888"]]},{"id":"d652f7c2.e41888","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3002.1103515625,"y":720.5558776855469,"z":"5c4aa102.e34ff","wires":[["1ebfb7bf.a79bb8","a93d5b4f.a969b8"]]},{"id":"1ebfb7bf.a79bb8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3228.1103515625,"y":723.5558471679688,"z":"5c4aa102.e34ff","wires":[]},{"id":"c4f76289.bdede","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2823.88818359375,"y":922.7779235839844,"z":"5c4aa102.e34ff","wires":[["58061af.316bde4"]]},{"id":"27952ef7.62ca42","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2821.888427734375,"y":830.7778930664062,"z":"5c4aa102.e34ff","wires":[["52a01fc.6384ce"]]},{"id":"8a3cbe9b.5b621","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2833.888671875,"y":874.7779235839844,"z":"5c4aa102.e34ff","wires":[["3015773a.9e8ed8"]]},{"id":"f8177f2d.a6291","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2386.7772216796875,"y":789.7779235839844,"z":"5c4aa102.e34ff","wires":[["17f10685.cdf999","49f4569c.8a2998","d0f4b673.bb9bc8","49762763.3da6f8"]]},{"id":"499f0443.9d41ec","type":"switchNode","name":"dependencyModelFound","xml":"<switch test='`$dependencyModelFound`'>\n","comments":"","outputs":1,"x":1664.5554809570312,"y":733.6666851043701,"z":"5c4aa102.e34ff","wires":[["caef42e3.e2cd1","ba818266.2f63b"]]},{"id":"caef42e3.e2cd1","type":"outcome","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1862.222412109375,"y":678.7777709960938,"z":"5c4aa102.e34ff","wires":[["32dbf6d7.c27d6a"]]},{"id":"32dbf6d7.c27d6a","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1987.6671142578125,"y":678.8888549804688,"z":"5c4aa102.e34ff","wires":[["1d118892.752427","6182f37b.1d21cc"]]},{"id":"1d118892.752427","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2167.6668701171875,"y":678.8888549804688,"z":"5c4aa102.e34ff","wires":[]},{"id":"ba818266.2f63b","type":"outcome","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1869.555419921875,"y":788.6669006347656,"z":"5c4aa102.e34ff","wires":[["be1f667a.981e38"]]},{"id":"49f4569c.8a2998","type":"execute","name":"Resolve VNFC DG","xml":"<execute plugin='org.openecomp.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcFlow[$vnfcIndex].vnfcType`' />\n<parameter name=\"action\" value=\"Start\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"Start\" />\n","comments":"","outputs":1,"x":2620.888427734375,"y":682.6389770507812,"z":"5c4aa102.e34ff","wires":[["212c800c.bdb73","d9418288.26914"]]},{"id":"d0f4b673.bb9bc8","type":"set","name":"set DG Parameters","xml":"<set>\n<parameter name='vnfcName' value='`$vnfcFlow[$vnfcIndex].vnfcName`' />\n<parameter name='vnfcType' value='`$vnfcFlow[$vnfcIndex].vnfcType`' />\n<parameter name='resilienceType' value='`$vnfcFlow[$vnfcIndex].resilienceType`' />\n<parameter name='vmCount' value='`$vnfcFlow[$vnfcIndex].vmCount`' />\n<parameter name='input.action' value='`$input.action`' />\n<parameter name='StartSuccessVMCount' value='0' />","comments":"","x":2621.9158935546875,"y":733.7223205566406,"z":"5c4aa102.e34ff","wires":[]},{"id":"49762763.3da6f8","type":"for","name":"For Each VM","xml":"<for index='j' start='0' end='`$vnfcFlow[$vnfcIndex].vmCount`' >\n","comments":"","outputs":1,"x":2615.693603515625,"y":788.6942443847656,"z":"5c4aa102.e34ff","wires":[["49159f53.bab48"]]},{"id":"49159f53.bab48","type":"set","name":"Set VM URL","xml":"<set>\n<parameter name=\"$vm[$j].url\" value='`$vnfcFlow[$vnfcIndex].vm[$j].url`' />","comments":"","x":2813.693603515625,"y":782.6942138671875,"z":"5c4aa102.e34ff","wires":[]},{"id":"52a01fc.6384ce","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2984.77734375,"y":829.888916015625,"z":"5c4aa102.e34ff","wires":[["febe94b.f9ea268","f2b1c346.5441c"]]},{"id":"febe94b.f9ea268","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3210.777587890625,"y":827.8889465332031,"z":"5c4aa102.e34ff","wires":[]},{"id":"3015773a.9e8ed8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2999.77734375,"y":875.8889465332031,"z":"5c4aa102.e34ff","wires":[["5e5e2482.c568bc"]]},{"id":"5e5e2482.c568bc","type":"switchNode","name":"switch_vm_start_success","xml":"<switch test='`$StartSuccessVMCount >= 1 and $AAIUpdateSuccessFlag == true`'>\n","comments":"","outputs":1,"x":3186.1103515625,"y":876.0003356933594,"z":"5c4aa102.e34ff","wires":[["a6d2b1f5.d987f","4b8ed0.8acc413"]]},{"id":"4b8ed0.8acc413","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":3407.888671875,"y":803.0003967285156,"z":"5c4aa102.e34ff","wires":[["c6426185.7dfe3"]]},{"id":"a6d2b1f5.d987f","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3399.388671875,"y":987.0002746582031,"z":"5c4aa102.e34ff","wires":[["c1a5bebe.ca387"]]},{"id":"5c097e27.bb7de","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3900.888427734375,"y":767.0003967285156,"z":"5c4aa102.e34ff","wires":[["1a3707f5.b0cfd8","aff88561.dea378","185bd07b.b7ca8","a981436.e6979c"]]},{"id":"f9cfce90.be4a4","type":"set","name":"update failed VNFC count","xml":"<set>\n<parameter name=\"FailedVNFCCount\" value=\"`$FailedVNFCCount + 1`\" />\n","comments":"","x":3746.555419921875,"y":1030.0002136230469,"z":"5c4aa102.e34ff","wires":[]},{"id":"1a3707f5.b0cfd8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":4106.44384765625,"y":877.0005187988281,"z":"5c4aa102.e34ff","wires":[]},{"id":"c1a5bebe.ca387","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3521.99951171875,"y":987.1113586425781,"z":"5c4aa102.e34ff","wires":[["f9cfce90.be4a4","c3210bb.7e0d2f8"]]},{"id":"81405549.a04ab8","type":"switchNode","name":"switch_vnfc_start_success","xml":"<switch test='`$FailedVNFCCount == 0`'>\n","comments":"","outputs":1,"x":2263.3330078125,"y":962.8889770507812,"z":"5c4aa102.e34ff","wires":[["1b88a948.830f47","3fa70651.493b2a"]]},{"id":"1b88a948.830f47","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2477.3330078125,"y":924.888916015625,"z":"5c4aa102.e34ff","wires":[["c17e8a64.feee78"]]},{"id":"3fa70651.493b2a","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2477.833251953125,"y":1001.8889770507812,"z":"5c4aa102.e34ff","wires":[["d811481f.f55068"]]},{"id":"c17e8a64.feee78","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2635.60205078125,"y":924.40576171875,"z":"5c4aa102.e34ff","wires":[]},{"id":"d811481f.f55068","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":2638.8330078125,"y":1000.8057861328125,"z":"5c4aa102.e34ff","wires":[]},{"id":"c5f7ab23.b45e78","type":"set","name":"set Counters","xml":"<set>\n<parameter name='FailedVNFCCount' value='0' />\n<parameter name='secondLastVnfcCounter' value=\"`$vnfcFlowCount - 1`\" />","comments":"","x":2233.3330078125,"y":730.8889465332031,"z":"5c4aa102.e34ff","wires":[]},{"id":"58061af.316bde4","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Start successfull for VNFC : ' + $vnfcName `\"/>\n","comments":"","outputs":1,"x":3003.666015625,"y":923.8891906738281,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"aff88561.dea378","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":4120.666015625,"y":766.8893737792969,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"c3210bb.7e0d2f8","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Failed to Start all VMs for VNFC : ' + $vnfcName + '. But successfully Started '+ $StartSuccessVMCount +' VM/s so continue to next VNFC'`\"/>\n","comments":"","outputs":1,"x":3711.666015625,"y":987.8893737792969,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"2a011c5b.f9d6d4","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'VNFC DG for ' + $vnfcName + ' resolves to rpc: ' + $Start.dg_name + ', module: ' + $Start.dg_module + ', version: ' + $Start.dg_version `\"/>\n","comments":"","outputs":1,"x":3021.777587890625,"y":641.88916015625,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"81dc48bb.8279b8","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'None of the VMs of VNFC ' + $vnfcName + ' are Started. Not proceeding to the next VNFC.'`\" />","comments":"","x":4511.5546875,"y":756.7783508300781,"z":"5c4aa102.e34ff","wires":[]},{"id":"185bd07b.b7ca8","type":"switchNode","name":"switch_vm_start_success","xml":"<switch test='`$StartSuccessVMCount >= 1`'>\n","comments":"","outputs":1,"x":4133.444580078125,"y":714.3335266113281,"z":"5c4aa102.e34ff","wires":[["31b691a6.d4b12e","192eb901.761be7"]]},{"id":"192eb901.761be7","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":4348.22265625,"y":757.3336486816406,"z":"5c4aa102.e34ff","wires":[["81dc48bb.8279b8"]]},{"id":"31b691a6.d4b12e","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":4345.72265625,"y":715.3335266113281,"z":"5c4aa102.e34ff","wires":[["a35ba1c.042ef6"]]},{"id":"a35ba1c.042ef6","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'AAI update for VNFC ' + $vnfcName + '  failed. Not proceeding to the next VNFC.'`\" />","comments":"","x":4508.555419921875,"y":715.3336486816406,"z":"5c4aa102.e34ff","wires":[]},{"id":"8a01f366.7f8b3","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failure in flattening payload Json\" />","comments":"","outputs":1,"x":817.8889465332031,"y":113.77777099609375,"z":"5c4aa102.e34ff","wires":[["fc577427.eef7c8"]]},{"id":"3b70b982.0b63e6","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1665.888916015625,"y":192.77777099609375,"z":"5c4aa102.e34ff","wires":[["e8b9ba94.acda98"]]},{"id":"e8b9ba94.acda98","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1844.46044921875,"y":192.49203491210938,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"62ddf370.b593cc","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failed to retrieve VNF details from A&amp;AI\" />","comments":"","outputs":1,"x":1486.8889465332031,"y":191.77777099609375,"z":"5c4aa102.e34ff","wires":[["3b70b982.0b63e6"]]},{"id":"4d23f1d5.255c2","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1227.5555114746094,"y":112.77777099609375,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"fc577427.eef7c8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1025.9839782714844,"y":113.06350708007812,"z":"5c4aa102.e34ff","wires":[["4d23f1d5.255c2"]]},{"id":"abde09fa.791d28","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Server/VNFC does not exists in A&amp;AI for the VNF\" />","comments":"","outputs":1,"x":1677.5558471679688,"y":412.88888359069824,"z":"5c4aa102.e34ff","wires":[["bc782016.90984"]]},{"id":"bc782016.90984","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2222.5557861328125,"y":410.8888854980469,"z":"5c4aa102.e34ff","wires":[["b07f6dbb.8bd43"]]},{"id":"b07f6dbb.8bd43","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2396.1273193359375,"y":410.6031494140625,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"d289f63d.66e818","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />","comments":"","outputs":1,"x":1868.5557250976562,"y":535.9999389648438,"z":"5c4aa102.e34ff","wires":[["bc782016.90984"]]},{"id":"6182f37b.1d21cc","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />","comments":"","outputs":1,"x":2155.2218017578125,"y":589.9999389648438,"z":"5c4aa102.e34ff","wires":[["bc782016.90984"]]},{"id":"a93d5b4f.a969b8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Failed to retrieve VNFC DG for : ' + $vnfcFlow[$vnfcIndex].vnfcType`\"/>","comments":"","outputs":1,"x":3255.33349609375,"y":677.1111145019531,"z":"5c4aa102.e34ff","wires":[["27acd7c9.c9d3f8"]]},{"id":"27acd7c9.c9d3f8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3470.66748046875,"y":682.0000915527344,"z":"5c4aa102.e34ff","wires":[["bb169884.8524d8"]]},{"id":"bb169884.8524d8","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":3662.239013671875,"y":682.7143249511719,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"f2b1c346.5441c","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'VNFC DG not found for : ' + $vnfcName`\"/>","comments":"","outputs":1,"x":3220.444580078125,"y":783.1111145019531,"z":"5c4aa102.e34ff","wires":[["27acd7c9.c9d3f8"]]},{"id":"a981436.e6979c","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\"/>","comments":"","outputs":1,"x":4130.666748046875,"y":810.1112365722656,"z":"5c4aa102.e34ff","wires":[["2ccc3a15.045cd6"]]},{"id":"2ccc3a15.045cd6","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4345.8896484375,"y":811.0002136230469,"z":"5c4aa102.e34ff","wires":[["d620e55c.b5a9c8"]]},{"id":"d620e55c.b5a9c8","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":4542.462158203125,"y":810.7144470214844,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"c6426185.7dfe3","type":"switchNode","name":"switch last vnfc","xml":"<switch test='`$secondLastVnfcCounter == $vnfcIndex`'>\n","comments":"","outputs":1,"x":3556.5556640625,"y":801.3334045410156,"z":"5c4aa102.e34ff","wires":[["c418f351.9d5a9","d075b39f.c65b1"]]},{"id":"c418f351.9d5a9","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3760.77783203125,"y":875.3334045410156,"z":"5c4aa102.e34ff","wires":[["1a3707f5.b0cfd8"]]},{"id":"d075b39f.c65b1","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":3756.278076171875,"y":768.3335266113281,"z":"5c4aa102.e34ff","wires":[["5c097e27.bb7de"]]}]
+[{"id":"299910f3.66048","type":"dgstart","name":"DGSTART","outputs":1,"x":108.88888549804688,"y":43.888885498046875,"z":"5c4aa102.e34ff","wires":[["4c139e83.c4319"]]},{"id":"4c139e83.c4319","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":283.8888854980469,"y":42.888885498046875,"z":"5c4aa102.e34ff","wires":[["bfb729c1.a8e6c8"]]},{"id":"bfb729c1.a8e6c8","type":"method","name":"Start_VNF","xml":"<method rpc='Start_VNF' mode='sync'>\n","comments":"","outputs":1,"x":134.88894653320312,"y":134.88888549804688,"z":"5c4aa102.e34ff","wires":[["6ec09531.21892c"]]},{"id":"3c8b6771.447f48","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":413.88922119140625,"y":160.88888549804688,"z":"5c4aa102.e34ff","wires":[["c9c46d3e.b8431"]]},{"id":"50133d6a.76f334","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":412.88922119140625,"y":110.88888549804688,"z":"5c4aa102.e34ff","wires":[["c9c46d3e.b8431"]]},{"id":"29442299.20a70e","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":406.88922119140625,"y":215.88890075683594,"z":"5c4aa102.e34ff","wires":[["c9c46d3e.b8431"]]},{"id":"6ec09531.21892c","type":"execute","name":"Set payload in Context","xml":"<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />","comments":"","outputs":1,"x":186.88897705078125,"y":214.888916015625,"z":"5c4aa102.e34ff","wires":[["3c8b6771.447f48","50133d6a.76f334","29442299.20a70e","c1780f4e.03327"]]},{"id":"c1780f4e.03327","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":412.888916015625,"y":278.888916015625,"z":"5c4aa102.e34ff","wires":[["2f541c3b.cee8b4"]]},{"id":"2f541c3b.cee8b4","type":"execute","name":"Get Vnf Hierarchy","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":584.5555725097656,"y":278.888916015625,"z":"5c4aa102.e34ff","wires":[["ef6bc2fa.faa29","9bba9c55.7f49d"]]},{"id":"9bba9c55.7f49d","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":772.5556335449219,"y":237.888916015625,"z":"5c4aa102.e34ff","wires":[["2e270a1.07ca7f6"]]},{"id":"ef6bc2fa.faa29","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":760.5555877685547,"y":315.88885498046875,"z":"5c4aa102.e34ff","wires":[["1e6364a8.66f95b"]]},{"id":"1e6364a8.66f95b","type":"switchNode","name":"getVnfHierarchy_result ?","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":921.5555114746094,"y":384,"z":"5c4aa102.e34ff","wires":[["c8100453.9d35b8","99c4ec1e.ee054"]]},{"id":"c8100453.9d35b8","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1128.5558471679688,"y":445.0000591278076,"z":"5c4aa102.e34ff","wires":[["3ff31edf.ede1c2"]]},{"id":"99c4ec1e.ee054","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1127.5557556152344,"y":324,"z":"5c4aa102.e34ff","wires":[["2e270a1.07ca7f6"]]},{"id":"3ff31edf.ede1c2","type":"switchNode","name":"VNF_VMCount ?","xml":"<switch test='`$VNF.VMCount`'>","comments":"","outputs":1,"x":1162.5558471679688,"y":513.1109294891357,"z":"5c4aa102.e34ff","wires":[["1416e132.1c0aaf","eb4fad9c.bce16"]]},{"id":"1416e132.1c0aaf","type":"outcome","name":"0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1348.5554809570312,"y":446.11108207702637,"z":"5c4aa102.e34ff","wires":[["b17b296.f6d01d8"]]},{"id":"eb4fad9c.bce16","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1268.5554809570312,"y":579.1110515594482,"z":"5c4aa102.e34ff","wires":[["11321978.17eea7"]]},{"id":"11321978.17eea7","type":"execute","name":"Get Execution Flow","xml":"<execute plugin='org.onap.appc.dg.common.VnfExecutionFlow' method='getVnfExecutionFlowData' >\n<parameter name=\"DependencyType\" value='RESOURCE' />\n<parameter name=\"FlowStrategy\" value='FORWARD' />\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfVersion\" value='`$vnf.version`' />\n","comments":"","outputs":1,"x":1326.5554809570312,"y":654.2222576141357,"z":"5c4aa102.e34ff","wires":[["c56fb547.a74a68","2e8596f1.80158a"]]},{"id":"c56fb547.a74a68","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1518.5552978515625,"y":654.2221069335938,"z":"5c4aa102.e34ff","wires":[["499f0443.9d41ec"]]},{"id":"2e8596f1.80158a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1517.5553588867188,"y":575.2221355438232,"z":"5c4aa102.e34ff","wires":[["f2bd14d8.012ae8"]]},{"id":"c9c46d3e.b8431","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":587.5558776855469,"y":161.88888549804688,"z":"5c4aa102.e34ff","wires":[["9db67ad0.c72e08","8a01f366.7f8b3"]]},{"id":"9db67ad0.c72e08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","x":784.8888244628906,"y":162.41261291503906,"z":"5c4aa102.e34ff","wires":[]},{"id":"2e270a1.07ca7f6","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1282.3333587646484,"y":240.77780151367188,"z":"5c4aa102.e34ff","wires":[["c7ba02c4.f3caf","62ddf370.b593cc"]]},{"id":"c7ba02c4.f3caf","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1471.3335266113281,"y":301.7778015136719,"z":"5c4aa102.e34ff","wires":[]},{"id":"b17b296.f6d01d8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1478.8889770507812,"y":445.1111431121826,"z":"5c4aa102.e34ff","wires":[["8936d091.5239b","abde09fa.791d28"]]},{"id":"8936d091.5239b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1667.8889770507812,"y":474.11120414733887,"z":"5c4aa102.e34ff","wires":[]},{"id":"f2bd14d8.012ae8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1651.8889770507812,"y":576.3331909179688,"z":"5c4aa102.e34ff","wires":[["c62e4740.de62c8","d289f63d.66e818"]]},{"id":"c62e4740.de62c8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1840.8894653320312,"y":611.3333129882812,"z":"5c4aa102.e34ff","wires":[]},{"id":"17cf107e.7f886","type":"for","name":"For each VNFC","xml":"<for index='vnfcIndex' start='0' end='`$vnfcFlowCount`' >\n","comments":"","outputs":1,"x":2216.1107177734375,"y":790.5554504394531,"z":"5c4aa102.e34ff","wires":[["f8177f2d.a6291"]]},{"id":"17f10685.cdf999","type":"call","name":"call VNFC DG","xml":"<call module='`$Start.dg_module`' rpc='`$Start.dg_name`' mode='sync' version='`$Start.dg_version`'>\n","comments":"","outputs":1,"x":2628.110595703125,"y":874.6667175292969,"z":"5c4aa102.e34ff","wires":[["8a3cbe9b.5b621","27952ef7.62ca42","c4f76289.bdede"]]},{"id":"be1f667a.981e38","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2011.111083984375,"y":788.5556945800781,"z":"5c4aa102.e34ff","wires":[["17cf107e.7f886","c5f7ab23.b45e78","81405549.a04ab8"]]},{"id":"212c800c.bdb73","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2864.11083984375,"y":641.5558471679688,"z":"5c4aa102.e34ff","wires":[["2a011c5b.f9d6d4"]]},{"id":"d9418288.26914","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2860.110595703125,"y":723.5558471679688,"z":"5c4aa102.e34ff","wires":[["d652f7c2.e41888"]]},{"id":"d652f7c2.e41888","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3002.1103515625,"y":720.5558776855469,"z":"5c4aa102.e34ff","wires":[["1ebfb7bf.a79bb8","a93d5b4f.a969b8"]]},{"id":"1ebfb7bf.a79bb8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3228.1103515625,"y":723.5558471679688,"z":"5c4aa102.e34ff","wires":[]},{"id":"c4f76289.bdede","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2823.88818359375,"y":922.7779235839844,"z":"5c4aa102.e34ff","wires":[["58061af.316bde4"]]},{"id":"27952ef7.62ca42","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2821.888427734375,"y":830.7778930664062,"z":"5c4aa102.e34ff","wires":[["52a01fc.6384ce"]]},{"id":"8a3cbe9b.5b621","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2833.888671875,"y":874.7779235839844,"z":"5c4aa102.e34ff","wires":[["3015773a.9e8ed8"]]},{"id":"f8177f2d.a6291","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2386.7772216796875,"y":789.7779235839844,"z":"5c4aa102.e34ff","wires":[["17f10685.cdf999","49f4569c.8a2998","d0f4b673.bb9bc8","49762763.3da6f8"]]},{"id":"499f0443.9d41ec","type":"switchNode","name":"dependencyModelFound","xml":"<switch test='`$dependencyModelFound`'>\n","comments":"","outputs":1,"x":1664.5554809570312,"y":733.6666851043701,"z":"5c4aa102.e34ff","wires":[["caef42e3.e2cd1","ba818266.2f63b"]]},{"id":"caef42e3.e2cd1","type":"outcome","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1862.222412109375,"y":678.7777709960938,"z":"5c4aa102.e34ff","wires":[["32dbf6d7.c27d6a"]]},{"id":"32dbf6d7.c27d6a","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1987.6671142578125,"y":678.8888549804688,"z":"5c4aa102.e34ff","wires":[["1d118892.752427","6182f37b.1d21cc"]]},{"id":"1d118892.752427","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2167.6668701171875,"y":678.8888549804688,"z":"5c4aa102.e34ff","wires":[]},{"id":"ba818266.2f63b","type":"outcome","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1869.555419921875,"y":788.6669006347656,"z":"5c4aa102.e34ff","wires":[["be1f667a.981e38"]]},{"id":"49f4569c.8a2998","type":"execute","name":"Resolve VNFC DG","xml":"<execute plugin='org.onap.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcFlow[$vnfcIndex].vnfcType`' />\n<parameter name=\"action\" value=\"Start\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"Start\" />\n","comments":"","outputs":1,"x":2620.888427734375,"y":682.6389770507812,"z":"5c4aa102.e34ff","wires":[["212c800c.bdb73","d9418288.26914"]]},{"id":"d0f4b673.bb9bc8","type":"set","name":"set DG Parameters","xml":"<set>\n<parameter name='vnfcName' value='`$vnfcFlow[$vnfcIndex].vnfcName`' />\n<parameter name='vnfcType' value='`$vnfcFlow[$vnfcIndex].vnfcType`' />\n<parameter name='resilienceType' value='`$vnfcFlow[$vnfcIndex].resilienceType`' />\n<parameter name='vmCount' value='`$vnfcFlow[$vnfcIndex].vmCount`' />\n<parameter name='input.action' value='`$input.action`' />\n<parameter name='StartSuccessVMCount' value='0' />","comments":"","x":2621.9158935546875,"y":733.7223205566406,"z":"5c4aa102.e34ff","wires":[]},{"id":"49762763.3da6f8","type":"for","name":"For Each VM","xml":"<for index='j' start='0' end='`$vnfcFlow[$vnfcIndex].vmCount`' >\n","comments":"","outputs":1,"x":2615.693603515625,"y":788.6942443847656,"z":"5c4aa102.e34ff","wires":[["49159f53.bab48"]]},{"id":"49159f53.bab48","type":"set","name":"Set VM URL","xml":"<set>\n<parameter name=\"$vm[$j].url\" value='`$vnfcFlow[$vnfcIndex].vm[$j].url`' />","comments":"","x":2813.693603515625,"y":782.6942138671875,"z":"5c4aa102.e34ff","wires":[]},{"id":"52a01fc.6384ce","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2984.77734375,"y":829.888916015625,"z":"5c4aa102.e34ff","wires":[["febe94b.f9ea268","f2b1c346.5441c"]]},{"id":"febe94b.f9ea268","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3210.777587890625,"y":827.8889465332031,"z":"5c4aa102.e34ff","wires":[]},{"id":"3015773a.9e8ed8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2999.77734375,"y":875.8889465332031,"z":"5c4aa102.e34ff","wires":[["5e5e2482.c568bc"]]},{"id":"5e5e2482.c568bc","type":"switchNode","name":"switch_vm_start_success","xml":"<switch test='`$StartSuccessVMCount >= 1 and $AAIUpdateSuccessFlag == true`'>\n","comments":"","outputs":1,"x":3186.1103515625,"y":876.0003356933594,"z":"5c4aa102.e34ff","wires":[["a6d2b1f5.d987f","4b8ed0.8acc413"]]},{"id":"4b8ed0.8acc413","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":3407.888671875,"y":803.0003967285156,"z":"5c4aa102.e34ff","wires":[["c6426185.7dfe3"]]},{"id":"a6d2b1f5.d987f","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3399.388671875,"y":987.0002746582031,"z":"5c4aa102.e34ff","wires":[["c1a5bebe.ca387"]]},{"id":"5c097e27.bb7de","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3900.888427734375,"y":767.0003967285156,"z":"5c4aa102.e34ff","wires":[["1a3707f5.b0cfd8","aff88561.dea378","185bd07b.b7ca8","a981436.e6979c"]]},{"id":"f9cfce90.be4a4","type":"set","name":"update failed VNFC count","xml":"<set>\n<parameter name=\"FailedVNFCCount\" value=\"`$FailedVNFCCount + 1`\" />\n","comments":"","x":3746.555419921875,"y":1030.0002136230469,"z":"5c4aa102.e34ff","wires":[]},{"id":"1a3707f5.b0cfd8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":4106.44384765625,"y":877.0005187988281,"z":"5c4aa102.e34ff","wires":[]},{"id":"c1a5bebe.ca387","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3521.99951171875,"y":987.1113586425781,"z":"5c4aa102.e34ff","wires":[["f9cfce90.be4a4","c3210bb.7e0d2f8"]]},{"id":"81405549.a04ab8","type":"switchNode","name":"switch_vnfc_start_success","xml":"<switch test='`$FailedVNFCCount == 0`'>\n","comments":"","outputs":1,"x":2263.3330078125,"y":962.8889770507812,"z":"5c4aa102.e34ff","wires":[["1b88a948.830f47","3fa70651.493b2a"]]},{"id":"1b88a948.830f47","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2477.3330078125,"y":924.888916015625,"z":"5c4aa102.e34ff","wires":[["c17e8a64.feee78"]]},{"id":"3fa70651.493b2a","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2477.833251953125,"y":1001.8889770507812,"z":"5c4aa102.e34ff","wires":[["d811481f.f55068"]]},{"id":"c17e8a64.feee78","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2635.60205078125,"y":924.40576171875,"z":"5c4aa102.e34ff","wires":[]},{"id":"d811481f.f55068","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":2638.8330078125,"y":1000.8057861328125,"z":"5c4aa102.e34ff","wires":[]},{"id":"c5f7ab23.b45e78","type":"set","name":"set Counters","xml":"<set>\n<parameter name='FailedVNFCCount' value='0' />\n<parameter name='secondLastVnfcCounter' value=\"`$vnfcFlowCount - 1`\" />","comments":"","x":2233.3330078125,"y":730.8889465332031,"z":"5c4aa102.e34ff","wires":[]},{"id":"58061af.316bde4","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Start successfull for VNFC : ' + $vnfcName `\"/>\n","comments":"","outputs":1,"x":3003.666015625,"y":923.8891906738281,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"aff88561.dea378","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":4120.666015625,"y":766.8893737792969,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"c3210bb.7e0d2f8","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Failed to Start all VMs for VNFC : ' + $vnfcName + '. But successfully Started '+ $StartSuccessVMCount +' VM/s so continue to next VNFC'`\"/>\n","comments":"","outputs":1,"x":3711.666015625,"y":987.8893737792969,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"2a011c5b.f9d6d4","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'VNFC DG for ' + $vnfcName + ' resolves to rpc: ' + $Start.dg_name + ', module: ' + $Start.dg_module + ', version: ' + $Start.dg_version `\"/>\n","comments":"","outputs":1,"x":3021.777587890625,"y":641.88916015625,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"81dc48bb.8279b8","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'None of the VMs of VNFC ' + $vnfcName + ' are Started. Not proceeding to the next VNFC.'`\" />","comments":"","x":4511.5546875,"y":756.7783508300781,"z":"5c4aa102.e34ff","wires":[]},{"id":"185bd07b.b7ca8","type":"switchNode","name":"switch_vm_start_success","xml":"<switch test='`$StartSuccessVMCount >= 1`'>\n","comments":"","outputs":1,"x":4133.444580078125,"y":714.3335266113281,"z":"5c4aa102.e34ff","wires":[["31b691a6.d4b12e","192eb901.761be7"]]},{"id":"192eb901.761be7","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":4348.22265625,"y":757.3336486816406,"z":"5c4aa102.e34ff","wires":[["81dc48bb.8279b8"]]},{"id":"31b691a6.d4b12e","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":4345.72265625,"y":715.3335266113281,"z":"5c4aa102.e34ff","wires":[["a35ba1c.042ef6"]]},{"id":"a35ba1c.042ef6","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'AAI update for VNFC ' + $vnfcName + '  failed. Not proceeding to the next VNFC.'`\" />","comments":"","x":4508.555419921875,"y":715.3336486816406,"z":"5c4aa102.e34ff","wires":[]},{"id":"8a01f366.7f8b3","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failure in flattening payload Json\" />","comments":"","outputs":1,"x":817.8889465332031,"y":113.77777099609375,"z":"5c4aa102.e34ff","wires":[["fc577427.eef7c8"]]},{"id":"3b70b982.0b63e6","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1665.888916015625,"y":192.77777099609375,"z":"5c4aa102.e34ff","wires":[["e8b9ba94.acda98"]]},{"id":"e8b9ba94.acda98","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1844.46044921875,"y":192.49203491210938,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"62ddf370.b593cc","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failed to retrieve VNF details from A&amp;AI\" />","comments":"","outputs":1,"x":1486.8889465332031,"y":191.77777099609375,"z":"5c4aa102.e34ff","wires":[["3b70b982.0b63e6"]]},{"id":"4d23f1d5.255c2","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1227.5555114746094,"y":112.77777099609375,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"fc577427.eef7c8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1025.9839782714844,"y":113.06350708007812,"z":"5c4aa102.e34ff","wires":[["4d23f1d5.255c2"]]},{"id":"abde09fa.791d28","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Server/VNFC does not exists in A&amp;AI for the VNF\" />","comments":"","outputs":1,"x":1677.5558471679688,"y":412.88888359069824,"z":"5c4aa102.e34ff","wires":[["bc782016.90984"]]},{"id":"bc782016.90984","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2222.5557861328125,"y":410.8888854980469,"z":"5c4aa102.e34ff","wires":[["b07f6dbb.8bd43"]]},{"id":"b07f6dbb.8bd43","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2396.1273193359375,"y":410.6031494140625,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"d289f63d.66e818","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />","comments":"","outputs":1,"x":1868.5557250976562,"y":535.9999389648438,"z":"5c4aa102.e34ff","wires":[["bc782016.90984"]]},{"id":"6182f37b.1d21cc","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />","comments":"","outputs":1,"x":2155.2218017578125,"y":589.9999389648438,"z":"5c4aa102.e34ff","wires":[["bc782016.90984"]]},{"id":"a93d5b4f.a969b8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Failed to retrieve VNFC DG for : ' + $vnfcFlow[$vnfcIndex].vnfcType`\"/>","comments":"","outputs":1,"x":3255.33349609375,"y":677.1111145019531,"z":"5c4aa102.e34ff","wires":[["27acd7c9.c9d3f8"]]},{"id":"27acd7c9.c9d3f8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3470.66748046875,"y":682.0000915527344,"z":"5c4aa102.e34ff","wires":[["bb169884.8524d8"]]},{"id":"bb169884.8524d8","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":3662.239013671875,"y":682.7143249511719,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"f2b1c346.5441c","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'VNFC DG not found for : ' + $vnfcName`\"/>","comments":"","outputs":1,"x":3220.444580078125,"y":783.1111145019531,"z":"5c4aa102.e34ff","wires":[["27acd7c9.c9d3f8"]]},{"id":"a981436.e6979c","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\"/>","comments":"","outputs":1,"x":4130.666748046875,"y":810.1112365722656,"z":"5c4aa102.e34ff","wires":[["2ccc3a15.045cd6"]]},{"id":"2ccc3a15.045cd6","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4345.8896484375,"y":811.0002136230469,"z":"5c4aa102.e34ff","wires":[["d620e55c.b5a9c8"]]},{"id":"d620e55c.b5a9c8","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":4542.462158203125,"y":810.7144470214844,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"c6426185.7dfe3","type":"switchNode","name":"switch last vnfc","xml":"<switch test='`$secondLastVnfcCounter == $vnfcIndex`'>\n","comments":"","outputs":1,"x":3556.5556640625,"y":801.3334045410156,"z":"5c4aa102.e34ff","wires":[["c418f351.9d5a9","d075b39f.c65b1"]]},{"id":"c418f351.9d5a9","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3760.77783203125,"y":875.3334045410156,"z":"5c4aa102.e34ff","wires":[["1a3707f5.b0cfd8"]]},{"id":"d075b39f.c65b1","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":3756.278076171875,"y":768.3335266113281,"z":"5c4aa102.e34ff","wires":[["5c097e27.bb7de"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Start_VNFC.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Start_VNFC.json
index e27a43aef..82f5e5ce2 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Start_VNFC.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Start_VNFC.json
@@ -1 +1 @@
-[{"id":"1a470291.a963fd","type":"dgstart","name":"DGSTART","outputs":1,"x":85.80625915527344,"y":73,"z":"2fe30bf3.5a02e4","wires":[["368abe9d.90c702"]]},{"id":"368abe9d.90c702","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":119.80638122558594,"y":141,"z":"2fe30bf3.5a02e4","wires":[["9f74d2fb.bc71e"]]},{"id":"9f74d2fb.bc71e","type":"method","name":"Start_VNFC","xml":"<method rpc='Start_VNFC' mode='sync'>\n","comments":"","outputs":1,"x":152.80641174316406,"y":213,"z":"2fe30bf3.5a02e4","wires":[["bdba45dd.15e5c8"]]},{"id":"497933c8.b206ec","type":"execute","name":"Resolve Healthcheck DG","xml":"<execute plugin='org.openecomp.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"HealthCheck\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"HealthCheckDG\" />\n","comments":"","outputs":1,"x":613.8064422607422,"y":143,"z":"2fe30bf3.5a02e4","wires":[["d7ce9461.e88a68","62ec37a8.172928","75dad6ba.48a458"]]},{"id":"d7ce9461.e88a68","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":836.8064422607422,"y":92,"z":"2fe30bf3.5a02e4","wires":[["37af42.94d100be"]]},{"id":"62ec37a8.172928","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":837.8065643310547,"y":143,"z":"2fe30bf3.5a02e4","wires":[["83580dcd.5f36f"]]},{"id":"bdba45dd.15e5c8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"false","comments":"","outputs":1,"x":132.8063507080078,"y":310,"z":"2fe30bf3.5a02e4","wires":[["497933c8.b206ec","7f5f1cb7.8aca24","f1ed0579.63f1b8","16e2a975.926777","eb4bfac1.da01f8"]]},{"id":"7f5f1cb7.8aca24","type":"execute","name":"Update_AAI_Status","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Starting\" />","comments":"","outputs":1,"x":1134.8065643310547,"y":302,"z":"2fe30bf3.5a02e4","wires":[["36bd1de8.b0c632","4cc486e0.d290d8","91b35c7b.49f2c"]]},{"id":"4cc486e0.d290d8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1443.8068389892578,"y":284,"z":"2fe30bf3.5a02e4","wires":[["8e557a40.222a38"]]},{"id":"91b35c7b.49f2c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1453.8063507080078,"y":326,"z":"2fe30bf3.5a02e4","wires":[["8e557a40.222a38"]]},{"id":"36bd1de8.b0c632","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1408.8061065673828,"y":244,"z":"2fe30bf3.5a02e4","wires":[["5f8bf1c.c8cef1"]]},{"id":"37af42.94d100be","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":971.0287322998047,"y":91.41883087158203,"z":"2fe30bf3.5a02e4","wires":[["950b3e69.00d3b","5c7ad2d.1115a2c","89c755e0.cb6588","a5078ee3.ebb7f"]]},{"id":"950b3e69.00d3b","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Healthcheck DG resolution plugin not found for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1198.8064727783203,"y":75,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"83580dcd.5f36f","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":963.0287322998047,"y":142.88888549804688,"z":"2fe30bf3.5a02e4","wires":[["f4335fed.0da16","5c7ad2d.1115a2c","89c755e0.cb6588","a5078ee3.ebb7f"]]},{"id":"f4335fed.0da16","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Error while resolving Healthcheck DG for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1204.0285186767578,"y":122.88888549804688,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"8e557a40.222a38","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1854.6954498291016,"y":285.8888854980469,"z":"2fe30bf3.5a02e4","wires":[["4cfe160d.5a95e8","69cc0201.551e3c"]]},{"id":"5c7ad2d.1115a2c","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1188.5973510742188,"y":169.18878173828125,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"89c755e0.cb6588","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value=\"`$error-message`\"/>","comments":"","x":1210.5842742919922,"y":251.35894775390625,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"5f8bf1c.c8cef1","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1535.9170684814453,"y":243.88888549804688,"z":"2fe30bf3.5a02e4","wires":[["baf70582.73b758","f2273c8a.ea5c4"]]},{"id":"baf70582.73b758","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1696.9175567626953,"y":195.88888549804688,"z":"2fe30bf3.5a02e4","wires":[["8e557a40.222a38"]]},{"id":"f2273c8a.ea5c4","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1681.9176788330078,"y":242.88888549804688,"z":"2fe30bf3.5a02e4","wires":[["8e557a40.222a38"]]},{"id":"4cfe160d.5a95e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2007.0284576416016,"y":344.8888854980469,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"75dad6ba.48a458","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":839.6952514648438,"y":203.88888549804688,"z":"2fe30bf3.5a02e4","wires":[["a8b1a96d.d59ab8"]]},{"id":"a8b1a96d.d59ab8","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Hleathchek DG resolved to : ' + $HealthCheckDG.dg_name`\"/>\n","comments":"","outputs":1,"x":988.3619995117188,"y":203.88888549804688,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"3b4f9814.e2ad98","type":"set","name":"init","xml":"<set>\n<parameter name='startFailedCount' value='0' />\n<parameter name='startSuccessCount' value='0' />\n","comments":"","x":514.4516448974609,"y":332.1745910644531,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"9d9e0e20.60bbe","type":"for","name":"for_each_vm","xml":"<for index=\"vmIndex\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":532.5944366455078,"y":396.8889465332031,"z":"2fe30bf3.5a02e4","wires":[["cd5abeb4.2254"]]},{"id":"cd5abeb4.2254","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":696.3618621826172,"y":396.8888854980469,"z":"2fe30bf3.5a02e4","wires":[["4f1c6b48.d34304","809e42b.52a73c","6ce36de3.135c74"]]},{"id":"4f1c6b48.d34304","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Attempting to start the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":870.7906341552734,"y":345.6031799316406,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"6ce36de3.135c74","type":"set","name":"set start parameters","xml":"<set>\n<parameter name=\"start-vm-url\" value=\"`$vm[$vmIndex].url`\" />\n<parameter name='startRetryCount' value='3'/>\n","comments":"","x":890.4515838623047,"y":398.03179931640625,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"809e42b.52a73c","type":"call","name":"Start","xml":"<call module='APPC' rpc='Start_VM' mode='sync' >\n","comments":"","outputs":1,"x":866.4516448974609,"y":484.03173828125,"z":"2fe30bf3.5a02e4","wires":[["e9e973e5.43003","cf35edf3.ce1f3","286386e1.b6b11a"]]},{"id":"286386e1.b6b11a","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1022.7849578857422,"y":438.03173828125,"z":"2fe30bf3.5a02e4","wires":[["f1f6e27e.6487b"]]},{"id":"e9e973e5.43003","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1028.6521453857422,"y":483.9603271484375,"z":"2fe30bf3.5a02e4","wires":[["890ad316.9f99d"]]},{"id":"cf35edf3.ce1f3","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1023.0069732666016,"y":566.0317668914795,"z":"2fe30bf3.5a02e4","wires":[["2779a3f.bc4c45c"]]},{"id":"2779a3f.bc4c45c","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1164.1498565673828,"y":565.174711227417,"z":"2fe30bf3.5a02e4","wires":[["24b2e5c0.1a66ea","a27787d1.bd06a8","e53b7469.4e2428"]]},{"id":"f1f6e27e.6487b","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1157.7849578857422,"y":438.03173828125,"z":"2fe30bf3.5a02e4","wires":[["59d92c23.70d234","f0a3b326.8b285","a6dd21c9.3e41c","db25d1d6.9bc34"]]},{"id":"890ad316.9f99d","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1158.4358367919922,"y":483.888916015625,"z":"2fe30bf3.5a02e4","wires":[["f0a3b326.8b285","a6dd21c9.3e41c","db25d1d6.9bc34","8bd43260.5eb42"]]},{"id":"a27787d1.bd06a8","type":"set","name":"Mark vm Started","xml":"<set>\n<parameter name=\"startedServerList[$startSuccessCount].url\" value=\"`$vm[$vmIndex].url`\" />\n","comments":"","x":1371.1497344970703,"y":566.1747722625732,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"e53b7469.4e2428","type":"set","name":"Increment Started vm count","xml":"<set>\n<parameter name='startSuccessCount' value='`$startSuccessCount+1`' />\n","comments":"","x":1404.8959503173828,"y":605.809476852417,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"24b2e5c0.1a66ea","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Start succeeded for the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1356.1498565673828,"y":646.1746826171875,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"a6dd21c9.3e41c","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1376.4366912841797,"y":480.7936382293701,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"f0a3b326.8b285","type":"set","name":"set_mark_vm_failed","xml":"<set>\n<parameter name=\"startFailedCount\" value=\"`$startFailedCount + 1`\" />\n","comments":"","x":1389.4364471435547,"y":442.79357719421387,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"59d92c23.70d234","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'DG to execute Start action not found for VM: ' + $vm[$vmIndex].url`\"/>\n","comments":"","x":1388.3563690185547,"y":368.74596977233887,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"1fc9009e.86fd2f","type":"comment","name":"Health check started servers","info":"","comments":"","x":385.4182586669922,"y":571.1834697723389,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"7fcf9784.ff3178","type":"set","name":"init","xml":"<set>\n<parameter name='healthCheckFailedCount' value='0' />\n","comments":"","x":507.63025283813477,"y":609.1834106445312,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"ff0c18c8.f1cb88","type":"switchNode","name":"started server > 0","xml":"<switch test='`$startSuccessCount > 0`'>\n","comments":"","outputs":1,"x":515.4183807373047,"y":665.1834697723389,"z":"2fe30bf3.5a02e4","wires":[["b26968f.6e75098","b15f37a3.f2acf8"]]},{"id":"b15f37a3.f2acf8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":688.1683807373047,"y":729.9335918426514,"z":"2fe30bf3.5a02e4","wires":[["a78e254c.02c078"]]},{"id":"b26968f.6e75098","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":696.6683692932129,"y":621.9334716796875,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"a78e254c.02c078","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":812.6302833557129,"y":730.1834106445312,"z":"2fe30bf3.5a02e4","wires":[["2b9f0ce9.6571f4","c5b2f2ce.cc748","b6eeb883.4737a8","38df2d3a.1c6b72"]]},{"id":"38df2d3a.1c6b72","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"Attempting to health check the started servers of the VNFC\"/>\n","comments":"","outputs":1,"x":989.5399627685547,"y":668.564453125,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"2b9f0ce9.6571f4","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$startSuccessCount`\" >","comments":"","outputs":1,"x":993.6304168701172,"y":713.1834716796875,"z":"2fe30bf3.5a02e4","wires":[["d65d79a1.52d338"]]},{"id":"b6eeb883.4737a8","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$startSuccessCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":979.6301727294922,"y":756.1834716796875,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"d65d79a1.52d338","type":"set","name":"set : health check input list","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$startedServerList[$i].url`\" />\n","comments":"","x":1204.0746765136719,"y":712.29443359375,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"c5b2f2ce.cc748","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":1033.9349822998047,"y":801.416748046875,"z":"2fe30bf3.5a02e4","wires":[["d1531542.c646f8","b755495d.033df8","aa99d38e.616c1"]]},{"id":"d1531542.c646f8","type":"outcome","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1273.6300811767578,"y":805.1837158203125,"z":"2fe30bf3.5a02e4","wires":[["999c3522.a16f48"]]},{"id":"b755495d.033df8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1279.1468353271484,"y":758.5216369628906,"z":"2fe30bf3.5a02e4","wires":[["aa248ff6.575f3"]]},{"id":"aa99d38e.616c1","type":"outcome","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1271.8803253173828,"y":851.68359375,"z":"2fe30bf3.5a02e4","wires":[["dfeacdef.57da3"]]},{"id":"dfeacdef.57da3","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$startSuccessCount`\" >","comments":"","outputs":1,"x":1419.6302642822266,"y":851.1836547851562,"z":"2fe30bf3.5a02e4","wires":[["325c7a00.1c3df6"]]},{"id":"325c7a00.1c3df6","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[$i].status`\">\n","comments":"","outputs":1,"x":1632.6300201416016,"y":851.1836547851562,"z":"2fe30bf3.5a02e4","wires":[["a0cc95d1.d14208","f9a1c849.631ee8","815cbe58.50221"]]},{"id":"815cbe58.50221","type":"other","name":"DOWN","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":1901.6302032470703,"y":810.1835021972656,"z":"2fe30bf3.5a02e4","wires":[["79d320a7.79de4"]]},{"id":"f9a1c849.631ee8","type":"other","name":"UNKNOWN","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":1871.4139556884766,"y":850.3263549804688,"z":"2fe30bf3.5a02e4","wires":[["79d320a7.79de4"]]},{"id":"a0cc95d1.d14208","type":"other","name":"UP","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":1882.6307525634766,"y":906.1837158203125,"z":"2fe30bf3.5a02e4","wires":[["3c905744.ff9818"]]},{"id":"aa248ff6.575f3","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1408.6300811767578,"y":757.1835327148438,"z":"2fe30bf3.5a02e4","wires":[["f684de68.9d9c2","1774dfbf.897b2","ede6e99a.c88818","f4fcd65c.1b68d8"]]},{"id":"999c3522.a16f48","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1412.6300811767578,"y":804.1835327148438,"z":"2fe30bf3.5a02e4","wires":[["d3a9eab2.9f7a78","f684de68.9d9c2","ede6e99a.c88818","f4fcd65c.1b68d8"]]},{"id":"d3a9eab2.9f7a78","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"Error occurred during health check of the started servers\"/>","comments":"","x":1645.6302337646484,"y":627.1835021972656,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"1774dfbf.897b2","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1658.2970733642578,"y":672.1834106445312,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"f684de68.9d9c2","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1635.7633819580078,"y":714.9960327148438,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"79d320a7.79de4","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2049.344497680664,"y":826.4690551757812,"z":"2fe30bf3.5a02e4","wires":[["d8a6df2a.7dd4","aee7be5b.f82c8","937cf884.7f6f78","bc4bcf48.26b37"]]},{"id":"d8a6df2a.7dd4","type":"set","name":"Set error message","xml":"<set>\n<parameter name='event-message' value=\"`'Health check failed for the started server : ' + $startedServerList[$i].url`\"/>\n","comments":"","x":2289.345474243164,"y":724.4691772460938,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"aee7be5b.f82c8","type":"set","name":"increment healthCheck failed VM count","xml":"<set>\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthCheckFailedCount + 1`\" />\n","comments":"","x":2348.345474243164,"y":770.4691772460938,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"937cf884.7f6f78","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2276.291275024414,"y":810.0693359375,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"3c905744.ff9818","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2039.630630493164,"y":905.1836547851562,"z":"2fe30bf3.5a02e4","wires":[["e1da7adf.b45238","b4fa63d.6dabba","9fefa332.fd358"]]},{"id":"9fefa332.fd358","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Start succeeded for the server : ' + $startedServerList[$i].url`\"/>\n<parameter name=\"StartSuccessVMCount\" value=\"`$StartSuccessVMCount + 1`\" />\n\n","comments":"","x":2289.684829711914,"y":903.2501831054688,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"b4fa63d.6dabba","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":2300.685317993164,"y":942.2501831054688,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"e1da7adf.b45238","type":"execute","name":"Report_Success","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\" />\n\n","comments":"","outputs":1,"x":2295.630630493164,"y":981.7549438476562,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"16e2a975.926777","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":341.4182586669922,"y":663.1834697723389,"z":"2fe30bf3.5a02e4","wires":[["ff0c18c8.f1cb88","7fcf9784.ff3178"]]},{"id":"f1ed0579.63f1b8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":351.47291564941406,"y":359.8888854980469,"z":"2fe30bf3.5a02e4","wires":[["3b4f9814.e2ad98","9d9e0e20.60bbe"]]},{"id":"60427904.cffb48","type":"execute","name":"Update_AAI_Status_Success","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Running\" />\n","comments":"","outputs":1,"x":913.1391448974609,"y":1090.888916015625,"z":"2fe30bf3.5a02e4","wires":[["d229c29c.1c5a5","32097ba7.a930c4","fb49cf8a.60582"]]},{"id":"25e341a2.474c9e","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":888.1392669677734,"y":1192.8892211914062,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"a570b6c0.693758","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":693.5836639404297,"y":1090.8890380859375,"z":"2fe30bf3.5a02e4","wires":[["60427904.cffb48","25e341a2.474c9e","1f885944.deb907"]]},{"id":"1f885944.deb907","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'VNFC Started successfully : ' + $vnfcName`\"/>\n","comments":"","outputs":1,"x":898.0281219482422,"y":1139.77783203125,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"15725357.0eb17d","type":"execute","name":"Update_AAI_Status_Failure","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />","comments":"","outputs":1,"x":903.1393280029297,"y":947.8890380859375,"z":"2fe30bf3.5a02e4","wires":[["d229c29c.1c5a5","32097ba7.a930c4","fb49cf8a.60582"]]},{"id":"eac568e8.d84638","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":875.1393890380859,"y":1024.8896789550781,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"c95cab6.08b0358","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":686.9169769287109,"y":948.7779541015625,"z":"2fe30bf3.5a02e4","wires":[["eac568e8.d84638","15725357.0eb17d"]]},{"id":"d229c29c.1c5a5","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1185.1392974853516,"y":947.8889465332031,"z":"2fe30bf3.5a02e4","wires":[["68c72cc4.2a6b44"]]},{"id":"32097ba7.a930c4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1184.1390533447266,"y":1003.888916015625,"z":"2fe30bf3.5a02e4","wires":[["68c72cc4.2a6b44"]]},{"id":"fb49cf8a.60582","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1159.1389923095703,"y":1089.8889465332031,"z":"2fe30bf3.5a02e4","wires":[["1f4262ac.f8c95d"]]},{"id":"68c72cc4.2a6b44","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1660.0282745361328,"y":1013.7778015136719,"z":"2fe30bf3.5a02e4","wires":[["7cacd3c8.cb4e7c","63bf861a.2d76a8"]]},{"id":"1f4262ac.f8c95d","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1286.2497100830078,"y":1089.7778625488281,"z":"2fe30bf3.5a02e4","wires":[["4d740d53.13d1b4","2af9f7fe.d47ef8","9445997.2e24868"]]},{"id":"4d740d53.13d1b4","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1461.2508087158203,"y":1041.7778625488281,"z":"2fe30bf3.5a02e4","wires":[["68c72cc4.2a6b44"]]},{"id":"2af9f7fe.d47ef8","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1479.2506866455078,"y":1090.7779235839844,"z":"2fe30bf3.5a02e4","wires":[["68c72cc4.2a6b44"]]},{"id":"7cacd3c8.cb4e7c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1815.3616485595703,"y":1056.7778015136719,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"eb4bfac1.da01f8","type":"switchNode","name":"switch_server_start_success","xml":"<switch test='`$startFailedCount == 0 and $healthCheckFailedCount == 0`'>\n","comments":"","outputs":1,"x":322.91737365722656,"y":975.7532958984375,"z":"2fe30bf3.5a02e4","wires":[["953185e1.700a28","72decc28.91a144"]]},{"id":"72decc28.91a144","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":544.6674652099609,"y":1091.50341796875,"z":"2fe30bf3.5a02e4","wires":[["a570b6c0.693758"]]},{"id":"953185e1.700a28","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":550.1674652099609,"y":948.5034790039062,"z":"2fe30bf3.5a02e4","wires":[["c95cab6.08b0358"]]},{"id":"9445997.2e24868","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1463.9175567626953,"y":1137.6668395996094,"z":"2fe30bf3.5a02e4","wires":[["1ee65462.74023c"]]},{"id":"1ee65462.74023c","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='true' />\n","comments":"","x":1655.0285186767578,"y":1137.6668395996094,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"a5078ee3.ebb7f","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1238.4729614257812,"y":210,"z":"2fe30bf3.5a02e4","wires":[["ac68f81b.5c48e8"]]},{"id":"ac68f81b.5c48e8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1758.4725494384766,"y":111,"z":"2fe30bf3.5a02e4","wires":[["5b461a8f.62eed4"]]},{"id":"5b461a8f.62eed4","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2429.0443267822266,"y":118.71426391601562,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"69cc0201.551e3c","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Error occurred while updating VNFC details in A&amp;AI\" />","comments":"","outputs":1,"x":2028.0282135009766,"y":210,"z":"2fe30bf3.5a02e4","wires":[["51c3354e.2fa70c"]]},{"id":"51c3354e.2fa70c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2233.028091430664,"y":170,"z":"2fe30bf3.5a02e4","wires":[["5b461a8f.62eed4"]]},{"id":"db25d1d6.9bc34","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1392.0284881591797,"y":522.9999980926514,"z":"2fe30bf3.5a02e4","wires":[["74d607b1.bd0498"]]},{"id":"74d607b1.bd0498","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1906.028091430664,"y":614.9999084472656,"z":"2fe30bf3.5a02e4","wires":[["94e7dbf9.b04ce8"]]},{"id":"94e7dbf9.b04ce8","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2089.0445098876953,"y":614.71435546875,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"ede6e99a.c88818","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1691.9176788330078,"y":804.2222290039062,"z":"2fe30bf3.5a02e4","wires":[["74d607b1.bd0498"]]},{"id":"bc4bcf48.26b37","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2281.028823852539,"y":862.5555725097656,"z":"2fe30bf3.5a02e4","wires":[["80fab7b3.2f0e48"]]},{"id":"80fab7b3.2f0e48","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2505.139419555664,"y":862.3332824707031,"z":"2fe30bf3.5a02e4","wires":[["d15983e5.4706b"]]},{"id":"d15983e5.4706b","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2698.156021118164,"y":863.0476379394531,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"63bf861a.2d76a8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Error occurred while updating VNFC details in A&amp;AI\" />","comments":"","outputs":1,"x":1849.584243774414,"y":974.5555725097656,"z":"2fe30bf3.5a02e4","wires":[["479e4d8c.1ac324"]]},{"id":"479e4d8c.1ac324","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2031.5841217041016,"y":1005.5555725097656,"z":"2fe30bf3.5a02e4","wires":[["151b06a1.86efe9"]]},{"id":"151b06a1.86efe9","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2216.8062896728516,"y":1042.6667785644531,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"f4fcd65c.1b68d8","type":"set","name":"update healthCheck failed count","xml":"<set>\n<parameter name=\"healthCheckFailedCount\" value=\"`$startSuccessCount`\" />\n","comments":"","x":1681.1396026611328,"y":756.5556030273438,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"8bd43260.5eb42","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`$error-message`\"/>\n","comments":"","x":1388.8065643310547,"y":404.99999809265137,"z":"2fe30bf3.5a02e4","wires":[]}]
+[{"id":"1a470291.a963fd","type":"dgstart","name":"DGSTART","outputs":1,"x":85.80625915527344,"y":73,"z":"2fe30bf3.5a02e4","wires":[["368abe9d.90c702"]]},{"id":"368abe9d.90c702","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":119.80638122558594,"y":141,"z":"2fe30bf3.5a02e4","wires":[["9f74d2fb.bc71e"]]},{"id":"9f74d2fb.bc71e","type":"method","name":"Start_VNFC","xml":"<method rpc='Start_VNFC' mode='sync'>\n","comments":"","outputs":1,"x":152.80641174316406,"y":213,"z":"2fe30bf3.5a02e4","wires":[["bdba45dd.15e5c8"]]},{"id":"497933c8.b206ec","type":"execute","name":"Resolve Healthcheck DG","xml":"<execute plugin='org.onap.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"HealthCheck\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"HealthCheckDG\" />\n","comments":"","outputs":1,"x":613.8064422607422,"y":143,"z":"2fe30bf3.5a02e4","wires":[["d7ce9461.e88a68","62ec37a8.172928","75dad6ba.48a458"]]},{"id":"d7ce9461.e88a68","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":836.8064422607422,"y":92,"z":"2fe30bf3.5a02e4","wires":[["37af42.94d100be"]]},{"id":"62ec37a8.172928","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":837.8065643310547,"y":143,"z":"2fe30bf3.5a02e4","wires":[["83580dcd.5f36f"]]},{"id":"bdba45dd.15e5c8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"false","comments":"","outputs":1,"x":132.8063507080078,"y":310,"z":"2fe30bf3.5a02e4","wires":[["497933c8.b206ec","7f5f1cb7.8aca24","f1ed0579.63f1b8","16e2a975.926777","eb4bfac1.da01f8"]]},{"id":"7f5f1cb7.8aca24","type":"execute","name":"Update_AAI_Status","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Starting\" />","comments":"","outputs":1,"x":1134.8065643310547,"y":302,"z":"2fe30bf3.5a02e4","wires":[["36bd1de8.b0c632","4cc486e0.d290d8","91b35c7b.49f2c"]]},{"id":"4cc486e0.d290d8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1443.8068389892578,"y":284,"z":"2fe30bf3.5a02e4","wires":[["8e557a40.222a38"]]},{"id":"91b35c7b.49f2c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1453.8063507080078,"y":326,"z":"2fe30bf3.5a02e4","wires":[["8e557a40.222a38"]]},{"id":"36bd1de8.b0c632","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1408.8061065673828,"y":244,"z":"2fe30bf3.5a02e4","wires":[["5f8bf1c.c8cef1"]]},{"id":"37af42.94d100be","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":971.0287322998047,"y":91.41883087158203,"z":"2fe30bf3.5a02e4","wires":[["950b3e69.00d3b","5c7ad2d.1115a2c","89c755e0.cb6588","a5078ee3.ebb7f"]]},{"id":"950b3e69.00d3b","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Healthcheck DG resolution plugin not found for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1198.8064727783203,"y":75,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"83580dcd.5f36f","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":963.0287322998047,"y":142.88888549804688,"z":"2fe30bf3.5a02e4","wires":[["f4335fed.0da16","5c7ad2d.1115a2c","89c755e0.cb6588","a5078ee3.ebb7f"]]},{"id":"f4335fed.0da16","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Error while resolving Healthcheck DG for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1204.0285186767578,"y":122.88888549804688,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"8e557a40.222a38","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1854.6954498291016,"y":285.8888854980469,"z":"2fe30bf3.5a02e4","wires":[["4cfe160d.5a95e8","69cc0201.551e3c"]]},{"id":"5c7ad2d.1115a2c","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1188.5973510742188,"y":169.18878173828125,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"89c755e0.cb6588","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value=\"`$error-message`\"/>","comments":"","x":1210.5842742919922,"y":251.35894775390625,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"5f8bf1c.c8cef1","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1535.9170684814453,"y":243.88888549804688,"z":"2fe30bf3.5a02e4","wires":[["baf70582.73b758","f2273c8a.ea5c4"]]},{"id":"baf70582.73b758","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1696.9175567626953,"y":195.88888549804688,"z":"2fe30bf3.5a02e4","wires":[["8e557a40.222a38"]]},{"id":"f2273c8a.ea5c4","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1681.9176788330078,"y":242.88888549804688,"z":"2fe30bf3.5a02e4","wires":[["8e557a40.222a38"]]},{"id":"4cfe160d.5a95e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2007.0284576416016,"y":344.8888854980469,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"75dad6ba.48a458","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":839.6952514648438,"y":203.88888549804688,"z":"2fe30bf3.5a02e4","wires":[["a8b1a96d.d59ab8"]]},{"id":"a8b1a96d.d59ab8","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Hleathchek DG resolved to : ' + $HealthCheckDG.dg_name`\"/>\n","comments":"","outputs":1,"x":988.3619995117188,"y":203.88888549804688,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"3b4f9814.e2ad98","type":"set","name":"init","xml":"<set>\n<parameter name='startFailedCount' value='0' />\n<parameter name='startSuccessCount' value='0' />\n","comments":"","x":514.4516448974609,"y":332.1745910644531,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"9d9e0e20.60bbe","type":"for","name":"for_each_vm","xml":"<for index=\"vmIndex\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":532.5944366455078,"y":396.8889465332031,"z":"2fe30bf3.5a02e4","wires":[["cd5abeb4.2254"]]},{"id":"cd5abeb4.2254","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":696.3618621826172,"y":396.8888854980469,"z":"2fe30bf3.5a02e4","wires":[["4f1c6b48.d34304","809e42b.52a73c","6ce36de3.135c74"]]},{"id":"4f1c6b48.d34304","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Attempting to start the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":870.7906341552734,"y":345.6031799316406,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"6ce36de3.135c74","type":"set","name":"set start parameters","xml":"<set>\n<parameter name=\"start-vm-url\" value=\"`$vm[$vmIndex].url`\" />\n<parameter name='startRetryCount' value='3'/>\n","comments":"","x":890.4515838623047,"y":398.03179931640625,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"809e42b.52a73c","type":"call","name":"Start","xml":"<call module='APPC' rpc='Start_VM' mode='sync' >\n","comments":"","outputs":1,"x":866.4516448974609,"y":484.03173828125,"z":"2fe30bf3.5a02e4","wires":[["e9e973e5.43003","cf35edf3.ce1f3","286386e1.b6b11a"]]},{"id":"286386e1.b6b11a","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1022.7849578857422,"y":438.03173828125,"z":"2fe30bf3.5a02e4","wires":[["f1f6e27e.6487b"]]},{"id":"e9e973e5.43003","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1028.6521453857422,"y":483.9603271484375,"z":"2fe30bf3.5a02e4","wires":[["890ad316.9f99d"]]},{"id":"cf35edf3.ce1f3","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1023.0069732666016,"y":566.0317668914795,"z":"2fe30bf3.5a02e4","wires":[["2779a3f.bc4c45c"]]},{"id":"2779a3f.bc4c45c","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1164.1498565673828,"y":565.174711227417,"z":"2fe30bf3.5a02e4","wires":[["24b2e5c0.1a66ea","a27787d1.bd06a8","e53b7469.4e2428"]]},{"id":"f1f6e27e.6487b","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1157.7849578857422,"y":438.03173828125,"z":"2fe30bf3.5a02e4","wires":[["59d92c23.70d234","f0a3b326.8b285","a6dd21c9.3e41c","db25d1d6.9bc34"]]},{"id":"890ad316.9f99d","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1158.4358367919922,"y":483.888916015625,"z":"2fe30bf3.5a02e4","wires":[["f0a3b326.8b285","a6dd21c9.3e41c","db25d1d6.9bc34","8bd43260.5eb42"]]},{"id":"a27787d1.bd06a8","type":"set","name":"Mark vm Started","xml":"<set>\n<parameter name=\"startedServerList[$startSuccessCount].url\" value=\"`$vm[$vmIndex].url`\" />\n","comments":"","x":1371.1497344970703,"y":566.1747722625732,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"e53b7469.4e2428","type":"set","name":"Increment Started vm count","xml":"<set>\n<parameter name='startSuccessCount' value='`$startSuccessCount+1`' />\n","comments":"","x":1404.8959503173828,"y":605.809476852417,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"24b2e5c0.1a66ea","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Start succeeded for the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1356.1498565673828,"y":646.1746826171875,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"a6dd21c9.3e41c","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1376.4366912841797,"y":480.7936382293701,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"f0a3b326.8b285","type":"set","name":"set_mark_vm_failed","xml":"<set>\n<parameter name=\"startFailedCount\" value=\"`$startFailedCount + 1`\" />\n","comments":"","x":1389.4364471435547,"y":442.79357719421387,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"59d92c23.70d234","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'DG to execute Start action not found for VM: ' + $vm[$vmIndex].url`\"/>\n","comments":"","x":1388.3563690185547,"y":368.74596977233887,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"1fc9009e.86fd2f","type":"comment","name":"Health check started servers","info":"","comments":"","x":385.4182586669922,"y":571.1834697723389,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"7fcf9784.ff3178","type":"set","name":"init","xml":"<set>\n<parameter name='healthCheckFailedCount' value='0' />\n","comments":"","x":507.63025283813477,"y":609.1834106445312,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"ff0c18c8.f1cb88","type":"switchNode","name":"started server > 0","xml":"<switch test='`$startSuccessCount > 0`'>\n","comments":"","outputs":1,"x":515.4183807373047,"y":665.1834697723389,"z":"2fe30bf3.5a02e4","wires":[["b26968f.6e75098","b15f37a3.f2acf8"]]},{"id":"b15f37a3.f2acf8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":688.1683807373047,"y":729.9335918426514,"z":"2fe30bf3.5a02e4","wires":[["a78e254c.02c078"]]},{"id":"b26968f.6e75098","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":696.6683692932129,"y":621.9334716796875,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"a78e254c.02c078","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":812.6302833557129,"y":730.1834106445312,"z":"2fe30bf3.5a02e4","wires":[["2b9f0ce9.6571f4","c5b2f2ce.cc748","b6eeb883.4737a8","38df2d3a.1c6b72"]]},{"id":"38df2d3a.1c6b72","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"Attempting to health check the started servers of the VNFC\"/>\n","comments":"","outputs":1,"x":989.5399627685547,"y":668.564453125,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"2b9f0ce9.6571f4","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$startSuccessCount`\" >","comments":"","outputs":1,"x":993.6304168701172,"y":713.1834716796875,"z":"2fe30bf3.5a02e4","wires":[["d65d79a1.52d338"]]},{"id":"b6eeb883.4737a8","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$startSuccessCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":979.6301727294922,"y":756.1834716796875,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"d65d79a1.52d338","type":"set","name":"set : health check input list","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$startedServerList[$i].url`\" />\n","comments":"","x":1204.0746765136719,"y":712.29443359375,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"c5b2f2ce.cc748","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":1033.9349822998047,"y":801.416748046875,"z":"2fe30bf3.5a02e4","wires":[["d1531542.c646f8","b755495d.033df8","aa99d38e.616c1"]]},{"id":"d1531542.c646f8","type":"outcome","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1273.6300811767578,"y":805.1837158203125,"z":"2fe30bf3.5a02e4","wires":[["999c3522.a16f48"]]},{"id":"b755495d.033df8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1279.1468353271484,"y":758.5216369628906,"z":"2fe30bf3.5a02e4","wires":[["aa248ff6.575f3"]]},{"id":"aa99d38e.616c1","type":"outcome","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1271.8803253173828,"y":851.68359375,"z":"2fe30bf3.5a02e4","wires":[["dfeacdef.57da3"]]},{"id":"dfeacdef.57da3","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$startSuccessCount`\" >","comments":"","outputs":1,"x":1419.6302642822266,"y":851.1836547851562,"z":"2fe30bf3.5a02e4","wires":[["325c7a00.1c3df6"]]},{"id":"325c7a00.1c3df6","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[$i].status`\">\n","comments":"","outputs":1,"x":1632.6300201416016,"y":851.1836547851562,"z":"2fe30bf3.5a02e4","wires":[["a0cc95d1.d14208","f9a1c849.631ee8","815cbe58.50221"]]},{"id":"815cbe58.50221","type":"other","name":"DOWN","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":1901.6302032470703,"y":810.1835021972656,"z":"2fe30bf3.5a02e4","wires":[["79d320a7.79de4"]]},{"id":"f9a1c849.631ee8","type":"other","name":"UNKNOWN","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":1871.4139556884766,"y":850.3263549804688,"z":"2fe30bf3.5a02e4","wires":[["79d320a7.79de4"]]},{"id":"a0cc95d1.d14208","type":"other","name":"UP","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":1882.6307525634766,"y":906.1837158203125,"z":"2fe30bf3.5a02e4","wires":[["3c905744.ff9818"]]},{"id":"aa248ff6.575f3","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1408.6300811767578,"y":757.1835327148438,"z":"2fe30bf3.5a02e4","wires":[["f684de68.9d9c2","1774dfbf.897b2","ede6e99a.c88818","f4fcd65c.1b68d8"]]},{"id":"999c3522.a16f48","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1412.6300811767578,"y":804.1835327148438,"z":"2fe30bf3.5a02e4","wires":[["d3a9eab2.9f7a78","f684de68.9d9c2","ede6e99a.c88818","f4fcd65c.1b68d8"]]},{"id":"d3a9eab2.9f7a78","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"Error occurred during health check of the started servers\"/>","comments":"","x":1645.6302337646484,"y":627.1835021972656,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"1774dfbf.897b2","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1658.2970733642578,"y":672.1834106445312,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"f684de68.9d9c2","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1635.7633819580078,"y":714.9960327148438,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"79d320a7.79de4","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2049.344497680664,"y":826.4690551757812,"z":"2fe30bf3.5a02e4","wires":[["d8a6df2a.7dd4","aee7be5b.f82c8","937cf884.7f6f78","bc4bcf48.26b37"]]},{"id":"d8a6df2a.7dd4","type":"set","name":"Set error message","xml":"<set>\n<parameter name='event-message' value=\"`'Health check failed for the started server : ' + $startedServerList[$i].url`\"/>\n","comments":"","x":2289.345474243164,"y":724.4691772460938,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"aee7be5b.f82c8","type":"set","name":"increment healthCheck failed VM count","xml":"<set>\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthCheckFailedCount + 1`\" />\n","comments":"","x":2348.345474243164,"y":770.4691772460938,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"937cf884.7f6f78","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2276.291275024414,"y":810.0693359375,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"3c905744.ff9818","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2039.630630493164,"y":905.1836547851562,"z":"2fe30bf3.5a02e4","wires":[["e1da7adf.b45238","b4fa63d.6dabba","9fefa332.fd358"]]},{"id":"9fefa332.fd358","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Start succeeded for the server : ' + $startedServerList[$i].url`\"/>\n<parameter name=\"StartSuccessVMCount\" value=\"`$StartSuccessVMCount + 1`\" />\n\n","comments":"","x":2289.684829711914,"y":903.2501831054688,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"b4fa63d.6dabba","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":2300.685317993164,"y":942.2501831054688,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"e1da7adf.b45238","type":"execute","name":"Report_Success","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\" />\n\n","comments":"","outputs":1,"x":2295.630630493164,"y":981.7549438476562,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"16e2a975.926777","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":341.4182586669922,"y":663.1834697723389,"z":"2fe30bf3.5a02e4","wires":[["ff0c18c8.f1cb88","7fcf9784.ff3178"]]},{"id":"f1ed0579.63f1b8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":351.47291564941406,"y":359.8888854980469,"z":"2fe30bf3.5a02e4","wires":[["3b4f9814.e2ad98","9d9e0e20.60bbe"]]},{"id":"60427904.cffb48","type":"execute","name":"Update_AAI_Status_Success","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Running\" />\n","comments":"","outputs":1,"x":913.1391448974609,"y":1090.888916015625,"z":"2fe30bf3.5a02e4","wires":[["d229c29c.1c5a5","32097ba7.a930c4","fb49cf8a.60582"]]},{"id":"25e341a2.474c9e","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":888.1392669677734,"y":1192.8892211914062,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"a570b6c0.693758","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":693.5836639404297,"y":1090.8890380859375,"z":"2fe30bf3.5a02e4","wires":[["60427904.cffb48","25e341a2.474c9e","1f885944.deb907"]]},{"id":"1f885944.deb907","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'VNFC Started successfully : ' + $vnfcName`\"/>\n","comments":"","outputs":1,"x":898.0281219482422,"y":1139.77783203125,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"15725357.0eb17d","type":"execute","name":"Update_AAI_Status_Failure","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />","comments":"","outputs":1,"x":903.1393280029297,"y":947.8890380859375,"z":"2fe30bf3.5a02e4","wires":[["d229c29c.1c5a5","32097ba7.a930c4","fb49cf8a.60582"]]},{"id":"eac568e8.d84638","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":875.1393890380859,"y":1024.8896789550781,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"c95cab6.08b0358","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":686.9169769287109,"y":948.7779541015625,"z":"2fe30bf3.5a02e4","wires":[["eac568e8.d84638","15725357.0eb17d"]]},{"id":"d229c29c.1c5a5","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1185.1392974853516,"y":947.8889465332031,"z":"2fe30bf3.5a02e4","wires":[["68c72cc4.2a6b44"]]},{"id":"32097ba7.a930c4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1184.1390533447266,"y":1003.888916015625,"z":"2fe30bf3.5a02e4","wires":[["68c72cc4.2a6b44"]]},{"id":"fb49cf8a.60582","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1159.1389923095703,"y":1089.8889465332031,"z":"2fe30bf3.5a02e4","wires":[["1f4262ac.f8c95d"]]},{"id":"68c72cc4.2a6b44","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1660.0282745361328,"y":1013.7778015136719,"z":"2fe30bf3.5a02e4","wires":[["7cacd3c8.cb4e7c","63bf861a.2d76a8"]]},{"id":"1f4262ac.f8c95d","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1286.2497100830078,"y":1089.7778625488281,"z":"2fe30bf3.5a02e4","wires":[["4d740d53.13d1b4","2af9f7fe.d47ef8","9445997.2e24868"]]},{"id":"4d740d53.13d1b4","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1461.2508087158203,"y":1041.7778625488281,"z":"2fe30bf3.5a02e4","wires":[["68c72cc4.2a6b44"]]},{"id":"2af9f7fe.d47ef8","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1479.2506866455078,"y":1090.7779235839844,"z":"2fe30bf3.5a02e4","wires":[["68c72cc4.2a6b44"]]},{"id":"7cacd3c8.cb4e7c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1815.3616485595703,"y":1056.7778015136719,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"eb4bfac1.da01f8","type":"switchNode","name":"switch_server_start_success","xml":"<switch test='`$startFailedCount == 0 and $healthCheckFailedCount == 0`'>\n","comments":"","outputs":1,"x":322.91737365722656,"y":975.7532958984375,"z":"2fe30bf3.5a02e4","wires":[["953185e1.700a28","72decc28.91a144"]]},{"id":"72decc28.91a144","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":544.6674652099609,"y":1091.50341796875,"z":"2fe30bf3.5a02e4","wires":[["a570b6c0.693758"]]},{"id":"953185e1.700a28","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":550.1674652099609,"y":948.5034790039062,"z":"2fe30bf3.5a02e4","wires":[["c95cab6.08b0358"]]},{"id":"9445997.2e24868","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1463.9175567626953,"y":1137.6668395996094,"z":"2fe30bf3.5a02e4","wires":[["1ee65462.74023c"]]},{"id":"1ee65462.74023c","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='true' />\n","comments":"","x":1655.0285186767578,"y":1137.6668395996094,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"a5078ee3.ebb7f","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1238.4729614257812,"y":210,"z":"2fe30bf3.5a02e4","wires":[["ac68f81b.5c48e8"]]},{"id":"ac68f81b.5c48e8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1758.4725494384766,"y":111,"z":"2fe30bf3.5a02e4","wires":[["5b461a8f.62eed4"]]},{"id":"5b461a8f.62eed4","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2429.0443267822266,"y":118.71426391601562,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"69cc0201.551e3c","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Error occurred while updating VNFC details in A&amp;AI\" />","comments":"","outputs":1,"x":2028.0282135009766,"y":210,"z":"2fe30bf3.5a02e4","wires":[["51c3354e.2fa70c"]]},{"id":"51c3354e.2fa70c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2233.028091430664,"y":170,"z":"2fe30bf3.5a02e4","wires":[["5b461a8f.62eed4"]]},{"id":"db25d1d6.9bc34","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1392.0284881591797,"y":522.9999980926514,"z":"2fe30bf3.5a02e4","wires":[["74d607b1.bd0498"]]},{"id":"74d607b1.bd0498","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1906.028091430664,"y":614.9999084472656,"z":"2fe30bf3.5a02e4","wires":[["94e7dbf9.b04ce8"]]},{"id":"94e7dbf9.b04ce8","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2089.0445098876953,"y":614.71435546875,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"ede6e99a.c88818","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":1691.9176788330078,"y":804.2222290039062,"z":"2fe30bf3.5a02e4","wires":[["74d607b1.bd0498"]]},{"id":"bc4bcf48.26b37","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2281.028823852539,"y":862.5555725097656,"z":"2fe30bf3.5a02e4","wires":[["80fab7b3.2f0e48"]]},{"id":"80fab7b3.2f0e48","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2505.139419555664,"y":862.3332824707031,"z":"2fe30bf3.5a02e4","wires":[["d15983e5.4706b"]]},{"id":"d15983e5.4706b","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2698.156021118164,"y":863.0476379394531,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"63bf861a.2d76a8","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Error occurred while updating VNFC details in A&amp;AI\" />","comments":"","outputs":1,"x":1849.584243774414,"y":974.5555725097656,"z":"2fe30bf3.5a02e4","wires":[["479e4d8c.1ac324"]]},{"id":"479e4d8c.1ac324","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2031.5841217041016,"y":1005.5555725097656,"z":"2fe30bf3.5a02e4","wires":[["151b06a1.86efe9"]]},{"id":"151b06a1.86efe9","type":"execute","name":"Report Error to DCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />","comments":"","outputs":1,"x":2216.8062896728516,"y":1042.6667785644531,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"f4fcd65c.1b68d8","type":"set","name":"update healthCheck failed count","xml":"<set>\n<parameter name=\"healthCheckFailedCount\" value=\"`$startSuccessCount`\" />\n","comments":"","x":1681.1396026611328,"y":756.5556030273438,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"8bd43260.5eb42","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`$error-message`\"/>\n","comments":"","x":1388.8065643310547,"y":404.99999809265137,"z":"2fe30bf3.5a02e4","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StopApplication_VM_vSCP_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StopApplication_VM_vSCP_2.0.0.json
index e955d538e..e9a04a394 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StopApplication_VM_vSCP_2.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StopApplication_VM_vSCP_2.0.0.json
@@ -136,7 +136,7 @@
     "id": "c48be551.f0b508",
     "type": "execute",
     "name": "Execute retrieve connection",
-    "xml": "<execute plugin='org.openecomp.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$vnf.type`\" />\n",
+    "xml": "<execute plugin='org.onap.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$vnf.type`\" />\n",
     "comments": "",
     "outputs": 1,
     "x": 936.5,
@@ -255,7 +255,7 @@
     "id": "bb87dbed.34a348",
     "type": "execute",
     "name": "Healthcheck to get Node Name",
-    "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='healthCheckVMs'>\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"retry-healthcheck\" value=\"`$retry-healthcheck`\"/>",
+    "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='healthCheckVMs'>\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"retry-healthcheck\" value=\"`$retry-healthcheck`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 447.5,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StopVM_VM_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StopVM_VM_2.0.0.json
index d0f4c6201..b47c06d6f 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StopVM_VM_2.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StopVM_VM_2.0.0.json
@@ -1 +1 @@
-[{"id":"1cef050a.1dfbcb","type":"dgstart","name":"DGSTART","outputs":1,"x":141.515625,"y":164.4333267211914,"z":"a6b16db5.af508","wires":[["a9d8f072.10cbd"]]},{"id":"a9d8f072.10cbd","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":318.5157165527344,"y":164,"z":"a6b16db5.af508","wires":[["46c68f6c.01837"]]},{"id":"46c68f6c.01837","type":"method","name":"StopVM_VM","xml":"<method rpc='StopVM_VM' mode='sync'>\n","comments":"","outputs":1,"x":260.97997665405273,"y":255.8214054107666,"z":"a6b16db5.af508","wires":[["fd5f6afc.5b61a8"]]},{"id":"ed427ea8.f19f5","type":"execute","name":"Stop","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='stopServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$stop-vm-url`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />\n","comments":"","outputs":1,"x":1105.3989791870117,"y":605.2190837860107,"z":"a6b16db5.af508","wires":[["b5b4b5a6.7469d8","d5e5239f.dcc79"]]},{"id":"b5b4b5a6.7469d8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1226.303726196289,"y":770.7907104492188,"z":"a6b16db5.af508","wires":[["ed170974.4288c8"]]},{"id":"d5e5239f.dcc79","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1261.5160751342773,"y":572.1476917266846,"z":"a6b16db5.af508","wires":[["249fafc6.75699"]]},{"id":"a3ddab0f.be74c8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1904.9443244934082,"y":761.433759689331,"z":"a6b16db5.af508","wires":[["dbdf325c.08025","f2981778.0beac8","e1c0fbcb.5e70d8"]]},{"id":"dbdf325c.08025","type":"set","name":"Set error message","xml":"<set>\n<parameter name='event-message' value=\"`'Failure while stopping the server: ' + $stop-vm-url`\"/>\n","comments":"","x":2087.516101837158,"y":722.1479930877686,"z":"a6b16db5.af508","wires":[]},{"id":"f2981778.0beac8","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2079.945056915283,"y":762.3383617401123,"z":"a6b16db5.af508","wires":[[]]},{"id":"44750395.80221c","type":"set","name":"Set Success Message","xml":"<set>\n<parameter name='success-message' value=\"`'Stop succeeded for the server : ' + $stop-vm-url`\"/>\n\n\n","comments":"","x":1916.2298202514648,"y":403.2907085418701,"z":"a6b16db5.af508","wires":[]},{"id":"5c22eb96.f3da94","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1906.0870056152344,"y":454.86212062835693,"z":"a6b16db5.af508","wires":[[]]},{"id":"64459e63.09ed5","type":"switchNode","name":"switch:Last Attempt","xml":"<switch test='`$stopRetryCount == $retryIndex`'>\n","comments":"","outputs":1,"x":1554.9280242919922,"y":767.0052223205566,"z":"a6b16db5.af508","wires":[["76293fdb.a702e","c9e6ef87.507db"]]},{"id":"c9e6ef87.507db","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1763.8207893371582,"y":759.3266429901123,"z":"a6b16db5.af508","wires":[["a3ddab0f.be74c8"]]},{"id":"76293fdb.a702e","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1749.1777744293213,"y":872.0405941009521,"z":"a6b16db5.af508","wires":[["ebef8c77.3f0be"]]},{"id":"2b09b8ff.3e3148","type":"for","name":"Loop","xml":"<for index=\"retryIndex\" start=\"1\" end=\"`$stopRetryCount + 1`\" >","comments":"","outputs":1,"x":614.6270370483398,"y":610.1476726531982,"z":"a6b16db5.af508","wires":[["9f75fd7d.6a168"]]},{"id":"ebef8c77.3f0be","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Stop attempt ' + $retryIndex + ' of ' + $stopRetryCount + ' failed for server : ' + $stop-vm-url + '. Retrying.'`\"/>\n","comments":"","outputs":1,"x":1992.2613925933838,"y":870.2905941009521,"z":"a6b16db5.af508","wires":[[]]},{"id":"e1c0fbcb.5e70d8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2095.960437774658,"y":811.5766429901123,"z":"a6b16db5.af508","wires":[]},{"id":"ab4f157e.b95da8","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1914.3252487182617,"y":579.4334754943848,"z":"a6b16db5.af508","wires":[]},{"id":"249fafc6.75699","type":"switchNode","name":"switch STATUS","xml":"<switch test='`$STOP_STATUS`'>\n","comments":"","outputs":1,"x":1422.3092880249023,"y":573.7031383514404,"z":"a6b16db5.af508","wires":[["bfaa23ff.9722f","6d690331.49ee2c","335e834f.a28b2c"]]},{"id":"bfaa23ff.9722f","type":"other","name":"ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":1503.8330841064453,"y":659.6078596115112,"z":"a6b16db5.af508","wires":[["ed170974.4288c8"]]},{"id":"6d690331.49ee2c","type":"success","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1669.2617568969727,"y":542.6078939437866,"z":"a6b16db5.af508","wires":[["85005452.136278"]]},{"id":"ed170974.4288c8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1387.2457962036133,"y":767.8937721252441,"z":"a6b16db5.af508","wires":[["64459e63.09ed5"]]},{"id":"fd5f6afc.5b61a8","type":"switchNode","name":"switch STATUS","xml":"<switch test='`$STOP_STATUS`'>\n","comments":"","outputs":1,"x":238.10294723510742,"y":523.8015937805176,"z":"a6b16db5.af508","wires":[["517f7561.af124c","15485fed.56523","ddbde736.0b20d8","4810dc09.1ec194"]]},{"id":"15485fed.56523","type":"other","name":"ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":412.3886528015137,"y":588.087329864502,"z":"a6b16db5.af508","wires":[["8f66cbff.7a29e8"]]},{"id":"517f7561.af124c","type":"success","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":407.8174858093262,"y":461.08732986450195,"z":"a6b16db5.af508","wires":[["8f66cbff.7a29e8"]]},{"id":"ddbde736.0b20d8","type":"other","name":"CONTEXT_NOT_FOUND","xml":"<outcome value='CONTEXT_NOT_FOUND'>\n","comments":"","outputs":1,"x":419.53152084350586,"y":676.6587200164795,"z":"a6b16db5.af508","wires":[["b496c2e5.7e0b7"]]},{"id":"335e834f.a28b2c","type":"other","name":"CONTEXT_NOT_FOUND","xml":"<outcome value='CONTEXT_NOT_FOUND'>\n","comments":"","outputs":1,"x":1725.245979309082,"y":622.3729629516602,"z":"a6b16db5.af508","wires":[["a3ddab0f.be74c8"]]},{"id":"784c3e4a.5134e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":499.5314750671387,"y":878.0872135162354,"z":"a6b16db5.af508","wires":[]},{"id":"b496c2e5.7e0b7","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":275.2457695007324,"y":826.658694267273,"z":"a6b16db5.af508","wires":[["784c3e4a.5134e","34ff62bb.1ea1ce","c3ad6392.97ef"]]},{"id":"4810dc09.1ec194","type":"success","name":"EMPTY","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":408.1029472351074,"y":520.9444465637207,"z":"a6b16db5.af508","wires":[["8f66cbff.7a29e8"]]},{"id":"34ff62bb.1ea1ce","type":"set","name":"Set error message","xml":"<set>\n<parameter name='event-message' value=\"Invalid AICIdentity or tenant or credentials\"/>\n","comments":"","x":523.8172416687012,"y":782.3729972839355,"z":"a6b16db5.af508","wires":[]},{"id":"c3ad6392.97ef","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":506.24620056152344,"y":823.9919185638428,"z":"a6b16db5.af508","wires":[[]]},{"id":"8f66cbff.7a29e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":616.6743812561035,"y":516.6587257385254,"z":"a6b16db5.af508","wires":[["614e98a0.740898","2b09b8ff.3e3148","630a1e7d.61b31"]]},{"id":"614e98a0.740898","type":"switchNode","name":"switch : stopRetryCount >= 0","xml":"<switch test='`$stopRetryCount >= 0`'>\n","comments":"","outputs":1,"x":886.6744194030762,"y":448.08729553222656,"z":"a6b16db5.af508","wires":[["1f5b5e63.c28f42","e7474230.d8845"]]},{"id":"1f5b5e63.c28f42","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1103.817211151123,"y":406.65876388549805,"z":"a6b16db5.af508","wires":[["e793bc34.ec31a"]]},{"id":"e7474230.d8845","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1110.9600982666016,"y":483.80166721343994,"z":"a6b16db5.af508","wires":[["af7b47ca.fc8588"]]},{"id":"af7b47ca.fc8588","type":"set","name":"increment stopRetryCount","xml":"<set>\n<parameter name=\"stopRetryCount\" value=\"`$stopRetryCount + 1`\" />\n","comments":"","x":1293.817195892334,"y":482.37305450439453,"z":"a6b16db5.af508","wires":[]},{"id":"e793bc34.ec31a","type":"set","name":"set stopRetryCount","xml":"<set>\n<parameter name='stopRetryCount' value='1' />\n","comments":"","x":1275.2457847595215,"y":405.2301845550537,"z":"a6b16db5.af508","wires":[]},{"id":"85005452.136278","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1691.515609741211,"y":450.1476058959961,"z":"a6b16db5.af508","wires":[["44750395.80221c","5c22eb96.f3da94","ab4f157e.b95da8","40c219cc.406928"]]},{"id":"630a1e7d.61b31","type":"set","name":"initialize exitLoop","xml":"<set>\n<parameter name='exitLoop' value='false' />\n","comments":"","x":851.5155944824219,"y":340.14762115478516,"z":"a6b16db5.af508","wires":[]},{"id":"40c219cc.406928","type":"set","name":"set exitLoop","xml":"<set>\n<parameter name='exitLoop' value='true' />\n","comments":"","x":1921.5157165527344,"y":514.4333572387695,"z":"a6b16db5.af508","wires":[]},{"id":"9f75fd7d.6a168","type":"switchNode","name":"switch exitLoop","xml":"<switch test='`$exitLoop`'>\n","comments":"","outputs":1,"x":781.5155944824219,"y":608.7190322875977,"z":"a6b16db5.af508","wires":[["e7b114e6.a3f9c8","91b0004b.02402"]]},{"id":"e7b114e6.a3f9c8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":950.0869522094727,"y":610.1476383209229,"z":"a6b16db5.af508","wires":[["ed427ea8.f19f5"]]},{"id":"91b0004b.02402","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":947.2299499511719,"y":675.861946105957,"z":"a6b16db5.af508","wires":[[]]}]
+[{"id":"1cef050a.1dfbcb","type":"dgstart","name":"DGSTART","outputs":1,"x":141.515625,"y":164.4333267211914,"z":"a6b16db5.af508","wires":[["a9d8f072.10cbd"]]},{"id":"a9d8f072.10cbd","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":318.5157165527344,"y":164,"z":"a6b16db5.af508","wires":[["46c68f6c.01837"]]},{"id":"46c68f6c.01837","type":"method","name":"StopVM_VM","xml":"<method rpc='StopVM_VM' mode='sync'>\n","comments":"","outputs":1,"x":260.97997665405273,"y":255.8214054107666,"z":"a6b16db5.af508","wires":[["fd5f6afc.5b61a8"]]},{"id":"ed427ea8.f19f5","type":"execute","name":"Stop","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='stopServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$stop-vm-url`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n","comments":"","outputs":1,"x":1105.3989791870117,"y":605.2190837860107,"z":"a6b16db5.af508","wires":[["b5b4b5a6.7469d8","d5e5239f.dcc79"]]},{"id":"b5b4b5a6.7469d8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1226.303726196289,"y":770.7907104492188,"z":"a6b16db5.af508","wires":[["ed170974.4288c8"]]},{"id":"d5e5239f.dcc79","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1261.5160751342773,"y":572.1476917266846,"z":"a6b16db5.af508","wires":[["249fafc6.75699"]]},{"id":"a3ddab0f.be74c8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1904.9443244934082,"y":761.433759689331,"z":"a6b16db5.af508","wires":[["dbdf325c.08025","f2981778.0beac8","e1c0fbcb.5e70d8"]]},{"id":"dbdf325c.08025","type":"set","name":"Set error message","xml":"<set>\n<parameter name='event-message' value=\"`'Failure while stopping the server: ' + $stop-vm-url`\"/>\n","comments":"","x":2087.516101837158,"y":722.1479930877686,"z":"a6b16db5.af508","wires":[]},{"id":"f2981778.0beac8","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2079.945056915283,"y":762.3383617401123,"z":"a6b16db5.af508","wires":[[]]},{"id":"44750395.80221c","type":"set","name":"Set Success Message","xml":"<set>\n<parameter name='success-message' value=\"`'Stop succeeded for the server : ' + $stop-vm-url`\"/>\n\n\n","comments":"","x":1916.2298202514648,"y":403.2907085418701,"z":"a6b16db5.af508","wires":[]},{"id":"5c22eb96.f3da94","type":"record","name":"Log message","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1906.0870056152344,"y":454.86212062835693,"z":"a6b16db5.af508","wires":[[]]},{"id":"64459e63.09ed5","type":"switchNode","name":"switch:Last Attempt","xml":"<switch test='`$stopRetryCount == $retryIndex`'>\n","comments":"","outputs":1,"x":1554.9280242919922,"y":767.0052223205566,"z":"a6b16db5.af508","wires":[["76293fdb.a702e","c9e6ef87.507db"]]},{"id":"c9e6ef87.507db","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1763.8207893371582,"y":759.3266429901123,"z":"a6b16db5.af508","wires":[["a3ddab0f.be74c8"]]},{"id":"76293fdb.a702e","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1749.1777744293213,"y":872.0405941009521,"z":"a6b16db5.af508","wires":[["ebef8c77.3f0be"]]},{"id":"2b09b8ff.3e3148","type":"for","name":"Loop","xml":"<for index=\"retryIndex\" start=\"1\" end=\"`$stopRetryCount + 1`\" >","comments":"","outputs":1,"x":614.6270370483398,"y":610.1476726531982,"z":"a6b16db5.af508","wires":[["9f75fd7d.6a168"]]},{"id":"ebef8c77.3f0be","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Stop attempt ' + $retryIndex + ' of ' + $stopRetryCount + ' failed for server : ' + $stop-vm-url + '. Retrying.'`\"/>\n","comments":"","outputs":1,"x":1992.2613925933838,"y":870.2905941009521,"z":"a6b16db5.af508","wires":[[]]},{"id":"e1c0fbcb.5e70d8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2095.960437774658,"y":811.5766429901123,"z":"a6b16db5.af508","wires":[]},{"id":"ab4f157e.b95da8","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1914.3252487182617,"y":579.4334754943848,"z":"a6b16db5.af508","wires":[]},{"id":"249fafc6.75699","type":"switchNode","name":"switch STATUS","xml":"<switch test='`$STOP_STATUS`'>\n","comments":"","outputs":1,"x":1422.3092880249023,"y":573.7031383514404,"z":"a6b16db5.af508","wires":[["bfaa23ff.9722f","6d690331.49ee2c","335e834f.a28b2c"]]},{"id":"bfaa23ff.9722f","type":"other","name":"ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":1503.8330841064453,"y":659.6078596115112,"z":"a6b16db5.af508","wires":[["ed170974.4288c8"]]},{"id":"6d690331.49ee2c","type":"success","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1669.2617568969727,"y":542.6078939437866,"z":"a6b16db5.af508","wires":[["85005452.136278"]]},{"id":"ed170974.4288c8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1387.2457962036133,"y":767.8937721252441,"z":"a6b16db5.af508","wires":[["64459e63.09ed5"]]},{"id":"fd5f6afc.5b61a8","type":"switchNode","name":"switch STATUS","xml":"<switch test='`$STOP_STATUS`'>\n","comments":"","outputs":1,"x":238.10294723510742,"y":523.8015937805176,"z":"a6b16db5.af508","wires":[["517f7561.af124c","15485fed.56523","ddbde736.0b20d8","4810dc09.1ec194"]]},{"id":"15485fed.56523","type":"other","name":"ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":412.3886528015137,"y":588.087329864502,"z":"a6b16db5.af508","wires":[["8f66cbff.7a29e8"]]},{"id":"517f7561.af124c","type":"success","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":407.8174858093262,"y":461.08732986450195,"z":"a6b16db5.af508","wires":[["8f66cbff.7a29e8"]]},{"id":"ddbde736.0b20d8","type":"other","name":"CONTEXT_NOT_FOUND","xml":"<outcome value='CONTEXT_NOT_FOUND'>\n","comments":"","outputs":1,"x":419.53152084350586,"y":676.6587200164795,"z":"a6b16db5.af508","wires":[["b496c2e5.7e0b7"]]},{"id":"335e834f.a28b2c","type":"other","name":"CONTEXT_NOT_FOUND","xml":"<outcome value='CONTEXT_NOT_FOUND'>\n","comments":"","outputs":1,"x":1725.245979309082,"y":622.3729629516602,"z":"a6b16db5.af508","wires":[["a3ddab0f.be74c8"]]},{"id":"784c3e4a.5134e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":499.5314750671387,"y":878.0872135162354,"z":"a6b16db5.af508","wires":[]},{"id":"b496c2e5.7e0b7","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":275.2457695007324,"y":826.658694267273,"z":"a6b16db5.af508","wires":[["784c3e4a.5134e","34ff62bb.1ea1ce","c3ad6392.97ef"]]},{"id":"4810dc09.1ec194","type":"success","name":"EMPTY","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":408.1029472351074,"y":520.9444465637207,"z":"a6b16db5.af508","wires":[["8f66cbff.7a29e8"]]},{"id":"34ff62bb.1ea1ce","type":"set","name":"Set error message","xml":"<set>\n<parameter name='event-message' value=\"Invalid AICIdentity or tenant or credentials\"/>\n","comments":"","x":523.8172416687012,"y":782.3729972839355,"z":"a6b16db5.af508","wires":[]},{"id":"c3ad6392.97ef","type":"record","name":"Log error","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":506.24620056152344,"y":823.9919185638428,"z":"a6b16db5.af508","wires":[[]]},{"id":"8f66cbff.7a29e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":616.6743812561035,"y":516.6587257385254,"z":"a6b16db5.af508","wires":[["614e98a0.740898","2b09b8ff.3e3148","630a1e7d.61b31"]]},{"id":"614e98a0.740898","type":"switchNode","name":"switch : stopRetryCount >= 0","xml":"<switch test='`$stopRetryCount >= 0`'>\n","comments":"","outputs":1,"x":886.6744194030762,"y":448.08729553222656,"z":"a6b16db5.af508","wires":[["1f5b5e63.c28f42","e7474230.d8845"]]},{"id":"1f5b5e63.c28f42","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1103.817211151123,"y":406.65876388549805,"z":"a6b16db5.af508","wires":[["e793bc34.ec31a"]]},{"id":"e7474230.d8845","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1110.9600982666016,"y":483.80166721343994,"z":"a6b16db5.af508","wires":[["af7b47ca.fc8588"]]},{"id":"af7b47ca.fc8588","type":"set","name":"increment stopRetryCount","xml":"<set>\n<parameter name=\"stopRetryCount\" value=\"`$stopRetryCount + 1`\" />\n","comments":"","x":1293.817195892334,"y":482.37305450439453,"z":"a6b16db5.af508","wires":[]},{"id":"e793bc34.ec31a","type":"set","name":"set stopRetryCount","xml":"<set>\n<parameter name='stopRetryCount' value='1' />\n","comments":"","x":1275.2457847595215,"y":405.2301845550537,"z":"a6b16db5.af508","wires":[]},{"id":"85005452.136278","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1691.515609741211,"y":450.1476058959961,"z":"a6b16db5.af508","wires":[["44750395.80221c","5c22eb96.f3da94","ab4f157e.b95da8","40c219cc.406928"]]},{"id":"630a1e7d.61b31","type":"set","name":"initialize exitLoop","xml":"<set>\n<parameter name='exitLoop' value='false' />\n","comments":"","x":851.5155944824219,"y":340.14762115478516,"z":"a6b16db5.af508","wires":[]},{"id":"40c219cc.406928","type":"set","name":"set exitLoop","xml":"<set>\n<parameter name='exitLoop' value='true' />\n","comments":"","x":1921.5157165527344,"y":514.4333572387695,"z":"a6b16db5.af508","wires":[]},{"id":"9f75fd7d.6a168","type":"switchNode","name":"switch exitLoop","xml":"<switch test='`$exitLoop`'>\n","comments":"","outputs":1,"x":781.5155944824219,"y":608.7190322875977,"z":"a6b16db5.af508","wires":[["e7b114e6.a3f9c8","91b0004b.02402"]]},{"id":"e7b114e6.a3f9c8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":950.0869522094727,"y":610.1476383209229,"z":"a6b16db5.af508","wires":[["ed427ea8.f19f5"]]},{"id":"91b0004b.02402","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":947.2299499511719,"y":675.861946105957,"z":"a6b16db5.af508","wires":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Stop_VM_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Stop_VM_2.0.0.json
index 567362172..872ee1be0 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Stop_VM_2.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Stop_VM_2.0.0.json
@@ -51,7 +51,7 @@
     "id": "546085a8.48136c",
     "type": "execute",
     "name": "Resolve Stop Application DG",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcFlow[$i].vnfcType`' /> \n<parameter name=\"action\" value=\"Stop_Application\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value='StopApplication' />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcFlow[$i].vnfcType`' /> \n<parameter name=\"action\" value=\"Stop_Application\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value='StopApplication' />",
     "comments": "",
     "outputs": 1,
     "x": 315.5,
@@ -433,7 +433,7 @@
     "id": "1dffaf3f.e12151",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\"/>",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 2509,
@@ -519,7 +519,7 @@
     "id": "5fb32110.cadf8",
     "type": "execute",
     "name": "Report Error",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />",
     "comments": "",
     "outputs": 1,
     "x": 2478,
@@ -572,7 +572,7 @@
     "id": "2b14f2c8.13f01e",
     "type": "execute",
     "name": "Report Success",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\" />",
     "comments": "",
     "outputs": 1,
     "x": 2684.5,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Stop_VNFC_2.0.2.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Stop_VNFC_2.0.2.json
index eb25a24d6..4cb03c82f 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Stop_VNFC_2.0.2.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Stop_VNFC_2.0.2.json
@@ -71,7 +71,7 @@
     "id": "7faaeb57.5e7824",
     "type": "execute",
     "name": "Update_AAI_Stopping",
-    "xml": "<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Stopping\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Stopping\" />",
     "comments": "",
     "outputs": 1,
     "x": 920.00048828125,
@@ -258,7 +258,7 @@
     "id": "b834e7a3.fb5ca8",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 2391.1122131347656,
@@ -285,7 +285,7 @@
     "id": "8cac271.4e263d8",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>\n\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>\n\n",
     "comments": "",
     "outputs": 1,
     "x": 2063.2223358154297,
@@ -323,7 +323,7 @@
     "id": "71a4120e.5d054c",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 2112.2223358154297,
@@ -339,7 +339,7 @@
     "id": "fdb3d9d6.7fb368",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNF details in A&amp;AI for : '+ $vnfcName`\"/>\n\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while updating VNF details in A&amp;AI for : '+ $vnfcName`\"/>\n\n",
     "comments": "",
     "outputs": 1,
     "x": 2391.2220764160156,
@@ -382,7 +382,7 @@
     "id": "c04c4a2.7a0a3b8",
     "type": "execute",
     "name": "Update_AA&I_Error",
-    "xml": "<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />\n",
+    "xml": "<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />\n",
     "comments": "",
     "outputs": 1,
     "x": 1292.0003967285156,
@@ -400,7 +400,7 @@
     "id": "2b6c1bfa.73a104",
     "type": "execute",
     "name": "update_AA&I_Stopped",
-    "xml": "<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Stopped\" />\n",
+    "xml": "<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Stopped\" />\n",
     "comments": "",
     "outputs": 1,
     "x": 1268.4282531738281,
@@ -601,7 +601,7 @@
     "id": "b06e9efa.c9bbb",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\"/>",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`$event-message`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 1189.0896606445312,
@@ -755,7 +755,7 @@
     "id": "ecdcb16f.8d932",
     "type": "execute",
     "name": "Report_Error_To_DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />",
     "comments": "",
     "outputs": 1,
     "x": 2441.666793823242,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Stop_VNF_2.0.1.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Stop_VNF_2.0.1.json
index 56fea3df2..37689727d 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Stop_VNF_2.0.1.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Stop_VNF_2.0.1.json
@@ -51,7 +51,7 @@
     "id": "83e59925.56b318",
     "type": "execute",
     "name": "execute_getVNF_Hierarchy",
-    "xml": "<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />",
     "comments": "",
     "outputs": 1,
     "x": 322.80625915527344,
@@ -135,7 +135,7 @@
     "id": "a282aae0.bfc518",
     "type": "execute",
     "name": "execute_UpdateAA&I",
-    "xml": "<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $vnf.vnfc[$i].name' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Stopping\" />\n",
+    "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $vnf.vnfc[$i].name' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Stopping\" />\n",
     "comments": "",
     "outputs": 1,
     "x": 1797.0922775268555,
@@ -222,7 +222,7 @@
     "id": "e6d70e75.2a057",
     "type": "execute",
     "name": "execute_update_AA&I",
-    "xml": "<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $vnf.vnfc[$i].name' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Stopped\" />\n",
+    "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $vnf.vnfc[$i].name' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Stopped\" />\n",
     "comments": "",
     "outputs": 1,
     "x": 4344.520042419434,
@@ -309,7 +309,7 @@
     "id": "7dd6f598.8b1cec",
     "type": "execute",
     "name": "execute_Update_AA&I",
-    "xml": "<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $vnf.vnfc[$i].name' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />\n",
+    "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $vnf.vnfc[$i].name' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />\n",
     "comments": "",
     "outputs": 1,
     "x": 4870.092239379883,
@@ -544,7 +544,7 @@
     "id": "309772d8.4e5b7e",
     "type": "execute",
     "name": "execute_STOP",
-    "xml": "<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='stopServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$vnf.vnfc[$i].vm[$j].url`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />\n\n",
+    "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='stopServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$vnf.vnfc[$i].vm[$j].url`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n\n",
     "comments": "",
     "outputs": 1,
     "x": 3332.092124938965,
@@ -901,7 +901,7 @@
     "id": "12e86e5e.c1b0e2",
     "type": "execute",
     "name": "execute",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Exception in getting VNF Hierachy\" />\n\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Exception in getting VNF Hierachy\" />\n\n",
     "comments": "",
     "outputs": 1,
     "x": 924.2348518371582,
@@ -949,7 +949,7 @@
     "id": "2d0d48a.2de4bb8",
     "type": "execute",
     "name": "execute",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in getting VNF Hierachy\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in getting VNF Hierachy\" />",
     "comments": "",
     "outputs": 1,
     "x": 1318.7348976135254,
@@ -997,7 +997,7 @@
     "id": "31b238ff.837628",
     "type": "execute",
     "name": "execute",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"VM Count is 0\" />\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"VM Count is 0\" />\n",
     "comments": "",
     "outputs": 1,
     "x": 1632.8066139221191,
@@ -1045,7 +1045,7 @@
     "id": "94ab01a4.1db23",
     "type": "execute",
     "name": "execute",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $vnf.vnfc[$i].name`\" />\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $vnf.vnfc[$i].name`\" />\n",
     "comments": "",
     "outputs": 1,
     "x": 2190.8065032958984,
@@ -1093,7 +1093,7 @@
     "id": "2a4a5a93.3d21a6",
     "type": "execute",
     "name": "execute",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc ' + $vnf.vnfc[$i].name`\" />\n\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc ' + $vnf.vnfc[$i].name`\" />\n\n",
     "comments": "",
     "outputs": 1,
     "x": 2834.0919036865234,
@@ -1141,7 +1141,7 @@
     "id": "aea4cad3.f582f8",
     "type": "execute",
     "name": "execute",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $vnf.vnfc[$i].name`\" />\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $vnf.vnfc[$i].name`\" />\n",
     "comments": "",
     "outputs": 1,
     "x": 2888.2349891662598,
@@ -1189,7 +1189,7 @@
     "id": "8c1c2d57.93d6f",
     "type": "execute",
     "name": "Report_Failure_in_Stop",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in stop for:' + $vnf.vnfc[$i].vm[$j].url`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in stop for:' + $vnf.vnfc[$i].vm[$j].url`\" />",
     "comments": "",
     "outputs": 1,
     "x": 4920.235027313232,
@@ -1237,7 +1237,7 @@
     "id": "322d698f.b46f96",
     "type": "execute",
     "name": "Report_Context_not_found",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Context not found:' + $vnf.vnfc[$i].vm[$j].url`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Context not found:' + $vnf.vnfc[$i].vm[$j].url`\" />",
     "comments": "",
     "outputs": 1,
     "x": 4484.377815246582,
@@ -1285,7 +1285,7 @@
     "id": "6a2b403b.59abf",
     "type": "execute",
     "name": "Report_Error_occoured_while_stopping_the_server",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Error occoured while stopping the server:' + $vnf.vnfc[$i].vm[$j].url`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Error occoured while stopping the server:' + $vnf.vnfc[$i].vm[$j].url`\" />",
     "comments": "",
     "outputs": 1,
     "x": 4302.663665771484,
@@ -1369,7 +1369,7 @@
     "id": "cbb3c57f.95eb28",
     "type": "execute",
     "name": "execute",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $vnf.vnfc[$i].name`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $vnf.vnfc[$i].name`\" />",
     "comments": "",
     "outputs": 1,
     "x": 5251.949172973633,
@@ -1385,7 +1385,7 @@
     "id": "7a001de8.702584",
     "type": "execute",
     "name": "execute",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc' + $vnf.vnfc[$i].name`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc' + $vnf.vnfc[$i].name`\" />",
     "comments": "",
     "outputs": 1,
     "x": 5267.8060302734375,
@@ -1429,7 +1429,7 @@
     "id": "746b0185.8192d",
     "type": "execute",
     "name": "execute",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $vnf.vnfc[$i].name`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $vnf.vnfc[$i].name`\" />",
     "comments": "",
     "outputs": 1,
     "x": 4877.234405517578,
@@ -1475,7 +1475,7 @@
     "id": "44594fa2.fbe3f",
     "type": "execute",
     "name": "execute: flatAndAddToContext",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
     "comments": "",
     "outputs": 1,
     "x": 168.80625915527344,
@@ -1522,7 +1522,7 @@
     "id": "ac55cbef.3c59f8",
     "type": "execute",
     "name": "execute",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $vnf.vnfc[$i].name`\" />\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $vnf.vnfc[$i].name`\" />\n",
     "comments": "",
     "outputs": 1,
     "x": 5425.235069274902,
@@ -1581,7 +1581,7 @@
     "id": "d2b1eb53.8867c8",
     "type": "execute",
     "name": "execute",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $vnf.vnfc[$i].name`\" />\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $vnf.vnfc[$i].name`\" />\n",
     "comments": "",
     "outputs": 1,
     "x": 6136.092121124268,
@@ -1640,7 +1640,7 @@
     "id": "a1f75570.727518",
     "type": "execute",
     "name": "execute",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value='Exception in AAI Update for vnfc $vnf.vnfc[$i].name' />\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value='Exception in AAI Update for vnfc $vnf.vnfc[$i].name' />\n",
     "comments": "",
     "outputs": 1,
     "x": 5873.520835876465,
@@ -1699,7 +1699,7 @@
     "id": "e0347aed.5c5778",
     "type": "execute",
     "name": "Report_Error_Flattening_Payload_Json",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />",
     "comments": "",
     "outputs": 1,
     "x": 566.3776702880859,
@@ -1774,7 +1774,7 @@
     "id": "ae76c4ea.4835d8",
     "type": "execute",
     "name": "Report_Error_Loading_Json_Flattening_Plugin",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />",
     "comments": "",
     "outputs": 1,
     "x": 573.3776741027832,
@@ -1820,7 +1820,7 @@
     "id": "e2750964.bdc668",
     "type": "execute",
     "name": "Report_Success_in_Stop",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'STOP event executed successfully for ' + $vnf.vnfc[$i].vm[$j].url`\" />\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'STOP event executed successfully for ' + $vnf.vnfc[$i].vm[$j].url`\" />\n",
     "comments": "",
     "outputs": 1,
     "x": 3835.139602661133,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Stop_VNF_2.0.2.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Stop_VNF_2.0.2.json
index c2329de2a..357dcf383 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Stop_VNF_2.0.2.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Stop_VNF_2.0.2.json
@@ -99,7 +99,7 @@
     "id": "dd256332.18b52",
     "type": "execute",
     "name": "flatAndAddToContext",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
     "comments": "",
     "outputs": 1,
     "x": 422.5157165527344,
@@ -134,7 +134,7 @@
     "id": "c02b5f84.eb026",
     "type": "execute",
     "name": "execute_getVnfHierarchy",
-    "xml": "<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />\n",
+    "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />\n",
     "comments": "",
     "outputs": 1,
     "x": 434.182373046875,
@@ -281,7 +281,7 @@
     "id": "1de7ef77.6f1701",
     "type": "execute",
     "name": "Get VNFC Execution Flow Data",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.VnfExecutionFlow' method='getVnfExecutionFlowData' >\n<parameter name=\"DependencyType\" value='RESOURCE' />\n<parameter name=\"FlowStrategy\" value='REVERSE' />\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfVersion\" value='`$vnf.version`' />\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.VnfExecutionFlow' method='getVnfExecutionFlowData' >\n<parameter name=\"DependencyType\" value='RESOURCE' />\n<parameter name=\"FlowStrategy\" value='REVERSE' />\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfVersion\" value='`$vnf.version`' />\n",
     "comments": "",
     "outputs": 1,
     "x": 596.1823120117188,
@@ -332,7 +332,7 @@
     "id": "6a4cb650.71b798",
     "type": "execute",
     "name": "Report Error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />",
     "comments": "",
     "outputs": 1,
     "x": 2930.0870666503906,
@@ -391,7 +391,7 @@
     "id": "1c582707.184b99",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failed to retrieve VNF details from A&amp;AI\"/>\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failed to retrieve VNF details from A&amp;AI\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 1281.9598999023438,
@@ -452,7 +452,7 @@
     "id": "58014ac2.8034f4",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failed to retrieve VNF details from A&amp;AI\"/>\n\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failed to retrieve VNF details from A&amp;AI\"/>\n\n",
     "comments": "",
     "outputs": 1,
     "x": 1276.8490600585938,
@@ -513,7 +513,7 @@
     "id": "fe639385.f254b",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />",
     "comments": "",
     "outputs": 1,
     "x": 1287.5156860351562,
@@ -574,7 +574,7 @@
     "id": "ca1fafca.d9e25",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />",
     "comments": "",
     "outputs": 1,
     "x": 1293.515625,
@@ -617,7 +617,7 @@
     "id": "741ec63e.47b658",
     "type": "execute",
     "name": "Resolve VNFC DG",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcFlow[$i].vnfcType`' /> \n<parameter name=\"action\" value=\"Stop\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' /> \n<parameter name=\"prefix\" value=\"Stop\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcFlow[$i].vnfcType`' /> \n<parameter name=\"action\" value=\"Stop\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' /> \n<parameter name=\"prefix\" value=\"Stop\" />",
     "comments": "",
     "outputs": 1,
     "x": 1256.7380676269531,
@@ -748,7 +748,7 @@
     "id": "2b7c2fc2.fce28",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Failed to retrieve VNFC DG for ' + $vnfcFlow[$i].vnfcType`\"/>",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'Failed to retrieve VNFC DG for ' + $vnfcFlow[$i].vnfcType`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 1905.7377624511719,
@@ -814,7 +814,7 @@
     "id": "44681b66.f4c3a4",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'VNFC DG not found for: ' + $vnfcFlow[$i].vnfcName`\"/>",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'VNFC DG not found for: ' + $vnfcFlow[$i].vnfcName`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 2185.960723876953,
@@ -1043,7 +1043,7 @@
     "id": "f7377249.220f5",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Stop DG not found\"/>",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Stop DG not found\"/>",
     "comments": "",
     "outputs": 1,
     "x": 1895.7378845214844,
@@ -1249,7 +1249,7 @@
     "id": "915b6526.fc9068",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failure in flattening payload Json\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failure in flattening payload Json\" />",
     "comments": "",
     "outputs": 1,
     "x": 1266.5155639648438,
@@ -1400,7 +1400,7 @@
     "id": "ae5453ba.3f87c",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'AAI update for VNFC ' + $vnfcName + '  failed. Not proceeding to the next VNFC.'`\" />\n",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"`'AAI update for VNFC ' + $vnfcName + '  failed. Not proceeding to the next VNFC.'`\" />\n",
     "comments": "",
     "outputs": 1,
     "x": 2692.6266174316406,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_FIREWALL_Configure_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_FIREWALL_Configure_2.0.0.json
index cfda47b0b..ffa01e614 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_FIREWALL_Configure_2.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_FIREWALL_Configure_2.0.0.json
@@ -1 +1 @@
-[{"id":"e300eb8d.e228b8","type":"dgstart","name":"DGSTART","outputs":1,"x":146,"y":152,"z":"8266ef6c.2a723","wires":[["78eca58a.cc28fc"]]},{"id":"78eca58a.cc28fc","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":150,"y":242,"z":"8266ef6c.2a723","wires":[["89a3ba51.457e08"]]},{"id":"89a3ba51.457e08","type":"method","name":"FIREWALL_Configure","xml":"<method rpc='FIREWALL_Configure' mode='sync'>\n","comments":"","outputs":1,"x":171,"y":328,"z":"8266ef6c.2a723","wires":[["203050e6.0500a"]]},{"id":"f056109.d3d72f","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"output.status.dgerror.code\" value=\"503\" />\n","comments":"","outputs":1,"x":627,"y":325,"z":"8266ef6c.2a723","wires":[["bb728ed6.12c5","a6f6f578.370da8"]]},{"id":"203050e6.0500a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":426,"y":329,"z":"8266ef6c.2a723","wires":[["f056109.d3d72f"]]},{"id":"bb728ed6.12c5","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":815,"y":335,"z":"8266ef6c.2a723","wires":[["e13eb078.a647"]]},{"id":"e13eb078.a647","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":1001,"y":332,"z":"8266ef6c.2a723","wires":[]},{"id":"a6f6f578.370da8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":773,"y":398,"z":"8266ef6c.2a723","wires":[["e13eb078.a647"]]}]
+[{"id":"e300eb8d.e228b8","type":"dgstart","name":"DGSTART","outputs":1,"x":146,"y":152,"z":"8266ef6c.2a723","wires":[["78eca58a.cc28fc"]]},{"id":"78eca58a.cc28fc","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":150,"y":242,"z":"8266ef6c.2a723","wires":[["89a3ba51.457e08"]]},{"id":"89a3ba51.457e08","type":"method","name":"FIREWALL_Configure","xml":"<method rpc='FIREWALL_Configure' mode='sync'>\n","comments":"","outputs":1,"x":171,"y":328,"z":"8266ef6c.2a723","wires":[["203050e6.0500a"]]},{"id":"f056109.d3d72f","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"output.status.dgerror.code\" value=\"503\" />\n","comments":"","outputs":1,"x":627,"y":325,"z":"8266ef6c.2a723","wires":[["bb728ed6.12c5","a6f6f578.370da8"]]},{"id":"203050e6.0500a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":426,"y":329,"z":"8266ef6c.2a723","wires":[["f056109.d3d72f"]]},{"id":"bb728ed6.12c5","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":815,"y":335,"z":"8266ef6c.2a723","wires":[["e13eb078.a647"]]},{"id":"e13eb078.a647","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":1001,"y":332,"z":"8266ef6c.2a723","wires":[]},{"id":"a6f6f578.370da8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":773,"y":398,"z":"8266ef6c.2a723","wires":[["e13eb078.a647"]]}]
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 4bb050c3b..a08bde568 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
@@ -88,7 +88,7 @@
     "id": "7eaffd91.5e2494",
     "type": "execute",
     "name": "Report Error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 1195.2260360717773,
@@ -324,7 +324,7 @@
     "id": "72158f5.d06fd7",
     "type": "execute",
     "name": "Report Error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 1548.5471420288086,
@@ -560,7 +560,7 @@
     "id": "9380a644.f57908",
     "type": "execute",
     "name": "Report Error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 1645.5338973999023,
@@ -749,7 +749,7 @@
     "id": "dda489b7.a7bc78",
     "type": "execute",
     "name": "Generate output payload",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
+    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
     "comments": "",
     "outputs": 1,
     "x": 593.8887214660645,
@@ -813,7 +813,7 @@
     "id": "34834985.8ba986",
     "type": "execute",
     "name": "Report error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure while generating output payload JSON\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure while generating output payload JSON\" />",
     "comments": "",
     "outputs": 1,
     "x": 1270.460132598877,
@@ -836,7 +836,7 @@
     "id": "5aeed919.b83438",
     "type": "execute",
     "name": "Generate output payload",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
+    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
     "comments": "",
     "outputs": 1,
     "x": 1674.3334579467773,
@@ -900,7 +900,7 @@
     "id": "254d3066.a4bc5",
     "type": "execute",
     "name": "Report error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure while generating output payload JSON\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure while generating output payload JSON\" />",
     "comments": "",
     "outputs": 1,
     "x": 2286.904960632324,
@@ -923,7 +923,7 @@
     "id": "b79736f.f56eac8",
     "type": "execute",
     "name": "Generate output payload",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
+    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
     "comments": "",
     "outputs": 1,
     "x": 1561.1111373901367,
@@ -987,7 +987,7 @@
     "id": "7312ce6e.051b1",
     "type": "execute",
     "name": "Report error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure while generating output payload JSON\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure while generating output payload JSON\" />",
     "comments": "",
     "outputs": 1,
     "x": 2198.6826400756836,
@@ -1047,7 +1047,7 @@
     "id": "93ba279d.5bcbb8",
     "type": "execute",
     "name": "execute CvaasDataIntoContext",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='cvaasFileNameAndFileContentToContext' >\n<parameter name=\"cvaas-directory-path\" value=\"/opt/app/bvc/cvaas\" />\n<parameter name=\"appc-instance-id\" value=\"appc001\" />\n<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='cvaasFileNameAndFileContentToContext' >\n<parameter name=\"cvaas-directory-path\" value=\"/opt/app/bvc/cvaas\" />\n<parameter name=\"appc-instance-id\" value=\"appc001\" />\n<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />",
     "comments": "",
     "outputs": 1,
     "x": 1769.583999633789,
@@ -1109,7 +1109,7 @@
     "id": "d4049805.d34618",
     "type": "execute",
     "name": "execute CheckFileCreated",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='checkFileCreated' >\n<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='checkFileCreated' >\n<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />",
     "comments": "",
     "outputs": 1,
     "x": 2706.364604949951,
@@ -1172,7 +1172,7 @@
     "id": "e5102b5c.3b53c8",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />",
     "comments": "",
     "outputs": 1,
     "x": 3436.0007400512695,
@@ -1196,7 +1196,7 @@
     "id": "892031d3.9e1bd",
     "type": "execute",
     "name": "Report error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 3835.000331878662,
@@ -1232,7 +1232,7 @@
     "id": "a2c9685e.16d318",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />",
     "comments": "",
     "outputs": 1,
     "x": 2398.667205810547,
@@ -1256,7 +1256,7 @@
     "id": "80effa9c.33fce8",
     "type": "execute",
     "name": "Report Error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 2812.7992248535156,
@@ -1293,7 +1293,7 @@
     "id": "d043d660.7cbce8",
     "type": "execute",
     "name": "Set payload in Context",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
     "comments": "",
     "outputs": 1,
     "x": 738.6666793823242,
@@ -1370,7 +1370,7 @@
     "id": "a9abc91a.956e38",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failure in flattening payload Json\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failure in flattening payload Json\" />",
     "comments": "",
     "outputs": 1,
     "x": 1471.666358947754,
@@ -1405,7 +1405,7 @@
     "id": "789d293f.1e9dc8",
     "type": "execute",
     "name": "Report Error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />",
     "comments": "",
     "outputs": 1,
     "x": 1881.3329238891602,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Stop_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Stop_2.0.0.json
index caa6750b3..f043b7adb 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Stop_2.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Stop_2.0.0.json
@@ -1 +1 @@
-[{"id":"7e2fb931.5cb6a8","type":"method","name":"Generic_Stop","xml":"<method rpc='Generic_Stop' mode='sync'>\n","comments":"","outputs":1,"x":246,"y":93,"z":"a4e67f56.cb2c9","wires":[["2587b8bb.e5e958"]]},{"id":"ec3c7234.5264c","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":327,"y":29,"z":"a4e67f56.cb2c9","wires":[["7e2fb931.5cb6a8"]]},{"id":"315a077d.12b998","type":"dgstart","name":"DGSTART","outputs":1,"x":151,"y":29,"z":"a4e67f56.cb2c9","wires":[["ec3c7234.5264c"]]},{"id":"2587b8bb.e5e958","type":"execute","name":"execute_getVNF_Hierarchy","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$org.openecomp.appc.vfid`\" />","comments":"","outputs":1,"x":171,"y":198,"z":"a4e67f56.cb2c9","wires":[["9dcb5f4b.e5edc","cbcbe34a.531c7"]]},{"id":"9dcb5f4b.e5edc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":142,"y":374,"z":"a4e67f56.cb2c9","wires":[["682f2d38.85dcf4"]]},{"id":"ef252110.98a58","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":459,"y":643,"z":"a4e67f56.cb2c9","wires":[["8564038a.20f11","99f8b9e.6458b48"]]},{"id":"8564038a.20f11","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":606,"y":470,"z":"a4e67f56.cb2c9","wires":[["d55f4a78.4ab358"]]},{"id":"d55f4a78.4ab358","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":748,"y":399,"z":"a4e67f56.cb2c9","wires":[["8fc22181.f2a49"]]},{"id":"8fc22181.f2a49","type":"execute","name":"execute_UpdateAA&I","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"STOPPING\" />\n","comments":"","outputs":1,"x":901,"y":470,"z":"a4e67f56.cb2c9","wires":[["a9079be8.d4a478","9876fdec.6f37b"]]},{"id":"a9079be8.d4a478","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1007,"y":244,"z":"a4e67f56.cb2c9","wires":[["8115b889.f550c8"]]},{"id":"99f8b9e.6458b48","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":624,"y":833,"z":"a4e67f56.cb2c9","wires":[]},{"id":"cbcbe34a.531c7","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":403,"y":156,"z":"a4e67f56.cb2c9","wires":[["e1b9b789.f64058"]]},{"id":"88300794.7ebab8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":774,"y":125,"z":"a4e67f56.cb2c9","wires":[]},{"id":"16f41970.2b9937","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1436,"y":335,"z":"a4e67f56.cb2c9","wires":[["209159f2.bcb756"]]},{"id":"c8ee356c.0659d8","type":"execute","name":"execute_update_AA&I","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"STOPPED\" />\n","comments":"","outputs":1,"x":1857,"y":585,"z":"a4e67f56.cb2c9","wires":[["4d7443c4.c8179c","8b55dde0.3bbb"]]},{"id":"4d7443c4.c8179c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2089,"y":733,"z":"a4e67f56.cb2c9","wires":[["f46b9146.02c08"]]},{"id":"e8c9cfc3.43aba","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2436,"y":784,"z":"a4e67f56.cb2c9","wires":[]},{"id":"8b55dde0.3bbb","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2074,"y":400,"z":"a4e67f56.cb2c9","wires":[["c7b8b650.debeb8"]]},{"id":"9876fdec.6f37b","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":740,"y":596,"z":"a4e67f56.cb2c9","wires":[["ee34ffbb.23891"]]},{"id":"e0f1fadf.9c0e38","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":995,"y":762,"z":"a4e67f56.cb2c9","wires":[]},{"id":"25ea35c8.19f71a","type":"execute","name":"execute_Update_AA&I","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"ERROR\" />\n","comments":"","outputs":1,"x":1920.0000305175781,"y":236,"z":"a4e67f56.cb2c9","wires":[["34ca0aa7.90eda6","a0a350ed.07716"]]},{"id":"34ca0aa7.90eda6","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2120,"y":312,"z":"a4e67f56.cb2c9","wires":[["e98338be.9afa58"]]},{"id":"4b5d9174.e2d7d","type":"comment","name":"update VNFCs to STOPPING","info":"","comments":"","x":863,"y":518,"z":"a4e67f56.cb2c9","wires":[]},{"id":"fd5a214f.ebac2","type":"comment","name":"call south bound to STOP VMs","info":"","comments":"","x":1321,"y":63,"z":"a4e67f56.cb2c9","wires":[]},{"id":"69e7f6ee.f0f488","type":"comment","name":"if failure from south bound then update as Error","info":"","comments":"","x":1905,"y":69,"z":"a4e67f56.cb2c9","wires":[]},{"id":"5a8b51ce.7d4ff","type":"comment","name":"STOPPED VNFCs in AA&I","info":"","comments":"","x":2105,"y":574,"z":"a4e67f56.cb2c9","wires":[]},{"id":"6c7dacf5.ea4894","type":"comment","name":"Fetch all VMs and VNFCs from AA&I for given VNF_ID","info":"","comments":"","x":596,"y":182,"z":"a4e67f56.cb2c9","wires":[]},{"id":"84f683a0.d9fcb","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2233,"y":110,"z":"a4e67f56.cb2c9","wires":[]},{"id":"a0a350ed.07716","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2099,"y":148,"z":"a4e67f56.cb2c9","wires":[["84f683a0.d9fcb"]]},{"id":"74105ed4.70bad","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1416,"y":102,"z":"a4e67f56.cb2c9","wires":[["b8a6176c.8ff0e8"]]},{"id":"333d173e.eb68a8","type":"switchNode","name":"switch","xml":"<switch test='`$VNF.VMCount`'>\n","comments":"","outputs":1,"x":136,"y":670.0000305175781,"z":"a4e67f56.cb2c9","wires":[["f1e14e66.f97c6","ddd6b13.e25e15"]]},{"id":"f1e14e66.f97c6","type":"other","name":"outcome_0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":333,"y":552.0000305175781,"z":"a4e67f56.cb2c9","wires":[["debeaa94.ae7058"]]},{"id":"ddd6b13.e25e15","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":319,"y":683.0000305175781,"z":"a4e67f56.cb2c9","wires":[["ef252110.98a58"]]},{"id":"209159f2.bcb756","type":"switchNode","name":"switch","xml":"<switch test='`$STOP_STATUS`'>\n","comments":"","outputs":1,"x":1618,"y":334,"z":"a4e67f56.cb2c9","wires":[["727f90cf.4e78e","6bc80951.a39408","5a17e4b6.24cc2c"]]},{"id":"727f90cf.4e78e","type":"success","name":"outcome_SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1845,"y":464,"z":"a4e67f56.cb2c9","wires":[["c8ee356c.0659d8"]]},{"id":"6bc80951.a39408","type":"other","name":"outcome_SERVER_NOT_FOUND","xml":"<outcome value='SERVER_NOT_FOUND'>\n","comments":"","outputs":1,"x":1608,"y":227,"z":"a4e67f56.cb2c9","wires":[["f58c9809.cd0798"]]},{"id":"5a17e4b6.24cc2c","type":"other","name":"outcome_ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":1783,"y":324,"z":"a4e67f56.cb2c9","wires":[["22896989.a0c9c6"]]},{"id":"6a7166f0.3d8308","type":"execute","name":"execute_STOP","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='stopServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$VNF.VM[$i].URL`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />\n","comments":"","outputs":1,"x":1326,"y":239,"z":"a4e67f56.cb2c9","wires":[["16f41970.2b9937","74105ed4.70bad"]]},{"id":"682f2d38.85dcf4","type":"switchNode","name":"switch","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":128,"y":492.0000305175781,"z":"a4e67f56.cb2c9","wires":[["cbff0a6a.206938","bf5be080.c5c5e"]]},{"id":"bf5be080.c5c5e","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":271,"y":437,"z":"a4e67f56.cb2c9","wires":[["646e1f85.cb186"]]},{"id":"c13b792d.778058","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":483,"y":318,"z":"a4e67f56.cb2c9","wires":[]},{"id":"cbff0a6a.206938","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":129,"y":568.0000305175781,"z":"a4e67f56.cb2c9","wires":[["333d173e.eb68a8"]]},{"id":"10c91a07.a117c6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":583,"y":425,"z":"a4e67f56.cb2c9","wires":[]},{"id":"8115b889.f550c8","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1092,"y":344,"z":"a4e67f56.cb2c9","wires":[["1127dc8f.3f9963","c9595f20.2a9c8","a2f5ef46.94c16"]]},{"id":"1127dc8f.3f9963","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1209,"y":111,"z":"a4e67f56.cb2c9","wires":[["6a7166f0.3d8308"]]},{"id":"c9595f20.2a9c8","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1341,"y":427,"z":"a4e67f56.cb2c9","wires":[["f8f3a23a.eb879"]]},{"id":"8217861.f831678","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1572,"y":559,"z":"a4e67f56.cb2c9","wires":[]},{"id":"a2f5ef46.94c16","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1205,"y":514,"z":"a4e67f56.cb2c9","wires":[["e97be688.52f7b8"]]},{"id":"833e99d3.8e1fc8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1392,"y":748,"z":"a4e67f56.cb2c9","wires":[]},{"id":"c7b8b650.debeb8","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":2251,"y":519,"z":"a4e67f56.cb2c9","wires":[["b7c2ee30.1eb72","e4923dfa.c9afb","b90b071c.055b78"]]},{"id":"b7c2ee30.1eb72","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":2451,"y":422,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"e4923dfa.c9afb","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2456,"y":527,"z":"a4e67f56.cb2c9","wires":[["801303e7.59ed6"]]},{"id":"b90b071c.055b78","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2459,"y":638,"z":"a4e67f56.cb2c9","wires":[["cfc89854.f4d468"]]},{"id":"a69ecbbf.1d5bc8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2798,"y":531,"z":"a4e67f56.cb2c9","wires":[]},{"id":"2edb4a8d.6d3ab6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2854,"y":664,"z":"a4e67f56.cb2c9","wires":[]},{"id":"e98338be.9afa58","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":2225,"y":213,"z":"a4e67f56.cb2c9","wires":[["8822689b.0636b8","d848ce46.2a685","f77fa469.3a14b8"]]},{"id":"8822689b.0636b8","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":2437,"y":102,"z":"a4e67f56.cb2c9","wires":[["81c78045.cc4b7"]]},{"id":"81c78045.cc4b7","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2696,"y":101,"z":"a4e67f56.cb2c9","wires":[]},{"id":"d848ce46.2a685","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2449,"y":184,"z":"a4e67f56.cb2c9","wires":[["9b1f5185.99c3d"]]},{"id":"9b1f5185.99c3d","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2700,"y":185,"z":"a4e67f56.cb2c9","wires":[]},{"id":"f77fa469.3a14b8","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2449,"y":291,"z":"a4e67f56.cb2c9","wires":[["8a3cbd67.71ce4"]]},{"id":"8a3cbd67.71ce4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2705,"y":293,"z":"a4e67f56.cb2c9","wires":[]},{"id":"e1b9b789.f64058","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":623,"y":74,"z":"a4e67f56.cb2c9","wires":[["ad90eade.1e4318","88300794.7ebab8"]]},{"id":"ad90eade.1e4318","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"Exception in getting VNF Hierachy\" />\n<parameter name=\"output.status.message\" value=\"Exception in getting VNF Hierachy\" />\n","comments":"","outputs":1,"x":761,"y":20,"z":"a4e67f56.cb2c9","wires":[["5162c75b.63a0f8"]]},{"id":"5162c75b.63a0f8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":922,"y":32,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"646e1f85.cb186","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":415,"y":253,"z":"a4e67f56.cb2c9","wires":[["c13b792d.778058","cfce6271.431d"]]},{"id":"cfce6271.431d","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"Failure in getting VNF Hierachy\" />\n<parameter name=\"output.status.message\" value=\"Failure in getting VNF Hierachy\" />","comments":"","outputs":1,"x":576,"y":230,"z":"a4e67f56.cb2c9","wires":[["b23db4a.b34b848"]]},{"id":"b23db4a.b34b848","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":713,"y":218,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"debeaa94.ae7058","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":569,"y":352,"z":"a4e67f56.cb2c9","wires":[["10c91a07.a117c6","30d4ccc8.122954"]]},{"id":"30d4ccc8.122954","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"VM Count is 0\" />\n<parameter name=\"output.status.message\" value=\"VM Count is 0\" />","comments":"","outputs":1,"x":671,"y":289,"z":"a4e67f56.cb2c9","wires":[["7e7f8d2.f243e74"]]},{"id":"7e7f8d2.f243e74","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":812,"y":305,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"ee34ffbb.23891","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":819,"y":686,"z":"a4e67f56.cb2c9","wires":[["9c0e0f69.b19d1","e0f1fadf.9c0e38"]]},{"id":"9c0e0f69.b19d1","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name='org.openecomp.appc.dg.error' value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n \n","comments":"","outputs":1,"x":1009,"y":630,"z":"a4e67f56.cb2c9","wires":[["46b448f9.a03378"]]},{"id":"46b448f9.a03378","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1209,"y":717,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"e97be688.52f7b8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1201,"y":590,"z":"a4e67f56.cb2c9","wires":[["c7dca449.abdeb8","833e99d3.8e1fc8"]]},{"id":"c7dca449.abdeb8","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name='org.openecomp.appc.dg.error' value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1390,"y":658,"z":"a4e67f56.cb2c9","wires":[["26eaa68f.bf82ea"]]},{"id":"26eaa68f.bf82ea","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1568,"y":652,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"f8f3a23a.eb879","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1431,"y":503,"z":"a4e67f56.cb2c9","wires":[["8b3b5e98.1be6d","8217861.f831678"]]},{"id":"8b3b5e98.1be6d","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name='org.openecomp.appc.dg.error' value=\"`'VNFC not found in AAI '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1585,"y":461,"z":"a4e67f56.cb2c9","wires":[["13b89cf6.a36ed3"]]},{"id":"13b89cf6.a36ed3","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1693,"y":513,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"b8a6176c.8ff0e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1446,"y":48,"z":"a4e67f56.cb2c9","wires":[["a45ba5fc.9feb68","25ea35c8.19f71a"]]},{"id":"a45ba5fc.9feb68","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name='org.openecomp.appc.dg.error' value=\"`'Failure in stop for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in stop for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1587,"y":29,"z":"a4e67f56.cb2c9","wires":[["9bacb3e0.f2d41"]]},{"id":"9bacb3e0.f2d41","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1741,"y":31,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"f58c9809.cd0798","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1582,"y":164,"z":"a4e67f56.cb2c9","wires":[["25ea35c8.19f71a","10bd5099.1c07bf"]]},{"id":"10bd5099.1c07bf","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name='org.openecomp.appc.dg.error' value=\"`'Stop : Server not found '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Stop : Server not found '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1706,"y":99,"z":"a4e67f56.cb2c9","wires":[["677f73ad.c6c76c"]]},{"id":"677f73ad.c6c76c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1863,"y":102,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"22896989.a0c9c6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1853.9999389648438,"y":163,"z":"a4e67f56.cb2c9","wires":[["25ea35c8.19f71a","1a1bb1b5.d95e6e"]]},{"id":"1a1bb1b5.d95e6e","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name='org.openecomp.appc.dg.error' value=\"`'Stop : Error occoured while stopping the server '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Stop : Error occoured while stopping the server '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1954,"y":144,"z":"a4e67f56.cb2c9","wires":[["89e55d1b.8bacb"]]},{"id":"89e55d1b.8bacb","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2083,"y":109,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"801303e7.59ed6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2623,"y":514,"z":"a4e67f56.cb2c9","wires":[["6cc2dd3a.5ab1c4","a69ecbbf.1d5bc8"]]},{"id":"cfc89854.f4d468","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2627,"y":629,"z":"a4e67f56.cb2c9","wires":[["4f117e3b.87012","2edb4a8d.6d3ab6"]]},{"id":"f46b9146.02c08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2226,"y":729,"z":"a4e67f56.cb2c9","wires":[["30bc77c5.9a7ea8","e8c9cfc3.43aba"]]},{"id":"6cc2dd3a.5ab1c4","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name='org.openecomp.appc.dg.error' value=\"`'VNFC not found in AAI '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2793,"y":473,"z":"a4e67f56.cb2c9","wires":[["b58381a3.ec774"]]},{"id":"4f117e3b.87012","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name='org.openecomp.appc.dg.error' value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2816,"y":592,"z":"a4e67f56.cb2c9","wires":[["ca332e3a.6a09e"]]},{"id":"b58381a3.ec774","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2966,"y":479,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"ca332e3a.6a09e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3049,"y":586,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"30bc77c5.9a7ea8","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name='org.openecomp.appc.dg.error' value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2434,"y":702,"z":"a4e67f56.cb2c9","wires":[["2a4d844.64b3b7c"]]},{"id":"2a4d844.64b3b7c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2593,"y":706,"z":"a4e67f56.cb2c9","wires":[[]]}]
+[{"id":"7e2fb931.5cb6a8","type":"method","name":"Generic_Stop","xml":"<method rpc='Generic_Stop' mode='sync'>\n","comments":"","outputs":1,"x":246,"y":93,"z":"a4e67f56.cb2c9","wires":[["2587b8bb.e5e958"]]},{"id":"ec3c7234.5264c","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":327,"y":29,"z":"a4e67f56.cb2c9","wires":[["7e2fb931.5cb6a8"]]},{"id":"315a077d.12b998","type":"dgstart","name":"DGSTART","outputs":1,"x":151,"y":29,"z":"a4e67f56.cb2c9","wires":[["ec3c7234.5264c"]]},{"id":"2587b8bb.e5e958","type":"execute","name":"execute_getVNF_Hierarchy","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$org.onap.appc.vfid`\" />","comments":"","outputs":1,"x":171,"y":198,"z":"a4e67f56.cb2c9","wires":[["9dcb5f4b.e5edc","cbcbe34a.531c7"]]},{"id":"9dcb5f4b.e5edc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":142,"y":374,"z":"a4e67f56.cb2c9","wires":[["682f2d38.85dcf4"]]},{"id":"ef252110.98a58","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":459,"y":643,"z":"a4e67f56.cb2c9","wires":[["8564038a.20f11","99f8b9e.6458b48"]]},{"id":"8564038a.20f11","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":606,"y":470,"z":"a4e67f56.cb2c9","wires":[["d55f4a78.4ab358"]]},{"id":"d55f4a78.4ab358","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":748,"y":399,"z":"a4e67f56.cb2c9","wires":[["8fc22181.f2a49"]]},{"id":"8fc22181.f2a49","type":"execute","name":"execute_UpdateAA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"STOPPING\" />\n","comments":"","outputs":1,"x":901,"y":470,"z":"a4e67f56.cb2c9","wires":[["a9079be8.d4a478","9876fdec.6f37b"]]},{"id":"a9079be8.d4a478","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1007,"y":244,"z":"a4e67f56.cb2c9","wires":[["8115b889.f550c8"]]},{"id":"99f8b9e.6458b48","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":624,"y":833,"z":"a4e67f56.cb2c9","wires":[]},{"id":"cbcbe34a.531c7","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":403,"y":156,"z":"a4e67f56.cb2c9","wires":[["e1b9b789.f64058"]]},{"id":"88300794.7ebab8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":774,"y":125,"z":"a4e67f56.cb2c9","wires":[]},{"id":"16f41970.2b9937","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1436,"y":335,"z":"a4e67f56.cb2c9","wires":[["209159f2.bcb756"]]},{"id":"c8ee356c.0659d8","type":"execute","name":"execute_update_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"STOPPED\" />\n","comments":"","outputs":1,"x":1857,"y":585,"z":"a4e67f56.cb2c9","wires":[["4d7443c4.c8179c","8b55dde0.3bbb"]]},{"id":"4d7443c4.c8179c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2089,"y":733,"z":"a4e67f56.cb2c9","wires":[["f46b9146.02c08"]]},{"id":"e8c9cfc3.43aba","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2436,"y":784,"z":"a4e67f56.cb2c9","wires":[]},{"id":"8b55dde0.3bbb","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2074,"y":400,"z":"a4e67f56.cb2c9","wires":[["c7b8b650.debeb8"]]},{"id":"9876fdec.6f37b","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":740,"y":596,"z":"a4e67f56.cb2c9","wires":[["ee34ffbb.23891"]]},{"id":"e0f1fadf.9c0e38","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":995,"y":762,"z":"a4e67f56.cb2c9","wires":[]},{"id":"25ea35c8.19f71a","type":"execute","name":"execute_Update_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"ERROR\" />\n","comments":"","outputs":1,"x":1920.0000305175781,"y":236,"z":"a4e67f56.cb2c9","wires":[["34ca0aa7.90eda6","a0a350ed.07716"]]},{"id":"34ca0aa7.90eda6","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2120,"y":312,"z":"a4e67f56.cb2c9","wires":[["e98338be.9afa58"]]},{"id":"4b5d9174.e2d7d","type":"comment","name":"update VNFCs to STOPPING","info":"","comments":"","x":863,"y":518,"z":"a4e67f56.cb2c9","wires":[]},{"id":"fd5a214f.ebac2","type":"comment","name":"call south bound to STOP VMs","info":"","comments":"","x":1321,"y":63,"z":"a4e67f56.cb2c9","wires":[]},{"id":"69e7f6ee.f0f488","type":"comment","name":"if failure from south bound then update as Error","info":"","comments":"","x":1905,"y":69,"z":"a4e67f56.cb2c9","wires":[]},{"id":"5a8b51ce.7d4ff","type":"comment","name":"STOPPED VNFCs in AA&I","info":"","comments":"","x":2105,"y":574,"z":"a4e67f56.cb2c9","wires":[]},{"id":"6c7dacf5.ea4894","type":"comment","name":"Fetch all VMs and VNFCs from AA&I for given VNF_ID","info":"","comments":"","x":596,"y":182,"z":"a4e67f56.cb2c9","wires":[]},{"id":"84f683a0.d9fcb","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2233,"y":110,"z":"a4e67f56.cb2c9","wires":[]},{"id":"a0a350ed.07716","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2099,"y":148,"z":"a4e67f56.cb2c9","wires":[["84f683a0.d9fcb"]]},{"id":"74105ed4.70bad","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1416,"y":102,"z":"a4e67f56.cb2c9","wires":[["b8a6176c.8ff0e8"]]},{"id":"333d173e.eb68a8","type":"switchNode","name":"switch","xml":"<switch test='`$VNF.VMCount`'>\n","comments":"","outputs":1,"x":136,"y":670.0000305175781,"z":"a4e67f56.cb2c9","wires":[["f1e14e66.f97c6","ddd6b13.e25e15"]]},{"id":"f1e14e66.f97c6","type":"other","name":"outcome_0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":333,"y":552.0000305175781,"z":"a4e67f56.cb2c9","wires":[["debeaa94.ae7058"]]},{"id":"ddd6b13.e25e15","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":319,"y":683.0000305175781,"z":"a4e67f56.cb2c9","wires":[["ef252110.98a58"]]},{"id":"209159f2.bcb756","type":"switchNode","name":"switch","xml":"<switch test='`$STOP_STATUS`'>\n","comments":"","outputs":1,"x":1618,"y":334,"z":"a4e67f56.cb2c9","wires":[["727f90cf.4e78e","6bc80951.a39408","5a17e4b6.24cc2c"]]},{"id":"727f90cf.4e78e","type":"success","name":"outcome_SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1845,"y":464,"z":"a4e67f56.cb2c9","wires":[["c8ee356c.0659d8"]]},{"id":"6bc80951.a39408","type":"other","name":"outcome_SERVER_NOT_FOUND","xml":"<outcome value='SERVER_NOT_FOUND'>\n","comments":"","outputs":1,"x":1608,"y":227,"z":"a4e67f56.cb2c9","wires":[["f58c9809.cd0798"]]},{"id":"5a17e4b6.24cc2c","type":"other","name":"outcome_ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":1783,"y":324,"z":"a4e67f56.cb2c9","wires":[["22896989.a0c9c6"]]},{"id":"6a7166f0.3d8308","type":"execute","name":"execute_STOP","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='stopServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$VNF.VM[$i].URL`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n","comments":"","outputs":1,"x":1326,"y":239,"z":"a4e67f56.cb2c9","wires":[["16f41970.2b9937","74105ed4.70bad"]]},{"id":"682f2d38.85dcf4","type":"switchNode","name":"switch","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":128,"y":492.0000305175781,"z":"a4e67f56.cb2c9","wires":[["cbff0a6a.206938","bf5be080.c5c5e"]]},{"id":"bf5be080.c5c5e","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":271,"y":437,"z":"a4e67f56.cb2c9","wires":[["646e1f85.cb186"]]},{"id":"c13b792d.778058","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":483,"y":318,"z":"a4e67f56.cb2c9","wires":[]},{"id":"cbff0a6a.206938","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":129,"y":568.0000305175781,"z":"a4e67f56.cb2c9","wires":[["333d173e.eb68a8"]]},{"id":"10c91a07.a117c6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":583,"y":425,"z":"a4e67f56.cb2c9","wires":[]},{"id":"8115b889.f550c8","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1092,"y":344,"z":"a4e67f56.cb2c9","wires":[["1127dc8f.3f9963","c9595f20.2a9c8","a2f5ef46.94c16"]]},{"id":"1127dc8f.3f9963","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1209,"y":111,"z":"a4e67f56.cb2c9","wires":[["6a7166f0.3d8308"]]},{"id":"c9595f20.2a9c8","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1341,"y":427,"z":"a4e67f56.cb2c9","wires":[["f8f3a23a.eb879"]]},{"id":"8217861.f831678","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1572,"y":559,"z":"a4e67f56.cb2c9","wires":[]},{"id":"a2f5ef46.94c16","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1205,"y":514,"z":"a4e67f56.cb2c9","wires":[["e97be688.52f7b8"]]},{"id":"833e99d3.8e1fc8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1392,"y":748,"z":"a4e67f56.cb2c9","wires":[]},{"id":"c7b8b650.debeb8","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":2251,"y":519,"z":"a4e67f56.cb2c9","wires":[["b7c2ee30.1eb72","e4923dfa.c9afb","b90b071c.055b78"]]},{"id":"b7c2ee30.1eb72","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":2451,"y":422,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"e4923dfa.c9afb","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2456,"y":527,"z":"a4e67f56.cb2c9","wires":[["801303e7.59ed6"]]},{"id":"b90b071c.055b78","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2459,"y":638,"z":"a4e67f56.cb2c9","wires":[["cfc89854.f4d468"]]},{"id":"a69ecbbf.1d5bc8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2798,"y":531,"z":"a4e67f56.cb2c9","wires":[]},{"id":"2edb4a8d.6d3ab6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2854,"y":664,"z":"a4e67f56.cb2c9","wires":[]},{"id":"e98338be.9afa58","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":2225,"y":213,"z":"a4e67f56.cb2c9","wires":[["8822689b.0636b8","d848ce46.2a685","f77fa469.3a14b8"]]},{"id":"8822689b.0636b8","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":2437,"y":102,"z":"a4e67f56.cb2c9","wires":[["81c78045.cc4b7"]]},{"id":"81c78045.cc4b7","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2696,"y":101,"z":"a4e67f56.cb2c9","wires":[]},{"id":"d848ce46.2a685","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2449,"y":184,"z":"a4e67f56.cb2c9","wires":[["9b1f5185.99c3d"]]},{"id":"9b1f5185.99c3d","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2700,"y":185,"z":"a4e67f56.cb2c9","wires":[]},{"id":"f77fa469.3a14b8","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2449,"y":291,"z":"a4e67f56.cb2c9","wires":[["8a3cbd67.71ce4"]]},{"id":"8a3cbd67.71ce4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2705,"y":293,"z":"a4e67f56.cb2c9","wires":[]},{"id":"e1b9b789.f64058","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":623,"y":74,"z":"a4e67f56.cb2c9","wires":[["ad90eade.1e4318","88300794.7ebab8"]]},{"id":"ad90eade.1e4318","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"Exception in getting VNF Hierachy\" />\n<parameter name=\"output.status.message\" value=\"Exception in getting VNF Hierachy\" />\n","comments":"","outputs":1,"x":761,"y":20,"z":"a4e67f56.cb2c9","wires":[["5162c75b.63a0f8"]]},{"id":"5162c75b.63a0f8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":922,"y":32,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"646e1f85.cb186","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":415,"y":253,"z":"a4e67f56.cb2c9","wires":[["c13b792d.778058","cfce6271.431d"]]},{"id":"cfce6271.431d","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"Failure in getting VNF Hierachy\" />\n<parameter name=\"output.status.message\" value=\"Failure in getting VNF Hierachy\" />","comments":"","outputs":1,"x":576,"y":230,"z":"a4e67f56.cb2c9","wires":[["b23db4a.b34b848"]]},{"id":"b23db4a.b34b848","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":713,"y":218,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"debeaa94.ae7058","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":569,"y":352,"z":"a4e67f56.cb2c9","wires":[["10c91a07.a117c6","30d4ccc8.122954"]]},{"id":"30d4ccc8.122954","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"VM Count is 0\" />\n<parameter name=\"output.status.message\" value=\"VM Count is 0\" />","comments":"","outputs":1,"x":671,"y":289,"z":"a4e67f56.cb2c9","wires":[["7e7f8d2.f243e74"]]},{"id":"7e7f8d2.f243e74","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":812,"y":305,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"ee34ffbb.23891","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":819,"y":686,"z":"a4e67f56.cb2c9","wires":[["9c0e0f69.b19d1","e0f1fadf.9c0e38"]]},{"id":"9c0e0f69.b19d1","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n \n","comments":"","outputs":1,"x":1009,"y":630,"z":"a4e67f56.cb2c9","wires":[["46b448f9.a03378"]]},{"id":"46b448f9.a03378","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1209,"y":717,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"e97be688.52f7b8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1201,"y":590,"z":"a4e67f56.cb2c9","wires":[["c7dca449.abdeb8","833e99d3.8e1fc8"]]},{"id":"c7dca449.abdeb8","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1390,"y":658,"z":"a4e67f56.cb2c9","wires":[["26eaa68f.bf82ea"]]},{"id":"26eaa68f.bf82ea","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1568,"y":652,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"f8f3a23a.eb879","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1431,"y":503,"z":"a4e67f56.cb2c9","wires":[["8b3b5e98.1be6d","8217861.f831678"]]},{"id":"8b3b5e98.1be6d","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'VNFC not found in AAI '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1585,"y":461,"z":"a4e67f56.cb2c9","wires":[["13b89cf6.a36ed3"]]},{"id":"13b89cf6.a36ed3","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1693,"y":513,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"b8a6176c.8ff0e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1446,"y":48,"z":"a4e67f56.cb2c9","wires":[["a45ba5fc.9feb68","25ea35c8.19f71a"]]},{"id":"a45ba5fc.9feb68","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'Failure in stop for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in stop for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1587,"y":29,"z":"a4e67f56.cb2c9","wires":[["9bacb3e0.f2d41"]]},{"id":"9bacb3e0.f2d41","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1741,"y":31,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"f58c9809.cd0798","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1582,"y":164,"z":"a4e67f56.cb2c9","wires":[["25ea35c8.19f71a","10bd5099.1c07bf"]]},{"id":"10bd5099.1c07bf","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'Stop : Server not found '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Stop : Server not found '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1706,"y":99,"z":"a4e67f56.cb2c9","wires":[["677f73ad.c6c76c"]]},{"id":"677f73ad.c6c76c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1863,"y":102,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"22896989.a0c9c6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1853.9999389648438,"y":163,"z":"a4e67f56.cb2c9","wires":[["25ea35c8.19f71a","1a1bb1b5.d95e6e"]]},{"id":"1a1bb1b5.d95e6e","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'Stop : Error occoured while stopping the server '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Stop : Error occoured while stopping the server '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1954,"y":144,"z":"a4e67f56.cb2c9","wires":[["89e55d1b.8bacb"]]},{"id":"89e55d1b.8bacb","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2083,"y":109,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"801303e7.59ed6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2623,"y":514,"z":"a4e67f56.cb2c9","wires":[["6cc2dd3a.5ab1c4","a69ecbbf.1d5bc8"]]},{"id":"cfc89854.f4d468","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2627,"y":629,"z":"a4e67f56.cb2c9","wires":[["4f117e3b.87012","2edb4a8d.6d3ab6"]]},{"id":"f46b9146.02c08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2226,"y":729,"z":"a4e67f56.cb2c9","wires":[["30bc77c5.9a7ea8","e8c9cfc3.43aba"]]},{"id":"6cc2dd3a.5ab1c4","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'VNFC not found in AAI '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2793,"y":473,"z":"a4e67f56.cb2c9","wires":[["b58381a3.ec774"]]},{"id":"4f117e3b.87012","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2816,"y":592,"z":"a4e67f56.cb2c9","wires":[["ca332e3a.6a09e"]]},{"id":"b58381a3.ec774","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2966,"y":479,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"ca332e3a.6a09e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3049,"y":586,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"30bc77c5.9a7ea8","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2434,"y":702,"z":"a4e67f56.cb2c9","wires":[["2a4d844.64b3b7c"]]},{"id":"2a4d844.64b3b7c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2593,"y":706,"z":"a4e67f56.cb2c9","wires":[[]]}]
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 e829c98eb..8296c5eaa 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
@@ -88,7 +88,7 @@
     "id": "2a1906ba.c69e1a",
     "type": "execute",
     "name": "Report Error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 1229.2260704040527,
@@ -470,7 +470,7 @@
     "id": "a278106d.b2101",
     "type": "execute",
     "name": "Report Error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 1816.5474433898926,
@@ -493,7 +493,7 @@
     "id": "205f706d.16fb1",
     "type": "execute",
     "name": "Report Error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 1461.7608222961426,
@@ -637,7 +637,7 @@
     "id": "aa08d8db.e07148",
     "type": "execute",
     "name": "Generate output payload",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
+    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
     "comments": "",
     "outputs": 1,
     "x": 763.6667366027832,
@@ -701,7 +701,7 @@
     "id": "bd7acdda.91a63",
     "type": "execute",
     "name": "Report error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure while generating output payload JSON\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure while generating output payload JSON\" />",
     "comments": "",
     "outputs": 1,
     "x": 1441.2381706237793,
@@ -724,7 +724,7 @@
     "id": "4d82212c.2ef21",
     "type": "execute",
     "name": "Generate output payload",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
+    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
     "comments": "",
     "outputs": 1,
     "x": 1493.8887519836426,
@@ -788,7 +788,7 @@
     "id": "49e01c1c.c64a44",
     "type": "execute",
     "name": "Report error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure while generating output payload JSON\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure while generating output payload JSON\" />",
     "comments": "",
     "outputs": 1,
     "x": 2165.460346221924,
@@ -862,7 +862,7 @@
     "id": "7e300025.5253a",
     "type": "execute",
     "name": "execute CvaasDataIntoContext",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='cvaasFileNameAndFileContentToContext' >\n<parameter name=\"cvaas-directory-path\" value=\"/opt/app/bvc/cvaas\" />\n<parameter name=\"appc-instance-id\" value=\"appc01\" />\n<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='cvaasFileNameAndFileContentToContext' >\n<parameter name=\"cvaas-directory-path\" value=\"/opt/app/bvc/cvaas\" />\n<parameter name=\"appc-instance-id\" value=\"appc01\" />\n<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />",
     "comments": "",
     "outputs": 1,
     "x": 1943.9172744750977,
@@ -1038,7 +1038,7 @@
     "id": "4c75663f.43f0d8",
     "type": "execute",
     "name": "execute CheckFileCreated",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='checkFileCreated' >\n<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='checkFileCreated' >\n<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />",
     "comments": "",
     "outputs": 1,
     "x": 2490.933391571045,
@@ -1091,7 +1091,7 @@
     "id": "cab8f54e.ec65e8",
     "type": "execute",
     "name": "Report Error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 3216.8359298706055,
@@ -1153,7 +1153,7 @@
     "id": "8652a63d.1ea618",
     "type": "execute",
     "name": "Report error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Error while fetching cvass data\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Error while fetching cvass data\" />",
     "comments": "",
     "outputs": 1,
     "x": 2655.238349914551,
@@ -1200,7 +1200,7 @@
     "id": "ce132d3c.9e7bb",
     "type": "execute",
     "name": "Report Error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 1900.7669982910156,
@@ -1212,7 +1212,7 @@
     "id": "cb484414.952458",
     "type": "execute",
     "name": "Set payload in Context",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
     "comments": "",
     "outputs": 1,
     "x": 726.6667137145996,
@@ -1289,7 +1289,7 @@
     "id": "861e0870.0e6308",
     "type": "execute",
     "name": "OutputMessageBuilder",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failure in flattening payload Json\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failure in flattening payload Json\" />",
     "comments": "",
     "outputs": 1,
     "x": 1454.6664390563965,
@@ -1324,7 +1324,7 @@
     "id": "61a0d1cf.928f8",
     "type": "execute",
     "name": "Report Error to DCAE",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />",
     "comments": "",
     "outputs": 1,
     "x": 1864.3330039978027,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Terminate_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Terminate_2.0.0.json
index d8b5c98be..d7ab5a28f 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Terminate_2.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Terminate_2.0.0.json
@@ -1 +1 @@
-[{"id":"e5c88bdc.d0f1b8","type":"method","name":"Generic_Terminate","xml":"<method rpc='Generic_Terminate' mode='sync'>\n","comments":"","outputs":1,"x":139,"y":234,"z":"a4e67f56.cb2c9","wires":[["ef72fe12.cfcd5"]]},{"id":"64a60c97.587824","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":139,"y":161,"z":"a4e67f56.cb2c9","wires":[["e5c88bdc.d0f1b8"]]},{"id":"6755c3b2.aaa76c","type":"dgstart","name":"DGSTART","outputs":1,"x":105,"y":67,"z":"a4e67f56.cb2c9","wires":[["64a60c97.587824"]]},{"id":"ef72fe12.cfcd5","type":"execute","name":"execute_getVNF_Hierarchy","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$org.openecomp.appc.vfid`\" />","comments":"","outputs":1,"x":223,"y":398,"z":"a4e67f56.cb2c9","wires":[["fdbfcf4e.2d7b2","2f7c0400.250b9c","8cddc38f.7a40e"]]},{"id":"fdbfcf4e.2d7b2","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":553.0000152587891,"y":339,"z":"a4e67f56.cb2c9","wires":[["f433b6cb.9cd0e8"]]},{"id":"47c9978b.e11268","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":254.00001525878906,"y":1011.0000610351562,"z":"a4e67f56.cb2c9","wires":[["aed1653d.64dc18","99961634.235f88","76a553b1.7a606c"]]},{"id":"aed1653d.64dc18","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":712.0000152587891,"y":868,"z":"a4e67f56.cb2c9","wires":[["6300ae03.3e269"]]},{"id":"6300ae03.3e269","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":802.0000152587891,"y":697,"z":"a4e67f56.cb2c9","wires":[["4eda765d.043368"]]},{"id":"4eda765d.043368","type":"execute","name":"execute_UpdateAA&I","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"TERMINATING\" />\n","comments":"","outputs":1,"x":943.0000152587891,"y":791,"z":"a4e67f56.cb2c9","wires":[["7d068120.8613d","f2187f0b.202fc"]]},{"id":"7d068120.8613d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1118.000015258789,"y":794,"z":"a4e67f56.cb2c9","wires":[["e362ad10.2e11d"]]},{"id":"2f7c0400.250b9c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":682.0000152587891,"y":235,"z":"a4e67f56.cb2c9","wires":[["56adc02f.e937d"]]},{"id":"dfc00961.e6fbe8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1091.000015258789,"y":287,"z":"a4e67f56.cb2c9","wires":[]},{"id":"4c5b7745.303d88","type":"execute","name":"execute_Delete_AA&I","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='deleteResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n","comments":"","outputs":1,"x":1288.000259399414,"y":1528.000244140625,"z":"a4e67f56.cb2c9","wires":[["dff7c6ea.eb0978","dc1f3aaa.e732e8"]]},{"id":"dff7c6ea.eb0978","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1469.000259399414,"y":1585.000244140625,"z":"a4e67f56.cb2c9","wires":[["5fb4f85a.b03e08"]]},{"id":"6b9fbfd9.cf2c9","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1554.000259399414,"y":1913.000244140625,"z":"a4e67f56.cb2c9","wires":[]},{"id":"dc1f3aaa.e732e8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1470.000259399414,"y":1454.000244140625,"z":"a4e67f56.cb2c9","wires":[["63511836.263ac8"]]},{"id":"f2187f0b.202fc","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1118.000015258789,"y":614,"z":"a4e67f56.cb2c9","wires":[["8818bd10.d6877"]]},{"id":"3d92ddfb.8dc4c2","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1586.000015258789,"y":525,"z":"a4e67f56.cb2c9","wires":[]},{"id":"6451e1d4.3680a","type":"comment","name":"update VNFCs to terminating","info":"","comments":"","x":864.0000152587891,"y":840,"z":"a4e67f56.cb2c9","wires":[]},{"id":"506b2052.9606c","type":"comment","name":"call south bound to delete VMs","info":"","comments":"","x":1432.000015258789,"y":334,"z":"a4e67f56.cb2c9","wires":[]},{"id":"30134eb1.2eebb2","type":"comment","name":"Delete VNFCs from AA&I","info":"","comments":"","x":1315.000259399414,"y":1562.000244140625,"z":"a4e67f56.cb2c9","wires":[]},{"id":"ebe89a17.2b35b8","type":"comment","name":"Fetch all VMs and VNFCs from AA&I for given VNF_ID","info":"","comments":"","x":473,"y":451,"z":"a4e67f56.cb2c9","wires":[]},{"id":"18e86385.97557c","type":"switchNode","name":"switch","xml":"<switch test='`$VNF.VMCount`'>\n","comments":"","outputs":1,"x":378.00001525878906,"y":772,"z":"a4e67f56.cb2c9","wires":[["bcee071d.335558","b4629424.d467e8"]]},{"id":"bcee071d.335558","type":"other","name":"outcome_0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":551.0000152587891,"y":677,"z":"a4e67f56.cb2c9","wires":[["a252c9a0.508a08"]]},{"id":"b4629424.d467e8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":499.00001525878906,"y":862,"z":"a4e67f56.cb2c9","wires":[["47c9978b.e11268"]]},{"id":"f433b6cb.9cd0e8","type":"switchNode","name":"switch","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":468.00001525878906,"y":484,"z":"a4e67f56.cb2c9","wires":[["2bc5afad.f4405","88a36565.5b6378"]]},{"id":"2bc5afad.f4405","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":467.00001525878906,"y":571,"z":"a4e67f56.cb2c9","wires":[["18e86385.97557c"]]},{"id":"88a36565.5b6378","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":723.0000152587891,"y":480,"z":"a4e67f56.cb2c9","wires":[["4c58c0ac.8a3ef"]]},{"id":"e362ad10.2e11d","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1251.000015258789,"y":656,"z":"a4e67f56.cb2c9","wires":[["9ec19783.7ab378","473696eb.550988","bd1386b8.54ecc8"]]},{"id":"9ec19783.7ab378","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1407.000015258789,"y":624,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"473696eb.550988","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1416.000015258789,"y":660,"z":"a4e67f56.cb2c9","wires":[["9c0a9e54.14d8"]]},{"id":"bd1386b8.54ecc8","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1411.000015258789,"y":697,"z":"a4e67f56.cb2c9","wires":[["735daa43.6c16e4"]]},{"id":"63511836.263ac8","type":"switchNode","name":"switch","xml":"<switch test='`$deleteResource_result`'>\n","comments":"","outputs":1,"x":1683.000259399414,"y":1524.0002136230469,"z":"a4e67f56.cb2c9","wires":[["1d4ca514.9fd7db","8b41e5e2.b6a818","e61220f4.9537f"]]},{"id":"1d4ca514.9fd7db","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>","comments":"","outputs":1,"x":1860.000259399414,"y":1490.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"8b41e5e2.b6a818","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1860.000259399414,"y":1604.000244140625,"z":"a4e67f56.cb2c9","wires":[["8763a75.b2f5c58"]]},{"id":"e61220f4.9537f","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1854.000259399414,"y":1715.000244140625,"z":"a4e67f56.cb2c9","wires":[["2208fca1.c9af34"]]},{"id":"166ff874.3f4048","type":"returnFailure","name":"return failure","xml":"<return status='failure'>","comments":"","x":2184.000259399414,"y":1628.000244140625,"z":"a4e67f56.cb2c9","wires":[]},{"id":"39941f53.76089","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2198.000259399414,"y":1761.000244140625,"z":"a4e67f56.cb2c9","wires":[]},{"id":"9e453cfe.7194d","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":830.0000152587891,"y":659,"z":"a4e67f56.cb2c9","wires":[]},{"id":"1d90c18b.5e663e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1784.000015258789,"y":667,"z":"a4e67f56.cb2c9","wires":[]},{"id":"2ef976e.d4afa8a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1746.0003509521484,"y":880,"z":"a4e67f56.cb2c9","wires":[]},{"id":"c65751bd.0458d","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":971.0000152587891,"y":504,"z":"a4e67f56.cb2c9","wires":[]},{"id":"56adc02f.e937d","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":800.0000152587891,"y":303,"z":"a4e67f56.cb2c9","wires":[["dfc00961.e6fbe8","acf0fd43.9e66"]]},{"id":"acf0fd43.9e66","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"Exception in getting VNF Hierachy\"/>\n<parameter name=\"output.status.message\" value=\"Exception in getting VNF Hierachy\"/>\n","comments":"","outputs":1,"x":1081.000015258789,"y":113,"z":"a4e67f56.cb2c9","wires":[["b33afed0.16dc"]]},{"id":"b33afed0.16dc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1306.000015258789,"y":84,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"4c58c0ac.8a3ef","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":865.0000152587891,"y":446,"z":"a4e67f56.cb2c9","wires":[["c65751bd.0458d","a1e2c80e.64ad08"]]},{"id":"a1e2c80e.64ad08","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"Failure in getting VNF Hierachy\"/>\n<parameter name=\"output.status.message\" value=\"Failure in getting VNF Hierachy\"/>","comments":"","outputs":1,"x":931.0000152587891,"y":372,"z":"a4e67f56.cb2c9","wires":[["f137844c.665ea8"]]},{"id":"f137844c.665ea8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1138.000015258789,"y":388,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"a252c9a0.508a08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":670.0000152587891,"y":615,"z":"a4e67f56.cb2c9","wires":[["9e453cfe.7194d","d07dd04b.ad633"]]},{"id":"d07dd04b.ad633","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"VM Count is 0\"/>\n<parameter name=\"output.status.message\" value=\"VM Count is 0\"/>","comments":"","outputs":1,"x":771.0000152587891,"y":543,"z":"a4e67f56.cb2c9","wires":[["c92631ce.23936"]]},{"id":"c92631ce.23936","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":937.0000152587891,"y":603,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"8818bd10.d6877","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1433.000015258789,"y":472,"z":"a4e67f56.cb2c9","wires":[["3d92ddfb.8dc4c2","b2f14fef.29f16"]]},{"id":"b2f14fef.29f16","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1658.000015258789,"y":470,"z":"a4e67f56.cb2c9","wires":[["9cabe4f.0b83218"]]},{"id":"9cabe4f.0b83218","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1861.000015258789,"y":473,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"735daa43.6c16e4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1516.999984741211,"y":776,"z":"a4e67f56.cb2c9","wires":[["2ef976e.d4afa8a","61aa63f1.de487c"]]},{"id":"61aa63f1.de487c","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1789.000473022461,"y":793,"z":"a4e67f56.cb2c9","wires":[["cd2515bf.b00448"]]},{"id":"cd2515bf.b00448","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2010.0003814697266,"y":789.0000915527344,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"9c0a9e54.14d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1578.999984741211,"y":665,"z":"a4e67f56.cb2c9","wires":[["1d90c18b.5e663e","c8b4dbe7.dbfbf8"]]},{"id":"c8b4dbe7.dbfbf8","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'VNFC not found in AAI'+ $VNF.VM[$i].VNFC`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI'+ $VNF.VM[$i].VNFC`\" />","comments":"","outputs":1,"x":1774.000015258789,"y":601,"z":"a4e67f56.cb2c9","wires":[["9720fcd3.38685"]]},{"id":"9720fcd3.38685","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1966.000259399414,"y":601,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"8763a75.b2f5c58","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2032.000259399414,"y":1598.000244140625,"z":"a4e67f56.cb2c9","wires":[["166ff874.3f4048","2d936263.c9b0de"]]},{"id":"2208fca1.c9af34","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2032.000259399414,"y":1719.000244140625,"z":"a4e67f56.cb2c9","wires":[["39941f53.76089","64428a52.6aacd4"]]},{"id":"2d936263.c9b0de","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'VNFC not found in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2206.000259399414,"y":1523.000244140625,"z":"a4e67f56.cb2c9","wires":[["5428dfc9.98ca2"]]},{"id":"64428a52.6aacd4","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2226.000259399414,"y":1682.000244140625,"z":"a4e67f56.cb2c9","wires":[["890502f.9d453"]]},{"id":"5428dfc9.98ca2","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2426.000259399414,"y":1525.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"890502f.9d453","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2447.000259399414,"y":1677.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"5fb4f85a.b03e08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1365.000259399414,"y":1849.000244140625,"z":"a4e67f56.cb2c9","wires":[["6b9fbfd9.cf2c9","12808282.63fedd"]]},{"id":"12808282.63fedd","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Failure in deleting from AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in deleting from AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1587.000259399414,"y":1846.000244140625,"z":"a4e67f56.cb2c9","wires":[["982395bf.926078"]]},{"id":"982395bf.926078","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1788.000259399414,"y":1847.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"99961634.235f88","type":"execute","name":"execute_TerminateStack","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='terminateStack' >\n <parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.openecomp.appc.instance.url\" value=\"`$VNF.VM[0].URL`\" />\n <parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />\n <parameter name=\"org.openecomp.appc.stack.id\" value=\"`$VNF.heat-stack-id`\"/>","comments":"","outputs":1,"x":639.0000152587891,"y":1032,"z":"a4e67f56.cb2c9","wires":[["4c9c8ea6.0754a","dd76694.e3a1398","b8cb00c4.e2276"]]},{"id":"4c9c8ea6.0754a","type":"outcome","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":530.0000152587891,"y":1344,"z":"a4e67f56.cb2c9","wires":[["29494781.a54038"]]},{"id":"dd76694.e3a1398","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":825.9999847412109,"y":1123.0000305175781,"z":"a4e67f56.cb2c9","wires":[["9bbcc3c6.f3fc9"]]},{"id":"9bbcc3c6.f3fc9","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":984.9999847412109,"y":1206.0000305175781,"z":"a4e67f56.cb2c9","wires":[["816ffef8.3f001","e7013e5c.73cd3","eb94341d.daee38"]]},{"id":"b8ddaca8.31ca2","type":"execute","name":"execute_Update_AA&I","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"ERROR\" />\n","comments":"","outputs":1,"x":1800.999984741211,"y":1151.0000915527344,"z":"a4e67f56.cb2c9","wires":[["745adec2.0c18","386e30ca.c82d7"]]},{"id":"386e30ca.c82d7","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1960.000015258789,"y":1085.0001220703125,"z":"a4e67f56.cb2c9","wires":[["5af77541.eebf1c"]]},{"id":"f91f4f00.327fd","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2238.999771118164,"y":1296.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"1a39765.7ec2a8a","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2247.999954223633,"y":1273.0001525878906,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"a65c14b7.f9fc18","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":2233.000015258789,"y":1252.0001220703125,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"7b1f1fed.0097","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":2109.000015258789,"y":1205.0001220703125,"z":"a4e67f56.cb2c9","wires":[["f91f4f00.327fd","1a39765.7ec2a8a","a65c14b7.f9fc18"]]},{"id":"745adec2.0c18","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1962.000015258789,"y":1213.0001220703125,"z":"a4e67f56.cb2c9","wires":[["7b1f1fed.0097"]]},{"id":"816ffef8.3f001","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Error occured while terminating Stack '+$VNF.heat-stack-id`\"/>\n<parameter name=\"output.status.message\" value=\"`'Error occured while terminating Stack '+$VNF.heat-stack-id`\"/>","comments":"","outputs":1,"x":1240.000015258789,"y":1199,"z":"a4e67f56.cb2c9","wires":[["dde9085f.2ff908"]]},{"id":"dde9085f.2ff908","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1429.000015258789,"y":1191,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"b8cb00c4.e2276","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":803.9999847412109,"y":1174.0001525878906,"z":"a4e67f56.cb2c9","wires":[["9bbcc3c6.f3fc9"]]},{"id":"f2b0d1ec.808d1","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":966.0000152587891,"y":1478.666748046875,"z":"a4e67f56.cb2c9","wires":[["a8b2ac3.d27705"]]},{"id":"e7013e5c.73cd3","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":939.0000152587891,"y":1009.3333740234375,"z":"a4e67f56.cb2c9","wires":[["1ed3a2d4.2d0acd"]]},{"id":"e13c6788.af9018","type":"execute","name":"execute_lookupServer","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='lookupServer' >\n <parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.openecomp.appc.instance.url\" value=\"`$VNF.VM[$i].URL`\" />\n <parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />\n","comments":"","outputs":1,"x":1160.000015258789,"y":1013.3333740234375,"z":"a4e67f56.cb2c9","wires":[["f1d9ce42.3fc2","8a7dbf97.22061"]]},{"id":"422c2173.1d7ab","type":"switchNode","name":"switch_isServerFound","xml":"<switch test='`$serverFound`'>\n","comments":"","outputs":1,"x":1564.6666412353516,"y":1016.3333740234375,"z":"a4e67f56.cb2c9","wires":[["4a611b2.5a488e4","9f456a36.09d8f8","1750b09d.dd507f"]]},{"id":"4a611b2.5a488e4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1765.666519165039,"y":1009.3333740234375,"z":"a4e67f56.cb2c9","wires":[["b8ddaca8.31ca2"]]},{"id":"9f456a36.09d8f8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1760.6666412353516,"y":1078.3333740234375,"z":"a4e67f56.cb2c9","wires":[["b8ddaca8.31ca2"]]},{"id":"e87932eb.920c2","type":"execute","name":"execute_Delete_AA&I","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='deleteResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n","comments":"","outputs":1,"x":2219.222183227539,"y":793.1111450195312,"z":"a4e67f56.cb2c9","wires":[["626a5a33.1f4184","133e3018.0ed4a"]]},{"id":"626a5a33.1f4184","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2432.222183227539,"y":889.1111755371094,"z":"a4e67f56.cb2c9","wires":[["6b98bf4a.6b6d1"]]},{"id":"84f94e68.c257","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2576.222183227539,"y":1129.1111755371094,"z":"a4e67f56.cb2c9","wires":[]},{"id":"133e3018.0ed4a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2422.222183227539,"y":717.1111755371094,"z":"a4e67f56.cb2c9","wires":[["61a1ee76.d7abf"]]},{"id":"3b27dd33.3249e2","type":"comment","name":"Delete VNFCs from AA&I","info":"","comments":"","x":2454.222183227539,"y":816.1111755371094,"z":"a4e67f56.cb2c9","wires":[]},{"id":"61a1ee76.d7abf","type":"switchNode","name":"switch","xml":"<switch test='`$deleteResource_result`'>\n","comments":"","outputs":1,"x":2614.222183227539,"y":720.1111755371094,"z":"a4e67f56.cb2c9","wires":[["cbf88535.3cc078","f10274f9.7c6708","b7ffbb29.5e80b8"]]},{"id":"cbf88535.3cc078","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>","comments":"","outputs":1,"x":2839.222183227539,"y":721.1111755371094,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"f10274f9.7c6708","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2839.222183227539,"y":835.1111755371094,"z":"a4e67f56.cb2c9","wires":[["97a5cdc3.5b14d"]]},{"id":"b7ffbb29.5e80b8","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2833.222183227539,"y":946.1111755371094,"z":"a4e67f56.cb2c9","wires":[["83dd288f.4d99b8"]]},{"id":"a93117d7.575f58","type":"returnFailure","name":"return failure","xml":"<return status='failure'>","comments":"","x":3163.222183227539,"y":859.1111755371094,"z":"a4e67f56.cb2c9","wires":[]},{"id":"576510ce.7be8a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3177.222183227539,"y":992.1111755371094,"z":"a4e67f56.cb2c9","wires":[]},{"id":"97a5cdc3.5b14d","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3011.222183227539,"y":829.1111755371094,"z":"a4e67f56.cb2c9","wires":[["a93117d7.575f58","1f9383ac.0e6aec"]]},{"id":"83dd288f.4d99b8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3011.222183227539,"y":950.1111755371094,"z":"a4e67f56.cb2c9","wires":[["576510ce.7be8a","e5f1757c.6e8838"]]},{"id":"1f9383ac.0e6aec","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'VNFC not found in AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":3143.222183227539,"y":749.1111755371094,"z":"a4e67f56.cb2c9","wires":[["42e84307.cf497c"]]},{"id":"e5f1757c.6e8838","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":3205.222183227539,"y":913.1111755371094,"z":"a4e67f56.cb2c9","wires":[["adf0db8.e0f4328"]]},{"id":"42e84307.cf497c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3360.222183227539,"y":749.1111755371094,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"adf0db8.e0f4328","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3384.222183227539,"y":910.1111755371094,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"6b98bf4a.6b6d1","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2384.222183227539,"y":1054.1111755371094,"z":"a4e67f56.cb2c9","wires":[["84f94e68.c257","ae3d5f22.e56e9"]]},{"id":"ae3d5f22.e56e9","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Failure in deleting from AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in deleting from AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2609.222183227539,"y":998.1111755371094,"z":"a4e67f56.cb2c9","wires":[["3da27612.12e46a"]]},{"id":"3da27612.12e46a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2797.222183227539,"y":1002.1111755371094,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"f1d9ce42.3fc2","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1363.000015258789,"y":1012,"z":"a4e67f56.cb2c9","wires":[["422c2173.1d7ab"]]},{"id":"8a7dbf97.22061","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1352.000015258789,"y":1082,"z":"a4e67f56.cb2c9","wires":[["b8ddaca8.31ca2"]]},{"id":"1ed3a2d4.2d0acd","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1030.000015258789,"y":959,"z":"a4e67f56.cb2c9","wires":[["e13c6788.af9018"]]},{"id":"8cddc38f.7a40e","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":776.0000152587891,"y":60,"z":"a4e67f56.cb2c9","wires":[["56adc02f.e937d"]]},{"id":"a8b2ac3.d27705","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1065.000015258789,"y":1535,"z":"a4e67f56.cb2c9","wires":[["4c5b7745.303d88"]]},{"id":"fcaee4fa.750418","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":859.0000152587891,"y":1532,"z":"a4e67f56.cb2c9","wires":[["f2b0d1ec.808d1"]]},{"id":"29494781.a54038","type":"switchNode","name":"switch","xml":"<switch test='`$TERMINATE_STATUS`'>\n","comments":"","outputs":1,"x":378.00001525878906,"y":1587,"z":"a4e67f56.cb2c9","wires":[["d79d038e.dc79d","b3678f24.77c0d","b71088d3.bcd548"]]},{"id":"b71088d3.bcd548","type":"other","name":"outcome_Stack_NOT_FOUND","xml":"<outcome value='STACK_NOT_FOUND'>\n","comments":"","outputs":1,"x":629.0000152587891,"y":1637,"z":"a4e67f56.cb2c9","wires":[["acf43fdf.f3f61"]]},{"id":"d79d038e.dc79d","type":"success","name":"outcome_SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":612.0000152587891,"y":1531,"z":"a4e67f56.cb2c9","wires":[["fcaee4fa.750418"]]},{"id":"b3678f24.77c0d","type":"other","name":"outcome_ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":610.0000152587891,"y":1579,"z":"a4e67f56.cb2c9","wires":[["9bbcc3c6.f3fc9"]]},{"id":"eb94341d.daee38","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1201.000015258789,"y":1285,"z":"a4e67f56.cb2c9","wires":[]},{"id":"5af77541.eebf1c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2181.999771118164,"y":1090.000244140625,"z":"a4e67f56.cb2c9","wires":[]},{"id":"f1c2445.9b079b8","type":"execute","name":"execute_Update_AA&I","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"ERROR\" />\n","comments":"","outputs":1,"x":851.0000152587891,"y":2108,"z":"a4e67f56.cb2c9","wires":[["4e5f0316.5b336c","9f4b4a3.064eeb8"]]},{"id":"9f4b4a3.064eeb8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1050.000015258789,"y":2087,"z":"a4e67f56.cb2c9","wires":[["41799e8a.78e08"]]},{"id":"4e5f0316.5b336c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1047.000015258789,"y":2132,"z":"a4e67f56.cb2c9","wires":[["63968449.9d15dc"]]},{"id":"63968449.9d15dc","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1182.000015258789,"y":2136,"z":"a4e67f56.cb2c9","wires":[["f7c574be.4bda68","5b336450.0d264c","f6d95927.d64ee8"]]},{"id":"f7c574be.4bda68","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1334.9998931884766,"y":2155.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"5b336450.0d264c","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1347.000015258789,"y":2137,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"f6d95927.d64ee8","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1326.000015258789,"y":2108,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"acf43fdf.f3f61","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":410.00001525878906,"y":1905,"z":"a4e67f56.cb2c9","wires":[["e077bff2.48865","423e8c1d.af2b24"]]},{"id":"e077bff2.48865","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":757.0000152587891,"y":1967.666748046875,"z":"a4e67f56.cb2c9","wires":[["e27653a7.d320a"]]},{"id":"e27653a7.d320a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":821.0000152587891,"y":2033,"z":"a4e67f56.cb2c9","wires":[["f1c2445.9b079b8"]]},{"id":"41799e8a.78e08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1507.000015258789,"y":2083,"z":"a4e67f56.cb2c9","wires":[["9e96b820.10fa68","4bdee93a.d5fd18"]]},{"id":"4bdee93a.d5fd18","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Failure in updatig Error in AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updatig Error in AAI for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1701.000015258789,"y":2020,"z":"a4e67f56.cb2c9","wires":[["f785dfe9.09653"]]},{"id":"f785dfe9.09653","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1905.000015258789,"y":2021,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"9e96b820.10fa68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1672.000015258789,"y":2143,"z":"a4e67f56.cb2c9","wires":[]},{"id":"1750b09d.dd507f","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1760.000015258789,"y":953,"z":"a4e67f56.cb2c9","wires":[["e87932eb.920c2"]]},{"id":"423e8c1d.af2b24","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":716.0000152587891,"y":2221,"z":"a4e67f56.cb2c9","wires":[["dad63133.72d13","650f38af.5e6678"]]},{"id":"650f38af.5e6678","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":948.0000762939453,"y":2265,"z":"a4e67f56.cb2c9","wires":[]},{"id":"dad63133.72d13","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Stack not found with id: '+$VNF.heat-stack-id`\"/>\n<parameter name=\"output.status.message\" value=\"`'Stack not found with id: '+$VNF.heat-stack-id`\"/>","comments":"","outputs":1,"x":988.0000762939453,"y":2208,"z":"a4e67f56.cb2c9","wires":[["6648d3dd.c3f94c"]]},{"id":"6648d3dd.c3f94c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1209.000015258789,"y":2204,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"76a553b1.7a606c","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":388.7063293457031,"y":1083.9843139648438,"z":"a4e67f56.cb2c9","wires":[]}]
+[{"id":"e5c88bdc.d0f1b8","type":"method","name":"Generic_Terminate","xml":"<method rpc='Generic_Terminate' mode='sync'>\n","comments":"","outputs":1,"x":139,"y":234,"z":"a4e67f56.cb2c9","wires":[["ef72fe12.cfcd5"]]},{"id":"64a60c97.587824","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":139,"y":161,"z":"a4e67f56.cb2c9","wires":[["e5c88bdc.d0f1b8"]]},{"id":"6755c3b2.aaa76c","type":"dgstart","name":"DGSTART","outputs":1,"x":105,"y":67,"z":"a4e67f56.cb2c9","wires":[["64a60c97.587824"]]},{"id":"ef72fe12.cfcd5","type":"execute","name":"execute_getVNF_Hierarchy","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$org.onap.appc.vfid`\" />","comments":"","outputs":1,"x":223,"y":398,"z":"a4e67f56.cb2c9","wires":[["fdbfcf4e.2d7b2","2f7c0400.250b9c","8cddc38f.7a40e"]]},{"id":"fdbfcf4e.2d7b2","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":553.0000152587891,"y":339,"z":"a4e67f56.cb2c9","wires":[["f433b6cb.9cd0e8"]]},{"id":"47c9978b.e11268","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":254.00001525878906,"y":1011.0000610351562,"z":"a4e67f56.cb2c9","wires":[["aed1653d.64dc18","99961634.235f88","76a553b1.7a606c"]]},{"id":"aed1653d.64dc18","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":712.0000152587891,"y":868,"z":"a4e67f56.cb2c9","wires":[["6300ae03.3e269"]]},{"id":"6300ae03.3e269","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":802.0000152587891,"y":697,"z":"a4e67f56.cb2c9","wires":[["4eda765d.043368"]]},{"id":"4eda765d.043368","type":"execute","name":"execute_UpdateAA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"TERMINATING\" />\n","comments":"","outputs":1,"x":943.0000152587891,"y":791,"z":"a4e67f56.cb2c9","wires":[["7d068120.8613d","f2187f0b.202fc"]]},{"id":"7d068120.8613d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1118.000015258789,"y":794,"z":"a4e67f56.cb2c9","wires":[["e362ad10.2e11d"]]},{"id":"2f7c0400.250b9c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":682.0000152587891,"y":235,"z":"a4e67f56.cb2c9","wires":[["56adc02f.e937d"]]},{"id":"dfc00961.e6fbe8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1091.000015258789,"y":287,"z":"a4e67f56.cb2c9","wires":[]},{"id":"4c5b7745.303d88","type":"execute","name":"execute_Delete_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='deleteResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n","comments":"","outputs":1,"x":1288.000259399414,"y":1528.000244140625,"z":"a4e67f56.cb2c9","wires":[["dff7c6ea.eb0978","dc1f3aaa.e732e8"]]},{"id":"dff7c6ea.eb0978","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1469.000259399414,"y":1585.000244140625,"z":"a4e67f56.cb2c9","wires":[["5fb4f85a.b03e08"]]},{"id":"6b9fbfd9.cf2c9","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1554.000259399414,"y":1913.000244140625,"z":"a4e67f56.cb2c9","wires":[]},{"id":"dc1f3aaa.e732e8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1470.000259399414,"y":1454.000244140625,"z":"a4e67f56.cb2c9","wires":[["63511836.263ac8"]]},{"id":"f2187f0b.202fc","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1118.000015258789,"y":614,"z":"a4e67f56.cb2c9","wires":[["8818bd10.d6877"]]},{"id":"3d92ddfb.8dc4c2","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1586.000015258789,"y":525,"z":"a4e67f56.cb2c9","wires":[]},{"id":"6451e1d4.3680a","type":"comment","name":"update VNFCs to terminating","info":"","comments":"","x":864.0000152587891,"y":840,"z":"a4e67f56.cb2c9","wires":[]},{"id":"506b2052.9606c","type":"comment","name":"call south bound to delete VMs","info":"","comments":"","x":1432.000015258789,"y":334,"z":"a4e67f56.cb2c9","wires":[]},{"id":"30134eb1.2eebb2","type":"comment","name":"Delete VNFCs from AA&I","info":"","comments":"","x":1315.000259399414,"y":1562.000244140625,"z":"a4e67f56.cb2c9","wires":[]},{"id":"ebe89a17.2b35b8","type":"comment","name":"Fetch all VMs and VNFCs from AA&I for given VNF_ID","info":"","comments":"","x":473,"y":451,"z":"a4e67f56.cb2c9","wires":[]},{"id":"18e86385.97557c","type":"switchNode","name":"switch","xml":"<switch test='`$VNF.VMCount`'>\n","comments":"","outputs":1,"x":378.00001525878906,"y":772,"z":"a4e67f56.cb2c9","wires":[["bcee071d.335558","b4629424.d467e8"]]},{"id":"bcee071d.335558","type":"other","name":"outcome_0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":551.0000152587891,"y":677,"z":"a4e67f56.cb2c9","wires":[["a252c9a0.508a08"]]},{"id":"b4629424.d467e8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":499.00001525878906,"y":862,"z":"a4e67f56.cb2c9","wires":[["47c9978b.e11268"]]},{"id":"f433b6cb.9cd0e8","type":"switchNode","name":"switch","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":468.00001525878906,"y":484,"z":"a4e67f56.cb2c9","wires":[["2bc5afad.f4405","88a36565.5b6378"]]},{"id":"2bc5afad.f4405","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":467.00001525878906,"y":571,"z":"a4e67f56.cb2c9","wires":[["18e86385.97557c"]]},{"id":"88a36565.5b6378","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":723.0000152587891,"y":480,"z":"a4e67f56.cb2c9","wires":[["4c58c0ac.8a3ef"]]},{"id":"e362ad10.2e11d","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1251.000015258789,"y":656,"z":"a4e67f56.cb2c9","wires":[["9ec19783.7ab378","473696eb.550988","bd1386b8.54ecc8"]]},{"id":"9ec19783.7ab378","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1407.000015258789,"y":624,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"473696eb.550988","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1416.000015258789,"y":660,"z":"a4e67f56.cb2c9","wires":[["9c0a9e54.14d8"]]},{"id":"bd1386b8.54ecc8","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1411.000015258789,"y":697,"z":"a4e67f56.cb2c9","wires":[["735daa43.6c16e4"]]},{"id":"63511836.263ac8","type":"switchNode","name":"switch","xml":"<switch test='`$deleteResource_result`'>\n","comments":"","outputs":1,"x":1683.000259399414,"y":1524.0002136230469,"z":"a4e67f56.cb2c9","wires":[["1d4ca514.9fd7db","8b41e5e2.b6a818","e61220f4.9537f"]]},{"id":"1d4ca514.9fd7db","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>","comments":"","outputs":1,"x":1860.000259399414,"y":1490.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"8b41e5e2.b6a818","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1860.000259399414,"y":1604.000244140625,"z":"a4e67f56.cb2c9","wires":[["8763a75.b2f5c58"]]},{"id":"e61220f4.9537f","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1854.000259399414,"y":1715.000244140625,"z":"a4e67f56.cb2c9","wires":[["2208fca1.c9af34"]]},{"id":"166ff874.3f4048","type":"returnFailure","name":"return failure","xml":"<return status='failure'>","comments":"","x":2184.000259399414,"y":1628.000244140625,"z":"a4e67f56.cb2c9","wires":[]},{"id":"39941f53.76089","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2198.000259399414,"y":1761.000244140625,"z":"a4e67f56.cb2c9","wires":[]},{"id":"9e453cfe.7194d","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":830.0000152587891,"y":659,"z":"a4e67f56.cb2c9","wires":[]},{"id":"1d90c18b.5e663e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1784.000015258789,"y":667,"z":"a4e67f56.cb2c9","wires":[]},{"id":"2ef976e.d4afa8a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1746.0003509521484,"y":880,"z":"a4e67f56.cb2c9","wires":[]},{"id":"c65751bd.0458d","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":971.0000152587891,"y":504,"z":"a4e67f56.cb2c9","wires":[]},{"id":"56adc02f.e937d","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":800.0000152587891,"y":303,"z":"a4e67f56.cb2c9","wires":[["dfc00961.e6fbe8","acf0fd43.9e66"]]},{"id":"acf0fd43.9e66","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"Exception in getting VNF Hierachy\"/>\n<parameter name=\"output.status.message\" value=\"Exception in getting VNF Hierachy\"/>\n","comments":"","outputs":1,"x":1081.000015258789,"y":113,"z":"a4e67f56.cb2c9","wires":[["b33afed0.16dc"]]},{"id":"b33afed0.16dc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1306.000015258789,"y":84,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"4c58c0ac.8a3ef","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":865.0000152587891,"y":446,"z":"a4e67f56.cb2c9","wires":[["c65751bd.0458d","a1e2c80e.64ad08"]]},{"id":"a1e2c80e.64ad08","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"Failure in getting VNF Hierachy\"/>\n<parameter name=\"output.status.message\" value=\"Failure in getting VNF Hierachy\"/>","comments":"","outputs":1,"x":931.0000152587891,"y":372,"z":"a4e67f56.cb2c9","wires":[["f137844c.665ea8"]]},{"id":"f137844c.665ea8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1138.000015258789,"y":388,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"a252c9a0.508a08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":670.0000152587891,"y":615,"z":"a4e67f56.cb2c9","wires":[["9e453cfe.7194d","d07dd04b.ad633"]]},{"id":"d07dd04b.ad633","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"VM Count is 0\"/>\n<parameter name=\"output.status.message\" value=\"VM Count is 0\"/>","comments":"","outputs":1,"x":771.0000152587891,"y":543,"z":"a4e67f56.cb2c9","wires":[["c92631ce.23936"]]},{"id":"c92631ce.23936","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":937.0000152587891,"y":603,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"8818bd10.d6877","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1433.000015258789,"y":472,"z":"a4e67f56.cb2c9","wires":[["3d92ddfb.8dc4c2","b2f14fef.29f16"]]},{"id":"b2f14fef.29f16","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1658.000015258789,"y":470,"z":"a4e67f56.cb2c9","wires":[["9cabe4f.0b83218"]]},{"id":"9cabe4f.0b83218","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1861.000015258789,"y":473,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"735daa43.6c16e4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1516.999984741211,"y":776,"z":"a4e67f56.cb2c9","wires":[["2ef976e.d4afa8a","61aa63f1.de487c"]]},{"id":"61aa63f1.de487c","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1789.000473022461,"y":793,"z":"a4e67f56.cb2c9","wires":[["cd2515bf.b00448"]]},{"id":"cd2515bf.b00448","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2010.0003814697266,"y":789.0000915527344,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"9c0a9e54.14d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1578.999984741211,"y":665,"z":"a4e67f56.cb2c9","wires":[["1d90c18b.5e663e","c8b4dbe7.dbfbf8"]]},{"id":"c8b4dbe7.dbfbf8","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'VNFC not found in AAI'+ $VNF.VM[$i].VNFC`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI'+ $VNF.VM[$i].VNFC`\" />","comments":"","outputs":1,"x":1774.000015258789,"y":601,"z":"a4e67f56.cb2c9","wires":[["9720fcd3.38685"]]},{"id":"9720fcd3.38685","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1966.000259399414,"y":601,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"8763a75.b2f5c58","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2032.000259399414,"y":1598.000244140625,"z":"a4e67f56.cb2c9","wires":[["166ff874.3f4048","2d936263.c9b0de"]]},{"id":"2208fca1.c9af34","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2032.000259399414,"y":1719.000244140625,"z":"a4e67f56.cb2c9","wires":[["39941f53.76089","64428a52.6aacd4"]]},{"id":"2d936263.c9b0de","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'VNFC not found in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2206.000259399414,"y":1523.000244140625,"z":"a4e67f56.cb2c9","wires":[["5428dfc9.98ca2"]]},{"id":"64428a52.6aacd4","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2226.000259399414,"y":1682.000244140625,"z":"a4e67f56.cb2c9","wires":[["890502f.9d453"]]},{"id":"5428dfc9.98ca2","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2426.000259399414,"y":1525.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"890502f.9d453","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2447.000259399414,"y":1677.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"5fb4f85a.b03e08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1365.000259399414,"y":1849.000244140625,"z":"a4e67f56.cb2c9","wires":[["6b9fbfd9.cf2c9","12808282.63fedd"]]},{"id":"12808282.63fedd","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in deleting from AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in deleting from AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1587.000259399414,"y":1846.000244140625,"z":"a4e67f56.cb2c9","wires":[["982395bf.926078"]]},{"id":"982395bf.926078","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1788.000259399414,"y":1847.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"99961634.235f88","type":"execute","name":"execute_TerminateStack","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='terminateStack' >\n <parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.onap.appc.instance.url\" value=\"`$VNF.VM[0].URL`\" />\n <parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n <parameter name=\"org.onap.appc.stack.id\" value=\"`$VNF.heat-stack-id`\"/>","comments":"","outputs":1,"x":639.0000152587891,"y":1032,"z":"a4e67f56.cb2c9","wires":[["4c9c8ea6.0754a","dd76694.e3a1398","b8cb00c4.e2276"]]},{"id":"4c9c8ea6.0754a","type":"outcome","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":530.0000152587891,"y":1344,"z":"a4e67f56.cb2c9","wires":[["29494781.a54038"]]},{"id":"dd76694.e3a1398","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":825.9999847412109,"y":1123.0000305175781,"z":"a4e67f56.cb2c9","wires":[["9bbcc3c6.f3fc9"]]},{"id":"9bbcc3c6.f3fc9","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":984.9999847412109,"y":1206.0000305175781,"z":"a4e67f56.cb2c9","wires":[["816ffef8.3f001","e7013e5c.73cd3","eb94341d.daee38"]]},{"id":"b8ddaca8.31ca2","type":"execute","name":"execute_Update_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"ERROR\" />\n","comments":"","outputs":1,"x":1800.999984741211,"y":1151.0000915527344,"z":"a4e67f56.cb2c9","wires":[["745adec2.0c18","386e30ca.c82d7"]]},{"id":"386e30ca.c82d7","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1960.000015258789,"y":1085.0001220703125,"z":"a4e67f56.cb2c9","wires":[["5af77541.eebf1c"]]},{"id":"f91f4f00.327fd","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2238.999771118164,"y":1296.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"1a39765.7ec2a8a","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2247.999954223633,"y":1273.0001525878906,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"a65c14b7.f9fc18","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":2233.000015258789,"y":1252.0001220703125,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"7b1f1fed.0097","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":2109.000015258789,"y":1205.0001220703125,"z":"a4e67f56.cb2c9","wires":[["f91f4f00.327fd","1a39765.7ec2a8a","a65c14b7.f9fc18"]]},{"id":"745adec2.0c18","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1962.000015258789,"y":1213.0001220703125,"z":"a4e67f56.cb2c9","wires":[["7b1f1fed.0097"]]},{"id":"816ffef8.3f001","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Error occured while terminating Stack '+$VNF.heat-stack-id`\"/>\n<parameter name=\"output.status.message\" value=\"`'Error occured while terminating Stack '+$VNF.heat-stack-id`\"/>","comments":"","outputs":1,"x":1240.000015258789,"y":1199,"z":"a4e67f56.cb2c9","wires":[["dde9085f.2ff908"]]},{"id":"dde9085f.2ff908","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1429.000015258789,"y":1191,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"b8cb00c4.e2276","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":803.9999847412109,"y":1174.0001525878906,"z":"a4e67f56.cb2c9","wires":[["9bbcc3c6.f3fc9"]]},{"id":"f2b0d1ec.808d1","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":966.0000152587891,"y":1478.666748046875,"z":"a4e67f56.cb2c9","wires":[["a8b2ac3.d27705"]]},{"id":"e7013e5c.73cd3","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":939.0000152587891,"y":1009.3333740234375,"z":"a4e67f56.cb2c9","wires":[["1ed3a2d4.2d0acd"]]},{"id":"e13c6788.af9018","type":"execute","name":"execute_lookupServer","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='lookupServer' >\n <parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.onap.appc.instance.url\" value=\"`$VNF.VM[$i].URL`\" />\n <parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n","comments":"","outputs":1,"x":1160.000015258789,"y":1013.3333740234375,"z":"a4e67f56.cb2c9","wires":[["f1d9ce42.3fc2","8a7dbf97.22061"]]},{"id":"422c2173.1d7ab","type":"switchNode","name":"switch_isServerFound","xml":"<switch test='`$serverFound`'>\n","comments":"","outputs":1,"x":1564.6666412353516,"y":1016.3333740234375,"z":"a4e67f56.cb2c9","wires":[["4a611b2.5a488e4","9f456a36.09d8f8","1750b09d.dd507f"]]},{"id":"4a611b2.5a488e4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1765.666519165039,"y":1009.3333740234375,"z":"a4e67f56.cb2c9","wires":[["b8ddaca8.31ca2"]]},{"id":"9f456a36.09d8f8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1760.6666412353516,"y":1078.3333740234375,"z":"a4e67f56.cb2c9","wires":[["b8ddaca8.31ca2"]]},{"id":"e87932eb.920c2","type":"execute","name":"execute_Delete_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='deleteResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n","comments":"","outputs":1,"x":2219.222183227539,"y":793.1111450195312,"z":"a4e67f56.cb2c9","wires":[["626a5a33.1f4184","133e3018.0ed4a"]]},{"id":"626a5a33.1f4184","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2432.222183227539,"y":889.1111755371094,"z":"a4e67f56.cb2c9","wires":[["6b98bf4a.6b6d1"]]},{"id":"84f94e68.c257","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2576.222183227539,"y":1129.1111755371094,"z":"a4e67f56.cb2c9","wires":[]},{"id":"133e3018.0ed4a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2422.222183227539,"y":717.1111755371094,"z":"a4e67f56.cb2c9","wires":[["61a1ee76.d7abf"]]},{"id":"3b27dd33.3249e2","type":"comment","name":"Delete VNFCs from AA&I","info":"","comments":"","x":2454.222183227539,"y":816.1111755371094,"z":"a4e67f56.cb2c9","wires":[]},{"id":"61a1ee76.d7abf","type":"switchNode","name":"switch","xml":"<switch test='`$deleteResource_result`'>\n","comments":"","outputs":1,"x":2614.222183227539,"y":720.1111755371094,"z":"a4e67f56.cb2c9","wires":[["cbf88535.3cc078","f10274f9.7c6708","b7ffbb29.5e80b8"]]},{"id":"cbf88535.3cc078","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>","comments":"","outputs":1,"x":2839.222183227539,"y":721.1111755371094,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"f10274f9.7c6708","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2839.222183227539,"y":835.1111755371094,"z":"a4e67f56.cb2c9","wires":[["97a5cdc3.5b14d"]]},{"id":"b7ffbb29.5e80b8","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2833.222183227539,"y":946.1111755371094,"z":"a4e67f56.cb2c9","wires":[["83dd288f.4d99b8"]]},{"id":"a93117d7.575f58","type":"returnFailure","name":"return failure","xml":"<return status='failure'>","comments":"","x":3163.222183227539,"y":859.1111755371094,"z":"a4e67f56.cb2c9","wires":[]},{"id":"576510ce.7be8a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3177.222183227539,"y":992.1111755371094,"z":"a4e67f56.cb2c9","wires":[]},{"id":"97a5cdc3.5b14d","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3011.222183227539,"y":829.1111755371094,"z":"a4e67f56.cb2c9","wires":[["a93117d7.575f58","1f9383ac.0e6aec"]]},{"id":"83dd288f.4d99b8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3011.222183227539,"y":950.1111755371094,"z":"a4e67f56.cb2c9","wires":[["576510ce.7be8a","e5f1757c.6e8838"]]},{"id":"1f9383ac.0e6aec","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'VNFC not found in AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":3143.222183227539,"y":749.1111755371094,"z":"a4e67f56.cb2c9","wires":[["42e84307.cf497c"]]},{"id":"e5f1757c.6e8838","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":3205.222183227539,"y":913.1111755371094,"z":"a4e67f56.cb2c9","wires":[["adf0db8.e0f4328"]]},{"id":"42e84307.cf497c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3360.222183227539,"y":749.1111755371094,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"adf0db8.e0f4328","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3384.222183227539,"y":910.1111755371094,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"6b98bf4a.6b6d1","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2384.222183227539,"y":1054.1111755371094,"z":"a4e67f56.cb2c9","wires":[["84f94e68.c257","ae3d5f22.e56e9"]]},{"id":"ae3d5f22.e56e9","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in deleting from AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in deleting from AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2609.222183227539,"y":998.1111755371094,"z":"a4e67f56.cb2c9","wires":[["3da27612.12e46a"]]},{"id":"3da27612.12e46a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2797.222183227539,"y":1002.1111755371094,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"f1d9ce42.3fc2","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1363.000015258789,"y":1012,"z":"a4e67f56.cb2c9","wires":[["422c2173.1d7ab"]]},{"id":"8a7dbf97.22061","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1352.000015258789,"y":1082,"z":"a4e67f56.cb2c9","wires":[["b8ddaca8.31ca2"]]},{"id":"1ed3a2d4.2d0acd","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1030.000015258789,"y":959,"z":"a4e67f56.cb2c9","wires":[["e13c6788.af9018"]]},{"id":"8cddc38f.7a40e","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":776.0000152587891,"y":60,"z":"a4e67f56.cb2c9","wires":[["56adc02f.e937d"]]},{"id":"a8b2ac3.d27705","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1065.000015258789,"y":1535,"z":"a4e67f56.cb2c9","wires":[["4c5b7745.303d88"]]},{"id":"fcaee4fa.750418","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":859.0000152587891,"y":1532,"z":"a4e67f56.cb2c9","wires":[["f2b0d1ec.808d1"]]},{"id":"29494781.a54038","type":"switchNode","name":"switch","xml":"<switch test='`$TERMINATE_STATUS`'>\n","comments":"","outputs":1,"x":378.00001525878906,"y":1587,"z":"a4e67f56.cb2c9","wires":[["d79d038e.dc79d","b3678f24.77c0d","b71088d3.bcd548"]]},{"id":"b71088d3.bcd548","type":"other","name":"outcome_Stack_NOT_FOUND","xml":"<outcome value='STACK_NOT_FOUND'>\n","comments":"","outputs":1,"x":629.0000152587891,"y":1637,"z":"a4e67f56.cb2c9","wires":[["acf43fdf.f3f61"]]},{"id":"d79d038e.dc79d","type":"success","name":"outcome_SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":612.0000152587891,"y":1531,"z":"a4e67f56.cb2c9","wires":[["fcaee4fa.750418"]]},{"id":"b3678f24.77c0d","type":"other","name":"outcome_ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":610.0000152587891,"y":1579,"z":"a4e67f56.cb2c9","wires":[["9bbcc3c6.f3fc9"]]},{"id":"eb94341d.daee38","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1201.000015258789,"y":1285,"z":"a4e67f56.cb2c9","wires":[]},{"id":"5af77541.eebf1c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2181.999771118164,"y":1090.000244140625,"z":"a4e67f56.cb2c9","wires":[]},{"id":"f1c2445.9b079b8","type":"execute","name":"execute_Update_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"ERROR\" />\n","comments":"","outputs":1,"x":851.0000152587891,"y":2108,"z":"a4e67f56.cb2c9","wires":[["4e5f0316.5b336c","9f4b4a3.064eeb8"]]},{"id":"9f4b4a3.064eeb8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1050.000015258789,"y":2087,"z":"a4e67f56.cb2c9","wires":[["41799e8a.78e08"]]},{"id":"4e5f0316.5b336c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1047.000015258789,"y":2132,"z":"a4e67f56.cb2c9","wires":[["63968449.9d15dc"]]},{"id":"63968449.9d15dc","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1182.000015258789,"y":2136,"z":"a4e67f56.cb2c9","wires":[["f7c574be.4bda68","5b336450.0d264c","f6d95927.d64ee8"]]},{"id":"f7c574be.4bda68","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1334.9998931884766,"y":2155.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"5b336450.0d264c","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1347.000015258789,"y":2137,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"f6d95927.d64ee8","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1326.000015258789,"y":2108,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"acf43fdf.f3f61","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":410.00001525878906,"y":1905,"z":"a4e67f56.cb2c9","wires":[["e077bff2.48865","423e8c1d.af2b24"]]},{"id":"e077bff2.48865","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":757.0000152587891,"y":1967.666748046875,"z":"a4e67f56.cb2c9","wires":[["e27653a7.d320a"]]},{"id":"e27653a7.d320a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":821.0000152587891,"y":2033,"z":"a4e67f56.cb2c9","wires":[["f1c2445.9b079b8"]]},{"id":"41799e8a.78e08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1507.000015258789,"y":2083,"z":"a4e67f56.cb2c9","wires":[["9e96b820.10fa68","4bdee93a.d5fd18"]]},{"id":"4bdee93a.d5fd18","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in updatig Error in AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updatig Error in AAI for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1701.000015258789,"y":2020,"z":"a4e67f56.cb2c9","wires":[["f785dfe9.09653"]]},{"id":"f785dfe9.09653","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1905.000015258789,"y":2021,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"9e96b820.10fa68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1672.000015258789,"y":2143,"z":"a4e67f56.cb2c9","wires":[]},{"id":"1750b09d.dd507f","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1760.000015258789,"y":953,"z":"a4e67f56.cb2c9","wires":[["e87932eb.920c2"]]},{"id":"423e8c1d.af2b24","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":716.0000152587891,"y":2221,"z":"a4e67f56.cb2c9","wires":[["dad63133.72d13","650f38af.5e6678"]]},{"id":"650f38af.5e6678","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":948.0000762939453,"y":2265,"z":"a4e67f56.cb2c9","wires":[]},{"id":"dad63133.72d13","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Stack not found with id: '+$VNF.heat-stack-id`\"/>\n<parameter name=\"output.status.message\" value=\"`'Stack not found with id: '+$VNF.heat-stack-id`\"/>","comments":"","outputs":1,"x":988.0000762939453,"y":2208,"z":"a4e67f56.cb2c9","wires":[["6648d3dd.c3f94c"]]},{"id":"6648d3dd.c3f94c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1209.000015258789,"y":2204,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"76a553b1.7a606c","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":388.7063293457031,"y":1083.9843139648438,"z":"a4e67f56.cb2c9","wires":[]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Terminate_2.0.1.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Terminate_2.0.1.json
index f92a53077..5b2491dfb 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Terminate_2.0.1.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Terminate_2.0.1.json
@@ -1 +1 @@
-[{"id":"6a91792e.7babd8","type":"method","name":"Generic_Terminate","xml":"<method rpc='Generic_Terminate' mode='sync'>\n","comments":"","outputs":1,"x":148.66665649414062,"y":231,"z":"214d83f7.3c518c","wires":[["8842ebb3.34ae88"]]},{"id":"5b236231.d788cc","type":"service-logic","name":"APPC 2.0.1","module":"APPC","version":"2.0.1","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='2.0.1'>","outputs":1,"x":148.66665649414062,"y":158,"z":"214d83f7.3c518c","wires":[["6a91792e.7babd8"]]},{"id":"40dd126c.6467ac","type":"dgstart","name":"DGSTART","outputs":1,"x":114.66665649414062,"y":64,"z":"214d83f7.3c518c","wires":[["5b236231.d788cc"]]},{"id":"c5b3ed4c.7a51e","type":"execute","name":"execute_getVNF_Hierarchy","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />","comments":"","outputs":1,"x":712.6666564941406,"y":418,"z":"214d83f7.3c518c","wires":[["4167438c.1e614c","5c2b2174.d5d2d","72adec34.6cebc4"]]},{"id":"4167438c.1e614c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1042.6666717529297,"y":359,"z":"214d83f7.3c518c","wires":[["f36ab527.a7f0a8"]]},{"id":"40745781.e26f38","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":743.6666717529297,"y":1031.0000610351562,"z":"214d83f7.3c518c","wires":[["9a947cc5.23ce8","51330ad7.924734","82d02640.710dc8"]]},{"id":"9a947cc5.23ce8","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":1201.6666717529297,"y":888,"z":"214d83f7.3c518c","wires":[["a18c1d82.ceb56"]]},{"id":"a18c1d82.ceb56","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":1291.6666717529297,"y":717,"z":"214d83f7.3c518c","wires":[["1f5ac652.ff0a0a"]]},{"id":"1f5ac652.ff0a0a","type":"execute","name":"execute_UpdateAA&I","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Terminating\" />\n","comments":"","outputs":1,"x":1432.6666717529297,"y":811,"z":"214d83f7.3c518c","wires":[["ba2d3b93.0fc308","e013018e.c2ce6"]]},{"id":"ba2d3b93.0fc308","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1607.6666717529297,"y":814,"z":"214d83f7.3c518c","wires":[["30ec2ffc.29dd4"]]},{"id":"5c2b2174.d5d2d","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1171.6666717529297,"y":255,"z":"214d83f7.3c518c","wires":[["7af3024a.0c77ec"]]},{"id":"6f9d109d.47a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1580.6666717529297,"y":307,"z":"214d83f7.3c518c","wires":[]},{"id":"a9d9b6a5.ff7028","type":"execute","name":"execute_Delete_AA&I","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='deleteResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n","comments":"","outputs":1,"x":1777.6669158935547,"y":1548.000244140625,"z":"214d83f7.3c518c","wires":[["f0a60773.983e78","791fa776.b19fa8"]]},{"id":"f0a60773.983e78","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1958.6669158935547,"y":1605.000244140625,"z":"214d83f7.3c518c","wires":[["1418d53d.7f133b"]]},{"id":"db7092d6.8fae","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2043.6669158935547,"y":1933.000244140625,"z":"214d83f7.3c518c","wires":[]},{"id":"791fa776.b19fa8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1959.6669158935547,"y":1474.000244140625,"z":"214d83f7.3c518c","wires":[["ddbbf603.b53e18"]]},{"id":"e013018e.c2ce6","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1607.6666717529297,"y":634,"z":"214d83f7.3c518c","wires":[["47ccb57f.6543ec"]]},{"id":"e72b6702.279708","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2075.6666717529297,"y":545,"z":"214d83f7.3c518c","wires":[]},{"id":"8bf91d02.277ac","type":"comment","name":"update VNFCs to terminating","info":"","comments":"","x":1353.6666717529297,"y":860,"z":"214d83f7.3c518c","wires":[]},{"id":"e269577f.6b4058","type":"comment","name":"call south bound to delete VMs","info":"","comments":"","x":1921.6666717529297,"y":354,"z":"214d83f7.3c518c","wires":[]},{"id":"8b30f8a4.f6e778","type":"comment","name":"Delete VNFCs from AA&I","info":"","comments":"","x":1804.6669158935547,"y":1582.000244140625,"z":"214d83f7.3c518c","wires":[]},{"id":"be86022b.82158","type":"comment","name":"Fetch all VMs and VNFCs from AA&I for given VNF_ID","info":"","comments":"","x":962.6666564941406,"y":471,"z":"214d83f7.3c518c","wires":[]},{"id":"78588c7a.743e14","type":"switchNode","name":"switch","xml":"<switch test='`$VNF.VMCount`'>\n","comments":"","outputs":1,"x":867.6666717529297,"y":792,"z":"214d83f7.3c518c","wires":[["166c71ac.291f6e","724fce8c.100f6"]]},{"id":"166c71ac.291f6e","type":"other","name":"outcome_0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1040.6666717529297,"y":697,"z":"214d83f7.3c518c","wires":[["74e7a734.c69f38"]]},{"id":"724fce8c.100f6","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":988.6666717529297,"y":882,"z":"214d83f7.3c518c","wires":[["40745781.e26f38"]]},{"id":"f36ab527.a7f0a8","type":"switchNode","name":"switch","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":957.6666717529297,"y":504,"z":"214d83f7.3c518c","wires":[["605c9bcb.12d854","8eb5283f.78b858"]]},{"id":"605c9bcb.12d854","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":956.6666717529297,"y":591,"z":"214d83f7.3c518c","wires":[["78588c7a.743e14"]]},{"id":"8eb5283f.78b858","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1212.6666717529297,"y":500,"z":"214d83f7.3c518c","wires":[["bc16b835.e67df8"]]},{"id":"30ec2ffc.29dd4","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1740.6666717529297,"y":676,"z":"214d83f7.3c518c","wires":[["486bc0b7.06e2c","6b589062.343aa","46ffb052.ef31d"]]},{"id":"486bc0b7.06e2c","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1896.6666717529297,"y":644,"z":"214d83f7.3c518c","wires":[[]]},{"id":"6b589062.343aa","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1905.6666717529297,"y":680,"z":"214d83f7.3c518c","wires":[["d6575672.8b8888"]]},{"id":"46ffb052.ef31d","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1900.6666717529297,"y":717,"z":"214d83f7.3c518c","wires":[["a6264772.8b5a18"]]},{"id":"ddbbf603.b53e18","type":"switchNode","name":"switch","xml":"<switch test='`$deleteResource_result`'>\n","comments":"","outputs":1,"x":2172.6669158935547,"y":1544.0002136230469,"z":"214d83f7.3c518c","wires":[["f03cdfd2.9419f","75d0e135.830a5","b144c34e.c13ab"]]},{"id":"f03cdfd2.9419f","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>","comments":"","outputs":1,"x":2349.6669158935547,"y":1510.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"75d0e135.830a5","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2349.6669158935547,"y":1624.000244140625,"z":"214d83f7.3c518c","wires":[["8e0f8ac1.b9e7e8"]]},{"id":"b144c34e.c13ab","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2343.6669158935547,"y":1735.000244140625,"z":"214d83f7.3c518c","wires":[["2ae8e8ce.c451c8"]]},{"id":"6b97d665.4e5aa8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2673.6669158935547,"y":1648.000244140625,"z":"214d83f7.3c518c","wires":[]},{"id":"ffc50795.32ef28","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2687.6669158935547,"y":1781.000244140625,"z":"214d83f7.3c518c","wires":[]},{"id":"79a07e38.a86d4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1319.6666717529297,"y":679,"z":"214d83f7.3c518c","wires":[]},{"id":"f4d2923.3dec37","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2273.6666717529297,"y":687,"z":"214d83f7.3c518c","wires":[]},{"id":"4a7e04c9.bf41cc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2235.667007446289,"y":900,"z":"214d83f7.3c518c","wires":[]},{"id":"2adb8b66.3f8504","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1460.6666717529297,"y":524,"z":"214d83f7.3c518c","wires":[]},{"id":"7af3024a.0c77ec","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1289.6666717529297,"y":323,"z":"214d83f7.3c518c","wires":[["6f9d109d.47a","ebf5dd23.4a38f"]]},{"id":"ebf5dd23.4a38f","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"Exception in getting VNF Hierachy\"/>\n<parameter name='output.status.message' value=\"Exception in getting VNF Hierachy\"/>\n","comments":"","outputs":1,"x":1570.6666717529297,"y":133,"z":"214d83f7.3c518c","wires":[["c956679b.bab7b8"]]},{"id":"c956679b.bab7b8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1795.6666717529297,"y":104,"z":"214d83f7.3c518c","wires":[[]]},{"id":"bc16b835.e67df8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1354.6666717529297,"y":466,"z":"214d83f7.3c518c","wires":[["2adb8b66.3f8504","a41aef94.7e09"]]},{"id":"a41aef94.7e09","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"Failure in getting VNF Hierachy\"/>\n<parameter name='output.status.message' value=\"Failure in getting VNF Hierachy\"/>\n\n","comments":"","outputs":1,"x":1420.6666717529297,"y":392,"z":"214d83f7.3c518c","wires":[["109fc3cc.165b8c"]]},{"id":"109fc3cc.165b8c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1627.6666717529297,"y":408,"z":"214d83f7.3c518c","wires":[[]]},{"id":"74e7a734.c69f38","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1159.6666717529297,"y":635,"z":"214d83f7.3c518c","wires":[["79a07e38.a86d4","1fdafa81.05cb55"]]},{"id":"1fdafa81.05cb55","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"VM Count is 0\"/>\n<parameter name='output.status.message' value=\"VM Count is 0\"/>\n\n","comments":"","outputs":1,"x":1260.6666717529297,"y":563,"z":"214d83f7.3c518c","wires":[["a638cc12.c03da"]]},{"id":"a638cc12.c03da","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1426.6666717529297,"y":623,"z":"214d83f7.3c518c","wires":[[]]},{"id":"47ccb57f.6543ec","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1922.6666717529297,"y":492,"z":"214d83f7.3c518c","wires":[["e72b6702.279708","203420f8.4a6c8"]]},{"id":"203420f8.4a6c8","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>\n","comments":"","outputs":1,"x":2147.6666717529297,"y":490,"z":"214d83f7.3c518c","wires":[["81561833.a0f998"]]},{"id":"81561833.a0f998","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2350.6666717529297,"y":493,"z":"214d83f7.3c518c","wires":[[]]},{"id":"a6264772.8b5a18","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2006.6666412353516,"y":796,"z":"214d83f7.3c518c","wires":[["4a7e04c9.bf41cc","d22c813.a8fe48"]]},{"id":"d22c813.a8fe48","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n\n","comments":"","outputs":1,"x":2278.6671295166016,"y":813,"z":"214d83f7.3c518c","wires":[["9df8c65a.d36ae8"]]},{"id":"9df8c65a.d36ae8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2499.667037963867,"y":809.0000915527344,"z":"214d83f7.3c518c","wires":[[]]},{"id":"d6575672.8b8888","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2068.6666412353516,"y":685,"z":"214d83f7.3c518c","wires":[["f4d2923.3dec37","d0f739a9.299bf8"]]},{"id":"d0f739a9.299bf8","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'VNFC not found in AAI'+ $VNF.VM[$i].VNFC`\" />\n<parameter name='output.status.message' value=\"`'VNFC not found in AAI'+ $VNF.VM[$i].VNFC`\" />\n\n","comments":"","outputs":1,"x":2263.6666717529297,"y":621,"z":"214d83f7.3c518c","wires":[["bede9367.77c9d"]]},{"id":"bede9367.77c9d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2455.6669158935547,"y":621,"z":"214d83f7.3c518c","wires":[[]]},{"id":"8e0f8ac1.b9e7e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2521.6669158935547,"y":1618.000244140625,"z":"214d83f7.3c518c","wires":[["6b97d665.4e5aa8","27493e98.52c6e2"]]},{"id":"2ae8e8ce.c451c8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2521.6669158935547,"y":1739.000244140625,"z":"214d83f7.3c518c","wires":[["ffc50795.32ef28","49dfea1b.954844"]]},{"id":"27493e98.52c6e2","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'VNFC not found in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'VNFC not found in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2695.6669158935547,"y":1543.000244140625,"z":"214d83f7.3c518c","wires":[["3265161a.da4fda"]]},{"id":"49dfea1b.954844","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n","comments":"","outputs":1,"x":2715.6669158935547,"y":1702.000244140625,"z":"214d83f7.3c518c","wires":[["a931d97f.0a8ef8"]]},{"id":"3265161a.da4fda","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2915.6669158935547,"y":1545.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"a931d97f.0a8ef8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2936.6669158935547,"y":1697.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"1418d53d.7f133b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1854.6669158935547,"y":1869.000244140625,"z":"214d83f7.3c518c","wires":[["db7092d6.8fae","d2c04b2.c7333b8"]]},{"id":"d2c04b2.c7333b8","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Failure in deleting from AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in deleting from AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n\n","comments":"","outputs":1,"x":2076.6669158935547,"y":1866.000244140625,"z":"214d83f7.3c518c","wires":[["76c8bb58.d4a2b4"]]},{"id":"76c8bb58.d4a2b4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2277.6669158935547,"y":1867.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"51330ad7.924734","type":"execute","name":"execute_TerminateStack","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='terminateStack' >\n <parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.openecomp.appc.instance.url\" value=\"`$VNF.VM[0].URL`\" />\n <parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />\n <parameter name=\"org.openecomp.appc.stack.id\" value=\"`$VNF.heat-stack-id`\"/>","comments":"","outputs":1,"x":1128.6666717529297,"y":1052,"z":"214d83f7.3c518c","wires":[["8014c3bc.7e994","9518b74c.9dfbe8","500bd329.f4843c"]]},{"id":"8014c3bc.7e994","type":"outcome","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1019.6666717529297,"y":1364,"z":"214d83f7.3c518c","wires":[["e36fc9a0.8f4758"]]},{"id":"9518b74c.9dfbe8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1315.6666412353516,"y":1143.0000305175781,"z":"214d83f7.3c518c","wires":[["f1cff1ca.4f3fa"]]},{"id":"f1cff1ca.4f3fa","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1474.6666412353516,"y":1226.0000305175781,"z":"214d83f7.3c518c","wires":[["d26c7cdb.1a1c1","e21c7013.2a511","4e395d8c.0e8654"]]},{"id":"bffd5141.6c547","type":"execute","name":"execute_Update_AA&I","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"ERROR\" />\n","comments":"","outputs":1,"x":2290.6666412353516,"y":1171.0000915527344,"z":"214d83f7.3c518c","wires":[["13d1960d.9c176a","ee50c4be.2e9d28"]]},{"id":"ee50c4be.2e9d28","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2449.6666717529297,"y":1105.0001220703125,"z":"214d83f7.3c518c","wires":[["6876f9ee.88d068"]]},{"id":"104f28b8.5f4c67","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2728.6664276123047,"y":1316.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"2129246.f55abdc","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2737.6666107177734,"y":1293.0001525878906,"z":"214d83f7.3c518c","wires":[[]]},{"id":"75bf7111.51ae5","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":2722.6666717529297,"y":1272.0001220703125,"z":"214d83f7.3c518c","wires":[[]]},{"id":"b334397d.c3d958","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":2598.6666717529297,"y":1225.0001220703125,"z":"214d83f7.3c518c","wires":[["104f28b8.5f4c67","2129246.f55abdc","75bf7111.51ae5"]]},{"id":"13d1960d.9c176a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2451.6666717529297,"y":1233.0001220703125,"z":"214d83f7.3c518c","wires":[["b334397d.c3d958"]]},{"id":"d26c7cdb.1a1c1","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Error occured while terminating Stack '+$VNF.heat-stack-id`\"/>\n<parameter name='output.status.message' value=\"`'Error occured while terminating Stack '+$VNF.heat-stack-id`\"/>\n","comments":"","outputs":1,"x":1729.6666717529297,"y":1219,"z":"214d83f7.3c518c","wires":[["8be889a9.6d6c68"]]},{"id":"8be889a9.6d6c68","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1918.6666717529297,"y":1211,"z":"214d83f7.3c518c","wires":[[]]},{"id":"500bd329.f4843c","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1293.6666412353516,"y":1194.0001525878906,"z":"214d83f7.3c518c","wires":[["f1cff1ca.4f3fa"]]},{"id":"4a03d8fe.d47068","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":1455.6666717529297,"y":1498.666748046875,"z":"214d83f7.3c518c","wires":[["6b7368e3.64b308"]]},{"id":"e21c7013.2a511","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":1428.6666717529297,"y":1029.3333740234375,"z":"214d83f7.3c518c","wires":[["7b636d61.d0b554"]]},{"id":"7099d9d3.ce2a88","type":"execute","name":"execute_lookupServer","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='lookupServer' >\n <parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.openecomp.appc.instance.url\" value=\"`$VNF.VM[$i].URL`\" />\n <parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />\n","comments":"","outputs":1,"x":1649.6666717529297,"y":1033.3333740234375,"z":"214d83f7.3c518c","wires":[["d40d4181.f4c28","e3a51c64.b39b9"]]},{"id":"7a853c33.9204b4","type":"switchNode","name":"switch_isServerFound","xml":"<switch test='`$serverFound`'>\n","comments":"","outputs":1,"x":2054.333297729492,"y":1036.3333740234375,"z":"214d83f7.3c518c","wires":[["ba8d600.0a405a","dec7ed8e.6bb98","f0ec0e5b.68c6"]]},{"id":"ba8d600.0a405a","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2255.3331756591797,"y":1029.3333740234375,"z":"214d83f7.3c518c","wires":[["bffd5141.6c547"]]},{"id":"dec7ed8e.6bb98","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2250.333297729492,"y":1098.3333740234375,"z":"214d83f7.3c518c","wires":[["bffd5141.6c547"]]},{"id":"a8c9d533.157048","type":"execute","name":"execute_Delete_AA&I","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='deleteResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n","comments":"","outputs":1,"x":2708.8888397216797,"y":813.1111450195312,"z":"214d83f7.3c518c","wires":[["b85685cd.59cc58","adbd6019.dddcf"]]},{"id":"b85685cd.59cc58","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2921.8888397216797,"y":909.1111755371094,"z":"214d83f7.3c518c","wires":[["a26d7ad7.fc3678"]]},{"id":"51877c7e.0ed344","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3065.8888397216797,"y":1149.1111755371094,"z":"214d83f7.3c518c","wires":[]},{"id":"adbd6019.dddcf","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2911.8888397216797,"y":737.1111755371094,"z":"214d83f7.3c518c","wires":[["a32e8ff0.fd949"]]},{"id":"6b1dcaae.a26de4","type":"comment","name":"Delete VNFCs from AA&I","info":"","comments":"","x":2943.8888397216797,"y":836.1111755371094,"z":"214d83f7.3c518c","wires":[]},{"id":"a32e8ff0.fd949","type":"switchNode","name":"switch","xml":"<switch test='`$deleteResource_result`'>\n","comments":"","outputs":1,"x":3103.8888397216797,"y":740.1111755371094,"z":"214d83f7.3c518c","wires":[["6367d45e.f568bc","a2b057d0.ae5338","af8908d5.a293b8"]]},{"id":"6367d45e.f568bc","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>","comments":"","outputs":1,"x":3328.8888397216797,"y":741.1111755371094,"z":"214d83f7.3c518c","wires":[[]]},{"id":"a2b057d0.ae5338","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":3328.8888397216797,"y":855.1111755371094,"z":"214d83f7.3c518c","wires":[["2e777347.c58bac"]]},{"id":"af8908d5.a293b8","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":3322.8888397216797,"y":966.1111755371094,"z":"214d83f7.3c518c","wires":[["d3aee095.4eaad"]]},{"id":"b0455566.ea43d8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3652.8888397216797,"y":879.1111755371094,"z":"214d83f7.3c518c","wires":[]},{"id":"8320aaf5.fac488","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3666.8888397216797,"y":1012.1111755371094,"z":"214d83f7.3c518c","wires":[]},{"id":"2e777347.c58bac","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3500.8888397216797,"y":849.1111755371094,"z":"214d83f7.3c518c","wires":[["b0455566.ea43d8","c013a213.b6497"]]},{"id":"d3aee095.4eaad","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3500.8888397216797,"y":970.1111755371094,"z":"214d83f7.3c518c","wires":[["8320aaf5.fac488","fc0ad0dd.1a778"]]},{"id":"c013a213.b6497","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'VNFC not found in AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'VNFC not found in AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":3632.8888397216797,"y":769.1111755371094,"z":"214d83f7.3c518c","wires":[["92ed3d58.93848"]]},{"id":"fc0ad0dd.1a778","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n","comments":"","outputs":1,"x":3694.8888397216797,"y":933.1111755371094,"z":"214d83f7.3c518c","wires":[["d9ca4a14.fc8388"]]},{"id":"92ed3d58.93848","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3849.8888397216797,"y":769.1111755371094,"z":"214d83f7.3c518c","wires":[[]]},{"id":"d9ca4a14.fc8388","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3873.8888397216797,"y":930.1111755371094,"z":"214d83f7.3c518c","wires":[[]]},{"id":"a26d7ad7.fc3678","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2873.8888397216797,"y":1074.1111755371094,"z":"214d83f7.3c518c","wires":[["51877c7e.0ed344","63fbb548.bd5b9c"]]},{"id":"63fbb548.bd5b9c","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Failure in deleting from AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in deleting from AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>\n\n","comments":"","outputs":1,"x":3098.8888397216797,"y":1018.1111755371094,"z":"214d83f7.3c518c","wires":[["fc4ad188.46539"]]},{"id":"fc4ad188.46539","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3286.8888397216797,"y":1022.1111755371094,"z":"214d83f7.3c518c","wires":[[]]},{"id":"d40d4181.f4c28","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1852.6666717529297,"y":1032,"z":"214d83f7.3c518c","wires":[["7a853c33.9204b4"]]},{"id":"e3a51c64.b39b9","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1841.6666717529297,"y":1102,"z":"214d83f7.3c518c","wires":[["bffd5141.6c547"]]},{"id":"7b636d61.d0b554","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1519.6666717529297,"y":979,"z":"214d83f7.3c518c","wires":[["7099d9d3.ce2a88"]]},{"id":"72adec34.6cebc4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1265.6666717529297,"y":80,"z":"214d83f7.3c518c","wires":[["7af3024a.0c77ec"]]},{"id":"6b7368e3.64b308","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1554.6666717529297,"y":1555,"z":"214d83f7.3c518c","wires":[["a9d9b6a5.ff7028"]]},{"id":"621d1ea9.529a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1356.6665954589844,"y":1548,"z":"214d83f7.3c518c","wires":[["4a03d8fe.d47068"]]},{"id":"e36fc9a0.8f4758","type":"switchNode","name":"switch","xml":"<switch test='`$TERMINATE_STATUS`'>\n","comments":"","outputs":1,"x":867.6666717529297,"y":1607,"z":"214d83f7.3c518c","wires":[["d112b421.f478c8","dd33deb1.aac3a","be14d688.32f998"]]},{"id":"be14d688.32f998","type":"other","name":"outcome_Stack_NOT_FOUND","xml":"<outcome value='STACK_NOT_FOUND'>\n","comments":"","outputs":1,"x":1118.6666717529297,"y":1657,"z":"214d83f7.3c518c","wires":[["54e72492.4b6c5c"]]},{"id":"d112b421.f478c8","type":"success","name":"outcome_SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1101.6666717529297,"y":1551,"z":"214d83f7.3c518c","wires":[["30776976.0fc246"]]},{"id":"dd33deb1.aac3a","type":"other","name":"outcome_ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":1099.6666717529297,"y":1599,"z":"214d83f7.3c518c","wires":[["f1cff1ca.4f3fa"]]},{"id":"4e395d8c.0e8654","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1690.6666717529297,"y":1305,"z":"214d83f7.3c518c","wires":[]},{"id":"6876f9ee.88d068","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2671.6664276123047,"y":1110.000244140625,"z":"214d83f7.3c518c","wires":[]},{"id":"43a0f845.a872c8","type":"execute","name":"execute_Update_AA&I","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"ERROR\" />\n","comments":"","outputs":1,"x":1340.6666717529297,"y":2128,"z":"214d83f7.3c518c","wires":[["3294635e.27511c","b1093d6.01027c"]]},{"id":"b1093d6.01027c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1539.6666717529297,"y":2107,"z":"214d83f7.3c518c","wires":[["8dd7506b.ff07f"]]},{"id":"3294635e.27511c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1536.6666717529297,"y":2152,"z":"214d83f7.3c518c","wires":[["33c89bc.80ab564"]]},{"id":"33c89bc.80ab564","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1671.6666717529297,"y":2156,"z":"214d83f7.3c518c","wires":[["4c727a1.c013684","c7169490.8b0688","555157fd.482568"]]},{"id":"4c727a1.c013684","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1824.6665496826172,"y":2175.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"c7169490.8b0688","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1836.6666717529297,"y":2157,"z":"214d83f7.3c518c","wires":[[]]},{"id":"555157fd.482568","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1815.6666717529297,"y":2128,"z":"214d83f7.3c518c","wires":[[]]},{"id":"54e72492.4b6c5c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":899.6666717529297,"y":1925,"z":"214d83f7.3c518c","wires":[["402e577a.9942b8","1e80e12b.08e96f"]]},{"id":"402e577a.9942b8","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":1246.6666717529297,"y":1987.666748046875,"z":"214d83f7.3c518c","wires":[["f67c30dc.e3327"]]},{"id":"f67c30dc.e3327","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1310.6666717529297,"y":2053,"z":"214d83f7.3c518c","wires":[["43a0f845.a872c8"]]},{"id":"8dd7506b.ff07f","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1996.6666717529297,"y":2103,"z":"214d83f7.3c518c","wires":[["5519adf3.6b21c4","62c19bb2.6e4ff4"]]},{"id":"62c19bb2.6e4ff4","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Failure in updatig Error in AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in updatig Error in AAI for '+$VNF.VM[$i].VNFC`\"/>\n\n\n","comments":"","outputs":1,"x":2190.6666717529297,"y":2040,"z":"214d83f7.3c518c","wires":[["b88c942f.647928"]]},{"id":"b88c942f.647928","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2394.6666717529297,"y":2041,"z":"214d83f7.3c518c","wires":[[]]},{"id":"5519adf3.6b21c4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2161.6666717529297,"y":2163,"z":"214d83f7.3c518c","wires":[]},{"id":"f0ec0e5b.68c6","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2249.6666717529297,"y":973,"z":"214d83f7.3c518c","wires":[["a8c9d533.157048"]]},{"id":"1e80e12b.08e96f","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1205.6666717529297,"y":2241,"z":"214d83f7.3c518c","wires":[["b275796.53f2988","4c597638.4430e8"]]},{"id":"4c597638.4430e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1437.666732788086,"y":2285,"z":"214d83f7.3c518c","wires":[]},{"id":"b275796.53f2988","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'Stack not found with id: '+$VNF.heat-stack-id`\"/>\n<parameter name='output.status.message' value=\"`'Stack not found with id: '+$VNF.heat-stack-id`\"/>\n","comments":"","outputs":1,"x":1477.666732788086,"y":2228,"z":"214d83f7.3c518c","wires":[["6f875274.e7da5c"]]},{"id":"6f875274.e7da5c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1698.6666717529297,"y":2224,"z":"214d83f7.3c518c","wires":[[]]},{"id":"82d02640.710dc8","type":"update","name":"update","xml":"<update resource='SQL' force='true' plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' key=\"UPDATE UPLOAD_CONFIG SET PENDING_DELETE='Y' where VNF_ID = $input.action-identifiers.vnf-id\">","comments":"","outputs":1,"x":487.4444274902344,"y":1245.8418579101562,"z":"214d83f7.3c518c","wires":[["f2a83f28.727f8","e85986a4.fe52f8"]]},{"id":"e85986a4.fe52f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":651.0158538818359,"y":1183.6987915039062,"z":"214d83f7.3c518c","wires":[["1dbbd253.259b4e"]]},{"id":"f2a83f28.727f8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":645.7062225341797,"y":1290.1268920898438,"z":"214d83f7.3c518c","wires":[["5cfca817.a09e08"]]},{"id":"1dbbd253.259b4e","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":820.4444427490234,"y":1184.8577270507812,"z":"214d83f7.3c518c","wires":[["5cfca817.a09e08","eb213ae1.5247d8"]]},{"id":"5cfca817.a09e08","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":907.3729934692383,"y":1289.9843034744263,"z":"214d83f7.3c518c","wires":[]},{"id":"d95314ce.20c6c8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1021.047607421875,"y":1196.7144775390625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"eb213ae1.5247d8","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`'SQL Exception : Unable to execute Update query for  '+$input.action-identifiers.vnf-id`\"/>\n<parameter name='output.status.message' value=\"`'SQL Exception : Unable to execute Update query for  '+$input.action-identifiers.vnf-id`\"/>\n","comments":"","outputs":1,"x":980.2959442138672,"y":1123.273681640625,"z":"214d83f7.3c518c","wires":[["d95314ce.20c6c8"]]},{"id":"8842ebb3.34ae88","type":"execute","name":"execute: flatAndAddToContext","xml":"<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />","comments":"","outputs":1,"x":364.33331298828125,"y":322.8888854980469,"z":"214d83f7.3c518c","wires":[["78b42273.8539ac","20f2de7b.a00212","45f44361.d41d9c"]]},{"id":"78b42273.8539ac","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":592.3333435058594,"y":365.88885498046875,"z":"214d83f7.3c518c","wires":[["c5b3ed4c.7a51e"]]},{"id":"73d772ff.d3cd6c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","x":486.99999618530273,"y":651.6666946411133,"z":"214d83f7.3c518c","wires":[]},{"id":"40aa2873.9839d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":275.6667175292969,"y":577.1429710388184,"z":"214d83f7.3c518c","wires":[["73d772ff.d3cd6c","7bb5a0a6.e48e1"]]},{"id":"7bb5a0a6.e48e1","type":"execute","name":"Report_Error_Flattening_Payload_Json","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","outputs":1,"x":564.5714111328125,"y":504.5238914489746,"z":"214d83f7.3c518c","wires":[["6772c7b9.c47d68"]]},{"id":"6772c7b9.c47d68","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":649.8572235107422,"y":575.9524984359741,"z":"214d83f7.3c518c","wires":[[]]},{"id":"20f2de7b.a00212","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":100,"y":578.6666679382324,"z":"214d83f7.3c518c","wires":[["40aa2873.9839d8"]]},{"id":"d0048652.b34e78","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />","comments":"","x":494,"y":874.666690826416,"z":"214d83f7.3c518c","wires":[]},{"id":"1b04dee7.d382d1","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":282.66672134399414,"y":800.1429672241211,"z":"214d83f7.3c518c","wires":[["d0048652.b34e78","1bd902de.9423ad"]]},{"id":"1bd902de.9423ad","type":"execute","name":"Report_Error_Loading_Json_Flattening_Plugin","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />","comments":"","outputs":1,"x":571.5714149475098,"y":727.5238876342773,"z":"214d83f7.3c518c","wires":[["f2afc01e.a912c"]]},{"id":"f2afc01e.a912c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":656.8572273254395,"y":798.9524946212769,"z":"214d83f7.3c518c","wires":[[]]},{"id":"45f44361.d41d9c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":107,"y":798.6666679382324,"z":"214d83f7.3c518c","wires":[["1b04dee7.d382d1"]]},{"id":"30776976.0fc246","type":"execute","name":"Report_Success_in_Terminate","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"TERMINATE event executed successfully\" />","comments":"","outputs":1,"x":1212.6666259765625,"y":1419.0000610351562,"z":"214d83f7.3c518c","wires":[["8e5bf1b1.4b98e","3651cf1b.ebe7d"]]},{"id":"8e5bf1b1.4b98e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1283.6666564941406,"y":1486.6666641235352,"z":"214d83f7.3c518c","wires":[["621d1ea9.529a"]]},{"id":"3651cf1b.ebe7d","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1480.6665954589844,"y":1416.6666870117188,"z":"214d83f7.3c518c","wires":[[]]}]
+[{"id":"6a91792e.7babd8","type":"method","name":"Generic_Terminate","xml":"<method rpc='Generic_Terminate' mode='sync'>\n","comments":"","outputs":1,"x":148.66665649414062,"y":231,"z":"214d83f7.3c518c","wires":[["8842ebb3.34ae88"]]},{"id":"5b236231.d788cc","type":"service-logic","name":"APPC 2.0.1","module":"APPC","version":"2.0.1","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='2.0.1'>","outputs":1,"x":148.66665649414062,"y":158,"z":"214d83f7.3c518c","wires":[["6a91792e.7babd8"]]},{"id":"40dd126c.6467ac","type":"dgstart","name":"DGSTART","outputs":1,"x":114.66665649414062,"y":64,"z":"214d83f7.3c518c","wires":[["5b236231.d788cc"]]},{"id":"c5b3ed4c.7a51e","type":"execute","name":"execute_getVNF_Hierarchy","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />","comments":"","outputs":1,"x":712.6666564941406,"y":418,"z":"214d83f7.3c518c","wires":[["4167438c.1e614c","5c2b2174.d5d2d","72adec34.6cebc4"]]},{"id":"4167438c.1e614c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1042.6666717529297,"y":359,"z":"214d83f7.3c518c","wires":[["f36ab527.a7f0a8"]]},{"id":"40745781.e26f38","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":743.6666717529297,"y":1031.0000610351562,"z":"214d83f7.3c518c","wires":[["9a947cc5.23ce8","51330ad7.924734","82d02640.710dc8"]]},{"id":"9a947cc5.23ce8","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":1201.6666717529297,"y":888,"z":"214d83f7.3c518c","wires":[["a18c1d82.ceb56"]]},{"id":"a18c1d82.ceb56","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":1291.6666717529297,"y":717,"z":"214d83f7.3c518c","wires":[["1f5ac652.ff0a0a"]]},{"id":"1f5ac652.ff0a0a","type":"execute","name":"execute_UpdateAA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Terminating\" />\n","comments":"","outputs":1,"x":1432.6666717529297,"y":811,"z":"214d83f7.3c518c","wires":[["ba2d3b93.0fc308","e013018e.c2ce6"]]},{"id":"ba2d3b93.0fc308","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1607.6666717529297,"y":814,"z":"214d83f7.3c518c","wires":[["30ec2ffc.29dd4"]]},{"id":"5c2b2174.d5d2d","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1171.6666717529297,"y":255,"z":"214d83f7.3c518c","wires":[["7af3024a.0c77ec"]]},{"id":"6f9d109d.47a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1580.6666717529297,"y":307,"z":"214d83f7.3c518c","wires":[]},{"id":"a9d9b6a5.ff7028","type":"execute","name":"execute_Delete_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='deleteResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n","comments":"","outputs":1,"x":1777.6669158935547,"y":1548.000244140625,"z":"214d83f7.3c518c","wires":[["f0a60773.983e78","791fa776.b19fa8"]]},{"id":"f0a60773.983e78","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1958.6669158935547,"y":1605.000244140625,"z":"214d83f7.3c518c","wires":[["1418d53d.7f133b"]]},{"id":"db7092d6.8fae","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2043.6669158935547,"y":1933.000244140625,"z":"214d83f7.3c518c","wires":[]},{"id":"791fa776.b19fa8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1959.6669158935547,"y":1474.000244140625,"z":"214d83f7.3c518c","wires":[["ddbbf603.b53e18"]]},{"id":"e013018e.c2ce6","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1607.6666717529297,"y":634,"z":"214d83f7.3c518c","wires":[["47ccb57f.6543ec"]]},{"id":"e72b6702.279708","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2075.6666717529297,"y":545,"z":"214d83f7.3c518c","wires":[]},{"id":"8bf91d02.277ac","type":"comment","name":"update VNFCs to terminating","info":"","comments":"","x":1353.6666717529297,"y":860,"z":"214d83f7.3c518c","wires":[]},{"id":"e269577f.6b4058","type":"comment","name":"call south bound to delete VMs","info":"","comments":"","x":1921.6666717529297,"y":354,"z":"214d83f7.3c518c","wires":[]},{"id":"8b30f8a4.f6e778","type":"comment","name":"Delete VNFCs from AA&I","info":"","comments":"","x":1804.6669158935547,"y":1582.000244140625,"z":"214d83f7.3c518c","wires":[]},{"id":"be86022b.82158","type":"comment","name":"Fetch all VMs and VNFCs from AA&I for given VNF_ID","info":"","comments":"","x":962.6666564941406,"y":471,"z":"214d83f7.3c518c","wires":[]},{"id":"78588c7a.743e14","type":"switchNode","name":"switch","xml":"<switch test='`$VNF.VMCount`'>\n","comments":"","outputs":1,"x":867.6666717529297,"y":792,"z":"214d83f7.3c518c","wires":[["166c71ac.291f6e","724fce8c.100f6"]]},{"id":"166c71ac.291f6e","type":"other","name":"outcome_0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1040.6666717529297,"y":697,"z":"214d83f7.3c518c","wires":[["74e7a734.c69f38"]]},{"id":"724fce8c.100f6","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":988.6666717529297,"y":882,"z":"214d83f7.3c518c","wires":[["40745781.e26f38"]]},{"id":"f36ab527.a7f0a8","type":"switchNode","name":"switch","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":957.6666717529297,"y":504,"z":"214d83f7.3c518c","wires":[["605c9bcb.12d854","8eb5283f.78b858"]]},{"id":"605c9bcb.12d854","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":956.6666717529297,"y":591,"z":"214d83f7.3c518c","wires":[["78588c7a.743e14"]]},{"id":"8eb5283f.78b858","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1212.6666717529297,"y":500,"z":"214d83f7.3c518c","wires":[["bc16b835.e67df8"]]},{"id":"30ec2ffc.29dd4","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1740.6666717529297,"y":676,"z":"214d83f7.3c518c","wires":[["486bc0b7.06e2c","6b589062.343aa","46ffb052.ef31d"]]},{"id":"486bc0b7.06e2c","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1896.6666717529297,"y":644,"z":"214d83f7.3c518c","wires":[[]]},{"id":"6b589062.343aa","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1905.6666717529297,"y":680,"z":"214d83f7.3c518c","wires":[["d6575672.8b8888"]]},{"id":"46ffb052.ef31d","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1900.6666717529297,"y":717,"z":"214d83f7.3c518c","wires":[["a6264772.8b5a18"]]},{"id":"ddbbf603.b53e18","type":"switchNode","name":"switch","xml":"<switch test='`$deleteResource_result`'>\n","comments":"","outputs":1,"x":2172.6669158935547,"y":1544.0002136230469,"z":"214d83f7.3c518c","wires":[["f03cdfd2.9419f","75d0e135.830a5","b144c34e.c13ab"]]},{"id":"f03cdfd2.9419f","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>","comments":"","outputs":1,"x":2349.6669158935547,"y":1510.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"75d0e135.830a5","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2349.6669158935547,"y":1624.000244140625,"z":"214d83f7.3c518c","wires":[["8e0f8ac1.b9e7e8"]]},{"id":"b144c34e.c13ab","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2343.6669158935547,"y":1735.000244140625,"z":"214d83f7.3c518c","wires":[["2ae8e8ce.c451c8"]]},{"id":"6b97d665.4e5aa8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2673.6669158935547,"y":1648.000244140625,"z":"214d83f7.3c518c","wires":[]},{"id":"ffc50795.32ef28","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2687.6669158935547,"y":1781.000244140625,"z":"214d83f7.3c518c","wires":[]},{"id":"79a07e38.a86d4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1319.6666717529297,"y":679,"z":"214d83f7.3c518c","wires":[]},{"id":"f4d2923.3dec37","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2273.6666717529297,"y":687,"z":"214d83f7.3c518c","wires":[]},{"id":"4a7e04c9.bf41cc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2235.667007446289,"y":900,"z":"214d83f7.3c518c","wires":[]},{"id":"2adb8b66.3f8504","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1460.6666717529297,"y":524,"z":"214d83f7.3c518c","wires":[]},{"id":"7af3024a.0c77ec","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1289.6666717529297,"y":323,"z":"214d83f7.3c518c","wires":[["6f9d109d.47a","ebf5dd23.4a38f"]]},{"id":"ebf5dd23.4a38f","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"Exception in getting VNF Hierachy\"/>\n<parameter name='output.status.message' value=\"Exception in getting VNF Hierachy\"/>\n","comments":"","outputs":1,"x":1570.6666717529297,"y":133,"z":"214d83f7.3c518c","wires":[["c956679b.bab7b8"]]},{"id":"c956679b.bab7b8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1795.6666717529297,"y":104,"z":"214d83f7.3c518c","wires":[[]]},{"id":"bc16b835.e67df8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1354.6666717529297,"y":466,"z":"214d83f7.3c518c","wires":[["2adb8b66.3f8504","a41aef94.7e09"]]},{"id":"a41aef94.7e09","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"Failure in getting VNF Hierachy\"/>\n<parameter name='output.status.message' value=\"Failure in getting VNF Hierachy\"/>\n\n","comments":"","outputs":1,"x":1420.6666717529297,"y":392,"z":"214d83f7.3c518c","wires":[["109fc3cc.165b8c"]]},{"id":"109fc3cc.165b8c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1627.6666717529297,"y":408,"z":"214d83f7.3c518c","wires":[[]]},{"id":"74e7a734.c69f38","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1159.6666717529297,"y":635,"z":"214d83f7.3c518c","wires":[["79a07e38.a86d4","1fdafa81.05cb55"]]},{"id":"1fdafa81.05cb55","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"VM Count is 0\"/>\n<parameter name='output.status.message' value=\"VM Count is 0\"/>\n\n","comments":"","outputs":1,"x":1260.6666717529297,"y":563,"z":"214d83f7.3c518c","wires":[["a638cc12.c03da"]]},{"id":"a638cc12.c03da","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1426.6666717529297,"y":623,"z":"214d83f7.3c518c","wires":[[]]},{"id":"47ccb57f.6543ec","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1922.6666717529297,"y":492,"z":"214d83f7.3c518c","wires":[["e72b6702.279708","203420f8.4a6c8"]]},{"id":"203420f8.4a6c8","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>\n","comments":"","outputs":1,"x":2147.6666717529297,"y":490,"z":"214d83f7.3c518c","wires":[["81561833.a0f998"]]},{"id":"81561833.a0f998","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2350.6666717529297,"y":493,"z":"214d83f7.3c518c","wires":[[]]},{"id":"a6264772.8b5a18","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2006.6666412353516,"y":796,"z":"214d83f7.3c518c","wires":[["4a7e04c9.bf41cc","d22c813.a8fe48"]]},{"id":"d22c813.a8fe48","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n\n","comments":"","outputs":1,"x":2278.6671295166016,"y":813,"z":"214d83f7.3c518c","wires":[["9df8c65a.d36ae8"]]},{"id":"9df8c65a.d36ae8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2499.667037963867,"y":809.0000915527344,"z":"214d83f7.3c518c","wires":[[]]},{"id":"d6575672.8b8888","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2068.6666412353516,"y":685,"z":"214d83f7.3c518c","wires":[["f4d2923.3dec37","d0f739a9.299bf8"]]},{"id":"d0f739a9.299bf8","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'VNFC not found in AAI'+ $VNF.VM[$i].VNFC`\" />\n<parameter name='output.status.message' value=\"`'VNFC not found in AAI'+ $VNF.VM[$i].VNFC`\" />\n\n","comments":"","outputs":1,"x":2263.6666717529297,"y":621,"z":"214d83f7.3c518c","wires":[["bede9367.77c9d"]]},{"id":"bede9367.77c9d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2455.6669158935547,"y":621,"z":"214d83f7.3c518c","wires":[[]]},{"id":"8e0f8ac1.b9e7e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2521.6669158935547,"y":1618.000244140625,"z":"214d83f7.3c518c","wires":[["6b97d665.4e5aa8","27493e98.52c6e2"]]},{"id":"2ae8e8ce.c451c8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2521.6669158935547,"y":1739.000244140625,"z":"214d83f7.3c518c","wires":[["ffc50795.32ef28","49dfea1b.954844"]]},{"id":"27493e98.52c6e2","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'VNFC not found in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'VNFC not found in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2695.6669158935547,"y":1543.000244140625,"z":"214d83f7.3c518c","wires":[["3265161a.da4fda"]]},{"id":"49dfea1b.954844","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n","comments":"","outputs":1,"x":2715.6669158935547,"y":1702.000244140625,"z":"214d83f7.3c518c","wires":[["a931d97f.0a8ef8"]]},{"id":"3265161a.da4fda","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2915.6669158935547,"y":1545.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"a931d97f.0a8ef8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2936.6669158935547,"y":1697.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"1418d53d.7f133b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1854.6669158935547,"y":1869.000244140625,"z":"214d83f7.3c518c","wires":[["db7092d6.8fae","d2c04b2.c7333b8"]]},{"id":"d2c04b2.c7333b8","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in deleting from AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in deleting from AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n\n","comments":"","outputs":1,"x":2076.6669158935547,"y":1866.000244140625,"z":"214d83f7.3c518c","wires":[["76c8bb58.d4a2b4"]]},{"id":"76c8bb58.d4a2b4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2277.6669158935547,"y":1867.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"51330ad7.924734","type":"execute","name":"execute_TerminateStack","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='terminateStack' >\n <parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.onap.appc.instance.url\" value=\"`$VNF.VM[0].URL`\" />\n <parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n <parameter name=\"org.onap.appc.stack.id\" value=\"`$VNF.heat-stack-id`\"/>","comments":"","outputs":1,"x":1128.6666717529297,"y":1052,"z":"214d83f7.3c518c","wires":[["8014c3bc.7e994","9518b74c.9dfbe8","500bd329.f4843c"]]},{"id":"8014c3bc.7e994","type":"outcome","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1019.6666717529297,"y":1364,"z":"214d83f7.3c518c","wires":[["e36fc9a0.8f4758"]]},{"id":"9518b74c.9dfbe8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1315.6666412353516,"y":1143.0000305175781,"z":"214d83f7.3c518c","wires":[["f1cff1ca.4f3fa"]]},{"id":"f1cff1ca.4f3fa","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1474.6666412353516,"y":1226.0000305175781,"z":"214d83f7.3c518c","wires":[["d26c7cdb.1a1c1","e21c7013.2a511","4e395d8c.0e8654"]]},{"id":"bffd5141.6c547","type":"execute","name":"execute_Update_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"ERROR\" />\n","comments":"","outputs":1,"x":2290.6666412353516,"y":1171.0000915527344,"z":"214d83f7.3c518c","wires":[["13d1960d.9c176a","ee50c4be.2e9d28"]]},{"id":"ee50c4be.2e9d28","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2449.6666717529297,"y":1105.0001220703125,"z":"214d83f7.3c518c","wires":[["6876f9ee.88d068"]]},{"id":"104f28b8.5f4c67","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2728.6664276123047,"y":1316.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"2129246.f55abdc","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2737.6666107177734,"y":1293.0001525878906,"z":"214d83f7.3c518c","wires":[[]]},{"id":"75bf7111.51ae5","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":2722.6666717529297,"y":1272.0001220703125,"z":"214d83f7.3c518c","wires":[[]]},{"id":"b334397d.c3d958","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":2598.6666717529297,"y":1225.0001220703125,"z":"214d83f7.3c518c","wires":[["104f28b8.5f4c67","2129246.f55abdc","75bf7111.51ae5"]]},{"id":"13d1960d.9c176a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2451.6666717529297,"y":1233.0001220703125,"z":"214d83f7.3c518c","wires":[["b334397d.c3d958"]]},{"id":"d26c7cdb.1a1c1","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Error occured while terminating Stack '+$VNF.heat-stack-id`\"/>\n<parameter name='output.status.message' value=\"`'Error occured while terminating Stack '+$VNF.heat-stack-id`\"/>\n","comments":"","outputs":1,"x":1729.6666717529297,"y":1219,"z":"214d83f7.3c518c","wires":[["8be889a9.6d6c68"]]},{"id":"8be889a9.6d6c68","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1918.6666717529297,"y":1211,"z":"214d83f7.3c518c","wires":[[]]},{"id":"500bd329.f4843c","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1293.6666412353516,"y":1194.0001525878906,"z":"214d83f7.3c518c","wires":[["f1cff1ca.4f3fa"]]},{"id":"4a03d8fe.d47068","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":1455.6666717529297,"y":1498.666748046875,"z":"214d83f7.3c518c","wires":[["6b7368e3.64b308"]]},{"id":"e21c7013.2a511","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":1428.6666717529297,"y":1029.3333740234375,"z":"214d83f7.3c518c","wires":[["7b636d61.d0b554"]]},{"id":"7099d9d3.ce2a88","type":"execute","name":"execute_lookupServer","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='lookupServer' >\n <parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.onap.appc.instance.url\" value=\"`$VNF.VM[$i].URL`\" />\n <parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n","comments":"","outputs":1,"x":1649.6666717529297,"y":1033.3333740234375,"z":"214d83f7.3c518c","wires":[["d40d4181.f4c28","e3a51c64.b39b9"]]},{"id":"7a853c33.9204b4","type":"switchNode","name":"switch_isServerFound","xml":"<switch test='`$serverFound`'>\n","comments":"","outputs":1,"x":2054.333297729492,"y":1036.3333740234375,"z":"214d83f7.3c518c","wires":[["ba8d600.0a405a","dec7ed8e.6bb98","f0ec0e5b.68c6"]]},{"id":"ba8d600.0a405a","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2255.3331756591797,"y":1029.3333740234375,"z":"214d83f7.3c518c","wires":[["bffd5141.6c547"]]},{"id":"dec7ed8e.6bb98","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2250.333297729492,"y":1098.3333740234375,"z":"214d83f7.3c518c","wires":[["bffd5141.6c547"]]},{"id":"a8c9d533.157048","type":"execute","name":"execute_Delete_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='deleteResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n","comments":"","outputs":1,"x":2708.8888397216797,"y":813.1111450195312,"z":"214d83f7.3c518c","wires":[["b85685cd.59cc58","adbd6019.dddcf"]]},{"id":"b85685cd.59cc58","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2921.8888397216797,"y":909.1111755371094,"z":"214d83f7.3c518c","wires":[["a26d7ad7.fc3678"]]},{"id":"51877c7e.0ed344","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3065.8888397216797,"y":1149.1111755371094,"z":"214d83f7.3c518c","wires":[]},{"id":"adbd6019.dddcf","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2911.8888397216797,"y":737.1111755371094,"z":"214d83f7.3c518c","wires":[["a32e8ff0.fd949"]]},{"id":"6b1dcaae.a26de4","type":"comment","name":"Delete VNFCs from AA&I","info":"","comments":"","x":2943.8888397216797,"y":836.1111755371094,"z":"214d83f7.3c518c","wires":[]},{"id":"a32e8ff0.fd949","type":"switchNode","name":"switch","xml":"<switch test='`$deleteResource_result`'>\n","comments":"","outputs":1,"x":3103.8888397216797,"y":740.1111755371094,"z":"214d83f7.3c518c","wires":[["6367d45e.f568bc","a2b057d0.ae5338","af8908d5.a293b8"]]},{"id":"6367d45e.f568bc","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>","comments":"","outputs":1,"x":3328.8888397216797,"y":741.1111755371094,"z":"214d83f7.3c518c","wires":[[]]},{"id":"a2b057d0.ae5338","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":3328.8888397216797,"y":855.1111755371094,"z":"214d83f7.3c518c","wires":[["2e777347.c58bac"]]},{"id":"af8908d5.a293b8","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":3322.8888397216797,"y":966.1111755371094,"z":"214d83f7.3c518c","wires":[["d3aee095.4eaad"]]},{"id":"b0455566.ea43d8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3652.8888397216797,"y":879.1111755371094,"z":"214d83f7.3c518c","wires":[]},{"id":"8320aaf5.fac488","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3666.8888397216797,"y":1012.1111755371094,"z":"214d83f7.3c518c","wires":[]},{"id":"2e777347.c58bac","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3500.8888397216797,"y":849.1111755371094,"z":"214d83f7.3c518c","wires":[["b0455566.ea43d8","c013a213.b6497"]]},{"id":"d3aee095.4eaad","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3500.8888397216797,"y":970.1111755371094,"z":"214d83f7.3c518c","wires":[["8320aaf5.fac488","fc0ad0dd.1a778"]]},{"id":"c013a213.b6497","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'VNFC not found in AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'VNFC not found in AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":3632.8888397216797,"y":769.1111755371094,"z":"214d83f7.3c518c","wires":[["92ed3d58.93848"]]},{"id":"fc0ad0dd.1a778","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n","comments":"","outputs":1,"x":3694.8888397216797,"y":933.1111755371094,"z":"214d83f7.3c518c","wires":[["d9ca4a14.fc8388"]]},{"id":"92ed3d58.93848","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3849.8888397216797,"y":769.1111755371094,"z":"214d83f7.3c518c","wires":[[]]},{"id":"d9ca4a14.fc8388","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3873.8888397216797,"y":930.1111755371094,"z":"214d83f7.3c518c","wires":[[]]},{"id":"a26d7ad7.fc3678","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2873.8888397216797,"y":1074.1111755371094,"z":"214d83f7.3c518c","wires":[["51877c7e.0ed344","63fbb548.bd5b9c"]]},{"id":"63fbb548.bd5b9c","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in deleting from AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in deleting from AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>\n\n","comments":"","outputs":1,"x":3098.8888397216797,"y":1018.1111755371094,"z":"214d83f7.3c518c","wires":[["fc4ad188.46539"]]},{"id":"fc4ad188.46539","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3286.8888397216797,"y":1022.1111755371094,"z":"214d83f7.3c518c","wires":[[]]},{"id":"d40d4181.f4c28","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1852.6666717529297,"y":1032,"z":"214d83f7.3c518c","wires":[["7a853c33.9204b4"]]},{"id":"e3a51c64.b39b9","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1841.6666717529297,"y":1102,"z":"214d83f7.3c518c","wires":[["bffd5141.6c547"]]},{"id":"7b636d61.d0b554","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1519.6666717529297,"y":979,"z":"214d83f7.3c518c","wires":[["7099d9d3.ce2a88"]]},{"id":"72adec34.6cebc4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1265.6666717529297,"y":80,"z":"214d83f7.3c518c","wires":[["7af3024a.0c77ec"]]},{"id":"6b7368e3.64b308","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1554.6666717529297,"y":1555,"z":"214d83f7.3c518c","wires":[["a9d9b6a5.ff7028"]]},{"id":"621d1ea9.529a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1356.6665954589844,"y":1548,"z":"214d83f7.3c518c","wires":[["4a03d8fe.d47068"]]},{"id":"e36fc9a0.8f4758","type":"switchNode","name":"switch","xml":"<switch test='`$TERMINATE_STATUS`'>\n","comments":"","outputs":1,"x":867.6666717529297,"y":1607,"z":"214d83f7.3c518c","wires":[["d112b421.f478c8","dd33deb1.aac3a","be14d688.32f998"]]},{"id":"be14d688.32f998","type":"other","name":"outcome_Stack_NOT_FOUND","xml":"<outcome value='STACK_NOT_FOUND'>\n","comments":"","outputs":1,"x":1118.6666717529297,"y":1657,"z":"214d83f7.3c518c","wires":[["54e72492.4b6c5c"]]},{"id":"d112b421.f478c8","type":"success","name":"outcome_SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1101.6666717529297,"y":1551,"z":"214d83f7.3c518c","wires":[["30776976.0fc246"]]},{"id":"dd33deb1.aac3a","type":"other","name":"outcome_ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":1099.6666717529297,"y":1599,"z":"214d83f7.3c518c","wires":[["f1cff1ca.4f3fa"]]},{"id":"4e395d8c.0e8654","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1690.6666717529297,"y":1305,"z":"214d83f7.3c518c","wires":[]},{"id":"6876f9ee.88d068","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2671.6664276123047,"y":1110.000244140625,"z":"214d83f7.3c518c","wires":[]},{"id":"43a0f845.a872c8","type":"execute","name":"execute_Update_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"ERROR\" />\n","comments":"","outputs":1,"x":1340.6666717529297,"y":2128,"z":"214d83f7.3c518c","wires":[["3294635e.27511c","b1093d6.01027c"]]},{"id":"b1093d6.01027c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1539.6666717529297,"y":2107,"z":"214d83f7.3c518c","wires":[["8dd7506b.ff07f"]]},{"id":"3294635e.27511c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1536.6666717529297,"y":2152,"z":"214d83f7.3c518c","wires":[["33c89bc.80ab564"]]},{"id":"33c89bc.80ab564","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1671.6666717529297,"y":2156,"z":"214d83f7.3c518c","wires":[["4c727a1.c013684","c7169490.8b0688","555157fd.482568"]]},{"id":"4c727a1.c013684","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1824.6665496826172,"y":2175.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"c7169490.8b0688","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1836.6666717529297,"y":2157,"z":"214d83f7.3c518c","wires":[[]]},{"id":"555157fd.482568","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1815.6666717529297,"y":2128,"z":"214d83f7.3c518c","wires":[[]]},{"id":"54e72492.4b6c5c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":899.6666717529297,"y":1925,"z":"214d83f7.3c518c","wires":[["402e577a.9942b8","1e80e12b.08e96f"]]},{"id":"402e577a.9942b8","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":1246.6666717529297,"y":1987.666748046875,"z":"214d83f7.3c518c","wires":[["f67c30dc.e3327"]]},{"id":"f67c30dc.e3327","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1310.6666717529297,"y":2053,"z":"214d83f7.3c518c","wires":[["43a0f845.a872c8"]]},{"id":"8dd7506b.ff07f","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1996.6666717529297,"y":2103,"z":"214d83f7.3c518c","wires":[["5519adf3.6b21c4","62c19bb2.6e4ff4"]]},{"id":"62c19bb2.6e4ff4","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in updatig Error in AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in updatig Error in AAI for '+$VNF.VM[$i].VNFC`\"/>\n\n\n","comments":"","outputs":1,"x":2190.6666717529297,"y":2040,"z":"214d83f7.3c518c","wires":[["b88c942f.647928"]]},{"id":"b88c942f.647928","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2394.6666717529297,"y":2041,"z":"214d83f7.3c518c","wires":[[]]},{"id":"5519adf3.6b21c4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2161.6666717529297,"y":2163,"z":"214d83f7.3c518c","wires":[]},{"id":"f0ec0e5b.68c6","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2249.6666717529297,"y":973,"z":"214d83f7.3c518c","wires":[["a8c9d533.157048"]]},{"id":"1e80e12b.08e96f","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1205.6666717529297,"y":2241,"z":"214d83f7.3c518c","wires":[["b275796.53f2988","4c597638.4430e8"]]},{"id":"4c597638.4430e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1437.666732788086,"y":2285,"z":"214d83f7.3c518c","wires":[]},{"id":"b275796.53f2988","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Stack not found with id: '+$VNF.heat-stack-id`\"/>\n<parameter name='output.status.message' value=\"`'Stack not found with id: '+$VNF.heat-stack-id`\"/>\n","comments":"","outputs":1,"x":1477.666732788086,"y":2228,"z":"214d83f7.3c518c","wires":[["6f875274.e7da5c"]]},{"id":"6f875274.e7da5c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1698.6666717529297,"y":2224,"z":"214d83f7.3c518c","wires":[[]]},{"id":"82d02640.710dc8","type":"update","name":"update","xml":"<update resource='SQL' force='true' plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' key=\"UPDATE UPLOAD_CONFIG SET PENDING_DELETE='Y' where VNF_ID = $input.action-identifiers.vnf-id\">","comments":"","outputs":1,"x":487.4444274902344,"y":1245.8418579101562,"z":"214d83f7.3c518c","wires":[["f2a83f28.727f8","e85986a4.fe52f8"]]},{"id":"e85986a4.fe52f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":651.0158538818359,"y":1183.6987915039062,"z":"214d83f7.3c518c","wires":[["1dbbd253.259b4e"]]},{"id":"f2a83f28.727f8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":645.7062225341797,"y":1290.1268920898438,"z":"214d83f7.3c518c","wires":[["5cfca817.a09e08"]]},{"id":"1dbbd253.259b4e","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":820.4444427490234,"y":1184.8577270507812,"z":"214d83f7.3c518c","wires":[["5cfca817.a09e08","eb213ae1.5247d8"]]},{"id":"5cfca817.a09e08","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":907.3729934692383,"y":1289.9843034744263,"z":"214d83f7.3c518c","wires":[]},{"id":"d95314ce.20c6c8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1021.047607421875,"y":1196.7144775390625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"eb213ae1.5247d8","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'SQL Exception : Unable to execute Update query for  '+$input.action-identifiers.vnf-id`\"/>\n<parameter name='output.status.message' value=\"`'SQL Exception : Unable to execute Update query for  '+$input.action-identifiers.vnf-id`\"/>\n","comments":"","outputs":1,"x":980.2959442138672,"y":1123.273681640625,"z":"214d83f7.3c518c","wires":[["d95314ce.20c6c8"]]},{"id":"8842ebb3.34ae88","type":"execute","name":"execute: flatAndAddToContext","xml":"<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />","comments":"","outputs":1,"x":364.33331298828125,"y":322.8888854980469,"z":"214d83f7.3c518c","wires":[["78b42273.8539ac","20f2de7b.a00212","45f44361.d41d9c"]]},{"id":"78b42273.8539ac","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":592.3333435058594,"y":365.88885498046875,"z":"214d83f7.3c518c","wires":[["c5b3ed4c.7a51e"]]},{"id":"73d772ff.d3cd6c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","x":486.99999618530273,"y":651.6666946411133,"z":"214d83f7.3c518c","wires":[]},{"id":"40aa2873.9839d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":275.6667175292969,"y":577.1429710388184,"z":"214d83f7.3c518c","wires":[["73d772ff.d3cd6c","7bb5a0a6.e48e1"]]},{"id":"7bb5a0a6.e48e1","type":"execute","name":"Report_Error_Flattening_Payload_Json","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","outputs":1,"x":564.5714111328125,"y":504.5238914489746,"z":"214d83f7.3c518c","wires":[["6772c7b9.c47d68"]]},{"id":"6772c7b9.c47d68","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":649.8572235107422,"y":575.9524984359741,"z":"214d83f7.3c518c","wires":[[]]},{"id":"20f2de7b.a00212","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":100,"y":578.6666679382324,"z":"214d83f7.3c518c","wires":[["40aa2873.9839d8"]]},{"id":"d0048652.b34e78","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />","comments":"","x":494,"y":874.666690826416,"z":"214d83f7.3c518c","wires":[]},{"id":"1b04dee7.d382d1","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":282.66672134399414,"y":800.1429672241211,"z":"214d83f7.3c518c","wires":[["d0048652.b34e78","1bd902de.9423ad"]]},{"id":"1bd902de.9423ad","type":"execute","name":"Report_Error_Loading_Json_Flattening_Plugin","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />","comments":"","outputs":1,"x":571.5714149475098,"y":727.5238876342773,"z":"214d83f7.3c518c","wires":[["f2afc01e.a912c"]]},{"id":"f2afc01e.a912c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":656.8572273254395,"y":798.9524946212769,"z":"214d83f7.3c518c","wires":[[]]},{"id":"45f44361.d41d9c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":107,"y":798.6666679382324,"z":"214d83f7.3c518c","wires":[["1b04dee7.d382d1"]]},{"id":"30776976.0fc246","type":"execute","name":"Report_Success_in_Terminate","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"TERMINATE event executed successfully\" />","comments":"","outputs":1,"x":1212.6666259765625,"y":1419.0000610351562,"z":"214d83f7.3c518c","wires":[["8e5bf1b1.4b98e","3651cf1b.ebe7d"]]},{"id":"8e5bf1b1.4b98e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1283.6666564941406,"y":1486.6666641235352,"z":"214d83f7.3c518c","wires":[["621d1ea9.529a"]]},{"id":"3651cf1b.ebe7d","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1480.6665954589844,"y":1416.6666870117188,"z":"214d83f7.3c518c","wires":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_SWITCH_Restart_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_SWITCH_Restart_2.0.0.json
index 458131011..4ad2d6b8b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_SWITCH_Restart_2.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_SWITCH_Restart_2.0.0.json
@@ -1 +1 @@
-[{"id":"1a937537.26e25b","type":"dgstart","name":"DGSTART","outputs":1,"x":128,"y":84,"z":"766912fd.5b210c","wires":[["cb060236.e98d1"]]},{"id":"cb060236.e98d1","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":132,"y":174,"z":"766912fd.5b210c","wires":[["40de1ddd.58f674"]]},{"id":"40de1ddd.58f674","type":"method","name":"SWITCH_Restart","xml":"<method rpc='SWITCH_Restart' mode='sync'>\n","comments":"","outputs":1,"x":153,"y":260,"z":"766912fd.5b210c","wires":[["5b95ace9.c583d4"]]},{"id":"ec6eb90f.cac088","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='waitMethod' >\n<parameter name=\"waitTime\" value=\"60000\" />\n","comments":"","outputs":1,"x":549,"y":260,"z":"766912fd.5b210c","wires":[["db7e112d.9bbe4","6aa99cde.cd13f4"]]},{"id":"5b95ace9.c583d4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":364,"y":260,"z":"766912fd.5b210c","wires":[["ec6eb90f.cac088"]]},{"id":"db7e112d.9bbe4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":725,"y":218,"z":"766912fd.5b210c","wires":[["d79b02d0.df76d"]]},{"id":"d79b02d0.df76d","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":910,"y":252,"z":"766912fd.5b210c","wires":[]},{"id":"6aa99cde.cd13f4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":726,"y":283,"z":"766912fd.5b210c","wires":[["d79b02d0.df76d"]]}]
+[{"id":"1a937537.26e25b","type":"dgstart","name":"DGSTART","outputs":1,"x":128,"y":84,"z":"766912fd.5b210c","wires":[["cb060236.e98d1"]]},{"id":"cb060236.e98d1","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":132,"y":174,"z":"766912fd.5b210c","wires":[["40de1ddd.58f674"]]},{"id":"40de1ddd.58f674","type":"method","name":"SWITCH_Restart","xml":"<method rpc='SWITCH_Restart' mode='sync'>\n","comments":"","outputs":1,"x":153,"y":260,"z":"766912fd.5b210c","wires":[["5b95ace9.c583d4"]]},{"id":"ec6eb90f.cac088","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='waitMethod' >\n<parameter name=\"waitTime\" value=\"60000\" />\n","comments":"","outputs":1,"x":549,"y":260,"z":"766912fd.5b210c","wires":[["db7e112d.9bbe4","6aa99cde.cd13f4"]]},{"id":"5b95ace9.c583d4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":364,"y":260,"z":"766912fd.5b210c","wires":[["ec6eb90f.cac088"]]},{"id":"db7e112d.9bbe4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":725,"y":218,"z":"766912fd.5b210c","wires":[["d79b02d0.df76d"]]},{"id":"d79b02d0.df76d","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":910,"y":252,"z":"766912fd.5b210c","wires":[]},{"id":"6aa99cde.cd13f4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":726,"y":283,"z":"766912fd.5b210c","wires":[["d79b02d0.df76d"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_VSBG_Test_2.0.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_VSBG_Test_2.0.0.0.json
index 03fe2d440..9e3520049 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_VSBG_Test_2.0.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_VSBG_Test_2.0.0.0.json
@@ -1 +1 @@
-[{"id":"f0a14063.49fef","type":"dgstart","name":"DGSTART","outputs":1,"x":144.66665649414062,"y":113,"z":"a4e67f56.cb2c9","wires":[["71609fd4.fe5e7"]]},{"id":"71609fd4.fe5e7","type":"service-logic","name":"APPC 2.0.0.0","module":"APPC","version":"2.0.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='2.0.0.0'>","outputs":1,"x":187.66665649414062,"y":161,"z":"a4e67f56.cb2c9","wires":[["7a306dce.e01f54"]]},{"id":"7a306dce.e01f54","type":"method","name":"VSBG_Test","xml":"<method rpc='VSBG_Test' mode='sync'>\n","comments":"","outputs":1,"x":233.66665649414062,"y":213,"z":"a4e67f56.cb2c9","wires":[["33d1bd3b.3839b2"]]},{"id":"f8461bde.e321d8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":1050.3810119628906,"y":819.5714111328125,"z":"a4e67f56.cb2c9","wires":[]},{"id":"dcf02cbe.eaddb","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.openecomp.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":642.6666564941406,"y":522,"z":"a4e67f56.cb2c9","wires":[["f5fa430a.9e4f7","1de49110.b5b6cf"]]},{"id":"1de49110.b5b6cf","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":948.4444274902344,"y":475.77777099609375,"z":"a4e67f56.cb2c9","wires":[["460816d8.46ee68"]]},{"id":"f5fa430a.9e4f7","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":956.3334045410156,"y":702.22216796875,"z":"a4e67f56.cb2c9","wires":[["f8461bde.e321d8"]]},{"id":"460816d8.46ee68","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.openecomp.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1058.4604187011719,"y":545.7619018554688,"z":"a4e67f56.cb2c9","wires":[["4160821.27be47c"]]},{"id":"39bde04b.627fc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"`$org.openecomp.appc.dg.error`\" />\n<parameter name='output.status.code' value='401'/>","comments":"","x":1192.6665344238281,"y":702.857177734375,"z":"a4e67f56.cb2c9","wires":[]},{"id":"4160821.27be47c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1128.2380676269531,"y":645.4285888671875,"z":"a4e67f56.cb2c9","wires":[["39bde04b.627fc"]]},{"id":"33d1bd3b.3839b2","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":285.6666564941406,"y":264.0000305175781,"z":"a4e67f56.cb2c9","wires":[["23f9f2ae.ed9cde","ea3be85c.c64088"]]},{"id":"ea3be85c.c64088","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >","comments":"","outputs":1,"x":440.6665344238281,"y":312.00006103515625,"z":"a4e67f56.cb2c9","wires":[["d5e1f466.c9bfe8","cd5322eb.78cc6"]]},{"id":"23f9f2ae.ed9cde","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value='`$org.openecomp.appc.vfid`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":455.6666564941406,"y":259.0000305175781,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"cd5322eb.78cc6","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":707.6666564941406,"y":260.3332824707031,"z":"a4e67f56.cb2c9","wires":[["a7848345.ee52c"]]},{"id":"d5e1f466.c9bfe8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":459.6666564941406,"y":379.9999694824219,"z":"a4e67f56.cb2c9","wires":[["82d20977.7a5348"]]},{"id":"a7848345.ee52c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":874.6666564941406,"y":259.3332824707031,"z":"a4e67f56.cb2c9","wires":[]},{"id":"ed1b86af.b4bf98","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.openecomp.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />","comments":"","x":716.6666564941406,"y":445,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"82d20977.7a5348","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":512.6666564941406,"y":445,"z":"a4e67f56.cb2c9","wires":[["ed1b86af.b4bf98","dcf02cbe.eaddb"]]}]
+[{"id":"f0a14063.49fef","type":"dgstart","name":"DGSTART","outputs":1,"x":144.66665649414062,"y":113,"z":"a4e67f56.cb2c9","wires":[["71609fd4.fe5e7"]]},{"id":"71609fd4.fe5e7","type":"service-logic","name":"APPC 2.0.0.0","module":"APPC","version":"2.0.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='2.0.0.0'>","outputs":1,"x":187.66665649414062,"y":161,"z":"a4e67f56.cb2c9","wires":[["7a306dce.e01f54"]]},{"id":"7a306dce.e01f54","type":"method","name":"VSBG_Test","xml":"<method rpc='VSBG_Test' mode='sync'>\n","comments":"","outputs":1,"x":233.66665649414062,"y":213,"z":"a4e67f56.cb2c9","wires":[["33d1bd3b.3839b2"]]},{"id":"f8461bde.e321d8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":1050.3810119628906,"y":819.5714111328125,"z":"a4e67f56.cb2c9","wires":[]},{"id":"dcf02cbe.eaddb","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":642.6666564941406,"y":522,"z":"a4e67f56.cb2c9","wires":[["f5fa430a.9e4f7","1de49110.b5b6cf"]]},{"id":"1de49110.b5b6cf","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":948.4444274902344,"y":475.77777099609375,"z":"a4e67f56.cb2c9","wires":[["460816d8.46ee68"]]},{"id":"f5fa430a.9e4f7","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":956.3334045410156,"y":702.22216796875,"z":"a4e67f56.cb2c9","wires":[["f8461bde.e321d8"]]},{"id":"460816d8.46ee68","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1058.4604187011719,"y":545.7619018554688,"z":"a4e67f56.cb2c9","wires":[["4160821.27be47c"]]},{"id":"39bde04b.627fc","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.dg.error`\" />\n<parameter name='output.status.code' value='401'/>","comments":"","x":1192.6665344238281,"y":702.857177734375,"z":"a4e67f56.cb2c9","wires":[]},{"id":"4160821.27be47c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1128.2380676269531,"y":645.4285888671875,"z":"a4e67f56.cb2c9","wires":[["39bde04b.627fc"]]},{"id":"33d1bd3b.3839b2","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":285.6666564941406,"y":264.0000305175781,"z":"a4e67f56.cb2c9","wires":[["23f9f2ae.ed9cde","ea3be85c.c64088"]]},{"id":"ea3be85c.c64088","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >","comments":"","outputs":1,"x":440.6665344238281,"y":312.00006103515625,"z":"a4e67f56.cb2c9","wires":[["d5e1f466.c9bfe8","cd5322eb.78cc6"]]},{"id":"23f9f2ae.ed9cde","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value='`$org.onap.appc.vfid`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":455.6666564941406,"y":259.0000305175781,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"cd5322eb.78cc6","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":707.6666564941406,"y":260.3332824707031,"z":"a4e67f56.cb2c9","wires":[["a7848345.ee52c"]]},{"id":"d5e1f466.c9bfe8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":459.6666564941406,"y":379.9999694824219,"z":"a4e67f56.cb2c9","wires":[["82d20977.7a5348"]]},{"id":"a7848345.ee52c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":874.6666564941406,"y":259.3332824707031,"z":"a4e67f56.cb2c9","wires":[]},{"id":"ed1b86af.b4bf98","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.onap.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />","comments":"","x":716.6666564941406,"y":445,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"82d20977.7a5348","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":512.6666564941406,"y":445,"z":"a4e67f56.cb2c9","wires":[["ed1b86af.b4bf98","dcf02cbe.eaddb"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_VSBG_Test_2.0.0.1.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_VSBG_Test_2.0.0.1.json
index 7df731355..6b2b64ba3 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_VSBG_Test_2.0.0.1.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_VSBG_Test_2.0.0.1.json
@@ -1 +1 @@
-[{"id":"3a3db435.c14d7c","type":"dgstart","name":"DGSTART","outputs":1,"x":2774.666748046875,"y":111.66666412353516,"z":"a8867a54.b68aa8","wires":[["427b0879.a63f58"]]},{"id":"427b0879.a63f58","type":"service-logic","name":"APPC 2.0.0.1","module":"APPC","version":"2.0.0.1","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='2.0.0.1'>","outputs":1,"x":2817.666748046875,"y":159.66666412353516,"z":"a8867a54.b68aa8","wires":[["3d555498.3ca7bc"]]},{"id":"3d555498.3ca7bc","type":"method","name":"VSBG_Test","xml":"<method rpc='VSBG_Test' mode='sync'>\n","comments":"","outputs":1,"x":2863.666748046875,"y":211.66666412353516,"z":"a8867a54.b68aa8","wires":[["231dec0e.0771c4"]]},{"id":"d736d249.7d49d","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":3697.381103515625,"y":960.2380599975586,"z":"a8867a54.b68aa8","wires":[]},{"id":"b8218641.e8a788","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.openecomp.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":3289.666748046875,"y":662.6666488647461,"z":"a8867a54.b68aa8","wires":[["b0b4fe67.6a463","9e903785.2aab28"]]},{"id":"9e903785.2aab28","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":3595.4445190429688,"y":616.4444198608398,"z":"a8867a54.b68aa8","wires":[["834e02e0.1b95d"]]},{"id":"b0b4fe67.6a463","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3603.33349609375,"y":842.8888168334961,"z":"a8867a54.b68aa8","wires":[["d736d249.7d49d"]]},{"id":"834e02e0.1b95d","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$org.openecomp.appc.dg.error`\" />\n","comments":"","outputs":1,"x":3705.4605102539062,"y":686.4285507202148,"z":"a8867a54.b68aa8","wires":[["dbbfce3e.4a9d7"]]},{"id":"7ef22aa1.c2f8f4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"`$org.openecomp.appc.dg.error`\" />\n<parameter name='output.status.code' value='401'/>","comments":"","x":3839.6666259765625,"y":843.5238265991211,"z":"a8867a54.b68aa8","wires":[]},{"id":"dbbfce3e.4a9d7","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3775.2381591796875,"y":786.0952377319336,"z":"a8867a54.b68aa8","wires":[["7ef22aa1.c2f8f4"]]},{"id":"19fa898d.6ab716","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2932.666748046875,"y":404.6666793823242,"z":"a8867a54.b68aa8","wires":[["bae44e29.4cfa5","ff4aa6b.9a66558"]]},{"id":"ff4aa6b.9a66558","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >","comments":"","outputs":1,"x":3087.6666259765625,"y":452.66670989990234,"z":"a8867a54.b68aa8","wires":[["4284b163.4ffc1","4c1b9cb6.5050f4"]]},{"id":"bae44e29.4cfa5","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":3102.666748046875,"y":399.6666793823242,"z":"a8867a54.b68aa8","wires":[]},{"id":"4c1b9cb6.5050f4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":3354.666748046875,"y":400.9999313354492,"z":"a8867a54.b68aa8","wires":[["a29a3ba4.2bd308"]]},{"id":"4284b163.4ffc1","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3106.666748046875,"y":520.666618347168,"z":"a8867a54.b68aa8","wires":[["94c7df7b.7fbd"]]},{"id":"a29a3ba4.2bd308","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":3521.666748046875,"y":399.9999313354492,"z":"a8867a54.b68aa8","wires":[]},{"id":"f5661947.16b088","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.openecomp.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />","comments":"","x":3363.666748046875,"y":585.6666488647461,"z":"a8867a54.b68aa8","wires":[]},{"id":"94c7df7b.7fbd","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3159.666748046875,"y":585.6666488647461,"z":"a8867a54.b68aa8","wires":[["f5661947.16b088","b8218641.e8a788"]]},{"id":"231dec0e.0771c4","type":"execute","name":"execute: flatAndAddToContext","xml":"<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />","comments":"","outputs":1,"x":2929.666748046875,"y":266.6666488647461,"z":"a8867a54.b68aa8","wires":[["c986922d.bf1bc","8a7c3f37.20d9"]]},{"id":"c986922d.bf1bc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2996.6666564941406,"y":338.66666412353516,"z":"a8867a54.b68aa8","wires":[["19fa898d.6ab716"]]},{"id":"8a7c3f37.20d9","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":3246.6666564941406,"y":286.66666412353516,"z":"a8867a54.b68aa8","wires":[[]]}]
+[{"id":"3a3db435.c14d7c","type":"dgstart","name":"DGSTART","outputs":1,"x":2774.666748046875,"y":111.66666412353516,"z":"a8867a54.b68aa8","wires":[["427b0879.a63f58"]]},{"id":"427b0879.a63f58","type":"service-logic","name":"APPC 2.0.0.1","module":"APPC","version":"2.0.0.1","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='2.0.0.1'>","outputs":1,"x":2817.666748046875,"y":159.66666412353516,"z":"a8867a54.b68aa8","wires":[["3d555498.3ca7bc"]]},{"id":"3d555498.3ca7bc","type":"method","name":"VSBG_Test","xml":"<method rpc='VSBG_Test' mode='sync'>\n","comments":"","outputs":1,"x":2863.666748046875,"y":211.66666412353516,"z":"a8867a54.b68aa8","wires":[["231dec0e.0771c4"]]},{"id":"d736d249.7d49d","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":3697.381103515625,"y":960.2380599975586,"z":"a8867a54.b68aa8","wires":[]},{"id":"b8218641.e8a788","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":3289.666748046875,"y":662.6666488647461,"z":"a8867a54.b68aa8","wires":[["b0b4fe67.6a463","9e903785.2aab28"]]},{"id":"9e903785.2aab28","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":3595.4445190429688,"y":616.4444198608398,"z":"a8867a54.b68aa8","wires":[["834e02e0.1b95d"]]},{"id":"b0b4fe67.6a463","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3603.33349609375,"y":842.8888168334961,"z":"a8867a54.b68aa8","wires":[["d736d249.7d49d"]]},{"id":"834e02e0.1b95d","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":3705.4605102539062,"y":686.4285507202148,"z":"a8867a54.b68aa8","wires":[["dbbfce3e.4a9d7"]]},{"id":"7ef22aa1.c2f8f4","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.dg.error`\" />\n<parameter name='output.status.code' value='401'/>","comments":"","x":3839.6666259765625,"y":843.5238265991211,"z":"a8867a54.b68aa8","wires":[]},{"id":"dbbfce3e.4a9d7","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3775.2381591796875,"y":786.0952377319336,"z":"a8867a54.b68aa8","wires":[["7ef22aa1.c2f8f4"]]},{"id":"19fa898d.6ab716","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2932.666748046875,"y":404.6666793823242,"z":"a8867a54.b68aa8","wires":[["bae44e29.4cfa5","ff4aa6b.9a66558"]]},{"id":"ff4aa6b.9a66558","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >","comments":"","outputs":1,"x":3087.6666259765625,"y":452.66670989990234,"z":"a8867a54.b68aa8","wires":[["4284b163.4ffc1","4c1b9cb6.5050f4"]]},{"id":"bae44e29.4cfa5","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":3102.666748046875,"y":399.6666793823242,"z":"a8867a54.b68aa8","wires":[]},{"id":"4c1b9cb6.5050f4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":3354.666748046875,"y":400.9999313354492,"z":"a8867a54.b68aa8","wires":[["a29a3ba4.2bd308"]]},{"id":"4284b163.4ffc1","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3106.666748046875,"y":520.666618347168,"z":"a8867a54.b68aa8","wires":[["94c7df7b.7fbd"]]},{"id":"a29a3ba4.2bd308","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":3521.666748046875,"y":399.9999313354492,"z":"a8867a54.b68aa8","wires":[]},{"id":"f5661947.16b088","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.onap.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />","comments":"","x":3363.666748046875,"y":585.6666488647461,"z":"a8867a54.b68aa8","wires":[]},{"id":"94c7df7b.7fbd","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3159.666748046875,"y":585.6666488647461,"z":"a8867a54.b68aa8","wires":[["f5661947.16b088","b8218641.e8a788"]]},{"id":"231dec0e.0771c4","type":"execute","name":"execute: flatAndAddToContext","xml":"<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />","comments":"","outputs":1,"x":2929.666748046875,"y":266.6666488647461,"z":"a8867a54.b68aa8","wires":[["c986922d.bf1bc","8a7c3f37.20d9"]]},{"id":"c986922d.bf1bc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2996.6666564941406,"y":338.66666412353516,"z":"a8867a54.b68aa8","wires":[["19fa898d.6ab716"]]},{"id":"8a7c3f37.20d9","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":3246.6666564941406,"y":286.66666412353516,"z":"a8867a54.b68aa8","wires":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_VSRX_ConfigModify_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_VSRX_ConfigModify_2.0.0.json
index 6be6a122f..d7cae8c3f 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_VSRX_ConfigModify_2.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_VSRX_ConfigModify_2.0.0.json
@@ -1 +1 @@
-[{"id":"7f8764e7.1c542c","type":"dgstart","name":"DGSTART","outputs":1,"x":140.88888549804688,"y":58,"z":"e3f97b79.d3ae78","wires":[["b994e559.02dd38"]]},{"id":"b994e559.02dd38","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":133.88888549804688,"y":112,"z":"e3f97b79.d3ae78","wires":[["e64a43a7.d28a6"]]},{"id":"e64a43a7.d28a6","type":"method","name":"VSRX_ConfigModify","xml":"<method rpc='VSRX_ConfigModify' mode='sync'>\n","comments":"","outputs":1,"x":159.88888549804688,"y":176,"z":"e3f97b79.d3ae78","wires":[["755b14f2.231e2c"]]},{"id":"8755712f.5d5e2","type":"execute","name":"execute_getVnfHierarchy","xml":"<execute plugin='org.openecomp.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy' >\n<parameter name=\"resourceKey\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"nodeName\" value=\"execute_getVnfHierarchy\" />\n","comments":"","outputs":1,"x":340.4343566894531,"y":217.27272033691406,"z":"e3f97b79.d3ae78","wires":[["744bf594.91468c","9a95025e.3abb7"]]},{"id":"744bf594.91468c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1121.2524108886719,"y":86,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"9a95025e.3abb7","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":354.7978820800781,"y":319.3636474609375,"z":"e3f97b79.d3ae78","wires":[["ddc0dcdd.0c53c"]]},{"id":"4c4b034a.d05dbc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1657.8888854980469,"y":531,"z":"e3f97b79.d3ae78","wires":[["dde156a3.5b7258","9bd7e953.2d6638"]]},{"id":"9bd7e953.2d6638","type":"execute","name":"execute_DCAEReporterPlugin","xml":"<execute plugin='org.openecomp.appc.dg.util.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$org.openecomp.appc.apiversion`\"/>\n<parameter name=\"eventId\" value=\"`$org.openecomp.appc.vfid`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />","comments":"","outputs":1,"x":1872.8888854980469,"y":444,"z":"e3f97b79.d3ae78","wires":[["954a79a7.253398"]]},{"id":"dde156a3.5b7258","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":1837.8888854980469,"y":620,"z":"e3f97b79.d3ae78","wires":[]},{"id":"ddc0dcdd.0c53c","type":"switchNode","name":"switch","xml":"<switch test='`$VNF.VMCount`'>\n","comments":"","outputs":1,"x":339.6161804199219,"y":393.5454406738281,"z":"e3f97b79.d3ae78","wires":[["d4d84951.bf4a78","ea6e2bf0.9bfc18"]]},{"id":"d4d84951.bf4a78","type":"outcome","name":"outcome_0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1115.6163024902344,"y":147.5454864501953,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"ea6e2bf0.9bfc18","type":"outcome","name":"outcome_other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":321.9798278808594,"y":498.9999694824219,"z":"e3f97b79.d3ae78","wires":[["e37888a7.55e2e8"]]},{"id":"e37888a7.55e2e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":406.25250244140625,"y":588.2727661132812,"z":"e3f97b79.d3ae78","wires":[["222d615a.833e5e","b3c1f8d8.d04008"]]},{"id":"222d615a.833e5e","type":"for","name":"foreach_vnfc","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >\n","comments":"","outputs":1,"x":527.5252990722656,"y":454.36358642578125,"z":"e3f97b79.d3ae78","wires":[["c8281303.b9663"]]},{"id":"c8281303.b9663","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":561.8889465332031,"y":389.181884765625,"z":"e3f97b79.d3ae78","wires":[["1cae10ed.8218ff"]]},{"id":"1cae10ed.8218ff","type":"execute","name":"execute_retrieveVMConfiguration","xml":"<execute plugin='org.openecomp.appc.dg.util.NetconfDBPlugin' method='retrieveVMDSConfiguration' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"vnf-type\" value=\"`$vnf-type`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"resourceKey\" value=\"`$VNF.VM[$i].vserver.vserver-name`\" />\n<parameter name=\"nodeName\" value=\"execute_retrieveVMConfiguration\" />\n","comments":"","outputs":1,"x":863.8890075683594,"y":303.36370849609375,"z":"e3f97b79.d3ae78","wires":[["42069768.bd0c68","a68e4eae.2af27"]]},{"id":"a68e4eae.2af27","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":853.7980041503906,"y":354.6363525390625,"z":"e3f97b79.d3ae78","wires":[["54fcb6c2.027148"]]},{"id":"42069768.bd0c68","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1201.3433532714844,"y":366.45458984375,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"6592a286.b317ec","type":"execute","name":"execute_modifyConfiguration","xml":"<execute plugin='org.openecomp.appc.dg.util.NetconfClientPlugin' method='modifyConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"file-content\" value=\"`$file-content`\" />\n<parameter name=\"nodeName\" value=\"execute_modifyConfiguration\" />\n","comments":"","outputs":1,"x":857.5253601074219,"y":566.3637084960938,"z":"e3f97b79.d3ae78","wires":[["fc1e7228.fbd9d","de949f48.36d61"]]},{"id":"fc1e7228.fbd9d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":877.0707702636719,"y":629.0908813476562,"z":"e3f97b79.d3ae78","wires":[["c3d5b7e7.9a2a58"]]},{"id":"de949f48.36d61","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1203.3435974121094,"y":500.27276611328125,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"b3c1f8d8.d04008","type":"execute","name":"execute_saveConfig","xml":"<execute plugin='org.openecomp.appc.dg.util.ConfigurationManagerPlugin' method='saveConfiguration' >\n<parameter name=\"fullConfig\" value=\"`$fullConfig`\" />\n<parameter name=\"nodeName\" value=\"execute_saveConfig\" />\n","comments":"","outputs":1,"x":468.7979431152344,"y":882.4546203613281,"z":"e3f97b79.d3ae78","wires":[["86fd9c6b.47858","a6e93d4e.a3791"]]},{"id":"a6e93d4e.a3791","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1171.5252685546875,"y":877.3636779785156,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"98ac5c02.6be86","type":"execute","name":"execute_readConfiguration","xml":"<execute plugin='org.openecomp.appc.dg.util.NetconfClientPlugin' method='getConfig' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"current\" />\n<parameter name=\"nodeName\" value=\"execute_readConfiguration\" />\n\n","comments":"","outputs":1,"x":734.2525939941406,"y":813.1817321777344,"z":"e3f97b79.d3ae78","wires":[["a985fa15.5d4168","a6e93d4e.a3791"]]},{"id":"54fcb6c2.027148","type":"execute","name":"execute_retrieveConfigFile","xml":"<execute plugin='org.openecomp.appc.dg.util.NetconfDBPlugin' method='retrieveConfigFile' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"nodeName\" value=\"execute_retrieveConfigFile\" />\n\n","comments":"","outputs":1,"x":847.8888854980469,"y":433,"z":"e3f97b79.d3ae78","wires":[["6ad14a83.ded604","858e63d7.b08b9"]]},{"id":"858e63d7.b08b9","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":853.8888854980469,"y":493,"z":"e3f97b79.d3ae78","wires":[["6592a286.b317ec"]]},{"id":"6ad14a83.ded604","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1206.8888854980469,"y":431,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"ded29ca9.c326a","type":"switchNode","name":"switch","xml":"<switch test='`$getConfig_Result`'>\n","comments":"","outputs":1,"x":1055.8889465332031,"y":734.000244140625,"z":"e3f97b79.d3ae78","wires":[["611ee584.7de67c","853375ef.cefa58"]]},{"id":"611ee584.7de67c","type":"outcome","name":"outcome_failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1236.8888854980469,"y":568,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"853375ef.cefa58","type":"outcome","name":"outcome_Success","xml":"<outcome value='Success'>\n","comments":"","outputs":1,"x":1258.8889465332031,"y":692.0000305175781,"z":"e3f97b79.d3ae78","wires":[[]]},{"id":"755b14f2.231e2c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":132.38888549804688,"y":255,"z":"e3f97b79.d3ae78","wires":[["205284fd.d2df5c","8755712f.5d5e2"]]},{"id":"205284fd.d2df5c","type":"execute","name":"ctxCleanup","xml":"<execute plugin='org.openecomp.appc.dg.util.DGPayloadCleanupPlugin' method='cleanup' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.openecomp.appc.confid`\" />\n","comments":"","outputs":1,"x":136.88888549804688,"y":348,"z":"e3f97b79.d3ae78","wires":[["3023e302.ead02c"]]},{"id":"3023e302.ead02c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":132.88888549804688,"y":431,"z":"e3f97b79.d3ae78","wires":[["88bef30b.130ef"]]},{"id":"88bef30b.130ef","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":120.38888549804688,"y":564,"z":"e3f97b79.d3ae78","wires":[]},{"id":"827f8b54.a2f738","type":"switchNode","name":"switch","xml":"<switch test='`$saveConfigResult`'>\n","comments":"","outputs":1,"x":752.388916015625,"y":941.0000305175781,"z":"e3f97b79.d3ae78","wires":[["4091b575.ef1d7c","28989f20.c2934"]]},{"id":"4091b575.ef1d7c","type":"outcome","name":"outcome_Success","xml":"<outcome value='Success'>\n","comments":"","outputs":1,"x":857.3888854980469,"y":1008,"z":"e3f97b79.d3ae78","wires":[[]]},{"id":"28989f20.c2934","type":"outcome","name":"outcome_failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1200.3888854980469,"y":946,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"954a79a7.253398","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2100.888885498047,"y":445,"z":"e3f97b79.d3ae78","wires":[["428f2b9f.d074b4"]]},{"id":"428f2b9f.d074b4","type":"execute","name":"ctxCleanup","xml":"<execute plugin='org.openecomp.appc.dg.util.DGPayloadCleanupPlugin' method='cleanup' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.openecomp.appc.confid`\" />\n","comments":"","outputs":1,"x":2264.888885498047,"y":445,"z":"e3f97b79.d3ae78","wires":[["da6af38.2701c1"]]},{"id":"da6af38.2701c1","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2437.888885498047,"y":445,"z":"e3f97b79.d3ae78","wires":[[]]},{"id":"c3d5b7e7.9a2a58","type":"execute","name":"execute_commitConfiguration","xml":"<execute plugin='org.openecomp.appc.dg.util.NetconfClientPlugin' method='commitConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"nodeName\" value=\"execute_commitConfiguration\" />\n","comments":"","outputs":1,"x":755.8889465332031,"y":689.0000915527344,"z":"e3f97b79.d3ae78","wires":[["75565b82.5ba9e4","e2ff07e0.f33ec8"]]},{"id":"75565b82.5ba9e4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1208.8888854980469,"y":640,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"e2ff07e0.f33ec8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":735.8889465332031,"y":747.0001525878906,"z":"e3f97b79.d3ae78","wires":[["98ac5c02.6be86"]]},{"id":"86fd9c6b.47858","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":602,"y":949.3333435058594,"z":"e3f97b79.d3ae78","wires":[["827f8b54.a2f738"]]},{"id":"a985fa15.5d4168","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":931.8889465332031,"y":772.3333435058594,"z":"e3f97b79.d3ae78","wires":[["ded29ca9.c326a"]]}]
+[{"id":"7f8764e7.1c542c","type":"dgstart","name":"DGSTART","outputs":1,"x":140.88888549804688,"y":58,"z":"e3f97b79.d3ae78","wires":[["b994e559.02dd38"]]},{"id":"b994e559.02dd38","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.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='2.0.0'>","outputs":1,"x":133.88888549804688,"y":112,"z":"e3f97b79.d3ae78","wires":[["e64a43a7.d28a6"]]},{"id":"e64a43a7.d28a6","type":"method","name":"VSRX_ConfigModify","xml":"<method rpc='VSRX_ConfigModify' mode='sync'>\n","comments":"","outputs":1,"x":159.88888549804688,"y":176,"z":"e3f97b79.d3ae78","wires":[["755b14f2.231e2c"]]},{"id":"8755712f.5d5e2","type":"execute","name":"execute_getVnfHierarchy","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy' >\n<parameter name=\"resourceKey\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"nodeName\" value=\"execute_getVnfHierarchy\" />\n","comments":"","outputs":1,"x":340.4343566894531,"y":217.27272033691406,"z":"e3f97b79.d3ae78","wires":[["744bf594.91468c","9a95025e.3abb7"]]},{"id":"744bf594.91468c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1121.2524108886719,"y":86,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"9a95025e.3abb7","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":354.7978820800781,"y":319.3636474609375,"z":"e3f97b79.d3ae78","wires":[["ddc0dcdd.0c53c"]]},{"id":"4c4b034a.d05dbc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1657.8888854980469,"y":531,"z":"e3f97b79.d3ae78","wires":[["dde156a3.5b7258","9bd7e953.2d6638"]]},{"id":"9bd7e953.2d6638","type":"execute","name":"execute_DCAEReporterPlugin","xml":"<execute plugin='org.onap.appc.dg.util.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$org.onap.appc.apiversion`\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />","comments":"","outputs":1,"x":1872.8888854980469,"y":444,"z":"e3f97b79.d3ae78","wires":[["954a79a7.253398"]]},{"id":"dde156a3.5b7258","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":1837.8888854980469,"y":620,"z":"e3f97b79.d3ae78","wires":[]},{"id":"ddc0dcdd.0c53c","type":"switchNode","name":"switch","xml":"<switch test='`$VNF.VMCount`'>\n","comments":"","outputs":1,"x":339.6161804199219,"y":393.5454406738281,"z":"e3f97b79.d3ae78","wires":[["d4d84951.bf4a78","ea6e2bf0.9bfc18"]]},{"id":"d4d84951.bf4a78","type":"outcome","name":"outcome_0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1115.6163024902344,"y":147.5454864501953,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"ea6e2bf0.9bfc18","type":"outcome","name":"outcome_other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":321.9798278808594,"y":498.9999694824219,"z":"e3f97b79.d3ae78","wires":[["e37888a7.55e2e8"]]},{"id":"e37888a7.55e2e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":406.25250244140625,"y":588.2727661132812,"z":"e3f97b79.d3ae78","wires":[["222d615a.833e5e","b3c1f8d8.d04008"]]},{"id":"222d615a.833e5e","type":"for","name":"foreach_vnfc","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >\n","comments":"","outputs":1,"x":527.5252990722656,"y":454.36358642578125,"z":"e3f97b79.d3ae78","wires":[["c8281303.b9663"]]},{"id":"c8281303.b9663","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":561.8889465332031,"y":389.181884765625,"z":"e3f97b79.d3ae78","wires":[["1cae10ed.8218ff"]]},{"id":"1cae10ed.8218ff","type":"execute","name":"execute_retrieveVMConfiguration","xml":"<execute plugin='org.onap.appc.dg.util.NetconfDBPlugin' method='retrieveVMDSConfiguration' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"vnf-type\" value=\"`$vnf-type`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"resourceKey\" value=\"`$VNF.VM[$i].vserver.vserver-name`\" />\n<parameter name=\"nodeName\" value=\"execute_retrieveVMConfiguration\" />\n","comments":"","outputs":1,"x":863.8890075683594,"y":303.36370849609375,"z":"e3f97b79.d3ae78","wires":[["42069768.bd0c68","a68e4eae.2af27"]]},{"id":"a68e4eae.2af27","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":853.7980041503906,"y":354.6363525390625,"z":"e3f97b79.d3ae78","wires":[["54fcb6c2.027148"]]},{"id":"42069768.bd0c68","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1201.3433532714844,"y":366.45458984375,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"6592a286.b317ec","type":"execute","name":"execute_modifyConfiguration","xml":"<execute plugin='org.onap.appc.dg.util.NetconfClientPlugin' method='modifyConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"file-content\" value=\"`$file-content`\" />\n<parameter name=\"nodeName\" value=\"execute_modifyConfiguration\" />\n","comments":"","outputs":1,"x":857.5253601074219,"y":566.3637084960938,"z":"e3f97b79.d3ae78","wires":[["fc1e7228.fbd9d","de949f48.36d61"]]},{"id":"fc1e7228.fbd9d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":877.0707702636719,"y":629.0908813476562,"z":"e3f97b79.d3ae78","wires":[["c3d5b7e7.9a2a58"]]},{"id":"de949f48.36d61","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1203.3435974121094,"y":500.27276611328125,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"b3c1f8d8.d04008","type":"execute","name":"execute_saveConfig","xml":"<execute plugin='org.onap.appc.dg.util.ConfigurationManagerPlugin' method='saveConfiguration' >\n<parameter name=\"fullConfig\" value=\"`$fullConfig`\" />\n<parameter name=\"nodeName\" value=\"execute_saveConfig\" />\n","comments":"","outputs":1,"x":468.7979431152344,"y":882.4546203613281,"z":"e3f97b79.d3ae78","wires":[["86fd9c6b.47858","a6e93d4e.a3791"]]},{"id":"a6e93d4e.a3791","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1171.5252685546875,"y":877.3636779785156,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"98ac5c02.6be86","type":"execute","name":"execute_readConfiguration","xml":"<execute plugin='org.onap.appc.dg.util.NetconfClientPlugin' method='getConfig' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"current\" />\n<parameter name=\"nodeName\" value=\"execute_readConfiguration\" />\n\n","comments":"","outputs":1,"x":734.2525939941406,"y":813.1817321777344,"z":"e3f97b79.d3ae78","wires":[["a985fa15.5d4168","a6e93d4e.a3791"]]},{"id":"54fcb6c2.027148","type":"execute","name":"execute_retrieveConfigFile","xml":"<execute plugin='org.onap.appc.dg.util.NetconfDBPlugin' method='retrieveConfigFile' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"nodeName\" value=\"execute_retrieveConfigFile\" />\n\n","comments":"","outputs":1,"x":847.8888854980469,"y":433,"z":"e3f97b79.d3ae78","wires":[["6ad14a83.ded604","858e63d7.b08b9"]]},{"id":"858e63d7.b08b9","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":853.8888854980469,"y":493,"z":"e3f97b79.d3ae78","wires":[["6592a286.b317ec"]]},{"id":"6ad14a83.ded604","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1206.8888854980469,"y":431,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"ded29ca9.c326a","type":"switchNode","name":"switch","xml":"<switch test='`$getConfig_Result`'>\n","comments":"","outputs":1,"x":1055.8889465332031,"y":734.000244140625,"z":"e3f97b79.d3ae78","wires":[["611ee584.7de67c","853375ef.cefa58"]]},{"id":"611ee584.7de67c","type":"outcome","name":"outcome_failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1236.8888854980469,"y":568,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"853375ef.cefa58","type":"outcome","name":"outcome_Success","xml":"<outcome value='Success'>\n","comments":"","outputs":1,"x":1258.8889465332031,"y":692.0000305175781,"z":"e3f97b79.d3ae78","wires":[[]]},{"id":"755b14f2.231e2c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":132.38888549804688,"y":255,"z":"e3f97b79.d3ae78","wires":[["205284fd.d2df5c","8755712f.5d5e2"]]},{"id":"205284fd.d2df5c","type":"execute","name":"ctxCleanup","xml":"<execute plugin='org.onap.appc.dg.util.DGPayloadCleanupPlugin' method='cleanup' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.onap.appc.confid`\" />\n","comments":"","outputs":1,"x":136.88888549804688,"y":348,"z":"e3f97b79.d3ae78","wires":[["3023e302.ead02c"]]},{"id":"3023e302.ead02c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":132.88888549804688,"y":431,"z":"e3f97b79.d3ae78","wires":[["88bef30b.130ef"]]},{"id":"88bef30b.130ef","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":120.38888549804688,"y":564,"z":"e3f97b79.d3ae78","wires":[]},{"id":"827f8b54.a2f738","type":"switchNode","name":"switch","xml":"<switch test='`$saveConfigResult`'>\n","comments":"","outputs":1,"x":752.388916015625,"y":941.0000305175781,"z":"e3f97b79.d3ae78","wires":[["4091b575.ef1d7c","28989f20.c2934"]]},{"id":"4091b575.ef1d7c","type":"outcome","name":"outcome_Success","xml":"<outcome value='Success'>\n","comments":"","outputs":1,"x":857.3888854980469,"y":1008,"z":"e3f97b79.d3ae78","wires":[[]]},{"id":"28989f20.c2934","type":"outcome","name":"outcome_failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1200.3888854980469,"y":946,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"954a79a7.253398","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2100.888885498047,"y":445,"z":"e3f97b79.d3ae78","wires":[["428f2b9f.d074b4"]]},{"id":"428f2b9f.d074b4","type":"execute","name":"ctxCleanup","xml":"<execute plugin='org.onap.appc.dg.util.DGPayloadCleanupPlugin' method='cleanup' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.onap.appc.confid`\" />\n","comments":"","outputs":1,"x":2264.888885498047,"y":445,"z":"e3f97b79.d3ae78","wires":[["da6af38.2701c1"]]},{"id":"da6af38.2701c1","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2437.888885498047,"y":445,"z":"e3f97b79.d3ae78","wires":[[]]},{"id":"c3d5b7e7.9a2a58","type":"execute","name":"execute_commitConfiguration","xml":"<execute plugin='org.onap.appc.dg.util.NetconfClientPlugin' method='commitConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"nodeName\" value=\"execute_commitConfiguration\" />\n","comments":"","outputs":1,"x":755.8889465332031,"y":689.0000915527344,"z":"e3f97b79.d3ae78","wires":[["75565b82.5ba9e4","e2ff07e0.f33ec8"]]},{"id":"75565b82.5ba9e4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1208.8888854980469,"y":640,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"e2ff07e0.f33ec8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":735.8889465332031,"y":747.0001525878906,"z":"e3f97b79.d3ae78","wires":[["98ac5c02.6be86"]]},{"id":"86fd9c6b.47858","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":602,"y":949.3333435058594,"z":"e3f97b79.d3ae78","wires":[["827f8b54.a2f738"]]},{"id":"a985fa15.5d4168","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":931.8889465332031,"y":772.3333435058594,"z":"e3f97b79.d3ae78","wires":[["ded29ca9.c326a"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_Backup.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_Backup.json
index 7d29a8a61..88f10cfe9 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_Backup.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_Backup.json
@@ -51,7 +51,7 @@
         "id": "a8f4edf0.5d8c2",
         "type": "execute",
         "name": "execute: handleUpgradeStub",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.UpgradeStubNode' method='handleUpgradeStub' >\n<parameter name=\"failureIndicator\" value=\"`$failureIndicator`\" />\n\n",
+        "xml": "<execute plugin='org.onap.appc.dg.util.UpgradeStubNode' method='handleUpgradeStub' >\n<parameter name=\"failureIndicator\" value=\"`$failureIndicator`\" />\n\n",
         "comments": "",
         "outputs": 1,
         "x": 419,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_HealthCheck.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_HealthCheck.json
index eb7e6a3f3..0260bd84f 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_HealthCheck.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_HealthCheck.json
@@ -51,7 +51,7 @@
         "id": "f1d1c6be.6d74e8",
         "type": "execute",
         "name": "execute: handleUpgradeStub",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.UpgradeStubNode' method='handleUpgradeStub' >\n<parameter name=\"failureIndicator\" value=\"`$failureIndicator`\" />\n\n",
+        "xml": "<execute plugin='org.onap.appc.dg.util.UpgradeStubNode' method='handleUpgradeStub' >\n<parameter name=\"failureIndicator\" value=\"`$failureIndicator`\" />\n\n",
         "comments": "",
         "outputs": 1,
         "x": 568,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UpgradePreconditionCheck.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UpgradePreconditionCheck.json
index b6d60c4bb..9ca2fff9b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UpgradePreconditionCheck.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UpgradePreconditionCheck.json
@@ -38,7 +38,7 @@
         "id": "a3be2603.6810f8",
         "type": "execute",
         "name": "execute: handleUpgradeStub",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.UpgradeStubNode' method='handleUpgradeStub' >\n<parameter name=\"failureIndicator\" value=\"`$failureIndicator`\" />\n\n",
+        "xml": "<execute plugin='org.onap.appc.dg.util.UpgradeStubNode' method='handleUpgradeStub' >\n<parameter name=\"failureIndicator\" value=\"`$failureIndicator`\" />\n\n",
         "comments": "",
         "outputs": 1,
         "x": 637.5182189941406,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UploadNewVersion.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UploadNewVersion.json
index 0b118c979..732a13342 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UploadNewVersion.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UploadNewVersion.json
@@ -38,7 +38,7 @@
         "id": "dc3e3baf.d4f3d8",
         "type": "execute",
         "name": "execute: handleUpgradeStub",
-        "xml": "<execute plugin='org.openecomp.appc.dg.util.UpgradeStubNode' method='handleUpgradeStub' >\n<parameter name=\"failureIndicator\" value=\"`$failureIndicator`\" />\n\n",
+        "xml": "<execute plugin='org.onap.appc.dg.util.UpgradeStubNode' method='handleUpgradeStub' >\n<parameter name=\"failureIndicator\" value=\"`$failureIndicator`\" />\n\n",
         "comments": "",
         "outputs": 1,
         "x": 581.5182189941406,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json
index 7eee8473e..24bc897fe 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json
@@ -2,7 +2,7 @@
     "id": "9fdda929.817f18",
     "type": "execute",
     "name": "execute: flatAndAddToContext",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
     "comments": "",
     "outputs": 1,
     "x": 335.75,
@@ -73,7 +73,7 @@
         "id": "3ccf5e6c.e15652",
         "type": "execute",
         "name": "execute: handleErrorToDCAE",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$error-message`\"/>\n",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$error-message`\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 1499.2882461547852,
@@ -85,7 +85,7 @@
         "id": "fb5b14.140314f",
         "type": "execute",
         "name": "execute: retrieveConnectionDetails",
-        "xml": "<execute plugin='org.openecomp.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$aai.input.data.vnf-type`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$aai.input.data.vnf-type`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 857.7498779296875,
@@ -282,7 +282,7 @@
         "id": "ec1d66f4.142a18",
         "type": "execute",
         "name": "execute: getVNFData",
-        "xml": "<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >",
+        "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >",
         "comments": "",
         "outputs": 1,
         "x": 534.0831298828125,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json
index 50092ed70..30dad3047 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json
@@ -2,7 +2,7 @@
     "id": "e30b7047.c8c7b",
     "type": "execute",
     "name": "execute: flatAndAddToContext",
-    "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
+    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
     "comments": "",
     "outputs": 1,
     "x": 473.75,
@@ -86,7 +86,7 @@
         "id": "52e82bf7.a1e6b4",
         "type": "execute",
         "name": "execute: handleErrorToDCAE",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.openecomp.appc.dg.error`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.onap.appc.dg.error`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 1100.638900756836,
@@ -98,7 +98,7 @@
         "id": "d4e3b7fe.4d6b28",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"`$org.openecomp.appc.dg.error`\" />\n<parameter name='output.status.code' value='401'/>\n",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.code' value='401'/>\n",
         "comments": "",
         "x": 1452.41650390625,
         "y": 328.44439697265625,
@@ -146,7 +146,7 @@
         "id": "9e7f2be9.363dc8",
         "type": "execute",
         "name": "execute: retrieveConnectionDetails",
-        "xml": "<execute plugin='org.openecomp.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$aai.input.data.vnf-type`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$aai.input.data.vnf-type`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 828.0833129882812,
@@ -232,7 +232,7 @@
         "id": "2cd2b34d.4a7c9c",
         "type": "execute",
         "name": "execute: getVNFData",
-        "xml": "<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >",
+        "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >",
         "comments": "",
         "outputs": 1,
         "x": 653.7500152587891,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json
index ac974ec21..d9cfd0dee 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json
@@ -60,7 +60,7 @@
         "id": "1d1d05aa.1712aa",
         "type": "execute",
         "name": "execute: handleErrorToDCAE",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$error-message`\"/>\n",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$error-message`\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 1722.749942779541,
@@ -72,7 +72,7 @@
         "id": "457ba9cf.7006a8",
         "type": "execute",
         "name": "execute: retrieveConnectionDetails",
-        "xml": "<execute plugin='org.openecomp.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 1236.7498512268066,
@@ -183,7 +183,7 @@
         "id": "5ec41e43.b3427",
         "type": "execute",
         "name": "execute: flatAndAddToContext",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
         "comments": "",
         "outputs": 1,
         "x": 418.74997329711914,
@@ -269,7 +269,7 @@
         "id": "a7c355e0.0616b8",
         "type": "execute",
         "name": "execute: getVNFData",
-        "xml": "<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >",
+        "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >",
         "comments": "",
         "outputs": 1,
         "x": 595.7499580383301,
@@ -282,7 +282,7 @@
         "id": "e9d1e289.2189c",
         "type": "execute",
         "name": "execute: retrieveConnectionDetails",
-        "xml": "<execute plugin='org.openecomp.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$aai.input.data.vnf-type`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$aai.input.data.vnf-type`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 1190.0832710266113,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_UpgradePreconditionCheck.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_UpgradePreconditionCheck.json
index d8be54d59..2fb4fc8cc 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_UpgradePreconditionCheck.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_UpgradePreconditionCheck.json
@@ -100,7 +100,7 @@
         "id": "631a551d.c6b7bc",
         "type": "execute",
         "name": "execute: handleErrorToDCAE",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$error-message`\"/>\n",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$error-message`\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 986,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_license.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_license.json
index 8808c1207..64c31bd61 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_license.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_license.json
@@ -1 +1 @@
-[{"id":"b1ce6dcf.35732","type":"dgstart","name":"DGSTART","outputs":1,"x":188,"y":50,"z":"150446f3.d47aa9","wires":[["174ee6ca.1ed6a9"]]},{"id":"174ee6ca.1ed6a9","type":"service-logic","name":"Appc-API 2.0.0.0","module":"Appc-API","version":"2.0.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='2.0.0.0'>","outputs":1,"x":350,"y":50,"z":"150446f3.d47aa9","wires":[["f19dcf10.eaeb9"]]},{"id":"f19dcf10.eaeb9","type":"method","name":"Method: Acquire License","xml":"<method rpc='acquire_license' mode='sync'>\n","comments":"","outputs":1,"x":581,"y":50,"z":"150446f3.d47aa9","wires":[["9ce11364.ca14f"]]},{"id":"9d436678.79ec78","type":"execute","name":"execute: retrieveLicenseModel","xml":"<execute plugin='org.openecomp.appc.dg.licmgr.LicenseManagerPlugin' method='retrieveLicenseModel' >\n<parameter name=\"org.openecomp.appc.vftype\" value=\"`$aai.input.data.vnf-type`\" />\n<parameter name=\"org.openecomp.appc.resource-version\" value=\"`$aai.input.data.persona-model-version`\" />\n\n","comments":"","outputs":1,"x":514,"y":350,"z":"150446f3.d47aa9","wires":[["b03a6327.d8941"]]},{"id":"f5ad1877.f5fb08","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1239,"y":217,"z":"150446f3.d47aa9","wires":[[]]},{"id":"25ece2ae.1fed4e","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":959,"y":274,"z":"150446f3.d47aa9","wires":[["f5ad1877.f5fb08","4d4a5b49.2afb94"]]},{"id":"4d4a5b49.2afb94","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.openecomp.appc.dg.error`' />\n","comments":"","x":1188,"y":274,"z":"150446f3.d47aa9","wires":[]},{"id":"4a0353c8.2d471c","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='getGenericVnfData'>","comments":"","outputs":1,"x":480,"y":274,"z":"150446f3.d47aa9","wires":[["b03a6327.d8941"]]},{"id":"972dd4cd.52e478","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value='`$input.action-identifiers.vnf-id`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":436,"y":210,"z":"150446f3.d47aa9","wires":[]},{"id":"9ce11364.ca14f","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":209,"y":274,"z":"150446f3.d47aa9","wires":[["972dd4cd.52e478","4a0353c8.2d471c","9d436678.79ec78","79795ed2.80425","99224f0e.1687b","d5060181.3d546"]]},{"id":"b03a6327.d8941","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":785,"y":274,"z":"150446f3.d47aa9","wires":[["25ece2ae.1fed4e"]]},{"id":"d8eca0a4.77181","type":"call","name":"acquire entitlement","xml":"<call module='Appc-API' version='2.0.0.0' rpc='acquire_and_return' mode='sync' >\n","comments":"","outputs":1,"x":1048,"y":426,"z":"150446f3.d47aa9","wires":[["5f4740fc.82243","e9c2ecda.2a739"]]},{"id":"bc1e02ed.46d83","type":"set","name":"set for entitlement","xml":"<set>\n\t<parameter name='model.uuid' value='`$model.entitlement.pool.uuid`' />\n\t<parameter name='aai.uuid' value='`$aai.input.data.entitlement-assignment-group-uuid`' />\n\t<parameter name='aai.asset.tag' value='`$aai.input.data.entitlement-resource-uuid`' />\n\t<parameter name='acquire.require' value='`$is.acquire-entitlement.require`' />\n\t<parameter name='release.require' value='`$is.release-entitlement.require`' />\n\t<parameter name='acquire.method' value='acquireEntitlement' />\n\t<parameter name='release.method' value='releaseEntitlement' />","comments":"","x":1061,"y":371,"z":"150446f3.d47aa9","wires":[]},{"id":"79795ed2.80425","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":459,"y":601,"z":"150446f3.d47aa9","wires":[]},{"id":"f26c05b5.ce1df8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":839,"y":426,"z":"150446f3.d47aa9","wires":[["bc1e02ed.46d83","d8eca0a4.77181"]]},{"id":"ed1a5e9a.1ca9d","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":838,"y":519,"z":"150446f3.d47aa9","wires":[["5791d93f.9c9838","4f84efd3.d3e91"]]},{"id":"5791d93f.9c9838","type":"set","name":"set for license","xml":"<set>\n\t<parameter name='model.uuid' value='`$model.license.key.uuid`' />\n\t<parameter name='aai.uuid' value='`$aai.input.data.license-assignment-group-uuid`' />\n\t<parameter name='aai.asset.tag' value='`$aai.input.data.license-key-uuid`' />\n\t<parameter name='acquire.require' value='`$is.acquire-license.require`' />\n\t<parameter name='release.require' value='`$is.release-license.require`' />\n\t<parameter name='acquire.method' value='acquireLicense' />\n\t<parameter name='release.method' value='releaseLicense' />","comments":"","x":1056,"y":519,"z":"150446f3.d47aa9","wires":[]},{"id":"4f84efd3.d3e91","type":"call","name":"acquire license","xml":"<call module='Appc-API' version='2.0.0.0' rpc='acquire_and_return' mode='sync' >\n","comments":"","outputs":1,"x":1054,"y":593,"z":"150446f3.d47aa9","wires":[["1676c3bf.6ae81c","921d09c2.070c98"]]},{"id":"5f4740fc.82243","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1259,"y":391,"z":"150446f3.d47aa9","wires":[["a4badb8.6948e28"]]},{"id":"e9c2ecda.2a739","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1258,"y":460,"z":"150446f3.d47aa9","wires":[["ef554789.af5fd8"]]},{"id":"9832f22b.c3486","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1885,"y":459,"z":"150446f3.d47aa9","wires":[[]]},{"id":"ef554789.af5fd8","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1576,"y":459,"z":"150446f3.d47aa9","wires":[["9832f22b.c3486","b3985ada.5fad68","8a8cc770.dfc4c8"]]},{"id":"b3985ada.5fad68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$acquire.error.error-message`' />\n","comments":"","x":1832,"y":500,"z":"150446f3.d47aa9","wires":[]},{"id":"a4badb8.6948e28","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.entitlement-resource-uuid' value='`$asset-tag`' />\n\t<parameter name='aai.input.data.entitlement-assignment-group-uuid' value='`$model.uuid`' />\n\n","comments":"","outputs":1,"x":1438,"y":391,"z":"150446f3.d47aa9","wires":[["5759c209.a4dc6c","48280ad5.075c64"]]},{"id":"5759c209.a4dc6c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1637,"y":346,"z":"150446f3.d47aa9","wires":[["9fb59e95.cd2ae"]]},{"id":"8a8cc770.dfc4c8","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.openecomp.appc.dg.error' value='`$acquire.error.error-message`' />\n","comments":"","x":1814,"y":413,"z":"150446f3.d47aa9","wires":[]},{"id":"1676c3bf.6ae81c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1259,"y":551,"z":"150446f3.d47aa9","wires":[["e6077b1c.676d68"]]},{"id":"80af8413.c41af8","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1752,"y":693,"z":"150446f3.d47aa9","wires":[[]]},{"id":"cf0d6944.da2e48","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1443,"y":644,"z":"150446f3.d47aa9","wires":[["80af8413.c41af8","424183e2.2fe76c","a2997968.151ab8"]]},{"id":"424183e2.2fe76c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$acquire.error.error-message`' />\n","comments":"","x":1701,"y":742,"z":"150446f3.d47aa9","wires":[]},{"id":"921d09c2.070c98","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1264,"y":644,"z":"150446f3.d47aa9","wires":[["cf0d6944.da2e48"]]},{"id":"e6077b1c.676d68","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.license-key-uuid' value='`$asset-tag`' />\n\t<parameter name='aai.input.data.license-assignment-group-uuid' value='`$model.uuid`' />\n\t<parameter name='aai.input.data.license-key' value='`$license-key`' />\n","comments":"","outputs":1,"x":1442,"y":551,"z":"150446f3.d47aa9","wires":[["baf4e318.6218b","996a1b70.ae33c8"]]},{"id":"baf4e318.6218b","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1632,"y":551,"z":"150446f3.d47aa9","wires":[["a692c8c6.e23748"]]},{"id":"a2997968.151ab8","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.openecomp.appc.dg.error' value='`$acquire.error.error-message`' />\n","comments":"","x":1684,"y":644,"z":"150446f3.d47aa9","wires":[]},{"id":"73130c00.837904","type":"execute","name":"execute: release","xml":"<execute plugin='org.openecomp.sdnc.sli.plugin.altsTools.AltsTools' method='releaseEntitlement' >\n    <parameter name=\"asset-uuid\" value=\"`$asset-tag`\" />\n\t<parameter name=\"assignment-group\" value=\"`$model.entitlement.pool.uuid`\" />\n\t<parameter name=\"error-prefix\" value=\"acquire.error\"/>\n\t<parameter name=\"prefix\" value=\"release.response\" />\n\t<parameter name=\"hostname\" value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":2002,"y":300,"z":"150446f3.d47aa9","wires":[[]]},{"id":"9fb59e95.cd2ae","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1798,"y":346,"z":"150446f3.d47aa9","wires":[["73130c00.837904","870b44ac.4f4af8","78617f1c.8bb0e"]]},{"id":"870b44ac.4f4af8","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n","comments":"","outputs":1,"x":2044,"y":346,"z":"150446f3.d47aa9","wires":[[]]},{"id":"78617f1c.8bb0e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.openecomp.appc.dg.error`' />\n","comments":"","x":1992,"y":394,"z":"150446f3.d47aa9","wires":[]},{"id":"48280ad5.075c64","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1643,"y":391,"z":"150446f3.d47aa9","wires":[[]]},{"id":"a692c8c6.e23748","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1789,"y":551,"z":"150446f3.d47aa9","wires":[["791287e7.f44278","e7d0dd25.7a0c6","a8028f31.101f4"]]},{"id":"791287e7.f44278","type":"execute","name":"execute: release","xml":"<execute plugin='org.openecomp.sdnc.sli.plugin.altsTools.AltsTools' method='releaseLicense' >\n    <parameter name=\"asset-uuid\" value=\"`$asset-tag`\" />\n\t<parameter name=\"assignment-group\" value=\"`$model.license.key.uuid`\" />\n\t<parameter name=\"error-prefix\" value=\"acquire.error\" />\n\t<parameter name=\"prefix\" value=\"release.response\" />\n\t<parameter name=\"hostname\" value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":2042,"y":551,"z":"150446f3.d47aa9","wires":[[]]},{"id":"e7d0dd25.7a0c6","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n","comments":"","outputs":1,"x":2081,"y":600,"z":"150446f3.d47aa9","wires":[[]]},{"id":"a8028f31.101f4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.openecomp.appc.dg.error`' />\n","comments":"","x":2033,"y":655,"z":"150446f3.d47aa9","wires":[]},{"id":"996a1b70.ae33c8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1637,"y":591,"z":"150446f3.d47aa9","wires":[[]]},{"id":"99224f0e.1687b","type":"switchNode","name":"entitlement require?","xml":"<switch test='`$is.aai-entitlement-update.require`'>\n","comments":"","outputs":1,"x":483,"y":426,"z":"150446f3.d47aa9","wires":[["9b0d5a39.63ece8"]]},{"id":"d5060181.3d546","type":"switchNode","name":"license require?","xml":"<switch test='`$is.aai-license-update.require`'>\n","comments":"","outputs":1,"x":475,"y":519,"z":"150446f3.d47aa9","wires":[["75b1fcca.18edd4"]]},{"id":"9b0d5a39.63ece8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":665,"y":426,"z":"150446f3.d47aa9","wires":[["f26c05b5.ce1df8"]]},{"id":"75b1fcca.18edd4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":662,"y":519,"z":"150446f3.d47aa9","wires":[["ed1a5e9a.1ca9d"]]}]
+[{"id":"b1ce6dcf.35732","type":"dgstart","name":"DGSTART","outputs":1,"x":188,"y":50,"z":"150446f3.d47aa9","wires":[["174ee6ca.1ed6a9"]]},{"id":"174ee6ca.1ed6a9","type":"service-logic","name":"Appc-API 2.0.0.0","module":"Appc-API","version":"2.0.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='2.0.0.0'>","outputs":1,"x":350,"y":50,"z":"150446f3.d47aa9","wires":[["f19dcf10.eaeb9"]]},{"id":"f19dcf10.eaeb9","type":"method","name":"Method: Acquire License","xml":"<method rpc='acquire_license' mode='sync'>\n","comments":"","outputs":1,"x":581,"y":50,"z":"150446f3.d47aa9","wires":[["9ce11364.ca14f"]]},{"id":"9d436678.79ec78","type":"execute","name":"execute: retrieveLicenseModel","xml":"<execute plugin='org.onap.appc.dg.licmgr.LicenseManagerPlugin' method='retrieveLicenseModel' >\n<parameter name=\"org.onap.appc.vftype\" value=\"`$aai.input.data.vnf-type`\" />\n<parameter name=\"org.onap.appc.resource-version\" value=\"`$aai.input.data.persona-model-version`\" />\n\n","comments":"","outputs":1,"x":514,"y":350,"z":"150446f3.d47aa9","wires":[["b03a6327.d8941"]]},{"id":"f5ad1877.f5fb08","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1239,"y":217,"z":"150446f3.d47aa9","wires":[[]]},{"id":"25ece2ae.1fed4e","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":959,"y":274,"z":"150446f3.d47aa9","wires":[["f5ad1877.f5fb08","4d4a5b49.2afb94"]]},{"id":"4d4a5b49.2afb94","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.onap.appc.dg.error`' />\n","comments":"","x":1188,"y":274,"z":"150446f3.d47aa9","wires":[]},{"id":"4a0353c8.2d471c","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData'>","comments":"","outputs":1,"x":480,"y":274,"z":"150446f3.d47aa9","wires":[["b03a6327.d8941"]]},{"id":"972dd4cd.52e478","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value='`$input.action-identifiers.vnf-id`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":436,"y":210,"z":"150446f3.d47aa9","wires":[]},{"id":"9ce11364.ca14f","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":209,"y":274,"z":"150446f3.d47aa9","wires":[["972dd4cd.52e478","4a0353c8.2d471c","9d436678.79ec78","79795ed2.80425","99224f0e.1687b","d5060181.3d546"]]},{"id":"b03a6327.d8941","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":785,"y":274,"z":"150446f3.d47aa9","wires":[["25ece2ae.1fed4e"]]},{"id":"d8eca0a4.77181","type":"call","name":"acquire entitlement","xml":"<call module='Appc-API' version='2.0.0.0' rpc='acquire_and_return' mode='sync' >\n","comments":"","outputs":1,"x":1048,"y":426,"z":"150446f3.d47aa9","wires":[["5f4740fc.82243","e9c2ecda.2a739"]]},{"id":"bc1e02ed.46d83","type":"set","name":"set for entitlement","xml":"<set>\n\t<parameter name='model.uuid' value='`$model.entitlement.pool.uuid`' />\n\t<parameter name='aai.uuid' value='`$aai.input.data.entitlement-assignment-group-uuid`' />\n\t<parameter name='aai.asset.tag' value='`$aai.input.data.entitlement-resource-uuid`' />\n\t<parameter name='acquire.require' value='`$is.acquire-entitlement.require`' />\n\t<parameter name='release.require' value='`$is.release-entitlement.require`' />\n\t<parameter name='acquire.method' value='acquireEntitlement' />\n\t<parameter name='release.method' value='releaseEntitlement' />","comments":"","x":1061,"y":371,"z":"150446f3.d47aa9","wires":[]},{"id":"79795ed2.80425","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":459,"y":601,"z":"150446f3.d47aa9","wires":[]},{"id":"f26c05b5.ce1df8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":839,"y":426,"z":"150446f3.d47aa9","wires":[["bc1e02ed.46d83","d8eca0a4.77181"]]},{"id":"ed1a5e9a.1ca9d","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":838,"y":519,"z":"150446f3.d47aa9","wires":[["5791d93f.9c9838","4f84efd3.d3e91"]]},{"id":"5791d93f.9c9838","type":"set","name":"set for license","xml":"<set>\n\t<parameter name='model.uuid' value='`$model.license.key.uuid`' />\n\t<parameter name='aai.uuid' value='`$aai.input.data.license-assignment-group-uuid`' />\n\t<parameter name='aai.asset.tag' value='`$aai.input.data.license-key-uuid`' />\n\t<parameter name='acquire.require' value='`$is.acquire-license.require`' />\n\t<parameter name='release.require' value='`$is.release-license.require`' />\n\t<parameter name='acquire.method' value='acquireLicense' />\n\t<parameter name='release.method' value='releaseLicense' />","comments":"","x":1056,"y":519,"z":"150446f3.d47aa9","wires":[]},{"id":"4f84efd3.d3e91","type":"call","name":"acquire license","xml":"<call module='Appc-API' version='2.0.0.0' rpc='acquire_and_return' mode='sync' >\n","comments":"","outputs":1,"x":1054,"y":593,"z":"150446f3.d47aa9","wires":[["1676c3bf.6ae81c","921d09c2.070c98"]]},{"id":"5f4740fc.82243","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1259,"y":391,"z":"150446f3.d47aa9","wires":[["a4badb8.6948e28"]]},{"id":"e9c2ecda.2a739","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1258,"y":460,"z":"150446f3.d47aa9","wires":[["ef554789.af5fd8"]]},{"id":"9832f22b.c3486","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1885,"y":459,"z":"150446f3.d47aa9","wires":[[]]},{"id":"ef554789.af5fd8","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1576,"y":459,"z":"150446f3.d47aa9","wires":[["9832f22b.c3486","b3985ada.5fad68","8a8cc770.dfc4c8"]]},{"id":"b3985ada.5fad68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$acquire.error.error-message`' />\n","comments":"","x":1832,"y":500,"z":"150446f3.d47aa9","wires":[]},{"id":"a4badb8.6948e28","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.entitlement-resource-uuid' value='`$asset-tag`' />\n\t<parameter name='aai.input.data.entitlement-assignment-group-uuid' value='`$model.uuid`' />\n\n","comments":"","outputs":1,"x":1438,"y":391,"z":"150446f3.d47aa9","wires":[["5759c209.a4dc6c","48280ad5.075c64"]]},{"id":"5759c209.a4dc6c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1637,"y":346,"z":"150446f3.d47aa9","wires":[["9fb59e95.cd2ae"]]},{"id":"8a8cc770.dfc4c8","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.onap.appc.dg.error' value='`$acquire.error.error-message`' />\n","comments":"","x":1814,"y":413,"z":"150446f3.d47aa9","wires":[]},{"id":"1676c3bf.6ae81c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1259,"y":551,"z":"150446f3.d47aa9","wires":[["e6077b1c.676d68"]]},{"id":"80af8413.c41af8","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1752,"y":693,"z":"150446f3.d47aa9","wires":[[]]},{"id":"cf0d6944.da2e48","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1443,"y":644,"z":"150446f3.d47aa9","wires":[["80af8413.c41af8","424183e2.2fe76c","a2997968.151ab8"]]},{"id":"424183e2.2fe76c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$acquire.error.error-message`' />\n","comments":"","x":1701,"y":742,"z":"150446f3.d47aa9","wires":[]},{"id":"921d09c2.070c98","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1264,"y":644,"z":"150446f3.d47aa9","wires":[["cf0d6944.da2e48"]]},{"id":"e6077b1c.676d68","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.license-key-uuid' value='`$asset-tag`' />\n\t<parameter name='aai.input.data.license-assignment-group-uuid' value='`$model.uuid`' />\n\t<parameter name='aai.input.data.license-key' value='`$license-key`' />\n","comments":"","outputs":1,"x":1442,"y":551,"z":"150446f3.d47aa9","wires":[["baf4e318.6218b","996a1b70.ae33c8"]]},{"id":"baf4e318.6218b","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1632,"y":551,"z":"150446f3.d47aa9","wires":[["a692c8c6.e23748"]]},{"id":"a2997968.151ab8","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.onap.appc.dg.error' value='`$acquire.error.error-message`' />\n","comments":"","x":1684,"y":644,"z":"150446f3.d47aa9","wires":[]},{"id":"73130c00.837904","type":"execute","name":"execute: release","xml":"<execute plugin='org.openecomp.sdnc.sli.plugin.altsTools.AltsTools' method='releaseEntitlement' >\n    <parameter name=\"asset-uuid\" value=\"`$asset-tag`\" />\n\t<parameter name=\"assignment-group\" value=\"`$model.entitlement.pool.uuid`\" />\n\t<parameter name=\"error-prefix\" value=\"acquire.error\"/>\n\t<parameter name=\"prefix\" value=\"release.response\" />\n\t<parameter name=\"hostname\" value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":2002,"y":300,"z":"150446f3.d47aa9","wires":[[]]},{"id":"9fb59e95.cd2ae","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1798,"y":346,"z":"150446f3.d47aa9","wires":[["73130c00.837904","870b44ac.4f4af8","78617f1c.8bb0e"]]},{"id":"870b44ac.4f4af8","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":2044,"y":346,"z":"150446f3.d47aa9","wires":[[]]},{"id":"78617f1c.8bb0e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.onap.appc.dg.error`' />\n","comments":"","x":1992,"y":394,"z":"150446f3.d47aa9","wires":[]},{"id":"48280ad5.075c64","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1643,"y":391,"z":"150446f3.d47aa9","wires":[[]]},{"id":"a692c8c6.e23748","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1789,"y":551,"z":"150446f3.d47aa9","wires":[["791287e7.f44278","e7d0dd25.7a0c6","a8028f31.101f4"]]},{"id":"791287e7.f44278","type":"execute","name":"execute: release","xml":"<execute plugin='org.openecomp.sdnc.sli.plugin.altsTools.AltsTools' method='releaseLicense' >\n    <parameter name=\"asset-uuid\" value=\"`$asset-tag`\" />\n\t<parameter name=\"assignment-group\" value=\"`$model.license.key.uuid`\" />\n\t<parameter name=\"error-prefix\" value=\"acquire.error\" />\n\t<parameter name=\"prefix\" value=\"release.response\" />\n\t<parameter name=\"hostname\" value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":2042,"y":551,"z":"150446f3.d47aa9","wires":[[]]},{"id":"e7d0dd25.7a0c6","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":2081,"y":600,"z":"150446f3.d47aa9","wires":[[]]},{"id":"a8028f31.101f4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.onap.appc.dg.error`' />\n","comments":"","x":2033,"y":655,"z":"150446f3.d47aa9","wires":[]},{"id":"996a1b70.ae33c8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1637,"y":591,"z":"150446f3.d47aa9","wires":[[]]},{"id":"99224f0e.1687b","type":"switchNode","name":"entitlement require?","xml":"<switch test='`$is.aai-entitlement-update.require`'>\n","comments":"","outputs":1,"x":483,"y":426,"z":"150446f3.d47aa9","wires":[["9b0d5a39.63ece8"]]},{"id":"d5060181.3d546","type":"switchNode","name":"license require?","xml":"<switch test='`$is.aai-license-update.require`'>\n","comments":"","outputs":1,"x":475,"y":519,"z":"150446f3.d47aa9","wires":[["75b1fcca.18edd4"]]},{"id":"9b0d5a39.63ece8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":665,"y":426,"z":"150446f3.d47aa9","wires":[["f26c05b5.ce1df8"]]},{"id":"75b1fcca.18edd4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":662,"y":519,"z":"150446f3.d47aa9","wires":[["ed1a5e9a.1ca9d"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_legacy_operation.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_legacy_operation.json
index b4ca75aaa..54fcedab0 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_legacy_operation.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_legacy_operation.json
@@ -1 +1 @@
-[{"id":"26263816.d709e8","type":"dgstart","name":"DGSTART","outputs":1,"x":158,"y":73,"z":"a2800b0.adcd2f8","wires":[["84a7e8cd.6a93a8"]]},{"id":"84a7e8cd.6a93a8","type":"service-logic","name":"Appc-API 2.0.0.0","module":"Appc-API","version":"2.0.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='2.0.0.0'>","outputs":1,"x":320,"y":73,"z":"a2800b0.adcd2f8","wires":[["144b76ae.ab2f69"]]},{"id":"144b76ae.ab2f69","type":"method","name":"Method: Legacy Operation","xml":"<method rpc='legacy_operation' mode='sync'>\n","comments":"","outputs":1,"x":551,"y":73,"z":"a2800b0.adcd2f8","wires":[["fc80f6e2.339178"]]},{"id":"fc80f6e2.339178","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":234,"y":257,"z":"a2800b0.adcd2f8","wires":[["9eddb683.5db478","c3ead607.5a1818","a0c31fb9.980eb"]]},{"id":"9eddb683.5db478","type":"call","name":"call: legacy-operation-all","xml":"<call module='APPC' rpc='topology-operation-all' version='2.0.0' mode='sync' >\n","comments":"","outputs":1,"x":512,"y":322,"z":"a2800b0.adcd2f8","wires":[["a6c9fcec.35ea7","f4f22d6f.b464"]]},{"id":"c3ead607.5a1818","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":479,"y":444,"z":"a2800b0.adcd2f8","wires":[]},{"id":"f4f22d6f.b464","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":740,"y":370,"z":"a2800b0.adcd2f8","wires":[["da7dbd7.b82e74"]]},{"id":"a6c9fcec.35ea7","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":736,"y":278,"z":"a2800b0.adcd2f8","wires":[["9b5ac116.42a4c"]]},{"id":"da7dbd7.b82e74","type":"execute","name":"Map Positive Response","xml":"<execute plugin='org.openecomp.appc.dg.common.LegacyUtil' method='convertPositiveResponse' >\n","comments":"","outputs":1,"x":917,"y":370,"z":"a2800b0.adcd2f8","wires":[["5318008f.8818d"]]},{"id":"5318008f.8818d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1120,"y":370,"z":"a2800b0.adcd2f8","wires":[[]]},{"id":"1a5b7135.777c5f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='SvcLogic.status.code' value='`$error-code`' />\n<parameter name='org.openecomp.appc.dg.error' value='`$error-message`' />\n<parameter name='dg.status.message.param.errorMsg' value='`$error-message`' />\n","comments":"","x":1252,"y":278,"z":"a2800b0.adcd2f8","wires":[]},{"id":"a0c31fb9.980eb","type":"execute","name":"Prepare Request","xml":"<execute plugin='org.openecomp.appc.dg.common.LegacyUtil' method='prepareRequest' >\n","comments":"","outputs":1,"x":481,"y":215,"z":"a2800b0.adcd2f8","wires":[[]]},{"id":"9b5ac116.42a4c","type":"execute","name":"Map Negative Response","xml":"<execute plugin='org.openecomp.appc.dg.common.LegacyUtil' method='convertNegativeResponse' >\n","comments":"","outputs":1,"x":913,"y":278,"z":"a2800b0.adcd2f8","wires":[["4b6e2869.5987d8"]]},{"id":"4b6e2869.5987d8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1101,"y":278,"z":"a2800b0.adcd2f8","wires":[["1a5b7135.777c5f"]]}]
+[{"id":"26263816.d709e8","type":"dgstart","name":"DGSTART","outputs":1,"x":158,"y":73,"z":"a2800b0.adcd2f8","wires":[["84a7e8cd.6a93a8"]]},{"id":"84a7e8cd.6a93a8","type":"service-logic","name":"Appc-API 2.0.0.0","module":"Appc-API","version":"2.0.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='2.0.0.0'>","outputs":1,"x":320,"y":73,"z":"a2800b0.adcd2f8","wires":[["144b76ae.ab2f69"]]},{"id":"144b76ae.ab2f69","type":"method","name":"Method: Legacy Operation","xml":"<method rpc='legacy_operation' mode='sync'>\n","comments":"","outputs":1,"x":551,"y":73,"z":"a2800b0.adcd2f8","wires":[["fc80f6e2.339178"]]},{"id":"fc80f6e2.339178","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":234,"y":257,"z":"a2800b0.adcd2f8","wires":[["9eddb683.5db478","c3ead607.5a1818","a0c31fb9.980eb"]]},{"id":"9eddb683.5db478","type":"call","name":"call: legacy-operation-all","xml":"<call module='APPC' rpc='topology-operation-all' version='2.0.0' mode='sync' >\n","comments":"","outputs":1,"x":512,"y":322,"z":"a2800b0.adcd2f8","wires":[["a6c9fcec.35ea7","f4f22d6f.b464"]]},{"id":"c3ead607.5a1818","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":479,"y":444,"z":"a2800b0.adcd2f8","wires":[]},{"id":"f4f22d6f.b464","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":740,"y":370,"z":"a2800b0.adcd2f8","wires":[["da7dbd7.b82e74"]]},{"id":"a6c9fcec.35ea7","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":736,"y":278,"z":"a2800b0.adcd2f8","wires":[["9b5ac116.42a4c"]]},{"id":"da7dbd7.b82e74","type":"execute","name":"Map Positive Response","xml":"<execute plugin='org.onap.appc.dg.common.LegacyUtil' method='convertPositiveResponse' >\n","comments":"","outputs":1,"x":917,"y":370,"z":"a2800b0.adcd2f8","wires":[["5318008f.8818d"]]},{"id":"5318008f.8818d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1120,"y":370,"z":"a2800b0.adcd2f8","wires":[[]]},{"id":"1a5b7135.777c5f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='SvcLogic.status.code' value='`$error-code`' />\n<parameter name='org.onap.appc.dg.error' value='`$error-message`' />\n<parameter name='dg.status.message.param.errorMsg' value='`$error-message`' />\n","comments":"","x":1252,"y":278,"z":"a2800b0.adcd2f8","wires":[]},{"id":"a0c31fb9.980eb","type":"execute","name":"Prepare Request","xml":"<execute plugin='org.onap.appc.dg.common.LegacyUtil' method='prepareRequest' >\n","comments":"","outputs":1,"x":481,"y":215,"z":"a2800b0.adcd2f8","wires":[[]]},{"id":"9b5ac116.42a4c","type":"execute","name":"Map Negative Response","xml":"<execute plugin='org.onap.appc.dg.common.LegacyUtil' method='convertNegativeResponse' >\n","comments":"","outputs":1,"x":913,"y":278,"z":"a2800b0.adcd2f8","wires":[["4b6e2869.5987d8"]]},{"id":"4b6e2869.5987d8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1101,"y":278,"z":"a2800b0.adcd2f8","wires":[["1a5b7135.777c5f"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_return_license.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_return_license.json
index c001e89cb..a9654d409 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_return_license.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_return_license.json
@@ -1 +1 @@
-[{"id":"a821f6e8.704ae8","type":"dgstart","name":"DGSTART","outputs":1,"x":114,"y":76,"z":"5c9ed2bf.7c802c","wires":[["225e9571.40dc9a"]]},{"id":"225e9571.40dc9a","type":"service-logic","name":"Appc-API 2.0.0.0","module":"Appc-API","version":"2.0.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='2.0.0.0'>","outputs":1,"x":276,"y":76,"z":"5c9ed2bf.7c802c","wires":[["658f8fd3.71418"]]},{"id":"658f8fd3.71418","type":"method","name":"Method: Return License","xml":"<method rpc='return_license' mode='sync'>\n","comments":"","outputs":1,"x":189,"y":205,"z":"5c9ed2bf.7c802c","wires":[["a1a70803.7a2338"]]},{"id":"757e67b1.7b4918","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1157,"y":285,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"2a6a83b8.dd656c","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":850,"y":323,"z":"5c9ed2bf.7c802c","wires":[["757e67b1.7b4918","f7406078.502ba"]]},{"id":"f7406078.502ba","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.openecomp.appc.dg.error`' />\n","comments":"","x":1211,"y":330,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"b37c3449.de61c8","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >","comments":"","outputs":1,"x":403,"y":324,"z":"5c9ed2bf.7c802c","wires":[["7b5ad420.2cdf2c"]]},{"id":"564c423c.4579bc","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value='`$input.action-identifiers.vnf-id`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":359,"y":268,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"a1a70803.7a2338","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":135,"y":300,"z":"5c9ed2bf.7c802c","wires":[["564c423c.4579bc","b37c3449.de61c8","fa5b213.83780e","fb350ce9.a1d8a","d7e6d28b.9fa3f"]]},{"id":"7b5ad420.2cdf2c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":591,"y":324,"z":"5c9ed2bf.7c802c","wires":[["2a6a83b8.dd656c"]]},{"id":"88061c98.c83f4","type":"set","name":"set for entitlement","xml":"<set>\n\t<parameter name='model.uuid' value='`$model.entitlement.pool.uuid`' />\n\t<parameter name=\"asset-tag\" value='`$aai.input.data.entitlement-resource-uuid`' />\n\t<parameter name='aai.uuid' value='`$aai.input.data.entitlement-assignment-group-uuid`' />\n\t<parameter name='acquire.method' value='acquireEntitlement' />\n\t<parameter name='release.method' value='releaseEntitlement' />\n","comments":"","x":916,"y":406,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"fa5b213.83780e","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":328,"y":739,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"7a6a9664.4a3d48","type":"set","name":"set for license","xml":"<set>\n\t<parameter name='model.uuid' value='`$model.license.key.uuid`' />\n\t<parameter name=\"asset-tag\" value=\"`$aai.input.data.license-key-uuid`\" />\n\t<parameter name=\"license-key\" value=\"`$aai.input.data.license-key`\" />\n\t<parameter name='aai.uuid' value='`$aai.input.data.license-assignment-group-uuid`' />\n\t<parameter name='acquire.method' value='acquireLicense' />\n\t<parameter name='release.method' value='releaseLicense' />","comments":"","x":927,"y":557,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"1e6af15c.6796df","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1147,"y":445,"z":"5c9ed2bf.7c802c","wires":[["5d49cf70.976ff"]]},{"id":"6aee4a8f.8f3c54","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1190,"y":529,"z":"5c9ed2bf.7c802c","wires":[["90c41eec.6a507"]]},{"id":"6f553242.ed52ec","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1856,"y":489,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"90c41eec.6a507","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1546,"y":530,"z":"5c9ed2bf.7c802c","wires":[["6f553242.ed52ec","d863be45.ce93a","a2f6bf78.eaf73"]]},{"id":"d863be45.ce93a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$acquire.error.error-message`' />\n","comments":"","x":1805,"y":529,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"db23792b.9aee08","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.entitlement-resource-uuid' value='' />\n\t<parameter name='aai.input.data.entitlement-assignment-group-uuid' value='' />\n\n","comments":"","outputs":1,"x":936,"y":466,"z":"5c9ed2bf.7c802c","wires":[["1e6af15c.6796df","6aee4a8f.8f3c54"]]},{"id":"c5c3ef8a.d28ec","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1537,"y":388,"z":"5c9ed2bf.7c802c","wires":[["3f58fb6b.831104"]]},{"id":"a2f6bf78.eaf73","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.openecomp.appc.dg.error' value='`$acquire.error.error-message`' />\n","comments":"","x":1788,"y":448,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"a75a3561.3c2d78","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1164,"y":617,"z":"5c9ed2bf.7c802c","wires":[["ff5b8e7e.ddf91"]]},{"id":"475bc485.88a2bc","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1857,"y":737,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"17f18b32.25fa65","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1500,"y":741,"z":"5c9ed2bf.7c802c","wires":[["475bc485.88a2bc","fa1ced45.a923e","ba4f55b0.15deb8"]]},{"id":"fa1ced45.a923e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$acquire.error.error-message`' />\n","comments":"","x":1810,"y":784,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"56ccaad7.0d0aa4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1247,"y":741,"z":"5c9ed2bf.7c802c","wires":[["17f18b32.25fa65"]]},{"id":"43cbdeae.fd16a","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.license-key-uuid' value='' />\n\t<parameter name='aai.input.data.license-key' value='' />\n\t<parameter name='aai.input.data.license-assignment-group-uuid' value='' />\n","comments":"","outputs":1,"x":950,"y":642,"z":"5c9ed2bf.7c802c","wires":[["a75a3561.3c2d78","56ccaad7.0d0aa4"]]},{"id":"32399c86.40db54","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1546,"y":617,"z":"5c9ed2bf.7c802c","wires":[["ce6a4c39.04928"]]},{"id":"ba4f55b0.15deb8","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.openecomp.appc.dg.error' value='`$acquire.error.error-message`' />\n","comments":"","x":1785,"y":692,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"5d49cf70.976ff","type":"execute","name":"execute: release entitlement","xml":"<execute plugin='org.openecomp.sdnc.sli.plugin.altsTools.AltsTools' method='releaseEntitlement' >\n    <parameter name=\"asset-uuid\" value=\"`$asset-tag`\" />\n\t<parameter name=\"assignment-group\" value=\"`$aai.uuid`\" />\n\t<parameter name=\"error-prefix\" value=\"acquire.error\" />\n\t<parameter name=\"prefix\" value=\"release.response\" />\n\t<parameter name=\"hostname\" value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":1350,"y":445,"z":"5c9ed2bf.7c802c","wires":[["c5c3ef8a.d28ec","37b2a9ad.9b5076"]]},{"id":"9146d0a1.0e3d3","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n","comments":"","outputs":1,"x":2021,"y":365,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"f839a87a.b2dfa8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.openecomp.appc.dg.error`' />\n","comments":"","x":1972,"y":425,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"37b2a9ad.9b5076","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1551,"y":469,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"ff5b8e7e.ddf91","type":"execute","name":"execute: release license","xml":"<execute plugin='org.openecomp.sdnc.sli.plugin.altsTools.AltsTools' method='releaseLicense' >\n    <parameter name=\"asset-uuid\" value=\"`$asset-tag`\" />\n\t<parameter name=\"assignment-group\" value=\"`$aai.uuid`\" />\n\t<parameter name=\"error-prefix\" value=\"acquire.error\" />\n\t<parameter name=\"prefix\" value=\"release.response\" />\n\t<parameter name=\"hostname\" value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":1352,"y":617,"z":"5c9ed2bf.7c802c","wires":[["32399c86.40db54","97e9c364.5a077"]]},{"id":"1ff85d4c.b7dcb3","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1978,"y":617,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"2221e1ef.b87a1e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.openecomp.appc.dg.error`' />\n","comments":"","x":1966,"y":669,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"97e9c364.5a077","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1571,"y":671,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"57f1d3d6.35cebc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":715,"y":432,"z":"5c9ed2bf.7c802c","wires":[["88061c98.c83f4","db23792b.9aee08"]]},{"id":"4e053a22.9bacc4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":724,"y":557,"z":"5c9ed2bf.7c802c","wires":[["7a6a9664.4a3d48","43cbdeae.fd16a"]]},{"id":"3f58fb6b.831104","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1724,"y":365,"z":"5c9ed2bf.7c802c","wires":[["8bea9f7.6b8d26","9146d0a1.0e3d3","f839a87a.b2dfa8"]]},{"id":"ce6a4c39.04928","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1713,"y":617,"z":"5c9ed2bf.7c802c","wires":[["1ff85d4c.b7dcb3","2221e1ef.b87a1e","579d777b.8d2698"]]},{"id":"fb350ce9.a1d8a","type":"switchNode","name":"release entitlement?","xml":"<switch test='`$is.release-entitlement.require`'>\n","comments":"","outputs":1,"x":381,"y":432,"z":"5c9ed2bf.7c802c","wires":[["97efa41.9e60358"]]},{"id":"97efa41.9e60358","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":555,"y":432,"z":"5c9ed2bf.7c802c","wires":[["57f1d3d6.35cebc"]]},{"id":"d7e6d28b.9fa3f","type":"switchNode","name":"release license?","xml":"<switch test='`$is.release-license.require`'>\n","comments":"","outputs":1,"x":374,"y":557,"z":"5c9ed2bf.7c802c","wires":[["ea6be629.2eb328"]]},{"id":"ea6be629.2eb328","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":548,"y":557,"z":"5c9ed2bf.7c802c","wires":[["4e053a22.9bacc4"]]},{"id":"8bea9f7.6b8d26","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.entitlement-resource-uuid' value='`$asset-tag`' />\n\t<parameter name='aai.input.data.entitlement-assignment-group-uuid' value='`$aai.uuid`' />\n\n","comments":"","outputs":1,"x":1996,"y":307,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"579d777b.8d2698","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.license-key-uuid' value='`$asset-tag`' />\n\t<parameter name='aai.input.data.license-key' value='`$license-key`' />\n\t<parameter name='aai.input.data.license-assignment-group-uuid' value='`$aai.uuid`' />\n","comments":"","outputs":1,"x":1964,"y":566,"z":"5c9ed2bf.7c802c","wires":[[]]}]
+[{"id":"a821f6e8.704ae8","type":"dgstart","name":"DGSTART","outputs":1,"x":114,"y":76,"z":"5c9ed2bf.7c802c","wires":[["225e9571.40dc9a"]]},{"id":"225e9571.40dc9a","type":"service-logic","name":"Appc-API 2.0.0.0","module":"Appc-API","version":"2.0.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='2.0.0.0'>","outputs":1,"x":276,"y":76,"z":"5c9ed2bf.7c802c","wires":[["658f8fd3.71418"]]},{"id":"658f8fd3.71418","type":"method","name":"Method: Return License","xml":"<method rpc='return_license' mode='sync'>\n","comments":"","outputs":1,"x":189,"y":205,"z":"5c9ed2bf.7c802c","wires":[["a1a70803.7a2338"]]},{"id":"757e67b1.7b4918","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1157,"y":285,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"2a6a83b8.dd656c","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":850,"y":323,"z":"5c9ed2bf.7c802c","wires":[["757e67b1.7b4918","f7406078.502ba"]]},{"id":"f7406078.502ba","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.onap.appc.dg.error`' />\n","comments":"","x":1211,"y":330,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"b37c3449.de61c8","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >","comments":"","outputs":1,"x":403,"y":324,"z":"5c9ed2bf.7c802c","wires":[["7b5ad420.2cdf2c"]]},{"id":"564c423c.4579bc","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value='`$input.action-identifiers.vnf-id`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":359,"y":268,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"a1a70803.7a2338","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":135,"y":300,"z":"5c9ed2bf.7c802c","wires":[["564c423c.4579bc","b37c3449.de61c8","fa5b213.83780e","fb350ce9.a1d8a","d7e6d28b.9fa3f"]]},{"id":"7b5ad420.2cdf2c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":591,"y":324,"z":"5c9ed2bf.7c802c","wires":[["2a6a83b8.dd656c"]]},{"id":"88061c98.c83f4","type":"set","name":"set for entitlement","xml":"<set>\n\t<parameter name='model.uuid' value='`$model.entitlement.pool.uuid`' />\n\t<parameter name=\"asset-tag\" value='`$aai.input.data.entitlement-resource-uuid`' />\n\t<parameter name='aai.uuid' value='`$aai.input.data.entitlement-assignment-group-uuid`' />\n\t<parameter name='acquire.method' value='acquireEntitlement' />\n\t<parameter name='release.method' value='releaseEntitlement' />\n","comments":"","x":916,"y":406,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"fa5b213.83780e","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":328,"y":739,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"7a6a9664.4a3d48","type":"set","name":"set for license","xml":"<set>\n\t<parameter name='model.uuid' value='`$model.license.key.uuid`' />\n\t<parameter name=\"asset-tag\" value=\"`$aai.input.data.license-key-uuid`\" />\n\t<parameter name=\"license-key\" value=\"`$aai.input.data.license-key`\" />\n\t<parameter name='aai.uuid' value='`$aai.input.data.license-assignment-group-uuid`' />\n\t<parameter name='acquire.method' value='acquireLicense' />\n\t<parameter name='release.method' value='releaseLicense' />","comments":"","x":927,"y":557,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"1e6af15c.6796df","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1147,"y":445,"z":"5c9ed2bf.7c802c","wires":[["5d49cf70.976ff"]]},{"id":"6aee4a8f.8f3c54","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1190,"y":529,"z":"5c9ed2bf.7c802c","wires":[["90c41eec.6a507"]]},{"id":"6f553242.ed52ec","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1856,"y":489,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"90c41eec.6a507","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1546,"y":530,"z":"5c9ed2bf.7c802c","wires":[["6f553242.ed52ec","d863be45.ce93a","a2f6bf78.eaf73"]]},{"id":"d863be45.ce93a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$acquire.error.error-message`' />\n","comments":"","x":1805,"y":529,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"db23792b.9aee08","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.entitlement-resource-uuid' value='' />\n\t<parameter name='aai.input.data.entitlement-assignment-group-uuid' value='' />\n\n","comments":"","outputs":1,"x":936,"y":466,"z":"5c9ed2bf.7c802c","wires":[["1e6af15c.6796df","6aee4a8f.8f3c54"]]},{"id":"c5c3ef8a.d28ec","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1537,"y":388,"z":"5c9ed2bf.7c802c","wires":[["3f58fb6b.831104"]]},{"id":"a2f6bf78.eaf73","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.onap.appc.dg.error' value='`$acquire.error.error-message`' />\n","comments":"","x":1788,"y":448,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"a75a3561.3c2d78","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1164,"y":617,"z":"5c9ed2bf.7c802c","wires":[["ff5b8e7e.ddf91"]]},{"id":"475bc485.88a2bc","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1857,"y":737,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"17f18b32.25fa65","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1500,"y":741,"z":"5c9ed2bf.7c802c","wires":[["475bc485.88a2bc","fa1ced45.a923e","ba4f55b0.15deb8"]]},{"id":"fa1ced45.a923e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$acquire.error.error-message`' />\n","comments":"","x":1810,"y":784,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"56ccaad7.0d0aa4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1247,"y":741,"z":"5c9ed2bf.7c802c","wires":[["17f18b32.25fa65"]]},{"id":"43cbdeae.fd16a","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.license-key-uuid' value='' />\n\t<parameter name='aai.input.data.license-key' value='' />\n\t<parameter name='aai.input.data.license-assignment-group-uuid' value='' />\n","comments":"","outputs":1,"x":950,"y":642,"z":"5c9ed2bf.7c802c","wires":[["a75a3561.3c2d78","56ccaad7.0d0aa4"]]},{"id":"32399c86.40db54","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1546,"y":617,"z":"5c9ed2bf.7c802c","wires":[["ce6a4c39.04928"]]},{"id":"ba4f55b0.15deb8","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.onap.appc.dg.error' value='`$acquire.error.error-message`' />\n","comments":"","x":1785,"y":692,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"5d49cf70.976ff","type":"execute","name":"execute: release entitlement","xml":"<execute plugin='org.openecomp.sdnc.sli.plugin.altsTools.AltsTools' method='releaseEntitlement' >\n    <parameter name=\"asset-uuid\" value=\"`$asset-tag`\" />\n\t<parameter name=\"assignment-group\" value=\"`$aai.uuid`\" />\n\t<parameter name=\"error-prefix\" value=\"acquire.error\" />\n\t<parameter name=\"prefix\" value=\"release.response\" />\n\t<parameter name=\"hostname\" value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":1350,"y":445,"z":"5c9ed2bf.7c802c","wires":[["c5c3ef8a.d28ec","37b2a9ad.9b5076"]]},{"id":"9146d0a1.0e3d3","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":2021,"y":365,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"f839a87a.b2dfa8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.onap.appc.dg.error`' />\n","comments":"","x":1972,"y":425,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"37b2a9ad.9b5076","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1551,"y":469,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"ff5b8e7e.ddf91","type":"execute","name":"execute: release license","xml":"<execute plugin='org.openecomp.sdnc.sli.plugin.altsTools.AltsTools' method='releaseLicense' >\n    <parameter name=\"asset-uuid\" value=\"`$asset-tag`\" />\n\t<parameter name=\"assignment-group\" value=\"`$aai.uuid`\" />\n\t<parameter name=\"error-prefix\" value=\"acquire.error\" />\n\t<parameter name=\"prefix\" value=\"release.response\" />\n\t<parameter name=\"hostname\" value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":1352,"y":617,"z":"5c9ed2bf.7c802c","wires":[["32399c86.40db54","97e9c364.5a077"]]},{"id":"1ff85d4c.b7dcb3","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1978,"y":617,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"2221e1ef.b87a1e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.onap.appc.dg.error`' />\n","comments":"","x":1966,"y":669,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"97e9c364.5a077","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1571,"y":671,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"57f1d3d6.35cebc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":715,"y":432,"z":"5c9ed2bf.7c802c","wires":[["88061c98.c83f4","db23792b.9aee08"]]},{"id":"4e053a22.9bacc4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":724,"y":557,"z":"5c9ed2bf.7c802c","wires":[["7a6a9664.4a3d48","43cbdeae.fd16a"]]},{"id":"3f58fb6b.831104","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1724,"y":365,"z":"5c9ed2bf.7c802c","wires":[["8bea9f7.6b8d26","9146d0a1.0e3d3","f839a87a.b2dfa8"]]},{"id":"ce6a4c39.04928","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1713,"y":617,"z":"5c9ed2bf.7c802c","wires":[["1ff85d4c.b7dcb3","2221e1ef.b87a1e","579d777b.8d2698"]]},{"id":"fb350ce9.a1d8a","type":"switchNode","name":"release entitlement?","xml":"<switch test='`$is.release-entitlement.require`'>\n","comments":"","outputs":1,"x":381,"y":432,"z":"5c9ed2bf.7c802c","wires":[["97efa41.9e60358"]]},{"id":"97efa41.9e60358","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":555,"y":432,"z":"5c9ed2bf.7c802c","wires":[["57f1d3d6.35cebc"]]},{"id":"d7e6d28b.9fa3f","type":"switchNode","name":"release license?","xml":"<switch test='`$is.release-license.require`'>\n","comments":"","outputs":1,"x":374,"y":557,"z":"5c9ed2bf.7c802c","wires":[["ea6be629.2eb328"]]},{"id":"ea6be629.2eb328","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":548,"y":557,"z":"5c9ed2bf.7c802c","wires":[["4e053a22.9bacc4"]]},{"id":"8bea9f7.6b8d26","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.entitlement-resource-uuid' value='`$asset-tag`' />\n\t<parameter name='aai.input.data.entitlement-assignment-group-uuid' value='`$aai.uuid`' />\n\n","comments":"","outputs":1,"x":1996,"y":307,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"579d777b.8d2698","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.license-key-uuid' value='`$asset-tag`' />\n\t<parameter name='aai.input.data.license-key' value='`$license-key`' />\n\t<parameter name='aai.input.data.license-assignment-group-uuid' value='`$aai.uuid`' />\n","comments":"","outputs":1,"x":1964,"y":566,"z":"5c9ed2bf.7c802c","wires":[[]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.0.json
index 6109b50fd..6b2b00140 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.0.json
@@ -1 +1 @@
-[{"id":"763764f9.79221c","type":"execute","name":"execute: retrieveDSConfiguration","xml":"<execute plugin='org.openecomp.appc.dg.netconf.NetconfDBPlugin' method='retrieveDSConfiguration' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"vnf-type\" value=\"`$vnf-type`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n","comments":"","outputs":1,"x":395.9444122314453,"y":491.0000457763672,"z":"fb913a7d.732918","wires":[["2539510.b9781b","2e1dc2b0.977cce"]]},{"id":"2539510.b9781b","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":628.6111602783203,"y":549.2222442626953,"z":"fb913a7d.732918","wires":[["4d592641.1595d8"]]},{"id":"2e1dc2b0.977cce","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":625.7221832275391,"y":513.7778167724609,"z":"fb913a7d.732918","wires":[["eca6713a.6394e"]]},{"id":"4d592641.1595d8","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.openecomp.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":630.3888702392578,"y":613.2222137451172,"z":"fb913a7d.732918","wires":[["7c24254c.c9cb7c","7b464568.a7055c"]]},{"id":"7c24254c.c9cb7c","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":859.9444122314453,"y":578.4444732666016,"z":"fb913a7d.732918","wires":[["eca6713a.6394e"]]},{"id":"7b464568.a7055c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":856.2779083251953,"y":625.2222137451172,"z":"fb913a7d.732918","wires":[["b09004a6.ff6eb8"]]},{"id":"b09004a6.ff6eb8","type":"execute","name":"execute: modifyConfiguration","xml":"<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='modifyConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"file-content\" value=\"`$file-content`\" />\n","comments":"","outputs":1,"x":723.0556182861328,"y":707.5554962158203,"z":"fb913a7d.732918","wires":[["f7c16fb0.faea8","bca9252e.3c05d8"]]},{"id":"f7c16fb0.faea8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":940.9444122314453,"y":687.8889312744141,"z":"fb913a7d.732918","wires":[["eca6713a.6394e"]]},{"id":"bca9252e.3c05d8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":945.1667022705078,"y":731.7777862548828,"z":"fb913a7d.732918","wires":[["5c0381d4.bfb8a"]]},{"id":"cbb153f7.c399","type":"execute","name":"execute: backupConfiguration","xml":"<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='backupConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n","comments":"","outputs":1,"x":850.2776641845703,"y":927.9999542236328,"z":"fb913a7d.732918","wires":[["d8669e30.15c2d","579be757.32a7d8"]]},{"id":"d8669e30.15c2d","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1059.3888702392578,"y":903.7777862548828,"z":"fb913a7d.732918","wires":[["eca6713a.6394e"]]},{"id":"579be757.32a7d8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1063.9445343017578,"y":948.3333282470703,"z":"fb913a7d.732918","wires":[["a45f0f06.775bf"]]},{"id":"a45f0f06.775bf","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n \t<parameter name='error-code' value='200' />","comments":"","x":1358.5001678466797,"y":947.4445037841797,"z":"fb913a7d.732918","wires":[]},{"id":"eca6713a.6394e","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.openecomp.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1240.1667938232422,"y":520.3333740234375,"z":"fb913a7d.732918","wires":[["b7cefeae.7ab6c"]]},{"id":"5c0381d4.bfb8a","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.openecomp.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":728.6110992431641,"y":797.0000839233398,"z":"fb913a7d.732918","wires":[["420c3d12.5c9364","32e323ab.c2e17c"]]},{"id":"32e323ab.c2e17c","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":959.3888702392578,"y":832.7778549194336,"z":"fb913a7d.732918","wires":[["eca6713a.6394e"]]},{"id":"420c3d12.5c9364","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":956.2778472900391,"y":870.2222518920898,"z":"fb913a7d.732918","wires":[["cbb153f7.c399"]]},{"id":"91ad9785.d2b408","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"`$org.openecomp.appc.dg.error`\" />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1590.7541046142578,"y":521.857177734375,"z":"fb913a7d.732918","wires":[]},{"id":"4edf3002.1258d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":238.6111297607422,"y":356.9999694824219,"z":"fb913a7d.732918","wires":[["20a6444f.9a5ebc"]]},{"id":"a15e7bed.f739b8","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >","comments":"","outputs":1,"x":254.6110076904297,"y":293.00006103515625,"z":"fb913a7d.732918","wires":[["4edf3002.1258d","3e864fff.be3c7"]]},{"id":"db7b3768.a07988","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":187.6111297607422,"y":232.00003051757812,"z":"fb913a7d.732918","wires":[["a15e7bed.f739b8","f2b5aee5.b9b0d"]]},{"id":"3e864fff.be3c7","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":569.6111297607422,"y":286.3332824707031,"z":"fb913a7d.732918","wires":[["be8ced87.d162c"]]},{"id":"f2b5aee5.b9b0d","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value='`$org.openecomp.appc.vfid`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":412.6111297607422,"y":169.00003051757812,"z":"fb913a7d.732918","wires":[]},{"id":"88e1659f.7fb148","type":"method","name":"VSBG_ConfigModify","xml":"<method rpc='VSBG_ConfigModify' mode='sync'>\n","comments":"","outputs":1,"x":145.5,"y":167.77777099609375,"z":"fb913a7d.732918","wires":[["db7b3768.a07988"]]},{"id":"be8ced87.d162c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":724.6111297607422,"y":286.3332824707031,"z":"fb913a7d.732918","wires":[]},{"id":"bf1e84f5.1bc6d8","type":"service-logic","name":"Appc-API 2.0.0.0","module":"Appc-API","version":"2.0.0.0","comments":"test service logic","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='2.0.0.0'>","outputs":1,"x":86.5,"y":123.55555725097656,"z":"fb913a7d.732918","wires":[["88e1659f.7fb148"]]},{"id":"61be8d43.488194","type":"dgstart","name":"DGSTART","outputs":1,"x":75.61112976074219,"y":50,"z":"fb913a7d.732918","wires":[["bf1e84f5.1bc6d8"]]},{"id":"d521598b.c7a468","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.openecomp.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />","comments":"","x":528.6111297607422,"y":426,"z":"fb913a7d.732918","wires":[]},{"id":"20a6444f.9a5ebc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":303.6111297607422,"y":427,"z":"fb913a7d.732918","wires":[["d521598b.c7a468","763764f9.79221c"]]},{"id":"b7cefeae.7ab6c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1441.9444122314453,"y":522,"z":"fb913a7d.732918","wires":[["91ad9785.d2b408"]]}]
+[{"id":"763764f9.79221c","type":"execute","name":"execute: retrieveDSConfiguration","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfDBPlugin' method='retrieveDSConfiguration' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"vnf-type\" value=\"`$vnf-type`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n","comments":"","outputs":1,"x":395.9444122314453,"y":491.0000457763672,"z":"fb913a7d.732918","wires":[["2539510.b9781b","2e1dc2b0.977cce"]]},{"id":"2539510.b9781b","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":628.6111602783203,"y":549.2222442626953,"z":"fb913a7d.732918","wires":[["4d592641.1595d8"]]},{"id":"2e1dc2b0.977cce","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":625.7221832275391,"y":513.7778167724609,"z":"fb913a7d.732918","wires":[["eca6713a.6394e"]]},{"id":"4d592641.1595d8","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":630.3888702392578,"y":613.2222137451172,"z":"fb913a7d.732918","wires":[["7c24254c.c9cb7c","7b464568.a7055c"]]},{"id":"7c24254c.c9cb7c","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":859.9444122314453,"y":578.4444732666016,"z":"fb913a7d.732918","wires":[["eca6713a.6394e"]]},{"id":"7b464568.a7055c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":856.2779083251953,"y":625.2222137451172,"z":"fb913a7d.732918","wires":[["b09004a6.ff6eb8"]]},{"id":"b09004a6.ff6eb8","type":"execute","name":"execute: modifyConfiguration","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='modifyConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"file-content\" value=\"`$file-content`\" />\n","comments":"","outputs":1,"x":723.0556182861328,"y":707.5554962158203,"z":"fb913a7d.732918","wires":[["f7c16fb0.faea8","bca9252e.3c05d8"]]},{"id":"f7c16fb0.faea8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":940.9444122314453,"y":687.8889312744141,"z":"fb913a7d.732918","wires":[["eca6713a.6394e"]]},{"id":"bca9252e.3c05d8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":945.1667022705078,"y":731.7777862548828,"z":"fb913a7d.732918","wires":[["5c0381d4.bfb8a"]]},{"id":"cbb153f7.c399","type":"execute","name":"execute: backupConfiguration","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='backupConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n","comments":"","outputs":1,"x":850.2776641845703,"y":927.9999542236328,"z":"fb913a7d.732918","wires":[["d8669e30.15c2d","579be757.32a7d8"]]},{"id":"d8669e30.15c2d","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1059.3888702392578,"y":903.7777862548828,"z":"fb913a7d.732918","wires":[["eca6713a.6394e"]]},{"id":"579be757.32a7d8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1063.9445343017578,"y":948.3333282470703,"z":"fb913a7d.732918","wires":[["a45f0f06.775bf"]]},{"id":"a45f0f06.775bf","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n \t<parameter name='error-code' value='200' />","comments":"","x":1358.5001678466797,"y":947.4445037841797,"z":"fb913a7d.732918","wires":[]},{"id":"eca6713a.6394e","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1240.1667938232422,"y":520.3333740234375,"z":"fb913a7d.732918","wires":[["b7cefeae.7ab6c"]]},{"id":"5c0381d4.bfb8a","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":728.6110992431641,"y":797.0000839233398,"z":"fb913a7d.732918","wires":[["420c3d12.5c9364","32e323ab.c2e17c"]]},{"id":"32e323ab.c2e17c","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":959.3888702392578,"y":832.7778549194336,"z":"fb913a7d.732918","wires":[["eca6713a.6394e"]]},{"id":"420c3d12.5c9364","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":956.2778472900391,"y":870.2222518920898,"z":"fb913a7d.732918","wires":[["cbb153f7.c399"]]},{"id":"91ad9785.d2b408","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.dg.error`\" />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1590.7541046142578,"y":521.857177734375,"z":"fb913a7d.732918","wires":[]},{"id":"4edf3002.1258d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":238.6111297607422,"y":356.9999694824219,"z":"fb913a7d.732918","wires":[["20a6444f.9a5ebc"]]},{"id":"a15e7bed.f739b8","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >","comments":"","outputs":1,"x":254.6110076904297,"y":293.00006103515625,"z":"fb913a7d.732918","wires":[["4edf3002.1258d","3e864fff.be3c7"]]},{"id":"db7b3768.a07988","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":187.6111297607422,"y":232.00003051757812,"z":"fb913a7d.732918","wires":[["a15e7bed.f739b8","f2b5aee5.b9b0d"]]},{"id":"3e864fff.be3c7","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":569.6111297607422,"y":286.3332824707031,"z":"fb913a7d.732918","wires":[["be8ced87.d162c"]]},{"id":"f2b5aee5.b9b0d","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value='`$org.onap.appc.vfid`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":412.6111297607422,"y":169.00003051757812,"z":"fb913a7d.732918","wires":[]},{"id":"88e1659f.7fb148","type":"method","name":"VSBG_ConfigModify","xml":"<method rpc='VSBG_ConfigModify' mode='sync'>\n","comments":"","outputs":1,"x":145.5,"y":167.77777099609375,"z":"fb913a7d.732918","wires":[["db7b3768.a07988"]]},{"id":"be8ced87.d162c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":724.6111297607422,"y":286.3332824707031,"z":"fb913a7d.732918","wires":[]},{"id":"bf1e84f5.1bc6d8","type":"service-logic","name":"Appc-API 2.0.0.0","module":"Appc-API","version":"2.0.0.0","comments":"test service logic","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='2.0.0.0'>","outputs":1,"x":86.5,"y":123.55555725097656,"z":"fb913a7d.732918","wires":[["88e1659f.7fb148"]]},{"id":"61be8d43.488194","type":"dgstart","name":"DGSTART","outputs":1,"x":75.61112976074219,"y":50,"z":"fb913a7d.732918","wires":[["bf1e84f5.1bc6d8"]]},{"id":"d521598b.c7a468","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.onap.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />","comments":"","x":528.6111297607422,"y":426,"z":"fb913a7d.732918","wires":[]},{"id":"20a6444f.9a5ebc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":303.6111297607422,"y":427,"z":"fb913a7d.732918","wires":[["d521598b.c7a468","763764f9.79221c"]]},{"id":"b7cefeae.7ab6c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1441.9444122314453,"y":522,"z":"fb913a7d.732918","wires":[["91ad9785.d2b408"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.1.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.1.json
index 8dd556b31..2ca19723b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.1.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.1.json
@@ -1 +1 @@
-[{"id":"6e90cbf4.57f244","type":"execute","name":"execute: retrieveDSConfiguration","xml":"<execute plugin='org.openecomp.appc.dg.netconf.NetconfDBPlugin' method='retrieveDSConfiguration' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"vnf-type\" value=\"`$vnf-type`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n","comments":"","outputs":1,"x":459.9444122314453,"y":572.0000457763672,"z":"2154d119.c59cae","wires":[["38318271.82e40e","5435f9ee.d438b8"]]},{"id":"38318271.82e40e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":691.6111602783203,"y":630.2222366333008,"z":"2154d119.c59cae","wires":[["a5fd395b.4ff8d8"]]},{"id":"5435f9ee.d438b8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":688.7221832275391,"y":594.7778091430664,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"a5fd395b.4ff8d8","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.openecomp.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":693.3888702392578,"y":694.2222061157227,"z":"2154d119.c59cae","wires":[["7649ccd1.4bdf84","740ae685.f59378"]]},{"id":"7649ccd1.4bdf84","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":922.9444122314453,"y":659.444465637207,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"740ae685.f59378","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":919.2779083251953,"y":706.2222061157227,"z":"2154d119.c59cae","wires":[["3efc3f7e.f0b8a"]]},{"id":"3efc3f7e.f0b8a","type":"execute","name":"execute: modifyConfiguration","xml":"<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='modifyConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"file-content\" value=\"`$file-content`\" />\n","comments":"","outputs":1,"x":786.0556182861328,"y":788.5554885864258,"z":"2154d119.c59cae","wires":[["25e0354c.1ecdca","1da66879.acaae8"]]},{"id":"25e0354c.1ecdca","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1003.9444122314453,"y":768.8889236450195,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"1da66879.acaae8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1008.1667022705078,"y":812.7777786254883,"z":"2154d119.c59cae","wires":[["ed4bb0ee.a817b"]]},{"id":"4cf1e455.d66afc","type":"execute","name":"execute: backupConfiguration","xml":"<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='backupConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n","comments":"","outputs":1,"x":913.2776641845703,"y":1008.9999465942383,"z":"2154d119.c59cae","wires":[["b404baeb.0bde98","9b814969.6f3608"]]},{"id":"b404baeb.0bde98","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1122.3888702392578,"y":984.7777786254883,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"9b814969.6f3608","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1126.9445343017578,"y":1029.3333206176758,"z":"2154d119.c59cae","wires":[["e3c4236.d2566e"]]},{"id":"e3c4236.d2566e","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n \t<parameter name='error-code' value='200' />","comments":"","x":1421.5001678466797,"y":1028.4444961547852,"z":"2154d119.c59cae","wires":[]},{"id":"7849e9fc.2f1158","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.openecomp.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1303.1667938232422,"y":601.333366394043,"z":"2154d119.c59cae","wires":[["c37ed5f7.c740d8"]]},{"id":"9dbac36f.19414","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.openecomp.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":783.6110992431641,"y":926.0000839233398,"z":"2154d119.c59cae","wires":[["ee5204f1.5fc5a8","f3c87dda.9f642"]]},{"id":"f3c87dda.9f642","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1022.3888702392578,"y":913.7778472900391,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"ee5204f1.5fc5a8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1019.2778472900391,"y":951.2222442626953,"z":"2154d119.c59cae","wires":[["4cf1e455.d66afc"]]},{"id":"31e43d90.09d0a2","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"`$org.openecomp.appc.dg.error`\" />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1654.7541046142578,"y":600.857177734375,"z":"2154d119.c59cae","wires":[]},{"id":"be651903.a128e8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":301.6111297607422,"y":437.99996185302734,"z":"2154d119.c59cae","wires":[["ab704a00.f6bbb8"]]},{"id":"a790a4ce.9e7338","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >","comments":"","outputs":1,"x":317.6110076904297,"y":374.0000534057617,"z":"2154d119.c59cae","wires":[["be651903.a128e8","c1565864.3b15e8"]]},{"id":"77c31558.fceebc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":250.6111297607422,"y":313.0000228881836,"z":"2154d119.c59cae","wires":[["a790a4ce.9e7338","2404d9f.4f73826"]]},{"id":"c1565864.3b15e8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":632.6111297607422,"y":367.3332748413086,"z":"2154d119.c59cae","wires":[["5c6f5002.5ff8"]]},{"id":"2404d9f.4f73826","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":450.6111297607422,"y":271.0000228881836,"z":"2154d119.c59cae","wires":[]},{"id":"595cefd2.9c438","type":"method","name":"VSBG_ConfigModify","xml":"<method rpc='VSBG_ConfigModify' mode='sync'>\n","comments":"","outputs":1,"x":145.5,"y":155.77777099609375,"z":"2154d119.c59cae","wires":[["e9fea7b9.249258"]]},{"id":"5c6f5002.5ff8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":787.6111297607422,"y":367.3332748413086,"z":"2154d119.c59cae","wires":[]},{"id":"47fccc9e.8c4124","type":"service-logic","name":"Appc-API 2.0.0.1","module":"Appc-API","version":"2.0.0.1","comments":"test service logic","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='2.0.0.1'>","outputs":1,"x":86.5,"y":111.55555725097656,"z":"2154d119.c59cae","wires":[["595cefd2.9c438"]]},{"id":"b1b41791.e43b18","type":"dgstart","name":"DGSTART","outputs":1,"x":75.61112976074219,"y":38,"z":"2154d119.c59cae","wires":[["47fccc9e.8c4124"]]},{"id":"62fb4de8.cacb14","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.openecomp.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />","comments":"","x":591.6111297607422,"y":506.99999237060547,"z":"2154d119.c59cae","wires":[]},{"id":"ab704a00.f6bbb8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":366.6111297607422,"y":507.99999237060547,"z":"2154d119.c59cae","wires":[["62fb4de8.cacb14","6e90cbf4.57f244"]]},{"id":"e9fea7b9.249258","type":"execute","name":"execute: flatAndAddToContext","xml":"<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />","comments":"","outputs":1,"x":231.2777557373047,"y":229.6666488647461,"z":"2154d119.c59cae","wires":[["1b3a064b.30350a","7eab1cec.af2814"]]},{"id":"1b3a064b.30350a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":243.9444122314453,"y":273.6666488647461,"z":"2154d119.c59cae","wires":[["77c31558.fceebc"]]},{"id":"7eab1cec.af2814","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":470.9444122314453,"y":130.66666412353516,"z":"2154d119.c59cae","wires":[[]]},{"id":"ed4bb0ee.a817b","type":"execute","name":"Report_Success_in_ModifyConfig","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"ModifyConfig event executed successfully\" />","comments":"","outputs":1,"x":766.9443511962891,"y":843.6667098999023,"z":"2154d119.c59cae","wires":[["2c09cc84.3d9894","f4239d49.350f8"]]},{"id":"2c09cc84.3d9894","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":704.9444122314453,"y":892.6667098999023,"z":"2154d119.c59cae","wires":[["9dbac36f.19414"]]},{"id":"f4239d49.350f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1027.9444122314453,"y":859.6667098999023,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"c37ed5f7.c740d8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1506.9444122314453,"y":601,"z":"2154d119.c59cae","wires":[["31e43d90.09d0a2"]]}]
+[{"id":"6e90cbf4.57f244","type":"execute","name":"execute: retrieveDSConfiguration","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfDBPlugin' method='retrieveDSConfiguration' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"vnf-type\" value=\"`$vnf-type`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n","comments":"","outputs":1,"x":459.9444122314453,"y":572.0000457763672,"z":"2154d119.c59cae","wires":[["38318271.82e40e","5435f9ee.d438b8"]]},{"id":"38318271.82e40e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":691.6111602783203,"y":630.2222366333008,"z":"2154d119.c59cae","wires":[["a5fd395b.4ff8d8"]]},{"id":"5435f9ee.d438b8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":688.7221832275391,"y":594.7778091430664,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"a5fd395b.4ff8d8","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":693.3888702392578,"y":694.2222061157227,"z":"2154d119.c59cae","wires":[["7649ccd1.4bdf84","740ae685.f59378"]]},{"id":"7649ccd1.4bdf84","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":922.9444122314453,"y":659.444465637207,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"740ae685.f59378","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":919.2779083251953,"y":706.2222061157227,"z":"2154d119.c59cae","wires":[["3efc3f7e.f0b8a"]]},{"id":"3efc3f7e.f0b8a","type":"execute","name":"execute: modifyConfiguration","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='modifyConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"file-content\" value=\"`$file-content`\" />\n","comments":"","outputs":1,"x":786.0556182861328,"y":788.5554885864258,"z":"2154d119.c59cae","wires":[["25e0354c.1ecdca","1da66879.acaae8"]]},{"id":"25e0354c.1ecdca","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1003.9444122314453,"y":768.8889236450195,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"1da66879.acaae8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1008.1667022705078,"y":812.7777786254883,"z":"2154d119.c59cae","wires":[["ed4bb0ee.a817b"]]},{"id":"4cf1e455.d66afc","type":"execute","name":"execute: backupConfiguration","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='backupConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n","comments":"","outputs":1,"x":913.2776641845703,"y":1008.9999465942383,"z":"2154d119.c59cae","wires":[["b404baeb.0bde98","9b814969.6f3608"]]},{"id":"b404baeb.0bde98","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1122.3888702392578,"y":984.7777786254883,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"9b814969.6f3608","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1126.9445343017578,"y":1029.3333206176758,"z":"2154d119.c59cae","wires":[["e3c4236.d2566e"]]},{"id":"e3c4236.d2566e","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n \t<parameter name='error-code' value='200' />","comments":"","x":1421.5001678466797,"y":1028.4444961547852,"z":"2154d119.c59cae","wires":[]},{"id":"7849e9fc.2f1158","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1303.1667938232422,"y":601.333366394043,"z":"2154d119.c59cae","wires":[["c37ed5f7.c740d8"]]},{"id":"9dbac36f.19414","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":783.6110992431641,"y":926.0000839233398,"z":"2154d119.c59cae","wires":[["ee5204f1.5fc5a8","f3c87dda.9f642"]]},{"id":"f3c87dda.9f642","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1022.3888702392578,"y":913.7778472900391,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"ee5204f1.5fc5a8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1019.2778472900391,"y":951.2222442626953,"z":"2154d119.c59cae","wires":[["4cf1e455.d66afc"]]},{"id":"31e43d90.09d0a2","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.dg.error`\" />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1654.7541046142578,"y":600.857177734375,"z":"2154d119.c59cae","wires":[]},{"id":"be651903.a128e8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":301.6111297607422,"y":437.99996185302734,"z":"2154d119.c59cae","wires":[["ab704a00.f6bbb8"]]},{"id":"a790a4ce.9e7338","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >","comments":"","outputs":1,"x":317.6110076904297,"y":374.0000534057617,"z":"2154d119.c59cae","wires":[["be651903.a128e8","c1565864.3b15e8"]]},{"id":"77c31558.fceebc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":250.6111297607422,"y":313.0000228881836,"z":"2154d119.c59cae","wires":[["a790a4ce.9e7338","2404d9f.4f73826"]]},{"id":"c1565864.3b15e8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":632.6111297607422,"y":367.3332748413086,"z":"2154d119.c59cae","wires":[["5c6f5002.5ff8"]]},{"id":"2404d9f.4f73826","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":450.6111297607422,"y":271.0000228881836,"z":"2154d119.c59cae","wires":[]},{"id":"595cefd2.9c438","type":"method","name":"VSBG_ConfigModify","xml":"<method rpc='VSBG_ConfigModify' mode='sync'>\n","comments":"","outputs":1,"x":145.5,"y":155.77777099609375,"z":"2154d119.c59cae","wires":[["e9fea7b9.249258"]]},{"id":"5c6f5002.5ff8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":787.6111297607422,"y":367.3332748413086,"z":"2154d119.c59cae","wires":[]},{"id":"47fccc9e.8c4124","type":"service-logic","name":"Appc-API 2.0.0.1","module":"Appc-API","version":"2.0.0.1","comments":"test service logic","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='2.0.0.1'>","outputs":1,"x":86.5,"y":111.55555725097656,"z":"2154d119.c59cae","wires":[["595cefd2.9c438"]]},{"id":"b1b41791.e43b18","type":"dgstart","name":"DGSTART","outputs":1,"x":75.61112976074219,"y":38,"z":"2154d119.c59cae","wires":[["47fccc9e.8c4124"]]},{"id":"62fb4de8.cacb14","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.onap.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />","comments":"","x":591.6111297607422,"y":506.99999237060547,"z":"2154d119.c59cae","wires":[]},{"id":"ab704a00.f6bbb8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":366.6111297607422,"y":507.99999237060547,"z":"2154d119.c59cae","wires":[["62fb4de8.cacb14","6e90cbf4.57f244"]]},{"id":"e9fea7b9.249258","type":"execute","name":"execute: flatAndAddToContext","xml":"<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />","comments":"","outputs":1,"x":231.2777557373047,"y":229.6666488647461,"z":"2154d119.c59cae","wires":[["1b3a064b.30350a","7eab1cec.af2814"]]},{"id":"1b3a064b.30350a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":243.9444122314453,"y":273.6666488647461,"z":"2154d119.c59cae","wires":[["77c31558.fceebc"]]},{"id":"7eab1cec.af2814","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":470.9444122314453,"y":130.66666412353516,"z":"2154d119.c59cae","wires":[[]]},{"id":"ed4bb0ee.a817b","type":"execute","name":"Report_Success_in_ModifyConfig","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"ModifyConfig event executed successfully\" />","comments":"","outputs":1,"x":766.9443511962891,"y":843.6667098999023,"z":"2154d119.c59cae","wires":[["2c09cc84.3d9894","f4239d49.350f8"]]},{"id":"2c09cc84.3d9894","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":704.9444122314453,"y":892.6667098999023,"z":"2154d119.c59cae","wires":[["9dbac36f.19414"]]},{"id":"f4239d49.350f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1027.9444122314453,"y":859.6667098999023,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"c37ed5f7.c740d8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1506.9444122314453,"y":601,"z":"2154d119.c59cae","wires":[["31e43d90.09d0a2"]]}]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ModifyConfig_2.0.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ModifyConfig_2.0.0.0.json
index 2b7bd7b0b..b6e1c2c31 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ModifyConfig_2.0.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ModifyConfig_2.0.0.0.json
@@ -3,7 +3,7 @@
         "id": "4656b037.e2db1",
         "type": "execute",
         "name": "execute: retrieveDSConfiguration",
-        "xml": "<execute plugin='org.openecomp.appc.dg.netconf.NetconfDBPlugin' method='retrieveDSConfiguration' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"vnf-type\" value=\"`$vnf-type`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfDBPlugin' method='retrieveDSConfiguration' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"vnf-type\" value=\"`$vnf-type`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 429,
@@ -52,7 +52,7 @@
         "id": "e4f5112d.b940f",
         "type": "execute",
         "name": "execute: operationStateValidation",
-        "xml": "<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.openecomp.appc.vftype\" value=\"`$vnf-type`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 663.4444580078125,
@@ -101,7 +101,7 @@
         "id": "a1def214.72c9f",
         "type": "execute",
         "name": "execute: modifyConfiguration",
-        "xml": "<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='modifyConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"file-content\" value=\"`$file-content`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='modifyConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"file-content\" value=\"`$file-content`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 756.1112060546875,
@@ -150,7 +150,7 @@
         "id": "69e22825.1a9578",
         "type": "execute",
         "name": "execute: backupConfiguration",
-        "xml": "<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='backupConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='backupConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 883.333251953125,
@@ -210,7 +210,7 @@
         "id": "730fdfb2.bc4ac",
         "type": "execute",
         "name": "execute: handleErrorToDCAE",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.openecomp.appc.dg.error`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.onap.appc.dg.error`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 1273.2223815917969,
@@ -226,7 +226,7 @@
         "id": "abf49643.479788",
         "type": "execute",
         "name": "execute: operationStateValidation",
-        "xml": "<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.openecomp.appc.vftype\" value=\"`$vnf-type`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 761.6666870117188,
@@ -275,7 +275,7 @@
         "id": "a8a21041.bd0a1",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"`$org.openecomp.appc.dg.error`\" />\n<parameter name='output.status.code' value='401'/>\n",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.code' value='401'/>\n",
         "comments": "",
         "x": 1623.8096923828125,
         "y": 531.857177734375,
@@ -302,7 +302,7 @@
         "id": "3724e729.81d9f8",
         "type": "execute",
         "name": "execute: getVNFData",
-        "xml": "<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >",
+        "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >",
         "comments": "",
         "outputs": 1,
         "x": 287.6665954589844,
@@ -353,7 +353,7 @@
         "id": "a9055b0c.089ba8",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n\t<parameter name='aai.vnfID' value='`$org.openecomp.appc.vfid`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t",
+        "xml": "<set>\n\t<parameter name='aai.vnfID' value='`$org.onap.appc.vfid`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t",
         "comments": "",
         "x": 445.6667175292969,
         "y": 179.00003051757812,
@@ -423,7 +423,7 @@
         "id": "6f262e5b.8106d",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n\t<parameter name='org.openecomp.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />",
+        "xml": "<set>\n\t<parameter name='org.onap.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />",
         "comments": "",
         "x": 561.6667175292969,
         "y": 436,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ModifyConfig_2.0.0.1.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ModifyConfig_2.0.0.1.json
index e38cc207a..6787a52ec 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ModifyConfig_2.0.0.1.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ModifyConfig_2.0.0.1.json
@@ -3,7 +3,7 @@
         "id": "7803fc.b785cc04",
         "type": "execute",
         "name": "execute: retrieveDSConfiguration",
-        "xml": "<execute plugin='org.openecomp.appc.dg.netconf.NetconfDBPlugin' method='retrieveDSConfiguration' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"vnf-type\" value=\"`$vnf-type`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfDBPlugin' method='retrieveDSConfiguration' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"vnf-type\" value=\"`$vnf-type`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 497,
@@ -52,7 +52,7 @@
         "id": "41d228d8.8ed518",
         "type": "execute",
         "name": "execute: operationStateValidation",
-        "xml": "<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.openecomp.appc.vftype\" value=\"`$vnf-type`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 730.4444580078125,
@@ -101,7 +101,7 @@
         "id": "e6a1550.e281ca8",
         "type": "execute",
         "name": "execute: modifyConfiguration",
-        "xml": "<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='modifyConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"file-content\" value=\"`$file-content`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='modifyConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"file-content\" value=\"`$file-content`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 823.1112060546875,
@@ -150,7 +150,7 @@
         "id": "fb0deae.818b418",
         "type": "execute",
         "name": "execute: backupConfiguration",
-        "xml": "<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='backupConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='backupConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 950.333251953125,
@@ -210,7 +210,7 @@
         "id": "e305119d.ed993",
         "type": "execute",
         "name": "execute: handleErrorToDCAE",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.openecomp.appc.dg.error\" value=\"`$org.openecomp.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.openecomp.appc.dg.error`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.onap.appc.dg.error`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 1340.2223815917969,
@@ -226,7 +226,7 @@
         "id": "8c61f324.ae24",
         "type": "execute",
         "name": "execute: operationStateValidation",
-        "xml": "<execute plugin='org.openecomp.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.openecomp.appc.vftype\" value=\"`$vnf-type`\" />\n",
+        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n",
         "comments": "",
         "outputs": 1,
         "x": 820.6666870117188,
@@ -275,7 +275,7 @@
         "id": "1a23a9aa.d63826",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"`$org.openecomp.appc.dg.error`\" />\n<parameter name='output.status.code' value='401'/>\n",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.code' value='401'/>\n",
         "comments": "",
         "x": 1691.8096923828125,
         "y": 630.857177734375,
@@ -302,7 +302,7 @@
         "id": "12f26606.82d0fa",
         "type": "execute",
         "name": "execute: getVNFData",
-        "xml": "<execute plugin='org.openecomp.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >",
+        "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >",
         "comments": "",
         "outputs": 1,
         "x": 354.6665954589844,
@@ -423,7 +423,7 @@
         "id": "e0a9dcc8.bb81a",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n\t<parameter name='org.openecomp.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />",
+        "xml": "<set>\n\t<parameter name='org.onap.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />",
         "comments": "",
         "x": 628.6667175292969,
         "y": 536.9999923706055,
@@ -452,7 +452,7 @@
         "id": "8e0514c2.f1c608",
         "type": "execute",
         "name": "execute: flatAndAddToContext",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
         "comments": "",
         "outputs": 1,
         "x": 268.3333435058594,
@@ -499,7 +499,7 @@
         "id": "2c1a225a.7bc46e",
         "type": "execute",
         "name": "Report_Success_in_ModifyConfig",
-        "xml": "<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"ModifyConfig event executed successfully\" />",
+        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"ModifyConfig event executed successfully\" />",
         "comments": "",
         "outputs": 1,
         "x": 803.9999389648438,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestCheckConfigStatus.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestCheckConfigStatus.java
index 7bddbc50b..a64d0eb36 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestCheckConfigStatus.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestCheckConfigStatus.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg;
+package org.onap.appc.dg;
 
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.openecomp.appc.dg.mock.instance.MockConfigureNodeExecutor;
-import org.openecomp.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
+import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor;
+import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 
 /* TODO:  move the dgtest to opensource
 import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase;
@@ -123,7 +123,7 @@ public class TestCheckConfigStatus /* extends AbstractDGTestCase */ {
 			String injectGraphXmls[] = new String[] { CheckConfigStatusXML };
 
 			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-			serviceReferences.put("org.openecomp.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor());
+			serviceReferences.put("org.onap.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor());
 		
 			GraphKey  graphKey = new GraphKey("APPC", null, "CheckConfigStatus", null);
 			DGTestCase tc = new DGTestCase(graphKey);
@@ -156,7 +156,7 @@ public class TestCheckConfigStatus /* extends AbstractDGTestCase */ {
 			String injectGraphXmls[] = new String[] { CheckConfigStatusXML };
 
 			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-			serviceReferences.put("org.openecomp.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor());
+			serviceReferences.put("org.onap.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor());
 		
 			GraphKey  graphKey = new GraphKey("APPC", null, "CheckConfigStatus", null);
 			DGTestCase tc = new DGTestCase(graphKey);
@@ -190,7 +190,7 @@ public class TestCheckConfigStatus /* extends AbstractDGTestCase */ {
 			String injectGraphXmls[] = new String[] { CheckConfigStatusXML };
 
 			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-			serviceReferences.put("org.openecomp.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor());
+			serviceReferences.put("org.onap.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor());
 		
 			GraphKey  graphKey = new GraphKey("APPC", null, "CheckConfigStatus", null);
 			DGTestCase tc = new DGTestCase(graphKey);
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestCommonConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestCommonConfig.java
index a1fde20cb..cd2b9d223 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestCommonConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestCommonConfig.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg;
+package org.onap.appc.dg;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.openecomp.appc.dg.mock.instance.MockConfigureNodeExecutor;
-import org.openecomp.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
+import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor;
+import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 import org.openecomp.sdnc.config.generator.convert.ConvertNode;
 import org.openecomp.sdnc.config.generator.merge.MergeNode;
 /*  move to open source
@@ -72,7 +72,7 @@ public class TestCommonConfig /* extends AbstractDGTestCase */ {
 			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("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode());
-			serviceReferences.put("org.openecomp.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor());
+			serviceReferences.put("org.onap.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor());
 
 			GraphKey  graphKey = new GraphKey("APPC", null, "CommonConfiguration", null);
 			DGTestCase tc = new DGTestCase(graphKey);
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestConfigurationDocumentRequest.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestConfigurationDocumentRequest.java
index 277803cc3..a4592e72e 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestConfigurationDocumentRequest.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestConfigurationDocumentRequest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg;
+package org.onap.appc.dg;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestConfigure.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestConfigure.java
index e4c6c109c..052ad7848 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestConfigure.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestConfigure.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg;
+package org.onap.appc.dg;
 
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.openecomp.appc.dg.mock.instance.MockConfigureNodeExecutor;
-import org.openecomp.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
+import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor;
+import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 
 /* need to move to open source
 import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestDownloadCliConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestDownloadCliConfig.java
index 6c4373a4a..782493c2d 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestDownloadCliConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestDownloadCliConfig.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg;
+package org.onap.appc.dg;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestDownloadIsbcConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestDownloadIsbcConfig.java
index 8a211bbf9..92e39e862 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestDownloadIsbcConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestDownloadIsbcConfig.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg;
+package org.onap.appc.dg;
 
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.openecomp.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
+import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 
 /* need to move to open source
 import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGenerateConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGenerateConfig.java
index fe50c9fb4..f329d6b6c 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGenerateConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGenerateConfig.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg;
+package org.onap.appc.dg;
 
 
 import static org.junit.Assert.*;
@@ -29,8 +29,8 @@ import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.appc.dg.mock.instance.MockConfigureNodeExecutor;
-import org.openecomp.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
+import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor;
+import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.powermock.api.mockito.PowerMockito;
@@ -71,7 +71,7 @@ public class TestGenerateConfig /* extends AbstractDGTestCase */ {
 			serviceReferences.put("org.openecomp.sdnc.config.generator.merge.MergeNode", new org.openecomp.sdnc.config.generator.merge.MergeNode());
 			//serviceReferences.put("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode());
 			
-			serviceReferences.put("org.openecomp.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
+			serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
 
 		
 			GraphKey  graphKey = new GraphKey("APPC", null, "GenerateConfig", null);
@@ -108,7 +108,7 @@ public class TestGenerateConfig /* extends AbstractDGTestCase */ {
 			serviceReferences.put("org.openecomp.sdnc.config.generator.merge.MergeNode", new org.openecomp.sdnc.config.generator.merge.MergeNode());
 			//serviceReferences.put("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode());
 			
-			serviceReferences.put("org.openecomp.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
+			serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
 
 
 			GraphKey  graphKey = new GraphKey("APPC", null, "GenerateConfig", null);
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGenerateTemplateConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGenerateTemplateConfig.java
index 444796608..250e4ac30 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGenerateTemplateConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGenerateTemplateConfig.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg;
+package org.onap.appc.dg;
 
 
 import static org.junit.Assert.*;
@@ -27,8 +27,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.openecomp.appc.dg.mock.instance.MockConfigureNodeExecutor;
-import org.openecomp.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
+import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor;
+import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -52,7 +52,7 @@ public class TestGenerateTemplateConfig /* extends AbstractDGTestCase */ {
 			Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
 			
-			serviceReferences.put("org.openecomp.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
+			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());
 
 			// Register Call graphs
@@ -84,7 +84,7 @@ public class TestGenerateTemplateConfig /* extends AbstractDGTestCase */ {
 			Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
 		
-			serviceReferences.put("org.openecomp.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
+			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());
 
 			// Register Call graphs
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetAaiInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetAaiInfo.java
index 059736740..6674054cb 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetAaiInfo.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetAaiInfo.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg;
+package org.onap.appc.dg;
 
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.openecomp.appc.dg.mock.instance.MockConfigureNodeExecutor;
-import org.openecomp.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
+import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor;
+import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetConfigParams.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetConfigParams.java
index 61a409c10..fd219b013 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetConfigParams.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetConfigParams.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg;
+package org.onap.appc.dg;
 
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.openecomp.appc.dg.mock.instance.MockConfigureNodeExecutor;
-import org.openecomp.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
+import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor;
+import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 
 /* move to open source
 import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetDeviceRunningConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetDeviceRunningConfig.java
index f7fafc065..48fb106db 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetDeviceRunningConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetDeviceRunningConfig.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg;
+package org.onap.appc.dg;
 
 
 import static org.junit.Assert.assertNotNull;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetVfModuleInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetVfModuleInfo.java
index 9619276e2..6bc64f233 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetVfModuleInfo.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetVfModuleInfo.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg;
+package org.onap.appc.dg;
 
 
 import static org.junit.Assert.*;
@@ -29,8 +29,8 @@ import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.appc.dg.mock.instance.MockConfigureNodeExecutor;
-import org.openecomp.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
+import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor;
+import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.powermock.api.mockito.PowerMockito;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestProcessParameterDefinition.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestProcessParameterDefinition.java
index ba7574a5f..f638c00c9 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestProcessParameterDefinition.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestProcessParameterDefinition.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg;
+package org.onap.appc.dg;
 
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.openecomp.appc.dg.mock.instance.MockConfigureNodeExecutor;
-import org.openecomp.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
+import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor;
+import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestPublishConfiguration.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestPublishConfiguration.java
index 6764aef2c..b00194d7a 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestPublishConfiguration.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestPublishConfiguration.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg;
+package org.onap.appc.dg;
 
 
 import static org.junit.Assert.*;
@@ -29,8 +29,8 @@ import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.appc.dg.mock.instance.MockConfigureNodeExecutor;
-import org.openecomp.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
+import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor;
+import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.powermock.api.mockito.PowerMockito;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestSaveRunningConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestSaveRunningConfig.java
index 67f97d9ac..c85bfb3f7 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestSaveRunningConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestSaveRunningConfig.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg;
+package org.onap.appc.dg;
 
 
 import static org.junit.Assert.*;
@@ -29,8 +29,8 @@ import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.appc.dg.mock.instance.MockConfigureNodeExecutor;
-import org.openecomp.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
+import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor;
+import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.powermock.api.mockito.PowerMockito;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestSetStatus.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestSetStatus.java
index 2d0c401fa..4f7dc5cf1 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestSetStatus.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestSetStatus.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg;
+package org.onap.appc.dg;
 
 
 import static org.junit.Assert.*;
@@ -29,8 +29,8 @@ import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.appc.dg.mock.instance.MockConfigureNodeExecutor;
-import org.openecomp.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
+import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor;
+import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.powermock.api.mockito.PowerMockito;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestUpdateAaiInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestUpdateAaiInfo.java
index b8b66b774..05e7fa5cd 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestUpdateAaiInfo.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestUpdateAaiInfo.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg;
+package org.onap.appc.dg;
 
 
 import static org.junit.Assert.*;
@@ -29,9 +29,9 @@ import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.appc.dg.mock.instance.MockAaiResource;
-import org.openecomp.appc.dg.mock.instance.MockConfigureNodeExecutor;
-import org.openecomp.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
+import org.onap.appc.dg.mock.instance.MockAaiResource;
+import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor;
+import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.powermock.api.mockito.PowerMockito;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/mock/instance/MockAaiResource.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/mock/instance/MockAaiResource.java
index 3e6822e15..9f93b51a9 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/mock/instance/MockAaiResource.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/mock/instance/MockAaiResource.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.mock.instance;
+package org.onap.appc.dg.mock.instance;
 
 
 import java.util.Map;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/mock/instance/MockConfigureNodeExecutor.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/mock/instance/MockConfigureNodeExecutor.java
index 459f6a24e..4d2e4c9b4 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/mock/instance/MockConfigureNodeExecutor.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/mock/instance/MockConfigureNodeExecutor.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.mock.instance;
+package org.onap.appc.dg.mock.instance;
 
 
 import java.util.Map;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/mock/instance/MockSvcLogicJavaPlugin.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/mock/instance/MockSvcLogicJavaPlugin.java
index 4995836e3..aeea98a97 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/mock/instance/MockSvcLogicJavaPlugin.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/mock/instance/MockSvcLogicJavaPlugin.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dg.mock.instance;
+package org.onap.appc.dg.mock.instance;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Failure.properties
index 644b0298d..46532299b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Failure.properties
@@ -25,10 +25,10 @@ input.device-authentication.PASSWORD = !bootstrap
 
 
 
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.get.outCome=failure
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.host=135.1.1.1
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.loginId=root
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.password=!bootstrap
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.outCome=failure
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.host=135.1.1.1
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.loginId=root
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.password=!bootstrap
 
 
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Success.properties
index 4d622b212..48a2313b0 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Success.properties
@@ -24,12 +24,12 @@ input.device-authentication.PASSWORD = !bootstrap
 
 
 input.configfilereference-success.TARGET-FILE-PATH=/tmp
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.get.outCome=success
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.host=135.1.1.1
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.loginId=root
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.password=!bootstrap
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.outCome=success
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.host=135.1.1.1
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.loginId=root
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.password=!bootstrap
 
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.fullPathFileName=/tmp
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.fullPathFileName=/tmp
 
 
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/APPC_method_CommonConfiguration_TC2.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/APPC_method_CommonConfiguration_TC2.properties
index c1eb82f07..e13c68845 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/APPC_method_CommonConfiguration_TC2.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/APPC_method_CommonConfiguration_TC2.properties
@@ -27,25 +27,25 @@ input.input.action=Configure
 input.input.payload=tcfile://payload_json_config.json
 
 
-# Property for org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo Execute Action
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.commonConfigInfo.status=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
-
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
-
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.CONFIGURE-ACTION-DG-ID = 8
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.VNF-TYPE = vUSP - Metaswitch vSBC
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.DOWNLOAD-CONFIG-DG = DownloadIsbcConfig
-
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
+# Property for org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo Execute Action
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.commonConfigInfo.status=success
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
+
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
+
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.CONFIGURE-ACTION-DG-ID = 8
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.VNF-TYPE = vUSP - Metaswitch vSBC
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.DOWNLOAD-CONFIG-DG = DownloadIsbcConfig
+
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
 
 
 # DG APPC.DownloadIsbcConfig properties
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/ISBCTemplateSuccess.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/ISBCTemplateSuccess.properties
index 8e0000bc6..a4a43f041 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/ISBCTemplateSuccess.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/ISBCTemplateSuccess.properties
@@ -28,39 +28,39 @@ input.input.payload=tcfile://payload_parameters_config.json
 
 
 #GetConfigParams
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
 
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.DOWNLOAD-CONFIG-DG=DownloadIsbcConfig
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.DOWNLOAD-CONFIG-DG=DownloadIsbcConfig
 
 #Configure
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.config-template.file-content=tcfile://vdbe_template.xml
-org.openecomp.appc.data.services.node.ConfigResourceNode.saveTemplateConfig.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.config-template.file-content=tcfile://vdbe_template.xml
+org.onap.appc.data.services.node.ConfigResourceNode.saveTemplateConfig.outCome=success
 
 
-org.openecomp.appc.config.generator.node.ConfigResourceNode
+org.onap.appc.config.generator.node.ConfigResourceNode
 #DownloadISBCConfig
-org.openecomp.appc.data.services.node.ConfigResourceNode.getConfigFileReference.outCome=success
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.put.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getConfigFileReference.outCome=success
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.outCome=success
 
 configfilereference-success.TARGET-FILE-PATH=SuccessFile
 configfilereference-failure.TARGET-FILE-PATH=FailureFile
 configfilereference-log.TARGET-FILE-PATH=FailureLogFile
 
 #CheckConfigStatus
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.get.outCome=success
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.outCome=success
 
 #SetStatus
 
@@ -68,16 +68,16 @@ org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.get.outCome=success
 
 #GetDeviceRunningConfig
 config-template.outCome=SUCCESS
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.GetCliRunningConfig.outCome=success
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.GetCliRunningConfig.outCome=success
 input.cliOutput=DEVICERUNNINGCONFIG
 
 
 #SaveRunningConfig
-org.openecomp.appc.data.services.node.ConfigResourceNode.updateUploadConfig.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.updateUploadConfig.tmp.uploadconfigmax.uploadconfigid=100
+org.onap.appc.data.services.node.ConfigResourceNode.updateUploadConfig.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.updateUploadConfig.tmp.uploadconfigmax.uploadconfigid=100
 
-org.openecomp.appc.dg.common.JsonDgUtil.generateOutputPayloadFromContext.outCome=success
-org.openecomp.appc.dg.common.JsonDgUtil.generateOutputPayloadFromContext.output.payload={ \\"upload-config-id\\" : [100] }
+org.onap.appc.dg.common.JsonDgUtil.generateOutputPayloadFromContext.outCome=success
+org.onap.appc.dg.common.JsonDgUtil.generateOutputPayloadFromContext.output.payload={ \\"upload-config-id\\" : [100] }
 
 
 #GetAaiInfo
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Failure.properties
index 057e77782..a7c315e5c 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Failure.properties
@@ -28,8 +28,8 @@ input.deviceconfig-file-content=DUMMYFILECONTENT
 
 input.tmp.configureactiondg.DOWNLOAD-CONFIG-DG=DownloadIsbcConfig
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.params.assertEquals.fileCategory=config_template
+org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.params.assertEquals.fileCategory=config_template
 
 
 input.error-code=401
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Success.properties
index 3e8398ac3..942c6e759 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Success.properties
@@ -28,8 +28,8 @@ input.deviceconfig-file-content=DUMMYFILECONTENT
 
 input.tmp.configureactiondg.DOWNLOAD-CONFIG-DG=DownloadIsbcConfig
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.params.assertEquals.fileCategory=config_template
+org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.params.assertEquals.fileCategory=config_template
 
 
 # DG  properties
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateTemplateConfig_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateTemplateConfig_Failure.properties
index 5764c97b4..e1c73635d 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateTemplateConfig_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateTemplateConfig_Failure.properties
@@ -27,8 +27,8 @@ input.device-authentication.PORT-NUMBER = 22
 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
 input.deviceconfig-file-content=DUMMYFILECONTENT
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.params.assertEquals.fileCategory=config_template
+org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.params.assertEquals.fileCategory=config_template
 
 
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GetTemplate_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GetTemplate_Failure.properties
index 170291a67..88243026a 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GetTemplate_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GetTemplate_Failure.properties
@@ -22,8 +22,8 @@ input.config-type=template
 
 #ProcessParameterDefinition
 APPC.ProcessParameterDefinition.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=failure
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.config-template.error-message=Unable to get template
+org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=failure
+org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.config-template.error-message=Unable to get template
 assertEquals.error-code=401
 assertEquals.error-message=Unable to get template
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Adaptor_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Adaptor_Failure.properties
index 447c51385..9e85c51a6 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Adaptor_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Adaptor_Failure.properties
@@ -30,9 +30,9 @@ download-config-template.assertEquals.vnf-type = vUSP - Metaswitch vSBC
 download-config-template.download-config-template.TEMPLATE=tcfile:///download_cli_config_template.txt
 download-config-template.outCome=SUCCESS
 
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.outCome=failure
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.error-code = 200
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.error-message = Device Not Found
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.outCome=failure
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.error-code = 200
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.error-message = Device Not Found
 
 assertEquals.error-code=401
 assertNotNull.error-message
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_DB_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_DB_Failure.properties
index 146760c4d..f99882843 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_DB_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_DB_Failure.properties
@@ -25,8 +25,8 @@ input.device-password = !bootstrap
 input.port-number = 22
 input.vnf-type = vUSP - Metaswitch vSBC
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getDownloadConfigTemplateByVnf.outCome=failure
-org.openecomp.appc.data.services.node.ConfigResourceNode.getDownloadConfigTemplateByVnf.tmp.downloadConfigTemplate.error-message=No record for VNF Type
+org.onap.appc.data.services.node.ConfigResourceNode.getDownloadConfigTemplateByVnf.outCome=failure
+org.onap.appc.data.services.node.ConfigResourceNode.getDownloadConfigTemplateByVnf.tmp.downloadConfigTemplate.error-message=No record for VNF Type
 
 download-config-template.assertEquals.vnf-type = vUSP - Metaswitch vSBC
 download-config-template.outCome=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 3ebd399fb..a4d40f257 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
@@ -47,7 +47,7 @@ download-config-template.download-config-template.TEMPLATE=tcfile:///download_cl
 
 # Configure Node
 #----------------------------
-#<configure adaptor='org.openecomp.appc.ccadaptor.ConfigComponentAdaptor' key='DownloadCliConfig'>
+#<configure adaptor='org.onap.appc.ccadaptor.ConfigComponentAdaptor' key='DownloadCliConfig'>
 #<parameter name="Download_config_template" value="`$download-config-template.TEMPLATE`"/>
 #<parameter name="Config_contents" value="`$device-config`"/>
 #<parameter name="Host_ip_address" value="`$host-ip-address`" />
@@ -55,11 +55,11 @@ download-config-template.download-config-template.TEMPLATE=tcfile:///download_cl
 #<parameter name="Password" value="`$device-password`" />
 #<parameter name="Port_number" value="`$port-number`" />
 
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.outCome=success
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.outCome=success
 # 	To assert execution/configure node context param <Plugin Name>.<Key / Method Name>.params.<assertEquals | assertNull | assertNull >.<Context Variable Name>= XXXXX	
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.params.assertEquals.Port_number=22
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.params.assertEquals.Port_number=22
 # 	To assert execution/configure node context param <Plugin Name>.<Key / Method Name>.<assertEquals | assertNull | assertNull >.<Context Variable Name>= XXXXX	
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.assertEquals.vnf-type = vUSP - Metaswitch vSBC
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.assertEquals.vnf-type = vUSP - Metaswitch vSBC
 
 # 	To assert DG Context after execution
 # <assertEquals | assertNull | assertNull >.<Context Variable Name>= XXXXX	
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/ConfigFile_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/ConfigFile_Failure.properties
index d049fa8af..bebcabd76 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/ConfigFile_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/ConfigFile_Failure.properties
@@ -18,9 +18,9 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getConfigFileReference.outCome=failure
+org.onap.appc.data.services.node.ConfigResourceNode.getConfigFileReference.outCome=failure
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getConfigFileReference.tmp.configfilereference.error-message=Failed to read Config files
+org.onap.appc.data.services.node.ConfigResourceNode.getConfigFileReference.tmp.configfilereference.error-message=Failed to read Config files
 
 c
 # DG  properties
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/DownloadIsbcConfig_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/DownloadIsbcConfig_Success.properties
index 695b87c89..41c78827d 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/DownloadIsbcConfig_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/DownloadIsbcConfig_Success.properties
@@ -18,7 +18,7 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getConfigFileReference.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getConfigFileReference.outCome=success
 
 
 input.vnf-host-ip-address=135.1.1.1
@@ -27,12 +27,12 @@ input.device-authentication.PASSWORD = !bootstrap
 input.deviceconfig-file-content=DUMMYFILECONTENT
 input.configfilereference-deviceconfig.TARGET-FILE-PATH=/tmp
 
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.put.outCome=success
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.host=135.1.1.1
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.loginId=root
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.password=!bootstrap
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.data=DUMMYFILECONTENT
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.fullPathFileName=/tmp
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.outCome=success
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.host=135.1.1.1
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.loginId=root
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.password=!bootstrap
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.data=DUMMYFILECONTENT
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.fullPathFileName=/tmp
 
 # DG  properties
 APPC.CheckConfigStatus.outCome=success
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/Put_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/Put_Failure.properties
index 23163d126..b512dd607 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/Put_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/Put_Failure.properties
@@ -24,14 +24,14 @@ input.device-authentication.PASSWORD = !bootstrap
 input.deviceconfig-file-content=DUMMYFILECONTENT
 input.configfilereference-deviceconfig.TARGET-FILE-PATH=/tmp
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getConfigFileReference.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getConfigFileReference.outCome=success
 
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.put.outCome=failure
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.host=135.1.1.1
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.loginId=root
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.password=!bootstrap
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.data=DUMMYFILECONTENT
-org.openecomp.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.fullPathFileName=/tmp
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.outCome=failure
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.host=135.1.1.1
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.loginId=root
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.password=!bootstrap
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.data=DUMMYFILECONTENT
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.fullPathFileName=/tmp
 
 
 assertEquals.error-code=401
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetInfoSuccess.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetInfoSuccess.properties
index 943982970..4ad130021 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetInfoSuccess.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetInfoSuccess.properties
@@ -18,12 +18,12 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.aai.client.node.AAIResourceNode.getVnfInfo.outCome=success
-org.openecomp.appc.aai.client.node.AAIResourceNode.getVnfInfo.tmp.vnfInfo.vnf.vnf-type=ISBC
-org.openecomp.appc.aai.client.node.AAIResourceNode.getVnfInfo.tmp.vnfInfo.vnf.vnf-name=testISBC
+org.onap.appc.aai.client.node.AAIResourceNode.getVnfInfo.outCome=success
+org.onap.appc.aai.client.node.AAIResourceNode.getVnfInfo.tmp.vnfInfo.vnf.vnf-type=ISBC
+org.onap.appc.aai.client.node.AAIResourceNode.getVnfInfo.tmp.vnfInfo.vnf.vnf-name=testISBC
 
 
-org.openecomp.appc.aai.client.node.AAIResourceNode.getAllVServersVnfcsInfo.outCome=success
+org.onap.appc.aai.client.node.AAIResourceNode.getAllVServersVnfcsInfo.outCome=success
 assertEquals.vnf-type=ISBC
 assertEquals.vnf-name=testISBC
 assertNull.error-code
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVServerFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVServerFail.properties
index 3ad1d5f1b..f2ae11299 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVServerFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVServerFail.properties
@@ -18,14 +18,14 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.aai.client.node.AAIResourceNode.getVnfInfo.outCome=success
-org.openecomp.appc.aai.client.node.AAIResourceNode.getVnfInfo.tmp.vnfInfo.vnf.vnf-type=ISBC
-org.openecomp.appc.aai.client.node.AAIResourceNode.getVnfInfo.tmp.vnfInfo.vnf.vnf-name=testISBC
+org.onap.appc.aai.client.node.AAIResourceNode.getVnfInfo.outCome=success
+org.onap.appc.aai.client.node.AAIResourceNode.getVnfInfo.tmp.vnfInfo.vnf.vnf-type=ISBC
+org.onap.appc.aai.client.node.AAIResourceNode.getVnfInfo.tmp.vnfInfo.vnf.vnf-name=testISBC
 
 
-org.openecomp.appc.aai.client.node.AAIResourceNode.getAllVServersVnfcsInfo.outCome=failure
+org.onap.appc.aai.client.node.AAIResourceNode.getAllVServersVnfcsInfo.outCome=failure
 
-org.openecomp.appc.aai.client.node.AAIResourceNode.getAllVServersVnfcsInfo.tmp.vnfInfo.error-message=VServer not found
+org.onap.appc.aai.client.node.AAIResourceNode.getAllVServersVnfcsInfo.tmp.vnfInfo.error-message=VServer not found
 
 assertEquals.vnf-type=ISBC
 assertEquals.vnf-name=testISBC
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVnfFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVnfFail.properties
index 0cb21671c..48d5d0aa1 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVnfFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVnfFail.properties
@@ -18,8 +18,8 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.aai.client.node.AAIResourceNode.getVnfInfo.outCome=failure
-org.openecomp.appc.aai.client.node.AAIResourceNode.getVnfInfo.tmp.vnfInfo.error-message=VNF not found
+org.onap.appc.aai.client.node.AAIResourceNode.getVnfInfo.outCome=failure
+org.onap.appc.aai.client.node.AAIResourceNode.getVnfInfo.tmp.vnfInfo.error-message=VNF not found
 
 assertEquals.error-code=401
 assertEquals.error-message=VNF not found
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliJson.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliJson.properties
index ffa77594a..24d6e11ac 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliJson.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliJson.properties
@@ -26,18 +26,18 @@ input.input.api-ver=2.11
 input.input.action=Configure
 input.input.payload=tcfile://payload_json_config.json
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
 
 APPC.GetAaiInfo.outCome=success
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliString.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliString.properties
index 0049359aa..f10ec5041 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliString.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliString.properties
@@ -29,18 +29,18 @@ input.input.payload=tcfile://payload_cli_config.json
 
 APPC.GetAaiInfo.outCome=success
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
-
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
+
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
 
 
 assertNull.config-type
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CommonConfigFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CommonConfigFail.properties
index 8d79c5c10..db34ea296 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CommonConfigFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CommonConfigFail.properties
@@ -29,8 +29,8 @@ input.input.payload=tcfile://payload_restore_config.json
 
 
 APPC.GetAaiInfo.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=failure
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.commonConfigInfo.error-message=getCommonConfigInfoFailure
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=failure
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.commonConfigInfo.error-message=getCommonConfigInfoFailure
 
 
 assertEquals.config-type=template
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/DefaultTemplate.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/DefaultTemplate.properties
index ebf08159c..cf443cd03 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/DefaultTemplate.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/DefaultTemplate.properties
@@ -28,18 +28,18 @@ input.input.payload=tcfile://payload_parameters_config.json
 
 
 APPC.GetAaiInfo.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
 
 assertEquals.config-type=template
 assertEquals.device-authentication.USER-NAME=root
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Restore.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Restore.properties
index 54dbf6e62..957369e2b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Restore.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Restore.properties
@@ -29,18 +29,18 @@ input.input.payload=tcfile://payload_restore_config.json
 
 
 APPC.GetAaiInfo.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
-
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
+
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
 
 
 assertEquals.config-type=template
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/TemplateName.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/TemplateName.properties
index 209faccb7..16353d0a0 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/TemplateName.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/TemplateName.properties
@@ -28,18 +28,18 @@ input.input.payload=tcfile://payload_template_config.json
 
 
 APPC.GetAaiInfo.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc
-org.openecomp.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
 
 assertEquals.config-type=template
 assertEquals.device-authentication.USER-NAME=root
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Failure.properties
index 05ecd134d..a280c2a11 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Failure.properties
@@ -28,7 +28,7 @@ input.config.user-name=brinda
 input.config.password=brinda123
 input.config.port-number=80
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.outCome=failure
-org.openecomp.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.tmp.deviceconfig.error-message=Couldn't connect to the Server
+org.onap.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.outCome=failure
+org.onap.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.tmp.deviceconfig.error-message=Couldn't connect to the Server
 
 assertEquals.dcae-error-message=Couldn't connect to the Server
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Others.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Others.properties
index b0e800fa3..baa96ecc5 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Others.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Others.properties
@@ -28,7 +28,7 @@ input.config.user-name=brinda
 input.config.password=brinda123
 input.config.port-number=80
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.outCome=Other
-org.openecomp.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.tmp.deviceconfig.error-message=Couldn't connect to the Server
+org.onap.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.outCome=Other
+org.onap.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.tmp.deviceconfig.error-message=Couldn't connect to the Server
 
 assertEquals.dcae-error-message=Unable to Get the Configuration
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Success.properties
index 161a6645e..e3336e666 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Success.properties
@@ -28,7 +28,7 @@ input.config.user-name=brinda
 input.config.password=brinda123
 input.config.port-number=80
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.tmp.deviceconfig.file-content=tcfile://config_chef.txt
+org.onap.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.tmp.deviceconfig.file-content=tcfile://config_chef.txt
 
 assertNotNull.device-running-config
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/XML_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/XML_Success.properties
index 161a6645e..e3336e666 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/XML_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/XML_Success.properties
@@ -28,7 +28,7 @@ input.config.user-name=brinda
 input.config.password=brinda123
 input.config.port-number=80
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.tmp.deviceconfig.file-content=tcfile://config_chef.txt
+org.onap.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.tmp.deviceconfig.file-content=tcfile://config_chef.txt
 
 assertNotNull.device-running-config
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 4219bfbce..0173ed1a0 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
@@ -19,8 +19,8 @@
 ###
 
 input.configuration-params=tcfile://request-param.json
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-definitions.file-content=tcfile://pd.yaml
+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
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetPDFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetPDFail.properties
index 1263f232d..4739c8796 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetPDFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetPDFail.properties
@@ -19,8 +19,8 @@
 ###
 
 input.configuration-params=tcfile://request-param.json
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=failure
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-definitions.error-message=PD file Not found
+org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=failure
+org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-definitions.error-message=PD file Not found
 
 assertNull.error-code
 assertNull.error-message
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 776256368..6318f092c 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
@@ -19,12 +19,12 @@
 ###
 
 input.configuration-params=tcfile://request-param.json
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-definitions.file-content=tcfile://pd.yaml
+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.openecomp.appc.instar.node.InstarClientNode.getInstarInfo.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"]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/NoInstarParams.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/NoInstarParams.properties
index b28e6beda..9eae0a0e8 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/NoInstarParams.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/NoInstarParams.properties
@@ -19,8 +19,8 @@
 ###
 
 input.configuration-params=tcfile://request-param.json
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-definitions.file-content=tcfile://noinstarparams_pd.yaml
+org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-definitions.file-content=tcfile://noinstarparams_pd.yaml
 
 
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/ProcessPD.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/ProcessPD.properties
index e60208030..0983c5b94 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/ProcessPD.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/ProcessPD.properties
@@ -20,23 +20,23 @@
 
 input.configuration-params=tcfile://request-param.json
 input.request-id=requestid
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-definitions.file-content=tcfile://pd.yaml
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-yang.file-content=tcfile://pd.yaml
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-yang.config-file-id=1234
+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.onap.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-yang.file-content=tcfile://pd.yaml
+org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-yang.config-file-id=1234
 
-org.openecomp.appc.instar.node.InstarClientNode.getInstarInfo.outCome=success
-org.openecomp.appc.instar.node.InstarClientNode.getInstarInfo.tmp.instarValues.INSTAR-KEY-VALUES=tcfile://instar_values.json
+org.onap.appc.instar.node.InstarClientNode.getInstarInfo.outCome=success
+org.onap.appc.instar.node.InstarClientNode.getInstarInfo.tmp.instarValues.INSTAR-KEY-VALUES=tcfile://instar_values.json
 
 
 #To assert execution/configure node context param <Plugin Name>.<Key / Method Name>.params.<assertEquals | assertNull | assertNull >.<Context Variable Name>= XXXXX	
-org.openecomp.appc.dg.common.VNFConfigurator.storeConfig.outCome=success
-org.openecomp.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.uniqueId=1234
-org.openecomp.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.requestId=requestid
-org.openecomp.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.configJSON={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"fd00:f4d5:ea06:1:0:110:136:254","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"}
+org.onap.appc.dg.common.VNFConfigurator.storeConfig.outCome=success
+org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.uniqueId=1234
+org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.requestId=requestid
+org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.configJSON={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"fd00:f4d5:ea06:1:0:110:136:254","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"}
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.saveConfigTransactionLog.outCome=true
-org.openecomp.appc.dg.common.DCAEReporterPlugin.report.outCome=true
+org.onap.appc.data.services.node.ConfigResourceNode.saveConfigTransactionLog.outCome=true
+org.onap.appc.dg.common.DCAEReporterPlugin.report.outCome=true
 
 assertEquals.configuration-params={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"fd00:f4d5:ea06:1:0:110:136:254","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"}
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/SaveMdsalFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/SaveMdsalFail.properties
index 4584f69b0..fd7140540 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/SaveMdsalFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/SaveMdsalFail.properties
@@ -20,24 +20,24 @@
 
 input.configuration-params=tcfile://request-param.json
 input.request-id=requestid
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-definitions.file-content=tcfile://pd.yaml
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-yang.file-content=tcfile://pd.yaml
-org.openecomp.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-yang.config-file-id=1234
+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.onap.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-yang.file-content=tcfile://pd.yaml
+org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-yang.config-file-id=1234
 
-org.openecomp.appc.instar.node.InstarClientNode.getInstarInfo.outCome=success
-org.openecomp.appc.instar.node.InstarClientNode.getInstarInfo.tmp.instarValues.INSTAR-KEY-VALUES=tcfile://instar_values.json
+org.onap.appc.instar.node.InstarClientNode.getInstarInfo.outCome=success
+org.onap.appc.instar.node.InstarClientNode.getInstarInfo.tmp.instarValues.INSTAR-KEY-VALUES=tcfile://instar_values.json
 
 
 #To assert execution/configure node context param <Plugin Name>.<Key / Method Name>.params.<assertEquals | assertNull | assertNull >.<Context Variable Name>= XXXXX	
-org.openecomp.appc.dg.common.VNFConfigurator.storeConfig.outCome=failure
-org.openecomp.appc.dg.common.VNFConfigurator.storeConfig.tmp.mdSalSave.ERROR_MESSAGE=MDSAL ERROR
-org.openecomp.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.uniqueId=1234
-org.openecomp.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.requestId=requestid
-org.openecomp.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.configJSON={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"fd00:f4d5:ea06:1:0:110:136:254","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"}
+org.onap.appc.dg.common.VNFConfigurator.storeConfig.outCome=failure
+org.onap.appc.dg.common.VNFConfigurator.storeConfig.tmp.mdSalSave.ERROR_MESSAGE=MDSAL ERROR
+org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.uniqueId=1234
+org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.requestId=requestid
+org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.configJSON={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"fd00:f4d5:ea06:1:0:110:136:254","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"}
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.saveConfigTransactionLog.outCome=true
-org.openecomp.appc.dg.common.DCAEReporterPlugin.report.outCome=true
+org.onap.appc.data.services.node.ConfigResourceNode.saveConfigTransactionLog.outCome=true
+org.onap.appc.dg.common.DCAEReporterPlugin.report.outCome=true
 
 assertEquals.configuration-params={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"fd00:f4d5:ea06:1:0:110:136:254","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"}
 
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 2a84acc81..e9d563380 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
@@ -27,8 +27,8 @@ 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.openecomp.appc.dg.common.JsonDgUtil.generateOutputPayloadFromContext.outCome=success
-org.openecomp.appc.dg.common.JsonDgUtil.generateOutputPayloadFromContext.output.payload={ \\"upload-config-id\\" : [100] }
+org.onap.appc.dg.common.JsonDgUtil.generateOutputPayloadFromContext.outCome=success
+org.onap.appc.dg.common.JsonDgUtil.generateOutputPayloadFromContext.output.payload={ \\"upload-config-id\\" : [100] }
 
 assertEquals.output.payload.upload-config-id[0]=12434
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties
index a1e160fb0..b094a6791 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties
@@ -25,8 +25,8 @@ input.tmp.uploadConfigInfo.FILE-CONTENT=configData
 input.tmp.uploadConfigInfo.UPLOAD-TIMESTAMP=567890
 
 
-org.openecomp.appc.dg.common.JsonDgUtil.generateOutputPayloadFromContext.outCome=success
-org.openecomp.appc.dg.common.JsonDgUtil.generateOutputPayloadFromContext.output.payload={ \\"upload-config-id\\" : [100] }
+org.onap.appc.dg.common.JsonDgUtil.generateOutputPayloadFromContext.outCome=success
+org.onap.appc.dg.common.JsonDgUtil.generateOutputPayloadFromContext.output.payload={ \\"upload-config-id\\" : [100] }
 
 assertEquals.output.payload.upload-config-id[0]=12434
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Failure.properties
index 868f9ac91..324b3d234 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Failure.properties
@@ -57,10 +57,10 @@ assertEquals.config.protocol = CLI
 assertNull.output.payload.upload-config-id[0]
 
 
-org.openecomp.appc.dg.common.DCAEReporterPlugin.report.outCome=success
-org.openecomp.appc.dg.common.DCAEReporterPlugin.report.params.assertEquals.output.status.dgerror.code=501
-org.openecomp.appc.dg.common.DCAEReporterPlugin.report.params.assertEquals.output.status.message=501:Configuration is successful but unable to get the running config.
+org.onap.appc.dg.common.DCAEReporterPlugin.report.outCome=success
+org.onap.appc.dg.common.DCAEReporterPlugin.report.params.assertEquals.output.status.dgerror.code=501
+org.onap.appc.dg.common.DCAEReporterPlugin.report.params.assertEquals.output.status.message=501:Configuration is successful but unable to get the running config.
 
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.saveConfigTransactionLog.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.saveConfigTransactionLog.params.assertEquals.message=501:Configuration is successful but unable to get the running config.
+org.onap.appc.data.services.node.ConfigResourceNode.saveConfigTransactionLog.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.saveConfigTransactionLog.params.assertEquals.message=501:Configuration is successful but unable to get the running config.
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties
index 316ad559e..f20421be0 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties
@@ -31,8 +31,8 @@ input.device-authentication.PORT-NUMBER = 22
 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
 input.deviceconfig-file-content=DUMMYFILECONTENT
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.updateUploadConfig.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.updateUploadConfig.tmp.uploadconfigmax.uploadconfigid=100
+org.onap.appc.data.services.node.ConfigResourceNode.updateUploadConfig.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.updateUploadConfig.tmp.uploadconfigmax.uploadconfigid=100
 
 
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/UploadConfig_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/UploadConfig_Failure.properties
index 930856150..3488888a2 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/UploadConfig_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/UploadConfig_Failure.properties
@@ -35,9 +35,9 @@ c
 
 # DG  properties
 APPC.GetDeviceRunningConfig.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.updateUploadConfig.outCome=failure
+org.onap.appc.data.services.node.ConfigResourceNode.updateUploadConfig.outCome=failure
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.updateUploadConfig.tmp.uploadconfig.error-message=SQLERROR
+org.onap.appc.data.services.node.ConfigResourceNode.updateUploadConfig.tmp.uploadconfig.error-message=SQLERROR
 
 
 
@@ -58,10 +58,10 @@ assertEquals.config.protocol = CLI
 
 assertNull.output.payload.upload-config-id[0]
 
-org.openecomp.appc.dg.common.DCAEReporterPlugin.report.outCome=success
-org.openecomp.appc.dg.common.DCAEReporterPlugin.report.params.assertEquals.output.status.dgerror.code=501
-org.openecomp.appc.dg.common.DCAEReporterPlugin.report.params.assertEquals.output.status.message=501:Configuration is successful but unable to save the running config.SQLERROR
+org.onap.appc.dg.common.DCAEReporterPlugin.report.outCome=success
+org.onap.appc.dg.common.DCAEReporterPlugin.report.params.assertEquals.output.status.dgerror.code=501
+org.onap.appc.dg.common.DCAEReporterPlugin.report.params.assertEquals.output.status.message=501:Configuration is successful but unable to save the running config.SQLERROR
 
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.saveConfigTransactionLog.outCome=success
-org.openecomp.appc.data.services.node.ConfigResourceNode.saveConfigTransactionLog.params.assertEquals.message=501:Configuration is successful but unable to save the running config.SQLERROR
+org.onap.appc.data.services.node.ConfigResourceNode.saveConfigTransactionLog.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.saveConfigTransactionLog.params.assertEquals.message=501:Configuration is successful but unable to save the running config.SQLERROR
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_AaiFailure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_AaiFailure.properties
index 07df12b90..9e41c78d9 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_AaiFailure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_AaiFailure.properties
@@ -18,7 +18,7 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.dg.common.DCAEReporterPlugin.report.outcome=success
+org.onap.appc.dg.common.DCAEReporterPlugin.report.outcome=success
 input.error-code=400
 input.request-action=Configure
 input.aai-error-message=Get from A&AI Failed
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_SaveRunningFailure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_SaveRunningFailure.properties
index 0de2b09f4..dcb6b813b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_SaveRunningFailure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_SaveRunningFailure.properties
@@ -18,7 +18,7 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.dg.common.DCAEReporterPlugin.report.outcome=success
+org.onap.appc.dg.common.DCAEReporterPlugin.report.outcome=success
 input.error-code=400
 input.request-action=Configure
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_Success.properties
index af4eb91bc..2018e5a37 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_Success.properties
@@ -18,7 +18,7 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.dg.common.DCAEReporterPlugin.report.outcome=success
+org.onap.appc.dg.common.DCAEReporterPlugin.report.outcome=success
 input.error-code=400
 input.request-action=Configure
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/GetVnfcRef_Fail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/GetVnfcRef_Fail.properties
index e906379df..83b82aa05 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/GetVnfcRef_Fail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/GetVnfcRef_Fail.properties
@@ -18,8 +18,8 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getVnfcReference.outCome=failure
-org.openecomp.appc.data.services.node.ConfigResourceNode.getVnfcReference.vnfc-reference[0].error-message=VnfcRef Record not found
+org.onap.appc.data.services.node.ConfigResourceNode.getVnfcReference.outCome=failure
+org.onap.appc.data.services.node.ConfigResourceNode.getVnfcReference.vnfc-reference[0].error-message=VnfcRef Record not found
 
 
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Fail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Fail.properties
index 1c50c2d25..55c6243cd 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Fail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Fail.properties
@@ -18,13 +18,13 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getVnfcReference.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getVnfcReference.outCome=success
 
-org.openecomp.appc.aai.client.node.AAIResourceNode.updateVnfAndVServerStatus.outCome=failure
-org.openecomp.appc.aai.client.node.AAIResourceNode.updateVnfAndVServerStatus.tmp.vnfInfo.error-message=A&AI Update for VServer failed.
+org.onap.appc.aai.client.node.AAIResourceNode.updateVnfAndVServerStatus.outCome=failure
+org.onap.appc.aai.client.node.AAIResourceNode.updateVnfAndVServerStatus.tmp.vnfInfo.error-message=A&AI Update for VServer failed.
 
-org.openecomp.appc.aai.client.node.AAIResourceNode.addVnfcs.outCome=failure
-org.openecomp.appc.aai.client.node.AAIResourceNode.addVnfcs.tmp.vnfInfo.error-message=A&AI Insert for vnfc failed.
+org.onap.appc.aai.client.node.AAIResourceNode.addVnfcs.outCome=failure
+org.onap.appc.aai.client.node.AAIResourceNode.addVnfcs.tmp.vnfInfo.error-message=A&AI Insert for vnfc failed.
 
 assertEquals.dcae-error-message=A&AI Update for VServer failed.A&AI Insert for vnfc failed.
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Success.properties
index 62b1395dc..f84571f7d 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Success.properties
@@ -18,11 +18,11 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.data.services.node.ConfigResourceNode.getVnfcReference.outCome=success
+org.onap.appc.data.services.node.ConfigResourceNode.getVnfcReference.outCome=success
 
-org.openecomp.appc.aai.client.node.AAIResourceNode.addVnfcs.outCome=success
+org.onap.appc.aai.client.node.AAIResourceNode.addVnfcs.outCome=success
 
-org.openecomp.appc.aai.client.node.AAIResourceNode.updateVnfAndVServerStatus.outCome=success
+org.onap.appc.aai.client.node.AAIResourceNode.updateVnfAndVServerStatus.outCome=success
 assertNull.dcae-error-message
 
 
diff --git a/appc-directed-graph/dg-loader/features/pom.xml b/appc-directed-graph/dg-loader/features/pom.xml
index 06c8c3ad0..536821d6b 100644
--- a/appc-directed-graph/dg-loader/features/pom.xml
+++ b/appc-directed-graph/dg-loader/features/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc.plugins</groupId>
+        <groupId>org.onap.appc.plugins</groupId>
         <artifactId>dg-loader</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -14,7 +14,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc.plugins</groupId>
+            <groupId>org.onap.appc.plugins</groupId>
             <artifactId>dg-loader-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-directed-graph/dg-loader/features/src/main/resources/features.xml b/appc-directed-graph/dg-loader/features/src/main/resources/features.xml
index e35943af5..519530eed 100644
--- a/appc-directed-graph/dg-loader/features/src/main/resources/features.xml
+++ b/appc-directed-graph/dg-loader/features/src/main/resources/features.xml
@@ -35,6 +35,6 @@
 		<bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>
-		<bundle>mvn:org.openecomp.appc.plugins/dg-loader-provider/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc.plugins/dg-loader-provider/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/appc-directed-graph/dg-loader/pom.xml b/appc-directed-graph/dg-loader/pom.xml
index 65659297b..866f07c9d 100644
--- a/appc-directed-graph/dg-loader/pom.xml
+++ b/appc-directed-graph/dg-loader/pom.xml
@@ -26,14 +26,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-directed-graph</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.openecomp.appc.plugins</groupId>
+    <groupId>org.onap.appc.plugins</groupId>
     <artifactId>dg-loader</artifactId>
     <version>1.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
diff --git a/appc-directed-graph/dg-loader/provider/pom.xml b/appc-directed-graph/dg-loader/provider/pom.xml
index 42235243a..b688eb457 100644
--- a/appc-directed-graph/dg-loader/provider/pom.xml
+++ b/appc-directed-graph/dg-loader/provider/pom.xml
@@ -26,7 +26,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc.plugins</groupId>
+        <groupId>org.onap.appc.plugins</groupId>
         <artifactId>dg-loader</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
diff --git a/appc-directed-graph/pom.xml b/appc-directed-graph/pom.xml
index 1955f04d4..2af2a9c3f 100644
--- a/appc-directed-graph/pom.xml
+++ b/appc-directed-graph/pom.xml
@@ -27,12 +27,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-directed-graph</artifactId>
     <packaging>pom</packaging>
     <name>Application Controller Directed Graph</name>
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-api/pom.xml
index d63a10a4d..d58c7bd6c 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/pom.xml
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 		<parent>
-	    <groupId>org.openecomp.appc</groupId>
+	    <groupId>org.onap.appc</groupId>
 	    <artifactId>appc-command-executor</artifactId>
 	    <version>1.3.0-SNAPSHOT</version>
 	  </parent>
@@ -17,17 +17,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>execution-queue-management-lib</artifactId>
       <version>${project.version}</version>
     </dependency>
       <dependency>
-          <groupId>org.openecomp.appc</groupId>
+          <groupId>org.onap.appc</groupId>
       <artifactId>domain-model-lib</artifactId>
       <version>${project.version}</version>
     </dependency>
       <dependency>
-          <groupId>org.openecomp.appc</groupId>
+          <groupId>org.onap.appc</groupId>
           <artifactId>appc-common</artifactId>
           <version>${project.version}</version>
           <scope>compile</scope>
@@ -48,7 +48,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
-                        <Export-Package>org.openecomp.appc.executor,org.openecomp.appc.executor.objects,org.openecomp.appc.executor.conv,org.openecomp.appc.executor.helper</Export-Package>
+                        <Export-Package>org.onap.appc.executor,org.onap.appc.executor.objects,org.onap.appc.executor.conv,org.onap.appc.executor.helper</Export-Package>
                         <Embed-Dependency>
                             javax.json;scope=compile|runtime;inline=false
                         </Embed-Dependency>
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/CommandExecutor.java b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/CommandExecutor.java
index b348ffde8..d6935b83a 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/CommandExecutor.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/CommandExecutor.java
@@ -25,11 +25,11 @@
 /**
  *
  */
-package org.openecomp.appc.executor;
+package org.onap.appc.executor;
 
 
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.exceptions.APPCException;
 
 
 
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/UnstableVNFException.java b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/UnstableVNFException.java
index 7c6f65f75..634bd0f68 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/UnstableVNFException.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/UnstableVNFException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executor;
+package org.onap.appc.executor;
 
 
 public class UnstableVNFException extends Exception{
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/conv/Converter.java b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/conv/Converter.java
index 0373cff48..3cfc7ece7 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/conv/Converter.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/conv/Converter.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executor.conv;
+package org.onap.appc.executor.conv;
 
 import java.io.IOException;
 
-import org.openecomp.appc.executor.objects.Params;
+import org.onap.appc.executor.objects.Params;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/CommandResponse.java b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/CommandResponse.java
index 8c7cff8f5..4e7b9b17f 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/CommandResponse.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/CommandResponse.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executor.objects;
+package org.onap.appc.executor.objects;
 
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
 
 
 public class CommandResponse {
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/LCMCommandStatus.java b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/LCMCommandStatus.java
index 44588d0df..be13fd0ff 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/LCMCommandStatus.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/LCMCommandStatus.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executor.objects;
+package org.onap.appc.executor.objects;
 
 
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.domainmodel.lcm.Status;
-import org.openecomp.appc.util.MessageFormatter;
+import org.onap.appc.domainmodel.lcm.Status;
+import org.onap.appc.util.MessageFormatter;
 
 import java.util.Map;
 
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/Params.java b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/Params.java
index 337f28085..c3cae7bcd 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/Params.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/Params.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executor.objects;
+package org.onap.appc.executor.objects;
 
 import java.lang.Object;
 import java.util.HashMap;
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/UniqueRequestIdentifier.java b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/UniqueRequestIdentifier.java
index 01c8d063a..b2f2a1d89 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/UniqueRequestIdentifier.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/UniqueRequestIdentifier.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executor.objects;
+package org.onap.appc.executor.objects;
 
 
 import org.apache.commons.lang3.StringUtils;
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-core/pom.xml
index 2d71339c2..a0ebe9dc0 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/pom.xml
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/pom.xml
@@ -21,7 +21,7 @@
 
     <modelVersion>4.0.0</modelVersion>
 		<parent>
-	    <groupId>org.openecomp.appc</groupId>
+	    <groupId>org.onap.appc</groupId>
 	    <artifactId>appc-command-executor</artifactId>
 	    <version>1.3.0-SNAPSHOT</version>
 	  </parent>
@@ -33,41 +33,41 @@
 
     <dependencies>
         <dependency>
-        	<groupId>org.openecomp.appc</groupId>
+        	<groupId>org.onap.appc</groupId>
         	<artifactId>appc-common</artifactId>
         	<version>${project.version}</version>
         </dependency>
         <dependency>
-        	<groupId>org.openecomp.appc</groupId>
+        	<groupId>org.onap.appc</groupId>
         	<artifactId>appc-command-executor-api</artifactId>
         </dependency>
         <dependency>
-        	<groupId>org.openecomp.appc</groupId>
+        	<groupId>org.onap.appc</groupId>
         	<artifactId>appc-workflow-management-api</artifactId>
         	<version>${project.version}</version>
         </dependency>
         <dependency>
-        	<groupId>org.openecomp.appc</groupId>
+        	<groupId>org.onap.appc</groupId>
         	<artifactId>appc-request-handler-api</artifactId>
         	<version>${project.version}</version>
         </dependency>
         <dependency>
-        	<groupId>org.openecomp.appc</groupId>
+        	<groupId>org.onap.appc</groupId>
         	<artifactId>execution-queue-management-lib</artifactId>
         	<version>${project.version}</version>
         </dependency>
 				<dependency>
-        	<groupId>org.openecomp.appc</groupId>
+        	<groupId>org.onap.appc</groupId>
         	<artifactId>appc-data-access-lib</artifactId>
         	<version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-dmaap-adapter-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-lifecycle-management-api</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -76,7 +76,7 @@
             <artifactId>aai-service-provider</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>domain-model-lib</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -93,11 +93,11 @@
                         <Bundle-Version>${project.version}</Bundle-Version>
                         <Embed-Dependency>eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
-                        <Export-Service>org.openecomp.appc.executor.CommandExecutor</Export-Service>
+                        <Export-Service>org.onap.appc.executor.CommandExecutor</Export-Service>
                         <Import-Package>
-                            org.openecomp.appc.executionqueue.*,
-                            org.openecomp.appc.executor,
-                            org.openecomp.appc.executor.objects,
+                            org.onap.appc.executionqueue.*,
+                            org.onap.appc.executor,
+                            org.onap.appc.executor.objects,
                             *;resolution:=optional
                         </Import-Package>
                     </instructions>
@@ -109,7 +109,7 @@
     <dependencyManagement>
     	<dependencies>
     		<dependency>
-    			<groupId>org.openecomp.appc</groupId>
+    			<groupId>org.onap.appc</groupId>
     			<artifactId>appc-command-executor-api</artifactId>
     			<version>${project.version}</version>
     		</dependency>
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandExecutorImpl.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandExecutorImpl.java
index f7ffdadce..d23a3fdd6 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandExecutorImpl.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandExecutorImpl.java
@@ -25,16 +25,16 @@
 /**
  *
  */
-package org.openecomp.appc.executor.impl;
+package org.onap.appc.executor.impl;
 
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.apache.commons.lang.ObjectUtils;
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.executionqueue.ExecutionQueueService;
-import org.openecomp.appc.executor.CommandExecutor;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.executionqueue.ExecutionQueueService;
+import org.onap.appc.executor.CommandExecutor;
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTask.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTask.java
index 3af436552..1df756efa 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTask.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTask.java
@@ -22,17 +22,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executor.impl;
-
-import org.openecomp.appc.domainmodel.lcm.Status;
-import org.openecomp.appc.executor.objects.CommandResponse;
-import org.openecomp.appc.executor.objects.LCMCommandStatus;
-import org.openecomp.appc.executor.objects.Params;
-import org.openecomp.appc.requesthandler.RequestHandler;
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.workflow.WorkFlowManager;
-import org.openecomp.appc.workflow.objects.WorkflowRequest;
-import org.openecomp.appc.workflow.objects.WorkflowResponse;
+package org.onap.appc.executor.impl;
+
+import org.onap.appc.domainmodel.lcm.Status;
+import org.onap.appc.executor.objects.CommandResponse;
+import org.onap.appc.executor.objects.LCMCommandStatus;
+import org.onap.appc.executor.objects.Params;
+import org.onap.appc.requesthandler.RequestHandler;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.workflow.WorkFlowManager;
+import org.onap.appc.workflow.objects.WorkflowRequest;
+import org.onap.appc.workflow.objects.WorkflowResponse;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTaskFactory.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTaskFactory.java
index 5a7550cc4..bd7247854 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTaskFactory.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTaskFactory.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executor.impl;
+package org.onap.appc.executor.impl;
 
 
-import org.openecomp.appc.domainmodel.lcm.ActionLevel;
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.domainmodel.lcm.VNFOperation;
-import org.openecomp.appc.lifecyclemanager.LifecycleManager;
-import org.openecomp.appc.requesthandler.RequestHandler;
-import org.openecomp.appc.workflow.WorkFlowManager;
+import org.onap.appc.domainmodel.lcm.ActionLevel;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.domainmodel.lcm.VNFOperation;
+import org.onap.appc.lifecyclemanager.LifecycleManager;
+import org.onap.appc.requesthandler.RequestHandler;
+import org.onap.appc.workflow.WorkFlowManager;
 
 
 
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommonMethods.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommonMethods.java
index 65d4b432f..a032f3737 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommonMethods.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommonMethods.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executor.impl;
+package org.onap.appc.executor.impl;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/ExpiredMessageHandler.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/ExpiredMessageHandler.java
index 7aa4cd167..bd5773216 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/ExpiredMessageHandler.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/ExpiredMessageHandler.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executor.impl;
+package org.onap.appc.executor.impl;
 
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.domainmodel.lcm.ActionLevel;
-import org.openecomp.appc.executionqueue.MessageExpirationListener;
-import org.openecomp.appc.requesthandler.RequestHandler;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.domainmodel.lcm.ActionLevel;
+import org.onap.appc.executionqueue.MessageExpirationListener;
+import org.onap.appc.requesthandler.RequestHandler;
 
 
 public class ExpiredMessageHandler<M> implements MessageExpirationListener<M>{
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMCommandTask.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMCommandTask.java
index 77126086f..999957fc8 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMCommandTask.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMCommandTask.java
@@ -22,30 +22,30 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executor.impl;
+package org.onap.appc.executor.impl;
 
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.domainmodel.lcm.CommonHeader;
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.domainmodel.lcm.Status;
-import org.openecomp.appc.domainmodel.lcm.VNFOperation;
-import org.openecomp.appc.executor.UnstableVNFException;
-import org.openecomp.appc.executor.objects.CommandResponse;
-import org.openecomp.appc.executor.objects.LCMCommandStatus;
-import org.openecomp.appc.executor.objects.Params;
-import org.openecomp.appc.executor.objects.UniqueRequestIdentifier;
-import org.openecomp.appc.lifecyclemanager.LifecycleManager;
-import org.openecomp.appc.lifecyclemanager.objects.LifecycleException;
-import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException;
-import org.openecomp.appc.lifecyclemanager.objects.VNFOperationOutcome;
-import org.openecomp.appc.logging.LoggingConstants;
-import org.openecomp.appc.requesthandler.RequestHandler;
-import org.openecomp.appc.workflow.WorkFlowManager;
-import org.openecomp.appc.workflow.objects.WorkflowResponse;
+import org.onap.appc.domainmodel.lcm.CommonHeader;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.domainmodel.lcm.Status;
+import org.onap.appc.domainmodel.lcm.VNFOperation;
+import org.onap.appc.executor.UnstableVNFException;
+import org.onap.appc.executor.objects.CommandResponse;
+import org.onap.appc.executor.objects.LCMCommandStatus;
+import org.onap.appc.executor.objects.Params;
+import org.onap.appc.executor.objects.UniqueRequestIdentifier;
+import org.onap.appc.lifecyclemanager.LifecycleManager;
+import org.onap.appc.lifecyclemanager.objects.LifecycleException;
+import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException;
+import org.onap.appc.lifecyclemanager.objects.VNFOperationOutcome;
+import org.onap.appc.logging.LoggingConstants;
+import org.onap.appc.requesthandler.RequestHandler;
+import org.onap.appc.workflow.WorkFlowManager;
+import org.onap.appc.workflow.objects.WorkflowResponse;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMReadonlyCommandTask.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMReadonlyCommandTask.java
index 83e0638ae..0eeefe540 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMReadonlyCommandTask.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMReadonlyCommandTask.java
@@ -22,19 +22,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executor.impl;
+package org.onap.appc.executor.impl;
 
 
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.domainmodel.lcm.CommonHeader;
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.executor.UnstableVNFException;
-import org.openecomp.appc.executor.objects.CommandResponse;
-import org.openecomp.appc.executor.objects.LCMCommandStatus;
-import org.openecomp.appc.executor.objects.Params;
-import org.openecomp.appc.executor.objects.UniqueRequestIdentifier;
-import org.openecomp.appc.requesthandler.RequestHandler;
-import org.openecomp.appc.workflow.WorkFlowManager;
+import org.onap.appc.domainmodel.lcm.CommonHeader;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.executor.UnstableVNFException;
+import org.onap.appc.executor.objects.CommandResponse;
+import org.onap.appc.executor.objects.LCMCommandStatus;
+import org.onap.appc.executor.objects.Params;
+import org.onap.appc.executor.objects.UniqueRequestIdentifier;
+import org.onap.appc.requesthandler.RequestHandler;
+import org.onap.appc.workflow.WorkFlowManager;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 5474dcc6f..d0ee8cd05 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -29,14 +29,14 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
-    <bean id="commandExecutorBean" class="org.openecomp.appc.executor.impl.CommandExecutorImpl"
+    <bean id="commandExecutorBean" class="org.onap.appc.executor.impl.CommandExecutorImpl"
           scope="singleton" init-method="initialize">
         <property name="executionQueueService" ref="ExecutionQueueServiceRef"/>
         <property name="executionTaskFactory" ref="CommandExecutionTaskFactory"/>
         <property name="expiredMessageHandler" ref="expiredMessageHandlerBean"/>
     </bean>
 
-    <bean id="CommandExecutionTaskFactory" class="org.openecomp.appc.executor.impl.CommandTaskFactory"
+    <bean id="CommandExecutionTaskFactory" class="org.onap.appc.executor.impl.CommandTaskFactory"
           scope="singleton">
         <property name="vnfRequestHandler" ref="vnfRequestHandlerService"/>
         <property name="vmRequestHandler" ref="vmRequestHandlerService"/>
@@ -44,23 +44,23 @@
         <property name="lifecyclemanager" ref="LifecyclemanagerRef"/>
     </bean>
 
-    <bean id="expiredMessageHandlerBean" class="org.openecomp.appc.executor.impl.ExpiredMessageHandler"
+    <bean id="expiredMessageHandlerBean" class="org.onap.appc.executor.impl.ExpiredMessageHandler"
           scope="singleton">
         <property name="vnfRequestHandler" ref="vnfRequestHandlerService"/>
         <property name="vmRequestHandler" ref="vmRequestHandlerService"/>
     </bean>
 
     <reference id="WorkFlowManagerRef" availability="mandatory" activation="eager"
-               interface="org.openecomp.appc.workflow.WorkFlowManager"/>
+               interface="org.onap.appc.workflow.WorkFlowManager"/>
     <reference id="vnfRequestHandlerService" availability="optional" activation="eager"
-               interface="org.openecomp.appc.requesthandler.RequestHandler" filter="(level=VNF)"/>
+               interface="org.onap.appc.requesthandler.RequestHandler" filter="(level=VNF)"/>
     <reference id="vmRequestHandlerService" availability="optional" activation="eager"
-               interface="org.openecomp.appc.requesthandler.RequestHandler" filter="(level=VM)"/>
+               interface="org.onap.appc.requesthandler.RequestHandler" filter="(level=VM)"/>
     <reference id="LifecyclemanagerRef" availability="mandatory" activation="eager"
-               interface="org.openecomp.appc.lifecyclemanager.LifecycleManager"/>
+               interface="org.onap.appc.lifecyclemanager.LifecycleManager"/>
     <reference id="ExecutionQueueServiceRef" availability="mandatory" activation="eager"
-               interface="org.openecomp.appc.executionqueue.ExecutionQueueService"/>
+               interface="org.onap.appc.executionqueue.ExecutionQueueService"/>
 
-    <service id="commandExecutorService" interface="org.openecomp.appc.executor.CommandExecutor"
+    <service id="commandExecutorService" interface="org.onap.appc.executor.CommandExecutor"
              ref="commandExecutorBean"/>
 </blueprint>
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/org/openecomp/appc/default.properties b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/org/openecomp/appc/default.properties
index a6e3a6aea..1a4f859db 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/org/openecomp/appc/default.properties
@@ -24,8 +24,8 @@
 
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 #Property below provided by appc.properties
 appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/CommandExecutionTaskTest.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/CommandExecutionTaskTest.java
index daf302c3b..af62a06f6 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/CommandExecutionTaskTest.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/CommandExecutionTaskTest.java
@@ -22,30 +22,30 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executor;
+package org.onap.appc.executor;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.openecomp.appc.domainmodel.lcm.ActionIdentifiers;
-import org.openecomp.appc.domainmodel.lcm.CommonHeader;
-import org.openecomp.appc.domainmodel.lcm.Flags;
-import org.openecomp.appc.domainmodel.lcm.RequestContext;
-import org.openecomp.appc.domainmodel.lcm.ResponseContext;
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.domainmodel.lcm.Status;
-import org.openecomp.appc.domainmodel.lcm.VNFContext;
-import org.openecomp.appc.domainmodel.lcm.VNFOperation;
-import org.openecomp.appc.executor.impl.CommandTask;
-import org.openecomp.appc.executor.impl.CommandTaskFactory;
-import org.openecomp.appc.executor.impl.LCMCommandTask;
-import org.openecomp.appc.executor.impl.LCMReadonlyCommandTask;
-import org.openecomp.appc.executor.objects.CommandResponse;
-import org.openecomp.appc.lifecyclemanager.LifecycleManager;
-import org.openecomp.appc.requesthandler.RequestHandler;
-import org.openecomp.appc.workflow.WorkFlowManager;
-import org.openecomp.appc.workflow.objects.WorkflowResponse;
+import org.onap.appc.domainmodel.lcm.ActionIdentifiers;
+import org.onap.appc.domainmodel.lcm.CommonHeader;
+import org.onap.appc.domainmodel.lcm.Flags;
+import org.onap.appc.domainmodel.lcm.RequestContext;
+import org.onap.appc.domainmodel.lcm.ResponseContext;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.domainmodel.lcm.Status;
+import org.onap.appc.domainmodel.lcm.VNFContext;
+import org.onap.appc.domainmodel.lcm.VNFOperation;
+import org.onap.appc.executor.impl.CommandTask;
+import org.onap.appc.executor.impl.CommandTaskFactory;
+import org.onap.appc.executor.impl.LCMCommandTask;
+import org.onap.appc.executor.impl.LCMReadonlyCommandTask;
+import org.onap.appc.executor.objects.CommandResponse;
+import org.onap.appc.lifecyclemanager.LifecycleManager;
+import org.onap.appc.requesthandler.RequestHandler;
+import org.onap.appc.workflow.WorkFlowManager;
+import org.onap.appc.workflow.objects.WorkflowResponse;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutor.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutor.java
index fa9257faa..cd02c260d 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutor.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutor.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executor;
+package org.onap.appc.executor;
 /**
  *
  */
@@ -34,19 +34,19 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.appc.domainmodel.lcm.ActionIdentifiers;
-import org.openecomp.appc.domainmodel.lcm.CommonHeader;
-import org.openecomp.appc.domainmodel.lcm.Flags;
-import org.openecomp.appc.domainmodel.lcm.RequestContext;
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.domainmodel.lcm.VNFContext;
-import org.openecomp.appc.domainmodel.lcm.VNFOperation;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.executionqueue.ExecutionQueueService;
-import org.openecomp.appc.executor.impl.*;
-import org.openecomp.appc.lifecyclemanager.LifecycleManager;
-import org.openecomp.appc.requesthandler.RequestHandler;
-import org.openecomp.appc.workflow.WorkFlowManager;
+import org.onap.appc.domainmodel.lcm.ActionIdentifiers;
+import org.onap.appc.domainmodel.lcm.CommonHeader;
+import org.onap.appc.domainmodel.lcm.Flags;
+import org.onap.appc.domainmodel.lcm.RequestContext;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.domainmodel.lcm.VNFContext;
+import org.onap.appc.domainmodel.lcm.VNFOperation;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.executionqueue.ExecutionQueueService;
+import org.onap.appc.executor.impl.*;
+import org.onap.appc.lifecyclemanager.LifecycleManager;
+import org.onap.appc.requesthandler.RequestHandler;
+import org.onap.appc.workflow.WorkFlowManager;
 import org.powermock.api.mockito.PowerMockito;
 
 import java.util.Date;
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/resources/org/openecomp/appc/default.properties b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/resources/org/openecomp/appc/default.properties
index f7089f1e4..c5130b3ab 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/resources/org/openecomp/appc/default.properties
@@ -23,9 +23,9 @@
 ###
 
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded to supply configuration options
-#org.openecomp.appc.bootstrap.file=executor-test.properties
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+#org.onap.appc.bootstrap.file=executor-test.properties
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 
 #
@@ -72,12 +72,12 @@ 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.openecomp.appc.logging.path=${user.home},etc,../etc,.
-org.openecomp.appc.logging.file=logback.xml
+org.onap.appc.logging.path=${user.home},etc,../etc,.
+org.onap.appc.logging.file=logback.xml
 
-org.openecomp.appc.db.url.%s", schema), "");
-org.openecomp.appc.db.user.%s", schema), "");
-org.openecomp.appc.db.pass.%s", schema), "");
+org.onap.appc.db.url.%s", schema), "");
+org.onap.appc.db.user.%s", schema), "");
+org.onap.appc.db.pass.%s", schema), "");
 
 #Property below provided by appc.properties
 appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-features/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-features/pom.xml
index e5b895d4d..bed8584dc 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-features/pom.xml
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-features/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-command-executor</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<name>appc-command-executor-features</name>
@@ -13,12 +13,12 @@
 
   <dependencies>
      <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-command-executor-api</artifactId>
       <version>${project.version}</version>
     </dependency>
      <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-command-executor-core</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-features/src/main/resources/features.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-features/src/main/resources/features.xml
index fefff52ec..fc1ec092e 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-features/src/main/resources/features.xml
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-features/src/main/resources/features.xml
@@ -29,9 +29,9 @@
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0  http://karaf.apache.org/xmlns/features/v1.2.0">
 
     <feature name='appc-command-executor' description="application executor" version='${project.version}'>
-        <bundle>mvn:org.openecomp.appc/execution-queue-management-lib/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-command-executor-api/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-command-executor-core/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/execution-queue-management-lib/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-command-executor-api/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-command-executor-core/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-installer/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-installer/pom.xml
index fb7597b5f..407af7ef9 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-installer/pom.xml
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-installer/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-command-executor</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -15,14 +15,14 @@
         <application.name>appc-command-executor</application.name>
         <features.boot>appc-command-executor</features.boot>
         <features.repositories>
-            mvn:org.openecomp.appc/appc-command-executor-features/${project.version}/xml/features
+            mvn:org.onap.appc/appc-command-executor-features/${project.version}/xml/features
         </features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-command-executor-features</artifactId>
             <version>${project.version}</version>
             <classifier>features</classifier>
@@ -35,12 +35,12 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-command-executor-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-command-executor-core</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-dispatcher/appc-command-executor/pom.xml b/appc-dispatcher/appc-command-executor/pom.xml
index 9fcf1fc9a..69cf83900 100644
--- a/appc-dispatcher/appc-command-executor/pom.xml
+++ b/appc-dispatcher/appc-command-executor/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-dispatcher</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml
index 9788241eb..749764bc7 100644
--- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-dispatcher-common</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -32,7 +32,7 @@
           <scope>compile</scope>
       </dependency>
       <dependency>
-          <groupId>org.openecomp.appc</groupId>
+          <groupId>org.onap.appc</groupId>
           <artifactId>appc-common</artifactId>
           <version>${project.version}</version>
       </dependency>
@@ -50,8 +50,8 @@
             <configuration>
                 <instructions>
                     <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                    <Export-Package>org.openecomp.appc.dao.util</Export-Package>
-                    <Import-Package>org.openecomp.appc.configuration,*;resolution:=optional</Import-Package>
+                    <Export-Package>org.onap.appc.dao.util</Export-Package>
+                    <Import-Package>org.onap.appc.configuration,*;resolution:=optional</Import-Package>
                     <Embed-Dependency>mariadb-java-client</Embed-Dependency>
                     <Embed-Transitive>true</Embed-Transitive>
                 </instructions>
diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/AppcJdbcConnectionFactory.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/AppcJdbcConnectionFactory.java
index a33b0fe44..e62f03da3 100644
--- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/AppcJdbcConnectionFactory.java
+++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/AppcJdbcConnectionFactory.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dao.util;
+package org.onap.appc.dao.util;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DBUtils.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DBUtils.java
index c4b788057..447dce8fc 100644
--- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DBUtils.java
+++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DBUtils.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dao.util;
+package org.onap.appc.dao.util;
 
 import java.sql.*;
 
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 
 @Deprecated
 public class DBUtils {
@@ -44,9 +44,9 @@ public class DBUtils {
 
 	public static Connection getConnection(String schema) throws SQLException {
 		DriverManager.registerDriver(new org.mariadb.jdbc.Driver());
-		String dbURL = configuration.getProperty(String.format("org.openecomp.appc.db.url.%s", schema), "");
-		String userName = configuration.getProperty(String.format("org.openecomp.appc.db.user.%s", schema), "");
-		String password = configuration.getProperty(String.format("org.openecomp.appc.db.pass.%s", schema), "");
+		String dbURL = configuration.getProperty(String.format("org.onap.appc.db.url.%s", schema), "");
+		String userName = configuration.getProperty(String.format("org.onap.appc.db.user.%s", schema), "");
+		String password = configuration.getProperty(String.format("org.onap.appc.db.pass.%s", schema), "");
 		return DriverManager.getConnection(dbURL, userName, password);
 	}
 
diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DefaultJdbcConnectionFactory.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DefaultJdbcConnectionFactory.java
index 0704014df..88599ac72 100644
--- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DefaultJdbcConnectionFactory.java
+++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DefaultJdbcConnectionFactory.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dao.util;
+package org.onap.appc.dao.util;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/JdbcConnectionFactory.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/JdbcConnectionFactory.java
index 0bb526515..1a47db3f7 100644
--- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/JdbcConnectionFactory.java
+++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/JdbcConnectionFactory.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dao.util;
+package org.onap.appc.dao.util;
 
 import java.sql.Connection;
 
diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/JdbcRuntimeException.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/JdbcRuntimeException.java
index 70bc3c6dd..8e606fe94 100644
--- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/JdbcRuntimeException.java
+++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/JdbcRuntimeException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dao.util;
+package org.onap.appc.dao.util;
 
 public class JdbcRuntimeException extends RuntimeException {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/Messages.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/Messages.java
index e375d4fa3..6330793b7 100644
--- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/Messages.java
+++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/Messages.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.dao.util;
+package org.onap.appc.dao.util;
 
 public enum Messages {
     EXP_JDBC_CONNECT("Error connecting to JDBC URL [%s]."),
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/pom.xml
index 1ab18e08f..204e9f2e4 100644
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-dispatcher-common</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -24,7 +24,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
-                        <Export-Package>org.openecomp.appc.domainmodel.lcm</Export-Package>
+                        <Export-Package>org.onap.appc.domainmodel.lcm</Export-Package>
                         <Embed-Transitive>true</Embed-Transitive>
 
                     </instructions>
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionIdentifiers.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionIdentifiers.java
index 6aa9ef507..bb5b4cdab 100644
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionIdentifiers.java
+++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionIdentifiers.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.domainmodel.lcm;
+package org.onap.appc.domainmodel.lcm;
 
 
 public class ActionIdentifiers {
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionLevel.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionLevel.java
index 67d0fab5c..230812cef 100644
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionLevel.java
+++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionLevel.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.domainmodel.lcm;
+package org.onap.appc.domainmodel.lcm;
 
 public enum ActionLevel {
     VNF,VM,VNFC
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/CommonHeader.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/CommonHeader.java
index faa61a8d0..7c44efecb 100644
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/CommonHeader.java
+++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/CommonHeader.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.domainmodel.lcm;
+package org.onap.appc.domainmodel.lcm;
 
 import java.time.Instant;
 
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Flags.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Flags.java
index f500890fc..4102955f0 100644
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Flags.java
+++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Flags.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.domainmodel.lcm;
+package org.onap.appc.domainmodel.lcm;
 
 
 public class Flags {
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/OperationType.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/OperationType.java
index becca04b6..b5b017e40 100644
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/OperationType.java
+++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/OperationType.java
@@ -22,7 +22,7 @@
         * ============LICENSE_END=========================================================
         */
 
-package org.openecomp.appc.domainmodel.lcm;
+package org.onap.appc.domainmodel.lcm;
 
 public enum OperationType {
     ReadOnly,BuiltIn,OrchestrationStatusUpdate,OperationStatusUpdate
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RequestContext.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RequestContext.java
index 9a3dab1e3..12ad5ae95 100644
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RequestContext.java
+++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RequestContext.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.domainmodel.lcm;
+package org.onap.appc.domainmodel.lcm;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ResponseContext.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ResponseContext.java
index 945b5183b..da3a6be69 100644
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ResponseContext.java
+++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ResponseContext.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.domainmodel.lcm;
+package org.onap.appc.domainmodel.lcm;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RuntimeContext.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RuntimeContext.java
index 7b85f808b..2580f1830 100644
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RuntimeContext.java
+++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RuntimeContext.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.domainmodel.lcm;
+package org.onap.appc.domainmodel.lcm;
 
 import java.time.Instant;
 import java.util.Date;
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Status.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Status.java
index 8da7b41d1..2f8fd1950 100644
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Status.java
+++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Status.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.domainmodel.lcm;
+package org.onap.appc.domainmodel.lcm;
 
 
 public class Status {
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFContext.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFContext.java
index fcd332cea..bcc31fcec 100644
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFContext.java
+++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFContext.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.domainmodel.lcm;
+package org.onap.appc.domainmodel.lcm;
 
 
 public class VNFContext {
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFOperation.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFOperation.java
index 316b5acb7..228005d34 100644
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFOperation.java
+++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFOperation.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.domainmodel.lcm;
+package org.onap.appc.domainmodel.lcm;
 
 public enum VNFOperation {
     Configure, Test, HealthCheck, Start, Terminate, Restart, Rebuild, Stop, ConfigModify,
diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/pom.xml
index e15aada06..cc89f3c3f 100644
--- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-dispatcher-common</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -17,7 +17,7 @@
 
   <dependencies>
     <dependency>
-    	<groupId>org.openecomp.appc</groupId>
+    	<groupId>org.onap.appc</groupId>
     	<artifactId>appc-common</artifactId>
     	<version>${project.version}</version>
     </dependency>
@@ -37,7 +37,7 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
                         <Embed-Transitive>true</Embed-Transitive>
-                        <Export-Package>org.openecomp.appc.executionqueue,org.openecomp.appc.executionqueue.impl</Export-Package>
+                        <Export-Package>org.onap.appc.executionqueue,org.onap.appc.executionqueue.impl</Export-Package>
                         <Import-Package>
                             *;resolution:=optional
                         </Import-Package>
diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/ExecutionQueueService.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/ExecutionQueueService.java
index 6bda39dbf..1423962ef 100644
--- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/ExecutionQueueService.java
+++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/ExecutionQueueService.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executionqueue;
+package org.onap.appc.executionqueue;
 
 import java.util.concurrent.TimeUnit;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 
 public interface ExecutionQueueService<M extends Runnable> {
     void putMessage(M message) throws APPCException;
diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/MessageExpirationListener.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/MessageExpirationListener.java
index 62fac766f..c1f3592c6 100644
--- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/MessageExpirationListener.java
+++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/MessageExpirationListener.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executionqueue;
+package org.onap.appc.executionqueue;
 
 public interface MessageExpirationListener<M> {
     void onMessageExpiration(M message);
diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/helper/Util.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/helper/Util.java
index 8670adabd..58279e8a7 100644
--- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/helper/Util.java
+++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/helper/Util.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executionqueue.helper;
+package org.onap.appc.executionqueue.helper;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.executionqueue.impl.QueueManager;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.executionqueue.impl.QueueManager;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/ExecutionQueueServiceFactory.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/ExecutionQueueServiceFactory.java
index 9a0867f3f..f071be6f0 100644
--- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/ExecutionQueueServiceFactory.java
+++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/ExecutionQueueServiceFactory.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executionqueue.impl;
+package org.onap.appc.executionqueue.impl;
 
-import org.openecomp.appc.executionqueue.ExecutionQueueService;
+import org.onap.appc.executionqueue.ExecutionQueueService;
 
 public class ExecutionQueueServiceFactory {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/ExecutionQueueServiceImpl.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/ExecutionQueueServiceImpl.java
index c29078c27..0634a0eb2 100644
--- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/ExecutionQueueServiceImpl.java
+++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/ExecutionQueueServiceImpl.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executionqueue.impl;
+package org.onap.appc.executionqueue.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.executionqueue.ExecutionQueueService;
-import org.openecomp.appc.executionqueue.MessageExpirationListener;
-import org.openecomp.appc.executionqueue.impl.object.QueueMessage;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.executionqueue.ExecutionQueueService;
+import org.onap.appc.executionqueue.MessageExpirationListener;
+import org.onap.appc.executionqueue.impl.object.QueueMessage;
 
 import java.time.Instant;
 import java.util.concurrent.TimeUnit;
diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/QueueManager.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/QueueManager.java
index 9e1efb644..db0e3d4c5 100644
--- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/QueueManager.java
+++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/QueueManager.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executionqueue.impl;
+package org.onap.appc.executionqueue.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.executionqueue.MessageExpirationListener;
-import org.openecomp.appc.executionqueue.helper.Util;
-import org.openecomp.appc.executionqueue.impl.object.QueueMessage;
+import org.onap.appc.executionqueue.MessageExpirationListener;
+import org.onap.appc.executionqueue.helper.Util;
+import org.onap.appc.executionqueue.impl.object.QueueMessage;
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/object/QueueMessage.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/object/QueueMessage.java
index 62d4874d9..bb48da7e5 100644
--- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/object/QueueMessage.java
+++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/object/QueueMessage.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executionqueue.impl.object;
+package org.onap.appc.executionqueue.impl.object;
 
 import java.time.Instant;
 import java.util.Objects;
diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 9f8628458..4f1530ba5 100644
--- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -28,20 +28,20 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
-    <bean id="ExecutionQueueUtilBean" class="org.openecomp.appc.executionqueue.helper.Util" scope="singleton"
+    <bean id="ExecutionQueueUtilBean" class="org.onap.appc.executionqueue.helper.Util" scope="singleton"
           init-method="init">
     </bean>
 
-    <bean id="QueueManagerBean" class="org.openecomp.appc.executionqueue.impl.QueueManager" scope="singleton"
+    <bean id="QueueManagerBean" class="org.onap.appc.executionqueue.impl.QueueManager" scope="singleton"
           init-method="init" destroy-method="stop">
         <property name="executionQueueUtil" ref="ExecutionQueueUtilBean"/>
     </bean>
 
-    <bean id="ExecutionQueueServiceBean" class="org.openecomp.appc.executionqueue.impl.ExecutionQueueServiceImpl"
+    <bean id="ExecutionQueueServiceBean" class="org.onap.appc.executionqueue.impl.ExecutionQueueServiceImpl"
           scope="singleton">
         <property name="queueManager" ref="QueueManagerBean"/>
     </bean>
 
-    <service id="ExecutionQueueService" interface="org.openecomp.appc.executionqueue.ExecutionQueueService"
+    <service id="ExecutionQueueService" interface="org.onap.appc.executionqueue.ExecutionQueueService"
              ref="ExecutionQueueServiceBean"/>
 </blueprint>
diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/ExecutionQueueServiceTest.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/ExecutionQueueServiceTest.java
index 067b6c3e7..67f480d47 100644
--- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/ExecutionQueueServiceTest.java
+++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/ExecutionQueueServiceTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executionqueue;
+package org.onap.appc.executionqueue;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -31,10 +31,10 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mockito;
 import org.mockito.Spy;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.executionqueue.helper.Util;
-import org.openecomp.appc.executionqueue.impl.ExecutionQueueServiceImpl;
-import org.openecomp.appc.executionqueue.impl.QueueManager;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.executionqueue.helper.Util;
+import org.onap.appc.executionqueue.impl.ExecutionQueueServiceImpl;
+import org.onap.appc.executionqueue.impl.QueueManager;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import static org.mockito.Matchers.any;
diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/Listener.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/Listener.java
index 61c447630..ce26fd92a 100644
--- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/Listener.java
+++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/Listener.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executionqueue;
+package org.onap.appc.executionqueue;
 
-import org.openecomp.appc.executionqueue.MessageExpirationListener;
+import org.onap.appc.executionqueue.MessageExpirationListener;
 
 
 public class Listener implements MessageExpirationListener {
diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/Message.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/Message.java
index f7a61b6a8..43bd7077c 100644
--- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/Message.java
+++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/Message.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.executionqueue;
+package org.onap.appc.executionqueue;
 
 
 public class Message implements Runnable {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/pom.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/pom.xml
index 934e24f69..d340bc19b 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>lock-manager-lib</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
@@ -18,7 +18,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Export-Package>org.openecomp.appc.lockmanager.api</Export-Package>
+                        <Export-Package>org.onap.appc.lockmanager.api</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockException.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockException.java
index 8e39370c6..ab5356325 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockException.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.api;
+package org.onap.appc.lockmanager.api;
 
 
 public class LockException extends Exception {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockManager.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockManager.java
index 8290a8dda..e6a0fb778 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockManager.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockManager.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.api;
+package org.onap.appc.lockmanager.api;
 
 /**
  * Enables locking and unlocking of a resource by id.
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockRuntimeException.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockRuntimeException.java
index 894ec14c1..99df74628 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockRuntimeException.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockRuntimeException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.api;
+package org.onap.appc.lockmanager.api;
 
 public class LockRuntimeException extends RuntimeException {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/pom.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/pom.xml
index 1c52e0685..4f34bbaa9 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>lock-manager-lib</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <name>lock-manager-features</name>
@@ -13,12 +13,12 @@
 
   <dependencies>
      <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>lock-manager-api</artifactId>
       <version>${project.version}</version>
     </dependency>  	
      <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>lock-manager-impl</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/src/main/resources/features.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/src/main/resources/features.xml
index c9fd3a04a..4408b6954 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/src/main/resources/features.xml
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/src/main/resources/features.xml
@@ -30,11 +30,11 @@
         
     <feature name='lock-manager' description="lock-manager" version='${project.version}'>
         <!-- appc-common and appc-data-access-lib bundles are flagged as being a dependency -->
-        <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
-        <bundle dependency="true">mvn:org.openecomp.appc/appc-data-access-lib/${project.version}</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/appc-data-access-lib/${project.version}</bundle>
 
-    	<bundle start-level="80" start="true">mvn:org.openecomp.appc/lock-manager-api/${project.version}</bundle>
-        <bundle start-level="85" start="true">mvn:org.openecomp.appc/lock-manager-impl/${project.version}</bundle>
+    	<bundle start-level="80" start="true">mvn:org.onap.appc/lock-manager-api/${project.version}</bundle>
+        <bundle start-level="85" start="true">mvn:org.onap.appc/lock-manager-impl/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml
index 05866f635..a4334a2e0 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>lock-manager-lib</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
@@ -12,7 +12,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>lock-manager-api</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
@@ -22,7 +22,7 @@
             <artifactId>mariadb-java-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-data-access-lib</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -43,12 +43,12 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Export-Service>org.openecomp.appc.lockmanager.api.LockManager</Export-Service>
+                        <Export-Service>org.onap.appc.lockmanager.api.LockManager</Export-Service>
                         <Import-Package>
-                            org.openecomp.appc.lockmanager.api.*,
-                            org.openecomp.appc.dao.util,com.att.eelf.configuration, *;resolution:=optional
+                            org.onap.appc.lockmanager.api.*,
+                            org.onap.appc.dao.util,com.att.eelf.configuration, *;resolution:=optional
                         </Import-Package>
-                        <Private-Package>org.openecomp.appc.lockmanager.impl.*</Private-Package>
+                        <Private-Package>org.onap.appc.lockmanager.impl.*</Private-Package>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
                     </instructions>
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImpl.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImpl.java
index 33172a2da..b141d9607 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImpl.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImpl.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.inmemory;
+package org.onap.appc.lockmanager.impl.inmemory;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.openecomp.appc.lockmanager.api.LockException;
-import org.openecomp.appc.lockmanager.api.LockManager;
+import org.onap.appc.lockmanager.api.LockException;
+import org.onap.appc.lockmanager.api.LockManager;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockValue.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockValue.java
index d0bef626b..d83192c5a 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockValue.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockValue.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.inmemory;
+package org.onap.appc.lockmanager.impl.inmemory;
 
 
 public class LockValue {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/JdbcLockManager.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/JdbcLockManager.java
index 880b07ff9..9b2083101 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/JdbcLockManager.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/JdbcLockManager.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.sql;
+package org.onap.appc.lockmanager.impl.sql;
 
 import java.sql.Connection;
 
-import org.openecomp.appc.dao.util.JdbcConnectionFactory;
-import org.openecomp.appc.lockmanager.api.LockManager;
+import org.onap.appc.dao.util.JdbcConnectionFactory;
+import org.onap.appc.lockmanager.api.LockManager;
 
 public abstract class JdbcLockManager implements LockManager {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/Messages.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/Messages.java
index f40a8134e..769d94257 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/Messages.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/Messages.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.sql;
+package org.onap.appc.lockmanager.impl.sql;
 
 public enum Messages {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/MySqlConnectionFactory.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/MySqlConnectionFactory.java
index c9af310e7..4df89541d 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/MySqlConnectionFactory.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/MySqlConnectionFactory.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.sql;
+package org.onap.appc.lockmanager.impl.sql;
 
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
-import org.openecomp.appc.dao.util.DefaultJdbcConnectionFactory;
+import org.onap.appc.dao.util.DefaultJdbcConnectionFactory;
 
 public class MySqlConnectionFactory extends DefaultJdbcConnectionFactory {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/LockRecord.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/LockRecord.java
index 250e75983..ff0e63b8d 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/LockRecord.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/LockRecord.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.sql.optimistic;
+package org.onap.appc.lockmanager.impl.sql.optimistic;
 
 class LockRecord {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManager.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManager.java
index da75fb344..d1dd2c5a3 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManager.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManager.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.sql.optimistic;
+package org.onap.appc.lockmanager.impl.sql.optimistic;
 
 import java.sql.SQLException;
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/SqlLockManager.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/SqlLockManager.java
index d4fb7d155..26ec6a274 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/SqlLockManager.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/SqlLockManager.java
@@ -22,17 +22,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.sql.optimistic;
+package org.onap.appc.lockmanager.impl.sql.optimistic;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.openecomp.appc.lockmanager.api.LockException;
-import org.openecomp.appc.lockmanager.api.LockRuntimeException;
-import org.openecomp.appc.lockmanager.impl.sql.JdbcLockManager;
-import org.openecomp.appc.lockmanager.impl.sql.Messages;
+import org.onap.appc.lockmanager.api.LockException;
+import org.onap.appc.lockmanager.api.LockRuntimeException;
+import org.onap.appc.lockmanager.impl.sql.JdbcLockManager;
+import org.onap.appc.lockmanager.impl.sql.Messages;
 
 abstract class SqlLockManager extends JdbcLockManager {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/LockRecord.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/LockRecord.java
index 45f974737..1960ba9a3 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/LockRecord.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/LockRecord.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.sql.pessimistic;
+package org.onap.appc.lockmanager.impl.sql.pessimistic;
 
 class LockRecord {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManager.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManager.java
index b54e3e622..b76f15c8f 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManager.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManager.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.sql.pessimistic;
+package org.onap.appc.lockmanager.impl.sql.pessimistic;
 
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.openecomp.appc.lockmanager.api.LockRuntimeException;
+import org.onap.appc.lockmanager.api.LockRuntimeException;
 
 public class MySqlLockManager extends SqlLockManager {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/SqlLockManager.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/SqlLockManager.java
index 68fa38b92..a1536d969 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/SqlLockManager.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/SqlLockManager.java
@@ -22,17 +22,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.sql.pessimistic;
+package org.onap.appc.lockmanager.impl.sql.pessimistic;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.openecomp.appc.lockmanager.api.LockException;
-import org.openecomp.appc.lockmanager.api.LockRuntimeException;
-import org.openecomp.appc.lockmanager.impl.sql.JdbcLockManager;
-import org.openecomp.appc.lockmanager.impl.sql.Messages;
+import org.onap.appc.lockmanager.api.LockException;
+import org.onap.appc.lockmanager.api.LockRuntimeException;
+import org.onap.appc.lockmanager.impl.sql.JdbcLockManager;
+import org.onap.appc.lockmanager.impl.sql.Messages;
 
 abstract class SqlLockManager extends JdbcLockManager {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 1fc105611..34383cbb7 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -28,13 +28,13 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
-    <!--<bean id="lockManagerInMemoryBean" class="org.openecomp.appc.lockmanager.impl.inmemory.LockManagerInMemoryImpl" factory-method="getLockManager" scope="singleton"/>-->
-    <!--<service id="lockManagerInMemoryService" interface="org.openecomp.appc.lockmanager.api.LockManager" ref="lockManagerInMemoryBean"/>-->
+    <!--<bean id="lockManagerInMemoryBean" class="org.onap.appc.lockmanager.impl.inmemory.LockManagerInMemoryImpl" factory-method="getLockManager" scope="singleton"/>-->
+    <!--<service id="lockManagerInMemoryService" interface="org.onap.appc.lockmanager.api.LockManager" ref="lockManagerInMemoryBean"/>-->
 
-    <service id="lockManagerMySqlOptimisticService" interface="org.openecomp.appc.lockmanager.api.LockManager">
-        <bean class="org.openecomp.appc.lockmanager.impl.sql.optimistic.MySqlLockManager">
+    <service id="lockManagerMySqlOptimisticService" interface="org.onap.appc.lockmanager.api.LockManager">
+        <bean class="org.onap.appc.lockmanager.impl.sql.optimistic.MySqlLockManager">
             <property name="connectionFactory">
-                <bean class="org.openecomp.appc.dao.util.AppcJdbcConnectionFactory">
+                <bean class="org.onap.appc.dao.util.AppcJdbcConnectionFactory">
                     <property name="schema" value="sdnctl"/>
                 </bean>
             </property>
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/api/LockManagerBaseTests.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/api/LockManagerBaseTests.java
index aba6889e5..9f7e84c43 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/api/LockManagerBaseTests.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/api/LockManagerBaseTests.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.api;
+package org.onap.appc.lockmanager.api;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.lockmanager.api.LockException;
-import org.openecomp.appc.lockmanager.api.LockManager;
+import org.onap.appc.lockmanager.api.LockException;
+import org.onap.appc.lockmanager.api.LockManager;
 
 public abstract class LockManagerBaseTests {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImplTest.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImplTest.java
index dd9b9d80c..8d2dd7516 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImplTest.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImplTest.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.inmemory;
+package org.onap.appc.lockmanager.impl.inmemory;
 
-import org.openecomp.appc.lockmanager.api.LockManager;
-import org.openecomp.appc.lockmanager.api.LockManagerBaseTests;
-import org.openecomp.appc.lockmanager.impl.inmemory.LockManagerInMemoryImpl;
+import org.onap.appc.lockmanager.api.LockManager;
+import org.onap.appc.lockmanager.api.LockManagerBaseTests;
+import org.onap.appc.lockmanager.impl.inmemory.LockManagerInMemoryImpl;
 
 
 public class LockManagerInMemoryImplTest extends LockManagerBaseTests {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/MySqlLockManagerBaseTests.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/MySqlLockManagerBaseTests.java
index 2691b6a74..b8cd95b94 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/MySqlLockManagerBaseTests.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/MySqlLockManagerBaseTests.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.sql;
+package org.onap.appc.lockmanager.impl.sql;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
-import org.openecomp.appc.dao.util.DefaultJdbcConnectionFactory;
-import org.openecomp.appc.lockmanager.api.LockManager;
-import org.openecomp.appc.lockmanager.api.LockManagerBaseTests;
-import org.openecomp.appc.lockmanager.impl.sql.JdbcLockManager;
-import org.openecomp.appc.lockmanager.impl.sql.MySqlConnectionFactory;
+import org.onap.appc.dao.util.DefaultJdbcConnectionFactory;
+import org.onap.appc.lockmanager.api.LockManager;
+import org.onap.appc.lockmanager.api.LockManagerBaseTests;
+import org.onap.appc.lockmanager.impl.sql.JdbcLockManager;
+import org.onap.appc.lockmanager.impl.sql.MySqlConnectionFactory;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/Synchronizer.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/Synchronizer.java
index 8697c374c..ae92a4a9d 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/Synchronizer.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/Synchronizer.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.sql;
+package org.onap.appc.lockmanager.impl.sql;
 
 public class Synchronizer {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/SynchronizerReceiver.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/SynchronizerReceiver.java
index de6a20cd0..e6caad564 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/SynchronizerReceiver.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/SynchronizerReceiver.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.sql;
+package org.onap.appc.lockmanager.impl.sql;
 
 public interface SynchronizerReceiver {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManagerMock.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManagerMock.java
index a2a9a5ffd..f9c072e6c 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManagerMock.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManagerMock.java
@@ -22,17 +22,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.sql.optimistic;
+package org.onap.appc.lockmanager.impl.sql.optimistic;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.openecomp.appc.lockmanager.impl.sql.Synchronizer;
-import org.openecomp.appc.lockmanager.impl.sql.SynchronizerReceiver;
-import org.openecomp.appc.lockmanager.impl.sql.optimistic.LockRecord;
-import org.openecomp.appc.lockmanager.impl.sql.optimistic.MySqlLockManager;
+import org.onap.appc.lockmanager.impl.sql.Synchronizer;
+import org.onap.appc.lockmanager.impl.sql.SynchronizerReceiver;
+import org.onap.appc.lockmanager.impl.sql.optimistic.LockRecord;
+import org.onap.appc.lockmanager.impl.sql.optimistic.MySqlLockManager;
 
 class MySqlLockManagerMock extends MySqlLockManager implements SynchronizerReceiver {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/TestMySqlLockManager.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/TestMySqlLockManager.java
index 696c187e7..d652c7523 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/TestMySqlLockManager.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/TestMySqlLockManager.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.sql.optimistic;
+package org.onap.appc.lockmanager.impl.sql.optimistic;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.lockmanager.api.LockException;
-import org.openecomp.appc.lockmanager.impl.sql.JdbcLockManager;
-import org.openecomp.appc.lockmanager.impl.sql.MySqlLockManagerBaseTests;
-import org.openecomp.appc.lockmanager.impl.sql.Synchronizer;
+import org.onap.appc.lockmanager.api.LockException;
+import org.onap.appc.lockmanager.impl.sql.JdbcLockManager;
+import org.onap.appc.lockmanager.impl.sql.MySqlLockManagerBaseTests;
+import org.onap.appc.lockmanager.impl.sql.Synchronizer;
 
 import java.util.concurrent.*;
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManagerMock.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManagerMock.java
index 64416f040..a4bbd3406 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManagerMock.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManagerMock.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.sql.pessimistic;
+package org.onap.appc.lockmanager.impl.sql.pessimistic;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -32,11 +32,11 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.openecomp.appc.lockmanager.api.LockRuntimeException;
-import org.openecomp.appc.lockmanager.impl.sql.Synchronizer;
-import org.openecomp.appc.lockmanager.impl.sql.SynchronizerReceiver;
-import org.openecomp.appc.lockmanager.impl.sql.pessimistic.LockRecord;
-import org.openecomp.appc.lockmanager.impl.sql.pessimistic.MySqlLockManager;
+import org.onap.appc.lockmanager.api.LockRuntimeException;
+import org.onap.appc.lockmanager.impl.sql.Synchronizer;
+import org.onap.appc.lockmanager.impl.sql.SynchronizerReceiver;
+import org.onap.appc.lockmanager.impl.sql.pessimistic.LockRecord;
+import org.onap.appc.lockmanager.impl.sql.pessimistic.MySqlLockManager;
 
 class MySqlLockManagerMock extends MySqlLockManager implements SynchronizerReceiver {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/TestMySqlLockManager.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/TestMySqlLockManager.java
index f1039a451..c54cfc81a 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/TestMySqlLockManager.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/TestMySqlLockManager.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lockmanager.impl.sql.pessimistic;
+package org.onap.appc.lockmanager.impl.sql.pessimistic;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.lockmanager.api.LockException;
-import org.openecomp.appc.lockmanager.api.LockRuntimeException;
-import org.openecomp.appc.lockmanager.impl.sql.JdbcLockManager;
-import org.openecomp.appc.lockmanager.impl.sql.MySqlLockManagerBaseTests;
-import org.openecomp.appc.lockmanager.impl.sql.Synchronizer;
-import org.openecomp.appc.lockmanager.impl.sql.pessimistic.MySqlLockManager;
+import org.onap.appc.lockmanager.api.LockException;
+import org.onap.appc.lockmanager.api.LockRuntimeException;
+import org.onap.appc.lockmanager.impl.sql.JdbcLockManager;
+import org.onap.appc.lockmanager.impl.sql.MySqlLockManagerBaseTests;
+import org.onap.appc.lockmanager.impl.sql.Synchronizer;
+import org.onap.appc.lockmanager.impl.sql.pessimistic.MySqlLockManager;
 
 import java.util.concurrent.*;
 
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/pom.xml
index 13b0375b9..7c6ae9970 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>appc-dispatcher-common</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>lock-manager-lib</artifactId>
diff --git a/appc-dispatcher/appc-dispatcher-common/pom.xml b/appc-dispatcher/appc-dispatcher-common/pom.xml
index 69e483bd6..8afae5e4a 100644
--- a/appc-dispatcher/appc-dispatcher-common/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-common/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-dispatcher</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/pom.xml
index a17ffdedc..8f17c3ff2 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-dispatcher-common</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -24,8 +24,8 @@
 					<instructions>
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Version>${project.version}</Bundle-Version>
-						<Export-Package>org.openecomp.appc.rankingframework</Export-Package>
-						<Private-Package>org.openecomp.appc.rankingframework.impl</Private-Package>
+						<Export-Package>org.onap.appc.rankingframework</Export-Package>
+						<Private-Package>org.onap.appc.rankingframework.impl</Private-Package>
 						<Embed-Dependency>eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
 						<Import-Package>!groovy.lang,!javax.jms,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.codehaus.janino,!com.ibm.icu.*,!com.sun.faces.*,!org.apache.log,*</Import-Package>
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/AbstractRankedAttributesResolverFactory.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/AbstractRankedAttributesResolverFactory.java
index bd8413464..99ac8a74e 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/AbstractRankedAttributesResolverFactory.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/AbstractRankedAttributesResolverFactory.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework;
+package org.onap.appc.rankingframework;
 
-import org.openecomp.appc.rankingframework.impl.DefaultRankedAttributesTreeFactory;
+import org.onap.appc.rankingframework.impl.DefaultRankedAttributesTreeFactory;
 
 public abstract class AbstractRankedAttributesResolverFactory implements RankedAttributesResolverFactory {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/ConfigurationEntry.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/ConfigurationEntry.java
index 163c355b4..66c4ce7da 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/ConfigurationEntry.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/ConfigurationEntry.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework;
+package org.onap.appc.rankingframework;
 
 public interface ConfigurationEntry<R> {
     Object getAttributeValue(String name);
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/ConfigurationSet.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/ConfigurationSet.java
index af7698cf6..461d197e7 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/ConfigurationSet.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/ConfigurationSet.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework;
+package org.onap.appc.rankingframework;
 
 import java.util.Collection;
 
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesContext.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesContext.java
index ee2efa887..09e749852 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesContext.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesContext.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework;
+package org.onap.appc.rankingframework;
 
 public interface RankedAttributesContext {
     Object getAttributeValue(String name);
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesResolver.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesResolver.java
index 077208cf1..bd9da0911 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesResolver.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesResolver.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework;
+package org.onap.appc.rankingframework;
 
 public interface RankedAttributesResolver<R> {
     R resolve(RankedAttributesContext context);
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesResolverFactory.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesResolverFactory.java
index 9461ded08..4f5a85299 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesResolverFactory.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesResolverFactory.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework;
+package org.onap.appc.rankingframework;
 
 public interface RankedAttributesResolverFactory {
     <R> RankedAttributesResolver<R> create(ConfigurationSet<R> config);
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/BacktraceStrategy.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/BacktraceStrategy.java
index e6d35ac7f..6523fef65 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/BacktraceStrategy.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/BacktraceStrategy.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework.impl;
+package org.onap.appc.rankingframework.impl;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.openecomp.appc.rankingframework.RankedAttributesContext;
+import org.onap.appc.rankingframework.RankedAttributesContext;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/CompositeNode.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/CompositeNode.java
index 53781cc67..8d15c5632 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/CompositeNode.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/CompositeNode.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework.impl;
+package org.onap.appc.rankingframework.impl;
 
 import java.util.Map;
 
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Constants.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Constants.java
index ac7be0106..2e4ffd8e1 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Constants.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Constants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework.impl;
+package org.onap.appc.rankingframework.impl;
 
 class Constants {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/DefaultRankedAttributesTreeFactory.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/DefaultRankedAttributesTreeFactory.java
index fa33d6e63..4d59735b5 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/DefaultRankedAttributesTreeFactory.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/DefaultRankedAttributesTreeFactory.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework.impl;
+package org.onap.appc.rankingframework.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import org.openecomp.appc.rankingframework.ConfigurationSet;
-import org.openecomp.appc.rankingframework.RankedAttributesResolver;
-import org.openecomp.appc.rankingframework.RankedAttributesResolverFactory;
+import org.onap.appc.rankingframework.ConfigurationSet;
+import org.onap.appc.rankingframework.RankedAttributesResolver;
+import org.onap.appc.rankingframework.RankedAttributesResolverFactory;
 
 public final class DefaultRankedAttributesTreeFactory implements RankedAttributesResolverFactory {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/LeafNode.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/LeafNode.java
index 61bc61d5a..c6bb97378 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/LeafNode.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/LeafNode.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework.impl;
+package org.onap.appc.rankingframework.impl;
 
 class LeafNode<R> extends NodeBase<R> {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Node.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Node.java
index 9c9b76b5b..940e50972 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Node.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Node.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework.impl;
+package org.onap.appc.rankingframework.impl;
 
 interface Node<R> {
     enum Type {
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/NodeBase.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/NodeBase.java
index 996c29e5e..1075cca50 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/NodeBase.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/NodeBase.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework.impl;
+package org.onap.appc.rankingframework.impl;
 
 import java.util.UUID;
 
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/RankedAttributesTree.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/RankedAttributesTree.java
index b90ace3ca..f3e3191ec 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/RankedAttributesTree.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/RankedAttributesTree.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework.impl;
+package org.onap.appc.rankingframework.impl;
 
 import java.util.List;
 
-import org.openecomp.appc.rankingframework.RankedAttributesContext;
-import org.openecomp.appc.rankingframework.RankedAttributesResolver;
+import org.onap.appc.rankingframework.RankedAttributesContext;
+import org.onap.appc.rankingframework.RankedAttributesResolver;
 
 class RankedAttributesTree<R> implements RankedAttributesResolver<R> {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/RankedAttributesTreeBuilder.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/RankedAttributesTreeBuilder.java
index 0c9d3bd03..2a7cfbfe0 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/RankedAttributesTreeBuilder.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/RankedAttributesTreeBuilder.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework.impl;
+package org.onap.appc.rankingframework.impl;
 
 import java.util.HashMap;
 
-import org.openecomp.appc.rankingframework.ConfigurationEntry;
-import org.openecomp.appc.rankingframework.ConfigurationSet;
+import org.onap.appc.rankingframework.ConfigurationEntry;
+import org.onap.appc.rankingframework.ConfigurationSet;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Strategy.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Strategy.java
index d2fc1b964..36f898163 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Strategy.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Strategy.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework.impl;
+package org.onap.appc.rankingframework.impl;
 
 import java.util.List;
 
-import org.openecomp.appc.rankingframework.RankedAttributesContext;
+import org.onap.appc.rankingframework.RankedAttributesContext;
 
 interface Strategy {
     <R> R resolve(CompositeNode<R> root, List<String> rankedNames, RankedAttributesContext context);
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Utils.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Utils.java
index 22da46add..fb18377f9 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Utils.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Utils.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework.impl;
+package org.onap.appc.rankingframework.impl;
 
 class Utils {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/test/java/org/openecomp/appc/rankingframework/TestRankingFramework.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/test/java/org/openecomp/appc/rankingframework/TestRankingFramework.java
index 48a7753f9..99376923f 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/test/java/org/openecomp/appc/rankingframework/TestRankingFramework.java
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/test/java/org/openecomp/appc/rankingframework/TestRankingFramework.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.rankingframework;
+package org.onap.appc.rankingframework;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -32,11 +32,11 @@ import java.util.Map;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.rankingframework.AbstractRankedAttributesResolverFactory;
-import org.openecomp.appc.rankingframework.ConfigurationEntry;
-import org.openecomp.appc.rankingframework.ConfigurationSet;
-import org.openecomp.appc.rankingframework.RankedAttributesContext;
-import org.openecomp.appc.rankingframework.RankedAttributesResolver;
+import org.onap.appc.rankingframework.AbstractRankedAttributesResolverFactory;
+import org.onap.appc.rankingframework.ConfigurationEntry;
+import org.onap.appc.rankingframework.ConfigurationSet;
+import org.onap.appc.rankingframework.RankedAttributesContext;
+import org.onap.appc.rankingframework.RankedAttributesResolver;
 
 public class  TestRankingFramework {
 
diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/test/resources/logback.xml b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/test/resources/logback.xml
index 36b985cec..5733ce02c 100644
--- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/test/resources/logback.xml
+++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/test/resources/logback.xml
@@ -39,7 +39,7 @@
 		</encoder>
 	</appender>
 
-	<logger name="org.openecomp.appc" level="DEBUG" additivity="false">
+	<logger name="org.onap.appc" level="DEBUG" additivity="false">
 		<appender-ref ref="FILE" />
 	</logger>
 
diff --git a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/pom.xml b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/pom.xml
index 857a9f1a2..3e9a24bfa 100644
--- a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>appc-dispatcher-common</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -13,12 +13,12 @@
     <name>transaction-recorder</name>
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-common</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-data-access-lib</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -39,9 +39,9 @@
                         <Bundle-Version>${project.version}</Bundle-Version>
                         <Embed-Dependency>appc-common,eelf-core,logback-core,logback-classic,appc-data-access-lib;scope=compile|runtime;inline=false</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
-                        <Export-Service>org.openecomp.appc.transactionrecorder.TransactionRecorder</Export-Service>
+                        <Export-Service>org.onap.appc.transactionrecorder.TransactionRecorder</Export-Service>
                         <Import-Package>!javax.*,!groovy.lang,!org.apache.log,!org.apache.log4j.*,!org.codehaus.jackson.*,!org.codehaus.jackson.map.*,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.apache.commons.lang3,!org.codehaus.janino,!org.jasypt.*,!com.ibm.icu.*,!com.sun.faces.*,*;resolution:=optional</Import-Package>
-                        <Export-Package>org.openecomp.appc.transactionrecorder,org.openecomp.appc.transactionrecorder.objects</Export-Package>
+                        <Export-Package>org.onap.appc.transactionrecorder,org.onap.appc.transactionrecorder.objects</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/TransactionRecorder.java b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/TransactionRecorder.java
index d50cce8db..8f3c51129 100644
--- a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/TransactionRecorder.java
+++ b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/TransactionRecorder.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.transactionrecorder;
+package org.onap.appc.transactionrecorder;
 
 
-import org.openecomp.appc.transactionrecorder.objects.TransactionRecord;
+import org.onap.appc.transactionrecorder.objects.TransactionRecord;
 
 
 public interface TransactionRecorder {
diff --git a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/impl/TransactionRecorderImpl.java b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/impl/TransactionRecorderImpl.java
index 1601177c9..89e0d9281 100644
--- a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/impl/TransactionRecorderImpl.java
+++ b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/impl/TransactionRecorderImpl.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.transactionrecorder.impl;
+package org.onap.appc.transactionrecorder.impl;
 
-import org.openecomp.appc.dao.util.DBUtils;
-import org.openecomp.appc.transactionrecorder.TransactionRecorder;
-import org.openecomp.appc.transactionrecorder.objects.TransactionRecord;
+import org.onap.appc.dao.util.DBUtils;
+import org.onap.appc.transactionrecorder.TransactionRecorder;
+import org.onap.appc.transactionrecorder.objects.TransactionRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/objects/TransactionRecord.java b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/objects/TransactionRecord.java
index 8e45d82f8..ba3af9985 100644
--- a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/objects/TransactionRecord.java
+++ b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/objects/TransactionRecord.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.transactionrecorder.objects;
+package org.onap.appc.transactionrecorder.objects;
 
 import java.time.Instant;
 
diff --git a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index d157ffa57..ba8d9f8a0 100644
--- a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -29,6 +29,6 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
-    <bean id="transactionRecorderBean" class="org.openecomp.appc.transactionrecorder.impl.TransactionRecorderImpl" scope="singleton" ></bean>
-    <service id="transactionRecorderService" interface="org.openecomp.appc.transactionrecorder.TransactionRecorder" ref="transactionRecorderBean"/>
+    <bean id="transactionRecorderBean" class="org.onap.appc.transactionrecorder.impl.TransactionRecorderImpl" scope="singleton" ></bean>
+    <service id="transactionRecorderService" interface="org.onap.appc.transactionrecorder.TransactionRecorder" ref="transactionRecorderBean"/>
 </blueprint>
diff --git a/appc-dispatcher/appc-dispatcher-features/pom.xml b/appc-dispatcher/appc-dispatcher-features/pom.xml
index a0532af33..1882a6a32 100644
--- a/appc-dispatcher/appc-dispatcher-features/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-features/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-dispatcher</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <name>appc-dispatcher-features</name>
diff --git a/appc-dispatcher/appc-dispatcher-installer/pom.xml b/appc-dispatcher/appc-dispatcher-installer/pom.xml
index b02674d57..e648e0009 100644
--- a/appc-dispatcher/appc-dispatcher-installer/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-installer/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-dispatcher</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
 
@@ -15,16 +15,16 @@
     <application.name>appc-dispatcher</application.name>
     <features.boot>appc-dispatcher</features.boot>
 	<features.boot.licenseManager>appc-license-manager</features.boot.licenseManager>
-    <!--<features.repositories>mvn:org.openecomp.appc/appc-dispatcher-features/${project.version}/xml/features,mvn:org.openecomp.appc/appc-request-handler-features/${project.version}/xml/features,mvn:org.openecomp.appc/appc-command-executor-features/${project.version}/xml/features,mvn:org.openecomp.appc/appc-lifecycle-management-features/${project.version}/xml/features,mvn:org.openecomp.appc/appc-license-manager-features/${project.version}/xml/features,mvn:org.openecomp.appc/appc-workflow-management-features/${project.version}/xml/features,mvn:org.openecomp.appc/lock-manager-features/${project.version}/xml/features</features.repositories>-->
+    <!--<features.repositories>mvn:org.onap.appc/appc-dispatcher-features/${project.version}/xml/features,mvn:org.onap.appc/appc-request-handler-features/${project.version}/xml/features,mvn:org.onap.appc/appc-command-executor-features/${project.version}/xml/features,mvn:org.onap.appc/appc-lifecycle-management-features/${project.version}/xml/features,mvn:org.onap.appc/appc-license-manager-features/${project.version}/xml/features,mvn:org.onap.appc/appc-workflow-management-features/${project.version}/xml/features,mvn:org.onap.appc/lock-manager-features/${project.version}/xml/features</features.repositories>-->
 	
 	<!-- SEPARATED FEATURE INSTALLS -->
-	<features.repo.dispatcher>mvn:org.openecomp.appc/appc-dispatcher-features/${project.version}/xml/features</features.repo.dispatcher>
-	<features.repo.requestHandler>mvn:org.openecomp.appc/appc-request-handler-features/${project.version}/xml/features</features.repo.requestHandler>
-	<features.repo.commandExecutor>mvn:org.openecomp.appc/appc-command-executor-features/${project.version}/xml/features</features.repo.commandExecutor>
-	<features.repo.lifecycleManagement>mvn:org.openecomp.appc/appc-lifecycle-management-features/${project.version}/xml/features</features.repo.lifecycleManagement>
-	<features.repo.licenseManager>mvn:org.openecomp.appc/appc-license-manager-features/${project.version}/xml/features</features.repo.licenseManager>
-	<features.repo.workflowManagement>mvn:org.openecomp.appc/appc-workflow-management-features/${project.version}/xml/features</features.repo.workflowManagement>
-	<features.repo.lockManager>mvn:org.openecomp.appc/lock-manager-features/${project.version}/xml/features</features.repo.lockManager>
+	<features.repo.dispatcher>mvn:org.onap.appc/appc-dispatcher-features/${project.version}/xml/features</features.repo.dispatcher>
+	<features.repo.requestHandler>mvn:org.onap.appc/appc-request-handler-features/${project.version}/xml/features</features.repo.requestHandler>
+	<features.repo.commandExecutor>mvn:org.onap.appc/appc-command-executor-features/${project.version}/xml/features</features.repo.commandExecutor>
+	<features.repo.lifecycleManagement>mvn:org.onap.appc/appc-lifecycle-management-features/${project.version}/xml/features</features.repo.lifecycleManagement>
+	<features.repo.licenseManager>mvn:org.onap.appc/appc-license-manager-features/${project.version}/xml/features</features.repo.licenseManager>
+	<features.repo.workflowManagement>mvn:org.onap.appc/appc-workflow-management-features/${project.version}/xml/features</features.repo.workflowManagement>
+	<features.repo.lockManager>mvn:org.onap.appc/lock-manager-features/${project.version}/xml/features</features.repo.lockManager>
 	
     <include.transitive.dependencies>false</include.transitive.dependencies>
   </properties>
@@ -32,7 +32,7 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-dispatcher-features</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -46,7 +46,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-request-handler-features</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -60,7 +60,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-command-executor-features</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -74,7 +74,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-lifecycle-management-features</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -88,7 +88,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-workflow-management-features</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -102,7 +102,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-license-manager-features</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -116,7 +116,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>lock-manager-features</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml
index 5eb1afb1a..03abbc54b 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 		<parent>
-	    <groupId>org.openecomp.appc</groupId>
+	    <groupId>org.onap.appc</groupId>
 	    <artifactId>appc-license-manager</artifactId>
 	    <version>1.3.0-SNAPSHOT</version>
 	  </parent>
@@ -30,7 +30,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
-                        <Export-Package>org.openecomp.appc.licmgr,org.openecomp.appc.licmgr.exception,org.openecomp.appc.licmgr.objects</Export-Package>
+                        <Export-Package>org.onap.appc.licmgr,org.onap.appc.licmgr.exception,org.onap.appc.licmgr.objects</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/Constants.java b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/Constants.java
index ba39134bf..64e54be97 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/Constants.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/Constants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.licmgr;
+package org.onap.appc.licmgr;
 
 public class Constants {
 
@@ -61,19 +61,19 @@ public class Constants {
     public static final String PAYLOAD = "payload";
 
     // constants fo DG
-    public static final String VNF_TYPE_FIELD_NAME = "org.openecomp.appc.vftype";
-    public static final String VNF_VERSION_FIELD_NAME = "org.openecomp.appc.vfversion";
-    public static final String VNF_RESOURCE_VERSION_FIELD_NAME = "org.openecomp.appc.resource-version";
+    public static final String VNF_TYPE_FIELD_NAME = "org.onap.appc.vftype";
+    public static final String VNF_VERSION_FIELD_NAME = "org.onap.appc.vfversion";
+    public static final String VNF_RESOURCE_VERSION_FIELD_NAME = "org.onap.appc.resource-version";
     public static final String TARGET_VNF_TYPE = "target-vnf-type";
     public static final String FILE_CONTENT_FIELD_NAME = "file-content";
     public static final String CONNECTION_DETAILS_FIELD_NAME = "connection-details";
     public static final String CONFIGURATION_FILE_FIELD_NAME = "configuration-file-name";
     public static final String VNF_HOST_IP_ADDRESS_FIELD_NAME = "vnf-host-ip-address";
     public static final String UPGRADE_VERSION = "upgrade-version";
-    public static final String DG_ERROR_FIELD_NAME = "org.openecomp.appc.dg.error";
+    public static final String DG_ERROR_FIELD_NAME = "org.onap.appc.dg.error";
     public static final String RESOURCEKEY = "resourceKey";
-    public static final String REQ_ID_FIELD_NAME = "org.openecomp.appc.reqid";
-    public static final String API_VERSION_FIELD_NAME = "org.openecomp.appc.apiversion";
+    public static final String REQ_ID_FIELD_NAME = "org.onap.appc.reqid";
+    public static final String API_VERSION_FIELD_NAME = "org.onap.appc.apiversion";
     public static final String MODEL_ENTITLMENT_POOL_UUID_NAME = "model.entitlement.pool.uuid";
     public static final String MODEL_LICENSE_KEY_UUID_NAME = "model.license.key.uuid";
     public static final String ENTITLMENT_POOL_UUID_NAME = "entitlement.pool.uuid";
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseDataAccessService.java b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseDataAccessService.java
index 0f14b2ee6..f826828c4 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseDataAccessService.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseDataAccessService.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.licmgr;
+package org.onap.appc.licmgr;
 
-import org.openecomp.appc.licmgr.exception.DataAccessException;
+import org.onap.appc.licmgr.exception.DataAccessException;
 
 import java.util.Map;
 
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseManager.java b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseManager.java
index 144cfb633..f396beba1 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseManager.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseManager.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.licmgr;
+package org.onap.appc.licmgr;
 
-import org.openecomp.appc.licmgr.exception.DataAccessException;
-import org.openecomp.appc.licmgr.objects.LicenseModel;
+import org.onap.appc.licmgr.exception.DataAccessException;
+import org.onap.appc.licmgr.objects.LicenseModel;
 
 
 @SuppressWarnings("JavaDoc")
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/exception/DataAccessException.java b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/exception/DataAccessException.java
index d2037772e..ba3def389 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/exception/DataAccessException.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/exception/DataAccessException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.licmgr.exception;
+package org.onap.appc.licmgr.exception;
 
 
 
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/objects/LicenseModel.java b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/objects/LicenseModel.java
index ba84562af..a2ea85ba2 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/objects/LicenseModel.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/objects/LicenseModel.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.licmgr.objects;
+package org.onap.appc.licmgr.objects;
 
 public class LicenseModel {
 
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml
index b88fdb99a..7d6f4abee 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml
@@ -3,7 +3,7 @@
 
     <modelVersion>4.0.0</modelVersion>
 		<parent>
-	    <groupId>org.openecomp.appc</groupId>
+	    <groupId>org.onap.appc</groupId>
 	    <artifactId>appc-license-manager</artifactId>
 	    <version>1.3.0-SNAPSHOT</version>
 	  </parent>
@@ -15,12 +15,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-common</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-license-manager-api</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -53,14 +53,14 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
-                        <Export-Service>org.openecomp.appc.licmgr.LicenseManager</Export-Service>
+                        <Export-Service>org.onap.appc.licmgr.LicenseManager</Export-Service>
 
                         <Embed-Dependency>
                             artifactId=!dblib-provider|slf4j-api|jcl-over-slf4j;scope=compile|runtime;inline=false
                         </Embed-Dependency>
 
                         <Import-Package>
-                            org.openecomp.appc.licmgr,org.openecomp.appc.licmgr.exception,org.openecomp.appc.licmgr.objects,
+                            org.onap.appc.licmgr,org.onap.appc.licmgr.exception,org.onap.appc.licmgr.objects,
                             *;resolution:=optional
                         </Import-Package>
 
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseDataAccessServiceImpl.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseDataAccessServiceImpl.java
index 3b3bc3564..8976d1332 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseDataAccessServiceImpl.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseDataAccessServiceImpl.java
@@ -22,18 +22,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.licmgr.impl;
+package org.onap.appc.licmgr.impl;
 
 import javax.sql.rowset.CachedRowSet;
 
-import org.openecomp.appc.licmgr.Constants;
-import org.openecomp.appc.licmgr.LicenseDataAccessService;
-import org.openecomp.appc.licmgr.exception.DataAccessException;
+import org.onap.appc.licmgr.Constants;
+import org.onap.appc.licmgr.LicenseDataAccessService;
+import org.onap.appc.licmgr.exception.DataAccessException;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
 
-import static org.openecomp.appc.licmgr.Constants.SDC_ARTIFACTS_FIELDS;
+import static org.onap.appc.licmgr.Constants.SDC_ARTIFACTS_FIELDS;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseManagerImpl.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseManagerImpl.java
index 4fc6a9345..422db7f2d 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseManagerImpl.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseManagerImpl.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.licmgr.impl;
+package org.onap.appc.licmgr.impl;
 
-import static org.openecomp.appc.licmgr.Constants.SDC_ARTIFACTS_FIELDS.ARTIFACT_CONTENT;
+import static org.onap.appc.licmgr.Constants.SDC_ARTIFACTS_FIELDS.ARTIFACT_CONTENT;
 
 import java.util.Map;
 
-import org.openecomp.appc.licmgr.LicenseDataAccessService;
-import org.openecomp.appc.licmgr.LicenseManager;
-import org.openecomp.appc.licmgr.exception.DataAccessException;
-import org.openecomp.appc.licmgr.objects.LicenseModel;
+import org.onap.appc.licmgr.LicenseDataAccessService;
+import org.onap.appc.licmgr.LicenseManager;
+import org.onap.appc.licmgr.exception.DataAccessException;
+import org.onap.appc.licmgr.objects.LicenseModel;
 
 
 @SuppressWarnings("all")
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index acdbb1150..a5c0c23fb 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -32,13 +32,13 @@
 
     <reference id="dbLibServiceRef" availability="mandatory" activation="eager" interface="org.onap.ccsdk.sli.core.dblib.DbLibService" />
 
-    <bean id="licenseDataServiceBean" class="org.openecomp.appc.licmgr.impl.LicenseDataAccessServiceImpl" scope="singleton" activation="eager">
+    <bean id="licenseDataServiceBean" class="org.onap.appc.licmgr.impl.LicenseDataAccessServiceImpl" scope="singleton" activation="eager">
         <property name="dbLibService" ref="dbLibServiceRef" />
         <property name="schema" value="sdnctl" />
     </bean>
 
-    <bean id="licenseServiceBean" class="org.openecomp.appc.licmgr.impl.LicenseManagerImpl" scope="singleton" activation="lazy">
+    <bean id="licenseServiceBean" class="org.onap.appc.licmgr.impl.LicenseManagerImpl" scope="singleton" activation="lazy">
         <property name="DAService" ref="licenseDataServiceBean"/>
     </bean>
-    <service id="licenseService" interface="org.openecomp.appc.licmgr.LicenseManager" ref="licenseServiceBean"/>
+    <service id="licenseService" interface="org.onap.appc.licmgr.LicenseManager" ref="licenseServiceBean"/>
 </blueprint>
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/org/openecomp/appc/default.properties b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/org/openecomp/appc/default.properties
index 47a88601a..f775abb39 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/org/openecomp/appc/default.properties
@@ -24,8 +24,8 @@
 
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 #Property below provided by appc.properties
 appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm
 appc.LCM.poolMembers=<DMAAP_IP>:3904
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerImplTest.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerImplTest.java
index 44e478d6a..35c8650d1 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerImplTest.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerImplTest.java
@@ -22,4 +22,4 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.licmgr;
+package org.onap.appc.licmgr;
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerMock.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerMock.java
index 92adefe55..21323fbef 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerMock.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerMock.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.licmgr;
+package org.onap.appc.licmgr;
 
-import org.openecomp.appc.licmgr.exception.DataAccessException;
-import org.openecomp.appc.licmgr.objects.LicenseModel;
+import org.onap.appc.licmgr.exception.DataAccessException;
+import org.onap.appc.licmgr.objects.LicenseModel;
 
 
 public class LicenseManagerMock implements LicenseManager {
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerPluginImplTest.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerPluginImplTest.java
index 44e478d6a..35c8650d1 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerPluginImplTest.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerPluginImplTest.java
@@ -22,4 +22,4 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.licmgr;
+package org.onap.appc.licmgr;
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseServiceMock.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseServiceMock.java
index ec44e7cdf..a52c463fc 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseServiceMock.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseServiceMock.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.licmgr;
+package org.onap.appc.licmgr;
 
-import org.openecomp.appc.licmgr.exception.DataAccessException;
+import org.onap.appc.licmgr.exception.DataAccessException;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/TestVfLicenseModelConvert.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/TestVfLicenseModelConvert.java
index 675b0f715..7bb185b33 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/TestVfLicenseModelConvert.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/TestVfLicenseModelConvert.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.licmgr;
+package org.onap.appc.licmgr;
 
 /*
-import org.openecomp.appc.licmgr.objects.VfLicenseModel;
+import org.onap.appc.licmgr.objects.VfLicenseModel;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Unmarshaller;
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml
index efb0ad642..5d962c637 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-license-manager</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<name>appc-license-manager-features</name>
@@ -13,12 +13,12 @@
 
   <dependencies>
 	  <dependency>
-		  <groupId>org.openecomp.appc</groupId>
+		  <groupId>org.onap.appc</groupId>
 		  <artifactId>appc-license-manager-api</artifactId>
 		  <version>${project.version}</version>
 	  </dependency>
 	  <dependency>
-		  <groupId>org.openecomp.appc</groupId>
+		  <groupId>org.onap.appc</groupId>
 		  <artifactId>appc-license-manager-core</artifactId>
 		  <version>${project.version}</version>
 	  </dependency>
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-features/src/main/resources/features.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-features/src/main/resources/features.xml
index baadce985..4bab1a93e 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-features/src/main/resources/features.xml
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-features/src/main/resources/features.xml
@@ -30,8 +30,8 @@
 
     <feature name='appc-license-manager' description="application license manager" version='${project.version}'>
         <bundle>mvn:com.sun.mail/javax.mail/1.5.0</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-license-manager-api/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-license-manager-core/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-license-manager-api/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-license-manager-core/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-dispatcher/appc-license-manager/pom.xml b/appc-dispatcher/appc-license-manager/pom.xml
index db24ccfb7..77ac63508 100644
--- a/appc-dispatcher/appc-license-manager/pom.xml
+++ b/appc-dispatcher/appc-license-manager/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-dispatcher</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml
index 32c6585c8..87cabf6ee 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 		<parent>
-	    <groupId>org.openecomp.appc</groupId>
+	    <groupId>org.onap.appc</groupId>
 	    <artifactId>appc-request-handler</artifactId>
 	    <version>1.3.0-SNAPSHOT</version>
 	  </parent>
@@ -22,17 +22,17 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-data-access-lib</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-command-executor-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -46,13 +46,13 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
-                        <Export-Package>org.openecomp.appc.requesthandler,org.openecomp.appc.requesthandler.objects,org.openecomp.appc.transactionrecorder,org.openecomp.appc.message</Export-Package>
+                        <Export-Package>org.onap.appc.requesthandler,org.onap.appc.requesthandler.objects,org.onap.appc.transactionrecorder,org.onap.appc.message</Export-Package>
 						<Embed-Dependency>
 							javax.json;scope=compile|runtime;inline=false
 						</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
 						<Import-Package>
-							org.openecomp.appc.domainmodel.lcm,
+							org.onap.appc.domainmodel.lcm,
 							*;resolution:=optional
 						</Import-Package>
                     </instructions>
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/message/RequestHandlerMessages.java b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/message/RequestHandlerMessages.java
index 944a09cae..36937a023 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/message/RequestHandlerMessages.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/message/RequestHandlerMessages.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.message;
+package org.onap.appc.message;
 
 
 public class RequestHandlerMessages {
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/LCMStateManager.java b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/LCMStateManager.java
index 72054a443..3890b1e24 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/LCMStateManager.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/LCMStateManager.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler;
+package org.onap.appc.requesthandler;
 
 /**
  */
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/RequestHandler.java b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/RequestHandler.java
index 231e97dd9..d8aba25b2 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/RequestHandler.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/RequestHandler.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler;
+package org.onap.appc.requesthandler;
 
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.executor.UnstableVNFException;
-import org.openecomp.appc.requesthandler.objects.RequestHandlerInput;
-import org.openecomp.appc.requesthandler.objects.RequestHandlerOutput;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.executor.UnstableVNFException;
+import org.onap.appc.requesthandler.objects.RequestHandlerInput;
+import org.onap.appc.requesthandler.objects.RequestHandlerOutput;
 
 /**
  * This class provides application logic for the Request/Response Handler Component.
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/objects/RequestHandlerInput.java b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/objects/RequestHandlerInput.java
index 98ac5da7a..94d35028b 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/objects/RequestHandlerInput.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/objects/RequestHandlerInput.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.objects;
+package org.onap.appc.requesthandler.objects;
 
-import org.openecomp.appc.domainmodel.lcm.RequestContext;
+import org.onap.appc.domainmodel.lcm.RequestContext;
 
 public class RequestHandlerInput {
 
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/objects/RequestHandlerOutput.java b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/objects/RequestHandlerOutput.java
index 0a8eb687f..16b36b048 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/objects/RequestHandlerOutput.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/objects/RequestHandlerOutput.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.objects;
+package org.onap.appc.requesthandler.objects;
 
-import org.openecomp.appc.domainmodel.lcm.ResponseContext;
+import org.onap.appc.domainmodel.lcm.ResponseContext;
 
 public class RequestHandlerOutput {
 
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml
index ea1fd54c5..7f76d2ec8 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml
@@ -14,7 +14,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-request-handler</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -26,66 +26,66 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-metric-bundle</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dmaap-adapter-bundle</artifactId>
 			<version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-message-adapter-api</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
 		</dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-message-adapter-factory</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-command-executor-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-workflow-management-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-request-handler-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>execution-queue-management-lib</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-lifecycle-management-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-data-access-lib</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>lock-manager-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -95,17 +95,17 @@
 			<artifactId>aai-service-provider</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>domain-model-lib</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-provider-model</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>transaction-recorder</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -125,13 +125,13 @@
 					<instructions>
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Version>${project.version}</Bundle-Version>
-						<Export-Service>org.openecomp.appc.requesthandler.RequestHandler</Export-Service>
+						<Export-Service>org.onap.appc.requesthandler.RequestHandler</Export-Service>
                         <Import-Package>
-                            org.openecomp.appc.adapter.messaging.*,
-                            org.openecomp.appc.adapter.message.*,
-                            org.openecomp.appc.adapter.factory.*,
-                            org.openecomp.appc.lockmanager.api.*,org.openecomp.appc.requesthandler,org.openecomp.appc.requesthandler.objects,org.openecomp.appc.transactionrecorder,
-                            org.openecomp.appc.transactionrecorder.objects, org.openecomp.appc.dao.util,
+                            org.onap.appc.adapter.messaging.*,
+                            org.onap.appc.adapter.message.*,
+                            org.onap.appc.adapter.factory.*,
+                            org.onap.appc.lockmanager.api.*,org.onap.appc.requesthandler,org.onap.appc.requesthandler.objects,org.onap.appc.transactionrecorder,
+                            org.onap.appc.transactionrecorder.objects, org.onap.appc.dao.util,
                             *;resolution:=optional
                         </Import-Package>
 					</instructions>
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/MessageAdapter.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/MessageAdapter.java
index a30c621e0..15e8d2436 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/MessageAdapter.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/MessageAdapter.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.messageadapter;
+package org.onap.appc.messageadapter;
 
-import org.openecomp.appc.domainmodel.lcm.ResponseContext;
-import org.openecomp.appc.domainmodel.lcm.VNFOperation;
+import org.onap.appc.domainmodel.lcm.ResponseContext;
+import org.onap.appc.domainmodel.lcm.VNFOperation;
 
 public interface MessageAdapter {
     /**
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/impl/MessageAdapterImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/impl/MessageAdapterImpl.java
index 207ab8556..63a3c00a4 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/impl/MessageAdapterImpl.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/impl/MessageAdapterImpl.java
@@ -22,24 +22,24 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.messageadapter.impl;
+package org.onap.appc.messageadapter.impl;
 
 
-import org.openecomp.appc.adapter.factory.DmaapMessageAdapterFactoryImpl;
-import org.openecomp.appc.adapter.factory.MessageService;
-import org.openecomp.appc.adapter.message.MessageAdapterFactory;
-import org.openecomp.appc.adapter.message.Producer;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.adapter.factory.DmaapMessageAdapterFactoryImpl;
+import org.onap.appc.adapter.factory.MessageService;
+import org.onap.appc.adapter.message.MessageAdapterFactory;
+import org.onap.appc.adapter.message.Producer;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.apache.commons.lang.ObjectUtils;
-import org.openecomp.appc.domainmodel.lcm.ResponseContext;
-import org.openecomp.appc.domainmodel.lcm.VNFOperation;
-import org.openecomp.appc.messageadapter.MessageAdapter;
-import org.openecomp.appc.requesthandler.conv.Converter;
+import org.onap.appc.domainmodel.lcm.ResponseContext;
+import org.onap.appc.domainmodel.lcm.VNFOperation;
+import org.onap.appc.messageadapter.MessageAdapter;
+import org.onap.appc.requesthandler.conv.Converter;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/constant/Constants.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/constant/Constants.java
index 650262cff..4015181a1 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/constant/Constants.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/constant/Constants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.constant;
+package org.onap.appc.requesthandler.constant;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/conv/Converter.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/conv/Converter.java
index aaa9933ed..5a791711e 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/conv/Converter.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/conv/Converter.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.conv;
+package org.onap.appc.requesthandler.conv;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -36,18 +36,18 @@ import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.*;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.CommonHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.CommonHeaderBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.common.header.Flags;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.common.header.FlagsBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.status.Status;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.status.StatusBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.*;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.CommonHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.CommonHeaderBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.common.header.Flags;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.common.header.FlagsBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.status.Status;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.status.StatusBuilder;
 import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
-import org.openecomp.appc.domainmodel.lcm.ResponseContext;
-import org.openecomp.appc.domainmodel.lcm.VNFOperation;
-import org.openecomp.appc.requesthandler.impl.DmaapOutgoingMessage;
+import org.onap.appc.domainmodel.lcm.ResponseContext;
+import org.onap.appc.domainmodel.lcm.VNFOperation;
+import org.onap.appc.requesthandler.impl.DmaapOutgoingMessage;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -270,7 +270,7 @@ public class Converter {
         }
 
         CommonHeaderBuilder commonHeaderBuilder = new CommonHeaderBuilder();
-        org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.common.header.Flags commonHeaderFlags = null;
+        org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.common.header.Flags commonHeaderFlags = null;
         if(inObj.getCommonHeader().getFlags() != null){
             commonHeaderFlags = Converter.convFlagsMapTorev160108Flags(inObj.getCommonHeader().getFlags());
             commonHeaderBuilder.setFlags(commonHeaderFlags);
@@ -301,8 +301,8 @@ public class Converter {
         return isoFormatter.format(timeStamp);
     }
 
-    public static org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.common.header.Flags
-    convFlagsMapTorev160108Flags(org.openecomp.appc.domainmodel.lcm.Flags flags) {
+    public static org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.common.header.Flags
+    convFlagsMapTorev160108Flags(org.onap.appc.domainmodel.lcm.Flags flags) {
         Flags rev160108flags = null;
         boolean anyFlag = false;
         FlagsBuilder flagsBuilder = new FlagsBuilder();
@@ -311,14 +311,14 @@ public class Converter {
          */
         /*
         if(flags.containsKey(FORCE_FLAG)){
-            org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.common.header.Flags.Force force =
-                    org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.common.header.Flags.Force.valueOf(flags.get(FORCE_FLAG).toString());
+            org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.common.header.Flags.Force force =
+                    org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.common.header.Flags.Force.valueOf(flags.get(FORCE_FLAG).toString());
             flagsBuilder.setForce(force);
             anyFlag = true;
         }
         if(flags.containsKey(MODE_FLAG)){
-            org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.common.header.Flags.Mode mode =
-                    org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.common.header.Flags.Mode.valueOf(flags.get(MODE_FLAG).toString());
+            org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.common.header.Flags.Mode mode =
+                    org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.common.header.Flags.Mode.valueOf(flags.get(MODE_FLAG).toString());
             flagsBuilder.setMode(mode);
             anyFlag = true;
         }
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/DGWorkflowNotFoundException.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/DGWorkflowNotFoundException.java
index 1e7c3f5e9..5626cfe6f 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/DGWorkflowNotFoundException.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/DGWorkflowNotFoundException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.exceptions;
+package org.onap.appc.requesthandler.exceptions;
 
 
 public class DGWorkflowNotFoundException extends Exception {
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/DuplicateRequestException.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/DuplicateRequestException.java
index 63e270084..b06788a99 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/DuplicateRequestException.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/DuplicateRequestException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.exceptions;
+package org.onap.appc.requesthandler.exceptions;
 
 
 public class DuplicateRequestException extends Exception {
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/InvalidInputException.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/InvalidInputException.java
index e654db70f..6e2435559 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/InvalidInputException.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/InvalidInputException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.exceptions;
+package org.onap.appc.requesthandler.exceptions;
 
 
 public class InvalidInputException extends Exception {
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/LCMOperationsDisabledException.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/LCMOperationsDisabledException.java
index 696e965fd..ca5f72682 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/LCMOperationsDisabledException.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/LCMOperationsDisabledException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.exceptions;
+package org.onap.appc.requesthandler.exceptions;
 
 /**
  */
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/MissingVNFDataInAAIException.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/MissingVNFDataInAAIException.java
index e5c6528ea..219265084 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/MissingVNFDataInAAIException.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/MissingVNFDataInAAIException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.exceptions;
+package org.onap.appc.requesthandler.exceptions;
 
 public class MissingVNFDataInAAIException extends Exception {
 	String missingAttributeName;
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/RequestExpiredException.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/RequestExpiredException.java
index 25be97b1b..02a130c8b 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/RequestExpiredException.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/RequestExpiredException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.exceptions;
+package org.onap.appc.requesthandler.exceptions;
 
 
 public class RequestExpiredException extends Exception {
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/VNFNotFoundException.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/VNFNotFoundException.java
index 214cefede..d1b2759d6 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/VNFNotFoundException.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/VNFNotFoundException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.exceptions;
+package org.onap.appc.requesthandler.exceptions;
 
 
 public class VNFNotFoundException extends Exception {
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/WorkflowNotFoundException.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/WorkflowNotFoundException.java
index 531835bc6..85157e32f 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/WorkflowNotFoundException.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/WorkflowNotFoundException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.exceptions;
+package org.onap.appc.requesthandler.exceptions;
 
 
 public class WorkflowNotFoundException extends Exception {
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/helper/RequestRegistry.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/helper/RequestRegistry.java
index ad2ff6ed5..fd1292ff9 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/helper/RequestRegistry.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/helper/RequestRegistry.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.helper;
+package org.onap.appc.requesthandler.helper;
 
 import org.apache.commons.lang.ObjectUtils;
-import org.openecomp.appc.executor.objects.UniqueRequestIdentifier;
+import org.onap.appc.executor.objects.UniqueRequestIdentifier;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/helper/RequestValidator.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/helper/RequestValidator.java
index fd38f5a84..e45341d3d 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/helper/RequestValidator.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/helper/RequestValidator.java
@@ -22,20 +22,20 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.helper;
+package org.onap.appc.requesthandler.helper;
 
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.executor.UnstableVNFException;
-import org.openecomp.appc.lifecyclemanager.objects.LifecycleException;
-import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException;
-import org.openecomp.appc.requesthandler.exceptions.DGWorkflowNotFoundException;
-import org.openecomp.appc.requesthandler.exceptions.DuplicateRequestException;
-import org.openecomp.appc.requesthandler.exceptions.InvalidInputException;
-import org.openecomp.appc.requesthandler.exceptions.LCMOperationsDisabledException;
-import org.openecomp.appc.requesthandler.exceptions.MissingVNFDataInAAIException;
-import org.openecomp.appc.requesthandler.exceptions.RequestExpiredException;
-import org.openecomp.appc.requesthandler.exceptions.VNFNotFoundException;
-import org.openecomp.appc.requesthandler.exceptions.WorkflowNotFoundException;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.executor.UnstableVNFException;
+import org.onap.appc.lifecyclemanager.objects.LifecycleException;
+import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException;
+import org.onap.appc.requesthandler.exceptions.DGWorkflowNotFoundException;
+import org.onap.appc.requesthandler.exceptions.DuplicateRequestException;
+import org.onap.appc.requesthandler.exceptions.InvalidInputException;
+import org.onap.appc.requesthandler.exceptions.LCMOperationsDisabledException;
+import org.onap.appc.requesthandler.exceptions.MissingVNFDataInAAIException;
+import org.onap.appc.requesthandler.exceptions.RequestExpiredException;
+import org.onap.appc.requesthandler.exceptions.VNFNotFoundException;
+import org.onap.appc.requesthandler.exceptions.WorkflowNotFoundException;
 
 public interface RequestValidator {
     public void validateRequest(RuntimeContext runtimeContext) throws VNFNotFoundException, RequestExpiredException, UnstableVNFException, InvalidInputException, DuplicateRequestException, NoTransitionDefinedException, LifecycleException, WorkflowNotFoundException, DGWorkflowNotFoundException, MissingVNFDataInAAIException, LCMOperationsDisabledException;
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/AbstractRequestHandlerImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/AbstractRequestHandlerImpl.java
index c14b2c1e7..8b56dda41 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/AbstractRequestHandlerImpl.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/AbstractRequestHandlerImpl.java
@@ -22,44 +22,44 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.impl;
+package org.onap.appc.requesthandler.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
 import org.apache.commons.lang.ObjectUtils;
-import org.openecomp.appc.requesthandler.constant.Constants;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.domainmodel.lcm.*;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.executor.CommandExecutor;
-import org.openecomp.appc.executor.UnstableVNFException;
-import org.openecomp.appc.executor.objects.LCMCommandStatus;
-import org.openecomp.appc.executor.objects.Params;
-import org.openecomp.appc.executor.objects.UniqueRequestIdentifier;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.lifecyclemanager.objects.LifecycleException;
-import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException;
-import org.openecomp.appc.logging.LoggingConstants;
-import org.openecomp.appc.logging.LoggingUtils;
-import org.openecomp.appc.messageadapter.MessageAdapter;
-import org.openecomp.appc.messageadapter.impl.MessageAdapterImpl;
-import org.openecomp.appc.metricservice.MetricRegistry;
-import org.openecomp.appc.metricservice.MetricService;
-import org.openecomp.appc.metricservice.metric.DispatchingFuntionMetric;
-import org.openecomp.appc.metricservice.metric.Metric;
-import org.openecomp.appc.metricservice.metric.MetricType;
-import org.openecomp.appc.metricservice.policy.PublishingPolicy;
-import org.openecomp.appc.metricservice.publisher.LogPublisher;
-import org.openecomp.appc.requesthandler.RequestHandler;
-import org.openecomp.appc.requesthandler.exceptions.*;
-import org.openecomp.appc.requesthandler.helper.RequestRegistry;
-import org.openecomp.appc.requesthandler.helper.RequestValidator;
-import org.openecomp.appc.requesthandler.objects.RequestHandlerInput;
-import org.openecomp.appc.requesthandler.objects.RequestHandlerOutput;
-import org.openecomp.appc.transactionrecorder.TransactionRecorder;
-import org.openecomp.appc.transactionrecorder.objects.TransactionRecord;
+import org.onap.appc.requesthandler.constant.Constants;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.domainmodel.lcm.*;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.executor.CommandExecutor;
+import org.onap.appc.executor.UnstableVNFException;
+import org.onap.appc.executor.objects.LCMCommandStatus;
+import org.onap.appc.executor.objects.Params;
+import org.onap.appc.executor.objects.UniqueRequestIdentifier;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.lifecyclemanager.objects.LifecycleException;
+import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException;
+import org.onap.appc.logging.LoggingConstants;
+import org.onap.appc.logging.LoggingUtils;
+import org.onap.appc.messageadapter.MessageAdapter;
+import org.onap.appc.messageadapter.impl.MessageAdapterImpl;
+import org.onap.appc.metricservice.MetricRegistry;
+import org.onap.appc.metricservice.MetricService;
+import org.onap.appc.metricservice.metric.DispatchingFuntionMetric;
+import org.onap.appc.metricservice.metric.Metric;
+import org.onap.appc.metricservice.metric.MetricType;
+import org.onap.appc.metricservice.policy.PublishingPolicy;
+import org.onap.appc.metricservice.publisher.LogPublisher;
+import org.onap.appc.requesthandler.RequestHandler;
+import org.onap.appc.requesthandler.exceptions.*;
+import org.onap.appc.requesthandler.helper.RequestRegistry;
+import org.onap.appc.requesthandler.helper.RequestValidator;
+import org.onap.appc.requesthandler.objects.RequestHandlerInput;
+import org.onap.appc.requesthandler.objects.RequestHandlerOutput;
+import org.onap.appc.transactionrecorder.TransactionRecorder;
+import org.onap.appc.transactionrecorder.objects.TransactionRecord;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
@@ -428,7 +428,7 @@ public abstract class AbstractRequestHandlerImpl implements RequestHandler {
         if (logger.isTraceEnabled())
             logger.trace("Entering in getInputTTL with RequestHeader = " + ObjectUtils.toString(header));
         if (!isValidTTL(String.valueOf(header.getFlags().getTtl()))) {
-            String defaultTTLStr = configuration.getProperty("org.openecomp.appc.workflow.default.ttl", String.valueOf(Constants.DEFAULT_TTL));
+            String defaultTTLStr = configuration.getProperty("org.onap.appc.workflow.default.ttl", String.valueOf(Constants.DEFAULT_TTL));
             Integer defaultTTL = Integer.parseInt(defaultTTLStr);
             if (logger.isTraceEnabled())
                 logger.trace("Exiting from getInputTTL with (defaultTTL = " + ObjectUtils.toString(defaultTTL) + ")");
@@ -457,14 +457,14 @@ public abstract class AbstractRequestHandlerImpl implements RequestHandler {
     }
 
     private Boolean isLoggingEnabled() {
-        String defaultFlagStr = configuration.getProperty("org.openecomp.appc.localTransactionRecorder.enable", String.valueOf(Constants.DEFAULT_LOGGING_FLAG));
+        String defaultFlagStr = configuration.getProperty("org.onap.appc.localTransactionRecorder.enable", String.valueOf(Constants.DEFAULT_LOGGING_FLAG));
         return Boolean.parseBoolean(defaultFlagStr);
     }
 
     private static RequestHandlerOutput buildRequestHandlerOutput(LCMCommandStatus response, Params params) {
         RequestHandlerOutput output = new RequestHandlerOutput();
         ResponseContext responseContext = new ResponseContext();
-        org.openecomp.appc.domainmodel.lcm.Status status = new org.openecomp.appc.domainmodel.lcm.Status(response.getResponseCode(),response.getFormattedMessage(params));
+        org.onap.appc.domainmodel.lcm.Status status = new org.onap.appc.domainmodel.lcm.Status(response.getResponseCode(),response.getFormattedMessage(params));
         responseContext.setStatus(status);
         output.setResponseContext(responseContext);
         return output;
@@ -607,7 +607,7 @@ public abstract class AbstractRequestHandlerImpl implements RequestHandler {
             return (MetricService) bctx.getService(sref);
         } else {
             logger.info("Metric Service error from bundlecontext");
-            logger.warn("Cannot find service reference for org.openecomp.appc.metricservice.MetricService");
+            logger.warn("Cannot find service reference for org.onap.appc.metricservice.MetricService");
             return null;
         }
     }
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/AbstractRequestValidatorImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/AbstractRequestValidatorImpl.java
index e60095d95..4f4942b8a 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/AbstractRequestValidatorImpl.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/AbstractRequestValidatorImpl.java
@@ -22,35 +22,35 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.impl;
+package org.onap.appc.requesthandler.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
-import org.openecomp.appc.requesthandler.constant.Constants;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.domainmodel.lcm.CommonHeader;
-import org.openecomp.appc.domainmodel.lcm.RequestContext;
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.domainmodel.lcm.VNFContext;
-import org.openecomp.appc.executor.UnstableVNFException;
-import org.openecomp.appc.executor.objects.UniqueRequestIdentifier;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.lifecyclemanager.LifecycleManager;
-import org.openecomp.appc.lifecyclemanager.objects.LifecycleException;
-import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException;
-import org.openecomp.appc.logging.LoggingConstants;
-import org.openecomp.appc.logging.LoggingUtils;
-import org.openecomp.appc.requesthandler.LCMStateManager;
-import org.openecomp.appc.requesthandler.exceptions.*;
-import org.openecomp.appc.requesthandler.helper.RequestRegistry;
-import org.openecomp.appc.requesthandler.helper.RequestValidator;
-import org.openecomp.appc.workflow.WorkFlowManager;
-import org.openecomp.appc.workflow.objects.WorkflowExistsOutput;
-import org.openecomp.appc.workflow.objects.WorkflowRequest;
+import org.onap.appc.requesthandler.constant.Constants;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.domainmodel.lcm.CommonHeader;
+import org.onap.appc.domainmodel.lcm.RequestContext;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.domainmodel.lcm.VNFContext;
+import org.onap.appc.executor.UnstableVNFException;
+import org.onap.appc.executor.objects.UniqueRequestIdentifier;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.lifecyclemanager.LifecycleManager;
+import org.onap.appc.lifecyclemanager.objects.LifecycleException;
+import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException;
+import org.onap.appc.logging.LoggingConstants;
+import org.onap.appc.logging.LoggingUtils;
+import org.onap.appc.requesthandler.LCMStateManager;
+import org.onap.appc.requesthandler.exceptions.*;
+import org.onap.appc.requesthandler.helper.RequestRegistry;
+import org.onap.appc.requesthandler.helper.RequestValidator;
+import org.onap.appc.workflow.WorkFlowManager;
+import org.onap.appc.workflow.objects.WorkflowExistsOutput;
+import org.onap.appc.workflow.objects.WorkflowRequest;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
@@ -225,7 +225,7 @@ public abstract class AbstractRequestValidatorImpl implements RequestValidator {
             logger.trace("Entering to readTTL with RequestHandlerInput = "+ ObjectUtils.toString(header));
         }
         if (header.getFlags()== null || !isValidTTL(String.valueOf(header.getFlags().getTtl()))) {
-            String defaultTTLStr = configuration.getProperty("org.openecomp.appc.workflow.default.ttl", String.valueOf(Constants.DEFAULT_TTL));
+            String defaultTTLStr = configuration.getProperty("org.onap.appc.workflow.default.ttl", String.valueOf(Constants.DEFAULT_TTL));
             return Integer.parseInt(defaultTTLStr);
         }
         if (logger.isTraceEnabled()) {
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/DmaapOutgoingMessage.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/DmaapOutgoingMessage.java
index 9a673a0c3..0df57a754 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/DmaapOutgoingMessage.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/DmaapOutgoingMessage.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.impl;
+package org.onap.appc.requesthandler.impl;
 
 
 
@@ -32,7 +32,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 /**
  * This class represents a message being sent out to DMaaP by APPC as async response.
- * note the structure of this class must be adapted to the sync message sent to DMaaP represened in org.openecomp.appc.listener.LCM.domainmodel.DmaapOutgoingMessage
+ * note the structure of this class must be adapted to the sync message sent to DMaaP represened in org.onap.appc.listener.LCM.domainmodel.DmaapOutgoingMessage
  *
  */
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/LCMStateManagerImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/LCMStateManagerImpl.java
index 4d61bf599..276eaddab 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/LCMStateManagerImpl.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/LCMStateManagerImpl.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.impl;
+package org.onap.appc.requesthandler.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.openecomp.appc.requesthandler.LCMStateManager;
+import org.onap.appc.requesthandler.LCMStateManager;
 
 public class LCMStateManagerImpl implements LCMStateManager {
     private static final EELFLogger logger = EELFManager.getInstance().getLogger(LCMStateManagerImpl.class);
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestHandlerImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestHandlerImpl.java
index 845351246..1f07b277c 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestHandlerImpl.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestHandlerImpl.java
@@ -22,25 +22,25 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.impl;
+package org.onap.appc.requesthandler.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
-import org.openecomp.appc.requesthandler.constant.Constants;
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.domainmodel.lcm.Status;
-import org.openecomp.appc.domainmodel.lcm.VNFOperation;
-import org.openecomp.appc.executor.UnstableVNFException;
-import org.openecomp.appc.executor.objects.LCMCommandStatus;
-import org.openecomp.appc.executor.objects.Params;
-import org.openecomp.appc.executor.objects.UniqueRequestIdentifier;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.lockmanager.api.LockException;
-import org.openecomp.appc.lockmanager.api.LockManager;
-import org.openecomp.appc.logging.LoggingConstants;
-import org.openecomp.appc.workingstatemanager.WorkingStateManager;
-import org.openecomp.appc.workingstatemanager.objects.VNFWorkingState;
+import org.onap.appc.requesthandler.constant.Constants;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.domainmodel.lcm.Status;
+import org.onap.appc.domainmodel.lcm.VNFOperation;
+import org.onap.appc.executor.UnstableVNFException;
+import org.onap.appc.executor.objects.LCMCommandStatus;
+import org.onap.appc.executor.objects.Params;
+import org.onap.appc.executor.objects.UniqueRequestIdentifier;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.lockmanager.api.LockException;
+import org.onap.appc.lockmanager.api.LockManager;
+import org.onap.appc.logging.LoggingConstants;
+import org.onap.appc.workingstatemanager.WorkingStateManager;
+import org.onap.appc.workingstatemanager.objects.VNFWorkingState;
 
 /**
  * This class provides application logic for the Request/Response Handler Component.
@@ -51,7 +51,7 @@ public class RequestHandlerImpl extends AbstractRequestHandlerImpl {
     /**
      * APP-C VNF lock idle timeout in milliseconds. Applied only when locking VNF using northbound API "lock"
      */
-    private static final String PROP_IDLE_TIMEOUT = "org.openecomp.appc.lock.idleTimeout";
+    private static final String PROP_IDLE_TIMEOUT = "org.onap.appc.lock.idleTimeout";
 
     private LockManager lockManager;
 
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestValidatorImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestValidatorImpl.java
index 8e0947e66..8724adc59 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestValidatorImpl.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestValidatorImpl.java
@@ -22,23 +22,23 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.impl;
+package org.onap.appc.requesthandler.impl;
 
 import com.att.eelf.i18n.EELFResourceManager;
 import org.apache.commons.lang.ObjectUtils;
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.domainmodel.lcm.VNFContext;
-import org.openecomp.appc.domainmodel.lcm.VNFOperation;
-import org.openecomp.appc.executor.UnstableVNFException;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.lifecyclemanager.LifecycleManager;
-import org.openecomp.appc.lifecyclemanager.objects.LifecycleException;
-import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException;
-import org.openecomp.appc.logging.LoggingConstants;
-import org.openecomp.appc.logging.LoggingUtils;
-import org.openecomp.appc.requesthandler.LCMStateManager;
-import org.openecomp.appc.requesthandler.exceptions.*;
-import org.openecomp.appc.workingstatemanager.WorkingStateManager;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.domainmodel.lcm.VNFContext;
+import org.onap.appc.domainmodel.lcm.VNFOperation;
+import org.onap.appc.executor.UnstableVNFException;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.lifecyclemanager.LifecycleManager;
+import org.onap.appc.lifecyclemanager.objects.LifecycleException;
+import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException;
+import org.onap.appc.logging.LoggingConstants;
+import org.onap.appc.logging.LoggingUtils;
+import org.onap.appc.requesthandler.LCMStateManager;
+import org.onap.appc.requesthandler.exceptions.*;
+import org.onap.appc.workingstatemanager.WorkingStateManager;
 
 
 public class RequestValidatorImpl extends AbstractRequestValidatorImpl {
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/VMRequestHandlerImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/VMRequestHandlerImpl.java
index e5dad8617..7e3917313 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/VMRequestHandlerImpl.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/VMRequestHandlerImpl.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.impl;
+package org.onap.appc.requesthandler.impl;
 
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.executor.UnstableVNFException;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.executor.UnstableVNFException;
 
 public class VMRequestHandlerImpl extends AbstractRequestHandlerImpl{
 
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/VMRequestValidatorImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/VMRequestValidatorImpl.java
index 4bfac802f..79f83fbc6 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/VMRequestValidatorImpl.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/VMRequestValidatorImpl.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler.impl;
+package org.onap.appc.requesthandler.impl;
 
 import com.att.eelf.i18n.EELFResourceManager;
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.domainmodel.lcm.VNFContext;
-import org.openecomp.appc.domainmodel.lcm.VNFOperation;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.logging.LoggingConstants;
-import org.openecomp.appc.logging.LoggingUtils;
-import org.openecomp.appc.requesthandler.exceptions.*;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.domainmodel.lcm.VNFContext;
+import org.onap.appc.domainmodel.lcm.VNFOperation;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.logging.LoggingConstants;
+import org.onap.appc.logging.LoggingUtils;
+import org.onap.appc.requesthandler.exceptions.*;
 
 import java.util.HashSet;
 import java.util.LinkedList;
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/WorkingStateManager.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/WorkingStateManager.java
index 11687f25a..e9b3d0f3a 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/WorkingStateManager.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/WorkingStateManager.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.workingstatemanager;
+package org.onap.appc.workingstatemanager;
 
-import org.openecomp.appc.requesthandler.exceptions.VNFNotFoundException;
-import org.openecomp.appc.workingstatemanager.objects.VNFWorkingState;
+import org.onap.appc.requesthandler.exceptions.VNFNotFoundException;
+import org.onap.appc.workingstatemanager.objects.VNFWorkingState;
 
 
 public interface WorkingStateManager {
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/JdbcWorkingStateManager.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/JdbcWorkingStateManager.java
index 85e1baab9..041cf7e84 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/JdbcWorkingStateManager.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/JdbcWorkingStateManager.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.workingstatemanager.impl;
+package org.onap.appc.workingstatemanager.impl;
 
 import java.sql.Connection;
 
-import org.openecomp.appc.dao.util.JdbcConnectionFactory;
-import org.openecomp.appc.workingstatemanager.WorkingStateManager;
+import org.onap.appc.dao.util.JdbcConnectionFactory;
+import org.onap.appc.workingstatemanager.WorkingStateManager;
 
 public abstract class JdbcWorkingStateManager implements WorkingStateManager {
 
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/RequestHandlerMessages.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/RequestHandlerMessages.java
index b41e9b41e..206d57229 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/RequestHandlerMessages.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/RequestHandlerMessages.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.workingstatemanager.impl;
+package org.onap.appc.workingstatemanager.impl;
 
 
 public class RequestHandlerMessages {
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/WorkingStateManagerImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/WorkingStateManagerImpl.java
index 3431d2774..e2fb3f298 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/WorkingStateManagerImpl.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/WorkingStateManagerImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.workingstatemanager.impl;
+package org.onap.appc.workingstatemanager.impl;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -33,12 +33,12 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.executor.objects.Params;
-import org.openecomp.appc.message.RequestHandlerMessages;
-import org.openecomp.appc.util.MessageFormatter;
-import org.openecomp.appc.workingstatemanager.objects.VNFWorkingState;
-import org.openecomp.appc.workingstatemanager.objects.VnfWorkingStateDto;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.executor.objects.Params;
+import org.onap.appc.message.RequestHandlerMessages;
+import org.onap.appc.util.MessageFormatter;
+import org.onap.appc.workingstatemanager.objects.VNFWorkingState;
+import org.onap.appc.workingstatemanager.objects.VnfWorkingStateDto;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.apache.commons.lang3.StringUtils;
@@ -50,7 +50,7 @@ public class WorkingStateManagerImpl extends JdbcWorkingStateManager {
     private static final String SQL_INSERT_VNF_STATE_MANAGEMENT = "INSERT IGNORE INTO VNF_STATE_MANAGEMENT (VNF_ID,STATE,OWNER_ID,UPDATED,VER) VALUES (?, ?, ?, ?, ?)";
     private static final String SQL_UPDATE_VNF_STATE_MANAGEMENT = "UPDATE VNF_STATE_MANAGEMENT SET OWNER_ID=?, UPDATED=?, STATE=?, VER=? WHERE VNF_ID=? AND VER=?";
     private static final String SQL_CURRENT_TIMESTAMP = "SELECT CURRENT_TIMESTAMP()";
-    private static int maxAttempts = ConfigurationFactory.getConfiguration().getIntegerProperty("org.openecomp.appc.workingstatemanager.maxAttempts",20);
+    private static int maxAttempts = ConfigurationFactory.getConfiguration().getIntegerProperty("org.onap.appc.workingstatemanager.maxAttempts",20);
 
     private static Map<String,VNFWorkingState> workingStateMap = new ConcurrentHashMap<>();
     private static final EELFLogger logger = EELFManager.getInstance().getLogger(WorkingStateManagerImpl.class);
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/objects/VNFWorkingState.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/objects/VNFWorkingState.java
index 60ff8b582..9c638de20 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/objects/VNFWorkingState.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/objects/VNFWorkingState.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.workingstatemanager.objects;
+package org.onap.appc.workingstatemanager.objects;
 
 
 public enum VNFWorkingState {
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/objects/VnfWorkingStateDto.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/objects/VnfWorkingStateDto.java
index 30603a6a6..948d4ca59 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/objects/VnfWorkingStateDto.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/objects/VnfWorkingStateDto.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.workingstatemanager.objects;
+package org.onap.appc.workingstatemanager.objects;
 
 
 public class VnfWorkingStateDto {
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index cf2aa4804..447c2ce21 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -29,7 +29,7 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
-    <bean id="vnfRequestHandlerBean" class="org.openecomp.appc.requesthandler.impl.RequestHandlerImpl" scope="singleton" >
+    <bean id="vnfRequestHandlerBean" class="org.onap.appc.requesthandler.impl.RequestHandlerImpl" scope="singleton" >
     	<property name="commandExecutor" ref="commandExecutorRef" />
         <property name="requestValidator" ref="vnfRequestValidatorBean" />
         <property name="lockManager" ref="lockManagerRef" />
@@ -37,51 +37,51 @@
         <property name="transactionRecorder" ref="transactionRecorderRef" />
     </bean>
 
-    <bean id="vmRequestHandlerBean" class="org.openecomp.appc.requesthandler.impl.VMRequestHandlerImpl" scope="singleton" >
+    <bean id="vmRequestHandlerBean" class="org.onap.appc.requesthandler.impl.VMRequestHandlerImpl" scope="singleton" >
         <property name="commandExecutor" ref="commandExecutorRef" />
         <property name="requestValidator" ref="vmRequestValidatorBean" />
         <property name="transactionRecorder" ref="transactionRecorderRef" />
     </bean>
 
-    <bean id="vnfRequestValidatorBean" class="org.openecomp.appc.requesthandler.impl.RequestValidatorImpl" scope="singleton" >
+    <bean id="vnfRequestValidatorBean" class="org.onap.appc.requesthandler.impl.RequestValidatorImpl" scope="singleton" >
         <property name="lifecyclemanager" ref="lifecyclemanagerRef" />
         <property name="workflowManager" ref="workflowManagerRef" />
         <property name="workingStateManager" ref="workingStateManagerBean" />
         <property name="lcmStateManager" ref="lcmStateManagerBean" />
     </bean>
 
-    <bean id="vmRequestValidatorBean" class="org.openecomp.appc.requesthandler.impl.VMRequestValidatorImpl" scope="singleton">
+    <bean id="vmRequestValidatorBean" class="org.onap.appc.requesthandler.impl.VMRequestValidatorImpl" scope="singleton">
         <property name="workflowManager" ref="workflowManagerRef" />
         <property name="lcmStateManager" ref="lcmStateManagerBean" />
     </bean>
 
-    <bean id="lcmStateManagerBean" class="org.openecomp.appc.requesthandler.impl.LCMStateManagerImpl" scope="singleton" />
+    <bean id="lcmStateManagerBean" class="org.onap.appc.requesthandler.impl.LCMStateManagerImpl" scope="singleton" />
 
-    <service id="vmRequestHandlerService" interface="org.openecomp.appc.requesthandler.RequestHandler" ref="vmRequestHandlerBean">
+    <service id="vmRequestHandlerService" interface="org.onap.appc.requesthandler.RequestHandler" ref="vmRequestHandlerBean">
         <service-properties>
             <entry key="level">
                 <value type="java.lang.String">VM</value>
             </entry>
         </service-properties>
     </service>
-    <service id="vnfRequestHandlerService" interface="org.openecomp.appc.requesthandler.RequestHandler" ref="vnfRequestHandlerBean">
+    <service id="vnfRequestHandlerService" interface="org.onap.appc.requesthandler.RequestHandler" ref="vnfRequestHandlerBean">
         <service-properties>
             <entry key="level">
                 <value type="java.lang.String">VNF</value>
             </entry>
         </service-properties>
     </service>
-    <service id="lcmStateManagerService" interface="org.openecomp.appc.requesthandler.LCMStateManager" ref="lcmStateManagerBean"/>
-    <reference id="lifecyclemanagerRef" availability="mandatory" activation="eager" interface="org.openecomp.appc.lifecyclemanager.LifecycleManager" />
-    <reference id="workflowManagerRef" availability="mandatory" activation="eager" interface="org.openecomp.appc.workflow.WorkFlowManager" />
-    <reference id="commandExecutorRef" availability="optional" activation="eager" interface="org.openecomp.appc.executor.CommandExecutor" />
-    <reference id="lockManagerRef" availability="mandatory" activation="eager" interface="org.openecomp.appc.lockmanager.api.LockManager" />
-    <reference id="transactionRecorderRef" availability="mandatory" activation="eager" interface="org.openecomp.appc.transactionrecorder.TransactionRecorder" />
+    <service id="lcmStateManagerService" interface="org.onap.appc.requesthandler.LCMStateManager" ref="lcmStateManagerBean"/>
+    <reference id="lifecyclemanagerRef" availability="mandatory" activation="eager" interface="org.onap.appc.lifecyclemanager.LifecycleManager" />
+    <reference id="workflowManagerRef" availability="mandatory" activation="eager" interface="org.onap.appc.workflow.WorkFlowManager" />
+    <reference id="commandExecutorRef" availability="optional" activation="eager" interface="org.onap.appc.executor.CommandExecutor" />
+    <reference id="lockManagerRef" availability="mandatory" activation="eager" interface="org.onap.appc.lockmanager.api.LockManager" />
+    <reference id="transactionRecorderRef" availability="mandatory" activation="eager" interface="org.onap.appc.transactionrecorder.TransactionRecorder" />
     <reference xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0" ext:proxy-method="classes" id="aaiServiceRef" availability="mandatory" activation="eager" interface="org.onap.ccsdk.sli.adaptors.aai.AAIService" />
 
-    <bean id="workingStateManagerBean" class="org.openecomp.appc.workingstatemanager.impl.WorkingStateManagerImpl" scope="singleton" >
+    <bean id="workingStateManagerBean" class="org.onap.appc.workingstatemanager.impl.WorkingStateManagerImpl" scope="singleton" >
         <property name="connectionFactory">
-            <bean class="org.openecomp.appc.dao.util.AppcJdbcConnectionFactory">
+            <bean class="org.onap.appc.dao.util.AppcJdbcConnectionFactory">
                 <property name="schema" value="sdnctl"/>
     </bean>
         </property>
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/org/openecomp/appc/default.properties b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/org/openecomp/appc/default.properties
index f04b048d7..9bf3b6c1a 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/org/openecomp/appc/default.properties
@@ -24,8 +24,8 @@
 
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 #Property below provided by appc.properties
 appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm
@@ -37,13 +37,13 @@ appc.LCM.provider.user=test
 appc.LCM.provider.pass=test
 
 
-org.openecomp.appc.db.url.sdnctl=jdbc:mysql://127.0.0.1:3306/test
-org.openecomp.appc.db.user.sdnctl=test
-org.openecomp.appc.db.pass.sdnctl=123456
+org.onap.appc.db.url.sdnctl=jdbc:mysql://127.0.0.1:3306/test
+org.onap.appc.db.user.sdnctl=test
+org.onap.appc.db.pass.sdnctl=123456
 
 # 
 # This needs to be changed so that the action can be appended to the end of the URL path 
 #
 #provider.urls.topology=https://admin:password@<IP_ADDRESS>:8443/restconf/operations/appc-provider:topology-service
 #provider.urls.topology=https://admin:password@<IP_ADDRESS>:8443/restconf/operations/appc-provider:
-org.openecomp.appc.workingstatemanager.maxAttempts=20
+org.onap.appc.workingstatemanager.maxAttempts=20
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/LCMStateManagerImplTest.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/LCMStateManagerImplTest.java
index 113c6c65b..95146fbfa 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/LCMStateManagerImplTest.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/LCMStateManagerImplTest.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler;
+package org.onap.appc.requesthandler;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.requesthandler.impl.LCMStateManagerImpl;
+import org.onap.appc.requesthandler.impl.LCMStateManagerImpl;
 
 public class LCMStateManagerImplTest {
 
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/RequestValidatorTest.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/RequestValidatorTest.java
index 9e2dd6f66..9339931e8 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/RequestValidatorTest.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/RequestValidatorTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler;
+package org.onap.appc.requesthandler;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -30,26 +30,26 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.openecomp.appc.domainmodel.lcm.ActionIdentifiers;
-import org.openecomp.appc.domainmodel.lcm.CommonHeader;
-import org.openecomp.appc.domainmodel.lcm.Flags;
-import org.openecomp.appc.domainmodel.lcm.RequestContext;
-import org.openecomp.appc.domainmodel.lcm.ResponseContext;
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.domainmodel.lcm.Status;
-import org.openecomp.appc.domainmodel.lcm.VNFContext;
-import org.openecomp.appc.domainmodel.lcm.VNFOperation;
-import org.openecomp.appc.lifecyclemanager.LifecycleManager;
-import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException;
-import org.openecomp.appc.requesthandler.exceptions.InvalidInputException;
-import org.openecomp.appc.requesthandler.exceptions.LCMOperationsDisabledException;
-import org.openecomp.appc.requesthandler.impl.RequestHandlerImpl;
-import org.openecomp.appc.requesthandler.impl.RequestValidatorImpl;
-import org.openecomp.appc.requesthandler.objects.RequestHandlerInput;
-import org.openecomp.appc.transactionrecorder.TransactionRecorder;
-import org.openecomp.appc.workflow.WorkFlowManager;
-import org.openecomp.appc.workflow.objects.WorkflowExistsOutput;
-import org.openecomp.appc.workingstatemanager.WorkingStateManager;
+import org.onap.appc.domainmodel.lcm.ActionIdentifiers;
+import org.onap.appc.domainmodel.lcm.CommonHeader;
+import org.onap.appc.domainmodel.lcm.Flags;
+import org.onap.appc.domainmodel.lcm.RequestContext;
+import org.onap.appc.domainmodel.lcm.ResponseContext;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.domainmodel.lcm.Status;
+import org.onap.appc.domainmodel.lcm.VNFContext;
+import org.onap.appc.domainmodel.lcm.VNFOperation;
+import org.onap.appc.lifecyclemanager.LifecycleManager;
+import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException;
+import org.onap.appc.requesthandler.exceptions.InvalidInputException;
+import org.onap.appc.requesthandler.exceptions.LCMOperationsDisabledException;
+import org.onap.appc.requesthandler.impl.RequestHandlerImpl;
+import org.onap.appc.requesthandler.impl.RequestValidatorImpl;
+import org.onap.appc.requesthandler.objects.RequestHandlerInput;
+import org.onap.appc.transactionrecorder.TransactionRecorder;
+import org.onap.appc.workflow.WorkFlowManager;
+import org.onap.appc.workflow.objects.WorkflowExistsOutput;
+import org.onap.appc.workingstatemanager.WorkingStateManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
 import org.onap.ccsdk.sli.adaptors.aai.AAIService;
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestConverter.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestConverter.java
index dd308976a..a65af669b 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestConverter.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestConverter.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler;
+package org.onap.appc.requesthandler;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.domainmodel.lcm.*;
-import org.openecomp.appc.executor.objects.LCMCommandStatus;
-import org.openecomp.appc.requesthandler.conv.Converter;
+import org.onap.appc.domainmodel.lcm.*;
+import org.onap.appc.executor.objects.LCMCommandStatus;
+import org.onap.appc.requesthandler.conv.Converter;
 
 import java.text.ParseException;
 import java.time.Instant;
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestRequestHandler.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestRequestHandler.java
index ef6d96e1e..dfb45389d 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestRequestHandler.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestRequestHandler.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.requesthandler;
+package org.onap.appc.requesthandler;
 
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyObject;
@@ -42,50 +42,50 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
-import org.openecomp.appc.adapter.factory.DmaapMessageAdapterFactoryImpl;
-import org.openecomp.appc.adapter.message.MessageAdapterFactory;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.domainmodel.lcm.*;
-import org.openecomp.appc.domainmodel.lcm.Flags.Mode;
-import org.openecomp.appc.domainmodel.lcm.ActionIdentifiers;
-import org.openecomp.appc.domainmodel.lcm.CommonHeader;
-import org.openecomp.appc.domainmodel.lcm.Flags;
-import org.openecomp.appc.domainmodel.lcm.RequestContext;
-import org.openecomp.appc.domainmodel.lcm.ResponseContext;
-import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
-import org.openecomp.appc.domainmodel.lcm.Status;
-import org.openecomp.appc.domainmodel.lcm.VNFContext;
-import org.openecomp.appc.domainmodel.lcm.VNFOperation;
-import org.openecomp.appc.executor.CommandExecutor;
-import org.openecomp.appc.executor.UnstableVNFException;
-import org.openecomp.appc.executor.objects.LCMCommandStatus;
-import org.openecomp.appc.lifecyclemanager.LifecycleManager;
-import org.openecomp.appc.lifecyclemanager.objects.LifecycleException;
-import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException;
-import org.openecomp.appc.lockmanager.api.LockException;
-import org.openecomp.appc.lockmanager.api.LockManager;
-import org.openecomp.appc.messageadapter.MessageAdapter;
-import org.openecomp.appc.messageadapter.impl.MessageAdapterImpl;
-import org.openecomp.appc.requesthandler.exceptions.*;
-import org.openecomp.appc.requesthandler.exceptions.DGWorkflowNotFoundException;
-import org.openecomp.appc.requesthandler.exceptions.DuplicateRequestException;
-import org.openecomp.appc.requesthandler.exceptions.InvalidInputException;
-import org.openecomp.appc.requesthandler.exceptions.RequestExpiredException;
-import org.openecomp.appc.requesthandler.exceptions.VNFNotFoundException;
-import org.openecomp.appc.requesthandler.exceptions.WorkflowNotFoundException;
-import org.openecomp.appc.requesthandler.impl.RequestHandlerImpl;
-import org.openecomp.appc.requesthandler.impl.RequestValidatorImpl;
-import org.openecomp.appc.requesthandler.objects.RequestHandlerInput;
-import org.openecomp.appc.requesthandler.objects.RequestHandlerOutput;
-import org.openecomp.appc.transactionrecorder.TransactionRecorder;
-import org.openecomp.appc.transactionrecorder.objects.TransactionRecord;
-import org.openecomp.appc.workflow.WorkFlowManager;
-import org.openecomp.appc.workflow.objects.WorkflowExistsOutput;
-import org.openecomp.appc.workflow.objects.WorkflowRequest;
-import org.openecomp.appc.workingstatemanager.WorkingStateManager;
-import org.openecomp.appc.workingstatemanager.objects.VNFWorkingState;
+import org.onap.appc.adapter.factory.DmaapMessageAdapterFactoryImpl;
+import org.onap.appc.adapter.message.MessageAdapterFactory;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.domainmodel.lcm.*;
+import org.onap.appc.domainmodel.lcm.Flags.Mode;
+import org.onap.appc.domainmodel.lcm.ActionIdentifiers;
+import org.onap.appc.domainmodel.lcm.CommonHeader;
+import org.onap.appc.domainmodel.lcm.Flags;
+import org.onap.appc.domainmodel.lcm.RequestContext;
+import org.onap.appc.domainmodel.lcm.ResponseContext;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
+import org.onap.appc.domainmodel.lcm.Status;
+import org.onap.appc.domainmodel.lcm.VNFContext;
+import org.onap.appc.domainmodel.lcm.VNFOperation;
+import org.onap.appc.executor.CommandExecutor;
+import org.onap.appc.executor.UnstableVNFException;
+import org.onap.appc.executor.objects.LCMCommandStatus;
+import org.onap.appc.lifecyclemanager.LifecycleManager;
+import org.onap.appc.lifecyclemanager.objects.LifecycleException;
+import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException;
+import org.onap.appc.lockmanager.api.LockException;
+import org.onap.appc.lockmanager.api.LockManager;
+import org.onap.appc.messageadapter.MessageAdapter;
+import org.onap.appc.messageadapter.impl.MessageAdapterImpl;
+import org.onap.appc.requesthandler.exceptions.*;
+import org.onap.appc.requesthandler.exceptions.DGWorkflowNotFoundException;
+import org.onap.appc.requesthandler.exceptions.DuplicateRequestException;
+import org.onap.appc.requesthandler.exceptions.InvalidInputException;
+import org.onap.appc.requesthandler.exceptions.RequestExpiredException;
+import org.onap.appc.requesthandler.exceptions.VNFNotFoundException;
+import org.onap.appc.requesthandler.exceptions.WorkflowNotFoundException;
+import org.onap.appc.requesthandler.impl.RequestHandlerImpl;
+import org.onap.appc.requesthandler.impl.RequestValidatorImpl;
+import org.onap.appc.requesthandler.objects.RequestHandlerInput;
+import org.onap.appc.requesthandler.objects.RequestHandlerOutput;
+import org.onap.appc.transactionrecorder.TransactionRecorder;
+import org.onap.appc.transactionrecorder.objects.TransactionRecord;
+import org.onap.appc.workflow.WorkFlowManager;
+import org.onap.appc.workflow.objects.WorkflowExistsOutput;
+import org.onap.appc.workflow.objects.WorkflowRequest;
+import org.onap.appc.workingstatemanager.WorkingStateManager;
+import org.onap.appc.workingstatemanager.objects.VNFWorkingState;
 import org.onap.ccsdk.sli.adaptors.aai.AAIService;
 
 import com.att.eelf.configuration.EELFLogger;
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/workingstatemanager/TestWorkingStateManager.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/workingstatemanager/TestWorkingStateManager.java
index 12ef95c6f..fc14f2ac9 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/workingstatemanager/TestWorkingStateManager.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/workingstatemanager/TestWorkingStateManager.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.workingstatemanager;
+package org.onap.appc.workingstatemanager;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.dao.util.AppcJdbcConnectionFactory;
-import org.openecomp.appc.workingstatemanager.impl.WorkingStateManagerImpl;
-import org.openecomp.appc.workingstatemanager.objects.VNFWorkingState;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.dao.util.AppcJdbcConnectionFactory;
+import org.onap.appc.workingstatemanager.impl.WorkingStateManagerImpl;
+import org.onap.appc.workingstatemanager.objects.VNFWorkingState;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
@@ -50,7 +50,7 @@ public class TestWorkingStateManager {
         String schema = "sdnctl";
         appcJdbcConnectionFactory.setSchema(schema);
         workingStateManager.setConnectionFactory(appcJdbcConnectionFactory);
-        String property = ConfigurationFactory.getConfiguration().getProperty(String.format("org.openecomp.appc.db.url.%s", schema));
+        String property = ConfigurationFactory.getConfiguration().getProperty(String.format("org.onap.appc.db.url.%s", schema));
         logger.info(property+" will be used as connection URL to mySQL.");
         logger.warn("you can set connection URL to other IP by adding -DmysqlIp=<MYSQL_IP> in VM Option");
 //        System.getProperties().getProperty("mys")
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/openecomp/appc/default.properties b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/openecomp/appc/default.properties
index 11a9b74fb..80e77b261 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/openecomp/appc/default.properties
@@ -23,9 +23,9 @@
 ###
 
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded to supply configuration options
-#org.openecomp.appc.bootstrap.file=executor-test.properties
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+#org.onap.appc.bootstrap.file=executor-test.properties
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 #
 # Certificate keystore and truststore
@@ -71,12 +71,12 @@ org.openecomp.sdnc.sli.aai.param.physical.location.id=physical-location-id
 org.openecomp.sdnc.sli.aai.param.service.type=service-type
 
 
-org.openecomp.appc.logging.path=${user.home},etc,../etc,.
-org.openecomp.appc.logging.file=logback.xml
+org.onap.appc.logging.path=${user.home},etc,../etc,.
+org.onap.appc.logging.file=logback.xml
 
-org.openecomp.appc.db.url.%s", schema), "");
-org.openecomp.appc.db.user.%s", schema), "");
-org.openecomp.appc.db.pass.%s", schema), "");
+org.onap.appc.db.url.%s", schema), "");
+org.onap.appc.db.user.%s", schema), "");
+org.onap.appc.db.pass.%s", schema), "");
 
 
 #Property below provided by appc.properties
@@ -91,8 +91,8 @@ appc.LCM.provider.pass=test
 
 
 mysqlIp=127.0.0.1
-org.openecomp.appc.db.url.sdnctl=jdbc:mysql://${mysqlIp}:3306/test
-org.openecomp.appc.db.user.sdnctl=test
-org.openecomp.appc.db.pass.sdnctl=123456
+org.onap.appc.db.url.sdnctl=jdbc:mysql://${mysqlIp}:3306/test
+org.onap.appc.db.user.sdnctl=test
+org.onap.appc.db.pass.sdnctl=123456
 
-org.openecomp.appc.workingstatemanager.maxAttempts=2
+org.onap.appc.workingstatemanager.maxAttempts=2
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-features/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-features/pom.xml
index 2279e5bb0..1562a6e01 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-features/pom.xml
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-features/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-request-handler</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <name>appc-request-handler-features</name>
@@ -13,12 +13,12 @@
 
   <dependencies>
      <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-request-handler-api</artifactId>
       <version>${project.version}</version>
     </dependency>  	
      <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-request-handler-core</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-features/src/main/resources/features.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-features/src/main/resources/features.xml
index 4df1ea054..75b21a656 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-features/src/main/resources/features.xml
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-features/src/main/resources/features.xml
@@ -29,15 +29,15 @@
     xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0  http://karaf.apache.org/xmlns/features/v1.2.0">     
         
     <feature name='appc-request-handler' description="appc-request-handler" version='${project.version}'>
-        <bundle>mvn:org.openecomp.appc/transaction-recorder/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/transaction-recorder/${project.version}</bundle>
 
         <!-- appc-data-access-lib bundle is flagged as being a dependency -->
-        <bundle dependency="true">mvn:org.openecomp.appc/appc-data-access-lib/${project.version}</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/appc-data-access-lib/${project.version}</bundle>
 
-        <bundle dependency="true">mvn:org.openecomp.appc/domain-model-lib/${project.version}</bundle>
-        <bundle start-level="75" start="true">mvn:org.openecomp.appc/appc-command-executor-api/${project.version}</bundle>
-    	<bundle start-level="80" start="true">mvn:org.openecomp.appc/appc-request-handler-api/${project.version}</bundle>
-        <bundle start-level="85" start="true">mvn:org.openecomp.appc/appc-request-handler-core/${project.version}</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/domain-model-lib/${project.version}</bundle>
+        <bundle start-level="75" start="true">mvn:org.onap.appc/appc-command-executor-api/${project.version}</bundle>
+    	<bundle start-level="80" start="true">mvn:org.onap.appc/appc-request-handler-api/${project.version}</bundle>
+        <bundle start-level="85" start="true">mvn:org.onap.appc/appc-request-handler-core/${project.version}</bundle>
 
     </feature>
 
diff --git a/appc-dispatcher/appc-request-handler/pom.xml b/appc-dispatcher/appc-request-handler/pom.xml
index 28d223947..7c480a13b 100644
--- a/appc-dispatcher/appc-request-handler/pom.xml
+++ b/appc-dispatcher/appc-request-handler/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-dispatcher</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml
index 92aa37bbe..14c9e2df9 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 		<parent>
-	    <groupId>org.openecomp.appc</groupId>
+	    <groupId>org.onap.appc</groupId>
 	    <artifactId>appc-workflow-management</artifactId>
 	    <version>1.3.0-SNAPSHOT</version>
 	  </parent>
@@ -17,12 +17,12 @@
 
   <dependencies>
   	<dependency>
-  		<groupId>org.openecomp.appc</groupId>
+  		<groupId>org.onap.appc</groupId>
   		<artifactId>appc-data-access-lib</artifactId>
   		<version>${project.version}</version>
   	</dependency>
   	<dependency>
-  		<groupId>org.openecomp.appc</groupId>
+  		<groupId>org.onap.appc</groupId>
   		<artifactId>domain-model-lib</artifactId>
   		<version>${project.version}</version>
   	</dependency>
@@ -36,7 +36,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
-                        <Export-Package>org.openecomp.appc.dao.objects,org.openecomp.appc.workflow,org.openecomp.appc.workflow.helper,org.openecomp.appc.workflow.objects</Export-Package>
+                        <Export-Package>org.onap.appc.dao.objects,org.onap.appc.workflow,org.onap.appc.workflow.helper,org.onap.appc.workflow.objects</Export-Package>
                         <!--<Embed-Dependency>appc-common,eelf-core,logback-core,logback-classic,appc-data-access-lib,javax.json;scope=compile|runtime;inline=false</Embed-Dependency>-->
                         <!--<Embed-Transitive>true</Embed-Transitive>-->
                         <!--<Import-Package>!groovy.lang,!javax.*,!org.apache.log,!org.apache.log4j.*,!org.codehaus.jackson.*,!org.codehaus.jackson.map.*,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.codehaus.janino,!org.jasypt.*,!com.ibm.icu.*,!com.sun.faces.*,*</Import-Package>-->
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/WorkFlowManager.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/WorkFlowManager.java
index 0342d6777..c0cb8f48e 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/WorkFlowManager.java
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/WorkFlowManager.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.workflow;
+package org.onap.appc.workflow;
 
-import org.openecomp.appc.workflow.objects.WorkflowExistsOutput;
-import org.openecomp.appc.workflow.objects.WorkflowRequest;
-import org.openecomp.appc.workflow.objects.WorkflowResponse;
+import org.onap.appc.workflow.objects.WorkflowExistsOutput;
+import org.onap.appc.workflow.objects.WorkflowRequest;
+import org.onap.appc.workflow.objects.WorkflowResponse;
 
 public interface WorkFlowManager {
 	/**
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowExistsOutput.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowExistsOutput.java
index c38ba97d4..37d33d286 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowExistsOutput.java
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowExistsOutput.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.workflow.objects;
+package org.onap.appc.workflow.objects;
 
 public class WorkflowExistsOutput {
 
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowRequest.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowRequest.java
index 6e2b3b0ba..6cdbc7146 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowRequest.java
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowRequest.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.workflow.objects;
+package org.onap.appc.workflow.objects;
 
-import org.openecomp.appc.domainmodel.lcm.RequestContext;
-import org.openecomp.appc.domainmodel.lcm.ResponseContext;
-import org.openecomp.appc.domainmodel.lcm.VNFContext;
+import org.onap.appc.domainmodel.lcm.RequestContext;
+import org.onap.appc.domainmodel.lcm.ResponseContext;
+import org.onap.appc.domainmodel.lcm.VNFContext;
 
 
 public class WorkflowRequest {
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowResponse.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowResponse.java
index a1d58f6ca..f8d2997c5 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowResponse.java
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowResponse.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.workflow.objects;
+package org.onap.appc.workflow.objects;
 
 import java.util.Properties;
 
-import org.openecomp.appc.domainmodel.lcm.ResponseContext;
+import org.onap.appc.domainmodel.lcm.ResponseContext;
 
 
 public class WorkflowResponse {
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml
index 1b4787667..51ab9f95c 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml
@@ -21,7 +21,7 @@
 
     <modelVersion>4.0.0</modelVersion>
 		<parent>
-	    <groupId>org.openecomp.appc</groupId>
+	    <groupId>org.onap.appc</groupId>
 	    <artifactId>appc-workflow-management</artifactId>
 	    <version>1.3.0-SNAPSHOT</version>
 	  </parent>
@@ -33,22 +33,22 @@
 
     <dependencies>
         <dependency>
-        	<groupId>org.openecomp.appc</groupId>
+        	<groupId>org.onap.appc</groupId>
         	<artifactId>appc-common</artifactId>
         	<version>${project.version}</version>
         </dependency>                
         <dependency>
-        	<groupId>org.openecomp.appc</groupId>
+        	<groupId>org.onap.appc</groupId>
         	<artifactId>appc-data-access-lib</artifactId>
         	<version>${project.version}</version>
         </dependency>
         <dependency>
-        	<groupId>org.openecomp.appc</groupId>
+        	<groupId>org.onap.appc</groupId>
         	<artifactId>appc-workflow-management-api</artifactId>
         	<version>${project.version}</version>
         </dependency>
         <dependency>
-        	<groupId>org.openecomp.appc</groupId>
+        	<groupId>org.onap.appc</groupId>
         	<artifactId>appc-ranking-framework-lib</artifactId>
         	<version>${project.version}</version>
         </dependency>
@@ -70,10 +70,10 @@
                         <Bundle-Version>${project.version}</Bundle-Version>
                         <Embed-Dependency>javax.json;scope=compile|runtime;inline=false</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
-                        <Export-Service>org.openecomp.appc.workflow.WorkFlowManager</Export-Service>
+                        <Export-Service>org.onap.appc.workflow.WorkFlowManager</Export-Service>
                         <Import-Package>
-                            org.openecomp.appc.workflow,org.openecomp.appc.workflow.objects, org.openecomp.appc.configuration,
-                            org.openecomp.appc.util,com.att.eelf.configuration, org.openecomp.appc.dao.util,
+                            org.onap.appc.workflow,org.onap.appc.workflow.objects, org.onap.appc.configuration,
+                            org.onap.appc.util,com.att.eelf.configuration, org.onap.appc.dao.util,
                             *;resolution:=optional
                         </Import-Package>
                     </instructions>
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/common/constant/Constants.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/common/constant/Constants.java
index d0c5990eb..ebac2d001 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/common/constant/Constants.java
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/common/constant/Constants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.common.constant;
+package org.onap.appc.common.constant;
 
 public class Constants {
 
@@ -36,34 +36,34 @@ public class Constants {
     /**
      * The name of the property that contains the VM id value in the graph's context
      */
-    public static final String VF_ID = "org.openecomp.appc.vfid";
+    public static final String VF_ID = "org.onap.appc.vfid";
 
     /**
      * The name of the property that contains the VF Type value in the graph's context
      */
-    public static final String VF_TYPE = "org.openecomp.appc.vftype";
+    public static final String VF_TYPE = "org.onap.appc.vftype";
 
     /**
      * The name of the property that contains the service request id value in the graph's context
      */
-    public static final String REQUEST_ID = "org.openecomp.appc.reqid";
+    public static final String REQUEST_ID = "org.onap.appc.reqid";
 
     /**
      * The name of the property that indicates which method of the IaaS adapter to call
      */
-    public static final String ACTION = "org.openecomp.appc.action";
+    public static final String ACTION = "org.onap.appc.action";
 
     public static final String PAYLOAD = "payload";
 
-    public static final String CONF_ID = "org.openecomp.appc.confid";
+    public static final String CONF_ID = "org.onap.appc.confid";
 
-    public static final String API_VERSION = "org.openecomp.appc.apiversion";
+    public static final String API_VERSION = "org.onap.appc.apiversion";
 
-    public static final String ORIGINATOR_ID = "org.openecomp.appc.originatorid";
+    public static final String ORIGINATOR_ID = "org.onap.appc.originatorid";
 
-    public static final String OBJECT_ID ="org.openecomp.appc.objectid";
+    public static final String OBJECT_ID ="org.onap.appc.objectid";
 
-    public static final String SUB_REQUEST_ID = "org.openecomp.appc.subrequestid";
+    public static final String SUB_REQUEST_ID = "org.onap.appc.subrequestid";
 
     public static final String ERROR_MESSAGE = "error-message";
 
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java
index cbf7f975a..ceae5677c 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java
@@ -22,21 +22,21 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.workflow.impl;
+package org.onap.appc.workflow.impl;
 
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.common.constant.Constants;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.domainmodel.lcm.RequestContext;
-import org.openecomp.appc.domainmodel.lcm.ResponseContext;
-import org.openecomp.appc.domainmodel.lcm.Status;
-import org.openecomp.appc.util.ObjectMapper;
-import org.openecomp.appc.workflow.WorkFlowManager;
-import org.openecomp.appc.workflow.objects.WorkflowExistsOutput;
-import org.openecomp.appc.workflow.objects.WorkflowRequest;
-import org.openecomp.appc.workflow.objects.WorkflowResponse;
+import org.onap.appc.common.constant.Constants;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.domainmodel.lcm.RequestContext;
+import org.onap.appc.domainmodel.lcm.ResponseContext;
+import org.onap.appc.domainmodel.lcm.Status;
+import org.onap.appc.util.ObjectMapper;
+import org.onap.appc.workflow.WorkFlowManager;
+import org.onap.appc.workflow.objects.WorkflowExistsOutput;
+import org.onap.appc.workflow.objects.WorkflowRequest;
+import org.onap.appc.workflow.objects.WorkflowResponse;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
@@ -55,7 +55,7 @@ public class WorkFlowManagerImpl implements WorkFlowManager{
 	private static final Configuration configuration = ConfigurationFactory.getConfiguration();
 
 	private final WorkflowResolver workflowResolver = new WorkflowResolver(
-			configuration.getIntegerProperty("org.openecomp.appc.workflow.resolver.refresh_interval", 300)
+			configuration.getIntegerProperty("org.onap.appc.workflow.resolver.refresh_interval", 300)
 	);
 
 	public void setSvcLogicServiceRef(SvcLogicService svcLogic) {
@@ -94,20 +94,20 @@ public class WorkFlowManagerImpl implements WorkFlowManager{
 				/*
 				The following method call (populateDGContext) populates DG context with the
 				request parameters to maintain backward compatibility with old DGs,
-				 we are not altering the old way of passing (org.openecomp.appc.vnfId and so on..)
+				 we are not altering the old way of passing (org.onap.appc.vnfId and so on..)
 				This is still a temporary solution, the end solution should be agreed with
 				all stakeholders and implemented.
 			 */
 				populateDGContext(workflowParams,workflowRequest);
             } else {
-				actionProperty = configuration.getProperty("org.openecomp.appc.workflow.action", String.valueOf(Constants.ACTION));
-				requestIdProperty = configuration.getProperty("org.openecomp.appc.workflow.request.id", String.valueOf(Constants.REQUEST_ID));
-				vfIdProperty = configuration.getProperty("org.openecomp.appc.workflow.vfid", String.valueOf(Constants.VF_ID));
-				String payloadProperty = configuration.getProperty("org.openecomp.appc.workflow.payload", String.valueOf(Constants.PAYLOAD));
-				String vfTypeProperty = configuration.getProperty("org.openecomp.appc.workflow.vftype", String.valueOf(Constants.VF_TYPE));
-				String apiVerProperty = configuration.getProperty("org.openecomp.appc.workflow.apiVersion", String.valueOf(Constants.API_VERSION));
-				String originatorIdProperty = configuration.getProperty("org.openecomp.appc.workflow.originatorId",Constants.ORIGINATOR_ID);
-				String subRequestId = configuration.getProperty("org.openecomp.appc.workflow.subRequestId",Constants.SUB_REQUEST_ID);
+				actionProperty = configuration.getProperty("org.onap.appc.workflow.action", String.valueOf(Constants.ACTION));
+				requestIdProperty = configuration.getProperty("org.onap.appc.workflow.request.id", String.valueOf(Constants.REQUEST_ID));
+				vfIdProperty = configuration.getProperty("org.onap.appc.workflow.vfid", String.valueOf(Constants.VF_ID));
+				String payloadProperty = configuration.getProperty("org.onap.appc.workflow.payload", String.valueOf(Constants.PAYLOAD));
+				String vfTypeProperty = configuration.getProperty("org.onap.appc.workflow.vftype", String.valueOf(Constants.VF_TYPE));
+				String apiVerProperty = configuration.getProperty("org.onap.appc.workflow.apiVersion", String.valueOf(Constants.API_VERSION));
+				String originatorIdProperty = configuration.getProperty("org.onap.appc.workflow.originatorId",Constants.ORIGINATOR_ID);
+				String subRequestId = configuration.getProperty("org.onap.appc.workflow.subRequestId",Constants.SUB_REQUEST_ID);
 
                 workflowParams.put(actionProperty,workflowRequest.getRequestContext().getAction().name());
                 workflowParams.put(requestIdProperty, workflowRequest.getRequestContext().getCommonHeader().getRequestId());
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowKey.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowKey.java
index 79ac2ee66..d61628fc9 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowKey.java
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowKey.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.workflow.impl;
+package org.onap.appc.workflow.impl;
 
 class WorkflowKey {
     private final String name;
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolver.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolver.java
index 51fd09b8b..1f4a5b406 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolver.java
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolver.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.workflow.impl;
+package org.onap.appc.workflow.impl;
 
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.openecomp.appc.rankingframework.RankedAttributesContext;
-import org.openecomp.appc.rankingframework.RankedAttributesResolver;
+import org.onap.appc.rankingframework.RankedAttributesContext;
+import org.onap.appc.rankingframework.RankedAttributesResolver;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolverDataReader.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolverDataReader.java
index 161240d93..9cb04c42a 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolverDataReader.java
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolverDataReader.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.workflow.impl;
+package org.onap.appc.workflow.impl;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -32,11 +32,11 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.openecomp.appc.dao.util.DBUtils;
-import org.openecomp.appc.rankingframework.AbstractRankedAttributesResolverFactory;
-import org.openecomp.appc.rankingframework.ConfigurationEntry;
-import org.openecomp.appc.rankingframework.ConfigurationSet;
-import org.openecomp.appc.rankingframework.RankedAttributesResolver;
+import org.onap.appc.dao.util.DBUtils;
+import org.onap.appc.rankingframework.AbstractRankedAttributesResolverFactory;
+import org.onap.appc.rankingframework.ConfigurationEntry;
+import org.onap.appc.rankingframework.ConfigurationSet;
+import org.onap.appc.rankingframework.RankedAttributesResolver;
 
 class WorkflowResolverDataReader {
 
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 2bfd64f72..6da63d813 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -29,10 +29,10 @@
 
 	<reference id="svcLogicServiceRef" availability="mandatory" activation="eager" interface="org.onap.ccsdk.sli.core.sli.provider.SvcLogicService" />
 
-	<bean id="workflowManagementBean" class="org.openecomp.appc.workflow.impl.WorkFlowManagerImpl" scope="singleton">
+	<bean id="workflowManagementBean" class="org.onap.appc.workflow.impl.WorkFlowManagerImpl" scope="singleton">
 		<property name="svcLogicServiceRef" ref="svcLogicServiceRef" />
 	</bean>
 
-	<service id="workflowManagementService" interface="org.openecomp.appc.workflow.WorkFlowManager" ref="workflowManagementBean" />
+	<service id="workflowManagementService" interface="org.onap.appc.workflow.WorkFlowManager" ref="workflowManagementBean" />
 
 </blueprint>
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/org/openecomp/appc/default.properties b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/org/openecomp/appc/default.properties
index 8ef6c917a..55249d0f9 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/org/openecomp/appc/default.properties
@@ -24,8 +24,8 @@
 
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 #Property below provided by appc.properties
 appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm
@@ -39,5 +39,5 @@ appc.LCM.provider.pass=test
 
 
 # Tolerance interval (in seconds) between invalidation of DG resolver configuration
-org.openecomp.appc.workflow.resolver.refresh_interval=300
+org.onap.appc.workflow.resolver.refresh_interval=300
 
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/java/org/openecomp/appc/workflow/TestWorkFlowManager.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/java/org/openecomp/appc/workflow/TestWorkFlowManager.java
index 41f19ce10..74828a5d2 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/java/org/openecomp/appc/workflow/TestWorkFlowManager.java
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/java/org/openecomp/appc/workflow/TestWorkFlowManager.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.workflow;
+package org.onap.appc.workflow;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.openecomp.appc.workflow.impl.WorkFlowManagerImpl;
-import org.openecomp.appc.workflow.objects.WorkflowRequest;
+import org.onap.appc.workflow.impl.WorkFlowManagerImpl;
+import org.onap.appc.workflow.objects.WorkflowRequest;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicGraph;
 import org.onap.ccsdk.sli.core.sli.SvcLogicNode;
@@ -177,7 +177,7 @@ public class TestWorkFlowManager {
         try {
             svcLogicConfigureNode.setAttribute("status", "success");
             svcLogicOtherNode.setAttribute("status", "failure");
-            svcLogicRootNode.setAttribute("test", "$org.openecomp.appc.action");
+            svcLogicRootNode.setAttribute("test", "$org.onap.appc.action");
             svcLogicRootNode.addOutcome("Configure", svcLogicConfigureNode);
             svcLogicRootNode.addOutcome("Other", svcLogicOtherNode);
         } catch (SvcLogicException e) {
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/openecomp/appc/default.properties b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/openecomp/appc/default.properties
index 3c3789968..227a83753 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/openecomp/appc/default.properties
@@ -23,9 +23,9 @@
 ###
 
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded to supply configuration options
-#org.openecomp.appc.bootstrap.file=executor-test.properties
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+#org.onap.appc.bootstrap.file=executor-test.properties
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 
 #
@@ -72,12 +72,12 @@ org.openecomp.sdnc.sli.aai.param.physical.location.id=physical-location-id
 org.openecomp.sdnc.sli.aai.param.service.type=service-type
 
 
-org.openecomp.appc.logging.path=${user.home},etc,../etc,.
-org.openecomp.appc.logging.file=logback.xml
+org.onap.appc.logging.path=${user.home},etc,../etc,.
+org.onap.appc.logging.file=logback.xml
 
-org.openecomp.appc.db.url.%s", schema), "");
-org.openecomp.appc.db.user.%s", schema), "");
-org.openecomp.appc.db.pass.%s", schema), "");
+org.onap.appc.db.url.%s", schema), "");
+org.onap.appc.db.user.%s", schema), "");
+org.onap.appc.db.pass.%s", schema), "");
 
 #Property below provided by appc.properties
 appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml
index b68268f36..5e27242ea 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-workflow-management</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <name>appc-workflow-management-features</name>
@@ -13,12 +13,12 @@
 
   <dependencies>
   	<dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-workflow-management-api</artifactId>
       <version>${project.version}</version>
     </dependency>
      <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-workflow-management-core</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/src/main/resources/features.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/src/main/resources/features.xml
index a29e0b11d..227867acb 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/src/main/resources/features.xml
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/src/main/resources/features.xml
@@ -29,11 +29,11 @@
     xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0  http://karaf.apache.org/xmlns/features/v1.2.0">
 
     <feature name='appc-workflow-management' description="application executor" version='${project.version}'>
-        <bundle dependency="true">mvn:org.openecomp.appc/appc-data-access-lib/${project.version}</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/appc-data-access-lib/${project.version}</bundle>
 
-        <bundle>mvn:org.openecomp.appc/appc-workflow-management-api/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-workflow-management-core/${project.version}</bundle>
-        <bundle start="true" dependency="true">mvn:org.openecomp.appc/appc-ranking-framework-lib/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-workflow-management-api/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-workflow-management-core/${project.version}</bundle>
+        <bundle start="true" dependency="true">mvn:org.onap.appc/appc-ranking-framework-lib/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-dispatcher/appc-workflow-management/pom.xml b/appc-dispatcher/appc-workflow-management/pom.xml
index b843246c0..3b0f7564b 100644
--- a/appc-dispatcher/appc-workflow-management/pom.xml
+++ b/appc-dispatcher/appc-workflow-management/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-dispatcher</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
diff --git a/appc-dispatcher/pom.xml b/appc-dispatcher/pom.xml
index beb970fe4..4c9018210 100644
--- a/appc-dispatcher/pom.xml
+++ b/appc-dispatcher/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
diff --git a/appc-event-listener/appc-event-listener-bundle/pom.xml b/appc-event-listener/appc-event-listener-bundle/pom.xml
index 55ddb286b..7be1a2a19 100644
--- a/appc-event-listener/appc-event-listener-bundle/pom.xml
+++ b/appc-event-listener/appc-event-listener-bundle/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-event-listener</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -14,7 +14,7 @@
 	<dependencies>
 <!--
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-rest-bundle</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -24,31 +24,31 @@
 			<artifactId>eelf-core</artifactId>
 			</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dmaap-adapter-bundle</artifactId>
 			<version>${project.version}</version>
             <scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-message-adapter-api</artifactId>
 			<version>${project.version}</version>
             <scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-message-adapter-factory</artifactId>
 			<version>${project.version}</version>
             <scope>provided</scope>
 		</dependency>
 <!--
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-rest-model</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -105,11 +105,11 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
-						<Bundle-SymbolicName>org.openecomp.appc.listener</Bundle-SymbolicName>
-						<Bundle-Activator>org.openecomp.appc.listener.AppcEventListenerActivator</Bundle-Activator>
-						<Export-Package>org.openecomp.appc.listener</Export-Package>
-						<Import-Package>org.openecomp.appc.adapter.message.*,org.openecomp.appc.adapter.factory.*,org.openecomp.appc.adapter.messaging.*
-							org.openecomp.appc.exceptions, org.openecomp.appc.util,
+						<Bundle-SymbolicName>org.onap.appc.listener</Bundle-SymbolicName>
+						<Bundle-Activator>org.onap.appc.listener.AppcEventListenerActivator</Bundle-Activator>
+						<Export-Package>org.onap.appc.listener</Export-Package>
+						<Import-Package>org.onap.appc.adapter.message.*,org.onap.appc.adapter.factory.*,org.onap.appc.adapter.messaging.*
+							org.onap.appc.exceptions, org.onap.appc.util,
 							com.att.eelf.configuration, com.att.eelf.i18n,
 							*;resolution:=optional
 						</Import-Package>
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/AbstractListener.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/AbstractListener.java
index faa997987..89c75a357 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/AbstractListener.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/AbstractListener.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener;
+package org.onap.appc.listener;
 
 import java.security.SecureRandom;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.openecomp.appc.listener.impl.EventHandlerImpl;
+import org.onap.appc.listener.impl.EventHandlerImpl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/AppcEventListenerActivator.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/AppcEventListenerActivator.java
index b8cfa2ef7..0b1eb5328 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/AppcEventListenerActivator.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/AppcEventListenerActivator.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener;
+package org.onap.appc.listener;
 
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.listener.impl.ControllerImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.listener.impl.ControllerImpl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -123,20 +123,20 @@ public class AppcEventListenerActivator implements BundleActivator {
 
         // Configure event listener for the demo use case
         ListenerProperties demoProps = new ListenerProperties("appc.demo", props);
-        demoProps.setListenerClass(org.openecomp.appc.listener.demo.impl.ListenerImpl.class);
+        demoProps.setListenerClass(org.onap.appc.listener.demo.impl.ListenerImpl.class);
         listeners.add(demoProps);
 
         // ===========================================================================
 
         ListenerProperties clLCMProps = new ListenerProperties("appc.LCM", props);
-        clLCMProps.setListenerClass(org.openecomp.appc.listener.LCM.impl.ListenerImpl.class);
+        clLCMProps.setListenerClass(org.onap.appc.listener.LCM.impl.ListenerImpl.class);
         listeners.add(clLCMProps);
 
         // Configure the OAM properties
         String oamPropKeyPrefix = "appc.OAM";
         ListenerProperties oamProps  = new ListenerProperties(oamPropKeyPrefix, props);
         if (isAppcOamPropsListenerEnabled(oamProps)) {
-            oamProps.setListenerClass(org.openecomp.appc.listener.LCM.impl.ListenerImpl.class);
+            oamProps.setListenerClass(org.onap.appc.listener.LCM.impl.ListenerImpl.class);
             listeners.add(oamProps);
         } else {
             LOG.warn(String.format("The listener %s is disabled and will not be run", oamPropKeyPrefix));
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/Controller.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/Controller.java
index a85e88924..4fce8972b 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/Controller.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/Controller.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener;
+package org.onap.appc.listener;
 
 import java.util.Map;
 
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/EventHandler.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/EventHandler.java
index 5468f5bbc..9ec81b831 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/EventHandler.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/EventHandler.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener;
+package org.onap.appc.listener;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/conv/Converter.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/conv/Converter.java
index ae6a67727..4cef18c87 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/conv/Converter.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/conv/Converter.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.LCM.conv;
+package org.onap.appc.listener.LCM.conv;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONObject;
-import org.openecomp.appc.listener.LCM.model.DmaapMessage;
-import org.openecomp.appc.listener.LCM.model.DmaapOutgoingMessage;
-import org.openecomp.appc.listener.util.Mapper;
+import org.onap.appc.listener.LCM.model.DmaapMessage;
+import org.onap.appc.listener.LCM.model.DmaapOutgoingMessage;
+import org.onap.appc.listener.util.Mapper;
 
 public class Converter {
    
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/impl/ListenerImpl.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/impl/ListenerImpl.java
index c9ac104f3..41a6f92ee 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/impl/ListenerImpl.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/impl/ListenerImpl.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.LCM.impl;
+package org.onap.appc.listener.LCM.impl;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.listener.AbstractListener;
-import org.openecomp.appc.listener.ListenerProperties;
-import org.openecomp.appc.listener.LCM.conv.Converter;
-import org.openecomp.appc.listener.LCM.model.DmaapIncomingMessage;
-import org.openecomp.appc.listener.LCM.operation.ProviderOperations;
+import org.onap.appc.listener.AbstractListener;
+import org.onap.appc.listener.ListenerProperties;
+import org.onap.appc.listener.LCM.conv.Converter;
+import org.onap.appc.listener.LCM.model.DmaapIncomingMessage;
+import org.onap.appc.listener.LCM.operation.ProviderOperations;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/impl/WorkerImpl.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/impl/WorkerImpl.java
index 81cdd2897..9334a8fad 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/impl/WorkerImpl.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/impl/WorkerImpl.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.LCM.impl;
-
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.listener.EventHandler;
-import org.openecomp.appc.listener.LCM.conv.Converter;
-import org.openecomp.appc.listener.LCM.model.DmaapMessage;
-import org.openecomp.appc.listener.LCM.model.DmaapOutgoingMessage;
-import org.openecomp.appc.listener.LCM.operation.ProviderOperations;
+package org.onap.appc.listener.LCM.impl;
+
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.listener.EventHandler;
+import org.onap.appc.listener.LCM.conv.Converter;
+import org.onap.appc.listener.LCM.model.DmaapMessage;
+import org.onap.appc.listener.LCM.model.DmaapOutgoingMessage;
+import org.onap.appc.listener.LCM.operation.ProviderOperations;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/ActionIdentifiers.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/ActionIdentifiers.java
index dc16be98a..2419bed65 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/ActionIdentifiers.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/ActionIdentifiers.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.LCM.model;
+package org.onap.appc.listener.LCM.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/CommonHeader.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/CommonHeader.java
index a8e6cf722..b7dcc1bb7 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/CommonHeader.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/CommonHeader.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.LCM.model;
+package org.onap.appc.listener.LCM.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -31,7 +31,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Map;
 
-import org.openecomp.appc.util.Time;
+import org.onap.appc.util.Time;
 
 public class CommonHeader implements Serializable {
     @JsonProperty("timestamp")
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/DmaapIncomingMessage.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/DmaapIncomingMessage.java
index 70c1ab711..32b70d100 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/DmaapIncomingMessage.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/DmaapIncomingMessage.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.LCM.model;
+package org.onap.appc.listener.LCM.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import org.json.JSONObject;
-import org.openecomp.appc.listener.util.Mapper;
+import org.onap.appc.listener.util.Mapper;
 
 /**
  * This class represents a message being sent out to DMaaP by APPC to update listeners on the status of a request
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/DmaapMessage.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/DmaapMessage.java
index 17f6e8165..214783d10 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/DmaapMessage.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/DmaapMessage.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.LCM.model;
+package org.onap.appc.listener.LCM.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/DmaapOutgoingMessage.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/DmaapOutgoingMessage.java
index d0d038a8b..acf4461aa 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/DmaapOutgoingMessage.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/DmaapOutgoingMessage.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.LCM.model;
+package org.onap.appc.listener.LCM.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import org.json.JSONObject;
-import org.openecomp.appc.listener.util.Mapper;
+import org.onap.appc.listener.util.Mapper;
 
 /**
  * This class represents a message being sent out to DMaaP by APPC to update listeners on the status of a request
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/InputBody.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/InputBody.java
index 9808daf56..85aed42d8 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/InputBody.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/InputBody.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.LCM.model;
+package org.onap.appc.listener.LCM.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/OutputBody.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/OutputBody.java
index b382434fd..11714e8fb 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/OutputBody.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/OutputBody.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.LCM.model;
+package org.onap.appc.listener.LCM.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import org.json.JSONObject;
-import org.openecomp.appc.listener.util.Mapper;
+import org.onap.appc.listener.util.Mapper;
 
 /**
  * This class represents a message being sent out to DMaaP by APPC to update listeners on the status of a request
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/ResponseStatus.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/ResponseStatus.java
index 718dbb15f..114b97b35 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/ResponseStatus.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/model/ResponseStatus.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.LCM.model;
+package org.onap.appc.listener.LCM.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/operation/GenericProviderOperationRequestFormatter.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/operation/GenericProviderOperationRequestFormatter.java
index dc8b5eab7..8fbe4af24 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/operation/GenericProviderOperationRequestFormatter.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/operation/GenericProviderOperationRequestFormatter.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.LCM.operation;
+package org.onap.appc.listener.LCM.operation;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import org.json.JSONObject;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.listener.LCM.model.InputBody;
-import org.openecomp.appc.listener.LCM.model.ResponseStatus;
-import org.openecomp.appc.listener.util.Mapper;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.listener.LCM.model.InputBody;
+import org.onap.appc.listener.LCM.model.ResponseStatus;
+import org.onap.appc.listener.util.Mapper;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/operation/ProviderOperationRequestFormatter.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/operation/ProviderOperationRequestFormatter.java
index af12b318d..1e9909a1f 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/operation/ProviderOperationRequestFormatter.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/operation/ProviderOperationRequestFormatter.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.LCM.operation;
+package org.onap.appc.listener.LCM.operation;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import org.json.JSONObject;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.listener.LCM.model.InputBody;
-import org.openecomp.appc.listener.LCM.model.ResponseStatus;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.listener.LCM.model.InputBody;
+import org.onap.appc.listener.LCM.model.ResponseStatus;
 
 import java.net.URL;
 
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/operation/ProviderOperations.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/operation/ProviderOperations.java
index a7ddc82ed..d3ac83d1b 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/operation/ProviderOperations.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/operation/ProviderOperations.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.LCM.operation;
+package org.onap.appc.listener.LCM.operation;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.commons.codec.binary.Base64;
@@ -44,9 +44,9 @@ import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.HTTP;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.listener.LCM.model.ResponseStatus;
-import org.openecomp.appc.listener.util.Mapper;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.listener.LCM.model.ResponseStatus;
+import org.onap.appc.listener.util.Mapper;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/Listener.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/Listener.java
index edd4d3e8d..50589c89d 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/Listener.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/Listener.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener;
+package org.onap.appc.listener;
 
 /**
  * This interface defines a listener that subscribes to a DMaaP topic and continually polls for messages. The
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/ListenerProperties.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/ListenerProperties.java
index 0d41ca9d0..7908d3a1b 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/ListenerProperties.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/ListenerProperties.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener;
+package org.onap.appc.listener;
 
 import java.util.Properties;
 
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/impl/ListenerImpl.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/impl/ListenerImpl.java
index 79339a0cd..c7599dd1a 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/impl/ListenerImpl.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/impl/ListenerImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.demo.impl;
+package org.onap.appc.listener.demo.impl;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -31,9 +31,9 @@ import java.util.List;
 import java.util.TimeZone;
 import java.util.concurrent.RejectedExecutionException;
 
-import org.openecomp.appc.listener.AbstractListener;
-import org.openecomp.appc.listener.ListenerProperties;
-import org.openecomp.appc.listener.demo.model.IncomingMessage;
+import org.onap.appc.listener.AbstractListener;
+import org.onap.appc.listener.ListenerProperties;
+import org.onap.appc.listener.demo.model.IncomingMessage;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/impl/ProviderOperations.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/impl/ProviderOperations.java
index 6d1ae9527..9337edfbf 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/impl/ProviderOperations.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/impl/ProviderOperations.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.demo.impl;
+package org.onap.appc.listener.demo.impl;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -61,9 +61,9 @@ import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.HTTP;
 import org.json.JSONObject;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.listener.demo.model.IncomingMessage;
-import org.openecomp.appc.listener.util.Mapper;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.listener.demo.model.IncomingMessage;
+import org.onap.appc.listener.util.Mapper;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/impl/WorkerImpl.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/impl/WorkerImpl.java
index 623904e26..ef72c6e12 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/impl/WorkerImpl.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/impl/WorkerImpl.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.demo.impl;
+package org.onap.appc.listener.demo.impl;
 
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.listener.EventHandler;
-import org.openecomp.appc.listener.demo.model.IncomingMessage;
-import org.openecomp.appc.listener.demo.model.Status;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.listener.EventHandler;
+import org.onap.appc.listener.demo.model.IncomingMessage;
+import org.onap.appc.listener.demo.model.Status;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/Action.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/Action.java
index 4fe775d79..eecc99b4c 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/Action.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/Action.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.demo.model;
+package org.onap.appc.listener.demo.model;
 
 public enum Action {
     Restart("Restart"), Rebuild("Rebuild"), Migrate("Migrate"), Evacuate("Evacuate"), Snapshot("Snapshot"),modifyconfig("ModifyConfig");
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/CommonMessage.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/CommonMessage.java
index ae51c4b97..75a618754 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/CommonMessage.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/CommonMessage.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.demo.model;
+package org.onap.appc.listener.demo.model;
 
 import java.io.Serializable;
 import java.util.Collection;
 
 import org.json.JSONObject;
-import org.openecomp.appc.listener.util.Mapper;
+import org.onap.appc.listener.util.Mapper;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/IncomingMessage.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/IncomingMessage.java
index 968c87f2a..555329106 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/IncomingMessage.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/IncomingMessage.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.demo.model;
+package org.onap.appc.listener.demo.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/OutgoingMessage.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/OutgoingMessage.java
index f436d379e..a3294dd8c 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/OutgoingMessage.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/OutgoingMessage.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.demo.model;
+package org.onap.appc.listener.demo.model;
 
 import java.net.InetAddress;
 import java.security.SecureRandom;
@@ -31,8 +31,8 @@ import java.util.Date;
 import java.util.TimeZone;
 
 import org.json.JSONObject;
-import org.openecomp.appc.listener.util.Mapper;
-import org.openecomp.appc.util.Time;
+import org.onap.appc.listener.util.Mapper;
+import org.onap.appc.util.Time;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/Status.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/Status.java
index ebc1c3590..09db11402 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/Status.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/demo/model/Status.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.demo.model;
+package org.onap.appc.listener.demo.model;
 
 public enum Status {
     /*
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/impl/ControllerImpl.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/impl/ControllerImpl.java
index d34d4037a..b830b6fc7 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/impl/ControllerImpl.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/impl/ControllerImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.impl;
+package org.onap.appc.listener.impl;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -33,9 +33,9 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.openecomp.appc.listener.Controller;
-import org.openecomp.appc.listener.Listener;
-import org.openecomp.appc.listener.ListenerProperties;
+import org.onap.appc.listener.Controller;
+import org.onap.appc.listener.Listener;
+import org.onap.appc.listener.ListenerProperties;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/impl/EventHandlerImpl.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/impl/EventHandlerImpl.java
index 506593ed1..85ce93001 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/impl/EventHandlerImpl.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/impl/EventHandlerImpl.java
@@ -22,18 +22,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.impl;
+package org.onap.appc.listener.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.adapter.factory.MessageService;
-import org.openecomp.appc.adapter.message.Consumer;
-import org.openecomp.appc.adapter.message.MessageAdapterFactory;
-import org.openecomp.appc.adapter.message.Producer;
-import org.openecomp.appc.listener.EventHandler;
-import org.openecomp.appc.listener.ListenerProperties;
-import org.openecomp.appc.listener.util.Mapper;
-import org.openecomp.appc.logging.LoggingConstants;
+import org.onap.appc.adapter.factory.MessageService;
+import org.onap.appc.adapter.message.Consumer;
+import org.onap.appc.adapter.message.MessageAdapterFactory;
+import org.onap.appc.adapter.message.Producer;
+import org.onap.appc.listener.EventHandler;
+import org.onap.appc.listener.ListenerProperties;
+import org.onap.appc.listener.util.Mapper;
+import org.onap.appc.logging.LoggingConstants;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/util/Mapper.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/util/Mapper.java
index f484aa8a3..bd77041ec 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/util/Mapper.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/util/Mapper.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.util;
+package org.onap.appc.listener.util;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-event-listener/appc-event-listener-bundle/src/main/resources/org/openecomp/appc/default.properties
index 89164b63d..839faddac 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -34,8 +34,8 @@
 
 
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded to supply configuration options
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 
 
diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM/TestConverter.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM/TestConverter.java
index 99f775140..f9fb7f408 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM/TestConverter.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM/TestConverter.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.LCM;
+package org.onap.appc.listener.LCM;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.listener.LCM.conv.Converter;
-import org.openecomp.appc.listener.LCM.model.DmaapIncomingMessage;
-import org.openecomp.appc.listener.LCM.model.DmaapOutgoingMessage;
-import org.openecomp.appc.listener.util.Mapper;
+import org.onap.appc.listener.LCM.conv.Converter;
+import org.onap.appc.listener.LCM.model.DmaapIncomingMessage;
+import org.onap.appc.listener.LCM.model.DmaapOutgoingMessage;
+import org.onap.appc.listener.util.Mapper;
 
 public class TestConverter {
 
diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM1607/model/TestJsonGenericMessages.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM1607/model/TestJsonGenericMessages.java
index 03dd62b01..f28bd8cb3 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM1607/model/TestJsonGenericMessages.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM1607/model/TestJsonGenericMessages.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.LCM1607.model;
+package org.onap.appc.listener.LCM1607.model;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.listener.util.Mapper;
+import org.onap.appc.listener.util.Mapper;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestAbstractListener.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestAbstractListener.java
index 3cd04fa89..a21bcd416 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestAbstractListener.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestAbstractListener.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener;
+package org.onap.appc.listener;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -34,8 +34,8 @@ import java.util.concurrent.ThreadPoolExecutor;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.listener.AbstractListener;
-import org.openecomp.appc.listener.ListenerProperties;
+import org.onap.appc.listener.AbstractListener;
+import org.onap.appc.listener.ListenerProperties;
 
 public class TestAbstractListener {
 
@@ -59,7 +59,7 @@ public class TestAbstractListener {
     @Before
     public void setup() throws Exception {
         Properties regularProps = new Properties();
-        regularProps.load(getClass().getResourceAsStream("/org/openecomp/appc/default.properties"));
+        regularProps.load(getClass().getResourceAsStream("/org/onap/appc/default.properties"));
         props = new ListenerProperties("", regularProps);
         listener = new DummyListener(props);
     }
diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestAppcDmaapListenerActivator.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestAppcDmaapListenerActivator.java
index 1fca2d375..6bb96b95c 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestAppcDmaapListenerActivator.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestAppcDmaapListenerActivator.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener;
+package org.onap.appc.listener;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 
 import org.junit.Test;
-import org.openecomp.appc.listener.AppcEventListenerActivator;
+import org.onap.appc.listener.AppcEventListenerActivator;
 
 public class TestAppcDmaapListenerActivator {
 
diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestListenerProperties.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestListenerProperties.java
index 643f8d179..42c263394 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestListenerProperties.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestListenerProperties.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener;
+package org.onap.appc.listener;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -35,10 +35,10 @@ import java.util.Properties;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.adapter.factory.MessageService;
-import org.openecomp.appc.listener.AbstractListener;
-import org.openecomp.appc.listener.ListenerProperties;
-import org.openecomp.appc.listener.ListenerProperties.KEYS;
+import org.onap.appc.adapter.factory.MessageService;
+import org.onap.appc.listener.AbstractListener;
+import org.onap.appc.listener.ListenerProperties;
+import org.onap.appc.listener.ListenerProperties.KEYS;
 
 public class TestListenerProperties {
 
@@ -126,7 +126,7 @@ public class TestListenerProperties {
 
         Properties tmp = new Properties();
         try {
-            tmp.load(getClass().getResourceAsStream("/org/openecomp/appc/default.properties"));
+            tmp.load(getClass().getResourceAsStream("/org/onap/appc/default.properties"));
         } catch (Exception e) {
             fail("Could not load properties to test");
         }
diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestEnums.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestEnums.java
index bf12a534d..f201e02f0 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestEnums.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestEnums.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.demo.model;
+package org.onap.appc.listener.demo.model;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
-import org.openecomp.appc.listener.demo.model.Action;
-import org.openecomp.appc.listener.demo.model.Status;
+import org.onap.appc.listener.demo.model.Action;
+import org.onap.appc.listener.demo.model.Status;
 
 public class TestEnums {
 
diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestMessages.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestMessages.java
index 4dbb945b8..3eedd88a3 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestMessages.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestMessages.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.demo.model;
+package org.onap.appc.listener.demo.model;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -35,10 +35,10 @@ import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.appc.listener.demo.model.IncomingMessage;
-import org.openecomp.appc.listener.demo.model.OutgoingMessage;
-import org.openecomp.appc.listener.demo.model.Status;
-import org.openecomp.appc.listener.util.Mapper;
+import org.onap.appc.listener.demo.model.IncomingMessage;
+import org.onap.appc.listener.demo.model.OutgoingMessage;
+import org.onap.appc.listener.demo.model.Status;
+import org.onap.appc.listener.util.Mapper;
 
 public class TestMessages {
     private IncomingMessage in;
diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestController.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestController.java
index 2a2c7de0a..d44bb22cc 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestController.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestController.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.impl;
+package org.onap.appc.listener.impl;
 
 public class TestController {
 
diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestEventHandler.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestEventHandler.java
index 7f48d45dd..992566358 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestEventHandler.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestEventHandler.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.impl;
+package org.onap.appc.listener.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -40,9 +40,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.appc.listener.EventHandler;
-import org.openecomp.appc.listener.ListenerProperties;
-import org.openecomp.appc.listener.impl.EventHandlerImpl;
+import org.onap.appc.listener.EventHandler;
+import org.onap.appc.listener.ListenerProperties;
+import org.onap.appc.listener.impl.EventHandlerImpl;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -58,7 +58,7 @@ public class TestEventHandler {
 
     private EventHandler adapter;
 
-    private static final String PROP_FILE = "/org/openecomp/appc/default.properties";
+    private static final String PROP_FILE = "/org/onap/appc/default.properties";
 
     private static final String MESSAGE_FILE = "/DCAEResponse.txt";
 
diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestListener.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestListener.java
index 6fbda7e4f..67ad9bf1d 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestListener.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestListener.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.impl;
+package org.onap.appc.listener.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -32,14 +32,14 @@ import java.util.Properties;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.appc.listener.Listener;
-import org.openecomp.appc.listener.ListenerProperties;
-import org.openecomp.appc.listener.demo.impl.ListenerImpl;
+import org.onap.appc.listener.Listener;
+import org.onap.appc.listener.ListenerProperties;
+import org.onap.appc.listener.demo.impl.ListenerImpl;
 
 @Ignore
 public class TestListener {
 
-    private static final String PROP_FILE = "/org/openecomp/appc/default.properties";
+    private static final String PROP_FILE = "/org/onap/appc/default.properties";
 
     private Listener listener;
 
diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/util/TestMapper.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/util/TestMapper.java
index 47f02946b..de726194f 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/util/TestMapper.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/util/TestMapper.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.util;
+package org.onap.appc.listener.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -36,7 +36,7 @@ import java.util.List;
 import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.listener.util.Mapper;
+import org.onap.appc.listener.util.Mapper;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/appc-event-listener/appc-event-listener-features/pom.xml b/appc-event-listener/appc-event-listener-features/pom.xml
index 7da13aec9..1e159cb4d 100644
--- a/appc-event-listener/appc-event-listener-features/pom.xml
+++ b/appc-event-listener/appc-event-listener-features/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-event-listener</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>appc-event-listener-features</artifactId>
@@ -13,7 +13,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-event-listener-bundle</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-event-listener/appc-event-listener-features/src/main/resources/features.xml b/appc-event-listener/appc-event-listener-features/src/main/resources/features.xml
index 2d0ef4118..23612a123 100644
--- a/appc-event-listener/appc-event-listener-features/src/main/resources/features.xml
+++ b/appc-event-listener/appc-event-listener-features/src/main/resources/features.xml
@@ -35,9 +35,9 @@
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
 <!--         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-        <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
-        <bundle dependency="true">mvn:org.openecomp.appc/appc-metric-bundle/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-event-listener-bundle/${project.version}</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/appc-metric-bundle/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-event-listener-bundle/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-event-listener/appc-event-listener-installer/pom.xml b/appc-event-listener/appc-event-listener-installer/pom.xml
index 497cad29a..f6f542a78 100644
--- a/appc-event-listener/appc-event-listener-installer/pom.xml
+++ b/appc-event-listener/appc-event-listener-installer/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-event-listener</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>appc-event-listener-installer</artifactId>
@@ -13,14 +13,14 @@
 	<properties>
 		<application.name>appc-event-listener</application.name>
 		<features.boot>appc-event-listener</features.boot>
-		<features.repositories>mvn:org.openecomp.appc/appc-event-listener-features/${project.version}/xml/features</features.repositories>
+		<features.repositories>mvn:org.onap.appc/appc-event-listener-features/${project.version}/xml/features</features.repositories>
 		<include.transitive.dependencies>false</include.transitive.dependencies>
 	</properties>
 
 	<dependencies>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-event-listener-features</artifactId>
 			<version>${project.version}</version>
 			<classifier>features</classifier>
@@ -34,7 +34,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-event-listener-bundle</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-event-listener/pom.xml b/appc-event-listener/pom.xml
index fd623f249..7bdda9d76 100644
--- a/appc-event-listener/pom.xml
+++ b/appc-event-listener/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
diff --git a/appc-inbound/appc-artifact-handler/features/pom.xml b/appc-inbound/appc-artifact-handler/features/pom.xml
index cd6ae70d6..86dc80ffc 100755
--- a/appc-inbound/appc-artifact-handler/features/pom.xml
+++ b/appc-inbound/appc-artifact-handler/features/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-artifact-handler</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>appc-artifact-handler-features</artifactId>
@@ -12,11 +12,11 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-artifact-handler-model</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-artifact-handler-provider</artifactId>
 			<classifier>config</classifier>
 			<type>xml</type>
diff --git a/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml b/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml
index 6b6906e9d..10a276460 100644
--- a/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml
+++ b/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml
@@ -42,12 +42,12 @@
 		<bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
 		<bundle>wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson.version}</bundle>
 		<bundle>wrap:mvn:org.yaml/snakeyaml/${snakeyaml.version}</bundle>
-		<bundle>wrap:mvn:org.openecomp.appc/appc-yang-generator/${project.version}</bundle>
+		<bundle>wrap:mvn:org.onap.appc/appc-yang-generator/${project.version}</bundle>
 		<bundle>wrap:mvn:org.openecomp.sdc.common/openecomp-tosca-datatype/${tosca.datatype.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-config-params-provider/${project.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-artifact-handler-model/${project.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-artifact-handler-provider/${project.version}</bundle>
-		<configfile finalname="etc/opendaylight/karaf/200-artifact-handler-provider.xml">mvn:org.openecomp.appc/appc-artifact-handler-provider/${project.version}/xml/config</configfile>
+		<bundle>mvn:org.onap.appc/appc-config-params-provider/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-artifact-handler-model/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-artifact-handler-provider/${project.version}</bundle>
+		<configfile finalname="etc/opendaylight/karaf/200-artifact-handler-provider.xml">mvn:org.onap.appc/appc-artifact-handler-provider/${project.version}/xml/config</configfile>
 	</feature>
 
 </features>
diff --git a/appc-inbound/appc-artifact-handler/installer/pom.xml b/appc-inbound/appc-artifact-handler/installer/pom.xml
index dc726d397..791be49e9 100755
--- a/appc-inbound/appc-artifact-handler/installer/pom.xml
+++ b/appc-inbound/appc-artifact-handler/installer/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-artifact-handler</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>appc-artifact-handler-installer</artifactId>
@@ -14,14 +14,14 @@
 	<properties>
 		<application.name>appc-artifact-handler</application.name>
 		<features.boot>appc-artifact-handler</features.boot>
-		<features.repositories>mvn:org.openecomp.appc/appc-artifact-handler-features/${project.version}/xml/features</features.repositories>
+		<features.repositories>mvn:org.onap.appc/appc-artifact-handler-features/${project.version}/xml/features</features.repositories>
 		<include.transitive.dependencies>false</include.transitive.dependencies>
 	</properties>
 
 	<dependencies>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-artifact-handler-features</artifactId>
 			<classifier>features</classifier>
 			<type>xml</type>
@@ -33,12 +33,12 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-artifact-handler-provider</artifactId>
 		</dependency>
 		
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-artifact-handler-provider</artifactId>
 			<version>${project.version}</version>
 			<classifier>config</classifier>
diff --git a/appc-inbound/appc-artifact-handler/model/pom.xml b/appc-inbound/appc-artifact-handler/model/pom.xml
index aeb1bb71a..9e2ad41b7 100755
--- a/appc-inbound/appc-artifact-handler/model/pom.xml
+++ b/appc-inbound/appc-artifact-handler/model/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-artifact-handler</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>appc-artifact-handler-model</artifactId>
diff --git a/appc-inbound/appc-artifact-handler/model/src/main/yang/artifact-handler.yang b/appc-inbound/appc-artifact-handler/model/src/main/yang/artifact-handler.yang
index e56b9c430..f9bf7ae10 100644
--- a/appc-inbound/appc-artifact-handler/model/src/main/yang/artifact-handler.yang
+++ b/appc-inbound/appc-artifact-handler/model/src/main/yang/artifact-handler.yang
@@ -25,7 +25,7 @@
 module artifact-handler {
     yang-version 1;
 
-    namespace "org.openecomp.appc:artifacthandler";
+    namespace "org.onap.appc:artifacthandler";
     prefix artifacthandler;
 
     import ietf-inet-types { prefix "ietf"; revision-date "2010-09-24"; }
diff --git a/appc-inbound/appc-artifact-handler/pom.xml b/appc-inbound/appc-artifact-handler/pom.xml
index 6ed8793f2..18ffa4109 100755
--- a/appc-inbound/appc-artifact-handler/pom.xml
+++ b/appc-inbound/appc-artifact-handler/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

 

 	<parent>

-		<groupId>org.openecomp.appc</groupId>

+		<groupId>org.onap.appc</groupId>

 		<artifactId>appc-inbound</artifactId>

 		<version>1.3.0-SNAPSHOT</version>

 	</parent>

@@ -14,26 +14,26 @@
 	<dependencyManagement>

 		<dependencies>

 			<dependency>

-				<groupId>org.openecomp.appc</groupId>

+				<groupId>org.onap.appc</groupId>

 				<artifactId>appc-artifact-handler-features</artifactId>

 				<classifier>features</classifier>

 				<type>xml</type>

 				<version>${project.version}</version>

 			</dependency>

 			<dependency>

-				<groupId>org.openecomp.appc</groupId>

+				<groupId>org.onap.appc</groupId>

 				<artifactId>appc-artifact-handler-model</artifactId>

 				<version>${project.version}</version>

 			</dependency>

 			<dependency>

-				<groupId>org.openecomp.appc</groupId>

+				<groupId>org.onap.appc</groupId>

 				<artifactId>appc-artifact-handler-provider</artifactId>

 				<version>${project.version}</version>

 				<classifier>config</classifier>

 				<type>xml</type>

 			</dependency>

 			<dependency>

-				<groupId>org.openecomp.appc</groupId>

+				<groupId>org.onap.appc</groupId>

 				<artifactId>appc-artifact-handler-provider</artifactId>

 				<version>${project.version}</version>

 			</dependency>

diff --git a/appc-inbound/appc-artifact-handler/provider/pom.xml b/appc-inbound/appc-artifact-handler/provider/pom.xml
index f283e8382..e1c132d63 100755
--- a/appc-inbound/appc-artifact-handler/provider/pom.xml
+++ b/appc-inbound/appc-artifact-handler/provider/pom.xml
@@ -27,7 +27,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-artifact-handler</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>appc-artifact-handler-provider</artifactId>
@@ -41,9 +41,9 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
-						<Bundle-SymbolicName>org.openecomp.appc.artifact.handler</Bundle-SymbolicName>
-						<Bundle-Activator>org.openecomp.appc.artifact.handler.SdcArtifactHandlerActivator</Bundle-Activator>
-						<Export-Package>org.openecomp.appc.artifact.handler,org.opendaylight.controller.config.yang.config.artifact-handler_provider.impl</Export-Package>
+						<Bundle-SymbolicName>org.onap.appc.artifact.handler</Bundle-SymbolicName>
+						<Bundle-Activator>org.onap.appc.artifact.handler.SdcArtifactHandlerActivator</Bundle-Activator>
+						<Export-Package>org.onap.appc.artifact.handler,org.opendaylight.controller.config.yang.config.artifact-handler_provider.impl</Export-Package>
 						<Import-Package>*</Import-Package>
 						<DynamicImport-Package>*</DynamicImport-Package>
 					</instructions>
@@ -119,7 +119,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-artifact-handler-model</artifactId>
 		</dependency>
 		<dependency>
@@ -127,7 +127,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 			<artifactId>config-api</artifactId>
 		</dependency>
  		<dependency>
- 			<groupId>org.openecomp.appc</groupId>
+ 			<groupId>org.onap.appc</groupId>
  			<artifactId>appc-yang-generator</artifactId>
  			<version>${project.version}</version>
  		</dependency>
@@ -153,7 +153,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 			<artifactId>sli-provider</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-config-params-provider</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/artifact/handler/provider/impl/rev170321/ArtifactHandlerProviderModule.java b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/artifact/handler/provider/impl/rev170321/ArtifactHandlerProviderModule.java
index a35ba6821..67bb19941 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/artifact/handler/provider/impl/rev170321/ArtifactHandlerProviderModule.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/artifact/handler/provider/impl/rev170321/ArtifactHandlerProviderModule.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.opendaylight.yang.gen.v1.org.openecomp.appc.artifact.handler.provider.impl.rev170321;
+package org.opendaylight.yang.gen.v1.org.onap.appc.artifact.handler.provider.impl.rev170321;
 
-import org.openecomp.appc.artifact.handler.ArtifactHandlerProvider;
+import org.onap.appc.artifact.handler.ArtifactHandlerProvider;
 
-public class ArtifactHandlerProviderModule extends org.opendaylight.yang.gen.v1.org.openecomp.appc.artifact.handler.provider.impl.rev170321.AbstractArtifactHandlerProviderModule {
+public class ArtifactHandlerProviderModule extends org.opendaylight.yang.gen.v1.org.onap.appc.artifact.handler.provider.impl.rev170321.AbstractArtifactHandlerProviderModule {
     public ArtifactHandlerProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
 
-    public ArtifactHandlerProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.openecomp.appc.artifact.handler.provider.impl.rev170321.ArtifactHandlerProviderModule oldModule, java.lang.AutoCloseable oldInstance) {
+    public ArtifactHandlerProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.onap.appc.artifact.handler.provider.impl.rev170321.ArtifactHandlerProviderModule oldModule, java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 
diff --git a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/artifact/handler/provider/impl/rev170321/ArtifactHandlerProviderModuleFactory.java b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/artifact/handler/provider/impl/rev170321/ArtifactHandlerProviderModuleFactory.java
index 171eada9b..7190da5b9 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/artifact/handler/provider/impl/rev170321/ArtifactHandlerProviderModuleFactory.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/artifact/handler/provider/impl/rev170321/ArtifactHandlerProviderModuleFactory.java
@@ -31,7 +31,7 @@
 *
 * Do not modify this file unless it is present under src/main directory
 */
-package org.opendaylight.yang.gen.v1.org.openecomp.appc.artifact.handler.provider.impl.rev170321;
-public class ArtifactHandlerProviderModuleFactory extends org.opendaylight.yang.gen.v1.org.openecomp.appc.artifact.handler.provider.impl.rev170321.AbstractArtifactHandlerProviderModuleFactory {
+package org.opendaylight.yang.gen.v1.org.onap.appc.artifact.handler.provider.impl.rev170321;
+public class ArtifactHandlerProviderModuleFactory extends org.opendaylight.yang.gen.v1.org.onap.appc.artifact.handler.provider.impl.rev170321.AbstractArtifactHandlerProviderModuleFactory {
 
 }
diff --git a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/ArtifactHandlerProvider.java b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/ArtifactHandlerProvider.java
index 8932e4732..d5ccd45b0 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/ArtifactHandlerProvider.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/ArtifactHandlerProvider.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.artifact.handler;
+package org.onap.appc.artifact.handler;
 
 import java.util.HashMap;
 import java.util.concurrent.ExecutionException;
@@ -41,12 +41,12 @@ import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFaile
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.artifacthandler.rev170321.ArtifactHandlerService;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.artifacthandler.rev170321.UploadartifactInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.artifacthandler.rev170321.UploadartifactInputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.artifacthandler.rev170321.UploadartifactOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.artifacthandler.rev170321.UploadartifactOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.artifacthandler.rev170321.uploadartifact.output.ConfigDocumentResponseBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.artifacthandler.rev170321.ArtifactHandlerService;
+import org.opendaylight.yang.gen.v1.org.onap.appc.artifacthandler.rev170321.UploadartifactInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.artifacthandler.rev170321.UploadartifactInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.artifacthandler.rev170321.UploadartifactOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.artifacthandler.rev170321.UploadartifactOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.artifacthandler.rev170321.uploadartifact.output.ConfigDocumentResponseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.rev130405.Services;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.rev130405.ServicesBuilder;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
@@ -54,9 +54,9 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-import org.openecomp.appc.artifact.handler.node.ArtifactHandlerNode;
-import org.openecomp.appc.artifact.handler.utils.ArtifactHandlerProviderUtil;
-import org.openecomp.appc.artifact.handler.utils.SdcArtifactHandlerConstants;
+import org.onap.appc.artifact.handler.node.ArtifactHandlerNode;
+import org.onap.appc.artifact.handler.utils.ArtifactHandlerProviderUtil;
+import org.onap.appc.artifact.handler.utils.SdcArtifactHandlerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import com.att.eelf.configuration.EELFLogger;
diff --git a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/SdcArtifactHandlerActivator.java b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/SdcArtifactHandlerActivator.java
index 6ce8af993..ebbbe4735 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/SdcArtifactHandlerActivator.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/SdcArtifactHandlerActivator.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.artifact.handler;
+package org.onap.appc.artifact.handler;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import org.openecomp.appc.artifact.handler.node.ArtifactHandlerNode;
+import org.onap.appc.artifact.handler.node.ArtifactHandlerNode;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
diff --git a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/dbservices/DBService.java b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/dbservices/DBService.java
index b915fd9dc..031d53e28 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/dbservices/DBService.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/dbservices/DBService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.artifact.handler.dbservices;
+package org.onap.appc.artifact.handler.dbservices;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -31,7 +31,7 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
-import org.openecomp.appc.artifact.handler.utils.SdcArtifactHandlerConstants;
+import org.onap.appc.artifact.handler.utils.SdcArtifactHandlerConstants;
 
 import java.sql.SQLException;
 import java.util.HashMap;
diff --git a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/node/ArtifactHandlerNode.java b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/node/ArtifactHandlerNode.java
index 920476b23..f56581977 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/node/ArtifactHandlerNode.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/node/ArtifactHandlerNode.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.artifact.handler.node;
+package org.onap.appc.artifact.handler.node;
 
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
@@ -31,11 +31,11 @@ import java.util.Map;
 import org.apache.commons.lang.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.openecomp.appc.artifact.handler.dbservices.DBService;
-import org.openecomp.appc.artifact.handler.utils.ArtifactHandlerProviderUtil;
-import org.openecomp.appc.artifact.handler.utils.SdcArtifactHandlerConstants;
-import org.openecomp.appc.yang.YANGGenerator;
-import org.openecomp.appc.yang.impl.YANGGeneratorFactory;
+import org.onap.appc.artifact.handler.dbservices.DBService;
+import org.onap.appc.artifact.handler.utils.ArtifactHandlerProviderUtil;
+import org.onap.appc.artifact.handler.utils.SdcArtifactHandlerConstants;
+import org.onap.appc.yang.YANGGenerator;
+import org.onap.appc.yang.impl.YANGGeneratorFactory;
 import org.openecomp.sdnc.config.params.transformer.tosca.ArtifactProcessorImpl;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
diff --git a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/utils/ArtifactHandlerProviderUtil.java b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/utils/ArtifactHandlerProviderUtil.java
index 199222e6e..15859178a 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/utils/ArtifactHandlerProviderUtil.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/utils/ArtifactHandlerProviderUtil.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.artifact.handler.utils;
+package org.onap.appc.artifact.handler.utils;
 
 import java.io.IOException;
 import java.security.SecureRandom;
@@ -31,8 +31,8 @@ import java.util.HashMap;
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.artifacthandler.rev170321.UploadartifactInput;
-import org.openecomp.appc.artifact.handler.node.ArtifactHandlerNode;
+import org.opendaylight.yang.gen.v1.org.onap.appc.artifacthandler.rev170321.UploadartifactInput;
+import org.onap.appc.artifact.handler.node.ArtifactHandlerNode;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import com.att.eelf.configuration.EELFLogger;
diff --git a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/utils/EscapeUtils.java b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/utils/EscapeUtils.java
index a5a338198..ece5cdb24 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/utils/EscapeUtils.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/utils/EscapeUtils.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.artifact.handler.utils;
+package org.onap.appc.artifact.handler.utils;
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/utils/SdcArtifactHandlerConstants.java b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/utils/SdcArtifactHandlerConstants.java
index 57dbb3f6f..c045ee7d4 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/utils/SdcArtifactHandlerConstants.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/openecomp/appc/artifact/handler/utils/SdcArtifactHandlerConstants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.artifact.handler.utils;
+package org.onap.appc.artifact.handler.utils;
 
 public class SdcArtifactHandlerConstants {
 
diff --git a/appc-inbound/appc-artifact-handler/provider/src/main/resources/initial/appc-artifact-handler-provider.xml b/appc-inbound/appc-artifact-handler/provider/src/main/resources/initial/appc-artifact-handler-provider.xml
index 658cb3fd6..34794c13c 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/main/resources/initial/appc-artifact-handler-provider.xml
+++ b/appc-inbound/appc-artifact-handler/provider/src/main/resources/initial/appc-artifact-handler-provider.xml
@@ -32,7 +32,7 @@
                 
                     <!-- This xmlns:prefix should match the namespace in the *-provider-impl.yang file
                          The prefix: inside type should match the prefix of the yang file. -->
-                    <type xmlns:prefix="org:openecomp:appc:artifact:handler:provider:impl">
+                    <type xmlns:prefix="org:onap:appc:artifact:handler:provider:impl">
                         prefix:artifact-handler-provider-impl
                     </type>
                     <name>artifact-handler-provider-impl</name>
@@ -69,7 +69,7 @@
           our service can be resolved. Capabilities for dependencies defined above are implied which is
           why we do not have define a required capability for the data broker, for example. -->
     <required-capabilities>
-        <capability>org:openecomp:appc:artifact:handler:provider:impl?module=artifact-handler-provider-impl&amp;revision=2017-03-21</capability>
+        <capability>org:onap:appc:artifact:handler:provider:impl?module=artifact-handler-provider-impl&amp;revision=2017-03-21</capability>
     </required-capabilities>
 
 </snapshot>
diff --git a/appc-inbound/appc-artifact-handler/provider/src/main/yang/artifact-handler-provider-impl.yang b/appc-inbound/appc-artifact-handler/provider/src/main/yang/artifact-handler-provider-impl.yang
index 01eeb3919..8b792e14e 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/main/yang/artifact-handler-provider-impl.yang
+++ b/appc-inbound/appc-artifact-handler/provider/src/main/yang/artifact-handler-provider-impl.yang
@@ -25,7 +25,7 @@
 module artifact-handler-provider-impl {
 
     yang-version 1;
-    namespace "org:openecomp:appc:artifact:handler:provider:impl";
+    namespace "org:onap:appc:artifact:handler:provider:impl";
     prefix "artifact-handler-provider-impl";
 
     import config { prefix config; revision-date 2013-04-05; }
diff --git a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/DBServiceTest.java b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/DBServiceTest.java
index 52fe27310..d5e86a0fc 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/DBServiceTest.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/DBServiceTest.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.artifact.handler.dbservices;
+package org.onap.appc.artifact.handler.dbservices;
 
 import java.nio.charset.Charset;
 import org.json.JSONObject;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.appc.artifact.handler.utils.SdcArtifactHandlerConstants;
+import org.onap.appc.artifact.handler.utils.SdcArtifactHandlerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.powermock.reflect.Whitebox;
 import static org.junit.Assert.assertEquals;
diff --git a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/MockDBService.java b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/MockDBService.java
index ef1aae9e7..caec09172 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/MockDBService.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/MockDBService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.artifact.handler.dbservices;
+package org.onap.appc.artifact.handler.dbservices;
 
 public class MockDBService extends DBService {
     private static MockDBService mockDgGeneralDBService = null;
diff --git a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/MockSvcLogicResource.java b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/MockSvcLogicResource.java
index 1a07117ed..c931ab0f4 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/MockSvcLogicResource.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/MockSvcLogicResource.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.artifact.handler.dbservices;
+package org.onap.appc.artifact.handler.dbservices;
 
 import java.util.Map;
 
diff --git a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/node/ArtifactHandlerNodeTest.java b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/node/ArtifactHandlerNodeTest.java
index 870c2fab1..42d436e98 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/node/ArtifactHandlerNodeTest.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/node/ArtifactHandlerNodeTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.artifact.handler.node;
+package org.onap.appc.artifact.handler.node;
 
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -37,10 +37,10 @@ import org.junit.Test;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.powermock.reflect.Whitebox;
 import static org.junit.Assert.assertTrue;
-import org.openecomp.appc.artifact.handler.dbservices.DBService;
-import org.openecomp.appc.artifact.handler.dbservices.MockDBService;
-import org.openecomp.appc.artifact.handler.utils.SdcArtifactHandlerConstants;
-import org.openecomp.appc.artifact.handler.utils.ArtifactHandlerProviderUtilTest;
+import org.onap.appc.artifact.handler.dbservices.DBService;
+import org.onap.appc.artifact.handler.dbservices.MockDBService;
+import org.onap.appc.artifact.handler.utils.SdcArtifactHandlerConstants;
+import org.onap.appc.artifact.handler.utils.ArtifactHandlerProviderUtilTest;
 
 import java.util.Map;
 import java.util.HashMap;
diff --git a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/node/MockArtifactHandlerNode.java b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/node/MockArtifactHandlerNode.java
index 437fa2678..39706a282 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/node/MockArtifactHandlerNode.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/node/MockArtifactHandlerNode.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.artifact.handler.node;
+package org.onap.appc.artifact.handler.node;
 
 import org.json.JSONObject;
-import org.openecomp.appc.artifact.handler.dbservices.MockDBService;
-import org.openecomp.appc.artifact.handler.utils.SdcArtifactHandlerConstants;
+import org.onap.appc.artifact.handler.dbservices.MockDBService;
+import org.onap.appc.artifact.handler.utils.SdcArtifactHandlerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 public class MockArtifactHandlerNode extends ArtifactHandlerNode {
diff --git a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/utils/ArtifactHandlerProviderUtilTest.java b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/utils/ArtifactHandlerProviderUtilTest.java
index be7e3cfd2..ef6ec6618 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/utils/ArtifactHandlerProviderUtilTest.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/utils/ArtifactHandlerProviderUtilTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.artifact.handler.utils;
+package org.onap.appc.artifact.handler.utils;
 
 import static org.junit.Assert.assertTrue;
 import java.nio.charset.Charset;
diff --git a/appc-inbound/appc-design-services/features/pom.xml b/appc-inbound/appc-design-services/features/pom.xml
index a99062966..f143df37c 100755
--- a/appc-inbound/appc-design-services/features/pom.xml
+++ b/appc-inbound/appc-design-services/features/pom.xml
@@ -4,7 +4,7 @@
 	
 	<parent>
 		<artifactId>appc-design-services</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>appc-design-services-features</artifactId>
@@ -13,11 +13,11 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-design-services-model</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-design-services-provider</artifactId>
 		</dependency>
 
diff --git a/appc-inbound/appc-design-services/features/src/main/resources/features.xml b/appc-inbound/appc-design-services/features/src/main/resources/features.xml
index a88410fe3..d413ad9cf 100644
--- a/appc-inbound/appc-design-services/features/src/main/resources/features.xml
+++ b/appc-inbound/appc-design-services/features/src/main/resources/features.xml
@@ -35,12 +35,12 @@
 		version='${project.version}'>
 
 		<feature version='${odl.mdsal.model.version}'>odl-mdsal-models</feature>
-		<bundle>mvn:org.openecomp.appc/appc-design-services-model/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-design-services-model/${project.version}</bundle>
 
 		<!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
 		<feature version='${odl.mdsal.version}'>odl-mdsal-broker</feature>
 		<feature>sdnc-sli</feature>
-		<bundle>mvn:org.openecomp.appc/appc-design-services-provider/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-design-services-provider/${project.version}</bundle>
 		<bundle>wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.3.0</bundle>
 		
 		<feature version='${odl.mdsal.version}'>odl-restconf</feature>
diff --git a/appc-inbound/appc-design-services/installer/pom.xml b/appc-inbound/appc-design-services/installer/pom.xml
index be6a32b0b..ea67826f6 100755
--- a/appc-inbound/appc-design-services/installer/pom.xml
+++ b/appc-inbound/appc-design-services/installer/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-design-services</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>appc-design-services-installer</artifactId>
@@ -14,14 +14,14 @@
 	<properties>
 		<application.name>appc-design-services</application.name>
 		<features.boot>appc-design-services</features.boot>
-		<features.repositories>mvn:org.openecomp.appc/appc-design-services-features/${project.version}/xml/features</features.repositories>
+		<features.repositories>mvn:org.onap.appc/appc-design-services-features/${project.version}/xml/features</features.repositories>
 		<include.transitive.dependencies>false</include.transitive.dependencies>
 	</properties>
 
 	<dependencies>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-design-services-features</artifactId>
 			<version>${project.version}</version>
 			<classifier>features</classifier>
@@ -34,7 +34,7 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-design-services-provider</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-inbound/appc-design-services/model/pom.xml b/appc-inbound/appc-design-services/model/pom.xml
index 1f2ff3473..bba4e12d8 100755
--- a/appc-inbound/appc-design-services/model/pom.xml
+++ b/appc-inbound/appc-design-services/model/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-design-services</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>appc-design-services-model</artifactId>
diff --git a/appc-inbound/appc-design-services/model/src/main/yang/appc-design-services.yang b/appc-inbound/appc-design-services/model/src/main/yang/appc-design-services.yang
index 1cd80c98b..f3f1e56d3 100644
--- a/appc-inbound/appc-design-services/model/src/main/yang/appc-design-services.yang
+++ b/appc-inbound/appc-design-services/model/src/main/yang/appc-design-services.yang
@@ -37,7 +37,7 @@
 module design-services {
 
     yang-version 1;
-    namespace "org:openecomp:appc";
+    namespace "org:onap:appc";
     prefix design-services;
     organization "AT&T.  Copyright (C) 2015. All rights reserved.";
 
diff --git a/appc-inbound/appc-design-services/pom.xml b/appc-inbound/appc-design-services/pom.xml
index 5023d50d4..8c1ab14b7 100755
--- a/appc-inbound/appc-design-services/pom.xml
+++ b/appc-inbound/appc-design-services/pom.xml
@@ -3,20 +3,20 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-inbound</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<packaging>pom</packaging>
-	<groupId>org.openecomp.appc</groupId>
+	<groupId>org.onap.appc</groupId>
 	<artifactId>appc-design-services</artifactId>
 
 	<dependencyManagement>
 
 		<dependencies>
 			<dependency>
-				<groupId>org.openecomp.appc</groupId>
+				<groupId>org.onap.appc</groupId>
 				<artifactId>appc-design-services-features</artifactId>
 				<classifier>features</classifier>
 				<type>xml</type>
@@ -24,19 +24,19 @@
 			</dependency>
 
 			<dependency>
-				<groupId>org.openecomp.appc</groupId>
+				<groupId>org.onap.appc</groupId>
 				<artifactId>appc-design-services-model</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.openecomp.appc</groupId>
+				<groupId>org.onap.appc</groupId>
 				<artifactId>appc-design-services-provider</artifactId>
 				<version>${project.version}</version>
 				<classifier>config</classifier>
 				<type>xml</type>
 			</dependency>
 			<dependency>
-				<groupId>org.openecomp.appc</groupId>
+				<groupId>org.onap.appc</groupId>
 				<artifactId>appc-design-services-provider</artifactId>
 				<version>${project.version}</version>
 			</dependency>
diff --git a/appc-inbound/appc-design-services/provider/pom.xml b/appc-inbound/appc-design-services/provider/pom.xml
index 9225f75d7..60a3c9e3d 100755
--- a/appc-inbound/appc-design-services/provider/pom.xml
+++ b/appc-inbound/appc-design-services/provider/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-design-services</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>appc-design-services-provider</artifactId>
@@ -18,7 +18,7 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
-						<Export-Package>org.openecomp.appc.design.services</Export-Package>
+						<Export-Package>org.onap.appc.design.services</Export-Package>
 						<Import-Package>*</Import-Package>
 					</instructions>
 				</configuration>
@@ -34,7 +34,7 @@
 		    <scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-design-services-model</artifactId>
 		</dependency>
 		<dependency>
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/ArtifactInfo.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/ArtifactInfo.java
index 41c02eac9..53f6f02fb 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/ArtifactInfo.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/ArtifactInfo.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.data;
+package org.onap.appc.design.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/DesignInfo.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/DesignInfo.java
index 96e429f02..a6d2ba24b 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/DesignInfo.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/DesignInfo.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.data;
+package org.onap.appc.design.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/DesignRequest.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/DesignRequest.java
index 03b70c7f2..d61de0282 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/DesignRequest.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/DesignRequest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.data;
+package org.onap.appc.design.data;
 
 import java.io.File;
 import java.net.URL;
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import org.openecomp.appc.design.services.util.DesignServiceConstants;
+import org.onap.appc.design.services.util.DesignServiceConstants;
 import org.onap.ccsdk.sli.core.dblib.DBResourceManager;
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
 
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/DesignResponse.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/DesignResponse.java
index 65fac2554..559620d9e 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/DesignResponse.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/DesignResponse.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.data;
+package org.onap.appc.design.data;
 
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/StatusInfo.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/StatusInfo.java
index 32a3e79e5..6d4b1a5a1 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/StatusInfo.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/data/StatusInfo.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.data;
+package org.onap.appc.design.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DbResponseProcessor.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DbResponseProcessor.java
index b6f6510a7..e697a9d4f 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DbResponseProcessor.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DbResponseProcessor.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.dbervices;
+package org.onap.appc.design.dbervices;
 
-import org.openecomp.appc.design.services.util.DesignServiceConstants;
+import org.onap.appc.design.services.util.DesignServiceConstants;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DbService.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DbService.java
index 02207709d..a2349196f 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DbService.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DbService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.dbervices;
+package org.onap.appc.design.dbervices;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DesignDBService.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DesignDBService.java
index 23ef7a19e..64251027f 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DesignDBService.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DesignDBService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.dbervices;
+package org.onap.appc.design.dbervices;
 
 import java.io.IOException;
 import java.security.SecureRandom;
@@ -32,12 +32,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.appc.design.data.ArtifactInfo;
-import org.openecomp.appc.design.data.DesignInfo;
-import org.openecomp.appc.design.data.DesignResponse;
-import org.openecomp.appc.design.data.StatusInfo;
-import org.openecomp.appc.design.services.util.ArtifactHandlerClient;
-import org.openecomp.appc.design.services.util.DesignServiceConstants;
+import org.onap.appc.design.data.ArtifactInfo;
+import org.onap.appc.design.data.DesignInfo;
+import org.onap.appc.design.data.DesignResponse;
+import org.onap.appc.design.data.StatusInfo;
+import org.onap.appc.design.services.util.ArtifactHandlerClient;
+import org.onap.appc.design.services.util.DesignServiceConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
 import org.onap.ccsdk.sli.core.dblib.DBResourceManager;
 import org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource;
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/RequestValidator.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/RequestValidator.java
index 0a9dd670a..c0b710deb 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/RequestValidator.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/RequestValidator.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.dbervices;
+package org.onap.appc.design.dbervices;
 
-import org.openecomp.appc.design.services.util.ArtifactHandlerClient;
-import org.openecomp.appc.design.services.util.DesignServiceConstants;
+import org.onap.appc.design.services.util.ArtifactHandlerClient;
+import org.onap.appc.design.services.util.DesignServiceConstants;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/propertyServices/PropertyUpdateService.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/propertyServices/PropertyUpdateService.java
index 79746ebc1..87e84d495 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/propertyServices/PropertyUpdateService.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/propertyServices/PropertyUpdateService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.propertyServices;
+package org.onap.appc.design.propertyServices;
 
 public class PropertyUpdateService {
     
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/DesignServiceProvider.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/DesignServiceProvider.java
index 641041979..f41bbac46 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/DesignServiceProvider.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/DesignServiceProvider.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.services;
+package org.onap.appc.design.services;
 
 import java.util.concurrent.Future;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev170627.DesignServicesService;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev170627.DesignServicesService;
 import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.openecomp.appc.design.services.impl.DesignServicesImpl;
+import org.onap.appc.design.services.impl.DesignServicesImpl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/impl/DesignServicesImpl.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/impl/DesignServicesImpl.java
index e800b8704..1787618e6 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/impl/DesignServicesImpl.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/impl/DesignServicesImpl.java
@@ -22,30 +22,30 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.services.impl;
+package org.onap.appc.design.services.impl;
 
 import java.util.concurrent.Future;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev170627.DbserviceInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev170627.DbserviceOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev170627.DbserviceOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev170627.DesignServicesService;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev170627.ValidatorInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev170627.ValidatorOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev170627.ValidatorOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev170627.XinterfaceserviceInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev170627.XinterfaceserviceOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev170627.XinterfaceserviceOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev170627.data.DataBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev170627.status.StatusBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev170627.DbserviceInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev170627.DbserviceOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev170627.DbserviceOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev170627.DesignServicesService;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev170627.ValidatorInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev170627.ValidatorOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev170627.ValidatorOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev170627.XinterfaceserviceInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev170627.XinterfaceserviceOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev170627.XinterfaceserviceOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev170627.data.DataBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev170627.status.StatusBuilder;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-import org.openecomp.appc.design.dbervices.DbResponseProcessor;
-import org.openecomp.appc.design.dbervices.DesignDBService;
-import org.openecomp.appc.design.services.util.DesignServiceConstants;
-import org.openecomp.appc.design.validator.ValidatorResponseProcessor;
-import org.openecomp.appc.design.validator.ValidatorService;
-import org.openecomp.appc.design.xinterface.XInterfaceService;
-import org.openecomp.appc.design.xinterface.XResponseProcessor;
+import org.onap.appc.design.dbervices.DbResponseProcessor;
+import org.onap.appc.design.dbervices.DesignDBService;
+import org.onap.appc.design.services.util.DesignServiceConstants;
+import org.onap.appc.design.validator.ValidatorResponseProcessor;
+import org.onap.appc.design.validator.ValidatorService;
+import org.onap.appc.design.xinterface.XInterfaceService;
+import org.onap.appc.design.xinterface.XResponseProcessor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/util/ArtifactHandlerClient.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/util/ArtifactHandlerClient.java
index 2ecb71a4b..b250faca9 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/util/ArtifactHandlerClient.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/util/ArtifactHandlerClient.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.services.util;
+package org.onap.appc.design.services.util;
 
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/util/DesignServiceConstants.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/util/DesignServiceConstants.java
index 73e6ba93f..9ad5e10ac 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/util/DesignServiceConstants.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/util/DesignServiceConstants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.services.util;
+package org.onap.appc.design.services.util;
 
 public class DesignServiceConstants {
             
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/util/EscapeUtils.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/util/EscapeUtils.java
index ae0f7f77b..80f756f3a 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/util/EscapeUtils.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/util/EscapeUtils.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.services.util;
+package org.onap.appc.design.services.util;
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/util/SecureRestClientTrustManager.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/util/SecureRestClientTrustManager.java
index 69014b5e4..8e31d9540 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/util/SecureRestClientTrustManager.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/services/util/SecureRestClientTrustManager.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.services.util;
+package org.onap.appc.design.services.util;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/validator/ValidatorResponseProcessor.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/validator/ValidatorResponseProcessor.java
index 1af4a97a0..faea6a5ee 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/validator/ValidatorResponseProcessor.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/validator/ValidatorResponseProcessor.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.validator;
+package org.onap.appc.design.validator;
 
-import org.openecomp.appc.design.services.impl.DesignServicesImpl;
+import org.onap.appc.design.services.impl.DesignServicesImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/validator/ValidatorService.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/validator/ValidatorService.java
index 2ab327530..6660dd825 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/validator/ValidatorService.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/validator/ValidatorService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.validator;
+package org.onap.appc.design.validator;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -48,7 +48,7 @@ import org.apache.velocity.exception.ParseErrorException;
 import org.apache.velocity.exception.ResourceNotFoundException;
 import org.apache.velocity.runtime.resource.loader.StringResourceLoader;
 import org.apache.velocity.runtime.resource.util.StringResourceRepository;
-import org.openecomp.appc.design.services.util.DesignServiceConstants;
+import org.onap.appc.design.services.util.DesignServiceConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/xinterface/XInterfaceService.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/xinterface/XInterfaceService.java
index 16a4b40da..157e52937 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/xinterface/XInterfaceService.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/xinterface/XInterfaceService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.xinterface;
+package org.onap.appc.design.xinterface;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/xinterface/XResponseProcessor.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/xinterface/XResponseProcessor.java
index 33e8438f0..aa72e2f09 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/xinterface/XResponseProcessor.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/xinterface/XResponseProcessor.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.xinterface;
+package org.onap.appc.design.xinterface;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/appc-inbound/appc-design-services/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/appc-inbound/appc-design-services/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index c207e8d3a..cd0e4123b 100644
--- a/appc-inbound/appc-design-services/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/appc-inbound/appc-design-services/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -36,7 +36,7 @@
 	<reference id="rpcRegistry"
 		interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" />
 
-	<bean id="provider" class="org.openecomp.appc.design.services.DesignServiceProvider"
+	<bean id="provider" class="org.onap.appc.design.services.DesignServiceProvider"
 		init-method="init" destroy-method="close">
 		<argument ref="dataBroker" />
 		<argument ref="rpcRegistry" />
diff --git a/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestArifactHandlerClient.java b/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestArifactHandlerClient.java
index 0ac893ed5..9f6622e36 100644
--- a/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestArifactHandlerClient.java
+++ b/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestArifactHandlerClient.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.validator;
+package org.onap.appc.design.validator;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.design.services.util.ArtifactHandlerClient;
+import org.onap.appc.design.services.util.ArtifactHandlerClient;
 import junit.framework.Assert;
 import static org.mockito.Mockito.*;
 import java.io.File;
diff --git a/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestDBService.java b/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestDBService.java
index 13cc93f61..ffc2cadce 100644
--- a/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestDBService.java
+++ b/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestDBService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.validator;
+package org.onap.appc.design.validator;
 
 import java.io.File;
 import java.io.InputStream;
@@ -33,9 +33,9 @@ import org.apache.commons.io.FileUtils;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.appc.design.dbervices.DbService;
-import org.openecomp.appc.design.dbervices.DesignDBService;
-import org.openecomp.appc.design.propertyServices.PropertyUpdateService;
+import org.onap.appc.design.dbervices.DbService;
+import org.onap.appc.design.dbervices.DesignDBService;
+import org.onap.appc.design.propertyServices.PropertyUpdateService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import junit.framework.Assert;
diff --git a/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestDbResponse.java b/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestDbResponse.java
index b8ae12586..73e3dfc99 100644
--- a/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestDbResponse.java
+++ b/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestDbResponse.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.validator;
+package org.onap.appc.design.validator;
 
 import java.util.ArrayList;
 import org.junit.Test;
-import org.openecomp.appc.design.dbervices.DbResponseProcessor;
+import org.onap.appc.design.dbervices.DbResponseProcessor;
 
 public class TestDbResponse {
 
diff --git a/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestDesigndata.java b/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestDesigndata.java
index 1a82ecdea..f5c4bfffd 100644
--- a/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestDesigndata.java
+++ b/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestDesigndata.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.validator;
+package org.onap.appc.design.validator;
 
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.Test;
-import org.openecomp.appc.design.data.ArtifactInfo;
-import org.openecomp.appc.design.data.DesignInfo;
-import org.openecomp.appc.design.data.DesignRequest;
-import org.openecomp.appc.design.data.DesignResponse;
-import org.openecomp.appc.design.data.StatusInfo;
+import org.onap.appc.design.data.ArtifactInfo;
+import org.onap.appc.design.data.DesignInfo;
+import org.onap.appc.design.data.DesignRequest;
+import org.onap.appc.design.data.DesignResponse;
+import org.onap.appc.design.data.StatusInfo;
 
 public class TestDesigndata {
 
diff --git a/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestEscapeUtils.java b/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestEscapeUtils.java
index fc9a765d7..4a99d42e9 100644
--- a/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestEscapeUtils.java
+++ b/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestEscapeUtils.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.validator;
+package org.onap.appc.design.validator;
 
 import java.io.IOException;
 import org.junit.Test;
-import org.openecomp.appc.design.services.util.EscapeUtils;
-import org.openecomp.appc.design.xinterface.XInterfaceService;
-import org.openecomp.appc.design.xinterface.XResponseProcessor;
+import org.onap.appc.design.services.util.EscapeUtils;
+import org.onap.appc.design.xinterface.XInterfaceService;
+import org.onap.appc.design.xinterface.XResponseProcessor;
 import junit.framework.Assert;
 
 public class TestEscapeUtils {
diff --git a/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestValidatorService.java b/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestValidatorService.java
index 858842b87..622483c66 100644
--- a/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestValidatorService.java
+++ b/appc-inbound/appc-design-services/provider/src/test/java/org/openecomp/appc/design/validator/TestValidatorService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.design.validator;
+package org.onap.appc.design.validator;
 
 import java.io.InputStream;
 import java.util.Enumeration;
@@ -30,7 +30,7 @@ import java.util.HashMap;
 import java.util.Properties;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.design.services.util.DesignServiceConstants;
+import org.onap.appc.design.services.util.DesignServiceConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/appc-inbound/pom.xml b/appc-inbound/pom.xml
index 2681c8d9a..76fe5856a 100755
--- a/appc-inbound/pom.xml
+++ b/appc-inbound/pom.xml
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

     <modelVersion>4.0.0</modelVersion>

     <parent>

-        <groupId>org.openecomp.appc</groupId>

+        <groupId>org.onap.appc</groupId>

         <artifactId>appc</artifactId>

         <version>1.3.0-SNAPSHOT</version>

     </parent>

diff --git a/appc-lifecycle-management/appc-lifecycle-management-api/pom.xml b/appc-lifecycle-management/appc-lifecycle-management-api/pom.xml
index 9c56d9538..b27be0f0d 100644
--- a/appc-lifecycle-management/appc-lifecycle-management-api/pom.xml
+++ b/appc-lifecycle-management/appc-lifecycle-management-api/pom.xml
@@ -1,6 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-lifecycle-management</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -25,7 +25,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
-                        <Export-Package>org.openecomp.appc.lifecyclemanager.*</Export-Package>
+                        <Export-Package>org.onap.appc.lifecyclemanager.*</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/LifecycleManager.java b/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/LifecycleManager.java
index 50fb7eec4..0ab535ffc 100644
--- a/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/LifecycleManager.java
+++ b/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/LifecycleManager.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lifecyclemanager;
+package org.onap.appc.lifecyclemanager;
 
-import org.openecomp.appc.lifecyclemanager.objects.LifecycleException;
-import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException;
+import org.onap.appc.lifecyclemanager.objects.LifecycleException;
+import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException;
 
 public interface LifecycleManager {
     String getNextState(String vnfType, String currentState, String event)
diff --git a/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/objects/LCMResponse.java b/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/objects/LCMResponse.java
index 4d73dc541..541f39fb2 100644
--- a/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/objects/LCMResponse.java
+++ b/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/objects/LCMResponse.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lifecyclemanager.objects;
+package org.onap.appc.lifecyclemanager.objects;
 
 public enum LCMResponse {
     INVALID_INPUT_PARAMETERS,
diff --git a/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/objects/LifecycleException.java b/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/objects/LifecycleException.java
index 613daa4ad..2fbdb740c 100644
--- a/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/objects/LifecycleException.java
+++ b/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/objects/LifecycleException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lifecyclemanager.objects;
+package org.onap.appc.lifecyclemanager.objects;
 
 public class LifecycleException extends Exception {
     public final String currentState;
diff --git a/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/objects/NoTransitionDefinedException.java b/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/objects/NoTransitionDefinedException.java
index 89616c268..ced81b812 100644
--- a/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/objects/NoTransitionDefinedException.java
+++ b/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/objects/NoTransitionDefinedException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lifecyclemanager.objects;
+package org.onap.appc.lifecyclemanager.objects;
 
 public class NoTransitionDefinedException extends Exception {
     public final String currentState;
diff --git a/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/objects/VNFOperationOutcome.java b/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/objects/VNFOperationOutcome.java
index 547ffc1a8..16cf08168 100644
--- a/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/objects/VNFOperationOutcome.java
+++ b/appc-lifecycle-management/appc-lifecycle-management-api/src/main/java/org/openecomp/appc/lifecyclemanager/objects/VNFOperationOutcome.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lifecyclemanager.objects;
+package org.onap.appc.lifecyclemanager.objects;
 
 public enum VNFOperationOutcome {
     SUCCESS,FAILURE,EXPIRE;
diff --git a/appc-lifecycle-management/appc-lifecycle-management-core/pom.xml b/appc-lifecycle-management/appc-lifecycle-management-core/pom.xml
index 460684507..82324efb6 100644
--- a/appc-lifecycle-management/appc-lifecycle-management-core/pom.xml
+++ b/appc-lifecycle-management/appc-lifecycle-management-core/pom.xml
@@ -20,7 +20,7 @@
     -->
 
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-lifecycle-management</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -34,12 +34,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-lifecycle-management-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>state-machine-lib</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -59,9 +59,9 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
                         <Embed-Transitive>true</Embed-Transitive>
-                        <Export-Service>org.openecomp.appc.lifecyclemanager.LifecycleManager</Export-Service>
+                        <Export-Service>org.onap.appc.lifecyclemanager.LifecycleManager</Export-Service>
                         <Import-Package>
-                            org.openecomp.appc.lifecyclemanager.*,
+                            org.onap.appc.lifecyclemanager.*,
                             *;resolution:=optional
                         </Import-Package>
                     </instructions>
diff --git a/appc-lifecycle-management/appc-lifecycle-management-core/src/main/java/org/openecomp/appc/lifecyclemanager/impl/LifecycleManagerImpl.java b/appc-lifecycle-management/appc-lifecycle-management-core/src/main/java/org/openecomp/appc/lifecyclemanager/impl/LifecycleManagerImpl.java
index b7acf98ed..12c48b481 100644
--- a/appc-lifecycle-management/appc-lifecycle-management-core/src/main/java/org/openecomp/appc/lifecyclemanager/impl/LifecycleManagerImpl.java
+++ b/appc-lifecycle-management/appc-lifecycle-management-core/src/main/java/org/openecomp/appc/lifecyclemanager/impl/LifecycleManagerImpl.java
@@ -22,22 +22,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.lifecyclemanager.impl;
+package org.onap.appc.lifecyclemanager.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
-import org.openecomp.appc.exceptions.InvalidInputException;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.lifecyclemanager.LifecycleManager;
-import org.openecomp.appc.lifecyclemanager.objects.LifecycleException;
-import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException;
-import org.openecomp.appc.statemachine.StateMachine;
-import org.openecomp.appc.statemachine.StateMetaDataReader;
-import org.openecomp.appc.statemachine.impl.StateMachineFactory;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamMetaDataReader;
-import org.openecomp.appc.statemachine.impl.readers.VnfMetaDataReader;
-import org.openecomp.appc.statemachine.objects.*;
+import org.onap.appc.exceptions.InvalidInputException;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.lifecyclemanager.LifecycleManager;
+import org.onap.appc.lifecyclemanager.objects.LifecycleException;
+import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException;
+import org.onap.appc.statemachine.StateMachine;
+import org.onap.appc.statemachine.StateMetaDataReader;
+import org.onap.appc.statemachine.impl.StateMachineFactory;
+import org.onap.appc.statemachine.impl.readers.AppcOamMetaDataReader;
+import org.onap.appc.statemachine.impl.readers.VnfMetaDataReader;
+import org.onap.appc.statemachine.objects.*;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index cea242f1f..bedf6e654 100644
--- a/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -26,9 +26,9 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
-    <bean id="lifecycleManagerBean" class="org.openecomp.appc.lifecyclemanager.impl.LifecycleManagerImpl" scope="singleton">
+    <bean id="lifecycleManagerBean" class="org.onap.appc.lifecyclemanager.impl.LifecycleManagerImpl" scope="singleton">
     </bean>
 
-    <service id="lcmService" interface="org.openecomp.appc.lifecyclemanager.LifecycleManager" ref="lifecycleManagerBean"/>
+    <service id="lcmService" interface="org.onap.appc.lifecyclemanager.LifecycleManager" ref="lifecycleManagerBean"/>
 
 </blueprint>
diff --git a/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/org/openecomp/appc/default.properties b/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/org/openecomp/appc/default.properties
index 99d728335..0c4de19aa 100644
--- a/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/org/openecomp/appc/default.properties
@@ -24,8 +24,8 @@
 
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 #Property below provided by appc.properties
 appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm
diff --git a/appc-lifecycle-management/appc-lifecycle-management-core/src/test/java/org/openecomp/appc/LifecycleManagerTest.java b/appc-lifecycle-management/appc-lifecycle-management-core/src/test/java/org/openecomp/appc/LifecycleManagerTest.java
index 299c32546..07aef6cb3 100644
--- a/appc-lifecycle-management/appc-lifecycle-management-core/src/test/java/org/openecomp/appc/LifecycleManagerTest.java
+++ b/appc-lifecycle-management/appc-lifecycle-management-core/src/test/java/org/openecomp/appc/LifecycleManagerTest.java
@@ -22,22 +22,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc;
+package org.onap.appc;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.exceptions.InvalidInputException;
-import org.openecomp.appc.lifecyclemanager.LifecycleManager;
-import org.openecomp.appc.statemachine.StateMetaDataReader;
-import org.openecomp.appc.lifecyclemanager.impl.LifecycleManagerImpl;
-import org.openecomp.appc.lifecyclemanager.objects.LifecycleException;
-import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException;
-import org.openecomp.appc.statemachine.impl.readers.VnfMetaDataReader;
-import org.openecomp.appc.statemachine.impl.readers.VnfMetaDataReader.VNFOperation;
-import org.openecomp.appc.statemachine.objects.Event;
-import org.openecomp.appc.statemachine.objects.State;
-import org.openecomp.appc.statemachine.objects.StateMachineMetadata;
-import org.openecomp.appc.statemachine.objects.Transition;
+import org.onap.appc.exceptions.InvalidInputException;
+import org.onap.appc.lifecyclemanager.LifecycleManager;
+import org.onap.appc.statemachine.StateMetaDataReader;
+import org.onap.appc.lifecyclemanager.impl.LifecycleManagerImpl;
+import org.onap.appc.lifecyclemanager.objects.LifecycleException;
+import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException;
+import org.onap.appc.statemachine.impl.readers.VnfMetaDataReader;
+import org.onap.appc.statemachine.impl.readers.VnfMetaDataReader.VNFOperation;
+import org.onap.appc.statemachine.objects.Event;
+import org.onap.appc.statemachine.objects.State;
+import org.onap.appc.statemachine.objects.StateMachineMetadata;
+import org.onap.appc.statemachine.objects.Transition;
 
 import java.util.*;
 
diff --git a/appc-lifecycle-management/appc-lifecycle-management-core/src/test/java/org/openecomp/appc/OamLifeCycleManagerTest.java b/appc-lifecycle-management/appc-lifecycle-management-core/src/test/java/org/openecomp/appc/OamLifeCycleManagerTest.java
index 0a89251d3..403a9f39e 100644
--- a/appc-lifecycle-management/appc-lifecycle-management-core/src/test/java/org/openecomp/appc/OamLifeCycleManagerTest.java
+++ b/appc-lifecycle-management/appc-lifecycle-management-core/src/test/java/org/openecomp/appc/OamLifeCycleManagerTest.java
@@ -22,18 +22,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc;
+package org.onap.appc;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.openecomp.appc.lifecyclemanager.impl.LifecycleManagerImpl;
-import org.openecomp.appc.lifecyclemanager.objects.LifecycleException;
-import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamMetaDataReader;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.onap.appc.lifecyclemanager.impl.LifecycleManagerImpl;
+import org.onap.appc.lifecyclemanager.objects.LifecycleException;
+import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException;
+import org.onap.appc.statemachine.impl.readers.AppcOamMetaDataReader;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/appc-lifecycle-management/appc-lifecycle-management-features/pom.xml b/appc-lifecycle-management/appc-lifecycle-management-features/pom.xml
index 23c13e3a1..304634fdf 100644
--- a/appc-lifecycle-management/appc-lifecycle-management-features/pom.xml
+++ b/appc-lifecycle-management/appc-lifecycle-management-features/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>appc-lifecycle-management</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -13,13 +13,13 @@
 
   <dependencies>
      <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-lifecycle-management-api</artifactId>
       <version>${project.version}</version>
     </dependency>
 
      <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-lifecycle-management-core</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-lifecycle-management/appc-lifecycle-management-features/src/main/resources/features.xml b/appc-lifecycle-management/appc-lifecycle-management-features/src/main/resources/features.xml
index 635ee6707..dd097525d 100644
--- a/appc-lifecycle-management/appc-lifecycle-management-features/src/main/resources/features.xml
+++ b/appc-lifecycle-management/appc-lifecycle-management-features/src/main/resources/features.xml
@@ -29,10 +29,10 @@
     xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0  http://karaf.apache.org/xmlns/features/v1.2.0">
 
     <feature name='appc-lifecycle-management' description="application executor" version='${project.version}'>
-        <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/state-machine-lib/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-lifecycle-management-api/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-lifecycle-management-core/${project.version}</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/state-machine-lib/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-lifecycle-management-api/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-lifecycle-management-core/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-lifecycle-management/appc-lifecycle-management-installer/pom.xml b/appc-lifecycle-management/appc-lifecycle-management-installer/pom.xml
index 1c17bc32c..443bffc9b 100644
--- a/appc-lifecycle-management/appc-lifecycle-management-installer/pom.xml
+++ b/appc-lifecycle-management/appc-lifecycle-management-installer/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-lifecycle-management</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -15,14 +15,14 @@
         <application.name>appc-lifecycle-management</application.name>
         <features.boot>appc-lifecycle-management</features.boot>
         <features.repositories>
-            mvn:org.openecomp.appc/appc-lifecycle-management-features/${project.version}/xml/features
+            mvn:org.onap.appc/appc-lifecycle-management-features/${project.version}/xml/features
         </features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-lifecycle-management-features</artifactId>
             <version>${project.version}</version>
             <classifier>features</classifier>
@@ -35,12 +35,12 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-lifecycle-management-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-lifecycle-management-core</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-lifecycle-management/pom.xml b/appc-lifecycle-management/pom.xml
index 22236316f..08fae11fa 100644
--- a/appc-lifecycle-management/pom.xml
+++ b/appc-lifecycle-management/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -14,7 +14,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-common</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-lifecycle-management/state-machine-lib/pom.xml b/appc-lifecycle-management/state-machine-lib/pom.xml
index 35a603d72..83700b8be 100644
--- a/appc-lifecycle-management/state-machine-lib/pom.xml
+++ b/appc-lifecycle-management/state-machine-lib/pom.xml
@@ -1,6 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-lifecycle-management</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -14,7 +14,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-lifecycle-management-api</artifactId>
             <version>1.3.0-SNAPSHOT</version>
         </dependency>
@@ -37,7 +37,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
-                        <Export-Package>org.openecomp.appc.statemachine.*</Export-Package>
+                        <Export-Package>org.onap.appc.statemachine.*</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/StateMachine.java b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/StateMachine.java
index de22e21a6..52350852e 100644
--- a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/StateMachine.java
+++ b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/StateMachine.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine;
+package org.onap.appc.statemachine;
 
-import org.openecomp.appc.exceptions.InvalidInputException;
-import org.openecomp.appc.statemachine.objects.Event;
-import org.openecomp.appc.statemachine.objects.State;
-import org.openecomp.appc.statemachine.objects.StateMachineResponse;
+import org.onap.appc.exceptions.InvalidInputException;
+import org.onap.appc.statemachine.objects.Event;
+import org.onap.appc.statemachine.objects.State;
+import org.onap.appc.statemachine.objects.StateMachineResponse;
 
 /**
  * Interface of the StateMachine
diff --git a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/StateMetaDataReader.java b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/StateMetaDataReader.java
index 6e60ee411..fe2b193e1 100644
--- a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/StateMetaDataReader.java
+++ b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/StateMetaDataReader.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine;
+package org.onap.appc.statemachine;
 
-import org.openecomp.appc.statemachine.objects.StateMachineMetadata;
+import org.onap.appc.statemachine.objects.StateMachineMetadata;
 
 public interface StateMetaDataReader {
     StateMachineMetadata readMetadata();
diff --git a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/StateMachineFactory.java b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/StateMachineFactory.java
index 3e38231b1..bfcafeb7d 100644
--- a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/StateMachineFactory.java
+++ b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/StateMachineFactory.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.impl;
+package org.onap.appc.statemachine.impl;
 
-import org.openecomp.appc.statemachine.StateMachine;
-import org.openecomp.appc.statemachine.objects.StateMachineMetadata;
+import org.onap.appc.statemachine.StateMachine;
+import org.onap.appc.statemachine.objects.StateMachineMetadata;
 
 /**
  * Factory of StateMachine
diff --git a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/StateMachineImpl.java b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/StateMachineImpl.java
index 4e21c13f4..b56250708 100644
--- a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/StateMachineImpl.java
+++ b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/StateMachineImpl.java
@@ -22,19 +22,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.impl;
+package org.onap.appc.statemachine.impl;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import org.openecomp.appc.exceptions.InvalidInputException;
-import org.openecomp.appc.statemachine.StateMachine;
-import org.openecomp.appc.statemachine.objects.Event;
-import org.openecomp.appc.statemachine.objects.Response;
-import org.openecomp.appc.statemachine.objects.State;
-import org.openecomp.appc.statemachine.objects.StateMachineMetadata;
-import org.openecomp.appc.statemachine.objects.StateMachineResponse;
-import org.openecomp.appc.statemachine.objects.Transition;
+import org.onap.appc.exceptions.InvalidInputException;
+import org.onap.appc.statemachine.StateMachine;
+import org.onap.appc.statemachine.objects.Event;
+import org.onap.appc.statemachine.objects.Response;
+import org.onap.appc.statemachine.objects.State;
+import org.onap.appc.statemachine.objects.StateMachineMetadata;
+import org.onap.appc.statemachine.objects.StateMachineResponse;
+import org.onap.appc.statemachine.objects.Transition;
 
 /**
  * Implementation of StateMachine
diff --git a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/readers/AppcOamMetaDataReader.java b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/readers/AppcOamMetaDataReader.java
index 637136bed..7451cf3af 100644
--- a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/readers/AppcOamMetaDataReader.java
+++ b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/readers/AppcOamMetaDataReader.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.impl.readers;
+package org.onap.appc.statemachine.impl.readers;
 
-import org.openecomp.appc.statemachine.StateMetaDataReader;
-import org.openecomp.appc.statemachine.objects.Event;
-import org.openecomp.appc.statemachine.objects.State;
-import org.openecomp.appc.statemachine.objects.StateMachineMetadata;
+import org.onap.appc.statemachine.StateMetaDataReader;
+import org.onap.appc.statemachine.objects.Event;
+import org.onap.appc.statemachine.objects.State;
+import org.onap.appc.statemachine.objects.StateMachineMetadata;
 
 /**
  * Reader for APPC OAM MetaData
diff --git a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/readers/AppcOamStates.java b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/readers/AppcOamStates.java
index a63f356e7..70a044bfa 100644
--- a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/readers/AppcOamStates.java
+++ b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/readers/AppcOamStates.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.impl.readers;
+package org.onap.appc.statemachine.impl.readers;
 
 import org.osgi.framework.Bundle;
 
diff --git a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/readers/VnfMetaDataReader.java b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/readers/VnfMetaDataReader.java
index cd573918b..2ba949f38 100644
--- a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/readers/VnfMetaDataReader.java
+++ b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/impl/readers/VnfMetaDataReader.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.impl.readers;
+package org.onap.appc.statemachine.impl.readers;
 
-import org.openecomp.appc.statemachine.StateMetaDataReader;
-import org.openecomp.appc.lifecyclemanager.objects.VNFOperationOutcome;
-import org.openecomp.appc.statemachine.objects.Event;
-import org.openecomp.appc.statemachine.objects.State;
-import org.openecomp.appc.statemachine.objects.StateMachineMetadata;
+import org.onap.appc.statemachine.StateMetaDataReader;
+import org.onap.appc.lifecyclemanager.objects.VNFOperationOutcome;
+import org.onap.appc.statemachine.objects.Event;
+import org.onap.appc.statemachine.objects.State;
+import org.onap.appc.statemachine.objects.StateMachineMetadata;
 
 /**
  * Reader for VNF MetaData
diff --git a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/Event.java b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/Event.java
index c6e5fcb6c..5e9b7c813 100644
--- a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/Event.java
+++ b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/Event.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.objects;
+package org.onap.appc.statemachine.objects;
 
 /**
  * Event Object
diff --git a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/Response.java b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/Response.java
index 283bbfba4..49b6c909b 100644
--- a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/Response.java
+++ b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/Response.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.objects;
+package org.onap.appc.statemachine.objects;
 
 /**
  * Response object
diff --git a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/State.java b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/State.java
index 20d3c59e2..117cd76c0 100644
--- a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/State.java
+++ b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/State.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.objects;
+package org.onap.appc.statemachine.objects;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/StateMachineMetadata.java b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/StateMachineMetadata.java
index e985c769a..02088b26e 100644
--- a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/StateMachineMetadata.java
+++ b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/StateMachineMetadata.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.objects;
+package org.onap.appc.statemachine.objects;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/StateMachineResponse.java b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/StateMachineResponse.java
index 0b1c8e2c7..9fc401527 100644
--- a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/StateMachineResponse.java
+++ b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/StateMachineResponse.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.objects;
+package org.onap.appc.statemachine.objects;
 
 
 public class StateMachineResponse {
diff --git a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/Transition.java b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/Transition.java
index 5bdf64980..2c6ee6366 100644
--- a/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/Transition.java
+++ b/appc-lifecycle-management/state-machine-lib/src/main/java/org/openecomp/appc/statemachine/objects/Transition.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.objects;
+package org.onap.appc.statemachine.objects;
 
 /**
  * Transition Object
diff --git a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/StateMachineFactoryTest.java b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/StateMachineFactoryTest.java
index f75e04d6a..e35482e45 100644
--- a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/StateMachineFactoryTest.java
+++ b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/StateMachineFactoryTest.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.impl;
+package org.onap.appc.statemachine.impl;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.statemachine.StateMachine;
-import org.openecomp.appc.statemachine.objects.Event;
-import org.openecomp.appc.statemachine.objects.State;
-import org.openecomp.appc.statemachine.objects.StateMachineMetadata;
+import org.onap.appc.statemachine.StateMachine;
+import org.onap.appc.statemachine.objects.Event;
+import org.onap.appc.statemachine.objects.State;
+import org.onap.appc.statemachine.objects.StateMachineMetadata;
 
 public class StateMachineFactoryTest {
     private StateMachineMetadata metadata;
diff --git a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/StateMachineImplTest.java b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/StateMachineImplTest.java
index 16a489aca..a4a8b9fcc 100644
--- a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/StateMachineImplTest.java
+++ b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/StateMachineImplTest.java
@@ -22,18 +22,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.impl;
+package org.onap.appc.statemachine.impl;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.internal.util.reflection.Whitebox;
-import org.openecomp.appc.exceptions.InvalidInputException;
-import org.openecomp.appc.statemachine.objects.Event;
-import org.openecomp.appc.statemachine.objects.Response;
-import org.openecomp.appc.statemachine.objects.State;
-import org.openecomp.appc.statemachine.objects.StateMachineMetadata;
-import org.openecomp.appc.statemachine.objects.StateMachineResponse;
+import org.onap.appc.exceptions.InvalidInputException;
+import org.onap.appc.statemachine.objects.Event;
+import org.onap.appc.statemachine.objects.Response;
+import org.onap.appc.statemachine.objects.State;
+import org.onap.appc.statemachine.objects.StateMachineMetadata;
+import org.onap.appc.statemachine.objects.StateMachineResponse;
 
 public class StateMachineImplTest {
     private StateMachineMetadata metadata;
diff --git a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/readers/AppcOamMetaDataReaderTest.java b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/readers/AppcOamMetaDataReaderTest.java
index 6073caa52..e8f2a2083 100644
--- a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/readers/AppcOamMetaDataReaderTest.java
+++ b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/readers/AppcOamMetaDataReaderTest.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.impl.readers;
+package org.onap.appc.statemachine.impl.readers;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.statemachine.objects.Event;
-import org.openecomp.appc.statemachine.objects.State;
-import org.openecomp.appc.statemachine.objects.StateMachineMetadata;
+import org.onap.appc.statemachine.objects.Event;
+import org.onap.appc.statemachine.objects.State;
+import org.onap.appc.statemachine.objects.StateMachineMetadata;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/readers/AppcOamStatesTest.java b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/readers/AppcOamStatesTest.java
index 01afd14e2..014618846 100644
--- a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/readers/AppcOamStatesTest.java
+++ b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/readers/AppcOamStatesTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.impl.readers;
+package org.onap.appc.statemachine.impl.readers;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/readers/VnfMetaDataReaderTest.java b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/readers/VnfMetaDataReaderTest.java
index b8b623f12..9b409491e 100644
--- a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/readers/VnfMetaDataReaderTest.java
+++ b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/impl/readers/VnfMetaDataReaderTest.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.impl.readers;
+package org.onap.appc.statemachine.impl.readers;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.lifecyclemanager.objects.VNFOperationOutcome;
-import org.openecomp.appc.statemachine.objects.Event;
-import org.openecomp.appc.statemachine.objects.State;
-import org.openecomp.appc.statemachine.objects.StateMachineMetadata;
+import org.onap.appc.lifecyclemanager.objects.VNFOperationOutcome;
+import org.onap.appc.statemachine.objects.Event;
+import org.onap.appc.statemachine.objects.State;
+import org.onap.appc.statemachine.objects.StateMachineMetadata;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/EventTest.java b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/EventTest.java
index e646bd260..961e33ffd 100644
--- a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/EventTest.java
+++ b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/EventTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.objects;
+package org.onap.appc.statemachine.objects;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/ResponseTest.java b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/ResponseTest.java
index b9f955f0d..e85bce65f 100644
--- a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/ResponseTest.java
+++ b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/ResponseTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.objects;
+package org.onap.appc.statemachine.objects;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/StateMachineMetadataTest.java b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/StateMachineMetadataTest.java
index 96c411061..684225736 100644
--- a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/StateMachineMetadataTest.java
+++ b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/StateMachineMetadataTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.objects;
+package org.onap.appc.statemachine.objects;
 
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/StateMachineResponseTest.java b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/StateMachineResponseTest.java
index c974ea067..183b7f5af 100644
--- a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/StateMachineResponseTest.java
+++ b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/StateMachineResponseTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.objects;
+package org.onap.appc.statemachine.objects;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/StateTest.java b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/StateTest.java
index 4e95d0a90..601754edf 100644
--- a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/StateTest.java
+++ b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/StateTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.objects;
+package org.onap.appc.statemachine.objects;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/TransitionTest.java b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/TransitionTest.java
index d948c15e4..da69d723c 100644
--- a/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/TransitionTest.java
+++ b/appc-lifecycle-management/state-machine-lib/src/test/java/org/openecomp/appc/statemachine/objects/TransitionTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.statemachine.objects;
+package org.onap.appc.statemachine.objects;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/appc-metric/appc-metric-bundle/pom.xml b/appc-metric/appc-metric-bundle/pom.xml
index b70f5949b..286941f5e 100644
--- a/appc-metric/appc-metric-bundle/pom.xml
+++ b/appc-metric/appc-metric-bundle/pom.xml
@@ -21,11 +21,11 @@
 
     <modelVersion>4.0.0</modelVersion>
 		<parent>
-	    <groupId>org.openecomp.appc</groupId>
+	    <groupId>org.onap.appc</groupId>
 	    <artifactId>appc-metric</artifactId>
 	    <version>1.3.0-SNAPSHOT</version>
 	  </parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-metric-bundle</artifactId>
     <packaging>bundle</packaging>
 
@@ -40,7 +40,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-        	<groupId>org.openecomp.appc</groupId>
+        	<groupId>org.onap.appc</groupId>
         	<artifactId>appc-common</artifactId>
         	<version>${project.version}</version>
         </dependency>
@@ -88,11 +88,11 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
-                        <Bundle-Activator>org.openecomp.appc.MetricActivator</Bundle-Activator>
+                        <Bundle-Activator>org.onap.appc.MetricActivator</Bundle-Activator>
                         <Embed-Dependency>appc-common,eelf-core,logback-core,logback-classic,appc-data-lib;scope=compile|runtime;inline=false</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
-                        <Export-Service>org.openecomp.appc.metricservice.impl.MetricServiceImpl,org.openecomp.appc.metricservice.MetricService,org.openecomp.appc.metricservice.policy.*,org.openecomp.appc.metricservice.metric.*</Export-Service>
-                        <Export-Package>org.openecomp.appc.metricservice,org.openecomp.appc.metricservice.impl,org.openecomp.appc.metricservice.policy,org.openecomp.appc.metricservice.publisher,org.openecomp.appc.metricservice.metric,org.apache.http</Export-Package>
+                        <Export-Service>org.onap.appc.metricservice.impl.MetricServiceImpl,org.onap.appc.metricservice.MetricService,org.onap.appc.metricservice.policy.*,org.onap.appc.metricservice.metric.*</Export-Service>
+                        <Export-Package>org.onap.appc.metricservice,org.onap.appc.metricservice.impl,org.onap.appc.metricservice.policy,org.onap.appc.metricservice.publisher,org.onap.appc.metricservice.metric,org.apache.http</Export-Package>
                         <Import-Package>!groovy.lang,!javax.*,!org.apache.log,!org.apache.log4j.*,!org.codehaus.jackson.*,!org.codehaus.jackson.map.*,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.apache.commons.lang3,!org.codehaus.janino,!org.jasypt.*,!com.ibm.icu.*,!com.sun.faces.*,*;resolution:=optional</Import-Package>
                     </instructions>
                 </configuration>
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/MetricActivator.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/MetricActivator.java
index 1df645844..40ff14827 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/MetricActivator.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/MetricActivator.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc;
+package org.onap.appc;
 
-import org.openecomp.appc.metricservice.MetricService;
-import org.openecomp.appc.metricservice.impl.MetricServiceImpl;
+import org.onap.appc.metricservice.MetricService;
+import org.onap.appc.metricservice.impl.MetricServiceImpl;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.osgi.framework.BundleActivator;
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/MetricRegistry.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/MetricRegistry.java
index 9a6e35f42..6e658ae47 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/MetricRegistry.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/MetricRegistry.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice;
+package org.onap.appc.metricservice;
 
-import org.openecomp.appc.metricservice.metric.Counter;
-import org.openecomp.appc.metricservice.metric.Metric;
-import org.openecomp.appc.metricservice.metric.MetricBuilderFactory;
-import org.openecomp.appc.metricservice.policy.PolicyBuilderFactory;
-import org.openecomp.appc.metricservice.policy.PublishingPolicy;
+import org.onap.appc.metricservice.metric.Counter;
+import org.onap.appc.metricservice.metric.Metric;
+import org.onap.appc.metricservice.metric.MetricBuilderFactory;
+import org.onap.appc.metricservice.policy.PolicyBuilderFactory;
+import org.onap.appc.metricservice.policy.PublishingPolicy;
 
 /**
  *
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/MetricService.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/MetricService.java
index 911265735..65ff72d97 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/MetricService.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/MetricService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice;
+package org.onap.appc.metricservice;
 
 
 import java.util.Map;
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/Publisher.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/Publisher.java
index eeb6a8202..1d38e44c3 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/Publisher.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/Publisher.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice;
+package org.onap.appc.metricservice;
 
-import org.openecomp.appc.metricservice.metric.Metric;
+import org.onap.appc.metricservice.metric.Metric;
 
 /**
  * Low-level logic of exposing metric values in certain way. There might be plenty of options such as logging, JMX, etc.
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/impl/MetricRegistryImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/impl/MetricRegistryImpl.java
index a33ea33f9..ac2054151 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/impl/MetricRegistryImpl.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/impl/MetricRegistryImpl.java
@@ -22,19 +22,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.impl;
+package org.onap.appc.metricservice.impl;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.openecomp.appc.metricservice.MetricRegistry;
-import org.openecomp.appc.metricservice.metric.Counter;
-import org.openecomp.appc.metricservice.metric.Metric;
-import org.openecomp.appc.metricservice.metric.MetricBuilderFactory;
-import org.openecomp.appc.metricservice.metric.impl.MetricBuilderFactoryImpl;
-import org.openecomp.appc.metricservice.policy.PolicyBuilderFactory;
-import org.openecomp.appc.metricservice.policy.PublishingPolicy;
-import org.openecomp.appc.metricservice.policy.impl.PolicyBuilderFactoryImpl;
+import org.onap.appc.metricservice.MetricRegistry;
+import org.onap.appc.metricservice.metric.Counter;
+import org.onap.appc.metricservice.metric.Metric;
+import org.onap.appc.metricservice.metric.MetricBuilderFactory;
+import org.onap.appc.metricservice.metric.impl.MetricBuilderFactoryImpl;
+import org.onap.appc.metricservice.policy.PolicyBuilderFactory;
+import org.onap.appc.metricservice.policy.PublishingPolicy;
+import org.onap.appc.metricservice.policy.impl.PolicyBuilderFactoryImpl;
 
 
 public class MetricRegistryImpl implements MetricRegistry {
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/impl/MetricServiceImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/impl/MetricServiceImpl.java
index 97b257804..20f2d8d2e 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/impl/MetricServiceImpl.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/impl/MetricServiceImpl.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.impl;
+package org.onap.appc.metricservice.impl;
 
 import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.openecomp.appc.metricservice.MetricRegistry;
-import org.openecomp.appc.metricservice.MetricService;
+import org.onap.appc.metricservice.MetricRegistry;
+import org.onap.appc.metricservice.MetricService;
 
 
 public class MetricServiceImpl implements MetricService {
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/Counter.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/Counter.java
index d99afc573..0b4d3e2d3 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/Counter.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/Counter.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.metric;
+package org.onap.appc.metricservice.metric;
 
 
 public interface Counter extends Metric {
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DispatchingFunctionCounterBuilder.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DispatchingFunctionCounterBuilder.java
index dd836f43c..bff07f627 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DispatchingFunctionCounterBuilder.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DispatchingFunctionCounterBuilder.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.metric;
+package org.onap.appc.metricservice.metric;
 
 
 public interface DispatchingFunctionCounterBuilder {
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DispatchingFuntionMetric.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DispatchingFuntionMetric.java
index 14e14180f..384875e9b 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DispatchingFuntionMetric.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DispatchingFuntionMetric.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.metric;
+package org.onap.appc.metricservice.metric;
 
 
 public interface DispatchingFuntionMetric extends Metric {
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DmaapRequestCounterBuilder.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DmaapRequestCounterBuilder.java
index 89ce7ef8f..efb23963f 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DmaapRequestCounterBuilder.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DmaapRequestCounterBuilder.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.metric;
+package org.onap.appc.metricservice.metric;
 
 
 public interface DmaapRequestCounterBuilder {
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DmaapRequestCounterMetric.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DmaapRequestCounterMetric.java
index 37eaca01c..522432631 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DmaapRequestCounterMetric.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DmaapRequestCounterMetric.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.metric;
+package org.onap.appc.metricservice.metric;
 
 
 public interface DmaapRequestCounterMetric extends Metric {
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/Metric.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/Metric.java
index 4035f1e74..ce4297c88 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/Metric.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/Metric.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.metric;
+package org.onap.appc.metricservice.metric;
 
 import java.util.HashMap;
 
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/MetricBuilderFactory.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/MetricBuilderFactory.java
index e6d870458..5a35247d3 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/MetricBuilderFactory.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/MetricBuilderFactory.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.metric;
+package org.onap.appc.metricservice.metric;
 
 
 public interface MetricBuilderFactory {
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/MetricType.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/MetricType.java
index 659f7810c..3f8ec30a8 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/MetricType.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/MetricType.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.metric;
+package org.onap.appc.metricservice.metric;
 
 /**
  *
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/PrimitiveCounter.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/PrimitiveCounter.java
index 142bef112..a3fc2191f 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/PrimitiveCounter.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/PrimitiveCounter.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.metric;
+package org.onap.appc.metricservice.metric;
 
 /**
  *
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/PrimitiveCounterBuilder.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/PrimitiveCounterBuilder.java
index cb6c42996..ded5ecf47 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/PrimitiveCounterBuilder.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/PrimitiveCounterBuilder.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.metric;
+package org.onap.appc.metricservice.metric;
 
 /**
  *
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DefaultPrimitiveCounter.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DefaultPrimitiveCounter.java
index ce5a39629..4b1992986 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DefaultPrimitiveCounter.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DefaultPrimitiveCounter.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.metric.impl;
+package org.onap.appc.metricservice.metric.impl;
 
-import org.openecomp.appc.metricservice.metric.MetricType;
-import org.openecomp.appc.metricservice.metric.PrimitiveCounter;
+import org.onap.appc.metricservice.metric.MetricType;
+import org.onap.appc.metricservice.metric.PrimitiveCounter;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DispatchingFunctionCounterBuilderImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DispatchingFunctionCounterBuilderImpl.java
index 812326139..fd3b05ef7 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DispatchingFunctionCounterBuilderImpl.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DispatchingFunctionCounterBuilderImpl.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.metric.impl;
+package org.onap.appc.metricservice.metric.impl;
 
-import org.openecomp.appc.metricservice.metric.DispatchingFunctionCounterBuilder;
-import org.openecomp.appc.metricservice.metric.DispatchingFuntionMetric;
-import org.openecomp.appc.metricservice.metric.MetricType;
+import org.onap.appc.metricservice.metric.DispatchingFunctionCounterBuilder;
+import org.onap.appc.metricservice.metric.DispatchingFuntionMetric;
+import org.onap.appc.metricservice.metric.MetricType;
 
 
 public class DispatchingFunctionCounterBuilderImpl implements DispatchingFunctionCounterBuilder {
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DispatchingFuntionMetricImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DispatchingFuntionMetricImpl.java
index cff76adb4..a6487957f 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DispatchingFuntionMetricImpl.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DispatchingFuntionMetricImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.metric.impl;
+package org.onap.appc.metricservice.metric.impl;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -30,8 +30,8 @@ import java.util.HashMap;
 import java.util.TimeZone;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.openecomp.appc.metricservice.metric.DispatchingFuntionMetric;
-import org.openecomp.appc.metricservice.metric.MetricType;
+import org.onap.appc.metricservice.metric.DispatchingFuntionMetric;
+import org.onap.appc.metricservice.metric.MetricType;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DmaapRequestCounterBuilderImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DmaapRequestCounterBuilderImpl.java
index 00fc1e32f..b5b53a810 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DmaapRequestCounterBuilderImpl.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DmaapRequestCounterBuilderImpl.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.metric.impl;
+package org.onap.appc.metricservice.metric.impl;
 
-import org.openecomp.appc.metricservice.metric.MetricType;
-import org.openecomp.appc.metricservice.metric.DmaapRequestCounterBuilder;
-import org.openecomp.appc.metricservice.metric.DmaapRequestCounterMetric;
+import org.onap.appc.metricservice.metric.MetricType;
+import org.onap.appc.metricservice.metric.DmaapRequestCounterBuilder;
+import org.onap.appc.metricservice.metric.DmaapRequestCounterMetric;
 
 
 public class DmaapRequestCounterBuilderImpl implements DmaapRequestCounterBuilder {
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DmaapRequestCounterMetricImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DmaapRequestCounterMetricImpl.java
index 3d85da5e3..dd1a6fc08 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DmaapRequestCounterMetricImpl.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DmaapRequestCounterMetricImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.metric.impl;
+package org.onap.appc.metricservice.metric.impl;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -30,8 +30,8 @@ import java.util.HashMap;
 import java.util.TimeZone;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.openecomp.appc.metricservice.metric.MetricType;
-import org.openecomp.appc.metricservice.metric.DmaapRequestCounterMetric;
+import org.onap.appc.metricservice.metric.MetricType;
+import org.onap.appc.metricservice.metric.DmaapRequestCounterMetric;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/MetricBuilderFactoryImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/MetricBuilderFactoryImpl.java
index 055e3fd45..0a45941d1 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/MetricBuilderFactoryImpl.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/MetricBuilderFactoryImpl.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.metric.impl;
+package org.onap.appc.metricservice.metric.impl;
 
-import org.openecomp.appc.metricservice.metric.DispatchingFunctionCounterBuilder;
-import org.openecomp.appc.metricservice.metric.MetricBuilderFactory;
-import org.openecomp.appc.metricservice.metric.PrimitiveCounterBuilder;
-import org.openecomp.appc.metricservice.metric.DmaapRequestCounterBuilder;
+import org.onap.appc.metricservice.metric.DispatchingFunctionCounterBuilder;
+import org.onap.appc.metricservice.metric.MetricBuilderFactory;
+import org.onap.appc.metricservice.metric.PrimitiveCounterBuilder;
+import org.onap.appc.metricservice.metric.DmaapRequestCounterBuilder;
 
 
 public class MetricBuilderFactoryImpl implements MetricBuilderFactory {
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/PrimitiveCounterBuilderImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/PrimitiveCounterBuilderImpl.java
index cee05fc4c..c95f89e75 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/PrimitiveCounterBuilderImpl.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/PrimitiveCounterBuilderImpl.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.metric.impl;
+package org.onap.appc.metricservice.metric.impl;
 
-import org.openecomp.appc.metricservice.metric.MetricType;
-import org.openecomp.appc.metricservice.metric.PrimitiveCounter;
-import org.openecomp.appc.metricservice.metric.PrimitiveCounterBuilder;
+import org.onap.appc.metricservice.metric.MetricType;
+import org.onap.appc.metricservice.metric.PrimitiveCounter;
+import org.onap.appc.metricservice.metric.PrimitiveCounterBuilder;
 
 
 public class PrimitiveCounterBuilderImpl implements PrimitiveCounterBuilder {
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/PolicyBuilderFactory.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/PolicyBuilderFactory.java
index 2db92db9f..fbdd04979 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/PolicyBuilderFactory.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/PolicyBuilderFactory.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.policy;
+package org.onap.appc.metricservice.policy;
 
 
 public interface PolicyBuilderFactory {
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/PublishingPolicy.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/PublishingPolicy.java
index 47ab741b1..44a05f994 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/PublishingPolicy.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/PublishingPolicy.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.policy;
+package org.onap.appc.metricservice.policy;
 
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.metricservice.metric.Metric;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.metricservice.metric.Metric;
 
 /**
  *
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/ScheduledPolicyBuilder.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/ScheduledPolicyBuilder.java
index 86d156fc7..d67031d03 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/ScheduledPolicyBuilder.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/ScheduledPolicyBuilder.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.policy;
+package org.onap.appc.metricservice.policy;
 
-import org.openecomp.appc.metricservice.Publisher;
-import org.openecomp.appc.metricservice.metric.Metric;
+import org.onap.appc.metricservice.Publisher;
+import org.onap.appc.metricservice.metric.Metric;
 
 /**
  *
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/ScheduledPublishingPolicy.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/ScheduledPublishingPolicy.java
index 10569c122..697ef3ff7 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/ScheduledPublishingPolicy.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/ScheduledPublishingPolicy.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.policy;
+package org.onap.appc.metricservice.policy;
 
-import org.openecomp.appc.metricservice.Publisher;
+import org.onap.appc.metricservice.Publisher;
 
 
 public interface ScheduledPublishingPolicy extends PublishingPolicy{
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/PolicyBuilderFactoryImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/PolicyBuilderFactoryImpl.java
index a2441902d..d9c4cf024 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/PolicyBuilderFactoryImpl.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/PolicyBuilderFactoryImpl.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.policy.impl;
+package org.onap.appc.metricservice.policy.impl;
 
-import org.openecomp.appc.metricservice.policy.PolicyBuilderFactory;
-import org.openecomp.appc.metricservice.policy.ScheduledPolicyBuilder;
+import org.onap.appc.metricservice.policy.PolicyBuilderFactory;
+import org.onap.appc.metricservice.policy.ScheduledPolicyBuilder;
 
 
 public class PolicyBuilderFactoryImpl implements PolicyBuilderFactory {
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/ScheduledPolicyBuilderImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/ScheduledPolicyBuilderImpl.java
index e164f3bef..65ce62435 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/ScheduledPolicyBuilderImpl.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/ScheduledPolicyBuilderImpl.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.policy.impl;
+package org.onap.appc.metricservice.policy.impl;
 
-import org.openecomp.appc.metricservice.Publisher;
-import org.openecomp.appc.metricservice.metric.Metric;
-import org.openecomp.appc.metricservice.policy.PublishingPolicy;
-import org.openecomp.appc.metricservice.policy.ScheduledPolicyBuilder;
+import org.onap.appc.metricservice.Publisher;
+import org.onap.appc.metricservice.metric.Metric;
+import org.onap.appc.metricservice.policy.PublishingPolicy;
+import org.onap.appc.metricservice.policy.ScheduledPolicyBuilder;
 
 
 public class ScheduledPolicyBuilderImpl implements ScheduledPolicyBuilder {
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/ScheduledPublishingPolicyImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/ScheduledPublishingPolicyImpl.java
index 9bbb22344..8933150f3 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/ScheduledPublishingPolicyImpl.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/ScheduledPublishingPolicyImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.policy.impl;
+package org.onap.appc.metricservice.policy.impl;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -32,14 +32,14 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.metricservice.MetricRegistry;
-import org.openecomp.appc.metricservice.MetricService;
-import org.openecomp.appc.metricservice.Publisher;
-import org.openecomp.appc.metricservice.metric.Metric;
-import org.openecomp.appc.metricservice.policy.ScheduledPublishingPolicy;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.metricservice.MetricRegistry;
+import org.onap.appc.metricservice.MetricService;
+import org.onap.appc.metricservice.Publisher;
+import org.onap.appc.metricservice.metric.Metric;
+import org.onap.appc.metricservice.policy.ScheduledPublishingPolicy;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/publisher/LogPublisher.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/publisher/LogPublisher.java
index 85c8188ad..e4f160d40 100644
--- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/publisher/LogPublisher.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/publisher/LogPublisher.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice.publisher;
+package org.onap.appc.metricservice.publisher;
 
-import org.openecomp.appc.metricservice.MetricRegistry;
-import org.openecomp.appc.metricservice.Publisher;
-import org.openecomp.appc.metricservice.metric.Metric;
+import org.onap.appc.metricservice.MetricRegistry;
+import org.onap.appc.metricservice.Publisher;
+import org.onap.appc.metricservice.metric.Metric;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-metric/appc-metric-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-metric/appc-metric-bundle/src/main/resources/org/openecomp/appc/default.properties
index e696380bd..f7eae381e 100644
--- a/appc-metric/appc-metric-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-metric/appc-metric-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -24,8 +24,8 @@
 
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 
 
diff --git a/appc-metric/appc-metric-bundle/src/test/java/org/openecomp/appc/metricservice/TestMetricServiceImpl.java b/appc-metric/appc-metric-bundle/src/test/java/org/openecomp/appc/metricservice/TestMetricServiceImpl.java
index f35410e09..7c8011e81 100644
--- a/appc-metric/appc-metric-bundle/src/test/java/org/openecomp/appc/metricservice/TestMetricServiceImpl.java
+++ b/appc-metric/appc-metric-bundle/src/test/java/org/openecomp/appc/metricservice/TestMetricServiceImpl.java
@@ -22,20 +22,20 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.metricservice;
+package org.onap.appc.metricservice;
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.metricservice.impl.MetricServiceImpl;
-import org.openecomp.appc.metricservice.metric.MetricType;
-import org.openecomp.appc.metricservice.metric.PrimitiveCounter;
-import org.openecomp.appc.metricservice.metric.DmaapRequestCounterMetric;
-import org.openecomp.appc.metricservice.metric.DispatchingFuntionMetric;
-import org.openecomp.appc.metricservice.metric.impl.DefaultPrimitiveCounter;
-import org.openecomp.appc.metricservice.metric.impl.DmaapRequestCounterMetricImpl;
-import org.openecomp.appc.metricservice.metric.impl.DispatchingFuntionMetricImpl;
-import org.openecomp.appc.metricservice.metric.impl.DispatchingFunctionCounterBuilderImpl;
-import org.openecomp.appc.metricservice.metric.impl.DmaapRequestCounterBuilderImpl;
-import org.openecomp.appc.metricservice.metric.impl.PrimitiveCounterBuilderImpl;
+import org.onap.appc.metricservice.impl.MetricServiceImpl;
+import org.onap.appc.metricservice.metric.MetricType;
+import org.onap.appc.metricservice.metric.PrimitiveCounter;
+import org.onap.appc.metricservice.metric.DmaapRequestCounterMetric;
+import org.onap.appc.metricservice.metric.DispatchingFuntionMetric;
+import org.onap.appc.metricservice.metric.impl.DefaultPrimitiveCounter;
+import org.onap.appc.metricservice.metric.impl.DmaapRequestCounterMetricImpl;
+import org.onap.appc.metricservice.metric.impl.DispatchingFuntionMetricImpl;
+import org.onap.appc.metricservice.metric.impl.DispatchingFunctionCounterBuilderImpl;
+import org.onap.appc.metricservice.metric.impl.DmaapRequestCounterBuilderImpl;
+import org.onap.appc.metricservice.metric.impl.PrimitiveCounterBuilderImpl;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
diff --git a/appc-metric/appc-metric-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-metric/appc-metric-bundle/src/test/resources/org/openecomp/appc/default.properties
index 3779c6465..596705820 100644
--- a/appc-metric/appc-metric-bundle/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-metric/appc-metric-bundle/src/test/resources/org/openecomp/appc/default.properties
@@ -23,7 +23,7 @@
 ###
 
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded to supply configuration options
-#org.openecomp.appc.bootstrap.file=executor-test.properties
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+#org.onap.appc.bootstrap.file=executor-test.properties
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
diff --git a/appc-metric/appc-metric-features/pom.xml b/appc-metric/appc-metric-features/pom.xml
index d2f38c0bc..6437dad1e 100644
--- a/appc-metric/appc-metric-features/pom.xml
+++ b/appc-metric/appc-metric-features/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-metric</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <name>appc-metric-features</name>
@@ -13,7 +13,7 @@
 
   <dependencies>
      <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-metric-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-metric/appc-metric-features/src/main/resources/features.xml b/appc-metric/appc-metric-features/src/main/resources/features.xml
index b770e6ac3..10e18c1f8 100644
--- a/appc-metric/appc-metric-features/src/main/resources/features.xml
+++ b/appc-metric/appc-metric-features/src/main/resources/features.xml
@@ -37,9 +37,9 @@
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
 
         <!-- appc-common bundle is flagged as being a dependency -->
-        <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
 
-        <bundle>mvn:org.openecomp.appc/appc-metric-bundle/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-metric-bundle/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-metric/appc-metric-installer/pom.xml b/appc-metric/appc-metric-installer/pom.xml
index 73c1ad90c..320d5aa17 100644
--- a/appc-metric/appc-metric-installer/pom.xml
+++ b/appc-metric/appc-metric-installer/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-metric</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>appc-metric-installer</artifactId>
@@ -13,14 +13,14 @@
   <properties>
     <application.name>appc-metric</application.name>
     <features.boot>appc-metric</features.boot>
-    <features.repositories>mvn:org.openecomp.appc/appc-metric-features/${project.version}/xml/features</features.repositories>
+    <features.repositories>mvn:org.onap.appc/appc-metric-features/${project.version}/xml/features</features.repositories>
     <include.transitive.dependencies>false</include.transitive.dependencies>
   </properties>
 
   <dependencies>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-metric-features</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -34,7 +34,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-metric-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-metric/pom.xml b/appc-metric/pom.xml
index 89f3ffbd0..49fcceb8e 100644
--- a/appc-metric/pom.xml
+++ b/appc-metric/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
diff --git a/appc-oam/appc-oam-bundle/pom.xml b/appc-oam/appc-oam-bundle/pom.xml
index 91904b8c7..51deba758 100644
--- a/appc-oam/appc-oam-bundle/pom.xml
+++ b/appc-oam/appc-oam-bundle/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>appc-oam</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>appc-oam-bundle</artifactId>
@@ -20,16 +20,16 @@
                 <configuration>
                     <instructions>
                         <Export-Package>org.opendaylight.controller.config.yang.config.sample_oam.impl</Export-Package>
-                        <Export-Package>org.openecomp.appc.oam</Export-Package>
+                        <Export-Package>org.onap.appc.oam</Export-Package>
                         <Import-Package>
-                            org.openecomp.appc.i18n,
-                            org.openecomp.appc.logging,
-                            org.openecomp.appc.util,
+                            org.onap.appc.i18n,
+                            org.onap.appc.logging,
+                            org.onap.appc.util,
                             com.att.eelf.configuration,
                             com.att.eelf.i18n,
-                            org.openecomp.appc.adapter.messaging.*,
-                            org.openecomp.appc.adapter.message.*,
-                            org.openecomp.appc.adapter.factory.*,
+                            org.onap.appc.adapter.messaging.*,
+                            org.onap.appc.adapter.message.*,
+                            org.onap.appc.adapter.factory.*,
                             *;resolution:=optional
                         </Import-Package>
                         <Embed-Dependency>
@@ -143,38 +143,38 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-common</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-oam-model</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-metric-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-request-handler-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-lifecycle-management-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-lifecycle-management-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>state-machine-lib</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -249,19 +249,19 @@
 
 
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-message-adapter-api</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-message-adapter-factory</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-dmaap-adapter-bundle</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModule.java b/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModule.java
index d44a9ba49..c978e3a45 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModule.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModule.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.impl.rev170303;
+package org.opendaylight.yang.gen.v1.org.onap.appc.oam.impl.rev170303;
 
-import org.openecomp.appc.oam.AppcOam;
+import org.onap.appc.oam.AppcOam;
 
-public class AppcOamModule extends org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.impl.rev170303.AbstractAppcOamModule {
+public class AppcOamModule extends org.opendaylight.yang.gen.v1.org.onap.appc.oam.impl.rev170303.AbstractAppcOamModule {
     public AppcOamModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
 
-    public AppcOamModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.impl.rev170303.AppcOamModule oldModule, java.lang.AutoCloseable oldInstance) {
+    public AppcOamModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.onap.appc.oam.impl.rev170303.AppcOamModule oldModule, java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModuleFactory.java b/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModuleFactory.java
index 66fdad3c4..6913a68f0 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModuleFactory.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModuleFactory.java
@@ -31,7 +31,7 @@
 *
 * Do not modify this file unless it is present under src/main directory
 */
-package org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.impl.rev170303;
-public class AppcOamModuleFactory extends org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.impl.rev170303.AbstractAppcOamModuleFactory {
+package org.opendaylight.yang.gen.v1.org.onap.appc.oam.impl.rev170303;
+public class AppcOamModuleFactory extends org.opendaylight.yang.gen.v1.org.onap.appc.oam.impl.rev170303.AbstractAppcOamModuleFactory {
 
 }
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/AppcOam.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/AppcOam.java
index 7ad3b6201..97938339c 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/AppcOam.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/AppcOam.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam;
+package org.onap.appc.oam;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -31,47 +31,47 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.AppcOamService;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.AppcState;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.GetAppcStateOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.GetAppcStateOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.GetMetricsOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.GetMetricsOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.get.metrics.output.Metrics;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.get.metrics.output.MetricsBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.get.metrics.output.metrics.KpiValues;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.get.metrics.output.metrics.KpiValuesBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.AppcOamService;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.AppcState;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.GetAppcStateOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.GetAppcStateOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.GetMetricsOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.GetMetricsOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.get.metrics.output.Metrics;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.get.metrics.output.MetricsBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.get.metrics.output.metrics.KpiValues;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.get.metrics.output.metrics.KpiValuesBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.metricservice.MetricRegistry;
-import org.openecomp.appc.metricservice.MetricService;
-import org.openecomp.appc.metricservice.metric.Metric;
-import org.openecomp.appc.oam.processor.OamMmodeProcessor;
-import org.openecomp.appc.oam.processor.OamRestartProcessor;
-import org.openecomp.appc.oam.processor.OamStartProcessor;
-import org.openecomp.appc.oam.processor.OamStopProcessor;
-import org.openecomp.appc.oam.util.AsyncTaskHelper;
-import org.openecomp.appc.oam.util.ConfigurationHelper;
-import org.openecomp.appc.oam.util.OperationHelper;
-import org.openecomp.appc.oam.util.StateHelper;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamMetaDataReader.AppcOperation;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.metricservice.MetricRegistry;
+import org.onap.appc.metricservice.MetricService;
+import org.onap.appc.metricservice.metric.Metric;
+import org.onap.appc.oam.processor.OamMmodeProcessor;
+import org.onap.appc.oam.processor.OamRestartProcessor;
+import org.onap.appc.oam.processor.OamStartProcessor;
+import org.onap.appc.oam.processor.OamStopProcessor;
+import org.onap.appc.oam.util.AsyncTaskHelper;
+import org.onap.appc.oam.util.ConfigurationHelper;
+import org.onap.appc.oam.util.OperationHelper;
+import org.onap.appc.oam.util.StateHelper;
+import org.onap.appc.statemachine.impl.readers.AppcOamMetaDataReader.AppcOperation;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/OAMCommandStatus.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/OAMCommandStatus.java
index b8a4e3e86..294b9d2cf 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/OAMCommandStatus.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/OAMCommandStatus.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam;
+package org.onap.appc.oam;
 
-import org.openecomp.appc.executor.objects.Params;
-import org.openecomp.appc.util.MessageFormatter;
+import org.onap.appc.executor.objects.Params;
+import org.onap.appc.util.MessageFormatter;
 
 import java.util.Map;
 
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/Converter.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/Converter.java
index a70d12042..152ffc9cc 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/Converter.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/Converter.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.messageadapter;
+package org.onap.appc.oam.messageadapter;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -32,15 +32,15 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status;
 import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
-import org.openecomp.appc.oam.AppcOam;
+import org.onap.appc.oam.AppcOam;
 
 import java.text.SimpleDateFormat;
 import java.util.TimeZone;
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/DmaapOutgoingMessage.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/DmaapOutgoingMessage.java
index 54887521d..25bf0cf8b 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/DmaapOutgoingMessage.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/DmaapOutgoingMessage.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.messageadapter;
+package org.onap.appc.oam.messageadapter;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -30,7 +30,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 /**
  * This class represents a message being sent out to DMaaP by APPC as async response.
- * note the structure of this class must be adapted to the sync message sent to DMaaP represented in org.openecomp.appc.listener.LCM.domainmodel.DmaapOutgoingMessage
+ * note the structure of this class must be adapted to the sync message sent to DMaaP represented in org.onap.appc.listener.LCM.domainmodel.DmaapOutgoingMessage
  *
  */
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/MessageAdapter.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/MessageAdapter.java
index d93feabe4..91836cb40 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/MessageAdapter.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/MessageAdapter.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.messageadapter;
+package org.onap.appc.oam.messageadapter;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.apache.commons.lang.ObjectUtils;
-import org.openecomp.appc.adapter.message.MessageAdapterFactory;
-import org.openecomp.appc.adapter.message.Producer;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.adapter.message.MessageAdapterFactory;
+import org.onap.appc.adapter.message.Producer;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/OAMContext.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/OAMContext.java
index 2d33388a0..3af395923 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/OAMContext.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/OAMContext.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.messageadapter;
+package org.onap.appc.oam.messageadapter;
 
 
 
 
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.*;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeaderBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status;import org.openecomp.appc.oam.AppcOam;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.*;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeaderBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status;import org.onap.appc.oam.AppcOam;
 
 public class OAMContext {
 
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseActionRunnable.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseActionRunnable.java
index b118eb0d1..927334670 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseActionRunnable.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseActionRunnable.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.processor;
+package org.onap.appc.oam.processor;
 
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.oam.AppcOam;
-import org.openecomp.appc.oam.OAMCommandStatus;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.oam.AppcOam;
+import org.onap.appc.oam.OAMCommandStatus;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseCommon.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseCommon.java
index 0cfab98b4..93e79dd2f 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseCommon.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseCommon.java
@@ -22,24 +22,24 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.processor;
+package org.onap.appc.oam.processor;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.i18n.EELFResourceManager;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.StatusBuilder;
-import org.openecomp.appc.exceptions.InvalidInputException;
-import org.openecomp.appc.exceptions.InvalidStateException;
-import org.openecomp.appc.executor.objects.Params;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.logging.LoggingConstants;
-import org.openecomp.appc.logging.LoggingUtils;
-import org.openecomp.appc.oam.AppcOam;
-import org.openecomp.appc.oam.OAMCommandStatus;
-import org.openecomp.appc.oam.util.ConfigurationHelper;
-import org.openecomp.appc.oam.util.OperationHelper;
-import org.openecomp.appc.oam.util.StateHelper;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.StatusBuilder;
+import org.onap.appc.exceptions.InvalidInputException;
+import org.onap.appc.exceptions.InvalidStateException;
+import org.onap.appc.executor.objects.Params;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.logging.LoggingConstants;
+import org.onap.appc.logging.LoggingUtils;
+import org.onap.appc.oam.AppcOam;
+import org.onap.appc.oam.OAMCommandStatus;
+import org.onap.appc.oam.util.ConfigurationHelper;
+import org.onap.appc.oam.util.OperationHelper;
+import org.onap.appc.oam.util.StateHelper;
 import org.slf4j.MDC;
 
 import java.net.InetAddress;
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseProcessor.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseProcessor.java
index 41955e135..414b94605 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseProcessor.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseProcessor.java
@@ -22,21 +22,21 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.processor;
+package org.onap.appc.oam.processor;
 
 import com.att.eelf.configuration.EELFLogger;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.exceptions.InvalidInputException;
-import org.openecomp.appc.exceptions.InvalidStateException;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.oam.OAMCommandStatus;
-import org.openecomp.appc.oam.util.AsyncTaskHelper;
-import org.openecomp.appc.oam.util.BundleHelper;
-import org.openecomp.appc.oam.util.ConfigurationHelper;
-import org.openecomp.appc.oam.util.OperationHelper;
-import org.openecomp.appc.oam.util.StateHelper;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.InvalidInputException;
+import org.onap.appc.exceptions.InvalidStateException;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.oam.OAMCommandStatus;
+import org.onap.appc.oam.util.AsyncTaskHelper;
+import org.onap.appc.oam.util.BundleHelper;
+import org.onap.appc.oam.util.ConfigurationHelper;
+import org.onap.appc.oam.util.OperationHelper;
+import org.onap.appc.oam.util.StateHelper;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 
 import java.util.Date;
 import java.util.concurrent.Future;
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamMmodeProcessor.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamMmodeProcessor.java
index 6a0466022..23f9fd130 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamMmodeProcessor.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamMmodeProcessor.java
@@ -22,22 +22,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.processor;
+package org.onap.appc.oam.processor;
 
 import com.att.eelf.configuration.EELFLogger;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.exceptions.InvalidInputException;
-import org.openecomp.appc.exceptions.InvalidStateException;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.oam.AppcOam;
-import org.openecomp.appc.oam.OAMCommandStatus;
-import org.openecomp.appc.oam.util.AsyncTaskHelper;
-import org.openecomp.appc.oam.util.ConfigurationHelper;
-import org.openecomp.appc.oam.util.OperationHelper;
-import org.openecomp.appc.oam.util.StateHelper;
-import org.openecomp.appc.requesthandler.LCMStateManager;
-import org.openecomp.appc.requesthandler.RequestHandler;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.InvalidInputException;
+import org.onap.appc.exceptions.InvalidStateException;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.oam.AppcOam;
+import org.onap.appc.oam.OAMCommandStatus;
+import org.onap.appc.oam.util.AsyncTaskHelper;
+import org.onap.appc.oam.util.ConfigurationHelper;
+import org.onap.appc.oam.util.OperationHelper;
+import org.onap.appc.oam.util.StateHelper;
+import org.onap.appc.requesthandler.LCMStateManager;
+import org.onap.appc.requesthandler.RequestHandler;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 
 import java.util.concurrent.TimeoutException;
 
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamRestartProcessor.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamRestartProcessor.java
index 857578917..b23b4d2aa 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamRestartProcessor.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamRestartProcessor.java
@@ -22,18 +22,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.processor;
+package org.onap.appc.oam.processor;
 
 import com.att.eelf.configuration.EELFLogger;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.oam.AppcOam;
-import org.openecomp.appc.oam.util.AsyncTaskHelper;
-import org.openecomp.appc.oam.util.ConfigurationHelper;
-import org.openecomp.appc.oam.util.OperationHelper;
-import org.openecomp.appc.oam.util.StateHelper;
-import org.openecomp.appc.requesthandler.LCMStateManager;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.oam.AppcOam;
+import org.onap.appc.oam.util.AsyncTaskHelper;
+import org.onap.appc.oam.util.ConfigurationHelper;
+import org.onap.appc.oam.util.OperationHelper;
+import org.onap.appc.oam.util.StateHelper;
+import org.onap.appc.requesthandler.LCMStateManager;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 
 /**
  * Processor to handle restart OAM API.
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStartProcessor.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStartProcessor.java
index 0d2f50513..2ca353244 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStartProcessor.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStartProcessor.java
@@ -22,18 +22,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.processor;
+package org.onap.appc.oam.processor;
 
 import com.att.eelf.configuration.EELFLogger;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.oam.AppcOam;
-import org.openecomp.appc.oam.util.AsyncTaskHelper;
-import org.openecomp.appc.oam.util.ConfigurationHelper;
-import org.openecomp.appc.oam.util.OperationHelper;
-import org.openecomp.appc.oam.util.StateHelper;
-import org.openecomp.appc.requesthandler.LCMStateManager;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.oam.AppcOam;
+import org.onap.appc.oam.util.AsyncTaskHelper;
+import org.onap.appc.oam.util.ConfigurationHelper;
+import org.onap.appc.oam.util.OperationHelper;
+import org.onap.appc.oam.util.StateHelper;
+import org.onap.appc.requesthandler.LCMStateManager;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 
 /**
  * Processor to handle start OAM API.
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStopProcessor.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStopProcessor.java
index d8d88d319..8710e0f08 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStopProcessor.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStopProcessor.java
@@ -22,17 +22,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.processor;
+package org.onap.appc.oam.processor;
 
 import com.att.eelf.configuration.EELFLogger;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.oam.AppcOam;
-import org.openecomp.appc.oam.util.AsyncTaskHelper;
-import org.openecomp.appc.oam.util.ConfigurationHelper;
-import org.openecomp.appc.oam.util.OperationHelper;
-import org.openecomp.appc.oam.util.StateHelper;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.oam.AppcOam;
+import org.onap.appc.oam.util.AsyncTaskHelper;
+import org.onap.appc.oam.util.ConfigurationHelper;
+import org.onap.appc.oam.util.OperationHelper;
+import org.onap.appc.oam.util.StateHelper;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 
 /**
  * Processor to handle stop OAM API.
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/AsyncTaskHelper.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/AsyncTaskHelper.java
index 9c344c14e..2f74bf5a9 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/AsyncTaskHelper.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/AsyncTaskHelper.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.util;
+package org.onap.appc.oam.util;
 
 import com.att.eelf.configuration.EELFLogger;
-import org.openecomp.appc.oam.AppcOam;
-import org.openecomp.appc.oam.processor.BaseActionRunnable;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.onap.appc.oam.AppcOam;
+import org.onap.appc.oam.processor.BaseActionRunnable;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
 
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleFilter.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleFilter.java
index 1e9f9b6a1..6dd98f165 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleFilter.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleFilter.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.util;
+package org.onap.appc.oam.util;
 
 import org.osgi.framework.Bundle;
 
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleHelper.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleHelper.java
index 74159bd65..3a4602542 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleHelper.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleHelper.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.util;
+package org.onap.appc.oam.util;
 
 import com.att.eelf.configuration.EELFLogger;
 import org.apache.commons.lang3.ArrayUtils;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.oam.AppcOam;
-import org.openecomp.appc.oam.processor.BaseCommon;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.oam.AppcOam;
+import org.onap.appc.oam.processor.BaseCommon;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/ConfigurationHelper.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/ConfigurationHelper.java
index 25df3dfd9..3c5629f11 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/ConfigurationHelper.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/ConfigurationHelper.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.util;
+package org.onap.appc.oam.util;
 
 import com.att.eelf.configuration.EELFLogger;
 import org.apache.commons.lang3.ArrayUtils;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/OperationHelper.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/OperationHelper.java
index 0b20104f4..9eec0b67b 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/OperationHelper.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/OperationHelper.java
@@ -22,28 +22,28 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.util;
+package org.onap.appc.oam.util;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.common.header.Flags;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.exceptions.InvalidInputException;
-import org.openecomp.appc.exceptions.InvalidStateException;
-import org.openecomp.appc.lifecyclemanager.LifecycleManager;
-import org.openecomp.appc.lifecyclemanager.objects.LifecycleException;
-import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException;
-import org.openecomp.appc.oam.AppcOam;
-import org.openecomp.appc.oam.messageadapter.MessageAdapter;
-import org.openecomp.appc.oam.messageadapter.OAMContext;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamMetaDataReader;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.common.header.Flags;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.InvalidInputException;
+import org.onap.appc.exceptions.InvalidStateException;
+import org.onap.appc.lifecyclemanager.LifecycleManager;
+import org.onap.appc.lifecyclemanager.objects.LifecycleException;
+import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException;
+import org.onap.appc.oam.AppcOam;
+import org.onap.appc.oam.messageadapter.MessageAdapter;
+import org.onap.appc.oam.messageadapter.OAMContext;
+import org.onap.appc.statemachine.impl.readers.AppcOamMetaDataReader;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/StateHelper.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/StateHelper.java
index a9ccc26d0..871a07676 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/StateHelper.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/StateHelper.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.util;
+package org.onap.appc.oam.util;
 
 import com.att.eelf.configuration.EELFLogger;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.AppcState;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.AppcState;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 import org.osgi.framework.Bundle;
 
 import java.util.Map;
diff --git a/appc-oam/appc-oam-bundle/src/main/resources/initial/appc-oam.xml b/appc-oam/appc-oam-bundle/src/main/resources/initial/appc-oam.xml
index c544e83b2..f152888d9 100644
--- a/appc-oam/appc-oam-bundle/src/main/resources/initial/appc-oam.xml
+++ b/appc-oam/appc-oam-bundle/src/main/resources/initial/appc-oam.xml
@@ -32,7 +32,7 @@
 
 					<!-- This xmlns:prefix should match the namespace in the *-oam-impl.yang
 						file The prefix: inside type should match the prefix of the yang file. -->
-					<type xmlns:prefix="org:openecomp:appc:oam:impl">
+					<type xmlns:prefix="org:onap:appc:oam:impl">
 						prefix:appc-oam-impl
 					</type>
 					<name>appc-oam-impl</name>
@@ -73,7 +73,7 @@
 		defined above are implied which is why we do not have define a required capability 
 		for the data broker, for example. -->
 	<required-capabilities>
-		<capability>org:openecomp:appc:oam:impl?module=appc-oam-impl&amp;revision=2017-03-03
+		<capability>org:onap:appc:oam:impl?module=appc-oam-impl&amp;revision=2017-03-03
 		</capability>
 	</required-capabilities>
 
diff --git a/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/default.properties
index e9b78cc30..964040a18 100644
--- a/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -38,16 +38,16 @@
 #
 #--------------------------------------------------------------------------------------------
 # The path and file used to load user-supplied configuration settings, if any 
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
-org.openecomp.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
 
 appc.application.name=APPC
 
 #
 # The path to search for logging configuration document, and the name of the document 
 #
-org.openecomp.appc.logging.path=${user.home},etc,../etc,.
-org.openecomp.appc.logging.file=logback.xml
+org.onap.appc.logging.path=${user.home},etc,../etc,.
+org.onap.appc.logging.file=logback.xml
 
 
 #
@@ -83,7 +83,7 @@ appc.OAM.AppcBundlesToNotStop=.*appc.oam.*\
 ,appc-lifecycle-management-api\
 ,appc-lifecycle-management-core\
 ,appc-metric-bundle\
-,org.openecomp.appc.listener\
+,org.onap.appc.listener\
 ,state-machine-lib
 
 appc.OAM.OtherBundlesToNotStop=app-cntrl-message-adapter-factory\
diff --git a/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/logback.xml b/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/logback.xml
index 799a1d8df..0dffe75e0 100644
--- a/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/logback.xml
+++ b/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/logback.xml
@@ -249,7 +249,7 @@
     </encoder>
   </appender>
 
-  <logger name="org.openecomp.appc" level="DEBUG" additivity="false">
+  <logger name="org.onap.appc" level="DEBUG" additivity="false">
     <appender-ref ref="CommandExecutor" />
   </logger>
 
diff --git a/appc-oam/appc-oam-bundle/src/main/yang/appc-oam.yang b/appc-oam/appc-oam-bundle/src/main/yang/appc-oam.yang
index a2c64497a..9f0a77f8d 100644
--- a/appc-oam/appc-oam-bundle/src/main/yang/appc-oam.yang
+++ b/appc-oam/appc-oam-bundle/src/main/yang/appc-oam.yang
@@ -25,7 +25,7 @@
 module appc-oam-impl {
 
     yang-version 1;
-    namespace "org:openecomp:appc:oam:impl";
+    namespace "org:onap:appc:oam:impl";
     prefix "appc-oam-impl";
 
     import config { prefix config; revision-date 2013-04-05; }
diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/AppcOamTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/AppcOamTest.java
index 5eb37af24..110198370 100644
--- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/AppcOamTest.java
+++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/AppcOamTest.java
@@ -22,32 +22,32 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam;
+package org.onap.appc.oam;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.AppcState;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.GetAppcStateOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.AppcState;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.GetAppcStateOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status;
 import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.openecomp.appc.oam.processor.OamMmodeProcessor;
-import org.openecomp.appc.oam.processor.OamRestartProcessor;
-import org.openecomp.appc.oam.processor.OamStartProcessor;
-import org.openecomp.appc.oam.processor.OamStopProcessor;
-import org.openecomp.appc.oam.util.OperationHelper;
-import org.openecomp.appc.oam.util.StateHelper;
+import org.onap.appc.oam.processor.OamMmodeProcessor;
+import org.onap.appc.oam.processor.OamRestartProcessor;
+import org.onap.appc.oam.processor.OamStartProcessor;
+import org.onap.appc.oam.processor.OamStopProcessor;
+import org.onap.appc.oam.util.OperationHelper;
+import org.onap.appc.oam.util.StateHelper;
 import org.osgi.framework.FrameworkUtil;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/OAMCommandStatusTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/OAMCommandStatusTest.java
index c941f43dc..269c4f811 100644
--- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/OAMCommandStatusTest.java
+++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/OAMCommandStatusTest.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam;
+package org.onap.appc.oam;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.executor.objects.Params;
+import org.onap.appc.executor.objects.Params;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/messageadapter/MessageAdapterTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/messageadapter/MessageAdapterTest.java
index ff60923fb..d3ebfda51 100644
--- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/messageadapter/MessageAdapterTest.java
+++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/messageadapter/MessageAdapterTest.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.messageadapter;
+package org.onap.appc.oam.messageadapter;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openecomp.appc.adapter.message.MessageAdapterFactory;
-import org.openecomp.appc.adapter.message.Producer;
+import org.onap.appc.adapter.message.MessageAdapterFactory;
+import org.onap.appc.adapter.message.Producer;
 
 import org.mockito.Mockito;
 import org.osgi.framework.Bundle;
diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseActionRunnableTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseActionRunnableTest.java
index 07500f441..daf0f6e07 100644
--- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseActionRunnableTest.java
+++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseActionRunnableTest.java
@@ -22,23 +22,23 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.processor;
+package org.onap.appc.oam.processor;
 
 import com.att.eelf.configuration.EELFLogger;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.oam.AppcOam;
-import org.openecomp.appc.oam.OAMCommandStatus;
-import org.openecomp.appc.oam.util.AsyncTaskHelper;
-import org.openecomp.appc.oam.util.BundleHelper;
-import org.openecomp.appc.oam.util.ConfigurationHelper;
-import org.openecomp.appc.oam.util.OperationHelper;
-import org.openecomp.appc.oam.util.StateHelper;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.oam.AppcOam;
+import org.onap.appc.oam.OAMCommandStatus;
+import org.onap.appc.oam.util.AsyncTaskHelper;
+import org.onap.appc.oam.util.BundleHelper;
+import org.onap.appc.oam.util.ConfigurationHelper;
+import org.onap.appc.oam.util.OperationHelper;
+import org.onap.appc.oam.util.StateHelper;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 import org.powermock.reflect.Whitebox;
 
 import java.util.Date;
diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseCommonTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseCommonTest.java
index 3f51669f7..59bddb0e4 100644
--- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseCommonTest.java
+++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseCommonTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.processor;
+package org.onap.appc.oam.processor;
 
 import com.att.eelf.configuration.EELFLogger;
 import org.junit.Assert;
@@ -30,16 +30,16 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status;
-import org.openecomp.appc.exceptions.InvalidInputException;
-import org.openecomp.appc.exceptions.InvalidStateException;
-import org.openecomp.appc.oam.AppcOam;
-import org.openecomp.appc.oam.OAMCommandStatus;
-import org.openecomp.appc.oam.util.ConfigurationHelper;
-import org.openecomp.appc.oam.util.OperationHelper;
-import org.openecomp.appc.oam.util.StateHelper;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status;
+import org.onap.appc.exceptions.InvalidInputException;
+import org.onap.appc.exceptions.InvalidStateException;
+import org.onap.appc.oam.AppcOam;
+import org.onap.appc.oam.OAMCommandStatus;
+import org.onap.appc.oam.util.ConfigurationHelper;
+import org.onap.appc.oam.util.OperationHelper;
+import org.onap.appc.oam.util.StateHelper;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseProcessorTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseProcessorTest.java
index 0109adf36..6769352c6 100644
--- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseProcessorTest.java
+++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseProcessorTest.java
@@ -22,27 +22,27 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.processor;
+package org.onap.appc.oam.processor;
 
 import com.att.eelf.configuration.EELFLogger;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.exceptions.InvalidInputException;
-import org.openecomp.appc.exceptions.InvalidStateException;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.oam.AppcOam;
-import org.openecomp.appc.oam.OAMCommandStatus;
-import org.openecomp.appc.oam.util.AsyncTaskHelper;
-import org.openecomp.appc.oam.util.ConfigurationHelper;
-import org.openecomp.appc.oam.util.OperationHelper;
-import org.openecomp.appc.oam.util.StateHelper;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.InvalidInputException;
+import org.onap.appc.exceptions.InvalidStateException;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.oam.AppcOam;
+import org.onap.appc.oam.OAMCommandStatus;
+import org.onap.appc.oam.util.AsyncTaskHelper;
+import org.onap.appc.oam.util.ConfigurationHelper;
+import org.onap.appc.oam.util.OperationHelper;
+import org.onap.appc.oam.util.StateHelper;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 import org.powermock.reflect.Whitebox;
 
 import static org.mockito.Matchers.any;
diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/AsyncTaskHelperTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/AsyncTaskHelperTest.java
index f81938e30..ddeb99440 100644
--- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/AsyncTaskHelperTest.java
+++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/AsyncTaskHelperTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.util;
+package org.onap.appc.oam.util;
 
 import com.att.eelf.configuration.EELFLogger;
 import org.junit.After;
@@ -31,8 +31,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.openecomp.appc.oam.AppcOam;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.onap.appc.oam.AppcOam;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
 import org.powermock.api.mockito.PowerMockito;
diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/BundleHelperTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/BundleHelperTest.java
index 878d15f39..433e87517 100644
--- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/BundleHelperTest.java
+++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/BundleHelperTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.util;
+package org.onap.appc.oam.util;
 
 import com.att.eelf.configuration.EELFLogger;
 import org.apache.commons.lang.ArrayUtils;
@@ -31,10 +31,10 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.oam.AppcOam;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.oam.AppcOam;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/ConfigurationHelperTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/ConfigurationHelperTest.java
index a489aa05e..348517b72 100644
--- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/ConfigurationHelperTest.java
+++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/ConfigurationHelperTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.util;
+package org.onap.appc.oam.util;
 
 import com.att.eelf.configuration.EELFLogger;
 import org.apache.commons.lang3.ArrayUtils;
@@ -30,7 +30,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.appc.configuration.Configuration;
+import org.onap.appc.configuration.Configuration;
 import org.powermock.reflect.Whitebox;
 
 import static org.mockito.Mockito.mock;
diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/OperationHelperTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/OperationHelperTest.java
index e335ad830..77edd1701 100644
--- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/OperationHelperTest.java
+++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/OperationHelperTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.util;
+package org.onap.appc.oam.util;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -31,20 +31,20 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.common.header.Flags;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.exceptions.InvalidInputException;
-import org.openecomp.appc.exceptions.InvalidStateException;
-import org.openecomp.appc.lifecyclemanager.LifecycleManager;
-import org.openecomp.appc.lifecyclemanager.objects.LifecycleException;
-import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException;
-import org.openecomp.appc.oam.AppcOam;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamMetaDataReader;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.common.header.Flags;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.InvalidInputException;
+import org.onap.appc.exceptions.InvalidStateException;
+import org.onap.appc.lifecyclemanager.LifecycleManager;
+import org.onap.appc.lifecyclemanager.objects.LifecycleException;
+import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException;
+import org.onap.appc.oam.AppcOam;
+import org.onap.appc.statemachine.impl.readers.AppcOamMetaDataReader;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/StateHelperTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/StateHelperTest.java
index 3dfb52bbe..9a3050e84 100644
--- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/StateHelperTest.java
+++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/StateHelperTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.oam.util;
+package org.onap.appc.oam.util;
 
 import com.att.eelf.configuration.EELFLogger;
 import org.junit.Assert;
@@ -30,8 +30,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.AppcState;
-import org.openecomp.appc.statemachine.impl.readers.AppcOamStates;
+import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.AppcState;
+import org.onap.appc.statemachine.impl.readers.AppcOamStates;
 import org.osgi.framework.Bundle;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
diff --git a/appc-oam/appc-oam-features/pom.xml b/appc-oam/appc-oam-features/pom.xml
index 689616e17..6598cd68e 100644
--- a/appc-oam/appc-oam-features/pom.xml
+++ b/appc-oam/appc-oam-features/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-oam</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <name>appc-oam-features</name>
@@ -13,13 +13,13 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-oam-model</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-oam-bundle</artifactId>
       <classifier>config</classifier>
       <type>xml</type>
@@ -27,7 +27,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-oam-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-oam/appc-oam-features/src/main/resources/features.xml b/appc-oam/appc-oam-features/src/main/resources/features.xml
index 23dd2430e..69bb62a50 100644
--- a/appc-oam/appc-oam-features/src/main/resources/features.xml
+++ b/appc-oam/appc-oam-features/src/main/resources/features.xml
@@ -32,9 +32,9 @@
 
     <feature name='appc-oam' description="appc oam module" version='${project.version}'>
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-        <bundle>mvn:org.openecomp.appc/appc-oam-model/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-oam-bundle/${project.version}</bundle>
-        <configfile finalname="etc/opendaylight/karaf/201-appc-oam.xml">mvn:org.openecomp.appc/appc-oam-bundle/${project.version}/xml/config</configfile>
+        <bundle>mvn:org.onap.appc/appc-oam-model/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-oam-bundle/${project.version}</bundle>
+        <configfile finalname="etc/opendaylight/karaf/201-appc-oam.xml">mvn:org.onap.appc/appc-oam-bundle/${project.version}/xml/config</configfile>
     </feature>
 
 </features>
diff --git a/appc-oam/appc-oam-installer/pom.xml b/appc-oam/appc-oam-installer/pom.xml
index 1e7fe1c46..f65879e80 100644
--- a/appc-oam/appc-oam-installer/pom.xml
+++ b/appc-oam/appc-oam-installer/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-oam</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   
@@ -14,14 +14,14 @@
   <properties>
     <application.name>appc-oam</application.name>
     <features.boot>appc-oam</features.boot>
-    <features.repositories>mvn:org.openecomp.appc/appc-oam-features/${project.version}/xml/features</features.repositories>
+    <features.repositories>mvn:org.onap.appc/appc-oam-features/${project.version}/xml/features</features.repositories>
     <include.transitive.dependencies>false</include.transitive.dependencies>
   </properties>
 
   <dependencies>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-oam-features</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -35,13 +35,13 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-oam-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-oam-bundle</artifactId>
       <version>${project.version}</version>
       <classifier>config</classifier>
diff --git a/appc-oam/appc-oam-model/pom.xml b/appc-oam/appc-oam-model/pom.xml
index 19e523e25..330be0a82 100644
--- a/appc-oam/appc-oam-model/pom.xml
+++ b/appc-oam/appc-oam-model/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>appc-oam</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>appc-oam-model</artifactId>
diff --git a/appc-oam/appc-oam-model/src/main/yang/appc-oam.yang b/appc-oam/appc-oam-model/src/main/yang/appc-oam.yang
index 0984daeda..cc2d618fa 100644
--- a/appc-oam/appc-oam-model/src/main/yang/appc-oam.yang
+++ b/appc-oam/appc-oam-model/src/main/yang/appc-oam.yang
@@ -37,7 +37,7 @@
 module appc-oam {
 
     yang-version 1;
-    namespace "org:openecomp:appc:oam";
+    namespace "org:onap:appc:oam";
     prefix appc-oam;
     organization "Copyright 2017 AT&T Intellectual Property.";
 
diff --git a/appc-oam/pom.xml b/appc-oam/pom.xml
index 4aca3d466..7b3119d35 100644
--- a/appc-oam/pom.xml
+++ b/appc-oam/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
diff --git a/appc-outbound/appc-aai-client/features/pom.xml b/appc-outbound/appc-aai-client/features/pom.xml
index f5e967454..c9c532261 100755
--- a/appc-outbound/appc-aai-client/features/pom.xml
+++ b/appc-outbound/appc-aai-client/features/pom.xml
@@ -5,7 +5,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-aai-client</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>appc-aai-client-features</artifactId>
@@ -14,7 +14,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-aai-client-provider</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-outbound/appc-aai-client/features/src/main/resources/features.xml b/appc-outbound/appc-aai-client/features/src/main/resources/features.xml
index 8b847f481..6294c8951 100644
--- a/appc-outbound/appc-aai-client/features/src/main/resources/features.xml
+++ b/appc-outbound/appc-aai-client/features/src/main/resources/features.xml
@@ -44,6 +44,6 @@
 		<bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-aai-client-provider/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-aai-client-provider/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/appc-outbound/appc-aai-client/installer/pom.xml b/appc-outbound/appc-aai-client/installer/pom.xml
index 245bd04a4..7732d72f9 100755
--- a/appc-outbound/appc-aai-client/installer/pom.xml
+++ b/appc-outbound/appc-aai-client/installer/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-aai-client</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>appc-aai-client-installer</artifactId>
@@ -14,14 +14,14 @@
 	<properties>
 		<application.name>appc-aai-client</application.name>
 		<features.boot>appc-aai-client</features.boot>
-		<features.repositories>mvn:org.openecomp.appc/appc-aai-client-features/${project.version}/xml/features</features.repositories>
+		<features.repositories>mvn:org.onap.appc/appc-aai-client-features/${project.version}/xml/features</features.repositories>
 		<include.transitive.dependencies>false</include.transitive.dependencies>
 	</properties>
 
 	<dependencies>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-aai-client-features</artifactId>
 			<version>${project.version}</version>
 			<classifier>features</classifier>
@@ -34,7 +34,7 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-aai-client-provider</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-outbound/appc-aai-client/pom.xml b/appc-outbound/appc-aai-client/pom.xml
index cd6e6d1c7..8e66dbb5b 100755
--- a/appc-outbound/appc-aai-client/pom.xml
+++ b/appc-outbound/appc-aai-client/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-outbound</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -18,7 +18,7 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.openecomp.appc</groupId>
+				<groupId>org.onap.appc</groupId>
 				<artifactId>appc-aai-client.features</artifactId>
 				<classifier>features</classifier>
 				<type>xml</type>
@@ -26,12 +26,12 @@
 			</dependency>
 
 			<dependency>
-				<groupId>org.openecomp.appc</groupId>
+				<groupId>org.onap.appc</groupId>
 				<artifactId>appc-aai-client.provider</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.openecomp.appc</groupId>
+				<groupId>org.onap.appc</groupId>
 				<artifactId>appc-aai-client.installer</artifactId>
 				<version>${project.version}</version>
 			</dependency>
diff --git a/appc-outbound/appc-aai-client/provider/pom.xml b/appc-outbound/appc-aai-client/provider/pom.xml
index b5db224b8..3484e4b79 100755
--- a/appc-outbound/appc-aai-client/provider/pom.xml
+++ b/appc-outbound/appc-aai-client/provider/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

 	<modelVersion>4.0.0</modelVersion>

 	<parent>

-		<groupId>org.openecomp.appc</groupId>

+		<groupId>org.onap.appc</groupId>

 		<artifactId>appc-aai-client</artifactId>

 		<version>1.3.0-SNAPSHOT</version>

 	</parent>

@@ -107,9 +107,9 @@
 				<extensions>true</extensions>

 				<configuration>

 					<instructions>

-						<Bundle-SymbolicName>org.openecomp.appc.aai.client</Bundle-SymbolicName>

-						<Bundle-Activator>org.openecomp.appc.aai.client.AppcAaiClientActivator</Bundle-Activator>

-						<Export-Package>org.openecomp.appc.aai.client</Export-Package>

+						<Bundle-SymbolicName>org.onap.appc.aai.client</Bundle-SymbolicName>

+						<Bundle-Activator>org.onap.appc.aai.client.AppcAaiClientActivator</Bundle-Activator>

+						<Export-Package>org.onap.appc.aai.client</Export-Package>

 						<Import-Package>*</Import-Package>

 						<DynamicImport-Package>*</DynamicImport-Package>

 					</instructions>

diff --git a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/AppcAaiClientActivator.java b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/AppcAaiClientActivator.java
index f3cf70fde..ab66af512 100644
--- a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/AppcAaiClientActivator.java
+++ b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/AppcAaiClientActivator.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.aai.client;
+package org.onap.appc.aai.client;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import org.openecomp.appc.aai.client.node.AAIResourceNode;
+import org.onap.appc.aai.client.node.AAIResourceNode;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
diff --git a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/AppcAaiClientConstant.java b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/AppcAaiClientConstant.java
index 7521d76da..772488876 100644
--- a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/AppcAaiClientConstant.java
+++ b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/AppcAaiClientConstant.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.aai.client;
+package org.onap.appc.aai.client;
 
 public class AppcAaiClientConstant {
 
diff --git a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/aai/AaiService.java b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/aai/AaiService.java
index 5078b37a0..f03e7f319 100644
--- a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/aai/AaiService.java
+++ b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/aai/AaiService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.aai.client.aai;
+package org.onap.appc.aai.client.aai;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -33,7 +33,7 @@ import org.apache.commons.lang3.math.NumberUtils;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
 
-import org.openecomp.appc.aai.client.AppcAaiClientConstant;
+import org.onap.appc.aai.client.AppcAaiClientConstant;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.onap.ccsdk.sli.adaptors.aai.AAIClient;
diff --git a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/node/AAIResourceNode.java b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/node/AAIResourceNode.java
index a65143882..250508358 100644
--- a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/node/AAIResourceNode.java
+++ b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/node/AAIResourceNode.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.aai.client.node;
+package org.onap.appc.aai.client.node;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -35,8 +35,8 @@ import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 
-import org.openecomp.appc.aai.client.AppcAaiClientConstant;
-import org.openecomp.appc.aai.client.aai.AaiService;
+import org.onap.appc.aai.client.AppcAaiClientConstant;
+import org.onap.appc.aai.client.aai.AaiService;
 
 
 import com.att.eelf.configuration.EELFLogger;
diff --git a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/MockAaiService.java b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/MockAaiService.java
index b330cdb23..724c8bf3b 100644
--- a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/MockAaiService.java
+++ b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/MockAaiService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.aai.client.aai;
+package org.onap.appc.aai.client.aai;
 import static org.junit.Assert.assertEquals;
 
 import static org.junit.Assert.fail;
diff --git a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/TestAaiService.java b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/TestAaiService.java
index 050d5bfae..aa807087f 100644
--- a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/TestAaiService.java
+++ b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/TestAaiService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.aai.client.aai;
+package org.onap.appc.aai.client.aai;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/MockAaiService.java b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/MockAaiService.java
index 29f77a9fd..2e03e6b5a 100644
--- a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/MockAaiService.java
+++ b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/MockAaiService.java
@@ -23,16 +23,16 @@
  */
 
 
-package org.openecomp.appc.aai.client.node;
+package org.onap.appc.aai.client.node;
 import static junit.framework.Assert.assertEquals;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.aai.client.AppcAaiClientConstant;
-//import org.openecomp.appc.aai.client.aai.AAIClientMock;
-import org.openecomp.appc.aai.client.aai.AaiService;
+import org.onap.appc.aai.client.AppcAaiClientConstant;
+//import org.onap.appc.aai.client.aai.AAIClientMock;
+import org.onap.appc.aai.client.aai.AaiService;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/TestAAIResourceNode.java b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/TestAAIResourceNode.java
index 9653af11a..6b05c08bb 100644
--- a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/TestAAIResourceNode.java
+++ b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/TestAAIResourceNode.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.aai.client.node;
+package org.onap.appc.aai.client.node;
 
 import static org.junit.Assert.*;
 
@@ -39,9 +39,9 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.aai.client.AppcAaiClientConstant;
-import org.openecomp.appc.aai.client.aai.AaiService;
-import org.openecomp.appc.aai.client.aai.TestAaiService;
+import org.onap.appc.aai.client.AppcAaiClientConstant;
+import org.onap.appc.aai.client.aai.AaiService;
+import org.onap.appc.aai.client.aai.TestAaiService;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-outbound/appc-network-inventory-client/features/pom.xml b/appc-outbound/appc-network-inventory-client/features/pom.xml
index b65404b19..4a8dc9e2a 100755
--- a/appc-outbound/appc-network-inventory-client/features/pom.xml
+++ b/appc-outbound/appc-network-inventory-client/features/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-network-inventory-client</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -13,7 +13,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-network-inventory-client-provider</artifactId>
 		</dependency>
 		
diff --git a/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml b/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml
index 1d84f0871..9c7caf91f 100644
--- a/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml
+++ b/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml
@@ -42,7 +42,7 @@
 		<bundle>mvn:com.sun.jersey/jersey-client/1.17</bundle>
 		<bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>		
-		<bundle>mvn:org.openecomp.appc/appc-config-params-provider/${project.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-network-inventory-client-provider/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-config-params-provider/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-network-inventory-client-provider/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/appc-outbound/appc-network-inventory-client/installer/pom.xml b/appc-outbound/appc-network-inventory-client/installer/pom.xml
index 9dff4e7d2..b0ed830bd 100755
--- a/appc-outbound/appc-network-inventory-client/installer/pom.xml
+++ b/appc-outbound/appc-network-inventory-client/installer/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-network-inventory-client</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<name>APPC Network Inventory - Installer</name>
@@ -13,13 +13,13 @@
 	<properties>
 		<application.name>appc-network-inventory-client</application.name>
 		<features.boot>appc-network-inventory-client</features.boot>
-		<features.repositories>mvn:org.openecomp.appc/appc-network-inventory-features/${project.version}/xml/features</features.repositories>
+		<features.repositories>mvn:org.onap.appc/appc-network-inventory-features/${project.version}/xml/features</features.repositories>
 		<include.transitive.dependencies>false</include.transitive.dependencies>
 	</properties>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-network-inventory-client-features</artifactId>
 			<classifier>features</classifier>
 			<type>xml</type>
@@ -31,7 +31,7 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-network-inventory-client-provider</artifactId>
 		</dependency>
 
diff --git a/appc-outbound/appc-network-inventory-client/pom.xml b/appc-outbound/appc-network-inventory-client/pom.xml
index 029c3b099..dd6eb5637 100755
--- a/appc-outbound/appc-network-inventory-client/pom.xml
+++ b/appc-outbound/appc-network-inventory-client/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-outbound</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -29,7 +29,7 @@
 
 		<dependencies>
 			<dependency>
-				<groupId>org.openecomp.appc</groupId>
+				<groupId>org.onap.appc</groupId>
 				<artifactId>appc-network-inventory-client-features</artifactId>
 				<classifier>features</classifier>
 				<type>xml</type>
@@ -37,7 +37,7 @@
 			</dependency>
 
 			<dependency>
-				<groupId>org.openecomp.appc</groupId>
+				<groupId>org.onap.appc</groupId>
 				<artifactId>appc-network-inventory-client-provider</artifactId>
 				<version>${project.version}</version>
 			</dependency>
diff --git a/appc-outbound/appc-network-inventory-client/provider/pom.xml b/appc-outbound/appc-network-inventory-client/provider/pom.xml
index 55e0d93bb..a4b9f07ae 100755
--- a/appc-outbound/appc-network-inventory-client/provider/pom.xml
+++ b/appc-outbound/appc-network-inventory-client/provider/pom.xml
@@ -27,7 +27,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

     <modelVersion>4.0.0</modelVersion>

     <parent>

-        <groupId>org.openecomp.appc</groupId>

+        <groupId>org.onap.appc</groupId>

         <artifactId>appc-network-inventory-client</artifactId>

         <version>1.3.0-SNAPSHOT</version>

     </parent>

@@ -74,7 +74,7 @@
             <scope>test</scope>

         </dependency>

         <dependency>

-            <groupId>org.openecomp.appc</groupId>

+            <groupId>org.onap.appc</groupId>

             <artifactId>appc-config-params-provider</artifactId>

             <version>${project.version}</version>

         </dependency>

@@ -104,9 +104,9 @@
                 <extensions>true</extensions>

                 <configuration>

                     <instructions>

-                        <Bundle-SymbolicName>org.openecomp.appc.instar</Bundle-SymbolicName>

-                        <Bundle-Activator>org.openecomp.appc.instar.InstarClientActivator</Bundle-Activator>

-                        <Export-Package>org.openecomp.appc.instar</Export-Package>

+                        <Bundle-SymbolicName>org.onap.appc.instar</Bundle-SymbolicName>

+                        <Bundle-Activator>org.onap.appc.instar.InstarClientActivator</Bundle-Activator>

+                        <Export-Package>org.onap.appc.instar</Export-Package>

                         <Import-Package>*</Import-Package>

                         <DynamicImport-Package>*</DynamicImport-Package>

                     </instructions>

diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/InstarClientActivator.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/InstarClientActivator.java
index 1f8f037b0..09021daa4 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/InstarClientActivator.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/InstarClientActivator.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.instar;
+package org.onap.appc.instar;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import org.openecomp.appc.instar.node.InstarClientNode;
+import org.onap.appc.instar.node.InstarClientNode;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/dme2client/Dme2Client.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/dme2client/Dme2Client.java
index 472683037..fa22a751f 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/dme2client/Dme2Client.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/dme2client/Dme2Client.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.instar.dme2client;
+package org.onap.appc.instar.dme2client;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.net.URI;
@@ -35,7 +35,7 @@ import javax.ws.rs.HttpMethod;
 import javax.ws.rs.core.MediaType;
 
 import org.apache.commons.io.IOUtils;
-import org.openecomp.appc.instar.utils.InstarClientConstant;
+import org.onap.appc.instar.utils.InstarClientConstant;
 
 
 import com.att.eelf.configuration.EELFLogger;
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/dme2client/SecureRestClientTrustManager.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/dme2client/SecureRestClientTrustManager.java
index 21e313eaf..86c2d99b3 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/dme2client/SecureRestClientTrustManager.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/dme2client/SecureRestClientTrustManager.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.instar.dme2client;
+package org.onap.appc.instar.dme2client;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InstarResponseHandlerImpl.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InstarResponseHandlerImpl.java
index 57b8b9dec..08df6f02e 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InstarResponseHandlerImpl.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InstarResponseHandlerImpl.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.instar.interfaceImpl;
+package org.onap.appc.instar.interfaceImpl;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.openecomp.appc.instar.interfaces.ResponseHandlerInterface;
-import org.openecomp.appc.instar.utils.InstarClientConstant;
+import org.onap.appc.instar.interfaces.ResponseHandlerInterface;
+import org.onap.appc.instar.utils.InstarClientConstant;
 import org.openecomp.sdnc.config.params.data.ResponseKey;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InstarRestClientImpl.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InstarRestClientImpl.java
index e727ce10d..db43d9c41 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InstarRestClientImpl.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InstarRestClientImpl.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.instar.interfaceImpl;
+package org.onap.appc.instar.interfaceImpl;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.HashMap;
 
 import org.apache.commons.io.IOUtils;
-import org.openecomp.appc.instar.dme2client.Dme2Client;
-import org.openecomp.appc.instar.interfaces.RestClientInterface;
-import org.openecomp.appc.instar.utils.InstarClientConstant;
+import org.onap.appc.instar.dme2client.Dme2Client;
+import org.onap.appc.instar.interfaces.RestClientInterface;
+import org.onap.appc.instar.utils.InstarClientConstant;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InterfaceIpAddressImpl.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InterfaceIpAddressImpl.java
index c0de909c7..cc2eeaa07 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InterfaceIpAddressImpl.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InterfaceIpAddressImpl.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.instar.interfaceImpl;
+package org.onap.appc.instar.interfaceImpl;
 
 import java.util.HashMap;
 import java.util.List;
 
-import org.openecomp.appc.instar.interfaces.ResponseHandlerInterface;
-import org.openecomp.appc.instar.interfaces.RestClientInterface;
-import org.openecomp.appc.instar.interfaces.RuleHandlerInterface;
-import org.openecomp.appc.instar.node.InstarClientNode;
-import org.openecomp.appc.instar.utils.InstarClientConstant;
+import org.onap.appc.instar.interfaces.ResponseHandlerInterface;
+import org.onap.appc.instar.interfaces.RestClientInterface;
+import org.onap.appc.instar.interfaces.RuleHandlerInterface;
+import org.onap.appc.instar.node.InstarClientNode;
+import org.onap.appc.instar.utils.InstarClientConstant;
 import org.openecomp.sdnc.config.params.data.Parameter;
 import org.openecomp.sdnc.config.params.data.ResponseKey;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaces/ResponseHandlerInterface.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaces/ResponseHandlerInterface.java
index 816bbdb5d..8211967b0 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaces/ResponseHandlerInterface.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaces/ResponseHandlerInterface.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.instar.interfaces;
+package org.onap.appc.instar.interfaces;
 
 public interface ResponseHandlerInterface {
 
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaces/RestClientInterface.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaces/RestClientInterface.java
index 448429163..bf6c5b34d 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaces/RestClientInterface.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaces/RestClientInterface.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.instar.interfaces;
+package org.onap.appc.instar.interfaces;
 
 public interface RestClientInterface {
 
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaces/RuleHandlerInterface.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaces/RuleHandlerInterface.java
index ad13c96e0..86f31d2fa 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaces/RuleHandlerInterface.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaces/RuleHandlerInterface.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.instar.interfaces;
+package org.onap.appc.instar.interfaces;
 
 
 public interface RuleHandlerInterface {
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/node/InstarClientNode.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/node/InstarClientNode.java
index f120f9995..1d343c668 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/node/InstarClientNode.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/node/InstarClientNode.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.instar.node;
+package org.onap.appc.instar.node;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -34,11 +34,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.instar.interfaceImpl.InstarRestClientImpl;
-import org.openecomp.appc.instar.interfaceImpl.InterfaceIpAddressImpl;
-import org.openecomp.appc.instar.interfaces.RestClientInterface;
-import org.openecomp.appc.instar.interfaces.RuleHandlerInterface;
-import org.openecomp.appc.instar.utils.InstarClientConstant;
+import org.onap.appc.instar.interfaceImpl.InstarRestClientImpl;
+import org.onap.appc.instar.interfaceImpl.InterfaceIpAddressImpl;
+import org.onap.appc.instar.interfaces.RestClientInterface;
+import org.onap.appc.instar.interfaces.RuleHandlerInterface;
+import org.onap.appc.instar.utils.InstarClientConstant;
 import org.openecomp.sdnc.config.params.data.Parameter;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/utils/InstarClientConstant.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/utils/InstarClientConstant.java
index 790651f12..30e59db22 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/utils/InstarClientConstant.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/utils/InstarClientConstant.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.instar.utils;
+package org.onap.appc.instar.utils;
 
 public class InstarClientConstant
 {
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInstarResponseHandlerImpl.java b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInstarResponseHandlerImpl.java
index e2055ef6d..1d0db357a 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInstarResponseHandlerImpl.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInstarResponseHandlerImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.instar.interfaceImpl;
+package org.onap.appc.instar.interfaceImpl;
 
 import org.junit.Test;
 import org.openecomp.sdnc.config.params.data.ResponseKey;
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInstarRestClientImpl.java b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInstarRestClientImpl.java
index eaedea476..cf2427dc1 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInstarRestClientImpl.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInstarRestClientImpl.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.instar.interfaceImpl;
+package org.onap.appc.instar.interfaceImpl;
 
 import java.util.HashMap;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.appc.instar.dme2client.Dme2Client;
+import org.onap.appc.instar.dme2client.Dme2Client;
 
 public class TestInstarRestClientImpl {
 
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInterfaceIpAddressImpl.java b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInterfaceIpAddressImpl.java
index 1217a7488..f29bebd7e 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInterfaceIpAddressImpl.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInterfaceIpAddressImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.instar.interfaceImpl;
+package org.onap.appc.instar.interfaceImpl;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/node/TestDme2Client.java b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/node/TestDme2Client.java
index 072050d76..8e87ffe35 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/node/TestDme2Client.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/node/TestDme2Client.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.instar.node;
+package org.onap.appc.instar.node;
 
 import java.util.HashMap;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openecomp.appc.instar.dme2client.Dme2Client;
+import org.onap.appc.instar.dme2client.Dme2Client;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.modules.junit4.PowerMockRunner;
 
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/node/TestInstarClientNode.java b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/node/TestInstarClientNode.java
index 6901d24b8..285662f75 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/node/TestInstarClientNode.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/node/TestInstarClientNode.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.instar.node;
+package org.onap.appc.instar.node;
 
 import java.net.URI;
 import java.nio.charset.Charset;
@@ -36,8 +36,8 @@ import org.apache.commons.io.IOUtils;
 import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.instar.dme2client.SecureRestClientTrustManager;
-import org.openecomp.appc.instar.utils.InstarClientConstant;
+import org.onap.appc.instar.dme2client.SecureRestClientTrustManager;
+import org.onap.appc.instar.utils.InstarClientConstant;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import com.sun.jersey.api.client.Client;
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/node/TestSecureRestClientTrustManager.java b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/node/TestSecureRestClientTrustManager.java
index 11fe58b67..b18673a40 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/node/TestSecureRestClientTrustManager.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/node/TestSecureRestClientTrustManager.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.instar.node;
+package org.onap.appc.instar.node;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.appc.instar.dme2client.SecureRestClientTrustManager;
+import org.onap.appc.instar.dme2client.SecureRestClientTrustManager;
 
 public class TestSecureRestClientTrustManager {
 
diff --git a/appc-outbound/pom.xml b/appc-outbound/pom.xml
index 28f28d9de..835684933 100755
--- a/appc-outbound/pom.xml
+++ b/appc-outbound/pom.xml
@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

 	<modelVersion>4.0.0</modelVersion>

 	<parent>

-		<groupId>org.openecomp.appc</groupId>

+		<groupId>org.onap.appc</groupId>

 		<artifactId>appc</artifactId>

 		<version>1.3.0-SNAPSHOT</version>

 	</parent>

diff --git a/appc-provider/appc-provider-bundle/pom.xml b/appc-provider/appc-provider-bundle/pom.xml
index edaf479ec..622dfbdaf 100644
--- a/appc-provider/appc-provider-bundle/pom.xml
+++ b/appc-provider/appc-provider-bundle/pom.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>appc-provider</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>appc-provider-bundle</artifactId>
@@ -42,14 +42,14 @@
                     <instructions>
                         <Export-Package>org.opendaylight.controller.config.yang.config.sample_provider.impl
                         </Export-Package>
-                        <Export-Package>org.openecomp.appc.provider</Export-Package>
+                        <Export-Package>org.onap.appc.provider</Export-Package>
                         <!-- <Import-Package>!groovy.lang,!javax.jms,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.codehaus.janino,!com.ibm.icu.*,!com.sun.faces.*,!org.apache.log,*;resolution:=optional</Import-Package> -->
                         <!-- <Embed-Dependency>appc-common,eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false,domain-model-lib,appc-command-executor-api,appc-request-handler-api</Embed-Dependency> -->
                         <Import-Package>
-                            org.openecomp.appc.domainmodel.lcm,
-                            org.openecomp.appc.i18n,
-                            org.openecomp.appc.logging,
-                            org.openecomp.appc.util,
+                            org.onap.appc.domainmodel.lcm,
+                            org.onap.appc.i18n,
+                            org.onap.appc.logging,
+                            org.onap.appc.util,
                             com.att.eelf.configuration,
                             com.att.eelf.i18n,
                             *;resolution:=optional
@@ -165,33 +165,33 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-request-handler-api</artifactId>
             <version>${project.version}</version>
             <type>bundle</type>
             <scope>provided</scope>
             <!--             <exclusions> -->
             <!--                 <exclusion> -->
-            <!--                     <groupId>org.openecomp.appc</groupId> -->
+            <!--                     <groupId>org.onap.appc</groupId> -->
             <!--                     <artifactId>domain-model-lib</artifactId> -->
             <!--                 </exclusion> -->
             <!--             </exclusions> -->
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-common</artifactId>
             <version>${project.version}</version>
             <!--             <classifier>jar-with-dependencies</classifier> -->
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-provider-model</artifactId>
             <version>${project.version}</version>
         </dependency>
 
-        <!-- ADDED THIS ARTIFACT TO BE ABLE TO FIND org.openecomp.appc.domainmodel.lcm -->
+        <!-- ADDED THIS ARTIFACT TO BE ABLE TO FIND org.onap.appc.domainmodel.lcm -->
         <!--         <dependency> -->
-        <!--             <groupId>org.openecomp.appc</groupId> -->
+        <!--             <groupId>org.onap.appc</groupId> -->
         <!--             <artifactId>domain-model-lib</artifactId> -->
         <!--             <version>${project.version}</version> -->
         <!--         </dependency> -->
diff --git a/appc-provider/appc-provider-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/provider/impl/rev140523/AppcProviderModule.java b/appc-provider/appc-provider-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/provider/impl/rev140523/AppcProviderModule.java
index 913b875a6..e2fef3447 100644
--- a/appc-provider/appc-provider-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/provider/impl/rev140523/AppcProviderModule.java
+++ b/appc-provider/appc-provider-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/provider/impl/rev140523/AppcProviderModule.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.opendaylight.yang.gen.v1.org.openecomp.appc.provider.impl.rev140523;
+package org.opendaylight.yang.gen.v1.org.onap.appc.provider.impl.rev140523;
 
-import org.openecomp.appc.provider.AppcProvider;
+import org.onap.appc.provider.AppcProvider;
 
 /**
  * This was generated code. It was generated into the source tree because it has to be manually modified.
  * 
  */
 public class AppcProviderModule extends
-                org.opendaylight.yang.gen.v1.org.openecomp.appc.provider.impl.rev140523.AbstractAppcProviderModule {
+                org.opendaylight.yang.gen.v1.org.onap.appc.provider.impl.rev140523.AbstractAppcProviderModule {
 
     /**
      * @param identifier
@@ -52,13 +52,13 @@ public class AppcProviderModule extends
     @SuppressWarnings("javadoc")
     public AppcProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
                               org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-                              org.opendaylight.yang.gen.v1.org.openecomp.appc.provider.impl.rev140523.AppcProviderModule oldModule,
+                              org.opendaylight.yang.gen.v1.org.onap.appc.provider.impl.rev140523.AppcProviderModule oldModule,
                               java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 
     /**
-     * @see org.opendaylight.yang.gen.v1.org.openecomp.appc.provider.impl.rev140523.AbstractAppcProviderModule#customValidation()
+     * @see org.opendaylight.yang.gen.v1.org.onap.appc.provider.impl.rev140523.AbstractAppcProviderModule#customValidation()
      */
     @Override
     public void customValidation() {
@@ -68,7 +68,7 @@ public class AppcProviderModule extends
     /**
      * This method is manually updated to actually invoke the provider implementation
      * 
-     * @see org.opendaylight.yang.gen.v1.org.openecomp.appc.provider.impl.rev140523.AbstractAppcProviderModule#createInstance()
+     * @see org.opendaylight.yang.gen.v1.org.onap.appc.provider.impl.rev140523.AbstractAppcProviderModule#createInstance()
      */
     @Override
     public java.lang.AutoCloseable createInstance() {
diff --git a/appc-provider/appc-provider-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/provider/impl/rev140523/AppcProviderModuleFactory.java b/appc-provider/appc-provider-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/provider/impl/rev140523/AppcProviderModuleFactory.java
index 35827d9c5..3623c2623 100644
--- a/appc-provider/appc-provider-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/provider/impl/rev140523/AppcProviderModuleFactory.java
+++ b/appc-provider/appc-provider-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/provider/impl/rev140523/AppcProviderModuleFactory.java
@@ -27,13 +27,13 @@
  * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator Generated at: Tue Sep 01
  * 13:56:34 CDT 2015 Do not modify this file unless it is present under src/main directory
  */
-package org.opendaylight.yang.gen.v1.org.openecomp.appc.provider.impl.rev140523;
+package org.opendaylight.yang.gen.v1.org.onap.appc.provider.impl.rev140523;
 
 /**
  * Generated code
  *
  */
 public class AppcProviderModuleFactory extends
-                org.opendaylight.yang.gen.v1.org.openecomp.appc.provider.impl.rev140523.AbstractAppcProviderModuleFactory {
+                org.opendaylight.yang.gen.v1.org.onap.appc.provider.impl.rev140523.AbstractAppcProviderModuleFactory {
 
 }
diff --git a/appc-provider/appc-provider-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/provider/lcm/impl/rev160108/AppcProviderLcmModule.java b/appc-provider/appc-provider-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/provider/lcm/impl/rev160108/AppcProviderLcmModule.java
index e173f3d21..41362624e 100644
--- a/appc-provider/appc-provider-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/provider/lcm/impl/rev160108/AppcProviderLcmModule.java
+++ b/appc-provider/appc-provider-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/provider/lcm/impl/rev160108/AppcProviderLcmModule.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.opendaylight.yang.gen.v1.org.openecomp.appc.provider.lcm.impl.rev160108;
+package org.opendaylight.yang.gen.v1.org.onap.appc.provider.lcm.impl.rev160108;
 
-import org.openecomp.appc.provider.AppcProviderLcm;
+import org.onap.appc.provider.AppcProviderLcm;
 
-public class AppcProviderLcmModule extends org.opendaylight.yang.gen.v1.org.openecomp.appc.provider.lcm.impl.rev160108.AbstractAppcProviderLcmModule {
+public class AppcProviderLcmModule extends org.opendaylight.yang.gen.v1.org.onap.appc.provider.lcm.impl.rev160108.AbstractAppcProviderLcmModule {
     public AppcProviderLcmModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
 
-    public AppcProviderLcmModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.openecomp.appc.provider.lcm.impl.rev160108.AppcProviderLcmModule oldModule, java.lang.AutoCloseable oldInstance) {
+    public AppcProviderLcmModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.onap.appc.provider.lcm.impl.rev160108.AppcProviderLcmModule oldModule, java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 
diff --git a/appc-provider/appc-provider-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/provider/lcm/impl/rev160108/AppcProviderLcmModuleFactory.java b/appc-provider/appc-provider-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/provider/lcm/impl/rev160108/AppcProviderLcmModuleFactory.java
index 1d8323529..b2046de47 100644
--- a/appc-provider/appc-provider-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/provider/lcm/impl/rev160108/AppcProviderLcmModuleFactory.java
+++ b/appc-provider/appc-provider-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/provider/lcm/impl/rev160108/AppcProviderLcmModuleFactory.java
@@ -31,7 +31,7 @@
 *
 * Do not modify this file unless it is present under src/main directory
 */
-package org.opendaylight.yang.gen.v1.org.openecomp.appc.provider.lcm.impl.rev160108;
-public class AppcProviderLcmModuleFactory extends org.opendaylight.yang.gen.v1.org.openecomp.appc.provider.lcm.impl.rev160108.AbstractAppcProviderLcmModuleFactory {
+package org.opendaylight.yang.gen.v1.org.onap.appc.provider.lcm.impl.rev160108;
+public class AppcProviderLcmModuleFactory extends org.opendaylight.yang.gen.v1.org.onap.appc.provider.lcm.impl.rev160108.AbstractAppcProviderLcmModuleFactory {
 
 }
diff --git a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/AppcProvider.java b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/AppcProvider.java
index 2fd3b4f8d..990576422 100644
--- a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/AppcProvider.java
+++ b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/AppcProvider.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.provider;
+package org.onap.appc.provider;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -31,30 +31,30 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.AppcProviderService;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.EvacuateInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.EvacuateOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.MigrateInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.MigrateOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.ModifyConfigInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.ModifyConfigOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.RebuildInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.RebuildOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.RestartInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.RestartOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.SnapshotInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.SnapshotOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.VmstatuscheckInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.VmstatuscheckOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.common.request.header.CommonRequestHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.config.payload.ConfigPayload;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.vnf.resource.VnfResource;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.AppcProviderService;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.EvacuateInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.EvacuateOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.MigrateInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.MigrateOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.ModifyConfigInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.ModifyConfigOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.RebuildInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.RebuildOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.RestartInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.RestartOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.SnapshotInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.SnapshotOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.VmstatuscheckInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.VmstatuscheckOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.common.request.header.CommonRequestHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.config.payload.ConfigPayload;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.vnf.resource.VnfResource;
 import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.provider.topology.TopologyService;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.provider.topology.TopologyService;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -177,7 +177,7 @@ public class AppcProvider implements AutoCloseable, AppcProviderService {
     /**
      * Rebuilds a specific VNF
      *
-     * @see org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.AppcProviderService#rebuild(org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.RebuildInput)
+     * @see org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.AppcProviderService#rebuild(org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.RebuildInput)
      */
     @Override
     public Future<RpcResult<RebuildOutput>> rebuild(RebuildInput input) {
@@ -192,7 +192,7 @@ public class AppcProvider implements AutoCloseable, AppcProviderService {
     /**
      * Restarts a specific VNF
      *
-     * @see org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.AppcProviderService#restart(org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.RestartInput)
+     * @see org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.AppcProviderService#restart(org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.RestartInput)
      */
     @Override
     public Future<RpcResult<RestartOutput>> restart(RestartInput input) {
@@ -206,7 +206,7 @@ public class AppcProvider implements AutoCloseable, AppcProviderService {
     /**
      * Migrates a specific VNF
      *
-     * @see org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.AppcProviderService#migrate(org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.MigrateInput)
+     * @see org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.AppcProviderService#migrate(org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.MigrateInput)
      */
     @Override
     public Future<RpcResult<MigrateOutput>> migrate(MigrateInput input) {
@@ -220,7 +220,7 @@ public class AppcProvider implements AutoCloseable, AppcProviderService {
     /**
      * Evacuates a specific VNF
      *
-     * @see org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.AppcProviderService#evacuate(org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.EvacuateInput)
+     * @see org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.AppcProviderService#evacuate(org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.EvacuateInput)
      */
     @Override
     public Future<RpcResult<EvacuateOutput>> evacuate(EvacuateInput input) {
@@ -231,7 +231,7 @@ public class AppcProvider implements AutoCloseable, AppcProviderService {
     /**
      * Evacuates a specific VNF
      *
-     * @see org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.AppcProviderService#evacuate(org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.EvacuateInput)
+     * @see org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.AppcProviderService#evacuate(org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.EvacuateInput)
      */
     @Override
     public Future<RpcResult<SnapshotOutput>> snapshot(SnapshotInput input) {
diff --git a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/AppcProviderClient.java b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/AppcProviderClient.java
index 6c43c388a..6195521be 100644
--- a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/AppcProviderClient.java
+++ b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/AppcProviderClient.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.provider;
+package org.onap.appc.provider;
 
-import org.openecomp.appc.util.StringHelper;
+import org.onap.appc.util.StringHelper;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
@@ -94,7 +94,7 @@ public class AppcProviderClient {
         MDC.put("ElapsedTime", durationStr);
         MDC.put("TargetEntity", "sli");
         MDC.put("TargetServiceName", "execute");
-        MDC.put("ClassName", "org.openecomp.appc.provider.AppcProviderClient"); 
+        MDC.put("ClassName", "org.onap.appc.provider.AppcProviderClient"); 
 
         LOG.debug("Parameters passed to SLI: " + StringHelper.propertiesToString(parms));
         metricsLogger.info("Parameters passed to SLI: " + StringHelper.propertiesToString(parms));
diff --git a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/AppcProviderLcm.java b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/AppcProviderLcm.java
index 0ce877838..66e8909bd 100644
--- a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/AppcProviderLcm.java
+++ b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/AppcProviderLcm.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.provider;
+package org.onap.appc.provider;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -32,109 +32,109 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.AppcProviderLcmService;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.AuditInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.AuditOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.AuditOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.CheckLockInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.CheckLockOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.CheckLockOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigBackupDeleteInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigBackupDeleteOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigBackupDeleteOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigBackupInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigBackupOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigBackupOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigExportInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigExportOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigExportOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigModifyInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigModifyOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigModifyOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigRestoreInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigRestoreOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigRestoreOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigScaleoutInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigScaleoutOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigScaleoutOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigureInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigureOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigureOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.EvacuateInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.EvacuateOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.EvacuateOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.HealthCheckInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.HealthCheckOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.HealthCheckOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.LiveUpgradeInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.LiveUpgradeOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.LiveUpgradeOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.LockInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.LockOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.LockOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.MigrateInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.MigrateOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.MigrateOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.RebuildInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.RebuildOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.RebuildOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.RestartInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.RestartOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.RestartOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.RollbackInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.RollbackOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.RollbackOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.SnapshotInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.SnapshotOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.SnapshotOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.SoftwareUploadInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.SoftwareUploadOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.SoftwareUploadOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StartInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StartOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StartOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StopInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StopOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StopOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.SyncInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.SyncOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.SyncOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.TerminateInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.TerminateOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.TerminateOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.TestInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.TestOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.TestOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.UnlockInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.UnlockOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.UnlockOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StartApplicationOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StartApplicationOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StartApplicationInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StopApplicationOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StopApplicationOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StopApplicationInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.status.Status;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.status.StatusBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.Action;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.AppcProviderLcmService;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.AuditInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.AuditOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.AuditOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.CheckLockInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.CheckLockOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.CheckLockOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigBackupDeleteInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigBackupDeleteOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigBackupDeleteOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigBackupInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigBackupOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigBackupOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigExportInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigExportOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigExportOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigModifyInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigModifyOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigModifyOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigRestoreInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigRestoreOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigRestoreOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigScaleoutInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigScaleoutOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigScaleoutOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigureInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigureOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigureOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.EvacuateInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.EvacuateOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.EvacuateOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.HealthCheckInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.HealthCheckOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.HealthCheckOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.LiveUpgradeInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.LiveUpgradeOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.LiveUpgradeOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.LockInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.LockOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.LockOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.MigrateInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.MigrateOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.MigrateOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.RebuildInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.RebuildOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.RebuildOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.RestartInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.RestartOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.RestartOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.RollbackInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.RollbackOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.RollbackOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.SnapshotInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.SnapshotOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.SnapshotOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.SoftwareUploadInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.SoftwareUploadOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.SoftwareUploadOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StartInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StartOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StartOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StopInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StopOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StopOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.SyncInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.SyncOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.SyncOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.TerminateInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.TerminateOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.TerminateOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.TestInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.TestOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.TestOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.UnlockInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.UnlockOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.UnlockOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StartApplicationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StartApplicationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StartApplicationInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StopApplicationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StopApplicationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StopApplicationInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.status.Status;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.status.StatusBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.Action;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.domainmodel.lcm.ActionLevel;
-import org.openecomp.appc.domainmodel.lcm.ResponseContext;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.executor.objects.LCMCommandStatus;
-import org.openecomp.appc.executor.objects.Params;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.logging.LoggingConstants;
-import org.openecomp.appc.logging.LoggingUtils;
-import org.openecomp.appc.provider.lcm.util.RequestInputBuilder;
-import org.openecomp.appc.provider.lcm.util.ValidationService;
-import org.openecomp.appc.requesthandler.RequestHandler;
-import org.openecomp.appc.requesthandler.objects.RequestHandlerInput;
-import org.openecomp.appc.requesthandler.objects.RequestHandlerOutput;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.domainmodel.lcm.ActionLevel;
+import org.onap.appc.domainmodel.lcm.ResponseContext;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.executor.objects.LCMCommandStatus;
+import org.onap.appc.executor.objects.Params;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.logging.LoggingConstants;
+import org.onap.appc.logging.LoggingUtils;
+import org.onap.appc.provider.lcm.util.RequestInputBuilder;
+import org.onap.appc.provider.lcm.util.ValidationService;
+import org.onap.appc.requesthandler.RequestHandler;
+import org.onap.appc.requesthandler.objects.RequestHandlerInput;
+import org.onap.appc.requesthandler.objects.RequestHandlerOutput;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
@@ -263,7 +263,7 @@ public class AppcProviderLcm implements AutoCloseable, AppcProviderLcmService {
     /**
      * Restarts a specific VNF
      *
-     * @see org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.AppcProviderLcmService#restart(RestartInput)
+     * @see org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.AppcProviderLcmService#restart(RestartInput)
      */
     @Override
     public Future<RpcResult<RestartOutput>> restart(RestartInput input) {
diff --git a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/ResponseHeaderBuilder.java b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/ResponseHeaderBuilder.java
index 5ec111159..7c479ddc0 100644
--- a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/ResponseHeaderBuilder.java
+++ b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/ResponseHeaderBuilder.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.provider;
+package org.onap.appc.provider;
 
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.TIMESTAMP;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.common.response.header.CommonResponseHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.common.response.header.CommonResponseHeaderBuilder;
-import org.openecomp.appc.util.Time;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.TIMESTAMP;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.common.response.header.CommonResponseHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.common.response.header.CommonResponseHeaderBuilder;
+import org.onap.appc.util.Time;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
diff --git a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/lcm/util/LCMConstants.java b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/lcm/util/LCMConstants.java
index c2f06a207..40e632e7f 100644
--- a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/lcm/util/LCMConstants.java
+++ b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/lcm/util/LCMConstants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.provider.lcm.util;
+package org.onap.appc.provider.lcm.util;
 
 public final class LCMConstants {
 	private LCMConstants() {
diff --git a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/lcm/util/RequestInputBuilder.java b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/lcm/util/RequestInputBuilder.java
index c323aa5e5..979c834de 100644
--- a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/lcm/util/RequestInputBuilder.java
+++ b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/lcm/util/RequestInputBuilder.java
@@ -22,22 +22,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.provider.lcm.util;
+package org.onap.appc.provider.lcm.util;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.TimeZone;
 
 import org.apache.commons.lang.StringUtils;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.Payload;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.action.identifiers.ActionIdentifiers;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.CommonHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.common.header.Flags;
-import org.openecomp.appc.domainmodel.lcm.Flags.Mode;
-import org.openecomp.appc.domainmodel.lcm.ActionLevel;
-import org.openecomp.appc.domainmodel.lcm.RequestContext;
-import org.openecomp.appc.domainmodel.lcm.VNFOperation;
-import org.openecomp.appc.requesthandler.objects.RequestHandlerInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.Payload;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.action.identifiers.ActionIdentifiers;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.CommonHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.common.header.Flags;
+import org.onap.appc.domainmodel.lcm.Flags.Mode;
+import org.onap.appc.domainmodel.lcm.ActionLevel;
+import org.onap.appc.domainmodel.lcm.RequestContext;
+import org.onap.appc.domainmodel.lcm.VNFOperation;
+import org.onap.appc.requesthandler.objects.RequestHandlerInput;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
@@ -91,7 +91,7 @@ public class RequestInputBuilder {
     }
 
     public RequestInputBuilder commonHeader(CommonHeader commonHeader) throws ParseException {
-        org.openecomp.appc.domainmodel.lcm.CommonHeader header = new org.openecomp.appc.domainmodel.lcm.CommonHeader();
+        org.onap.appc.domainmodel.lcm.CommonHeader header = new org.onap.appc.domainmodel.lcm.CommonHeader();
         this.requestContext.setCommonHeader(header);
 
         try {
@@ -129,13 +129,13 @@ public class RequestInputBuilder {
             }
 
         }
-        this.requestContext.getCommonHeader().setFlags(new org.openecomp.appc.domainmodel.lcm.Flags(mode, force, ttl));
+        this.requestContext.getCommonHeader().setFlags(new org.onap.appc.domainmodel.lcm.Flags(mode, force, ttl));
         return this;
     }
 
     public RequestInputBuilder actionIdentifiers(ActionIdentifiers actionIdentifiers)  throws ParseException  {
         if(null!= actionIdentifiers) {
-            org.openecomp.appc.domainmodel.lcm.ActionIdentifiers actionIds = new org.openecomp.appc.domainmodel.lcm.ActionIdentifiers();
+            org.onap.appc.domainmodel.lcm.ActionIdentifiers actionIds = new org.onap.appc.domainmodel.lcm.ActionIdentifiers();
             actionIds.setServiceInstanceId(actionIdentifiers.getServiceInstanceId());
             actionIds.setVnfcName(actionIdentifiers.getVnfcName());
             actionIds.setvServerId(actionIdentifiers.getVserverId());
@@ -151,7 +151,7 @@ public class RequestInputBuilder {
         }
     }
 
-    private ActionLevel readActionLevel(org.openecomp.appc.domainmodel.lcm.ActionIdentifiers actionIds) {
+    private ActionLevel readActionLevel(org.onap.appc.domainmodel.lcm.ActionIdentifiers actionIds) {
         if(!StringUtils.isEmpty(actionIds.getVserverId())){
             return ActionLevel.VM;
         }
diff --git a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/lcm/util/ValidationService.java b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/lcm/util/ValidationService.java
index 936a2b755..69e100b57 100644
--- a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/lcm/util/ValidationService.java
+++ b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/lcm/util/ValidationService.java
@@ -22,18 +22,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.provider.lcm.util;
+package org.onap.appc.provider.lcm.util;
 
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.Action;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.CommonHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.status.Status;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.status.StatusBuilder;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.executor.objects.LCMCommandStatus;
-import org.openecomp.appc.executor.objects.Params;
-import org.openecomp.appc.i18n.Msg;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.Action;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.CommonHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.status.Status;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.status.StatusBuilder;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.executor.objects.LCMCommandStatus;
+import org.onap.appc.executor.objects.Params;
+import org.onap.appc.i18n.Msg;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
diff --git a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/topology/TopologyService.java b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/topology/TopologyService.java
index 3837d9f1c..ea1d3f1ee 100644
--- a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/topology/TopologyService.java
+++ b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/topology/TopologyService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.provider.topology;
+package org.onap.appc.provider.topology;
 
 import static com.att.eelf.configuration.Configuration.MDC_ALERT_SEVERITY;
 import static com.att.eelf.configuration.Configuration.MDC_INSTANCE_UUID;
@@ -40,31 +40,31 @@ import java.util.Date;
 import java.util.Properties;
 import java.util.TimeZone;
 
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.MigrateOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.ModifyConfigOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.ModifyConfigOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.MigrateOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.RebuildOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.RebuildOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.RestartOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.RestartOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.SnapshotOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.SnapshotOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.UUID;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.common.request.header.CommonRequestHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.vnf.resource.VnfResource;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.config.payload.ConfigPayload;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.VmstatuscheckOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.VmstatuscheckOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.MigrateOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.ModifyConfigOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.ModifyConfigOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.MigrateOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.RebuildOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.RebuildOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.RestartOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.RestartOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.SnapshotOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.SnapshotOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.UUID;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.common.request.header.CommonRequestHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.vnf.resource.VnfResource;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.config.payload.ConfigPayload;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.VmstatuscheckOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.VmstatuscheckOutputBuilder;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.provider.AppcProvider;
-import org.openecomp.appc.provider.AppcProviderClient;
-import org.openecomp.appc.provider.ResponseHeaderBuilder;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.provider.AppcProvider;
+import org.onap.appc.provider.AppcProviderClient;
+import org.onap.appc.provider.ResponseHeaderBuilder;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
@@ -224,8 +224,8 @@ public class TopologyService {
         	url = configuration.getProperty("appc.provider.vfodl.url");
         }
         logger.trace("Final URL to VF ODL: "+url);
-        properties.put("org.openecomp.appc.configURL", url);
-        properties.put("org.openecomp.appc.configJson", data.getConfigJson());
+        properties.put("org.onap.appc.configURL", url);
+        properties.put("org.onap.appc.configJson", data.getConfigJson());
 
         //UUID identityUrl = vnf.getIdentityUrl();
         //if (identityUrl != null) {
diff --git a/appc-provider/appc-provider-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-provider/appc-provider-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 9c2ffd68f..c3047203d 100644
--- a/appc-provider/appc-provider-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-provider/appc-provider-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -29,11 +29,11 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                        xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
-<!--<bean id="requestDispatcher" class="org.openecomp.appc.requesthandler.impl.RequestHandlerImpl" scope="singleton" >
+<!--<bean id="requestDispatcher" class="org.onap.appc.requesthandler.impl.RequestHandlerImpl" scope="singleton" >
 </bean>
 
-<service id="requestDispatcherService" interface="org.openecomp.appc.requesthandler.RequestHandler" ref="requestDispatcher"/>
+<service id="requestDispatcherService" interface="org.onap.appc.requesthandler.RequestHandler" ref="requestDispatcher"/>
 
-<reference id="aaiAdapter" availability="mandatory" activation="eager" interface="org.openecomp.appc.adapter.aai.AAIAdapter"/>-->
+<reference id="aaiAdapter" availability="mandatory" activation="eager" interface="org.onap.appc.adapter.aai.AAIAdapter"/>-->
 
 </blueprint>
diff --git a/appc-provider/appc-provider-bundle/src/main/resources/initial/appc-provider.xml b/appc-provider/appc-provider-bundle/src/main/resources/initial/appc-provider.xml
index afc0451c7..e7abc8ff4 100644
--- a/appc-provider/appc-provider-bundle/src/main/resources/initial/appc-provider.xml
+++ b/appc-provider/appc-provider-bundle/src/main/resources/initial/appc-provider.xml
@@ -32,7 +32,7 @@
 
 					<!-- This xmlns:prefix should match the namespace in the *-provider-impl.yang 
 						file The prefix: inside type should match the prefix of the yang file. -->
-					<type xmlns:prefix="org:openecomp:appc:provider:impl">
+					<type xmlns:prefix="org:onap:appc:provider:impl">
 						prefix:appc-provider-impl
 					</type>
 					<name>appc-provider-impl</name>
@@ -67,7 +67,7 @@
 
 					<!-- This xmlns:prefix should match the namespace in the *-provider-impl.yang
 						file The prefix: inside type should match the prefix of the yang file. -->
-					<type xmlns:prefix="org:openecomp:appc:provider:lcm:impl">
+					<type xmlns:prefix="org:onap:appc:provider:lcm:impl">
 						prefix:appc-provider-lcm-impl
 					</type>
 					<name>appc-provider-lcm-impl</name>
@@ -112,9 +112,9 @@
 	<!-- <capability>appc:training:sample:provider:impl?module=sample-provider-impl&amp;revision=2014-05-23</capability> -->
 	<!-- </required-capabilities> -->
 	<required-capabilities>
-		<capability>org:openecomp:appc:provider:impl?module=appc-provider-impl&amp;revision=2014-05-23
+		<capability>org:onap:appc:provider:impl?module=appc-provider-impl&amp;revision=2014-05-23
 		</capability>
-		<capability>org:openecomp:appc:provider:lcm:impl?module=appc-provider-lcm-impl&amp;revision=2016-01-08
+		<capability>org:onap:appc:provider:lcm:impl?module=appc-provider-lcm-impl&amp;revision=2016-01-08
 		</capability>
 	</required-capabilities>
 
diff --git a/appc-provider/appc-provider-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-provider/appc-provider-bundle/src/main/resources/org/openecomp/appc/default.properties
index d8a8b42ee..5e9258a09 100644
--- a/appc-provider/appc-provider-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-provider/appc-provider-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -38,16 +38,16 @@
 #
 #--------------------------------------------------------------------------------------------
 # The path and file used to load user-supplied configuration settings, if any 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # The path to search for logging configuration document, and the name of the document 
 #
-org.openecomp.appc.logging.path=${user.home},etc,../etc,.
-org.openecomp.appc.logging.file=logback.xml 
+org.onap.appc.logging.path=${user.home},etc,../etc,.
+org.onap.appc.logging.file=logback.xml 
 
 # 
 # The DG properties 
diff --git a/appc-provider/appc-provider-bundle/src/main/resources/org/openecomp/appc/logback.xml b/appc-provider/appc-provider-bundle/src/main/resources/org/openecomp/appc/logback.xml
index 799a1d8df..0dffe75e0 100644
--- a/appc-provider/appc-provider-bundle/src/main/resources/org/openecomp/appc/logback.xml
+++ b/appc-provider/appc-provider-bundle/src/main/resources/org/openecomp/appc/logback.xml
@@ -249,7 +249,7 @@
     </encoder>
   </appender>
 
-  <logger name="org.openecomp.appc" level="DEBUG" additivity="false">
+  <logger name="org.onap.appc" level="DEBUG" additivity="false">
     <appender-ref ref="CommandExecutor" />
   </logger>
 
diff --git a/appc-provider/appc-provider-bundle/src/main/yang/appc-provider-lcm.yang b/appc-provider/appc-provider-bundle/src/main/yang/appc-provider-lcm.yang
index 8ea081002..56d2e70e0 100644
--- a/appc-provider/appc-provider-bundle/src/main/yang/appc-provider-lcm.yang
+++ b/appc-provider/appc-provider-bundle/src/main/yang/appc-provider-lcm.yang
@@ -25,7 +25,7 @@
 module appc-provider-lcm-impl {
 
     yang-version 1;
-    namespace "org:openecomp:appc:provider:lcm:impl";
+    namespace "org:onap:appc:provider:lcm:impl";
     prefix "appc-provider-lcm-impl";
 
     import config { prefix config; revision-date 2013-04-05; }
diff --git a/appc-provider/appc-provider-bundle/src/main/yang/appc-provider.yang b/appc-provider/appc-provider-bundle/src/main/yang/appc-provider.yang
index 38ccb0187..83f6bfffa 100644
--- a/appc-provider/appc-provider-bundle/src/main/yang/appc-provider.yang
+++ b/appc-provider/appc-provider-bundle/src/main/yang/appc-provider.yang
@@ -25,7 +25,7 @@
 module appc-provider-impl {
 
     yang-version 1;
-    namespace "org:openecomp:appc:provider:impl";
+    namespace "org:onap:appc:provider:impl";
     prefix "appc-provider-impl";
 
     import config { prefix config; revision-date 2013-04-05; }
diff --git a/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/AppcProviderClientTest.java b/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/AppcProviderClientTest.java
index 99d3122a2..58ccc4735 100644
--- a/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/AppcProviderClientTest.java
+++ b/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/AppcProviderClientTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.provider;
+package org.onap.appc.provider;
 
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/AppcProviderLcmTest.java b/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/AppcProviderLcmTest.java
index 11ab106e1..f25df9c44 100644
--- a/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/AppcProviderLcmTest.java
+++ b/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/AppcProviderLcmTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.provider;
+package org.onap.appc.provider;
 
 import org.junit.After;
 import org.junit.Assert;
@@ -36,72 +36,72 @@ import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.AuditInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.AuditOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.CheckLockInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.CheckLockOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigBackupDeleteInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigBackupDeleteOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigBackupInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigBackupOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigExportInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigExportOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigModifyInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigModifyOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigRestoreInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigRestoreOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigScaleoutInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigScaleoutOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigureInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ConfigureOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.EvacuateInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.EvacuateOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.HealthCheckInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.HealthCheckOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.LiveUpgradeInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.LiveUpgradeOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.LockInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.LockOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.MigrateInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.MigrateOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.RebuildInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.RebuildOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.RestartInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.RestartOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.RollbackInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.RollbackOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.SnapshotInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.SnapshotOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.SoftwareUploadInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.SoftwareUploadOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StartApplicationInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StartApplicationOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StartInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StartOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StopApplicationInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StopApplicationOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StopInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.StopOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.SyncInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.SyncOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.TerminateInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.TerminateOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.TestInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.TestOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.UnlockInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.UnlockOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.ZULU;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.action.identifiers.ActionIdentifiers;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.action.identifiers.ActionIdentifiersBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.CommonHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.CommonHeaderBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.status.Status;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.status.StatusBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.AuditInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.AuditOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.CheckLockInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.CheckLockOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigBackupDeleteInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigBackupDeleteOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigBackupInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigBackupOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigExportInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigExportOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigModifyInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigModifyOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigRestoreInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigRestoreOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigScaleoutInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigScaleoutOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigureInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ConfigureOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.EvacuateInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.EvacuateOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.HealthCheckInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.HealthCheckOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.LiveUpgradeInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.LiveUpgradeOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.LockInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.LockOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.MigrateInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.MigrateOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.RebuildInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.RebuildOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.RestartInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.RestartOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.RollbackInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.RollbackOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.SnapshotInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.SnapshotOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.SoftwareUploadInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.SoftwareUploadOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StartApplicationInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StartApplicationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StartInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StartOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StopApplicationInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StopApplicationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StopInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.StopOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.SyncInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.SyncOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.TerminateInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.TerminateOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.TestInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.TestOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.UnlockInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.UnlockOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.ZULU;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.action.identifiers.ActionIdentifiers;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.action.identifiers.ActionIdentifiersBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.CommonHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.CommonHeaderBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.status.Status;
+import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.status.StatusBuilder;
 import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.openecomp.appc.domainmodel.lcm.ResponseContext;
-import org.openecomp.appc.executor.objects.LCMCommandStatus;
-import org.openecomp.appc.provider.lcm.util.ValidationService;
-import org.openecomp.appc.requesthandler.objects.RequestHandlerOutput;
+import org.onap.appc.domainmodel.lcm.ResponseContext;
+import org.onap.appc.executor.objects.LCMCommandStatus;
+import org.onap.appc.provider.lcm.util.ValidationService;
+import org.onap.appc.requesthandler.objects.RequestHandlerOutput;
 import org.osgi.framework.FrameworkUtil;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -142,7 +142,7 @@ public class AppcProviderLcmTest extends AbstractDataBrokerTest {
     @Mock
     private ResponseContext responseContext;
     @Mock
-    private org.openecomp.appc.domainmodel.lcm.Status successlcmStatus;
+    private org.onap.appc.domainmodel.lcm.Status successlcmStatus;
 
     /**
      * The @Before annotation is defined in the AbstractDataBrokerTest class. The method setupWithDataBroker is invoked
diff --git a/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/AppcProviderTest.java b/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/AppcProviderTest.java
index e6f47b7ea..31598c9c9 100644
--- a/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/AppcProviderTest.java
+++ b/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/AppcProviderTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.provider;
+package org.onap.appc.provider;
 
 import org.junit.After;
 import org.junit.Assert;
@@ -35,25 +35,25 @@ import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.EvacuateInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.EvacuateOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.MigrateInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.MigrateOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.ModifyConfigInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.ModifyConfigOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.RebuildInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.RebuildOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.RestartInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.RestartOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.SnapshotInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.SnapshotOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.VmstatuscheckInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.VmstatuscheckOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.common.request.header.CommonRequestHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.config.payload.ConfigPayload;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.vnf.resource.VnfResource;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.EvacuateInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.EvacuateOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.MigrateInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.MigrateOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.ModifyConfigInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.ModifyConfigOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.RebuildInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.RebuildOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.RestartInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.RestartOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.SnapshotInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.SnapshotOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.VmstatuscheckInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.VmstatuscheckOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.common.request.header.CommonRequestHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.config.payload.ConfigPayload;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.vnf.resource.VnfResource;
 import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.openecomp.appc.provider.topology.TopologyService;
+import org.onap.appc.provider.topology.TopologyService;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
diff --git a/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/ResponseHeaderBuilderTest.java b/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/ResponseHeaderBuilderTest.java
index fad60a239..f910a908d 100644
--- a/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/ResponseHeaderBuilderTest.java
+++ b/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/ResponseHeaderBuilderTest.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.provider;
+package org.onap.appc.provider;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.common.response.header.CommonResponseHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.common.response.header.CommonResponseHeader;
 
 public class ResponseHeaderBuilderTest {
 
diff --git a/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/topology/TopologyServiceTest.java b/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/topology/TopologyServiceTest.java
index 215b10a31..8bb84b544 100644
--- a/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/topology/TopologyServiceTest.java
+++ b/appc-provider/appc-provider-bundle/src/test/java/org/openecomp/appc/provider/topology/TopologyServiceTest.java
@@ -22,19 +22,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.provider.topology;
+package org.onap.appc.provider.topology;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.UUID;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.common.request.header.CommonRequestHeader;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.config.payload.ConfigPayload;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.rev160104.vnf.resource.VnfResource;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.provider.AppcProvider;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.UUID;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.common.request.header.CommonRequestHeader;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.config.payload.ConfigPayload;
+import org.opendaylight.yang.gen.v1.org.onap.appc.rev160104.vnf.resource.VnfResource;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.provider.AppcProvider;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
diff --git a/appc-provider/appc-provider-features/pom.xml b/appc-provider/appc-provider-features/pom.xml
index a4694ae6c..222aa415e 100644
--- a/appc-provider/appc-provider-features/pom.xml
+++ b/appc-provider/appc-provider-features/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-provider</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <name>appc-provider-features</name>
@@ -13,13 +13,13 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-provider-model</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-provider-bundle</artifactId>
       <classifier>config</classifier>
       <type>xml</type>
@@ -27,7 +27,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-provider-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-provider/appc-provider-features/src/main/resources/features.xml b/appc-provider/appc-provider-features/src/main/resources/features.xml
index 06e3616c0..2e2b759f8 100644
--- a/appc-provider/appc-provider-features/src/main/resources/features.xml
+++ b/appc-provider/appc-provider-features/src/main/resources/features.xml
@@ -32,9 +32,9 @@
     
     <feature name='appc-provider' description="application controller" version='${project.version}'>
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-        <bundle>mvn:org.openecomp.appc/appc-provider-model/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-provider-bundle/${project.version}</bundle>
-        <configfile finalname="etc/opendaylight/karaf/200-appc-provider.xml">mvn:org.openecomp.appc/appc-provider-bundle/${project.version}/xml/config</configfile>
+        <bundle>mvn:org.onap.appc/appc-provider-model/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-provider-bundle/${project.version}</bundle>
+        <configfile finalname="etc/opendaylight/karaf/200-appc-provider.xml">mvn:org.onap.appc/appc-provider-bundle/${project.version}/xml/config</configfile>
     </feature>
 
 </features>
diff --git a/appc-provider/appc-provider-installer/pom.xml b/appc-provider/appc-provider-installer/pom.xml
index ac2b85d70..5a997af0d 100644
--- a/appc-provider/appc-provider-installer/pom.xml
+++ b/appc-provider/appc-provider-installer/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-provider</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   
@@ -14,14 +14,14 @@
   <properties>
     <application.name>appc-provider</application.name>
     <features.boot>appc-provider</features.boot>
-    <features.repositories>mvn:org.openecomp.appc/appc-provider-features/${project.version}/xml/features</features.repositories>
+    <features.repositories>mvn:org.onap.appc/appc-provider-features/${project.version}/xml/features</features.repositories>
     <include.transitive.dependencies>false</include.transitive.dependencies>
   </properties>
 
   <dependencies>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-provider-features</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -35,13 +35,13 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-provider-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-provider-bundle</artifactId>
       <version>${project.version}</version>
       <classifier>config</classifier>
diff --git a/appc-provider/appc-provider-model/pom.xml b/appc-provider/appc-provider-model/pom.xml
index 6401c7fa3..2bc6e411f 100644
--- a/appc-provider/appc-provider-model/pom.xml
+++ b/appc-provider/appc-provider-model/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>appc-provider</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>appc-provider-model</artifactId>
diff --git a/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang b/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang
index a53684f68..8bcbd320c 100644
--- a/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang
+++ b/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang
@@ -43,7 +43,7 @@
 module appc-provider-lcm {
 
     yang-version 1;
-    namespace "org:openecomp:appc:lcm";
+    namespace "org:onap:appc:lcm";
     prefix appc-provider-lcm;
     organization "Copyright 2017 AT&T Intellectual Property.";
 
diff --git a/appc-provider/appc-provider-model/src/main/yang/appc-provider.yang b/appc-provider/appc-provider-model/src/main/yang/appc-provider.yang
index b62fabdf9..d89573b4d 100644
--- a/appc-provider/appc-provider-model/src/main/yang/appc-provider.yang
+++ b/appc-provider/appc-provider-model/src/main/yang/appc-provider.yang
@@ -43,7 +43,7 @@
 module appc-provider {
 
     yang-version 1;
-    namespace "org:openecomp:appc";
+    namespace "org:onap:appc";
     prefix appc-provider;
     organization "Copyright 2017 AT&T Intellectual Property.";
 
diff --git a/appc-provider/pom.xml b/appc-provider/pom.xml
index 695449d2a..147fc4c2d 100644
--- a/appc-provider/pom.xml
+++ b/appc-provider/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml b/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
index 96930efec..2e61b7010 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
@@ -27,7 +27,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
 	<parent>
 		<artifactId>appc-sdc-listener</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
@@ -76,13 +76,13 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-message-adapter-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-message-adapter-factory</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -94,7 +94,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -135,7 +135,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-license-manager-api</artifactId>
 			<!-- <version>${project.version}</version> -->
 			<version>${project.version}</version>
@@ -170,7 +170,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dg-dependency-model</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -180,7 +180,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 			<version>${jackson-yaml-version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dg-domain-model-lib</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -232,12 +232,12 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
-						<Bundle-SymbolicName>org.openecomp.appc.sdc.listener</Bundle-SymbolicName>
-						<!--Bundle-Activator>org.openecomp.appc.sdc.listener.AppcSdcListenerActivator</Bundle-Activator -->
-						<Export-Package>org.openecomp.appc.sdc.listener</Export-Package>
+						<Bundle-SymbolicName>org.onap.appc.sdc.listener</Bundle-SymbolicName>
+						<!--Bundle-Activator>org.onap.appc.sdc.listener.AppcSdcListenerActivator</Bundle-Activator -->
+						<Export-Package>org.onap.appc.sdc.listener</Export-Package>
 						<Import-Package>
-							org.openecomp.appc.licmgr,
-							org.openecomp.appc.adapter.messaging.*,
+							org.onap.appc.licmgr,
+							org.onap.appc.adapter.messaging.*,
 							com.att.eelf.*,
 							*;resolution:=optional
 						</Import-Package>
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/ArtifactProcessor.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/ArtifactProcessor.java
index c0f52206f..12b6373f7 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/ArtifactProcessor.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/ArtifactProcessor.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.artifacts;
+package org.onap.appc.sdc.artifacts;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
 
 /**
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/ArtifactStorageService.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/ArtifactStorageService.java
index db4da9fef..044fbd187 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/ArtifactStorageService.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/ArtifactStorageService.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.artifacts.helper;
+package org.onap.appc.sdc.artifacts.helper;
 
 import org.apache.commons.lang.StringUtils;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.sdc.artifacts.object.SDCReference;
+import org.onap.appc.sdc.artifacts.object.SDCReference;
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
-import org.openecomp.appc.sdc.artifacts.object.SDCArtifact;
+import org.onap.appc.sdc.artifacts.object.SDCArtifact;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
@@ -39,8 +39,8 @@ import javax.sql.rowset.CachedRowSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 
-import static org.openecomp.appc.sdc.artifacts.helper.Constants.COMMA;
-import static org.openecomp.appc.sdc.artifacts.helper.Constants.AND;
+import static org.onap.appc.sdc.artifacts.helper.Constants.COMMA;
+import static org.onap.appc.sdc.artifacts.helper.Constants.AND;
 
 /**
  * Provides methods for storing sdc artifacts into app-c database
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/Constants.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/Constants.java
index 4970a739e..eacfb5db6 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/Constants.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/Constants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.artifacts.helper;
+package org.onap.appc.sdc.artifacts.helper;
 
 /**
  * Constants required in SDC listener module
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/DependencyModelGenerator.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/DependencyModelGenerator.java
index 0f8065a30..295ee47c8 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/DependencyModelGenerator.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/DependencyModelGenerator.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.artifacts.helper;
+package org.onap.appc.sdc.artifacts.helper;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -31,11 +31,11 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
-import org.openecomp.appc.dg.dependencymanager.helper.DependencyModelParser;
-import org.openecomp.appc.dg.objects.Node;
-import org.openecomp.appc.dg.objects.VnfcDependencyModel;
-import org.openecomp.appc.domainmodel.Vnfc;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.dg.dependencymanager.helper.DependencyModelParser;
+import org.onap.appc.dg.objects.Node;
+import org.onap.appc.dg.objects.VnfcDependencyModel;
+import org.onap.appc.domainmodel.Vnfc;
+import org.onap.appc.exceptions.APPCException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -62,10 +62,10 @@ public class DependencyModelGenerator {
 
         if (vnfcDependencyModel != null && !vnfcDependencyModel.getDependencies().isEmpty()) {
             logger.debug(String.format("Dependency Model generated : %s ", vnfcDependencyModel.toString()));
-            List<org.openecomp.appc.sdc.artifacts.object.Vnfc> vnfcs = new ArrayList<>();
+            List<org.onap.appc.sdc.artifacts.object.Vnfc> vnfcs = new ArrayList<>();
 
             for (Node<Vnfc> node : vnfcDependencyModel.getDependencies()) {
-                org.openecomp.appc.sdc.artifacts.object.Vnfc vnfc = new org.openecomp.appc.sdc.artifacts.object.Vnfc();
+                org.onap.appc.sdc.artifacts.object.Vnfc vnfc = new org.onap.appc.sdc.artifacts.object.Vnfc();
                 vnfc.setVnfcType(node.getChild().getVnfcType());
                 vnfc.setMandatory(node.getChild().isMandatory());
                 vnfc.setResilienceType(node.getChild().getResilienceType());
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/AbstractArtifactProcessor.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/AbstractArtifactProcessor.java
index 06bda8b2d..7438d3047 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/AbstractArtifactProcessor.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/AbstractArtifactProcessor.java
@@ -22,20 +22,20 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.artifacts.impl;
-
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.adapter.message.MessageDestination;
-import org.openecomp.appc.adapter.message.event.EventHeader;
-import org.openecomp.appc.adapter.message.event.EventMessage;
-import org.openecomp.appc.adapter.message.event.EventStatus;
-import org.openecomp.appc.sdc.listener.Util;
-import org.openecomp.appc.exceptions.APPCException;
+package org.onap.appc.sdc.artifacts.impl;
+
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.adapter.message.MessageDestination;
+import org.onap.appc.adapter.message.event.EventHeader;
+import org.onap.appc.adapter.message.event.EventMessage;
+import org.onap.appc.adapter.message.event.EventStatus;
+import org.onap.appc.sdc.listener.Util;
+import org.onap.appc.exceptions.APPCException;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.sdc.artifacts.ArtifactProcessor;
-import org.openecomp.appc.sdc.artifacts.helper.ArtifactStorageService;
-import org.openecomp.appc.sdc.artifacts.object.SDCArtifact;
+import org.onap.appc.sdc.artifacts.ArtifactProcessor;
+import org.onap.appc.sdc.artifacts.helper.ArtifactStorageService;
+import org.onap.appc.sdc.artifacts.object.SDCArtifact;
 import org.openecomp.sdc.api.IDistributionClient;
 import org.openecomp.sdc.api.notification.IArtifactInfo;
 import org.openecomp.sdc.api.notification.INotificationData;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ArtifactProcessorFactory.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ArtifactProcessorFactory.java
index ba01cbc24..293974b79 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ArtifactProcessorFactory.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ArtifactProcessorFactory.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.artifacts.impl;
+package org.onap.appc.sdc.artifacts.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.sdc.artifacts.ArtifactProcessor;
-import org.openecomp.appc.sdc.artifacts.object.ArtifactType;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.sdc.artifacts.ArtifactProcessor;
+import org.onap.appc.sdc.artifacts.object.ArtifactType;
 import org.openecomp.sdc.api.IDistributionClient;
 import org.openecomp.sdc.api.notification.IArtifactInfo;
 import org.openecomp.sdc.api.notification.INotificationData;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ConfigArtifactProcessor.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ConfigArtifactProcessor.java
index 3baca3574..41230ea30 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ConfigArtifactProcessor.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ConfigArtifactProcessor.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.artifacts.impl;
+package org.onap.appc.sdc.artifacts.impl;
 
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.sdc.listener.ProviderOperations;
-import org.openecomp.appc.sdc.listener.ProviderResponse;
-import org.openecomp.appc.sdc.listener.Util;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.sdc.listener.ProviderOperations;
+import org.onap.appc.sdc.listener.ProviderResponse;
+import org.onap.appc.sdc.listener.Util;
+import org.onap.appc.exceptions.APPCException;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.sdc.artifacts.object.SDCArtifact;
+import org.onap.appc.sdc.artifacts.object.SDCArtifact;
 import org.openecomp.sdc.api.IDistributionClient;
 import org.openecomp.sdc.api.notification.IArtifactInfo;
 import org.openecomp.sdc.api.notification.INotificationData;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/LicenseArtifactProcessor.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/LicenseArtifactProcessor.java
index 21b32dc8e..fe5099785 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/LicenseArtifactProcessor.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/LicenseArtifactProcessor.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.artifacts.impl;
+package org.onap.appc.sdc.artifacts.impl;
 
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.licmgr.Constants;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.licmgr.Constants;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.apache.commons.lang.StringUtils;
-import org.openecomp.appc.sdc.artifacts.object.SDCArtifact;
+import org.onap.appc.sdc.artifacts.object.SDCArtifact;
 import org.openecomp.sdc.api.IDistributionClient;
 import org.openecomp.sdc.api.notification.IArtifactInfo;
 import org.openecomp.sdc.api.notification.INotificationData;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ToscaCsarArtifactProcessor.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ToscaCsarArtifactProcessor.java
index ff3ee5509..e38188432 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ToscaCsarArtifactProcessor.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ToscaCsarArtifactProcessor.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.artifacts.impl;
+package org.onap.appc.sdc.artifacts.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -30,13 +30,13 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import org.apache.commons.lang.StringUtils;
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.licmgr.Constants;
-import org.openecomp.appc.sdc.artifacts.helper.DependencyModelGenerator;
-import org.openecomp.appc.sdc.artifacts.object.Resource;
-import org.openecomp.appc.sdc.artifacts.object.SDCArtifact;
-import org.openecomp.appc.sdc.artifacts.object.SDCReference;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.licmgr.Constants;
+import org.onap.appc.sdc.artifacts.helper.DependencyModelGenerator;
+import org.onap.appc.sdc.artifacts.object.Resource;
+import org.onap.appc.sdc.artifacts.object.SDCArtifact;
+import org.onap.appc.sdc.artifacts.object.SDCReference;
 import org.openecomp.sdc.api.IDistributionClient;
 import org.openecomp.sdc.api.notification.IArtifactInfo;
 import org.openecomp.sdc.api.notification.INotificationData;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/ArtifactType.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/ArtifactType.java
index 1ff62385d..790ad2381 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/ArtifactType.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/ArtifactType.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.artifacts.object;
+package org.onap.appc.sdc.artifacts.object;
 
 /**
  * Enummration listing SDC artifact types
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Resource.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Resource.java
index 42716dc47..6ae441c18 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Resource.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Resource.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.artifacts.object;
+package org.onap.appc.sdc.artifacts.object;
 
 public class Resource {
     private String name;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCArtifact.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCArtifact.java
index 6cba5b2a2..d5376b570 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCArtifact.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCArtifact.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.artifacts.object;
+package org.onap.appc.sdc.artifacts.object;
 
 /**
  * POJO containing metadata about SDC artifact
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCReference.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCReference.java
index b9d630026..2ee6d7c85 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCReference.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCReference.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.artifacts.object;
+package org.onap.appc.sdc.artifacts.object;
 
 public class SDCReference {
 
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Vnfc.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Vnfc.java
index 47d5f4516..3e0d3a749 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Vnfc.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Vnfc.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.artifacts.object;
+package org.onap.appc.sdc.artifacts.object;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderOperations.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderOperations.java
index c644930e4..fa8340ac7 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderOperations.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderOperations.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -61,7 +61,7 @@ import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.HTTP;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderResponse.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderResponse.java
index cc21cea0c..bf91332c5 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderResponse.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderResponse.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
 
 public class ProviderResponse {
 
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcCallback.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcCallback.java
index 268a7f29a..8be458200 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcCallback.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcCallback.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.sdc.artifacts.ArtifactProcessor;
-import org.openecomp.appc.sdc.artifacts.impl.ArtifactProcessorFactory;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.sdc.artifacts.ArtifactProcessor;
+import org.onap.appc.sdc.artifacts.impl.ArtifactProcessorFactory;
 import org.openecomp.sdc.api.IDistributionClient;
 import org.openecomp.sdc.api.consumer.INotificationCallback;
 import org.openecomp.sdc.api.notification.IArtifactInfo;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcConfig.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcConfig.java
index 37b32d9bf..86ba9e1f5 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcConfig.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcConfig.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcListener.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcListener.java
index dccc95841..b204a54f7 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcListener.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcListener.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.openecomp.sdc.api.IDistributionClient;
 import org.openecomp.sdc.api.results.IDistributionClientResult;
 import org.openecomp.sdc.impl.DistributionClientFactory;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/Util.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/Util.java
index 2dbb66e30..bc4b4a896 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/Util.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/Util.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
 import org.openecomp.sdc.utils.DistributionStatusEnum;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.openecomp.sdc.api.IDistributionClient;
 import org.openecomp.sdc.api.consumer.IDistributionStatusMessage;
 import org.openecomp.sdc.api.notification.IArtifactInfo;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 3f0eacc88..449211013 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -31,12 +31,12 @@
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
 
-    <bean id="SdcListener" class="org.openecomp.appc.sdc.listener.SdcListener" init-method="start" destroy-method="stop" scope="singleton" activation="eager">
+    <bean id="SdcListener" class="org.onap.appc.sdc.listener.SdcListener" init-method="start" destroy-method="stop" scope="singleton" activation="eager">
     </bean>
 
     <!--
-    <bean id="SdcListenerBean" class="org.openecomp.appc.sdc.listener.impl.SdcListenerBean" init-method="start" destroy-method="stop" activation="eager" scope="singleton" />
-    <service SdcListenerener" interfaorg.openecomp.appc.sdc.listener.SdcListenerner" ref="SdcListenerBean"/>
+    <bean id="SdcListenerBean" class="org.onap.appc.sdc.listener.impl.SdcListenerBean" init-method="start" destroy-method="stop" activation="eager" scope="singleton" />
+    <service SdcListenerener" interfaorg.onap.appc.sdc.listener.SdcListenerner" ref="SdcListenerBean"/>
     -->
 
 </blueprint>
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/org/openecomp/appc/default.properties
index 20cbbbcb0..f8c5e8e2e 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -22,8 +22,8 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 # These SDC properties were provided by the SDC Op-So team
 appc.sdc.keystore.path=etc/sdc-client.jks
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestArtifactProcessor.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestArtifactProcessor.java
index 50fcb663c..8253238e8 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestArtifactProcessor.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestArtifactProcessor.java
@@ -1,11 +1,11 @@
-package org.openecomp.appc.sdc.artifacts.impl;
+package org.onap.appc.sdc.artifacts.impl;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.sdc.artifacts.object.SDCArtifact;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.sdc.artifacts.object.SDCArtifact;
 import org.openecomp.sdc.api.IDistributionClient;
 import org.openecomp.sdc.api.notification.IArtifactInfo;
 import org.openecomp.sdc.api.notification.INotificationData;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestLicenseArtifactProcessor.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestLicenseArtifactProcessor.java
index 03aa92447..f4cbc6a74 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestLicenseArtifactProcessor.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestLicenseArtifactProcessor.java
@@ -1,14 +1,14 @@
-package org.openecomp.appc.sdc.artifacts.impl;
+package org.onap.appc.sdc.artifacts.impl;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.sdc.artifacts.helper.ArtifactStorageService;
-import org.openecomp.appc.sdc.artifacts.object.SDCArtifact;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.sdc.artifacts.helper.ArtifactStorageService;
+import org.onap.appc.sdc.artifacts.object.SDCArtifact;
 import org.openecomp.sdc.api.IDistributionClient;
 import org.openecomp.sdc.api.notification.IArtifactInfo;
 import org.openecomp.sdc.api.notification.INotificationData;
@@ -47,7 +47,7 @@ public class TestLicenseArtifactProcessor {
         PowerMockito.doNothing().when(storageService).storeSDCArtifact(Matchers.anyObject());
     }
 
-    @Test(expected = org.openecomp.appc.exceptions.APPCException.class)
+    @Test(expected = org.onap.appc.exceptions.APPCException.class)
     public void testProcessArtifactWithMissingData() throws APPCException {
         SDCArtifact artifact=new SDCArtifact();
         artifact.setResourceVersion("RESOURCE VERSION");
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcCallbackTest.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcCallbackTest.java
index 32b7f8d37..1333ac022 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcCallbackTest.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcCallbackTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
 
 
 import org.junit.Assert;
@@ -31,13 +31,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.sdc.artifacts.helper.ArtifactStorageService;
-import org.openecomp.appc.sdc.artifacts.helper.DependencyModelGenerator;
-import org.openecomp.appc.sdc.artifacts.impl.ArtifactProcessorFactory;
-import org.openecomp.appc.sdc.artifacts.impl.ToscaCsarArtifactProcessor;
-import org.openecomp.appc.sdc.artifacts.object.SDCArtifact;
-import org.openecomp.appc.sdc.artifacts.object.SDCReference;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.sdc.artifacts.helper.ArtifactStorageService;
+import org.onap.appc.sdc.artifacts.helper.DependencyModelGenerator;
+import org.onap.appc.sdc.artifacts.impl.ArtifactProcessorFactory;
+import org.onap.appc.sdc.artifacts.impl.ToscaCsarArtifactProcessor;
+import org.onap.appc.sdc.artifacts.object.SDCArtifact;
+import org.onap.appc.sdc.artifacts.object.SDCReference;
 import org.openecomp.sdc.api.IDistributionClient;
 import org.openecomp.sdc.api.consumer.INotificationCallback;
 import org.openecomp.sdc.api.notification.IArtifactInfo;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcListenerTest.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcListenerTest.java
index 428aa8e86..7b60ce460 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcListenerTest.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcListenerTest.java
@@ -21,7 +21,7 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
 
 import com.att.eelf.configuration.EELFLogger;
 import org.junit.Assert;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestObjects.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestObjects.java
index 743468f3c..49c93d0a9 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestObjects.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestObjects.java
@@ -1,8 +1,8 @@
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.sdc.artifacts.object.Vnfc;
+import org.onap.appc.sdc.artifacts.object.Vnfc;
 
 public class SdcTestObjects {
 
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestUtils.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestUtils.java
index 62b96c0c4..7f2a01a7a 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestUtils.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestUtils.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/TestRun.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/TestRun.java
index 84337e471..4b673318c 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/TestRun.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/TestRun.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
 
 import org.junit.Test;
 
diff --git a/appc-sdc-listener/appc-sdc-listener-features/pom.xml b/appc-sdc-listener/appc-sdc-listener-features/pom.xml
index 278fd3784..7b7d91872 100644
--- a/appc-sdc-listener/appc-sdc-listener-features/pom.xml
+++ b/appc-sdc-listener/appc-sdc-listener-features/pom.xml
@@ -26,7 +26,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-sdc-listener</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>appc-sdc-listener-features</artifactId>
@@ -36,7 +36,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-sdc-listener-bundle</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-sdc-listener/appc-sdc-listener-features/src/main/resources/features.xml b/appc-sdc-listener/appc-sdc-listener-features/src/main/resources/features.xml
index 76a068ed7..7aae496e7 100644
--- a/appc-sdc-listener/appc-sdc-listener-features/src/main/resources/features.xml
+++ b/appc-sdc-listener/appc-sdc-listener-features/src/main/resources/features.xml
@@ -34,8 +34,8 @@
     <feature name='appc-sdc-listener' description="sdc listener" version='${project.version}'>
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-        <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-sdc-listener-bundle/${project.version}</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-sdc-listener-bundle/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-sdc-listener/appc-sdc-listener-installer/pom.xml b/appc-sdc-listener/appc-sdc-listener-installer/pom.xml
index f63adb453..91d92b8aa 100644
--- a/appc-sdc-listener/appc-sdc-listener-installer/pom.xml
+++ b/appc-sdc-listener/appc-sdc-listener-installer/pom.xml
@@ -26,7 +26,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-sdc-listener</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>appc-sdc-listener-installer</artifactId>
@@ -36,14 +36,14 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 	<properties>
 		<application.name>appc-sdc-listener</application.name>
 		<features.boot>appc-sdc-listener</features.boot>
-		<features.repositories>mvn:org.openecomp.appc/appc-sdc-listener-features/${project.version}/xml/features</features.repositories>
+		<features.repositories>mvn:org.onap.appc/appc-sdc-listener-features/${project.version}/xml/features</features.repositories>
 		<include.transitive.dependencies>false</include.transitive.dependencies>
 	</properties>
 
 	<dependencies>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-sdc-listener-features</artifactId>
 			<version>${project.version}</version>
 			<classifier>features</classifier>
@@ -57,7 +57,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-sdc-listener-bundle</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-sdc-listener/appc-yang-generator/pom.xml b/appc-sdc-listener/appc-yang-generator/pom.xml
index 9664973dc..413698ff9 100644
--- a/appc-sdc-listener/appc-yang-generator/pom.xml
+++ b/appc-sdc-listener/appc-yang-generator/pom.xml
@@ -28,7 +28,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>appc-sdc-listener</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
diff --git a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/YANGGenerator.java b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/YANGGenerator.java
index 562c4abf2..e0ad22a54 100644
--- a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/YANGGenerator.java
+++ b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/YANGGenerator.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.yang;
+package org.onap.appc.yang;
 
-import org.openecomp.appc.yang.exception.YANGGenerationException;
+import org.onap.appc.yang.exception.YANGGenerationException;
 
 import java.io.OutputStream;
 
diff --git a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/exception/YANGGenerationException.java b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/exception/YANGGenerationException.java
index a37d6f685..690a2fda6 100644
--- a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/exception/YANGGenerationException.java
+++ b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/exception/YANGGenerationException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.yang.exception;
+package org.onap.appc.yang.exception;
 
 /**
  * The Class YANGGenerationException.
diff --git a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorFactory.java b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorFactory.java
index 25d9b211a..fe278d412 100644
--- a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorFactory.java
+++ b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorFactory.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.yang.impl;
+package org.onap.appc.yang.impl;
 
-import org.openecomp.appc.yang.YANGGenerator;
+import org.onap.appc.yang.YANGGenerator;
 
 /**
  * A factory for creating YANGGenerator objects.
diff --git a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorImpl.java b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorImpl.java
index 246563932..55ff41cbd 100644
--- a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorImpl.java
+++ b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.yang.impl;
+package org.onap.appc.yang.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -35,10 +35,10 @@ import org.apache.velocity.exception.ResourceNotFoundException;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl;
-import org.openecomp.appc.yang.YANGGenerator;
-import org.openecomp.appc.yang.exception.YANGGenerationException;
-import org.openecomp.appc.yang.objects.Leaf;
-import org.openecomp.appc.yang.type.YangTypes;
+import org.onap.appc.yang.YANGGenerator;
+import org.onap.appc.yang.exception.YANGGenerationException;
+import org.onap.appc.yang.objects.Leaf;
+import org.onap.appc.yang.type.YangTypes;
 import org.openecomp.sdc.tosca.datatypes.model.NodeType;
 import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition;
 import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
@@ -59,7 +59,7 @@ public class YANGGeneratorImpl implements YANGGenerator {
 
 
 	/* (non-Javadoc)
-	 * @see org.openecomp.appc.yang.YANGGenerator#generateYANG(java.lang.String, java.lang.String, java.io.OutputStream)
+	 * @see org.onap.appc.yang.YANGGenerator#generateYANG(java.lang.String, java.lang.String, java.io.OutputStream)
 	 */
 	@Override
 	public void generateYANG(String uniqueID, String tosca, OutputStream stream)
diff --git a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/objects/Leaf.java b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/objects/Leaf.java
index 013e31475..2ec66b680 100644
--- a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/objects/Leaf.java
+++ b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/objects/Leaf.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.yang.objects;
+package org.onap.appc.yang.objects;
 
 public class Leaf {
 	private String name;
diff --git a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/type/YangTypes.java b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/type/YangTypes.java
index ca18c4311..97fb9973d 100644
--- a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/type/YangTypes.java
+++ b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/type/YangTypes.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.yang.type;
+package org.onap.appc.yang.type;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/appc-sdc-listener/appc-yang-generator/src/main/resources/templates/YangTemplate.vm b/appc-sdc-listener/appc-yang-generator/src/main/resources/templates/YangTemplate.vm
index ab608c5e1..45bef9d62 100644
--- a/appc-sdc-listener/appc-yang-generator/src/main/resources/templates/YangTemplate.vm
+++ b/appc-sdc-listener/appc-yang-generator/src/main/resources/templates/YangTemplate.vm
@@ -1,6 +1,6 @@
 module $moduleName {
 	yang-version 1;
-	namespace "org:openecomp:appc:vnf:$moduleName";
+	namespace "org:onap:appc:vnf:$moduleName";
     prefix appc-vnf;
     organization "Copyright 2017 AT&T Intellectual Property.";
 
diff --git a/appc-sdc-listener/appc-yang-generator/src/test/java/org/openecomp/appc/TestYANGGenerator.java b/appc-sdc-listener/appc-yang-generator/src/test/java/org/openecomp/appc/TestYANGGenerator.java
index a4487ac52..21130ee25 100644
--- a/appc-sdc-listener/appc-yang-generator/src/test/java/org/openecomp/appc/TestYANGGenerator.java
+++ b/appc-sdc-listener/appc-yang-generator/src/test/java/org/openecomp/appc/TestYANGGenerator.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc;
+package org.onap.appc;
 
 import org.junit.*;
 import org.junit.rules.TemporaryFolder;
-import org.openecomp.appc.yang.YANGGenerator;
-import org.openecomp.appc.yang.exception.YANGGenerationException;
-import org.openecomp.appc.yang.impl.YANGGeneratorFactory;
+import org.onap.appc.yang.YANGGenerator;
+import org.onap.appc.yang.exception.YANGGenerationException;
+import org.onap.appc.yang.impl.YANGGeneratorFactory;
 
 import java.io.*;
 
diff --git a/appc-sdc-listener/appc-yang-generator/src/test/resources/yang/expectedYang.yang b/appc-sdc-listener/appc-yang-generator/src/test/resources/yang/expectedYang.yang
index 29c89182b..57aeacf53 100644
--- a/appc-sdc-listener/appc-yang-generator/src/test/resources/yang/expectedYang.yang
+++ b/appc-sdc-listener/appc-yang-generator/src/test/resources/yang/expectedYang.yang
@@ -24,7 +24,7 @@
 
 module ATD456 {
 	yang-version 1;
-	namespace "org:openecomp:appc:vnf:ATD456";
+	namespace "org:onap:appc:vnf:ATD456";
     prefix appc-vnf;
     organization "Copyright 2017 AT&T Intellectual Property.";
 
diff --git a/appc-sdc-listener/pom.xml b/appc-sdc-listener/pom.xml
index 7fb0d19a2..12f831730 100644
--- a/appc-sdc-listener/pom.xml
+++ b/appc-sdc-listener/pom.xml
@@ -25,7 +25,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml b/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml
index 34ef775bd..949dada31 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml
@@ -4,7 +4,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-sequence-generator</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -22,9 +22,9 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>appc-sequence-generator-bundle</Bundle-SymbolicName>
-                        <!--                        <Bundle-Activator>org.openecomp.appc.seqgen.SequenceGeneratorActivator</Bundle-Activator>-->
-                        <Export-Package>org.openecomp.appc.seqgen.*</Export-Package>
-                        <Import-Package>org.openecomp.appc.domainmodel.lcm,*;resolution:=optional</Import-Package>
+                        <!--                        <Bundle-Activator>org.onap.appc.seqgen.SequenceGeneratorActivator</Bundle-Activator>-->
+                        <Export-Package>org.onap.appc.seqgen.*</Export-Package>
+                        <Import-Package>org.onap.appc.domainmodel.lcm,*;resolution:=optional</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
                         <Embed-Transitive>true</Embed-Transitive>
                     </instructions>
@@ -143,7 +143,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-dg-dependency-model</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -168,18 +168,18 @@
             <artifactId>sli-provider</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-dg-domain-model-lib</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>domain-model-lib</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-sequence-generator-model</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/sequencegenerator/impl/rev170706/SequenceGeneratorModule.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/sequencegenerator/impl/rev170706/SequenceGeneratorModule.java
index 7fa1dcb4e..9de0289ea 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/sequencegenerator/impl/rev170706/SequenceGeneratorModule.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/sequencegenerator/impl/rev170706/SequenceGeneratorModule.java
@@ -18,16 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.impl.rev170706;
+package org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.impl.rev170706;
 
-import org.openecomp.appc.seqgen.provider.SequenceGeneratorProvider;
+import org.onap.appc.seqgen.provider.SequenceGeneratorProvider;
 
-public class SequenceGeneratorModule extends org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.impl.rev170706.AbstractSequenceGeneratorModule {
+public class SequenceGeneratorModule extends org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.impl.rev170706.AbstractSequenceGeneratorModule {
     public SequenceGeneratorModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
 
-    public SequenceGeneratorModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.impl.rev170706.SequenceGeneratorModule oldModule, java.lang.AutoCloseable oldInstance) {
+    public SequenceGeneratorModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.impl.rev170706.SequenceGeneratorModule oldModule, java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/sequencegenerator/impl/rev170706/SequenceGeneratorModuleFactory.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/sequencegenerator/impl/rev170706/SequenceGeneratorModuleFactory.java
index 3ebba2076..3ebd11b05 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/sequencegenerator/impl/rev170706/SequenceGeneratorModuleFactory.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/sequencegenerator/impl/rev170706/SequenceGeneratorModuleFactory.java
@@ -27,7 +27,7 @@
 *
 * Do not modify this file unless it is present under src/main directory
 */
-package org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.impl.rev170706;
-public class SequenceGeneratorModuleFactory extends org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.impl.rev170706.AbstractSequenceGeneratorModuleFactory {
+package org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.impl.rev170706;
+public class SequenceGeneratorModuleFactory extends org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.impl.rev170706.AbstractSequenceGeneratorModuleFactory {
 
 }
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/SequenceGenerator.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/SequenceGenerator.java
index 0eba668ef..709e4e31b 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/SequenceGenerator.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/SequenceGenerator.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.seqgen;
+package org.onap.appc.seqgen;
 
 
-import org.openecomp.appc.dg.objects.VnfcFlowModel;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.seqgen.objects.SequenceGeneratorInput;
-import org.openecomp.appc.seqgen.objects.Transaction;
+import org.onap.appc.dg.objects.VnfcFlowModel;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.seqgen.objects.SequenceGeneratorInput;
+import org.onap.appc.seqgen.objects.Transaction;
 
 import java.util.List;
 import java.util.Map;
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/dgplugin/SequenceGeneratorPlugin.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/dgplugin/SequenceGeneratorPlugin.java
index afe3810cf..26260d22f 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/dgplugin/SequenceGeneratorPlugin.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/dgplugin/SequenceGeneratorPlugin.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.seqgen.dgplugin;
+package org.onap.appc.seqgen.dgplugin;
 
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/dgplugin/impl/SequenceGeneratorPluginImpl.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/dgplugin/impl/SequenceGeneratorPluginImpl.java
index a89e8b272..c0ea4134c 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/dgplugin/impl/SequenceGeneratorPluginImpl.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/dgplugin/impl/SequenceGeneratorPluginImpl.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.seqgen.dgplugin.impl;
+package org.onap.appc.seqgen.dgplugin.impl;
 
 
 import com.att.eelf.configuration.EELFLogger;
@@ -28,18 +28,18 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.dg.objects.*;
-import org.openecomp.appc.domainmodel.Vnf;
-import org.openecomp.appc.domainmodel.Vnfc;
-import org.openecomp.appc.domainmodel.Vserver;
-import org.openecomp.appc.domainmodel.lcm.VNFOperation;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.seqgen.SequenceGenerator;
-import org.openecomp.appc.seqgen.dgplugin.SequenceGeneratorPlugin;
-import org.openecomp.appc.seqgen.impl.SequenceGeneratorFactory;
-import org.openecomp.appc.seqgen.objects.Constants;
-import org.openecomp.appc.seqgen.objects.SequenceGeneratorInput;
-import org.openecomp.appc.seqgen.objects.Transaction;
+import org.onap.appc.dg.objects.*;
+import org.onap.appc.domainmodel.Vnf;
+import org.onap.appc.domainmodel.Vnfc;
+import org.onap.appc.domainmodel.Vserver;
+import org.onap.appc.domainmodel.lcm.VNFOperation;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.seqgen.SequenceGenerator;
+import org.onap.appc.seqgen.dgplugin.SequenceGeneratorPlugin;
+import org.onap.appc.seqgen.impl.SequenceGeneratorFactory;
+import org.onap.appc.seqgen.objects.Constants;
+import org.onap.appc.seqgen.objects.SequenceGeneratorInput;
+import org.onap.appc.seqgen.objects.Transaction;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import java.io.IOException;
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/SequenceGeneratorFactory.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/SequenceGeneratorFactory.java
index 5d41fffe1..3c6a11962 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/SequenceGeneratorFactory.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/SequenceGeneratorFactory.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.seqgen.impl;
+package org.onap.appc.seqgen.impl;
 
-import org.openecomp.appc.domainmodel.lcm.VNFOperation;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.seqgen.SequenceGenerator;
+import org.onap.appc.domainmodel.lcm.VNFOperation;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.seqgen.SequenceGenerator;
 
 public class SequenceGeneratorFactory {
 
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/StartSequenceGenerator.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/StartSequenceGenerator.java
index 73e1b843f..dcffaafd8 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/StartSequenceGenerator.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/StartSequenceGenerator.java
@@ -18,26 +18,26 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.seqgen.impl;
+package org.onap.appc.seqgen.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.dg.flowbuilder.FlowBuilder;
-import org.openecomp.appc.dg.flowbuilder.impl.FlowBuilderFactory;
-import org.openecomp.appc.dg.objects.FlowStrategies;
-import org.openecomp.appc.dg.objects.InventoryModel;
-import org.openecomp.appc.dg.objects.VnfcDependencyModel;
-import org.openecomp.appc.dg.objects.VnfcFlowModel;
-import org.openecomp.appc.domainmodel.Vnfc;
-import org.openecomp.appc.domainmodel.Vserver;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.seqgen.SequenceGenerator;
-import org.openecomp.appc.seqgen.objects.*;
+import org.onap.appc.dg.flowbuilder.FlowBuilder;
+import org.onap.appc.dg.flowbuilder.impl.FlowBuilderFactory;
+import org.onap.appc.dg.objects.FlowStrategies;
+import org.onap.appc.dg.objects.InventoryModel;
+import org.onap.appc.dg.objects.VnfcDependencyModel;
+import org.onap.appc.dg.objects.VnfcFlowModel;
+import org.onap.appc.domainmodel.Vnfc;
+import org.onap.appc.domainmodel.Vserver;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.seqgen.SequenceGenerator;
+import org.onap.appc.seqgen.objects.*;
 
 import java.util.*;
 
-import static org.openecomp.appc.seqgen.objects.Constants.*;
+import static org.onap.appc.seqgen.objects.Constants.*;
 
 public class StartSequenceGenerator implements SequenceGenerator {
 
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/StopSequenceGenerator.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/StopSequenceGenerator.java
index 51edb99bf..77bee6b83 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/StopSequenceGenerator.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/StopSequenceGenerator.java
@@ -18,26 +18,26 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.seqgen.impl;
+package org.onap.appc.seqgen.impl;
 
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.dg.flowbuilder.FlowBuilder;
-import org.openecomp.appc.dg.flowbuilder.impl.FlowBuilderFactory;
-import org.openecomp.appc.dg.objects.FlowStrategies;
-import org.openecomp.appc.dg.objects.InventoryModel;
-import org.openecomp.appc.dg.objects.VnfcDependencyModel;
-import org.openecomp.appc.dg.objects.VnfcFlowModel;
-import org.openecomp.appc.domainmodel.Vnfc;
-import org.openecomp.appc.domainmodel.Vserver;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.seqgen.SequenceGenerator;
-import org.openecomp.appc.seqgen.objects.*;
+import org.onap.appc.dg.flowbuilder.FlowBuilder;
+import org.onap.appc.dg.flowbuilder.impl.FlowBuilderFactory;
+import org.onap.appc.dg.objects.FlowStrategies;
+import org.onap.appc.dg.objects.InventoryModel;
+import org.onap.appc.dg.objects.VnfcDependencyModel;
+import org.onap.appc.dg.objects.VnfcFlowModel;
+import org.onap.appc.domainmodel.Vnfc;
+import org.onap.appc.domainmodel.Vserver;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.seqgen.SequenceGenerator;
+import org.onap.appc.seqgen.objects.*;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
 import java.util.*;
 
-import static org.openecomp.appc.seqgen.objects.Constants.*;
+import static org.onap.appc.seqgen.objects.Constants.*;
 
 public class StopSequenceGenerator implements SequenceGenerator {
 
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/ActionIdentifier.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/ActionIdentifier.java
index ae3ed942d..0703edf42 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/ActionIdentifier.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/ActionIdentifier.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.seqgen.objects;
+package org.onap.appc.seqgen.objects;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Constants.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Constants.java
index 354145f02..476c5b718 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Constants.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Constants.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.seqgen.objects;
+package org.onap.appc.seqgen.objects;
 
 public class Constants {
     public static final String RETRY_COUNT = "retry-count";
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/PreCheckOption.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/PreCheckOption.java
index 860fac7e2..00d079b00 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/PreCheckOption.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/PreCheckOption.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.seqgen.objects;
+package org.onap.appc.seqgen.objects;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/RequestInfo.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/RequestInfo.java
index 697e13e3b..1704d274f 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/RequestInfo.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/RequestInfo.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.seqgen.objects;
+package org.onap.appc.seqgen.objects;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/RequestInfoBuilder.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/RequestInfoBuilder.java
index 70d4e9a0c..4fad00013 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/RequestInfoBuilder.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/RequestInfoBuilder.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.seqgen.objects;
+package org.onap.appc.seqgen.objects;
 
 public class RequestInfoBuilder {
 
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Response.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Response.java
index 9247e6e7f..ba3ccd400 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Response.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Response.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.seqgen.objects;
+package org.onap.appc.seqgen.objects;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/SequenceGeneratorInput.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/SequenceGeneratorInput.java
index 851a07582..d3f6a6d14 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/SequenceGeneratorInput.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/SequenceGeneratorInput.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.seqgen.objects;
+package org.onap.appc.seqgen.objects;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import org.openecomp.appc.dg.objects.InventoryModel;
-import org.openecomp.appc.dg.objects.VnfcDependencyModel;
+import org.onap.appc.dg.objects.InventoryModel;
+import org.onap.appc.dg.objects.VnfcDependencyModel;
 
 import javax.validation.constraints.NotNull;
 import java.util.List;
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/SequenceGeneratorInputBuilder.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/SequenceGeneratorInputBuilder.java
index b72e46e7e..66cb111b5 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/SequenceGeneratorInputBuilder.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/SequenceGeneratorInputBuilder.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.seqgen.objects;
+package org.onap.appc.seqgen.objects;
 
-import org.openecomp.appc.dg.objects.InventoryModel;
-import org.openecomp.appc.dg.objects.VnfcDependencyModel;
+import org.onap.appc.dg.objects.InventoryModel;
+import org.onap.appc.dg.objects.VnfcDependencyModel;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Transaction.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Transaction.java
index b49d1323a..ce45ec9e5 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Transaction.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Transaction.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.seqgen.objects;
+package org.onap.appc.seqgen.objects;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/provider/SequenceGeneratorProvider.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/provider/SequenceGeneratorProvider.java
index b3aab54e1..ad9a68705 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/provider/SequenceGeneratorProvider.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/provider/SequenceGeneratorProvider.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.seqgen.provider;
+package org.onap.appc.seqgen.provider;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -28,30 +28,30 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.GenerateSequenceInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.GenerateSequenceOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.GenerateSequenceOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.SequenceGeneratorService;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.dependency.info.dependency.info.Vnfcs;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.inventory.info.inventory.info.vnf.info.Vm;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.response.StatusBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.response.Transactions;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.response.TransactionsBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.response.transactions.ActionIdentifier;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.response.transactions.*;
-import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.response.transactions.responses.ResponseActionBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.GenerateSequenceInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.GenerateSequenceOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.GenerateSequenceOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.SequenceGeneratorService;
+import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.dependency.info.dependency.info.Vnfcs;
+import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.inventory.info.inventory.info.vnf.info.Vm;
+import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.response.StatusBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.response.Transactions;
+import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.response.TransactionsBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.response.transactions.ActionIdentifier;
+import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.response.transactions.*;
+import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.response.transactions.responses.ResponseActionBuilder;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-import org.openecomp.appc.dg.objects.InventoryModel;
-import org.openecomp.appc.dg.objects.Node;
-import org.openecomp.appc.dg.objects.VnfcDependencyModel;
-import org.openecomp.appc.domainmodel.Vnf;
-import org.openecomp.appc.domainmodel.Vserver;
-import org.openecomp.appc.domainmodel.lcm.VNFOperation;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.seqgen.SequenceGenerator;
-import org.openecomp.appc.seqgen.impl.SequenceGeneratorFactory;
-import org.openecomp.appc.seqgen.objects.*;
+import org.onap.appc.dg.objects.InventoryModel;
+import org.onap.appc.dg.objects.Node;
+import org.onap.appc.dg.objects.VnfcDependencyModel;
+import org.onap.appc.domainmodel.Vnf;
+import org.onap.appc.domainmodel.Vserver;
+import org.onap.appc.domainmodel.lcm.VNFOperation;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.seqgen.SequenceGenerator;
+import org.onap.appc.seqgen.impl.SequenceGeneratorFactory;
+import org.onap.appc.seqgen.objects.*;
 
 import java.util.*;
 import java.util.concurrent.ExecutorService;
@@ -263,12 +263,12 @@ public class SequenceGeneratorProvider implements AutoCloseable,SequenceGenerato
             return null;
         }
         List<Vnfcs> vnfcs = input.getDependencyInfo().getVnfcs();
-        Set<Node<org.openecomp.appc.domainmodel.Vnfc>> dependencies = new HashSet<>();
+        Set<Node<org.onap.appc.domainmodel.Vnfc>> dependencies = new HashSet<>();
         for(Vnfcs vnfcObj:vnfcs){
-            org.openecomp.appc.domainmodel.Vnfc vnfc;
-            Node<org.openecomp.appc.domainmodel.Vnfc> currentNode = readNode(vnfcObj.getVnfcType(),dependencies);
+            org.onap.appc.domainmodel.Vnfc vnfc;
+            Node<org.onap.appc.domainmodel.Vnfc> currentNode = readNode(vnfcObj.getVnfcType(),dependencies);
             if(currentNode == null){
-                vnfc = new org.openecomp.appc.domainmodel.Vnfc(vnfcObj.getVnfcType(),vnfcObj.getResilience());
+                vnfc = new org.onap.appc.domainmodel.Vnfc(vnfcObj.getVnfcType(),vnfcObj.getResilience());
                 currentNode = new Node<>(vnfc);
                 dependencies.add(currentNode);
             }
@@ -277,9 +277,9 @@ public class SequenceGeneratorProvider implements AutoCloseable,SequenceGenerato
                 currentNode.getChild().setMandatory(vnfcObj.isMandatory());
             }
             for(String parentVnfcType:vnfcObj.getParents()){
-                Node<org.openecomp.appc.domainmodel.Vnfc> parentNode = readNode(parentVnfcType,dependencies);
+                Node<org.onap.appc.domainmodel.Vnfc> parentNode = readNode(parentVnfcType,dependencies);
                 if(parentNode == null){
-                    org.openecomp.appc.domainmodel.Vnfc parentVnfc = new org.openecomp.appc.domainmodel.Vnfc(parentVnfcType,null);
+                    org.onap.appc.domainmodel.Vnfc parentVnfc = new org.onap.appc.domainmodel.Vnfc(parentVnfcType,null);
                     parentNode = new Node<>(parentVnfc);
                     currentNode.addParent(parentVnfc);
                     dependencies.add(parentNode);
@@ -292,8 +292,8 @@ public class SequenceGeneratorProvider implements AutoCloseable,SequenceGenerato
         return new VnfcDependencyModel(dependencies);
     }
 
-    private Node<org.openecomp.appc.domainmodel.Vnfc> readNode(String vnfcType, Set<Node<org.openecomp.appc.domainmodel.Vnfc>> dependencies) {
-        for(Node<org.openecomp.appc.domainmodel.Vnfc> node : dependencies){
+    private Node<org.onap.appc.domainmodel.Vnfc> readNode(String vnfcType, Set<Node<org.onap.appc.domainmodel.Vnfc>> dependencies) {
+        for(Node<org.onap.appc.domainmodel.Vnfc> node : dependencies){
             if(node.getChild().getVnfcType().equalsIgnoreCase(vnfcType)){
                 return node;
             }
@@ -309,7 +309,7 @@ public class SequenceGeneratorProvider implements AutoCloseable,SequenceGenerato
         Vnf vnf = new Vnf(input.getInventoryInfo().getVnfInfo().getVnfId(),
                 input.getInventoryInfo().getVnfInfo().getVnfType(),null);
 
-        Map<org.openecomp.appc.domainmodel.Vnfc,List<Vserver>> map = new HashMap<>();
+        Map<org.onap.appc.domainmodel.Vnfc,List<Vserver>> map = new HashMap<>();
         for(Vm vm:input.getInventoryInfo().getVnfInfo().getVm()){
             if(StringUtils.isBlank(vm.getVserverId())){
                 throw new APPCException("vserver-id not found ");
@@ -321,7 +321,7 @@ public class SequenceGeneratorProvider implements AutoCloseable,SequenceGenerato
                 throw new APPCException("vnfc-name not found for vserver " + vm.getVserverId());
             }
 
-            org.openecomp.appc.domainmodel.Vnfc vnfc = new org.openecomp.appc.domainmodel.Vnfc(vm.getVnfc().getVnfcType(),null,vm.getVnfc().getVnfcName());
+            org.onap.appc.domainmodel.Vnfc vnfc = new org.onap.appc.domainmodel.Vnfc(vm.getVnfc().getVnfcType(),null,vm.getVnfc().getVnfcName());
             List<Vserver> vms = map.get(vnfc);
             if(vms ==null){
                 vms = new LinkedList<>();
@@ -329,8 +329,8 @@ public class SequenceGeneratorProvider implements AutoCloseable,SequenceGenerato
             }
             vms.add(new Vserver(null,null,vm.getVserverId(),null,null));
         }
-        for(Map.Entry<org.openecomp.appc.domainmodel.Vnfc,List<Vserver>> entry:map.entrySet()){
-            org.openecomp.appc.domainmodel.Vnfc vnfc = entry.getKey();
+        for(Map.Entry<org.onap.appc.domainmodel.Vnfc,List<Vserver>> entry:map.entrySet()){
+            org.onap.appc.domainmodel.Vnfc vnfc = entry.getKey();
             List<Vserver> vmList = entry.getValue();
             vnfc.addVms(vmList);
             vnf.addVnfc(vnfc);
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 9422bd33a..02f56dd4d 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -23,7 +23,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
-    <bean id="sequenceGeneratorDGPlugin" class="org.openecomp.appc.seqgen.dgplugin.impl.SequenceGeneratorPluginImpl"/>
-    <service interface="org.openecomp.appc.seqgen.dgplugin.SequenceGeneratorPlugin" ref="sequenceGeneratorDGPlugin"/>
+    <bean id="sequenceGeneratorDGPlugin" class="org.onap.appc.seqgen.dgplugin.impl.SequenceGeneratorPluginImpl"/>
+    <service interface="org.onap.appc.seqgen.dgplugin.SequenceGeneratorPlugin" ref="sequenceGeneratorDGPlugin"/>
 
 </blueprint>
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/initial/appc-sequence-generator.xml b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/initial/appc-sequence-generator.xml
index fb48c2567..af586ac22 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/initial/appc-sequence-generator.xml
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/initial/appc-sequence-generator.xml
@@ -28,7 +28,7 @@
                 
                     <!-- This xmlns:prefix should match the namespace in the *-impl.yang file
                          The prefix: inside type should match the prefix of the yang file. -->
-                    <type xmlns:prefix="org:openecomp:appc:sequencegenerator:impl">
+                    <type xmlns:prefix="org:onap:appc:sequencegenerator:impl">
                         prefix:sequence-generator-impl
                     </type>
                     <name>sequence-generator-impl</name>
@@ -65,7 +65,7 @@
           our service can be resolved. Capabilities for dependencies defined above are implied which is
           why we do not have define a required capability for the data broker, for example. -->
     <required-capabilities>
-        <capability>org:openecomp:appc:sequencegenerator:impl?module=sequence-generator-impl&amp;revision=2017-07-06</capability>
+        <capability>org:onap:appc:sequencegenerator:impl?module=sequence-generator-impl&amp;revision=2017-07-06</capability>
     </required-capabilities>
 
 </snapshot>
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/org.openecomp.appc/default.properties b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/org.openecomp.appc/default.properties
index a3e3f8ac8..d9ba7a045 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/org.openecomp.appc/default.properties
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/org.openecomp.appc/default.properties
@@ -34,16 +34,16 @@
 #
 #--------------------------------------------------------------------------------------------
 # The path and file used to load user-supplied configuration settings, if any 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # The path to search for logging configuration document, and the name of the document 
 #
-org.openecomp.appc.logging.path=${user.home},etc,../etc,.
-org.openecomp.appc.logging.file=logback.xml 
+org.onap.appc.logging.path=${user.home},etc,../etc,.
+org.onap.appc.logging.file=logback.xml 
 
 # 
 # The DG properties 
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/org.openecomp.appc/logback.xml b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/org.openecomp.appc/logback.xml
index 0cefc8cf7..8e707e109 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/org.openecomp.appc/logback.xml
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/org.openecomp.appc/logback.xml
@@ -245,7 +245,7 @@
     </encoder>
   </appender>
 
-  <logger name="org.openecomp.appc" level="DEBUG" additivity="false">
+  <logger name="org.onap.appc" level="DEBUG" additivity="false">
     <appender-ref ref="CommandExecutor" />
   </logger>
 
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/yang/sequence-generator.yang b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/yang/sequence-generator.yang
index 50c00979b..eac669bae 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/yang/sequence-generator.yang
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/yang/sequence-generator.yang
@@ -1,7 +1,7 @@
 module sequence-generator-impl {
 
     yang-version 1;
-    namespace "org:openecomp:appc:sequencegenerator:impl";
+    namespace "org:onap:appc:sequencegenerator:impl";
     prefix "sequence-generator-impl";
 
     import config { prefix config; revision-date 2013-04-05; }
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/java/org/openecomp/appc/seqgen/TestSequenceGeneratorPlugin.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/java/org/openecomp/appc/seqgen/TestSequenceGeneratorPlugin.java
index 5ab75b634..748773a21 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/java/org/openecomp/appc/seqgen/TestSequenceGeneratorPlugin.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/java/org/openecomp/appc/seqgen/TestSequenceGeneratorPlugin.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.seqgen;
+package org.onap.appc.seqgen;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.seqgen.dgplugin.SequenceGeneratorPlugin;
-import org.openecomp.appc.seqgen.dgplugin.impl.SequenceGeneratorPluginImpl;
+import org.onap.appc.seqgen.dgplugin.SequenceGeneratorPlugin;
+import org.onap.appc.seqgen.dgplugin.impl.SequenceGeneratorPluginImpl;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import java.io.File;
diff --git a/appc-sequence-generator/appc-sequence-generator-features/pom.xml b/appc-sequence-generator/appc-sequence-generator-features/pom.xml
index d7041f290..b590bfa70 100644
--- a/appc-sequence-generator/appc-sequence-generator-features/pom.xml
+++ b/appc-sequence-generator/appc-sequence-generator-features/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-sequence-generator</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
@@ -12,12 +12,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-sequence-generator-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-sequence-generator-model</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -37,17 +37,17 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-dg-domain-model-lib</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-dg-dependency-model</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-common</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-sequence-generator/appc-sequence-generator-features/src/main/resources/features.xml b/appc-sequence-generator/appc-sequence-generator-features/src/main/resources/features.xml
index 34b65d9ec..4d0bf4893 100644
--- a/appc-sequence-generator/appc-sequence-generator-features/src/main/resources/features.xml
+++ b/appc-sequence-generator/appc-sequence-generator-features/src/main/resources/features.xml
@@ -30,14 +30,14 @@
 		version='${project.version}'>
 		<!--<feature version="${odl.controller.mdsal.version}">odl-mdsal-broker</feature>-->
 		<!--<feature>sdnc-sli</feature>-->
-		<bundle dependency="true">mvn:org.openecomp.appc/domain-model-lib/${project.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-sequence-generator-model/${project.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-sequence-generator-bundle/${project.version}</bundle>
-        <bundle>wrap:mvn:org.openecomp.appc/appc-dg-domain-model-lib/${project.version}</bundle>
-		<bundle>wrap:mvn:org.openecomp.appc/appc-dg-dependency-model/${project.version}</bundle>
+		<bundle dependency="true">mvn:org.onap.appc/domain-model-lib/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-common/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-sequence-generator-model/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-sequence-generator-bundle/${project.version}</bundle>
+        <bundle>wrap:mvn:org.onap.appc/appc-dg-domain-model-lib/${project.version}</bundle>
+		<bundle>wrap:mvn:org.onap.appc/appc-dg-dependency-model/${project.version}</bundle>
 		<configfile finalname="etc/opendaylight/karaf/201-appc-sequence-generator.xml">
-			mvn:org.openecomp.appc/appc-sequence-generator-bundle/${project.version}/xml/config</configfile>
+			mvn:org.onap.appc/appc-sequence-generator-bundle/${project.version}/xml/config</configfile>
 	</feature>
 
 </features>
diff --git a/appc-sequence-generator/appc-sequence-generator-installer/pom.xml b/appc-sequence-generator/appc-sequence-generator-installer/pom.xml
index 356f302f5..ab9a2b02f 100644
--- a/appc-sequence-generator/appc-sequence-generator-installer/pom.xml
+++ b/appc-sequence-generator/appc-sequence-generator-installer/pom.xml
@@ -26,7 +26,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-sequence-generator</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
@@ -37,14 +37,14 @@
   <properties>
     <application.name>appc-sequence-generator</application.name>
     <features.boot>appc-sequence-generator</features.boot>
-    <features.repositories>mvn:org.openecomp.appc/appc-sequence-generator-features/${project.version}/xml/features</features.repositories>
+    <features.repositories>mvn:org.onap.appc/appc-sequence-generator-features/${project.version}/xml/features</features.repositories>
     <include.transitive.dependencies>false</include.transitive.dependencies>
   </properties>
 
   <dependencies>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-sequence-generator-features</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -58,13 +58,13 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-sequence-generator-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-sequence-generator-bundle</artifactId>
       <classifier>config</classifier>
       <version>${project.version}</version>
@@ -72,7 +72,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-sequence-generator-model</artifactId>
       <version>${project.version}</version>
       <!--<type>properties</type>-->
diff --git a/appc-sequence-generator/appc-sequence-generator-model/pom.xml b/appc-sequence-generator/appc-sequence-generator-model/pom.xml
index 69b003597..bbbef4179 100644
--- a/appc-sequence-generator/appc-sequence-generator-model/pom.xml
+++ b/appc-sequence-generator/appc-sequence-generator-model/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-sequence-generator</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
diff --git a/appc-sequence-generator/appc-sequence-generator-model/src/main/yang/sequence-generator.yang b/appc-sequence-generator/appc-sequence-generator-model/src/main/yang/sequence-generator.yang
index 6777dad63..49c1551d0 100644
--- a/appc-sequence-generator/appc-sequence-generator-model/src/main/yang/sequence-generator.yang
+++ b/appc-sequence-generator/appc-sequence-generator-model/src/main/yang/sequence-generator.yang
@@ -1,7 +1,7 @@
 module sequence-generator {
     yang-version 1;
 
-    namespace "org:openecomp:appc:sequencegenerator";
+    namespace "org:onap:appc:sequencegenerator";
     prefix sequencegenerator;
 
     description
diff --git a/appc-sequence-generator/pom.xml b/appc-sequence-generator/pom.xml
index f8a187603..62ea1c896 100644
--- a/appc-sequence-generator/pom.xml
+++ b/appc-sequence-generator/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.openecomp.appc</groupId>
+  <groupId>org.onap.appc</groupId>
   <artifactId>appc-sequence-generator</artifactId>
   <name>appc-sequence-generator</name>
   <packaging>pom</packaging>
@@ -20,17 +20,17 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-sequence-generator-model</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-sequence-generator-features</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-sequence-generator-bundle</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/docs/APPC Client Library Guide/APPC Client Library Guide.rst b/docs/APPC Client Library Guide/APPC Client Library Guide.rst
index 221cf7949..0c5723438 100644
--- a/docs/APPC Client Library Guide/APPC Client Library Guide.rst
+++ b/docs/APPC Client Library Guide/APPC Client Library Guide.rst
@@ -88,8 +88,8 @@ Jar Files
 
 The Java application that runs the APPC client kit uses the following jar files:
 
-    -  org.openecomp.appc.client:client-kit
-    -  org.openecomp.appc.client:client-lib
+    -  org.onap.appc.client:client-kit
+    -  org.onap.appc.client:client-lib
 
 The client library JAR files are located in the repository under ``com\\att\\appc\\client``.
 
diff --git a/docs/APPC Logging Guide/APPC Logging Guide.rst b/docs/APPC Logging Guide/APPC Logging Guide.rst
index 043a382f0..274567c6a 100644
--- a/docs/APPC Logging Guide/APPC Logging Guide.rst
+++ b/docs/APPC Logging Guide/APPC Logging Guide.rst
@@ -271,7 +271,7 @@ Log File Locations
 The logging configuration file, ``org.ops4j.pax.logging.cfg`` are located in
 appc Git repository:
 
-``/appc/appc-common/src/main/resources/org/openecomp/appc/org.ops4j.pax.logging.cfg``
+``/appc/appc-common/src/main/resources/org/onap/appc/org.ops4j.pax.logging.cfg``
 
 
 The logs are stored at the location defined by the appropriate appender:
@@ -296,7 +296,7 @@ To enable EELF logging:
 
    with the configuration file that is checked into git:
 
-   ``/appc/appc-common/src/main/resources/org/openecomp/appc/org.ops4j.pax.logging.cfg``
+   ``/appc/appc-common/src/main/resources/org/onap/appc/org.ops4j.pax.logging.cfg``
 
 2. Stop and restart ODL controller for the configuration changes to take
    effect.
diff --git a/docs/APPC OAM API Guide/APPC OAM API Guide.rst b/docs/APPC OAM API Guide/APPC OAM API Guide.rst
index ac79e935b..4d4d93a52 100644
--- a/docs/APPC OAM API Guide/APPC OAM API Guide.rst
+++ b/docs/APPC OAM API Guide/APPC OAM API Guide.rst
@@ -194,10 +194,10 @@ Maintenance Mode API
     -
     /restconf/operations/appc-oam:maintenance-mode\|appc\|maintenance\_mode\|ecompController\|COMPLETE\|100\|ACCEPTED
     - request accepted\|\|INFO
-    \|\|127.0.0.1\|9\|localhost\|\|org.openecomp.appc.oam.AppcOam\|\|\|\|\|\|\|APPC0154W
+    \|\|127.0.0.1\|9\|localhost\|\|org.onap.appc.oam.AppcOam\|\|\|\|\|\|\|APPC0154W
     Application APPC is entering maintenance mode...
 
-    2017-06-02T13:58:55Z\|2017-06-02T13:59:05Z\|demo-oam-maintenance-mode-id#1\|\|org.openecomp.appc.oam-bundle
+    2017-06-02T13:58:55Z\|2017-06-02T13:59:05Z\|demo-oam-maintenance-mode-id#1\|\|org.onap.appc.oam-bundle
     scheduledExecutor\|appc\|maintenance\_mode\|ecompController\|COMPLETE\|400\|SUCCESS
     - request has been processed successfully\|\|INFO
     \|\|127.0.0.1\|10033\|localhost\|\|\|\|\|\|\|\|\|APPC0155W
@@ -446,13 +446,13 @@ Restart API
 		-
 		/restconf/operations/appc-oam:restart\|appc\|restart\|ecompController\|COMPLETE\|100\|ACCEPTED
 		- request accepted\|\|INFO
-		\|\|127.0.0.1\|13\|localhost\|\|org.openecomp.appc.oam.AppcOam\|\|\|\|\|\|\|APPC0162W
+		\|\|127.0.0.1\|13\|localhost\|\|org.onap.appc.oam.AppcOam\|\|\|\|\|\|\|APPC0162W
 		Application APPC is Restarting
 
-		2017-06-23T16:11:02Z\|2017-06-23T16:11:51Z\|demo-oam-restart-id#1\|\|org.openecomp.appc.oam-bundle
+		2017-06-23T16:11:02Z\|2017-06-23T16:11:51Z\|demo-oam-restart-id#1\|\|org.onap.appc.oam-bundle
 		scheduledExecutor\|appc\|restart\|ecompController\|COMPLETE\|400\|SUCCESS
 		- request has been processed successfully\|\|INFO
-		\|\|127.0.0.1\|49198\|localhost\|\|org.openecomp.appc.oam.AppcOam\|\|\|\|\|\|\|APPC0157I
+		\|\|127.0.0.1\|49198\|localhost\|\|org.onap.appc.oam.AppcOam\|\|\|\|\|\|\|APPC0157I
 		Application APPC is Started
 
 
@@ -529,7 +529,7 @@ Start API
 		2017-06-02T13:58:39Z\|2017-06-02T13:58:39Z\|\|\|qtp1068080075-57 -
 		/restconf/operations/appc-oam:start\|\|\|\|ERROR\|300\|REJECTED -
 		Invalid State Transition\|\|INFO
-		\|\|\|15\|\|\|org.openecomp.appc.oam.AppcOam\|\|\|\|\|\|\|APPC0156I
+		\|\|\|15\|\|\|org.onap.appc.oam.AppcOam\|\|\|\|\|\|\|APPC0156I
 		Application APPC is starting...
 
     **Audit Log - Success case**
@@ -539,9 +539,9 @@ Start API
 		2017-06-02T13:59:16Z\|2017-06-02T13:59:16Z\|demo-oam-start-id#1\|\|qtp1068080075-58-
 		/restconf/operations/appc-oam:start\|appc\|start\|ecompController\|COMPLETE\|100\|ACCEPTED
 		- request accepted\|\|INFO
-		\|\|127.0.0.1\|2\|localhost\|\|org.openecomp.appc.oam.AppcOam\|\|\|\|\|\|\|APPC0156I
+		\|\|127.0.0.1\|2\|localhost\|\|org.onap.appc.oam.AppcOam\|\|\|\|\|\|\|APPC0156I
 		Application APPC is starting...
-		2017-06-02T13:59:16Z\|2017-06-02T13:59:17Z\|demo-oam-start-id#1\|\|org.openecomp.appc.oam-bundle
+		2017-06-02T13:59:16Z\|2017-06-02T13:59:17Z\|demo-oam-start-id#1\|\|org.onap.appc.oam-bundle
 		scheduledExecutor\|appc\|start\|ecompController\|COMPLETE\|400\|SUCCESS
 		- request has been processed successfully\|\|INFO
 		\|\|127.0.0.1\|1007\|localhost\|\|\|\|\|\|\|\|\|APPC0157I
diff --git a/pom.xml b/pom.xml
index c2ceb8d74..a209e84e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc</artifactId>
     <version>1.3.0-SNAPSHOT</version>
     <name>appc</name>
@@ -302,26 +302,26 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
             </dependency>
             <!-- APPC -->
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-controller-features</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-controller-model</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-controller-bundle</artifactId>
                 <version>${project.version}</version>
                 <classifier>config</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-controller-bundle</artifactId>
                 <version>${project.version}</version>
             </dependency>