Controller Blueprints Nitrogen to Oxygen Migration

Changing package structure from org.onap.ccsdk.config to org.onap.ccsdk.features

Change-Id: I7d52b498f11ed892d547220cc4354298b6182c77
Issue-ID: CCSDK-560
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>

32 files changed, 247 insertions, 234 deletions

diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml
index 4f6b2936e..5ca679baf 100644
--- a/blueprints-processor/plugin/assignment-provider/pom.xml
+++ b/blueprints-processor/plugin/assignment-provider/pom.xml
@@ -105,11 +105,11 @@
                     <instructions>

                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.onap.ccsdk.config.assignment,

-                            org.onap.ccsdk.config.assignment.data,

-                            org.onap.ccsdk.config.assignment.service,

-                            org.onap.ccsdk.config.assignment.processor,

-                            org.onap.ccsdk.config.assignment.processor.custom

+                        <Export-Package>org.onap.ccsdk.features.assignment,

+                            org.onap.ccsdk.features.assignment.data,

+                            org.onap.ccsdk.features.assignment.service,

+                            org.onap.ccsdk.features.assignment.processor,

+                            org.onap.ccsdk.features.assignment.processor.custom

                         </Export-Package>

                     </instructions>

                 </configuration>

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/ConfigAssignmentConstants.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/ConfigAssignmentConstants.java
index 10e217b8c..3052a8611 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/ConfigAssignmentConstants.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/ConfigAssignmentConstants.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment;

