Moved config tests into config module

Change-Id: I7b99fdeeeb66f5de9bcd9283d815976c3d7520b0
Issue-ID: SDC-1867
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>

diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml
old mode 100644 (file)
new mode 100755 (executable)
index 78c3787..1236f85
--- a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml
@@ -108,4 +108,24 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${mvn.surefire.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                    <systemPropertyVariables>
+                        <config.location>${project.basedir}/src/test/resources</config.location>
+                        <node.config.location>${user.home}/TestResources</node.config.location>
+                    </systemPropertyVariables>
+                    <includes>
+                        <include>**/TestCMSuite.java</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/TestCMSuite.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/TestCMSuite.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/TestCMSuite.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/TestCMSuite.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLITest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/CLITest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLITest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/CLITest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/DynamicConfigurationTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/DynamicConfigurationTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/DynamicConfigurationTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/DynamicConfigurationTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/FallbackConfigTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackConfigTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/FallbackConfigTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JSONConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/JSONConfigTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JSONConfigTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/JSONConfigTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NodeSpecificCLITest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/NodeSpecificCLITest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NodeSpecificCLITest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/NodeSpecificCLITest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationOnPropValTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/NotificationOnPropValTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationOnPropValTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/NotificationOnPropValTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/UnregisterNotificationTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/UnregisterNotificationTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/UnregisterNotificationTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/UnregisterNotificationTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/XMLConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/XMLConfigTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/XMLConfigTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/XMLConfigTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/YAMLConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/YAMLConfigTest.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/YAMLConfigTest.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/YAMLConfigTest.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/ConfigTestConstant.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/util/ConfigTestConstant.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/ConfigTestConstant.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/util/ConfigTestConstant.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/TestUtil.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/util/TestUtil.java
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/TestUtil.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/util/TestUtil.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLI/config-NS.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config-NS.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLI/config-NS.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLI/config.json
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.json
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLI/config.json

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLI/config.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLI/config.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLI/config.xml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.xml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLI/config.xml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLI/config.yaml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.yaml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLI/config.yaml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLIFallback/config-NS.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config-NS.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLIFallback/config-NS.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLIFallback/config.json
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLIFallback/config.json

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLIFallback/config.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLIFallback/config.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLIFallback/config.xml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.xml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLIFallback/config.xml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLIFallback/config.yaml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.yaml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLIFallback/config.yaml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/DynamicConfiguration/config.json
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/DynamicConfiguration/config.json

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/DynamicConfiguration/config.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/DynamicConfiguration/config.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/DynamicConfiguration/config.xml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/DynamicConfiguration/config.xml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/DynamicConfiguration/config.yaml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.yaml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/DynamicConfiguration/config.yaml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/FallbackToGlobalNS/config-NS.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config-NS.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/FallbackToGlobalNS/config-NS.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/FallbackToGlobalNS/config.json
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/FallbackToGlobalNS/config.json

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/FallbackToGlobalNS/config.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/FallbackToGlobalNS/config.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/FallbackToGlobalNS/config.xml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/FallbackToGlobalNS/config.xml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/FallbackToGlobalNS/config.yaml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.yaml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/FallbackToGlobalNS/config.yaml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/GlobalAndNSConfig/config.json
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/GlobalAndNSConfig/config.json

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/GlobalAndNSConfig/config.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/GlobalAndNSConfig/config.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/GlobalAndNSConfig/config.xml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/GlobalAndNSConfig/config.xml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/GlobalAndNSConfig/config.yaml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.yaml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/GlobalAndNSConfig/config.yaml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/JSONConfiguration/config-M.json
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/JSONConfiguration/config-M.json

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/JSONConfiguration/config-O.json
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/JSONConfiguration/config-O.json

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/JSONConfiguration/config-U.json
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/JSONConfiguration/config-U.json

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/JSONConfiguration/config.json
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config.json
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/JSONConfiguration/config.json

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-M.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config-M.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-M.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config-M.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-O.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config-O.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-O.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config-O.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-U.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config-U.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-U.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config-U.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-M.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config-loadorder-M.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-M.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config-loadorder-M.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-O.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config-loadorder-O.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-O.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config-loadorder-O.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/MergeStrategyAsConfigProp/config.json
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/MergeStrategyAsConfigProp/config.json

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/MergeStrategyAsConfigProp/config.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/MergeStrategyAsConfigProp/config.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/MergeStrategyAsConfigProp/config.xml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/MergeStrategyAsConfigProp/config.xml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/MergeStrategyAsConfigProp/config.yaml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.yaml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/MergeStrategyAsConfigProp/config.yaml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NodeCLI/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NodeCLI/config.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NodeCLI/config.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NodeCLI/config.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/Notification/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/Notification/config.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/Notification/config.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/Notification/config.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig.zip b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationForNodeConfig.zip
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig.zip
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationForNodeConfig.zip

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationForNodeConfig/config.json
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationForNodeConfig/config.json

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationForNodeConfig/config.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationForNodeConfig/config.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationForNodeConfig/config.xml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationForNodeConfig/config.xml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationForNodeConfig/config.yaml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.yaml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationForNodeConfig/config.yaml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationOnPropVal/config-NS.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config-NS.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationOnPropVal/config-NS.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationOnPropVal/config.json
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationOnPropVal/config.json

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationOnPropVal/config.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationOnPropVal/config.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationOnPropVal/config.xml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationOnPropVal/config.xml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationOnPropVal/config.yaml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.yaml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NotificationOnPropVal/config.yaml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/SourceLocation/appjarconfig.json
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/SourceLocation/appjarconfig.json

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/SourceLocation/appjarconfig.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/SourceLocation/appjarconfig.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/SourceLocation/appjarconfig.xml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/SourceLocation/appjarconfig.xml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/SourceLocation/appjarconfig.yaml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.yaml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/SourceLocation/appjarconfig.yaml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config-NS.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config-NS.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config-NS.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config.json
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config.json

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config.xml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.xml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config.xml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config.yaml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.yaml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config.yaml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/ValidateDefaultMode/config-defaultmode.json
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/ValidateDefaultMode/config-defaultmode.json

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/ValidateDefaultMode/config-defaultmode.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/ValidateDefaultMode/config-defaultmode.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateNodeConfig/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/ValidateNodeConfig/config-NS.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateNodeConfig/config-NS.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/ValidateNodeConfig/config-NS.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateNodeConfig/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/ValidateNodeConfig/config.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateNodeConfig/config.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/ValidateNodeConfig/config.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/XMLConfiguration/config-M.xml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/XMLConfiguration/config-M.xml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/XMLConfiguration/config-O.xml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/XMLConfiguration/config-O.xml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/XMLConfiguration/config-U.xml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/XMLConfiguration/config-U.xml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/XMLConfiguration/config.xml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config.xml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/XMLConfiguration/config.xml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-M.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/YAMLConfiguration/config-M.yaml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-M.yaml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/YAMLConfiguration/config-M.yaml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-O.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/YAMLConfiguration/config-O.yaml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-O.yaml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/YAMLConfiguration/config-O.yaml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-U.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/YAMLConfiguration/config-U.yaml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-U.yaml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/YAMLConfiguration/config-U.yaml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/YAMLConfiguration/config.yaml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config.yaml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/YAMLConfiguration/config.yaml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/config-system.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/config-system.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/config-system.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/config-system.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/fallback/config-fallback-merge.xml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/fallback/config-fallback-merge.xml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-override.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/fallback/config-fallback-override.json
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-override.json
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/fallback/config-fallback-override.json

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-union.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/fallback/config-fallback-union.yaml
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-union.yaml
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/fallback/config-fallback-union.yaml

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/fallback/config-fallback.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/fallback/config-fallback.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-M.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/java-properties/config-M.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-M.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/java-properties/config-M.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-O.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/java-properties/config-O.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-O.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/java-properties/config-O.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-U.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/java-properties/config-U.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-U.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/java-properties/config-U.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/java-properties/config.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/java-properties/config.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-at.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-at.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-at.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-at.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-tf.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-tf.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-tf.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-tf.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-vf.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-vf.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-vf.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-vf.properties

diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config.properties
similarity index 100%
rename from common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config.properties
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config.properties