12 files changed, 69 insertions, 55 deletions
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/ResourceDictionaryUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/ResourceDictionaryUtilsTest.java
index 1b3dc9c1f..a84f52f50 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/ResourceDictionaryUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/ResourceDictionaryUtilsTest.java
@@ -15,18 +15,20 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.model;
+package org.onap.ccsdk.features.model;
 
 import java.util.Arrays;
 import java.util.HashMap;
 import org.junit.Assert;
 import org.junit.Test;
-import org.onap.ccsdk.config.model.data.PropertyDefinition;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
-import org.onap.ccsdk.config.model.data.dict.SourcesDefinition;
-import org.onap.ccsdk.config.model.data.dict.SourcesProperties;
-import org.onap.ccsdk.config.model.utils.ResourceDictionaryUtils;
+import org.onap.ccsdk.features.model.ValidTypes;
+import org.onap.ccsdk.features.model.data.PropertyDefinition;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.data.dict.SourcesDefinition;
+import org.onap.ccsdk.features.model.data.dict.SourcesProperties;
+import org.onap.ccsdk.features.model.utils.ResourceDictionaryUtils;
+
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/JsonParserUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonParserUtilsTest.java
index 693c505e3..98943db7e 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/JsonParserUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonParserUtilsTest.java
@@ -15,10 +15,12 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.onap.ccsdk.features.model.utils.JsonParserUtils;
+
 import com.fasterxml.jackson.databind.JsonNode;
 
 public class JsonParserUtilsTest {
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/JsonUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonUtilsTest.java
index 5dd0fae27..d5db17008 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/JsonUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonUtilsTest.java
@@ -15,11 +15,13 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
 
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
-import org.onap.ccsdk.config.model.ValidTypes;
+import org.onap.ccsdk.features.model.ValidTypes;
+import org.onap.ccsdk.features.model.utils.JsonUtils;
+
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/ResourceAssignmentUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtilsTest.java
index 034d70d7d..53eb624b5 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/ResourceAssignmentUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtilsTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
 
 import static org.junit.Assert.assertTrue;
 import java.io.File;
@@ -24,12 +24,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.junit.Test;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.ConfigModelException;
-import org.onap.ccsdk.config.model.ValidTypes;
-import org.onap.ccsdk.config.model.data.PropertyDefinition;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.ConfigModelException;
+import org.onap.ccsdk.features.model.ValidTypes;
+import org.onap.ccsdk.features.model.data.PropertyDefinition;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/ServiceTemplateUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtilsTest.java
index 5364ae924..df330b69e 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/ServiceTemplateUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtilsTest.java
@@ -15,15 +15,16 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
 
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.Assert;
 import org.junit.Test;
-import org.onap.ccsdk.config.model.data.ArtifactDefinition;
-import org.onap.ccsdk.config.model.data.CapabilityAssignment;
-import org.onap.ccsdk.config.model.data.NodeTemplate;
+import org.onap.ccsdk.features.model.data.ArtifactDefinition;
+import org.onap.ccsdk.features.model.data.CapabilityAssignment;
+import org.onap.ccsdk.features.model.data.NodeTemplate;
+import org.onap.ccsdk.features.model.utils.ServiceTemplateUtils;
 
 public class ServiceTemplateUtilsTest {
 
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/TransformationUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/TransformationUtilsTest.java
index ca57e5fab..cfcf246cd 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/TransformationUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/TransformationUtilsTest.java
@@ -15,13 +15,15 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.Test;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+
 import com.fasterxml.jackson.databind.JsonNode;
 
 public class TransformationUtilsTest {
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/validator/ServiceTemplateValidationTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidationTest.java
index 4c5e6a99c..83ac18022 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/validator/ServiceTemplateValidationTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidationTest.java
@@ -15,11 +15,13 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.model.validator;
+package org.onap.ccsdk.features.model.validator;
 
 import java.nio.charset.Charset;
 import org.apache.commons.io.IOUtils;
 import org.junit.Test;
+import org.onap.ccsdk.features.model.validator.ServiceTemplateValidator;
+
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ComponentNodeTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ComponentNodeTest.java
index d73a622c6..9c048f48e 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ComponentNodeTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ComponentNodeTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.params.service;
+package org.onap.ccsdk.features.params.service;
 
 import static org.mockito.Matchers.any;
 import java.io.File;
@@ -36,15 +36,15 @@ import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.service.ComponentNodeDelegate;
-import org.onap.ccsdk.config.model.service.ComponentNodeServiceImpl;
-import org.onap.ccsdk.config.model.service.ConfigModelService;
-import org.onap.ccsdk.config.model.service.ConfigModelServiceImpl;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.service.ComponentNodeDelegate;
+import org.onap.ccsdk.features.model.service.ComponentNodeServiceImpl;
+import org.onap.ccsdk.features.model.service.ConfigModelService;
+import org.onap.ccsdk.features.model.service.ConfigModelServiceImpl;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.osgi.framework.BundleContext;
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ConfigModelServiceTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ConfigModelServiceTest.java
index 77972a63e..3e62fafd0 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ConfigModelServiceTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ConfigModelServiceTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.params.service;
+package org.onap.ccsdk.features.params.service;
 
 import static org.junit.Assert.fail;
 import java.io.File;
@@ -32,13 +32,13 @@ import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.data.ServiceTemplate;
-import org.onap.ccsdk.config.model.domain.ConfigModel;
-import org.onap.ccsdk.config.model.domain.ConfigModelContent;
-import org.onap.ccsdk.config.model.service.ConfigModelService;
-import org.onap.ccsdk.config.model.service.ConfigModelServiceImpl;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.data.ServiceTemplate;
+import org.onap.ccsdk.features.model.domain.ConfigModel;
+import org.onap.ccsdk.features.model.domain.ConfigModelContent;
+import org.onap.ccsdk.features.model.service.ConfigModelService;
+import org.onap.ccsdk.features.model.service.ConfigModelServiceImpl;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ExpressionUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ExpressionUtilsTest.java
index e72b0531f..a1e273a84 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ExpressionUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ExpressionUtilsTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.params.service;
+package org.onap.ccsdk.features.params.service;
 
 import java.io.File;
 import java.nio.charset.Charset;
@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.Map;
 import org.apache.commons.io.FileUtils;
 import org.junit.Test;
-import org.onap.ccsdk.config.model.utils.ExpressionUtils;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.model.utils.ExpressionUtils;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/MockComponentNode.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/MockComponentNode.java
index 00260c9e3..35f23bcb1 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/MockComponentNode.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/MockComponentNode.java
@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.params.service;
+package org.onap.ccsdk.features.params.service;
 
 import java.util.Map;
-import org.onap.ccsdk.config.model.service.ComponentNode;
+
+import org.onap.ccsdk.features.model.service.ComponentNode;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ServiceTemplateCreateUtils.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ServiceTemplateCreateUtils.java
index 52f540565..5c89d45ae 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ServiceTemplateCreateUtils.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ServiceTemplateCreateUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.params.service;
+package org.onap.ccsdk.features.params.service;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,14 +24,14 @@ import java.util.HashMap;
 import java.util.Map;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.data.DataType;
-import org.onap.ccsdk.config.model.data.NodeTemplate;
-import org.onap.ccsdk.config.model.data.NodeType;
-import org.onap.ccsdk.config.model.data.ServiceTemplate;
-import org.onap.ccsdk.config.model.data.TopologyTemplate;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.data.DataType;
+import org.onap.ccsdk.features.model.data.NodeTemplate;
+import org.onap.ccsdk.features.model.data.NodeType;
+import org.onap.ccsdk.features.model.data.ServiceTemplate;
+import org.onap.ccsdk.features.model.data.TopologyTemplate;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
 
 public class ServiceTemplateCreateUtils {