Migrate ccdsk/apps to ccsdk/cds

Change-Id: I020a2ccec4e691717f888e8bd2afec91a7c4e987 Issue-ID: CCSDK-1178 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
author: Alexis de Talhouët <adetalhouet89@gmail.com> 2019-03-26 09:49:13 -0400
committer: Alexis de Talhouët <adetalhouet89@gmail.com> 2019-03-26 09:49:13 -0400
commit: 72d22a4339db09824d46746dacbba1e141763dc0 (patch)
tree: 7fbfea4b81afca0bc0c95e5d4b810f236f4dea29 /ms/controllerblueprints/modules/service/src/test
parent: ef6983b670796becfa66c69075c1829e8f9aef4b (diff)
21 files changed, 0 insertions, 1990 deletions
diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/DatabaseConfig.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/DatabaseConfig.java
deleted file mode 100644
index db35fe66..00000000
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/DatabaseConfig.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints;
-
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import javax.sql.DataSource;
-
-/**
- * DatabaseConfig.java Purpose: Provide Configuration Generator DatabaseConfig Information
- *
- * @author Brinda Santh
- * @version 1.0
- */
-@Configuration
-@EntityScan("org.onap.ccsdk.apps.controllerblueprints.service.domain")
-@EnableTransactionManagement
-@EnableJpaRepositories("org.onap.ccsdk.apps.controllerblueprints.service.repository")
-@EnableJpaAuditing
-public class DatabaseConfig {
-    /**
-     * This is a entityManagerFactory method
-     * 
-     * @param dataSource
-     * @return LocalContainerEntityManagerFactoryBean
-     */
-
-    @Bean
-    public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource) {
-        HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
-        vendorAdapter.setGenerateDdl(true);
-        vendorAdapter.setShowSql(false);
-        LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
-        factory.setJpaVendorAdapter(vendorAdapter);
-        factory.setPackagesToScan("org.onap.ccsdk.apps.controllerblueprints.service.domain");
-        factory.setDataSource(dataSource);
-        return factory;
-    }
-
-}
diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/TestApplication.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/TestApplication.java
deleted file mode 100644
index 537429f0..00000000
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/TestApplication.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
-
-
-@SpringBootApplication
-@ComponentScan(basePackages = {"org.onap.ccsdk.apps.controllerblueprints"})
-@EnableAutoConfiguration
-public class TestApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(TestApplication.class, args);
-    }
-
-}
-\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/ModelTypeServiceTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/ModelTypeServiceTest.java
deleted file mode 100644
index a94df6ae..00000000
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/ModelTypeServiceTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- *  Copyright © 2018 IBM.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.service;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import org.junit.Assert;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
-import org.onap.ccsdk.apps.controllerblueprints.TestApplication;
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants;
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;
-import org.onap.ccsdk.apps.controllerblueprints.service.domain.ModelType;
-import org.onap.ccsdk.apps.controllerblueprints.service.handler.ModelTypeHandler;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.annotation.Commit;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-@RunWith(SpringRunner.class)
-@DataJpaTest
-@Transactional(propagation = Propagation.NOT_SUPPORTED)
-@ContextConfiguration(classes = {TestApplication.class})
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class ModelTypeServiceTest {
-    private static EELFLogger log = EELFManager.getInstance().getLogger(ModelTypeServiceTest.class);
-    @Autowired
-    private ModelTypeHandler modelTypeHandler;
-
-    String modelName = "test-datatype";
-
-    @Test
-    @Commit
-    public void test01SaveModelType() throws Exception {
-        log.info("**************** test01SaveModelType  ********************");
-
-        String content = JacksonUtils.Companion.getClassPathFileContent("model_type/data_type/datatype-property.json");
-        ModelType modelType = new ModelType();
-        modelType.setDefinitionType(BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE);
-        modelType.setDerivedFrom(BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT);
-        modelType.setDescription("Definition for Sample Datatype ");
-        modelType.setDefinition(JacksonUtils.Companion.jsonNode(content));
-        modelType.setModelName(modelName);
-        modelType.setVersion("1.0.0");
-        modelType.setTags("test-datatype ," + BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT + ","
-                + BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE);
-        modelType.setUpdatedBy("xxxxxx@xxx.com");
-        modelType = modelTypeHandler.saveModel(modelType);
-        log.info("Saved Mode {}", modelType.toString());
-        Assert.assertNotNull("Failed to get Saved ModelType", modelType);
-        Assert.assertNotNull("Failed to get Saved ModelType, Id", modelType.getModelName());
-
-        ModelType dbModelType = modelTypeHandler.getModelTypeByName(modelType.getModelName());
-        Assert.assertNotNull("Failed to query ResourceMapping for ID (" + dbModelType.getModelName() + ")",
-                dbModelType);
-
-        // Model Update
-        modelType.setUpdatedBy("bs2796@xxx.com");
-        modelType = modelTypeHandler.saveModel(modelType);
-        Assert.assertNotNull("Failed to get Saved ModelType", modelType);
-        Assert.assertEquals("Failed to get Saved getUpdatedBy ", "bs2796@xxx.com", modelType.getUpdatedBy());
-
-    }
-
-    @Test
-    public void test02SearchModelTypes() throws Exception {
-        log.info("*********************** test02SearchModelTypes  ***************************");
-
-        String tags = "test-datatype";
-
-        List<ModelType> dbModelTypes = modelTypeHandler.searchModelTypes(tags);
-        Assert.assertNotNull("Failed to search ResourceMapping by tags", dbModelTypes);
-        Assert.assertTrue("Failed to search ResourceMapping by tags count", dbModelTypes.size() > 0);
-
-    }
-
-    @Test
-    public void test03GetModelType() throws Exception {
-        log.info("************************* test03GetModelType  *********************************");
-        ModelType dbModelType = modelTypeHandler.getModelTypeByName(modelName);
-        Assert.assertNotNull("Failed to get response for api call getModelByName ", dbModelType);
-        Assert.assertNotNull("Failed to get Id for api call  getModelByName ", dbModelType.getModelName());
-
-        List<ModelType> dbDatatypeModelTypes =
-                modelTypeHandler.getModelTypeByDefinitionType(BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE);
-        Assert.assertNotNull("Failed to find getModelTypeByDefinitionType by tags", dbDatatypeModelTypes);
-        Assert.assertTrue("Failed to find getModelTypeByDefinitionType by count", dbDatatypeModelTypes.size() > 0);
-
-        List<ModelType> dbModelTypeByDerivedFroms =
-                modelTypeHandler.getModelTypeByDerivedFrom(BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT);
-        Assert.assertNotNull("Failed to find getModelTypeByDerivedFrom by tags", dbModelTypeByDerivedFroms);
-        Assert.assertTrue("Failed to find getModelTypeByDerivedFrom by count", dbModelTypeByDerivedFroms.size() > 0);
-
-    }
-
-    @Test
-    public void test04DeleteModelType() throws Exception {
-        log.info(
-                "************************ test03DeleteModelType  ***********************");
-        ModelType dbResourceMapping = modelTypeHandler.getModelTypeByName(modelName);
-        Assert.assertNotNull("Failed to get response for api call getModelByName ", dbResourceMapping);
-        Assert.assertNotNull("Failed to get Id for api call  getModelByName ", dbResourceMapping.getModelName());
-
-        modelTypeHandler.deleteByModelName(dbResourceMapping.getModelName());
-    }
-}
-\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/common/SchemaGeneratorServiceTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/common/SchemaGeneratorServiceTest.java
deleted file mode 100644
index ed208db9..00000000
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/common/SchemaGeneratorServiceTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.service.common;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import org.apache.commons.io.FileUtils;
-import org.junit.Assert;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runners.MethodSorters;
-import org.onap.ccsdk.apps.controllerblueprints.service.SchemaGeneratorService;
-
-import java.io.File;
-import java.nio.charset.Charset;
-
-
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class SchemaGeneratorServiceTest {
-
-    private static EELFLogger log = EELFManager.getInstance().getLogger(SchemaGeneratorServiceTest.class);
-
-    @Test
-    public void test01GenerateSwaggerData() throws Exception {
-        log.info("******************* test01GenerateSwaggerData  ******************************");
-
-        String file = "src/test/resources/enhance/enhanced-template.json";
-        String serviceTemplateContent = FileUtils.readFileToString(new File(file), Charset.defaultCharset());
-        SchemaGeneratorService schemaGeneratorService = new SchemaGeneratorService();
-        String schema = schemaGeneratorService.generateSchema(serviceTemplateContent);
-        log.trace("Generated Schema " + schema);
-        Assert.assertNotNull("failed to generate Sample Data", schema);
-
-    }
-
-}
diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/repository/ModelTypeReactRepositoryTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/repository/ModelTypeReactRepositoryTest.java
deleted file mode 100644
index 739ce51b..00000000
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/repository/ModelTypeReactRepositoryTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *  Copyright © 2018 IBM.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.service.repository;
-
-import org.junit.Assert;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
-import org.onap.ccsdk.apps.controllerblueprints.TestApplication;
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants;
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;
-import org.onap.ccsdk.apps.controllerblueprints.service.domain.ModelType;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.annotation.Commit;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * ModelTypeReactRepositoryTest.
- *
- * @author Brinda Santh
- */
-
-@RunWith(SpringRunner.class)
-@DataJpaTest
-@ContextConfiguration(classes = {TestApplication.class})
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class ModelTypeReactRepositoryTest {
-
-    @Autowired
-    private ModelTypeReactRepository modelTypeReactRepository;
-
-    String modelName = "test-datatype";
-
-    @Test
-    @Commit
-    public void test01Save() {
-        String content = JacksonUtils.Companion.getClassPathFileContent("model_type/data_type/datatype-property.json");
-        ModelType modelType = new ModelType();
-        modelType.setDefinitionType(BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE);
-        modelType.setDerivedFrom(BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT);
-        modelType.setDescription("Definition for Sample Datatype ");
-        modelType.setDefinition(JacksonUtils.Companion.jsonNode(content));
-        modelType.setModelName(modelName);
-        modelType.setVersion("1.0.0");
-        modelType.setTags("test-datatype ," + BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT + ","
-                + BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE);
-        modelType.setUpdatedBy("xxxxxx@xxx.com");
-
-        ModelType dbModelType = modelTypeReactRepository.save(modelType).block();
-        Assert.assertNotNull("Failed to get Saved ModelType", dbModelType);
-    }
-
-    @Test
-    public void test02Finds() {
-        ModelType dbFindByModelName = modelTypeReactRepository.findByModelName(modelName).block();
-        Assert.assertNotNull("Failed to findByModelName ", dbFindByModelName);
-
-        List<ModelType> dbFindByDefinitionType =
-                modelTypeReactRepository.findByDefinitionType(BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE).collectList().block();
-        Assert.assertNotNull("Failed to findByDefinitionType ", dbFindByDefinitionType);
-        Assert.assertTrue("Failed to findByDefinitionType count", dbFindByDefinitionType.size() > 0);
-
-        List<ModelType> dbFindByDerivedFrom =
-                modelTypeReactRepository.findByDerivedFrom(BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT).collectList().block();
-        Assert.assertNotNull("Failed to find findByDerivedFrom", dbFindByDerivedFrom);
-        Assert.assertTrue("Failed to find findByDerivedFrom by count", dbFindByDerivedFrom.size() > 0);
-
-        List<ModelType> dbFindByModelNameIn =
-                modelTypeReactRepository.findByModelNameIn(Arrays.asList(modelName)).collectList().block();
-        Assert.assertNotNull("Failed to findByModelNameIn ", dbFindByModelNameIn);
-        Assert.assertTrue("Failed to findByModelNameIn by count", dbFindByModelNameIn.size() > 0);
-
-        List<ModelType> dbFindByDefinitionTypeIn =
-                modelTypeReactRepository.findByDefinitionTypeIn(Arrays.asList(BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE)).collectList().block();
-        Assert.assertNotNull("Failed to findByDefinitionTypeIn", dbFindByDefinitionTypeIn);
-        Assert.assertTrue("Failed to findByDefinitionTypeIn by count", dbFindByDefinitionTypeIn.size() > 0);
-
-        List<ModelType> dbFindByDerivedFromIn =
-                modelTypeReactRepository.findByDerivedFromIn(Arrays.asList(BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT)).collectList().block();
-        Assert.assertNotNull("Failed to find findByDerivedFromIn", dbFindByDerivedFromIn);
-        Assert.assertTrue("Failed to find findByDerivedFromIn by count", dbFindByDerivedFromIn.size() > 0);
-    }
-
-    @Test
-    @Commit
-    public void test03Delete() {
-        modelTypeReactRepository.deleteByModelName(modelName).block();
-    }
-
-}
diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/repository/ResourceDictionaryReactRepositoryTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/repository/ResourceDictionaryReactRepositoryTest.java
deleted file mode 100644
index 330eaa84..00000000
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/repository/ResourceDictionaryReactRepositoryTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *  Copyright © 2018 IBM.
- *  Modifications Copyright © 2017-2018 AT&T Intellectual Property.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.service.repository;
-
-import org.junit.Assert;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
-import org.onap.ccsdk.apps.controllerblueprints.TestApplication;
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition;
-import org.onap.ccsdk.apps.controllerblueprints.service.domain.ResourceDictionary;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.annotation.Commit;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * ResourceDictionaryReactRepositoryTest.
- *
- * @author Brinda Santh
- */
-
-@RunWith(SpringRunner.class)
-@DataJpaTest
-@ContextConfiguration(classes = {TestApplication.class})
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class ResourceDictionaryReactRepositoryTest {
-
-    private String sourceName = "test-source";
-
-    @Autowired
-    protected ResourceDictionaryReactRepository resourceDictionaryReactRepository;
-
-    @Test
-    @Commit
-    public void test01Save() {
-        ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile("./../../../../components/model-catalog/resource-dictionary/starter-dictionary/sample-primary-db-source.json", ResourceDefinition.class);
-        Assert.assertNotNull("Failed to get resourceDefinition from content", resourceDefinition);
-        resourceDefinition.setName(sourceName);
-
-        ResourceDictionary resourceDictionary = transformResourceDictionary(resourceDefinition);
-        ResourceDictionary dbResourceDictionary = resourceDictionaryReactRepository.save(resourceDictionary).block();
-        Assert.assertNotNull("Failed to save ResourceDictionary", dbResourceDictionary);
-    }
-
-    @Test
-    public void test02FindByNameReact() {
-        ResourceDictionary dbResourceDictionary = resourceDictionaryReactRepository.findByName(sourceName).block();
-        Assert.assertNotNull("Failed to query React Resource Dictionary by Name", dbResourceDictionary);
-    }
-
-    @Test
-    public void test03FindByNameInReact() {
-        List<ResourceDictionary> dbResourceDictionaries =
-                resourceDictionaryReactRepository.findByNameIn(Arrays.asList(sourceName)).collectList().block();
-        Assert.assertNotNull("Failed to query React Resource Dictionary by Names", dbResourceDictionaries);
-    }
-
-    @Test
-    public void test04FindByTagsContainingIgnoreCaseReact() {
-        List<ResourceDictionary> dbTagsResourceDictionaries =
-                resourceDictionaryReactRepository.findByTagsContainingIgnoreCase(sourceName).collectList().block();
-        Assert.assertNotNull("Failed to query React Resource Dictionary by Tags", dbTagsResourceDictionaries);
-    }
-
-    @Test
-    @Commit
-    public void test05Delete() {
-        resourceDictionaryReactRepository.deleteByName(sourceName).block();
-    }
-
-    private ResourceDictionary transformResourceDictionary(ResourceDefinition resourceDefinition) {
-        ResourceDictionary resourceDictionary = new ResourceDictionary();
-        resourceDictionary.setName(resourceDefinition.getName());
-        resourceDictionary.setDataType(resourceDefinition.getProperty().getType());
-        resourceDictionary.setDescription(resourceDefinition.getProperty().getDescription());
-        resourceDictionary.setTags(resourceDefinition.getTags());
-        resourceDictionary.setUpdatedBy(resourceDefinition.getUpdatedBy());
-        resourceDictionary.setDefinition(resourceDefinition);
-        return resourceDictionary;
-    }
-}
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/controller/BlueprintModelControllerTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/controller/BlueprintModelControllerTest.kt
deleted file mode 100644
index d504c293..00000000
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/controller/BlueprintModelControllerTest.kt
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright © 2019 Bell Canada Intellectual Property.
- * Modifications Copyright © 2019 IBM.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.service.controller
-
-import com.google.gson.Gson
-import org.json.JSONException
-import org.json.JSONObject
-import org.junit.After
-import org.junit.Before
-import org.junit.FixMethodOrder
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.MethodSorters
-import org.onap.ccsdk.apps.controllerblueprints.TestApplication
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintArchiveUtils
-import org.onap.ccsdk.apps.controllerblueprints.service.domain.BlueprintModelSearch
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.beans.factory.annotation.Value
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration
-import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.context.annotation.ComponentScan
-import org.springframework.core.io.ByteArrayResource
-import org.springframework.http.HttpMethod
-import org.springframework.http.HttpStatus
-import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.junit4.SpringRunner
-import org.springframework.test.web.reactive.server.WebTestClient
-import org.springframework.util.Base64Utils
-import org.springframework.web.reactive.function.BodyInserters
-import java.io.File
-import java.io.IOException
-import java.nio.charset.StandardCharsets.UTF_8
-import java.nio.file.Files
-import java.nio.file.Paths
-
-/**
- * BlueprintModelControllerTest Purpose: Integration test at API level
- *
- * @author Vinal Patel
- * @version 1.0
- */
-
-@RunWith(SpringRunner::class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ContextConfiguration(classes = [TestApplication::class])
-@ComponentScan(basePackages = ["org.onap.ccsdk.apps.controllerblueprints"])
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@EnableAutoConfiguration
-class BlueprintModelControllerTest {
-
-    companion object {
-
-        private var id: String? = null
-        private var name: String? = null
-        private var version: String? = null
-        private var tag: String? = null
-        private var result: String? = null
-    }
-
-    @Value("\${controllerblueprints.loadBluePrintPaths}")
-    private val loadBluePrintPaths: String? = null
-
-    @Autowired
-    private val webTestClient: WebTestClient? = null
-
-    @Value("\${controllerblueprints.loadBlueprintsExamplesPath}")
-    private val blueprintArchivePath: String? = null
-
-    private val filename = "test.zip"
-    private var blueprintFile: File? = null
-    private var zipBlueprintFile: File? = null
-
-    @Before
-    @Throws(Exception::class)
-    fun setUp() {
-        blueprintFile = File(loadBluePrintPaths+"/baseconfiguration")
-        if (blueprintFile!!.isDirectory) {
-            zipBlueprintFile = File(Paths.get(blueprintArchivePath).resolve(filename).toString())
-            BluePrintArchiveUtils.compress(blueprintFile!!, zipBlueprintFile!!, true)
-        }
-    }
-
-    @After
-    @Throws(Exception::class)
-    fun tearDown() {
-        zipBlueprintFile!!.delete()
-    }
-
-    @Test
-    @Throws(IOException::class, JSONException::class)
-    fun test1_saveBluePrint() {
-        webTestClient(HttpMethod.POST,
-                BodyInserters.fromMultipartData("file", object : ByteArrayResource(Files.readAllBytes(zipBlueprintFile!!.toPath())) {
-                    override fun getFilename(): String? {
-                        return "test.zip"
-                    }
-                }),
-                "/api/v1/blueprint-model",
-                HttpStatus.OK, true)
-    }
-
-    @Test
-    @Throws(JSONException::class)
-    fun test2_getBluePrintByNameAndVersion() {
-        webTestClient(HttpMethod.GET, null, "/api/v1/blueprint-model/by-name/$name/version/$version", HttpStatus.OK, false)
-    }
-
-
-    @Test
-    @Throws(JSONException::class)
-    fun test3_getBlueprintModel() {
-        webTestClient(HttpMethod.GET, null, "/api/v1/blueprint-model/$id", HttpStatus.OK, false)
-    }
-
-    @Test
-    @Throws(JSONException::class)
-    fun test4_getAllBlueprintModel() {
-        webTestClient(HttpMethod.GET, null, "/api/v1/blueprint-model", HttpStatus.OK, false)
-    }
-
-    @Test
-    @Throws(JSONException::class)
-    fun test5_downloadBluePrint() {
-        webTestClient(HttpMethod.GET, null, "/api/v1/blueprint-model/download/$id", HttpStatus.OK, false)
-    }
-
-    @Test
-    fun test6_publishBlueprintModel() {
-    }
-
-    @Test
-    @Throws(JSONException::class)
-    fun test7_searchBlueprintModels() {
-        webTestClient(HttpMethod.GET, null, "/api/v1/blueprint-model/search/$name", HttpStatus.OK, false)
-    }
-
-    @Test
-    @Throws(JSONException::class)
-    fun test8_downloadBlueprintByNameAndVersion() {
-        webTestClient(HttpMethod.GET, null, "/api/v1/blueprint-model/download/by-name/$name/version/$version", HttpStatus.OK, false)
-    }
-
-    @Test
-    fun test9_deleteBluePrint() {
-        //TODO: Use webTestClient function
-        //webTestClient(HttpMethod.DELETE, null, "/api/v1/blueprint-model/" + id, HttpStatus.OK, false);
-        webTestClient!!.delete().uri("/api/v1/blueprint-model/$id")
-                .header("Authorization", "Basic " + Base64Utils
-                        .encodeToString(("ccsdkapps" + ":" + "ccsdkapps").toByteArray(UTF_8)))
-                .exchange()
-                .expectStatus().is2xxSuccessful
-    }
-
-    @Throws(JSONException::class)
-    private fun webTestClient(requestMethod: HttpMethod, body: BodyInserters.MultipartInserter?, uri: String, expectedResponceStatus: HttpStatus, setParam: Boolean) {
-
-        result = String(webTestClient!!.method(requestMethod).uri(uri)
-                .header("Authorization", "Basic " + Base64Utils
-                        .encodeToString(("ccsdkapps" + ":" + "ccsdkapps").toByteArray(UTF_8)))
-                .body(body)
-                .exchange()
-                .expectStatus().isEqualTo(expectedResponceStatus)
-                .expectBody()
-                .returnResult().responseBody!!)
-
-        if (setParam) {
-            val jsonResponse = JSONObject(result)
-            val blueprintModelSearchJSON = jsonResponse.getJSONObject("blueprintModel")
-            val gson = Gson()
-            val blueprintModelSearch = gson.fromJson(blueprintModelSearchJSON.toString(), BlueprintModelSearch::class.java)
-            id = blueprintModelSearch.id
-            name = blueprintModelSearch.artifactName
-            version = blueprintModelSearch.artifactVersion
-            tag = blueprintModelSearch.tags
-        }
-    }
-
-}
-\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/controller/ModelTypeControllerTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/controller/ModelTypeControllerTest.kt
deleted file mode 100644
index 6fd0d1f0..00000000
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/controller/ModelTypeControllerTest.kt
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  Copyright © 2019 IBM.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.service.controller
-
-import com.att.eelf.configuration.EELFManager
-import org.junit.Assert
-import org.junit.FixMethodOrder
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.MethodSorters
-import org.onap.ccsdk.apps.controllerblueprints.TestApplication
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
-import org.onap.ccsdk.apps.controllerblueprints.service.domain.ModelType
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
-import org.springframework.test.annotation.Commit
-import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.junit4.SpringRunner
-
-@RunWith(SpringRunner::class)
-@DataJpaTest
-@ContextConfiguration(classes = [TestApplication::class])
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-class ModelTypeControllerTest {
-
-    private val log = EELFManager.getInstance().getLogger(ModelTypeControllerTest::class.java)!!
-
-    @Autowired
-    internal var modelTypeController: ModelTypeController? = null
-
-    private var modelName = "test-datatype"
-
-    @Test
-    @Commit
-    @Throws(Exception::class)
-    fun test01SaveModelType() {
-        log.info("**************** test01SaveModelType  ********************")
-
-        val content = JacksonUtils.getClassPathFileContent("model_type/data_type/datatype-property.json")
-        var modelType = ModelType()
-        modelType.definitionType = BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE
-        modelType.derivedFrom = BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT
-        modelType.description = "Definition for Sample Datatype "
-        modelType.definition = JacksonUtils.jsonNode(content)
-        modelType.modelName = modelName
-        modelType.version = "1.0.0"
-        modelType.tags = ("test-datatype ," + BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT + ","
-                + BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE)
-        modelType.updatedBy = "xxxxxx@xxx.com"
-        modelType = modelTypeController!!.saveModelType(modelType)
-        log.info("Saved Mode {}", modelType.toString())
-        Assert.assertNotNull("Failed to get Saved ModelType", modelType)
-        Assert.assertNotNull("Failed to get Saved ModelType, Id", modelType.modelName)
-
-        val dbModelType = modelTypeController!!.getModelTypeByName(modelType.modelName)
-        Assert.assertNotNull("Failed to query ResourceMapping for ID (" + dbModelType!!.modelName + ")",
-                dbModelType)
-
-        // Model Update
-        modelType.updatedBy = "bs2796@xxx.com"
-        modelType = modelTypeController!!.saveModelType(modelType)
-        Assert.assertNotNull("Failed to get Saved ModelType", modelType)
-        Assert.assertEquals("Failed to get Saved getUpdatedBy ", "bs2796@xxx.com", modelType.updatedBy)
-
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun test02SearchModelTypes() {
-        log.info("*********************** test02SearchModelTypes  ***************************")
-
-        val tags = "test-datatype"
-
-        val dbModelTypes = modelTypeController!!.searchModelTypes(tags)
-        Assert.assertNotNull("Failed to search ResourceMapping by tags", dbModelTypes)
-        Assert.assertTrue("Failed to search ResourceMapping by tags count", dbModelTypes.isNotEmpty())
-
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun test03GetModelType() {
-        log.info("************************* test03GetModelType  *********************************")
-        val dbModelType = modelTypeController!!.getModelTypeByName(modelName)
-        Assert.assertNotNull("Failed to get response for api call getModelByName $modelName", dbModelType)
-        Assert.assertNotNull("Failed to get Id for api call  getModelByName ", dbModelType!!.modelName)
-
-        val dbDatatypeModelTypes = modelTypeController!!.getModelTypeByDefinitionType(BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE)
-        Assert.assertNotNull("Failed to find getModelTypeByDefinitionType by tags", dbDatatypeModelTypes)
-        Assert.assertTrue("Failed to find getModelTypeByDefinitionType by count", dbDatatypeModelTypes.isNotEmpty())
-    }
-
-    @Test
-    @Commit
-    @Throws(Exception::class)
-    fun test04DeleteModelType() {
-        log.info(
-                "************************ test03DeleteModelType  ***********************")
-        val dbResourceMapping = modelTypeController!!.getModelTypeByName(modelName)
-        Assert.assertNotNull("Failed to get response for api call getModelByName ", dbResourceMapping)
-        Assert.assertNotNull("Failed to get Id for api call  getModelByName ", dbResourceMapping!!.modelName)
-
-        modelTypeController!!.deleteModelTypeByName(dbResourceMapping.modelName)
-    }
-}
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/controller/ResourceDictionaryControllerTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/controller/ResourceDictionaryControllerTest.kt
deleted file mode 100644
index 96c14261..00000000
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/controller/ResourceDictionaryControllerTest.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright © 2019 IBM.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.service.controller
-
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.onap.ccsdk.apps.controllerblueprints.TestApplication
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.context.annotation.ComponentScan
-import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.junit4.SpringRunner
-import kotlin.test.assertNotNull
-
-@RunWith(SpringRunner::class)
-@ContextConfiguration(classes = [TestApplication::class])
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ComponentScan(basePackages = ["org.onap.ccsdk.apps.controllerblueprints"])
-class ResourceDictionaryControllerTest {
-
-    @Autowired
-    lateinit var resourceDictionaryController: ResourceDictionaryController
-
-    @Test
-    fun testResourceDictionaryControllerPresence() {
-        assertNotNull(resourceDictionaryController, "failed to initialise ResourceDictionaryController")
-    }
-
-}
-\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/controller/mock/MockFilePart.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/controller/mock/MockFilePart.kt
deleted file mode 100644
index 60420aa6..00000000
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/controller/mock/MockFilePart.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright © 2019 IBM.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.service.controller.mock
-
-import org.apache.commons.io.FilenameUtils
-import org.slf4j.LoggerFactory
-import org.springframework.core.io.buffer.DataBuffer
-import org.springframework.http.HttpHeaders
-import org.springframework.http.codec.multipart.FilePart
-import org.springframework.util.FileCopyUtils
-import reactor.core.publisher.Flux
-import reactor.core.publisher.Mono
-import java.io.File
-import java.nio.file.Path
-
-class MockFilePart(private val fileName: String) : FilePart {
-    val log = LoggerFactory.getLogger(MockFilePart::class.java)!!
-    override fun content(): Flux<DataBuffer> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun headers(): HttpHeaders {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun filename(): String {
-        return FilenameUtils.getName(fileName)
-    }
-
-    override fun name(): String {
-        return FilenameUtils.getBaseName(fileName)
-    }
-
-    override fun transferTo(path: Path): Mono<Void> {
-        log.info("Copying file($fileName to ${path}")
-        FileCopyUtils.copy(File(fileName), path.toFile())
-        return Mono.empty()
-    }
-}
-\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt
deleted file mode 100644
index 62a37bef..00000000
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2018 IBM.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.service.enhancer
-
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.onap.ccsdk.apps.controllerblueprints.TestApplication
-import org.onap.ccsdk.apps.controllerblueprints.core.deleteDir
-import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintEnhancerService
-import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintValidatorService
-import org.onap.ccsdk.apps.controllerblueprints.core.normalizedPathName
-import org.onap.ccsdk.apps.controllerblueprints.service.load.ModelTypeLoadService
-import org.onap.ccsdk.apps.controllerblueprints.service.load.ResourceDictionaryLoadService
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.TestPropertySource
-import org.springframework.test.context.junit4.SpringRunner
-
-@RunWith(SpringRunner::class)
-@ContextConfiguration(classes = arrayOf(TestApplication::class))
-@TestPropertySource(locations = arrayOf("classpath:application.properties"))
-class BluePrintEnhancerServiceImplTest {
-
-    @Autowired
-    lateinit var modelTypeLoadService: ModelTypeLoadService
-
-    @Autowired
-    lateinit var resourceDictionaryLoadService: ResourceDictionaryLoadService
-
-    @Autowired
-    lateinit var bluePrintEnhancerService: BluePrintEnhancerService
-
-    @Autowired
-    lateinit var bluePrintValidatorService: BluePrintValidatorService
-
-    @Before
-    fun init() {
-        runBlocking {
-            modelTypeLoadService.loadPathModelType("./../../../../components/model-catalog/definition-type/starter-type")
-            resourceDictionaryLoadService.loadPathResourceDictionary("./../../../../components/model-catalog/resource-dictionary/starter-dictionary")
-            resourceDictionaryLoadService.loadPathResourceDictionary("./../../../../components/model-catalog/resource-dictionary/test-dictionary")
-        }
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun testEnhancementAndValidation() {
-
-        val basePath = "./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration"
-        testComponentInvokeEnhancementAndValidation(basePath, "base-enhance")
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun testComponentInvokeEnhancementAndValidation() {
-        val basePath = "./../../../../components/model-catalog/blueprint-model/test-blueprint/component_invoke"
-        testComponentInvokeEnhancementAndValidation(basePath, "component-enhance")
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun testGoldenEnhancementAndValidation() {
-        val basePath = "./../../../../components/model-catalog/blueprint-model/test-blueprint/golden"
-        testComponentInvokeEnhancementAndValidation(basePath, "golden-enhance")
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun testCapabilityRestconfEnhancementAndValidation() {
-        val basePath = "./../../../../components/model-catalog/blueprint-model/test-blueprint/capability_restconf"
-        testComponentInvokeEnhancementAndValidation(basePath, "capability_restconf-enhance")
-
-    }
-
-    private fun testComponentInvokeEnhancementAndValidation(basePath: String, targetDirName: String) {
-        runBlocking {
-            val targetPath = normalizedPathName("target/blueprints/enrichment", targetDirName)
-
-            deleteDir(targetPath)
-
-            val bluePrintContext = bluePrintEnhancerService.enhance(basePath, targetPath)
-            Assert.assertNotNull("failed to get blueprintContext ", bluePrintContext)
-
-            // Validate the Generated BluePrints
-            val valid = bluePrintValidatorService.validateBluePrints(targetPath)
-            Assert.assertTrue("blueprint($basePath) validation failed ", valid)
-
-            deleteDir(targetPath)
-        }
-    }
-
-
-}
-\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/utils/BluePrintEnhancerUtilsTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/utils/BluePrintEnhancerUtilsTest.kt
deleted file mode 100644
index 6bd10525..00000000
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/utils/BluePrintEnhancerUtilsTest.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Copyright © 2019 IBM.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.service.utils
-
-import kotlinx.coroutines.runBlocking
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.onap.ccsdk.apps.controllerblueprints.core.*
-import org.onap.ccsdk.apps.controllerblueprints.service.controller.mock.MockFilePart
-import java.nio.file.Paths
-import java.util.*
-import kotlin.test.assertTrue
-
-class BluePrintEnhancerUtilsTest {
-
-    private val blueprintDir = "./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration"
-    private val blueprintArchivePath: String = "./target/blueprints/archive"
-    private val blueprintEnrichmentPath: String = "./target/blueprints/enrichment"
-    private var zipBlueprintFileName =  normalizedPathName(blueprintArchivePath, "test.zip")
-
-    @Before
-    fun setUp() {
-        val archiveDir = normalizedFile(blueprintArchivePath).reCreateDirs()
-        assertTrue(archiveDir.exists(), "failed to create archiveDir(${archiveDir.absolutePath}")
-        val enhancerDir = normalizedFile(blueprintEnrichmentPath).reCreateDirs()
-        assertTrue(enhancerDir.exists(), "failed to create enhancerDir(${enhancerDir.absolutePath}")
-        val blueprintFile = Paths.get(blueprintDir).toFile().normalize()
-        val testZipFile = blueprintFile.compress(zipBlueprintFileName)
-        assertTrue(testZipFile.exists(), "Failed to create blueprint test zip(${testZipFile.absolutePath}")
-    }
-
-    @After
-    fun tearDown() {
-        deleteDir(blueprintArchivePath)
-        deleteDir(blueprintEnrichmentPath)
-    }
-
-    @Test
-    fun testFilePartCompressionNDeCompression() {
-        val filePart = MockFilePart(zipBlueprintFileName)
-
-        runBlocking {
-            val enhanceId = UUID.randomUUID().toString()
-            val blueprintArchiveLocation = normalizedPathName(blueprintArchivePath, enhanceId)
-            val blueprintEnrichmentLocation = normalizedPathName(blueprintEnrichmentPath, enhanceId)
-            BluePrintEnhancerUtils.decompressFilePart(filePart, blueprintArchiveLocation, blueprintEnrichmentLocation)
-            BluePrintEnhancerUtils.compressToFilePart(blueprintEnrichmentLocation, blueprintArchiveLocation)
-        }
-    }
-}
-
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/validator/ModelTypeValidatorTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/validator/ModelTypeValidatorTest.kt
deleted file mode 100644
index db4ee5c9..00000000
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/validator/ModelTypeValidatorTest.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.service.validator
-
-import com.fasterxml.jackson.databind.JsonNode
-import org.junit.Test
-import org.onap.ccsdk.apps.controllerblueprints.service.domain.ModelType
-
-class ModelTypeValidatorTest {
-
-    @Test(expected = IllegalStateException::class)
-    @Throws(Exception::class)
-    fun testvalidateModelType() {
-        val modelType = ModelType()
-        modelType.definitionType = ""
-        modelType.derivedFrom = ""
-        modelType.description = ""
-        val definitionContent: JsonNode? = null
-        modelType.definition = definitionContent
-        modelType.modelName = ""
-        modelType.version = ""
-        modelType.tags = ""
-        modelType.updatedBy = ""
-        ModelTypeValidator.validateModelType(modelType)
-    }
-}
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/application.properties b/ms/controllerblueprints/modules/service/src/test/resources/application.properties
deleted file mode 100755
index 011bad32..00000000
--- a/ms/controllerblueprints/modules/service/src/test/resources/application.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright © 2017-2018 AT&T Intellectual Property.
-# Modifications Copyright © 2018 IBM.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-spring.main.banner-mode=off
-spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false
-logging.level.org.springframework.web=INFO
-logging.level.org.hibernate.SQL=warn
-logging.level.org.hibernate.type.descriptor.sql=debug
-# Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,capability=source-capability
-# Controller Blueprints Core Configuration
-controllerblueprints.blueprintDeployPath=./target/blueprints/deploy
-controllerblueprints.blueprintArchivePath=./target/blueprints/archive
-controllerblueprints.blueprintEnrichmentPath=./target/blueprints/enrichment
-# Controller Blueprint Load Configurations
-controllerblueprints.loadInitialData=false
-controllerblueprints.loadBluePrint=false
-controllerblueprints.loadBluePrintPaths=./../../../../components/model-catalog/blueprint-model/test-blueprint
-controllerblueprints.loadModelType=false
-controllerblueprints.loadModeTypePaths=./../../../../components/model-catalog/definition-type/starter-type
-controllerblueprints.loadResourceDictionary=false
-controllerblueprints.loadResourceDictionaryPaths=./../../../../components/model-catalog/resource-dictionary/starter-dictionary
-
-# CBA file extension
-controllerblueprints.loadCbaExtension=zip
-
-# CBA examples for tests cases
-controllerblueprints.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprint
-\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json
deleted file mode 100644
index 3ed188b9..00000000
--- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json
+++ /dev/null
@@ -1,62 +0,0 @@
-[
-  {
-    "name": "rs-db-source",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "sample-db-source",
-    "dictionary-source": "primary-db",
-    "dependencies": [
-      "input-source"
-    ]
-  },
-  {
-    "name": "ra-default-source",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "sample-default-source",
-    "dictionary-source": "default",
-    "dependencies": []
-  },
-  {
-    "name": "ra-input-source",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "sample-input-source",
-    "dictionary-source": "input",
-    "dependencies": []
-  },
-  {
-    "name": "ra-list-input-source",
-    "input-param": true,
-    "property": {
-      "type": "list",
-      "required": true,
-      "entry_schema": {
-        "type": "string"
-      }
-    },
-    "dictionary-name": "ra-list-input-source",
-    "dictionary-source": "input",
-    "dependencies": []
-  },
-  {
-    "name": "ra-complex-input-source",
-    "input-param": true,
-    "property": {
-      "type": "dt-v4-aggregate",
-      "required": true
-    },
-    "dictionary-name": "sample-mdsal-source",
-    "dictionary-source": "primary-config-data",
-    "dependencies": []
-  }
-]
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
deleted file mode 100644
index 2e48b6d8..00000000
--- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
+++ /dev/null
@@ -1,351 +0,0 @@
-{
-  "metadata": {
-    "template_author": "Brinda Santh",
-    "template_name": "enhance-template",
-    "template_version": "1.0.0",
-    "template_tags": "brinda, VPE",
-    "service-type": "Sample Service",
-    "release": "1806",
-    "vnf-type": "VPE"
-  },
-  "topology_template": {
-    "inputs": {
-      "request-id": {
-        "required": true,
-        "type": "string"
-      },
-      "service-instance-id": {
-        "required": true,
-        "type": "string"
-      },
-      "scope-type": {
-        "required": true,
-        "type": "string"
-      },
-      "action-name": {
-        "required": true,
-        "type": "string"
-      },
-      "hostname": {
-        "required": true,
-        "type": "string"
-      }
-    },
-    "node_templates": {
-      "vpe-netconf-device": {
-        "capabilities": {
-          "netconf": {
-            "properties": {
-              "login-key": "sdnc",
-              "login-account": "sndc-local",
-              "source": "local",
-              "target-ip-address": {
-                "get_attribute": [
-                  "SELF",
-                  "lo0-local-ipv4-address"
-                ]
-              },
-              "port-number": 22,
-              "connection-time-out": 30
-            }
-          }
-        },
-        "type": "vnf-netconf-device"
-      },
-      "activate-netconf-component": {
-        "capabilities": {
-          "component-node": {}
-        },
-        "requirements": {
-          "netconf-connection": {
-            "capability": "netconf",
-            "node": "vpe-netconf-device",
-            "relationship": "tosca.relationships.ConnectsTo"
-          }
-        },
-        "interfaces": {
-          "NetconfExecutorComponent": {
-            "operations": {
-              "process": {
-                "inputs": {
-                  "action-name": {
-                    "get_input": "action-name"
-                  },
-                  "template-name": {
-                    "get_input": "template_name"
-                  },
-                  "template-version": {
-                    "get_input": "template_version"
-                  },
-                  "resource-type": "vnf-type",
-                  "request-id": {
-                    "get_input": "request-id"
-                  },
-                  "resource-id": {
-                    "get_input": "hostname"
-                  },
-                  "execution-script": "execution-script"
-                },
-                "outputs": {
-                  "response-data": {
-                    "get_attribute": [
-                      "SELF",
-                      "netconf-executor-baseconfig.response-data"
-                    ]
-                  },
-                  "status": {
-                    "get_attribute": [
-                      "SELF",
-                      "netconf-executor-baseconfig.status"
-                    ]
-                  }
-                },
-                "implementation": {
-                  "primary": "file://netconf_adaptor/DefaultBaseLicenceConfig.py"
-                }
-              }
-            }
-          }
-        },
-        "type": "component-netconf-executor"
-      },
-      "resource-assignment-ra-component": {
-        "capabilities": {
-          "component-node": {}
-        },
-        "interfaces": {
-          "ResourceAssignmentComponent": {
-            "operations": {
-              "process": {
-                "inputs": {
-                  "template-names": [
-                    "base-config-template",
-                    "licence-template"
-                  ],
-                  "action-name": {
-                    "get_input": "action-name"
-                  },
-                  "template-name": {
-                    "get_input": "template_name"
-                  },
-                  "template-version": {
-                    "get_input": "template-version"
-                  },
-                  "resource-type": "vnf-type",
-                  "request-id": {
-                    "get_input": "request-id"
-                  },
-                  "resource-id": {
-                    "get_input": "hostname"
-                  }
-                },
-                "outputs": {
-                  "resource-assignment-params": "success",
-                  "status": "status"
-                }
-              }
-            }
-          }
-        },
-        "type": "component-resource-assignment"
-      },
-      "resource-assignment-action": {
-        "properties": {
-          "mode": "sync",
-          "version": "LATEST",
-          "is-start-flow": false
-        },
-        "requirements": {
-          "component-dependency": {
-            "capability": "component-node",
-            "node": "resource-assignment-ra-component",
-            "relationship": "tosca.relationships.DependsOn"
-          }
-        },
-        "capabilities": {
-          "dg-node": {}
-        },
-        "interfaces": {
-          "CONFIG": {
-            "operations": {
-              "ResourceAssignment": {
-                "inputs": {
-                  "params": []
-                }
-              }
-            }
-          }
-        },
-        "type": "dg-resource-assignment"
-      },
-      "activate-action": {
-        "properties": {
-          "mode": "sync",
-          "version": "LATEST",
-          "is-start-flow": false
-        },
-        "requirements": {
-          "component-dependency": {
-            "capability": "component-node",
-            "node": "activate-netconf-component",
-            "relationship": "tosca.relationships.DependsOn"
-          }
-        },
-        "capabilities": {
-          "dg-node": {}
-        },
-        "interfaces": {
-          "CONFIG": {
-            "operations": {
-              "ActivateNetconf": {
-                "inputs": {
-                  "params": []
-                }
-              }
-            }
-          }
-        },
-        "type": "dg-activate-netconf"
-      },
-      "base-config-template": {
-        "capabilities": {
-          "content": {
-            "properties": {
-              "content": "db://base-config-template"
-            }
-          },
-          "mapping": {
-            "properties": {
-              "mapping": [
-                {
-                  "name": "rs-db-source",
-                  "property": {
-                    "required": true,
-                    "type": "string"
-                  },
-                  "input-param": false,
-                  "dictionary-name": "sample-db-source",
-                  "dictionary-source": "primary-db",
-                  "dependencies": [
-                    "hostname"
-                  ],
-                  "version": 0
-                },
-                {
-                  "name": "mdsal-source",
-                  "property": {
-                    "description": "",
-                    "required": true,
-                    "type": "list",
-                    "entry_schema": {
-                      "type": "dt-v4-aggregate"
-                    }
-                  },
-                  "input-param": false,
-                  "dictionary-name": "sample-mdsal-source",
-                  "dictionary-source": "primary-config-data",
-                  "dependencies": [
-                    "service-instance-id"
-                  ],
-                  "version": 0
-                },
-                {
-                  "name": "hostname",
-                  "property": {
-                    "required": true,
-                    "type": "string"
-                  },
-                  "dictionary-name": "hostname",
-                  "dictionary-source": "input",
-                  "version": 0,
-                  "input-param": false
-                },
-                {
-                  "name": "service",
-                  "property": {
-                    "required": true,
-                    "type": "string"
-                  },
-                  "dictionary-name": "service",
-                  "dictionary-source": "input",
-                  "version": 0,
-                  "input-param": false
-                },
-                {
-                  "name": "service-instance-id",
-                  "property": {
-                    "required": true,
-                    "type": "string"
-                  },
-                  "dictionary-name": "service-instance-id",
-                  "dictionary-source": "input",
-                  "version": 0,
-                  "input-param": false
-                }
-              ]
-            }
-          }
-        },
-        "properties": {
-          "action-names": [
-            "resource-assignment-action"
-          ]
-        },
-        "type": "artifact-config-template"
-      },
-      "licence-template": {
-        "capabilities": {
-          "content": {
-            "properties": {
-              "content": "db://licence-template"
-            }
-          },
-          "mapping": {
-            "properties": {
-              "mapping": [
-                {
-                  "name": "licenses",
-                  "property": {
-                    "required": true,
-                    "type": "list",
-                    "entry_schema": {
-                      "type": "dt-license-key"
-                    }
-                  },
-                  "input-param": false,
-                  "dictionary-name": "sample-licenses",
-                  "dictionary-source": "primary-config-data",
-                  "dependencies": [
-                    "service-instance-id"
-                  ],
-                  "version": 0
-                },
-                {
-                  "name": "service-instance-id",
-                  "property": {
-                    "required": true,
-                    "type": "string"
-                  },
-                  "dictionary-name": "service-instance-id",
-                  "dictionary-source": "input",
-                  "version": 0,
-                  "input-param": false
-                }
-              ]
-            }
-          }
-        },
-        "properties": {
-          "action-names": [
-            "resource-assignment-action"
-          ]
-        },
-        "type": "artifact-config-template"
-      }
-    }
-  },
-  "node_types": {
-  },
-  "data_types": {
-  }
-}
-\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
deleted file mode 100644
index 6937c719..00000000
--- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
+++ /dev/null
@@ -1,327 +0,0 @@
-{
-  "metadata" : {
-    "template_author" : "Brinda Santh",
-    "template_name" : "enhance-template",
-    "template_version" : "1.0.0",
-    "template_tags" : "brinda, VPE",
-    "service-type" : "Sample Service",
-    "release" : "1806",
-    "vnf-type" : "VPE"
-  },
-  "tosca_definitions_version" : "controller_blueprint_1_0_0",
-  "artifact_types" : { },
-  "data_types" : {
-  },
-  "node_types" : {
-  },
-  "topology_template" : {
-    "inputs" : {
-      "request-id" : {
-        "required" : true,
-        "type" : "string"
-      },
-      "service-instance-id" : {
-        "required" : true,
-        "type" : "string"
-      },
-      "scope-type" : {
-        "required" : true,
-        "type" : "string"
-      },
-      "action-name" : {
-        "required" : true,
-        "type" : "string"
-      },
-      "hostname" : {
-        "required" : true,
-        "type" : "string"
-      },
-      "resource-assignment-request" : {
-        "description" : "This is Dynamic Data type for the receipe resource-assignment-action.",
-        "required" : false,
-        "type" : "dt-resource-assignment-request"
-      }
-    },
-    "node_templates" : {
-      "vpe-netconf-device" : {
-        "type" : "vnf-netconf-device",
-        "capabilities" : {
-          "netconf" : {
-            "properties" : {
-              "login-key" : "sdnc",
-              "login-account" : "sndc-local",
-              "source" : "local",
-              "target-ip-address" : {
-                "get_attribute" : [ "SELF", "lo0-local-ipv4-address" ]
-              },
-              "port-number" : 22,
-              "connection-time-out" : 30
-            }
-          }
-        }
-      },
-      "activate-netconf-component" : {
-        "type" : "component-netconf-executor",
-        "capabilities" : {
-          "component-node" : { }
-        },
-        "requirements" : {
-          "netconf-connection" : {
-            "capability" : "netconf",
-            "node" : "vpe-netconf-device",
-            "relationship" : "tosca.relationships.ConnectsTo"
-          }
-        },
-        "interfaces" : {
-          "NetconfExecutorComponent" : {
-            "operations" : {
-              "process" : {
-                "implementation" : {
-                  "primary" : "file://netconf_adaptor/DefaultBaseLicenceConfig.py"
-                },
-                "inputs" : {
-                  "action-name" : {
-                    "get_input" : "action-name"
-                  },
-                  "template-name" : {
-                    "get_input" : "template_name"
-                  },
-                  "template-version" : {
-                    "get_input" : "template_version"
-                  },
-                  "resource-type" : "vnf-type",
-                  "request-id" : {
-                    "get_input" : "request-id"
-                  },
-                  "resource-id" : {
-                    "get_input" : "hostname"
-                  },
-                  "execution-script" : "execution-script"
-                },
-                "outputs" : {
-                  "response-data" : {
-                    "get_attribute" : [ "SELF", "netconf-executor-baseconfig.response-data" ]
-                  },
-                  "status" : {
-                    "get_attribute" : [ "SELF", "netconf-executor-baseconfig.status" ]
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "resource-assignment-ra-component" : {
-        "type" : "component-resource-assignment",
-        "capabilities" : {
-          "component-node" : { }
-        },
-        "interfaces" : {
-          "ResourceAssignmentComponent" : {
-            "operations" : {
-              "process" : {
-                "inputs" : {
-                  "template-names" : [ "base-config-template", "licence-template" ],
-                  "action-name" : {
-                    "get_input" : "action-name"
-                  },
-                  "template-name" : {
-                    "get_input" : "template_name"
-                  },
-                  "template-version" : {
-                    "get_input" : "template-version"
-                  },
-                  "resource-type" : "vnf-type",
-                  "request-id" : {
-                    "get_input" : "request-id"
-                  },
-                  "resource-id" : {
-                    "get_input" : "hostname"
-                  }
-                },
-                "outputs" : {
-                  "resource-assignment-params" : "success",
-                  "status" : "status"
-                }
-              }
-            }
-          }
-        }
-      },
-      "resource-assignment-action" : {
-        "type" : "dg-resource-assignment",
-        "properties" : {
-          "mode" : "sync",
-          "version" : "LATEST",
-          "is-start-flow" : false
-        },
-        "capabilities" : {
-          "dg-node" : { }
-        },
-        "requirements" : {
-          "component-dependency" : {
-            "capability" : "component-node",
-            "node" : "resource-assignment-ra-component",
-            "relationship" : "tosca.relationships.DependsOn"
-          }
-        },
-        "interfaces" : {
-          "CONFIG" : {
-            "operations" : {
-              "ResourceAssignment" : {
-                "inputs" : {
-                  "params" : [ ]
-                }
-              }
-            }
-          }
-        }
-      },
-      "activate-action" : {
-        "type" : "dg-activate-netconf",
-        "properties" : {
-          "mode" : "sync",
-          "version" : "LATEST",
-          "is-start-flow" : false
-        },
-        "capabilities" : {
-          "dg-node" : { }
-        },
-        "requirements" : {
-          "component-dependency" : {
-            "capability" : "component-node",
-            "node" : "activate-netconf-component",
-            "relationship" : "tosca.relationships.DependsOn"
-          }
-        },
-        "interfaces" : {
-          "CONFIG" : {
-            "operations" : {
-              "ActivateNetconf" : {
-                "inputs" : {
-                  "params" : [ ]
-                }
-              }
-            }
-          }
-        }
-      },
-      "base-config-template" : {
-        "type" : "artifact-config-template",
-        "properties" : {
-          "action-names" : [ "resource-assignment-action" ]
-        },
-        "capabilities" : {
-          "content" : {
-            "properties" : {
-              "content" : "db://base-config-template"
-            }
-          },
-          "mapping" : {
-            "properties" : {
-              "mapping" : [ {
-                "name" : "rs-db-source",
-                "property" : {
-                  "required" : true,
-                  "type" : "string"
-                },
-                "input-param" : false,
-                "dictionary-name" : "sample-db-source",
-                "dictionary-source" : "primary-db",
-                "dependencies" : [ "hostname" ],
-                "version" : 0
-              }, {
-                "name" : "mdsal-source",
-                "property" : {
-                  "description" : "",
-                  "required" : true,
-                  "type" : "list",
-                  "entry_schema" : {
-                    "type" : "dt-v4-aggregate"
-                  }
-                },
-                "input-param" : false,
-                "dictionary-name" : "sample-mdsal-source",
-                "dictionary-source" : "primary-config-data",
-                "dependencies" : [ "service-instance-id" ],
-                "version" : 0
-              }, {
-                "name" : "hostname",
-                "property" : {
-                  "required" : true,
-                  "type" : "string"
-                },
-                "dictionary-name" : "hostname",
-                "dictionary-source" : "input",
-                "version" : 0,
-                "input-param" : false
-              }, {
-                "name" : "service",
-                "property" : {
-                  "required" : true,
-                  "type" : "string"
-                },
-                "dictionary-name" : "service",
-                "dictionary-source" : "input",
-                "version" : 0,
-                "input-param" : false
-              }, {
-                "name" : "service-instance-id",
-                "property" : {
-                  "required" : true,
-                  "type" : "string"
-                },
-                "dictionary-name" : "service-instance-id",
-                "dictionary-source" : "input",
-                "version" : 0,
-                "input-param" : false
-              } ]
-            }
-          }
-        }
-      },
-      "licence-template" : {
-        "type" : "artifact-config-template",
-        "properties" : {
-          "action-names" : [ "resource-assignment-action" ]
-        },
-        "capabilities" : {
-          "content" : {
-            "properties" : {
-              "content" : "db://licence-template"
-            }
-          },
-          "mapping" : {
-            "properties" : {
-              "mapping" : [ {
-                "name" : "licenses",
-                "property" : {
-                  "required" : true,
-                  "type" : "list",
-                  "entry_schema" : {
-                    "type" : "dt-license-key"
-                  }
-                },
-                "input-param" : false,
-                "dictionary-name" : "sample-licenses",
-                "dictionary-source" : "primary-config-data",
-                "dependencies" : [ "service-instance-id" ],
-                "version" : 0
-              }, {
-                "name" : "service-instance-id",
-                "property" : {
-                  "required" : true,
-                  "type" : "string"
-                },
-                "dictionary-name" : "service-instance-id",
-                "dictionary-source" : "input",
-                "version" : 0,
-                "input-param" : false
-              } ]
-            }
-          }
-        }
-      }
-    }
-  }
-}
-\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/logback.xml b/ms/controllerblueprints/modules/service/src/test/resources/logback.xml
deleted file mode 100644
index 2546a838..00000000
--- a/ms/controllerblueprints/modules/service/src/test/resources/logback.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
-  ~  Copyright © 2018 IBM.
-  ~  Modifications Copyright © 2017-2018 AT&T Intellectual Property.
-  ~
-  ~  Licensed under the Apache License, Version 2.0 (the "License");
-  ~  you may not use this file except in compliance with the License.
-  ~  You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  -->
-
-<configuration>
-
-    <property name="localPattern" value="[%-8thread] %d{HH:mm:ss.SSS} %-5level %logger{50} - %msg%n" />
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- encoders are assigned the type
-             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-        <encoder>
-            <pattern>${localPattern}</pattern>
-        </encoder>
-    </appender>
-
-
-    <logger name="org.springframework" level="warn"/>
-    <logger name="org.springframework.web" level="warn"/>
-    <logger name="org.hibernate" level="error"/>
-    <logger name="org.onap.ccsdk.apps" level="info"/>
-
-    <root level="warn">
-        <appender-ref ref="STDOUT"/>
-    </root>
-
-</configuration>
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/model_type/data_type/datatype-property.json b/ms/controllerblueprints/modules/service/src/test/resources/model_type/data_type/datatype-property.json
deleted file mode 100644
index 5584b10e..00000000
--- a/ms/controllerblueprints/modules/service/src/test/resources/model_type/data_type/datatype-property.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"version": "1.0.0",
-	"description": "This is Entry point Input Data Type, which is dynamic datatype, The parameter names will be populated during the Design time for each inputs",
-	"properties": {
-		"type": {
-			"required": true,
-			"type": "string"
-		},
-		"description": {
-			"required": false,
-			"type": "string"
-		},
-		"required": {
-			"required": false,
-			"type": "boolean"
-		},
-		"default": {
-			"required": false,
-			"type": "string"
-		},
-		"entry_schema": {
-			"required": false,
-			"type": "string"
-		}
-	},
-	"derived_from": "tosca.datatypes.Root"
-}
-\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/resourcedictionary/automap.json b/ms/controllerblueprints/modules/service/src/test/resources/resourcedictionary/automap.json
deleted file mode 100644
index c6dd7948..00000000
--- a/ms/controllerblueprints/modules/service/src/test/resources/resourcedictionary/automap.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-	{
-		"name": "sample-input-source"
-	},
-	{
-		"name": "sample-default-source"
-	},
-	{
-		"name": "sample-db-source"
-	},
-	{
-		"name": "sample-mdsal-source"
-	}
-]
-\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/resourcedictionary/default_definition.json b/ms/controllerblueprints/modules/service/src/test/resources/resourcedictionary/default_definition.json
deleted file mode 100644
index 334fb24e..00000000
--- a/ms/controllerblueprints/modules/service/src/test/resources/resourcedictionary/default_definition.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "ipaddress",
-  "property": {
-    "description": "name of the ",
-    "type": "list",
-    "entry_schema": {
-      "type": "dt-v4-aggregate"
-    }
-  },
-  "updated-by": "Brinda Santh (bs2796)",
-  "tags": "ipaddress",
-  "sources": {
-    "input": {
-      "type": "source-input"
-    }
-  }
-}
-\ No newline at end of file
author	Alexis de Talhouët <adetalhouet89@gmail.com>	2019-03-26 09:49:13 -0400
committer	Alexis de Talhouët <adetalhouet89@gmail.com>	2019-03-26 09:49:13 -0400
commit	72d22a4339db09824d46746dacbba1e141763dc0 (patch)
tree	7fbfea4b81afca0bc0c95e5d4b810f236f4dea29 /ms/controllerblueprints/modules/service/src/test
parent	ef6983b670796becfa66c69075c1829e8f9aef4b (diff)