+package org.onap.ccsdk.features.assignment;

 

 @SuppressWarnings("squid:S1118")

 public class ConfigAssignmentConstants {

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/data/ResourceAssignmentData.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/data/ResourceAssignmentData.java
index 816c943f3..2bd067461 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/data/ResourceAssignmentData.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/data/ResourceAssignmentData.java
@@ -15,12 +15,13 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.data;

+package org.onap.ccsdk.features.assignment.data;

 

 import java.util.HashMap;

 import java.util.List;

 import java.util.Map;

-import org.onap.ccsdk.config.model.data.ResourceAssignment;

+

+import org.onap.ccsdk.features.model.data.ResourceAssignment;

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

 

 public class ResourceAssignmentData {

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/DBResourceProcessor.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessor.java
index 5f3e6094c..132d03c4f 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/DBResourceProcessor.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessor.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.processor;

+package org.onap.ccsdk.features.assignment.processor;

 

 import java.util.HashMap;

 import java.util.List;

@@ -23,17 +23,17 @@ import java.util.Map;
 import org.apache.commons.collections.CollectionUtils;

 import org.apache.commons.collections.MapUtils;

 import org.apache.commons.lang3.StringUtils;

-import org.onap.ccsdk.config.assignment.service.ConfigAssignmentUtils;

-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;

-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.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.service.ComponentNode;

-import org.onap.ccsdk.config.model.utils.JsonUtils;

-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;

+import org.onap.ccsdk.features.assignment.service.ConfigAssignmentUtils;

+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;

+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.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.service.ComponentNode;

+import org.onap.ccsdk.features.model.utils.JsonUtils;

+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;

 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/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/DefaultResourceProcessor.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessor.java
index aac13cb9d..563d5b523 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/DefaultResourceProcessor.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessor.java
@@ -15,18 +15,18 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.processor;

+package org.onap.ccsdk.features.assignment.processor;

 

 import java.util.List;

 import java.util.Map;

 import org.apache.commons.lang3.StringUtils;

-import org.onap.ccsdk.config.assignment.service.ConfigAssignmentUtils;

-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;

-import org.onap.ccsdk.config.model.ConfigModelConstant;

-import org.onap.ccsdk.config.model.ConfigModelException;

-import org.onap.ccsdk.config.model.data.ResourceAssignment;

-import org.onap.ccsdk.config.model.service.ComponentNode;

-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;

+import org.onap.ccsdk.features.assignment.service.ConfigAssignmentUtils;

+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;

+import org.onap.ccsdk.features.model.ConfigModelConstant;

+import org.onap.ccsdk.features.model.ConfigModelException;

+import org.onap.ccsdk.features.model.data.ResourceAssignment;

+import org.onap.ccsdk.features.model.service.ComponentNode;

+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;

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

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

 

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/InputResourceProcessor.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessor.java
index e32e7af51..6c73b08de 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/InputResourceProcessor.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessor.java
@@ -15,17 +15,17 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.processor;

+package org.onap.ccsdk.features.assignment.processor;

 

 import java.util.List;

 import java.util.Map;

 import org.apache.commons.lang3.StringUtils;

-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;

-import org.onap.ccsdk.config.model.ConfigModelConstant;

-import org.onap.ccsdk.config.model.ConfigModelException;

-import org.onap.ccsdk.config.model.data.ResourceAssignment;

-import org.onap.ccsdk.config.model.service.ComponentNode;

-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;

+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;

+import org.onap.ccsdk.features.model.ConfigModelConstant;

+import org.onap.ccsdk.features.model.ConfigModelException;

+import org.onap.ccsdk.features.model.data.ResourceAssignment;

+import org.onap.ccsdk.features.model.service.ComponentNode;

+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;

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

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

 

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/MdsalResourceProcessor.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessor.java
index 15528e13e..dfc041cee 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/MdsalResourceProcessor.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessor.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.processor;

+package org.onap.ccsdk.features.assignment.processor;

 

 import java.util.HashMap;

 import java.util.List;

@@ -23,17 +23,17 @@ import java.util.Map;
 import org.apache.commons.collections.CollectionUtils;

 import org.apache.commons.collections.MapUtils;

 import org.apache.commons.lang3.StringUtils;

-import org.onap.ccsdk.config.assignment.service.ConfigAssignmentUtils;

-import org.onap.ccsdk.config.model.ConfigModelConstant;

-import org.onap.ccsdk.config.model.ConfigModelException;

-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.service.ComponentNode;

-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;

-import org.onap.ccsdk.config.model.utils.TransformationUtils;

-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;

-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;

+import org.onap.ccsdk.features.assignment.service.ConfigAssignmentUtils;

+import org.onap.ccsdk.features.model.ConfigModelConstant;

+import org.onap.ccsdk.features.model.ConfigModelException;

+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.service.ComponentNode;

+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;

+import org.onap.ccsdk.features.model.utils.TransformationUtils;

+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;

+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/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/ProcessorFactory.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/ProcessorFactory.java
index 5fcedd87f..bb620a1a3 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/ProcessorFactory.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/ProcessorFactory.java
@@ -15,13 +15,13 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.processor;

+package org.onap.ccsdk.features.assignment.processor;

 

-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;

-import org.onap.ccsdk.config.model.ConfigModelConstant;

-import org.onap.ccsdk.config.model.service.ComponentNode;

-import org.onap.ccsdk.config.model.service.ComponentNodeService;

-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;

+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;

+import org.onap.ccsdk.features.model.ConfigModelConstant;

+import org.onap.ccsdk.features.model.service.ComponentNode;

+import org.onap.ccsdk.features.model.service.ComponentNodeService;

+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;

 

 public class ProcessorFactory {

 

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/ResourceAssignmentProcessor.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/ResourceAssignmentProcessor.java
index 70d9abc68..3ee49f085 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/ResourceAssignmentProcessor.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/ResourceAssignmentProcessor.java
@@ -15,15 +15,15 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.processor;

+package org.onap.ccsdk.features.assignment.processor;

 

 import java.util.ArrayList;

 import java.util.HashMap;

 import java.util.List;

 import java.util.Map;

 import org.apache.commons.collections.CollectionUtils;

-import org.onap.ccsdk.config.model.data.ResourceAssignment;

-import org.onap.ccsdk.config.model.utils.TopologicalSortingUtils;

+import org.onap.ccsdk.features.model.data.ResourceAssignment;

+import org.onap.ccsdk.features.model.utils.TopologicalSortingUtils;

 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/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentNode.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNode.java
index 8ed0b71fc..aaeadcabd 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentNode.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNode.java
@@ -15,23 +15,23 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.service;

+package org.onap.ccsdk.features.assignment.service;

 

 import java.util.HashMap;

 import java.util.List;

 import java.util.Map;

 import org.apache.commons.collections.MapUtils;

 import org.apache.commons.lang3.StringUtils;

-import org.onap.ccsdk.config.assignment.ConfigAssignmentConstants;

-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;

-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;

-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;

-import org.onap.ccsdk.config.model.ConfigModelConstant;

-import org.onap.ccsdk.config.model.service.ComponentNode;

-import org.onap.ccsdk.config.model.service.ComponentNodeService;

-import org.onap.ccsdk.config.model.service.ConfigModelService;

-import org.onap.ccsdk.config.model.utils.TransformationUtils;

-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;

+import org.onap.ccsdk.features.assignment.ConfigAssignmentConstants;

+import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;

+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;

+import org.onap.ccsdk.features.generator.service.ConfigGeneratorService;

+import org.onap.ccsdk.features.model.ConfigModelConstant;

+import org.onap.ccsdk.features.model.service.ComponentNode;

+import org.onap.ccsdk.features.model.service.ComponentNodeService;

+import org.onap.ccsdk.features.model.service.ConfigModelService;

+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 com.att.eelf.configuration.EELFLogger;

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentPersistService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentPersistService.java
index 320f4369b..c4083f86d 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentPersistService.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentPersistService.java
@@ -15,20 +15,20 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.service;

+package org.onap.ccsdk.features.assignment.service;

 

 import java.util.List;

 import org.apache.commons.collections.CollectionUtils;

 import org.apache.commons.lang3.StringUtils;

-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;

-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;

-import org.onap.ccsdk.config.data.adaptor.domain.ResourceAssignmentData;

-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.data.ResourceAssignment;

-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;

-import org.onap.ccsdk.config.model.utils.TransformationUtils;

+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;

+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;

+import org.onap.ccsdk.features.data.adaptor.domain.ResourceAssignmentData;

+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.data.ResourceAssignment;

+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;

+import org.onap.ccsdk.features.model.utils.TransformationUtils;

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

 import com.att.eelf.configuration.EELFLogger;

 import com.att.eelf.configuration.EELFManager;

@@ -43,7 +43,7 @@ public class ConfigAssignmentPersistService {
         this.configResourceService = configResourceService;

     }

 

-    public void saveResourceMapping(org.onap.ccsdk.config.assignment.data.ResourceAssignmentData resourceAssignmentData,

+    public void saveResourceMapping(org.onap.ccsdk.features.assignment.data.ResourceAssignmentData resourceAssignmentData,

             String templateName, List<ResourceAssignment> resourceAssignments) throws SvcLogicException {

         try {

 

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentProcessService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentProcessService.java
index 85ff82db6..61c035960 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentProcessService.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentProcessService.java
@@ -15,28 +15,28 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.service;

+package org.onap.ccsdk.features.assignment.service;

 

 import java.util.HashMap;

 import java.util.List;

 import java.util.Map;

 import org.apache.commons.collections.CollectionUtils;

 import org.apache.commons.lang3.StringUtils;

-import org.onap.ccsdk.config.assignment.ConfigAssignmentConstants;

-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;

-import org.onap.ccsdk.config.assignment.processor.ProcessorFactory;

-import org.onap.ccsdk.config.assignment.processor.ResourceAssignmentProcessor;

-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;

-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;

-import org.onap.ccsdk.config.model.ConfigModelConstant;

-import org.onap.ccsdk.config.model.data.ResourceAssignment;

-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;

-import org.onap.ccsdk.config.model.service.ComponentNode;

-import org.onap.ccsdk.config.model.service.ComponentNodeService;

-import org.onap.ccsdk.config.model.service.ConfigModelService;

-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;

-import org.onap.ccsdk.config.model.utils.TransformationUtils;

-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;

+import org.onap.ccsdk.features.assignment.ConfigAssignmentConstants;

+import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;

+import org.onap.ccsdk.features.assignment.processor.ProcessorFactory;

+import org.onap.ccsdk.features.assignment.processor.ResourceAssignmentProcessor;

+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;

+import org.onap.ccsdk.features.generator.service.ConfigGeneratorService;

+import org.onap.ccsdk.features.model.ConfigModelConstant;

+import org.onap.ccsdk.features.model.data.ResourceAssignment;

+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;

+import org.onap.ccsdk.features.model.service.ComponentNode;

+import org.onap.ccsdk.features.model.service.ComponentNodeService;

+import org.onap.ccsdk.features.model.service.ConfigModelService;

+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;

+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 com.att.eelf.configuration.EELFLogger;

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentService.java
index 4866f258b..969f84679 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentService.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentService.java
@@ -15,11 +15,12 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.service;

+package org.onap.ccsdk.features.assignment.service;

 

 import java.util.List;

-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;

-import org.onap.ccsdk.config.model.data.ResourceAssignment;

+

+import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;

+import org.onap.ccsdk.features.model.data.ResourceAssignment;

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

 

 public interface ConfigAssignmentService {

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentServiceImpl.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentServiceImpl.java
index 9e2bdcf8d..560d0b1ff 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentServiceImpl.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentServiceImpl.java
@@ -15,16 +15,17 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.service;

+package org.onap.ccsdk.features.assignment.service;

 

 import java.util.List;

-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;

-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;

-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;

-import org.onap.ccsdk.config.model.data.ResourceAssignment;

-import org.onap.ccsdk.config.model.service.ComponentNodeService;

-import org.onap.ccsdk.config.model.service.ConfigModelService;

-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;

+

+import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;

+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;

+import org.onap.ccsdk.features.generator.service.ConfigGeneratorService;

+import org.onap.ccsdk.features.model.data.ResourceAssignment;

+import org.onap.ccsdk.features.model.service.ComponentNodeService;

+import org.onap.ccsdk.features.model.service.ConfigModelService;

+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;

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

 import com.att.eelf.configuration.EELFLogger;

 import com.att.eelf.configuration.EELFManager;

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentUtils.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentUtils.java
index 32adbe249..1d7df6b58 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentUtils.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.service;

+package org.onap.ccsdk.features.assignment.service;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -24,19 +24,19 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.IteratorUtils;

 import org.apache.commons.collections.MapUtils;

 import org.apache.commons.lang3.StringUtils;

-import org.onap.ccsdk.config.data.adaptor.domain.ResourceAssignmentData;

-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.DataType;

-import org.onap.ccsdk.config.model.data.EntrySchema;

-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.domain.ResourceDictionary;

-import org.onap.ccsdk.config.model.utils.JsonUtils;

-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;

-import org.onap.ccsdk.config.model.utils.TransformationUtils;

+import org.onap.ccsdk.features.data.adaptor.domain.ResourceAssignmentData;

+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.DataType;

+import org.onap.ccsdk.features.model.data.EntrySchema;

+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.domain.ResourceDictionary;

+import org.onap.ccsdk.features.model.utils.JsonUtils;

+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;

+import org.onap.ccsdk.features.model.utils.TransformationUtils;

 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/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigPreviewService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewService.java
index ae5c01c88..071b5a548 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigPreviewService.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewService.java
@@ -15,20 +15,20 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.service;

+package org.onap.ccsdk.features.assignment.service;

 

 import java.util.HashMap;

 import java.util.List;

 import java.util.Map;

 import org.apache.commons.collections.CollectionUtils;

 import org.apache.commons.lang3.StringUtils;

-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;

-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;

-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;

-import org.onap.ccsdk.config.generator.data.ConfigGeneratorInfo;

-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;

-import org.onap.ccsdk.config.model.ConfigModelConstant;

-import org.onap.ccsdk.config.model.service.ConfigModelService;

+import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;

+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;

+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;

+import org.onap.ccsdk.features.generator.data.ConfigGeneratorInfo;

+import org.onap.ccsdk.features.generator.service.ConfigGeneratorService;

+import org.onap.ccsdk.features.model.ConfigModelConstant;

+import org.onap.ccsdk.features.model.service.ConfigModelService;

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

 import com.att.eelf.configuration.EELFLogger;

 import com.att.eelf.configuration.EELFManager;

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ResourceDictionaryService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceDictionaryService.java
index 50562b0e8..ec586f493 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ResourceDictionaryService.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceDictionaryService.java
@@ -15,20 +15,20 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.service;

+package org.onap.ccsdk.features.assignment.service;

 

 import java.util.ArrayList;

 import java.util.HashMap;

 import java.util.List;

 import java.util.Map;

 import org.apache.commons.lang3.StringUtils;

-import org.onap.ccsdk.config.model.data.ResourceAssignment;

-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;

-import org.onap.ccsdk.config.model.domain.ResourceDictionary;

-import org.onap.ccsdk.config.model.utils.TransformationUtils;

-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;

-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;

-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;

+import org.onap.ccsdk.features.model.data.ResourceAssignment;

+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;

+import org.onap.ccsdk.features.model.domain.ResourceDictionary;

+import org.onap.ccsdk.features.model.utils.TransformationUtils;

+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;

+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;

+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;

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

 import com.att.eelf.configuration.EELFLogger;

 import com.att.eelf.configuration.EELFManager;

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ResourceModelService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceModelService.java
index 9f3013b73..befa36a34 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ResourceModelService.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceModelService.java
@@ -15,17 +15,17 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.service;

+package org.onap.ccsdk.features.assignment.service;

 

 import java.util.HashMap;

 import java.util.List;

 import java.util.Map;

 import org.apache.commons.collections.CollectionUtils;

 import org.apache.commons.lang3.StringUtils;

-import org.onap.ccsdk.config.model.data.ResourceAssignment;

-import org.onap.ccsdk.config.model.service.ConfigModelService;

-import org.onap.ccsdk.config.model.utils.TransformationUtils;

-import org.onap.ccsdk.config.model.validator.ResourceAssignmentValidator;

+import org.onap.ccsdk.features.model.data.ResourceAssignment;

+import org.onap.ccsdk.features.model.service.ConfigModelService;

+import org.onap.ccsdk.features.model.utils.TransformationUtils;

+import org.onap.ccsdk.features.model.validator.ResourceAssignmentValidator;

 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/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index baa6bdbc5..f15429dfe 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -21,23 +21,23 @@
 	odl:use-default-for-reference-types="true">

 

 	<reference id="componentNodeService"

-		interface="org.onap.ccsdk.config.model.service.ComponentNodeService" />

+		interface="org.onap.ccsdk.features.model.service.ComponentNodeService" />

 

 	<reference id="configResourceService"

-		interface="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService" />

+		interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />

 

 	<reference id="configModelService"

-		interface="org.onap.ccsdk.config.model.service.ConfigModelService" />

+		interface="org.onap.ccsdk.features.model.service.ConfigModelService" />

 

 	<reference id="configRestAdaptorService"

-		interface="org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService" />

+		interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />

 

 	<reference id="configGeneratorService"

-		interface="org.onap.ccsdk.config.generator.service.ConfigGeneratorService" />

+		interface="org.onap.ccsdk.features.generator.service.ConfigGeneratorService" />

 

 	<!-- Expose the Common Component Bean -->

 	<bean id="configAssignmentNode"

-		class="org.onap.ccsdk.config.assignment.service.ConfigAssignmentNode">

+		class="org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode">

 		<argument ref="configResourceService" />

 		<argument ref="configRestAdaptorService" />

 		<argument ref="configModelService" />

@@ -46,10 +46,10 @@
 	</bean>

 

 	<service ref="configAssignmentNode"

-		interface="org.onap.ccsdk.config.assignment.service.ConfigAssignmentNode" />

+		interface="org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode" />

 

 	<bean id="configAssignmentService"

-		class="org.onap.ccsdk.config.assignment.service.ConfigAssignmentServiceImpl">

+		class="org.onap.ccsdk.features.assignment.service.ConfigAssignmentServiceImpl">

 		<argument ref="configResourceService" />

 		<argument ref="configRestAdaptorService" />

 		<argument ref="configModelService" />

@@ -58,6 +58,6 @@
 	</bean>

 

 	<service ref="configAssignmentService"

-		interface="org.onap.ccsdk.config.assignment.service.ConfigAssignmentService" />

+		interface="org.onap.ccsdk.features.assignment.service.ConfigAssignmentService" />

 

 </blueprint>

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DBResourceProcessorTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessorTest.java
index 5a704e995..43a4881d5 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DBResourceProcessorTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.processor;

+package org.onap.ccsdk.features.assignment.processor;

 

 import static org.mockito.Matchers.any;

 import java.io.File;

@@ -37,13 +37,14 @@ import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;

 import org.mockito.runners.MockitoJUnitRunner;

 import org.mockito.stubbing.Answer;

-import org.onap.ccsdk.config.assignment.service.ConfigResourceAssignmentTestUtils;

-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.data.ResourceAssignment;

-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;

-import org.onap.ccsdk.config.model.utils.TransformationUtils;

+import org.onap.ccsdk.features.assignment.processor.DBResourceProcessor;

+import org.onap.ccsdk.features.assignment.service.ConfigResourceAssignmentTestUtils;

+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.data.ResourceAssignment;

+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;

+import org.onap.ccsdk.features.model.utils.TransformationUtils;

 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/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DefaultResourceProcessorTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessorTest.java
index 7e8d14201..df3800387 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DefaultResourceProcessorTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.processor;

+package org.onap.ccsdk.features.assignment.processor;

 

 import static org.mockito.Matchers.any;

 import java.io.File;

@@ -35,13 +35,14 @@ import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;

 import org.mockito.runners.MockitoJUnitRunner;

 import org.mockito.stubbing.Answer;

-import org.onap.ccsdk.config.assignment.service.ConfigResourceAssignmentTestUtils;

-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.data.ResourceAssignment;

-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;

-import org.onap.ccsdk.config.model.utils.TransformationUtils;

+import org.onap.ccsdk.features.assignment.processor.DefaultResourceProcessor;

+import org.onap.ccsdk.features.assignment.service.ConfigResourceAssignmentTestUtils;

+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.data.ResourceAssignment;

+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;

+import org.onap.ccsdk.features.model.utils.TransformationUtils;

 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/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/InputResourceProcessorTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessorTest.java
index 2aabdb3d9..cd0b7828e 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/InputResourceProcessorTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.processor;

+package org.onap.ccsdk.features.assignment.processor;

 

 import static org.mockito.Matchers.any;

 import java.io.File;

@@ -35,13 +35,14 @@ import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;

 import org.mockito.runners.MockitoJUnitRunner;

 import org.mockito.stubbing.Answer;

-import org.onap.ccsdk.config.assignment.service.ConfigResourceAssignmentTestUtils;

-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.data.ResourceAssignment;

-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;

-import org.onap.ccsdk.config.model.utils.TransformationUtils;

+import org.onap.ccsdk.features.assignment.processor.InputResourceProcessor;

+import org.onap.ccsdk.features.assignment.service.ConfigResourceAssignmentTestUtils;

+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.data.ResourceAssignment;

+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;

+import org.onap.ccsdk.features.model.utils.TransformationUtils;

 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/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/MdsalResourceProcessorTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessorTest.java
index 2d651c836..5f73f32e3 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/MdsalResourceProcessorTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.processor;

+package org.onap.ccsdk.features.assignment.processor;

 

 import java.io.File;

 import java.nio.charset.Charset;

@@ -33,12 +33,13 @@ import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;

 import org.mockito.runners.MockitoJUnitRunner;

 import org.mockito.stubbing.Answer;

-import org.onap.ccsdk.config.assignment.service.ConfigResourceAssignmentTestUtils;

-import org.onap.ccsdk.config.model.ConfigModelConstant;

-import org.onap.ccsdk.config.model.data.ResourceAssignment;

-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;

-import org.onap.ccsdk.config.model.utils.TransformationUtils;

-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;

+import org.onap.ccsdk.features.assignment.processor.MdsalResourceProcessor;

+import org.onap.ccsdk.features.assignment.service.ConfigResourceAssignmentTestUtils;

+import org.onap.ccsdk.features.model.ConfigModelConstant;

+import org.onap.ccsdk.features.model.data.ResourceAssignment;

+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;

+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 com.att.eelf.configuration.EELFLogger;

 import com.att.eelf.configuration.EELFManager;

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentNodeTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNodeTest.java
index 9ad94dcd0..41911e91d 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentNodeTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNodeTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.service;

+package org.onap.ccsdk.features.assignment.service;

 

 import java.io.File;

 import java.nio.charset.Charset;

@@ -33,17 +33,18 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;

 import org.mockito.MockitoAnnotations;

 import org.mockito.runners.MockitoJUnitRunner;

-import org.onap.ccsdk.config.assignment.ConfigAssignmentConstants;

-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;

-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;

-import org.onap.ccsdk.config.generator.service.ConfigGeneratorServiceImpl;

-import org.onap.ccsdk.config.model.ConfigModelConstant;

-import org.onap.ccsdk.config.model.service.ComponentNodeDelegate;

-import org.onap.ccsdk.config.model.service.ComponentNodeService;

-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.rest.adaptor.service.ConfigRestAdaptorService;

+import org.onap.ccsdk.features.assignment.ConfigAssignmentConstants;

+import org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode;

+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;

+import org.onap.ccsdk.features.generator.service.ConfigGeneratorService;

+import org.onap.ccsdk.features.generator.service.ConfigGeneratorServiceImpl;

+import org.onap.ccsdk.features.model.ConfigModelConstant;

+import org.onap.ccsdk.features.model.service.ComponentNodeDelegate;

+import org.onap.ccsdk.features.model.service.ComponentNodeService;

+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.rest.adaptor.service.ConfigRestAdaptorService;

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

 import org.osgi.framework.BundleContext;

 import com.att.eelf.configuration.EELFLogger;

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigPreviewServiceTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewServiceTest.java
index 75b7f2e28..1e0b4a299 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigPreviewServiceTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewServiceTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.service;

+package org.onap.ccsdk.features.assignment.service;

 

 import java.io.File;

 import java.nio.charset.Charset;

@@ -29,14 +29,16 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;

 import org.mockito.MockitoAnnotations;

 import org.mockito.runners.MockitoJUnitRunner;

-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;

-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;

-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;

-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;

-import org.onap.ccsdk.config.generator.service.ConfigGeneratorServiceImpl;

-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.assignment.data.ResourceAssignmentData;

+import org.onap.ccsdk.features.assignment.service.ConfigPreviewService;

+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;

+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;

+import org.onap.ccsdk.features.generator.service.ConfigGeneratorService;

+import org.onap.ccsdk.features.generator.service.ConfigGeneratorServiceImpl;

+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 com.att.eelf.configuration.EELFLogger;

 import com.att.eelf.configuration.EELFManager;

 

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigResourceAssignmentTestUtils.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigResourceAssignmentTestUtils.java
index ee1c076ae..5ce2c9a1d 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigResourceAssignmentTestUtils.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigResourceAssignmentTestUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.service;

+package org.onap.ccsdk.features.assignment.service;

 

 import static org.mockito.Matchers.any;

 import static org.mockito.Matchers.anyString;

@@ -33,14 +33,15 @@ import org.mockito.Matchers;
 import org.mockito.Mockito;

 import org.mockito.invocation.InvocationOnMock;

 import org.mockito.stubbing.Answer;

-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;

-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.data.dict.ResourceDefinition;

-import org.onap.ccsdk.config.model.domain.ConfigModel;

-import org.onap.ccsdk.config.model.domain.ConfigModelContent;

-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;

+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;

+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.data.dict.ResourceDefinition;

+import org.onap.ccsdk.features.model.domain.ConfigModel;

+import org.onap.ccsdk.features.model.domain.ConfigModelContent;

+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;

+

 import com.att.eelf.configuration.EELFLogger;

 import com.att.eelf.configuration.EELFManager;

 import com.fasterxml.jackson.core.type.TypeReference;

@@ -68,10 +69,10 @@ public class ConfigResourceAssignmentTestUtils {
 

         Mockito.doAnswer(new Answer<ConfigModel>() {

             @Override

-            public org.onap.ccsdk.config.model.domain.ConfigModel answer(InvocationOnMock invocationOnMock)

+            public org.onap.ccsdk.features.model.domain.ConfigModel answer(InvocationOnMock invocationOnMock)

                     throws Throwable {

                 Object[] args = invocationOnMock.getArguments();

-                org.onap.ccsdk.config.model.domain.ConfigModel serviceArtifact = null;

+                org.onap.ccsdk.features.model.domain.ConfigModel serviceArtifact = null;

                 if (args != null && args.length == 3) {

 

                     logger.info("Artifact info " + Arrays.asList(args));

@@ -102,7 +103,7 @@ public class ConfigResourceAssignmentTestUtils {
                         configModelContents.add(configModelTemplateContent);

                     }

 

-                    serviceArtifact = new org.onap.ccsdk.config.model.domain.ConfigModel();

+                    serviceArtifact = new org.onap.ccsdk.features.model.domain.ConfigModel();

                     serviceArtifact.setArtifactName(String.valueOf(args[0]));

                     serviceArtifact.setArtifactVersion(String.valueOf(args[1]));

                     serviceArtifact.setPublished("Y");

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentGenerationTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentGenerationTest.java
index 3dc7da7eb..04147d90f 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentGenerationTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentGenerationTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.service;

+package org.onap.ccsdk.features.assignment.service;

 

 import java.nio.charset.Charset;

 import java.util.HashMap;

@@ -24,11 +24,12 @@ import java.util.Map;
 import org.apache.commons.io.IOUtils;

 import org.junit.Assert;

 import org.junit.Test;

-import org.onap.ccsdk.config.model.ConfigModelConstant;

-import org.onap.ccsdk.config.model.ValidTypes;

-import org.onap.ccsdk.config.model.data.ResourceAssignment;

-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;

-import org.onap.ccsdk.config.model.utils.TransformationUtils;

+import org.onap.ccsdk.features.model.ConfigModelConstant;

+import org.onap.ccsdk.features.model.ValidTypes;

+import org.onap.ccsdk.features.model.data.ResourceAssignment;

+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;

+import org.onap.ccsdk.features.model.utils.TransformationUtils;

+

 import com.att.eelf.configuration.EELFLogger;

 import com.att.eelf.configuration.EELFManager;

 import com.fasterxml.jackson.databind.JsonNode;

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentValidation.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentValidation.java
index d708404f5..a3be02920 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentValidation.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentValidation.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.service;

+package org.onap.ccsdk.features.assignment.service;

 

 import java.io.IOException;

 import java.nio.charset.Charset;

@@ -25,10 +25,11 @@ import org.junit.Assert;
 import org.junit.Rule;

 import org.junit.Test;

 import org.junit.rules.ExpectedException;

-import org.onap.ccsdk.config.model.ConfigModelException;

-import org.onap.ccsdk.config.model.data.ResourceAssignment;

-import org.onap.ccsdk.config.model.utils.TransformationUtils;

-import org.onap.ccsdk.config.model.validator.ResourceAssignmentValidator;

+import org.onap.ccsdk.features.model.ConfigModelException;

+import org.onap.ccsdk.features.model.data.ResourceAssignment;

+import org.onap.ccsdk.features.model.utils.TransformationUtils;

+import org.onap.ccsdk.features.model.validator.ResourceAssignmentValidator;

+

 import com.att.eelf.configuration.EELFLogger;

 import com.att.eelf.configuration.EELFManager;

 

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/TopologicalSortingTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/TopologicalSortingTest.java
index e4b7f5dee..f6e8871a6 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/TopologicalSortingTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/TopologicalSortingTest.java
@@ -15,16 +15,16 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.assignment.service;

+package org.onap.ccsdk.features.assignment.service;

 

 import java.nio.charset.Charset;

 import java.util.List;

 import org.apache.commons.io.IOUtils;

 import org.junit.Assert;

 import org.junit.Test;

-import org.onap.ccsdk.config.assignment.processor.ResourceAssignmentProcessor;

-import org.onap.ccsdk.config.model.data.ResourceAssignment;

-import org.onap.ccsdk.config.model.utils.TransformationUtils;

+import org.onap.ccsdk.features.assignment.processor.ResourceAssignmentProcessor;

+import org.onap.ccsdk.features.model.data.ResourceAssignment;

+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/assignment-provider/src/test/resources/service_templates/resource_assignment.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json
index 0e29fe160..cbea6a82c 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json
+++ b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json
@@ -139,7 +139,7 @@
 			"resource-assignment": {

 				"type": "component-resource-assignment",

 				"interfaces": {

-					"org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {

+					"org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {

 						"operations": {

 							"process": {

 								"inputs": {

@@ -243,7 +243,7 @@
 				}

 			},

 			"interfaces": {

-				"org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {

+				"org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {

 					"operations": {

 						"process": {

 							"inputs": {

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json
index 6347f4223..4cbb8fa25 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json
+++ b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json
@@ -139,7 +139,7 @@
 			"resource-assignment": {

 				"type": "component-resource-assignment",

 				"interfaces": {

-					"org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {

+					"org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {

 						"operations": {

 							"process": {

 								"inputs": {

@@ -245,7 +245,7 @@
 				}

 			},

 			"interfaces": {

-				"org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {

+				"org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {

 					"operations": {

 						"process": {

 							"inputs": {

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json
index 20207a87b..7113b70c2 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json
+++ b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json
@@ -224,7 +224,7 @@
 			"resource-assignment": {

 				"type": "component-resource-assignment",

 				"interfaces": {

-					"org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {

+					"org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {

 						"operations": {

 							"process": {

 								"inputs": {

@@ -328,7 +328,7 @@
 				}

 			},

 			"interfaces": {

-				"org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {

+				"org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {

 					"operations": {

 						"process": {

 							"inputs": {