summaryrefslogtreecommitdiffstats
path: root/appc-directed-graph/appc-dgraph/provider/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'appc-directed-graph/appc-dgraph/provider/src/test')
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestCheckConfigStatus.java12
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestCommonConfig.java8
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestConfigurationDocumentRequest.java2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestConfigure.java6
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestDownloadCliConfig.java2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestDownloadIsbcConfig.java4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGenerateConfig.java10
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGenerateTemplateConfig.java10
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetAaiInfo.java6
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetConfigParams.java6
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetDeviceRunningConfig.java2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestGetVfModuleInfo.java6
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestProcessParameterDefinition.java6
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestPublishConfiguration.java6
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestSaveRunningConfig.java6
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestSetStatus.java6
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/TestUpdateAaiInfo.java8
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/mock/instance/MockAaiResource.java2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/mock/instance/MockConfigureNodeExecutor.java2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/java/org/openecomp/appc/dg/mock/instance/MockSvcLogicJavaPlugin.java2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Failure.properties8
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Success.properties10
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/APPC_method_CommonConfiguration_TC2.properties38
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/ISBCTemplateSuccess.properties48
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Failure.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Success.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateTemplateConfig_Failure.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GetTemplate_Failure.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Adaptor_Failure.properties6
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_DB_Failure.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties8
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/ConfigFile_Failure.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/DownloadIsbcConfig_Success.properties14
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/Put_Failure.properties14
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetInfoSuccess.properties8
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVServerFail.properties10
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVnfFail.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliJson.properties22
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliString.properties24
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CommonConfigFail.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/DefaultTemplate.properties22
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Restore.properties24
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/TemplateName.properties22
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Failure.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Others.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Success.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/XML_Success.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetInstarParamsFail.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetPDFail.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/MergeParamsFail.properties6
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/NoInstarParams.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/ProcessPD.properties24
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/SaveMdsalFail.properties26
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Failure.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Failure.properties10
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/UploadConfig_Failure.properties14
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_AaiFailure.properties2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_SaveRunningFailure.properties2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_Success.properties2
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/GetVnfcRef_Fail.properties4
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Fail.properties10
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Success.properties6
64 files changed, 284 insertions, 284 deletions
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