diff options
author | Singal, Kapil (ks220y) <ks220y@att.com> | 2018-09-12 16:26:03 -0400 |
---|---|---|
committer | Singal, Kapil (ks220y) <ks220y@att.com> | 2018-09-12 16:26:03 -0400 |
commit | 280a0f6c73ab1c1aed9ee87fbd053d01d3838d70 (patch) | |
tree | 4c72a3ede9e9cecdff1ca4835e2df886b7e703e2 /blueprints-processor/plugin/assignment-provider/src/test/java | |
parent | 37a244dfa9b485c2832f1882930e0e67238f31fb (diff) |
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>
Diffstat (limited to 'blueprints-processor/plugin/assignment-provider/src/test/java')
-rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessorTest.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DBResourceProcessorTest.java) | 17 | ||||
-rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessorTest.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DefaultResourceProcessorTest.java) | 17 | ||||
-rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessorTest.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/InputResourceProcessorTest.java) | 17 | ||||
-rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessorTest.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/MdsalResourceProcessorTest.java) | 15 | ||||
-rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNodeTest.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentNodeTest.java) | 25 | ||||
-rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewServiceTest.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigPreviewServiceTest.java) | 20 | ||||
-rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigResourceAssignmentTestUtils.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigResourceAssignmentTestUtils.java) | 25 | ||||
-rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentGenerationTest.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentGenerationTest.java) | 13 | ||||
-rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentValidation.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentValidation.java) | 11 | ||||
-rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/TopologicalSortingTest.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/TopologicalSortingTest.java) | 8 |
10 files changed, 89 insertions, 79 deletions
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;
|