Removing old name references

Removing references to bvc, att

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

25 files changed, 142 insertions, 142 deletions

diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCheckConfigStatus.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCheckConfigStatus.java
index 994fbc7b2..6aba42b1a 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCheckConfigStatus.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCheckConfigStatus.java
@@ -33,9 +33,9 @@ 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;
-import com.att.sdnctl.dgtestlibrary.DGTestCase;
-import com.att.sdnctl.dgtestlibrary.GraphKey;
+import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase;
+import org.onap.sdnc.dgtestlibrary.DGTestCase;
+import org.onap.sdnc.dgtestlibrary.GraphKey;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import com.att.eelf.configuration.EELFLogger;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java
index 3c939cbe3..1e7835c85 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java
@@ -33,9 +33,9 @@ import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 import org.onap.sdnc.config.generator.convert.ConvertNode;
 import org.onap.sdnc.config.generator.merge.MergeNode;
 /*  move to open source
-import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase;
-import com.att.sdnctl.dgtestlibrary.DGTestCase;
-import com.att.sdnctl.dgtestlibrary.GraphKey;
+import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase;
+import org.onap.sdnc.dgtestlibrary.DGTestCase;
+import org.onap.sdnc.dgtestlibrary.GraphKey;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java
index 9f6d676b7..29d7b0f4c 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java
@@ -30,9 +30,9 @@ import java.util.Map;
 import org.junit.Test;
 
 /* move to opensource
-import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase;
-import com.att.sdnctl.dgtestlibrary.DGTestCase;
-import com.att.sdnctl.dgtestlibrary.GraphKey;
+import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase;
+import org.onap.sdnc.dgtestlibrary.DGTestCase;
+import org.onap.sdnc.dgtestlibrary.GraphKey;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigure.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigure.java
index 6022ac834..894ddd7c2 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigure.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigure.java
@@ -33,9 +33,9 @@ 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;
-import com.att.sdnctl.dgtestlibrary.DGTestCase;
-import com.att.sdnctl.dgtestlibrary.GraphKey;
+import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase;
+import org.onap.sdnc.dgtestlibrary.DGTestCase;
+import org.onap.sdnc.dgtestlibrary.GraphKey;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import com.att.eelf.configuration.EELFLogger;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadCliConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadCliConfig.java
index 2f6f7459a..3cf70fe44 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadCliConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadCliConfig.java
@@ -32,10 +32,10 @@ import org.junit.Test;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 /* need to move to opensource
-import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase;
-import com.att.sdnctl.dgtestlibrary.DGMockUtils;
-import com.att.sdnctl.dgtestlibrary.DGTestCase;
-import com.att.sdnctl.dgtestlibrary.GraphKey;
+import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase;
+import org.onap.sdnc.dgtestlibrary.DGMockUtils;
+import org.onap.sdnc.dgtestlibrary.DGTestCase;
+import org.onap.sdnc.dgtestlibrary.GraphKey;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadIsbcConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadIsbcConfig.java
index 231dd6b0a..87d3f4561 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadIsbcConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadIsbcConfig.java
@@ -32,9 +32,9 @@ import org.junit.Test;
 import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 
 /* need to move to open source
-import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase;
-import com.att.sdnctl.dgtestlibrary.DGTestCase;
-import com.att.sdnctl.dgtestlibrary.GraphKey;
+import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase;
+import org.onap.sdnc.dgtestlibrary.DGTestCase;
+import org.onap.sdnc.dgtestlibrary.GraphKey;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import com.att.eelf.configuration.EELFLogger;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java
index af0423b0d..36c549ad0 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java
@@ -44,9 +44,9 @@ import org.slf4j.LoggerFactory;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 /* need to move to open source
-import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase;
-import com.att.sdnctl.dgtestlibrary.DGTestCase;
-import com.att.sdnctl.dgtestlibrary.GraphKey;
+import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase;
+import org.onap.sdnc.dgtestlibrary.DGTestCase;
+import org.onap.sdnc.dgtestlibrary.GraphKey;
 import org.apache.sling.testing.mock.osgi.MockOsgi;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
@@ -73,7 +73,7 @@ public class TestGenerateConfig /* extends AbstractDGTestCase */ {
             Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
             serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
-            //serviceReferences.put("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode());
+            //serviceReferences.put("org.onap.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode());
 
             serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
 
@@ -110,7 +110,7 @@ public class TestGenerateConfig /* extends AbstractDGTestCase */ {
             Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
             serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
-            //serviceReferences.put("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode());
+            //serviceReferences.put("org.onap.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode());
 
             serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java
index 3223cb9e7..95fcf3e9a 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java
@@ -37,9 +37,9 @@ import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 /* need to move to opensource
-import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase;
-import com.att.sdnctl.dgtestlibrary.DGTestCase;
-import com.att.sdnctl.dgtestlibrary.GraphKey;
+import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase;
+import org.onap.sdnc.dgtestlibrary.DGTestCase;
+import org.onap.sdnc.dgtestlibrary.GraphKey;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetAaiInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetAaiInfo.java
index f7307acb2..9587a96c7 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetAaiInfo.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetAaiInfo.java
@@ -35,9 +35,9 @@ import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 /* need to move to open source
-import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase;
-import com.att.sdnctl.dgtestlibrary.DGTestCase;
-import com.att.sdnctl.dgtestlibrary.GraphKey;
+import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase;
+import org.onap.sdnc.dgtestlibrary.DGTestCase;
+import org.onap.sdnc.dgtestlibrary.GraphKey;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java
index 52e20415e..074aa6ff9 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java
@@ -33,9 +33,9 @@ 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;
-import com.att.sdnctl.dgtestlibrary.DGTestCase;
-import com.att.sdnctl.dgtestlibrary.GraphKey;
+import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase;
+import org.onap.sdnc.dgtestlibrary.DGTestCase;
+import org.onap.sdnc.dgtestlibrary.GraphKey;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetDeviceRunningConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetDeviceRunningConfig.java
index b84b0516e..d08bd4f16 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetDeviceRunningConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetDeviceRunningConfig.java
@@ -32,9 +32,9 @@ import org.junit.Test;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 /* need to move to open source
-import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase;
-import com.att.sdnctl.dgtestlibrary.DGTestCase;
-import com.att.sdnctl.dgtestlibrary.GraphKey;
+import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase;
+import org.onap.sdnc.dgtestlibrary.DGTestCase;
+import org.onap.sdnc.dgtestlibrary.GraphKey;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java
index 6bc9d10e3..d9b9ad4a6 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java
@@ -45,9 +45,9 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 /* need move to open source
 import org.apache.sling.testing.mock.osgi.MockOsgi;
-import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase;
-import com.att.sdnctl.dgtestlibrary.DGTestCase;
-import com.att.sdnctl.dgtestlibrary.GraphKey;
+import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase;
+import org.onap.sdnc.dgtestlibrary.DGTestCase;
+import org.onap.sdnc.dgtestlibrary.GraphKey;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java
index 56b0bab3b..0b5cf7e5d 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java
@@ -35,9 +35,9 @@ import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 /* move to open source
-import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase;
-import com.att.sdnctl.dgtestlibrary.DGTestCase;
-import com.att.sdnctl.dgtestlibrary.GraphKey;
+import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase;
+import org.onap.sdnc.dgtestlibrary.DGTestCase;
+import org.onap.sdnc.dgtestlibrary.GraphKey;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java
index f2399729e..bf7d5e2a9 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java
@@ -44,9 +44,9 @@ import org.slf4j.LoggerFactory;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 /* need to move to open source
-import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase;
-import com.att.sdnctl.dgtestlibrary.DGTestCase;
-import com.att.sdnctl.dgtestlibrary.GraphKey;
+import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase;
+import org.onap.sdnc.dgtestlibrary.DGTestCase;
+import org.onap.sdnc.dgtestlibrary.GraphKey;
 import org.apache.sling.testing.mock.osgi.MockOsgi;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java
index 943edf2c1..6cc05179a 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java
@@ -45,9 +45,9 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 /* need to move to open source
 import org.apache.sling.testing.mock.osgi.MockOsgi;
-import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase;
-import com.att.sdnctl.dgtestlibrary.DGTestCase;
-import com.att.sdnctl.dgtestlibrary.GraphKey;
+import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase;
+import org.onap.sdnc.dgtestlibrary.DGTestCase;
+import org.onap.sdnc.dgtestlibrary.GraphKey;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java
index 9eed43e8b..a0a20243d 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java
@@ -46,9 +46,9 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 /* move to open source
 import org.apache.sling.testing.mock.osgi.MockOsgi;
-import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase;
-import com.att.sdnctl.dgtestlibrary.DGTestCase;
-import com.att.sdnctl.dgtestlibrary.GraphKey;
+import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase;
+import org.onap.sdnc.dgtestlibrary.DGTestCase;
+import org.onap.sdnc.dgtestlibrary.GraphKey;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor;
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockAaiResource.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockAaiResource.java
index 6d23d13ff..6f3847e97 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockAaiResource.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockAaiResource.java
@@ -109,7 +109,7 @@ public class MockAaiResource implements SvcLogicResource {
             assertEquals(parms.get("is-closed-loop"), "false");
             assertEquals(parms.get("vnfc-function-code"), "funccode");
             assertEquals(parms.get("vnfc-type"), "vnfctype");
-            assertEquals(parms.get("ipaddress-v4-oam-vip"), "135.1.1.1");
+            assertEquals(parms.get("ipaddress-v4-oam-vip"), "10.1.1.1");
             assertEquals(parms.get("group-notation"), "groupnotation");
             assertEquals(parms.get("relationship-list.relationship[0].related-to"), "vserver");
             assertEquals(parms.get("relationship-list.relationship[0].relationship-data[0].relationship-key"), "vserver.vserver-id");
@@ -140,7 +140,7 @@ public class MockAaiResource implements SvcLogicResource {
             assertEquals(parms.get("is-closed-loop"), "false");
             assertEquals(parms.get("vnfc-function-code"), "funccode1");
             assertEquals(parms.get("vnfc-type"), "vnfctype1");
-            assertEquals(parms.get("ipaddress-v4-oam-vip"), "135.2.2.2");
+            assertEquals(parms.get("ipaddress-v4-oam-vip"), "10.2.2.2");
             assertEquals(parms.get("group-notation"), "groupnotation1");
             assertEquals(parms.get("relationship-list.relationship[0].related-to"), "vserver");
             assertEquals(parms.get("relationship-list.relationship[0].relationship-data[0].relationship-key"), "vserver.vserver-id");
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockConfigureNodeExecutor.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockConfigureNodeExecutor.java
index 7c2247a26..073c3d725 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockConfigureNodeExecutor.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockConfigureNodeExecutor.java
@@ -37,7 +37,7 @@ public class MockConfigureNodeExecutor implements SvcLogicAdaptor{
 
         if ( "get".equals(key)) {
 
-            if ("135.1.1.1".equals(parameters.get("host") )) {
+            if ("10.1.1.1".equals(parameters.get("host") )) {
                     String fullPathFileName = parameters.get("fullPathFileName");
                     if (("SuccessFile").equals(fullPathFileName ) )
                         return ConfigStatus.FAILURE;
@@ -46,7 +46,7 @@ public class MockConfigureNodeExecutor implements SvcLogicAdaptor{
                     if (("FailureLogFile").equals(fullPathFileName ) )
                         return ConfigStatus.SUCCESS;
             }
-            else if ("135.2.2.2".equals(parameters.get("host")) ) {
+            else if ("10.2.2.2".equals(parameters.get("host")) ) {
                 String fullPathFileName = parameters.get("fullPathFileName");
                 if (("SuccessFile").equals(fullPathFileName ) )
                     return ConfigStatus.FAILURE;
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 0168b477f..04f6e803b 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
@@ -34,6 +34,6 @@ org.onap.appc.dg.common.JsonDgUtil.generateOutputPayloadFromContext.output.paylo
 
 assertEquals.output.payload.upload-config-id[0]=12434
 
-assertEquals.tmp.fileName=/opt/app/bvc/cvaas/ibcx0001v_567890_appc001.json
+assertEquals.tmp.fileName=/opt/onap/appc/cvaas/ibcx0001v_567890_appc001.json
       
 
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 4d6b0aa8f..940ea0e29 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
@@ -44,7 +44,7 @@ org.onap.appc.data.services.node.ConfigResourceNode.updateUploadConfig.tmp.uploa
 APPC.GetDeviceRunningConfig.outCome=success
 APPC.PublishConfiguration.outCome=success
 
-com.att.sdnctl.prop.PropertiesNode.readProperties=success
+org.onap.ccsdk.sli.plugins.prop.PropertiesNode.readProperties=success
 assertNull.dcae-error-message
 
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties
index 6e6659c29..e4b86e75e 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties
@@ -31,25 +31,25 @@ input.input.action=Configure
 input.input.payload=tcfile://payload_json_config.json
 
 
-# Property for com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo Execute Action
-com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.commonConfigInfo.status=success
-com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
-com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
-com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=
-com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD =
-com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
-
-com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
-com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC
-com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
-com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc
-com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
-
-com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.CONFIGURE-ACTION-DG-ID = 8
-com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.VNF-TYPE = vUSP - Metaswitch vSBC
-com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.DOWNLOAD-CONFIG-DG = DownloadIsbcConfig
-
-com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
+# Property for org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo Execute Action
+org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.commonConfigInfo.status=success
+org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
+org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
+org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=
+org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD =
+org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
+
+org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
+org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC
+org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
+org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc
+org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
+
+org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.CONFIGURE-ACTION-DG-ID = 8
+org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.VNF-TYPE = vUSP - Metaswitch vSBC
+org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.DOWNLOAD-CONFIG-DG = DownloadIsbcConfig
+
+org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
 
 
 # DG APPC.DownloadIsbcConfig properties
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/noinstarparams_pd.yaml b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/noinstarparams_pd.yaml
index 5cf518101..ec9fba843 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/noinstarparams_pd.yaml
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/noinstarparams_pd.yaml
@@ -25,8 +25,8 @@ parameters:
   required: false

   source: null

   class-type: null

-  default-value: "fd00:f4d5:ea06:1:0:110:136:254"

-  assigned-value: "fd00:f4d5:ea06:1:0:110:136:254"

+  default-value: "10.0.0.147"

+  assigned-value: "10.0.0.147"

   path: null

   request-keys: null

   response-keys: null

@@ -61,8 +61,8 @@ parameters:
   required: false

   source: null

   class-type: null

-  default-value: "fd00:f4d5:ea06:1:0:110:136:254"

-  assigned-value: "fd00:f4d5:ea06:1:0:110:136:254"

+  default-value: "10.0.0.147"

+  assigned-value: "10.0.0.147"

   path: null

   request-keys: null

   response-keys: null

diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json
index 9bd143c48..f0230751e 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json
@@ -1,9 +1,9 @@
 {
     "request-parameters": {
         "vnf-type": "ISBC",
-        "vnf-host-ip-address": "135.21.166.39",
+        "vnf-host-ip-address": "10.0.0.39",
         "service-instance-id": "ibcx0001vm001",
-        "site-location": "Middletown",
+        "site-location": "Somewhere",
         "vnf-name": "ibcx0001v",
         "vm": [
             {
@@ -13,7 +13,7 @@
                         "vnfc-name": "ibcx0001vm001ssc001",
                         "vnfc-function-code": "ssc",
                         "vnfc-type": "vISBC – ssc",
-                        "ipaddress-v4-oam-vip": "12.1.1.1",
+                        "ipaddress-v4-oam-vip": "10.1.1.1",
                         "group-notation": "ibcx0001vm001ssc001pair"
                     }
                 ]
@@ -32,47 +32,47 @@
         ]
     },
     "configuration": {
-        "configuration-string": "config\r\nsystem\r\nservice-interface serv1\r\nipv4\r\ngateway-ip-address 12.12.12.12\r\n"
+        "configuration-string": "config\r\nsystem\r\nservice-interface serv1\r\nipv4\r\ngateway-ip-address 10.0.12.12\r\n"
     },
     "configuration-parameters": {
         "LOCAL_ACCESS_IP_ADDR": "192.168.30.1",
-        "LOCAL_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
+        "LOCAL_CORE_ALT_IP_ADDR": "10.0.0.147",
         "LOCAL_BILLING_IP_ADDR": "192.168.30.1",
         "REMOTE_ACCESS_IP_ADDR": "192.168.30.1",
-        "REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
+        "REMOTE_CORE_ALT_IP_ADDR": "10.0.0.147",
         "REMOTE_BILLING_IP_ADDR": "192.168.30.1",
         "CORE_NETWORK_PLEN": "32",
         "CORE_NETWORK_ALT_PLEN": "126",
         "CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1",
-        "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254",
+        "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "10.0.0.147",
         "ACCESS_NETWORK_PLEN": "32",
         "ACCESS_NETWORK_ALT_PLEN": "126",
-        "ACCESS_NETWORK_DEFAULT_GATEWAY": "135.25.69.147",
-        "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254",
+        "ACCESS_NETWORK_DEFAULT_GATEWAY": "10.0.0.147",
+        "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "10.0.0.147",
         "BILLING_NETWORK_PLEN": "32",
-        "BILLING_NETWORK_DEFAULT_GATEWAY": "135.25.69.147",
-        "VIRT_CORE_IP_ADDR": "135.25.69.147",
-        "VIRT_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
-        "VIRT_ACCESS_IP_ADDR": "135.25.69.147",
-        "VIRT_ACCESS_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
-        "VIRT_BILLING_IP_ADDR": "135.25.69.147",
-        "DNS_SERVERS": "135.25.69.147",
-        "SNMP_CLIENT_1": "135.25.69.147",
-        "SNMP_CLIENT_2": "135.25.69.147",
-        "SNMP_COMMUNITY_STRING_CLIENT1": "135.25.69.147",
-        "SNMP_COMMUNITY_STRING_CLIENT2": "135.25.69.147",
-        "BILLING_SERVER_1": "135.25.69.147",
-        "BILLING_SERVER_2": "135.25.69.147",
-        "IMS_CORE_ALT_IP_ADDR1": "135.25.69.147",
-        "IMS_CORE_ALT_IP_ADDR2": "135.25.69.147",
-        "IMS_CORE_ALT_IP_ADDR3": "135.25.69.147",
-        "IMS_CORE_ALT_IP_ADDR4": "135.25.69.147",
-        "OAM_VIP_HOSTNAME": "135.25.69.147",
-        "DG_APP_SERVER1": "135.25.69.147",
-        "DG_APP_SERVER2": "135.25.69.147",
-        "CTS_IP_RANGE": "135.25.69.147",
+        "BILLING_NETWORK_DEFAULT_GATEWAY": "10.0.0.147",
+        "VIRT_CORE_IP_ADDR": "10.0.0.147",
+        "VIRT_CORE_ALT_IP_ADDR": "10.0.0.147",
+        "VIRT_ACCESS_IP_ADDR": "10.0.0.147",
+        "VIRT_ACCESS_ALT_IP_ADDR": "10.0.0.147",
+        "VIRT_BILLING_IP_ADDR": "10.0.0.147",
+        "DNS_SERVERS": "10.0.0.147",
+        "SNMP_CLIENT_1": "10.0.0.147",
+        "SNMP_CLIENT_2": "10.0.0.147",
+        "SNMP_COMMUNITY_STRING_CLIENT1": "10.0.0.147",
+        "SNMP_COMMUNITY_STRING_CLIENT2": "10.0.0.147",
+        "BILLING_SERVER_1": "10.0.0.147",
+        "BILLING_SERVER_2": "10.0.0.147",
+        "IMS_CORE_ALT_IP_ADDR1": "10.0.0.147",
+        "IMS_CORE_ALT_IP_ADDR2": "10.0.0.147",
+        "IMS_CORE_ALT_IP_ADDR3": "10.0.0.147",
+        "IMS_CORE_ALT_IP_ADDR4": "10.0.0.147",
+        "OAM_VIP_HOSTNAME": "10.0.0.147",
+        "DG_APP_SERVER1": "10.0.0.147",
+        "DG_APP_SERVER2": "10.0.0.147",
+        "CTS_IP_RANGE": "10.0.0.147",
         "CTS_PREFIX_LENGTH": "26",
-        "LICENSE_KEY": "AQGpAQA/AQAEAAANBAIAGY1mwTCGq0adcFTpiuwgDxAFwlmxPP8TYmQDAAEBBAAABQAEVwMAAAYABFhR3QAHAARXAwAAAgFkAQAoAQABBAIAB0MwMjc1MTgDAAL//wYAB0wwMTEwMDEHAAQAAAABCQABAAIBNgEBMwEAAQECAAEAAwAEAAGGoAQABP////8FAASAADTfBgAE/////wcAFAEABkcuNzI5QQIABAAAE4gDAAEBBwARAQADQU1SAgAEAAATiAMAAQEHABQBAAZBTVItV0ICAAQAABOIAwABAQsABAABhqAMAB4BABBJTlNUX0lTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX0lTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19IQV9WSVJUAgAEAAAAZAMAAQG8N/Kba2f53+Rj7bN0En1MmpFrvPo+QBSk0smG9XCVZ8lmwYTCggTSLdHDG8kR1/AsSz7nr3v87H+4GIuY+Ktjw7Ug1a8xhBRUabSjz5pOm34ZZwG8uC38sbgVfIXEZJd+jukvAijyRqnrud5MX24vozW/tVMYj4GHCmrdc176tA==",
+        "LICENSE_KEY": "abcd1234",
         "LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp"
     }
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json
index d6b2ebbe7..794c8d86c 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json
@@ -1,7 +1,7 @@
 {
     "request-parameters": {
         "vnf-type": "ISBC",
-        "vnf-host-ip-address": "135.21.166.39",
+        "vnf-host-ip-address": "10.0.0.39",
         "service-instance-id": "ibcx0001vm001",
         "site-location": "Middletown",
         "vnf-name": "ibcx0001v",
@@ -13,7 +13,7 @@
                         "vnfc-name": "ibcx0001vm001ssc001",
                         "vnfc-function-code": "ssc",
                         "vnfc-type": "vISBC – ssc",
-                        "ipaddress-v4-oam-vip": "12.1.1.1",
+                        "ipaddress-v4-oam-vip": "10.1.1.1",
                         "group-notation": "ibcx0001vm001ssc001pair"
                     }
                 ]
@@ -42,43 +42,43 @@
     },
     "configuration-parameters": {
         "LOCAL_ACCESS_IP_ADDR": "192.168.30.1",
-        "LOCAL_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
+        "LOCAL_CORE_ALT_IP_ADDR": "10.0.0.147",
         "LOCAL_BILLING_IP_ADDR": "192.168.30.1",
         "REMOTE_ACCESS_IP_ADDR": "192.168.30.1",
-        "REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
+        "REMOTE_CORE_ALT_IP_ADDR": "10.0.0.147",
         "REMOTE_BILLING_IP_ADDR": "192.168.30.1",
         "CORE_NETWORK_PLEN": "32",
         "CORE_NETWORK_ALT_PLEN": "126",
         "CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1",
-        "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254",
+        "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "10.0.0.147",
         "ACCESS_NETWORK_PLEN": "32",
         "ACCESS_NETWORK_ALT_PLEN": "126",
-        "ACCESS_NETWORK_DEFAULT_GATEWAY": "135.25.69.147",
-        "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254",
+        "ACCESS_NETWORK_DEFAULT_GATEWAY": "10.0.0.147",
+        "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "10.0.0.147",
         "BILLING_NETWORK_PLEN": "32",
-        "BILLING_NETWORK_DEFAULT_GATEWAY": "135.25.69.147",
-        "VIRT_CORE_IP_ADDR": "135.25.69.147",
-        "VIRT_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
-        "VIRT_ACCESS_IP_ADDR": "135.25.69.147",
-        "VIRT_ACCESS_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
-        "VIRT_BILLING_IP_ADDR": "135.25.69.147",
-        "DNS_SERVERS": "135.25.69.147",
-        "SNMP_CLIENT_1": "135.25.69.147",
-        "SNMP_CLIENT_2": "135.25.69.147",
-        "SNMP_COMMUNITY_STRING_CLIENT1": "135.25.69.147",
-        "SNMP_COMMUNITY_STRING_CLIENT2": "135.25.69.147",
-        "BILLING_SERVER_1": "135.25.69.147",
-        "BILLING_SERVER_2": "135.25.69.147",
-        "IMS_CORE_ALT_IP_ADDR1": "135.25.69.147",
-        "IMS_CORE_ALT_IP_ADDR2": "135.25.69.147",
-        "IMS_CORE_ALT_IP_ADDR3": "135.25.69.147",
-        "IMS_CORE_ALT_IP_ADDR4": "135.25.69.147",
-        "OAM_VIP_HOSTNAME": "135.25.69.147",
-        "DG_APP_SERVER1": "135.25.69.147",
-        "DG_APP_SERVER2": "135.25.69.147",
-        "CTS_IP_RANGE": "135.25.69.147",
+        "BILLING_NETWORK_DEFAULT_GATEWAY": "10.0.0.147",
+        "VIRT_CORE_IP_ADDR": "10.0.0.147",
+        "VIRT_CORE_ALT_IP_ADDR": "10.0.0.147",
+        "VIRT_ACCESS_IP_ADDR": "10.0.0.147",
+        "VIRT_ACCESS_ALT_IP_ADDR": "10.0.0.147",
+        "VIRT_BILLING_IP_ADDR": "10.0.0.147",
+        "DNS_SERVERS": "10.0.0.147",
+        "SNMP_CLIENT_1": "10.0.0.147",
+        "SNMP_CLIENT_2": "10.0.0.147",
+        "SNMP_COMMUNITY_STRING_CLIENT1": "10.0.0.147",
+        "SNMP_COMMUNITY_STRING_CLIENT2": "10.0.0.147",
+        "BILLING_SERVER_1": "10.0.0.147",
+        "BILLING_SERVER_2": "10.0.0.147",
+        "IMS_CORE_ALT_IP_ADDR1": "10.0.0.147",
+        "IMS_CORE_ALT_IP_ADDR2": "10.0.0.147",
+        "IMS_CORE_ALT_IP_ADDR3": "10.0.0.147",
+        "IMS_CORE_ALT_IP_ADDR4": "10.0.0.147",
+        "OAM_VIP_HOSTNAME": "10.0.0.147",
+        "DG_APP_SERVER1": "10.0.0.147",
+        "DG_APP_SERVER2": "10.0.0.147",
+        "CTS_IP_RANGE": "10.0.0.147",
         "CTS_PREFIX_LENGTH": "26",
-        "LICENSE_KEY": "AQGpAQA/AQAEAAANBAIAGY1mwTCGq0adcFTpiuwgDxAFwlmxPP8TYmQDAAEBBAAABQAEVwMAAAYABFhR3QAHAARXAwAAAgFkAQAoAQABBAIAB0MwMjc1MTgDAAL//wYAB0wwMTEwMDEHAAQAAAABCQABAAIBNgEBMwEAAQECAAEAAwAEAAGGoAQABP////8FAASAADTfBgAE/////wcAFAEABkcuNzI5QQIABAAAE4gDAAEBBwARAQADQU1SAgAEAAATiAMAAQEHABQBAAZBTVItV0ICAAQAABOIAwABAQsABAABhqAMAB4BABBJTlNUX0lTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX0lTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19IQV9WSVJUAgAEAAAAZAMAAQG8N/Kba2f53+Rj7bN0En1MmpFrvPo+QBSk0smG9XCVZ8lmwYTCggTSLdHDG8kR1/AsSz7nr3v87H+4GIuY+Ktjw7Ug1a8xhBRUabSjz5pOm34ZZwG8uC38sbgVfIXEZJd+jukvAijyRqnrud5MX24vozW/tVMYj4GHCmrdc176tA==",
+        "LICENSE_KEY": "abcd1234",
         "LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp"
     }
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/pd.yaml b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/pd.yaml
index 3eb302eb3..f065c3058 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/pd.yaml
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/pd.yaml
@@ -21,7 +21,7 @@ vnf-parameter-list:
   required: false

   source: "INSTAR"

   rule-type: null

-  default: "fd00:f4d5:ea06:1:0:110:136:254"

+  default: "10.0.0.147"

   request-keys:

   - key-name: "address_fqdn"

     key-value: "m001dbj001p1n004v006"

@@ -52,7 +52,7 @@ vnf-parameter-list:
   required: false

   source: null

   rule-type: null

-  default: "fd00:f4d5:ea06:1:0:110:136:254"

+  default: "10.0.0.147"

   request-keys: null

   response-keys: null

 - name: "REMOTE_BILLING_IP_ADDR"