Remove controllerbluprints distribution.

Change-Id: I8c7269f97f2b32a0fe8689baaeddfe1e82e0d075
Issue-ID: CCSDK-1663
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>

12 files changed, 0 insertions, 1523 deletions

diff --git a/ms/controllerblueprints/modules/pom.xml b/ms/controllerblueprints/modules/pom.xml
index 07121226f..4bc962f04 100644
--- a/ms/controllerblueprints/modules/pom.xml
+++ b/ms/controllerblueprints/modules/pom.xml
@@ -31,7 +31,6 @@
         <module>blueprint-core</module>
         <module>resource-dict</module>
         <module>blueprint-validation</module>
-        <module>service</module>
     </modules>
 
     <dependencies>
diff --git a/ms/controllerblueprints/modules/service/pom.xml b/ms/controllerblueprints/modules/service/pom.xml
deleted file mode 100644
index 0d822514a..000000000
--- a/ms/controllerblueprints/modules/service/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright © 2017-2018 AT&T Intellectual Property.
-  ~
-  ~ Modifications Copyright © 2018 IBM.
-  ~
-  ~ Modifications Copyright © 2019 IBM, Bell Canada
-  ~
-  ~ 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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId>
-        <artifactId>modules</artifactId>
-        <version>0.6.1-SNAPSHOT</version>
-    </parent>
-    <artifactId>service</artifactId>
-    <name>Controller Blueprints Service</name>
-
-    <properties>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-coroutines-reactor</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId>
-            <artifactId>blueprint-validation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.hubspot.jinjava</groupId>
-            <artifactId>jinjava</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/common/SwaggerGenerator.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/common/SwaggerGenerator.java
deleted file mode 100644
index 38216a616..000000000
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/common/SwaggerGenerator.java
+++ /dev/null
@@ -1,182 +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.cds.controllerblueprints.service.common;
-
-import io.swagger.models.*;
-import io.swagger.models.parameters.BodyParameter;
-import io.swagger.models.parameters.Parameter;
-import io.swagger.models.properties.*;
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang3.BooleanUtils;
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants;
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintTypes;
-import org.onap.ccsdk.cds.controllerblueprints.core.data.PropertyDefinition;
-import org.onap.ccsdk.cds.controllerblueprints.core.data.ServiceTemplate;
-
-import java.util.*;
-
-/**
- * SwaggerGenerator.java Purpose: Provide Service to generate service template input schema definition and Sample Json
- * generation.
- *
- * @author Brinda Santh
- * @version 1.0
- */
-@Deprecated
-public class SwaggerGenerator {
-
-    private ServiceTemplate serviceTemplate;
-    public static final String INPUTS="inputs";
-
-    /**
-     * This is a SwaggerGenerator constructor
-     */
-    public SwaggerGenerator(ServiceTemplate serviceTemplate) {
-        this.serviceTemplate = serviceTemplate;
-    }
-
-    /**
-     * This is a generateSwagger
-     *
-     * @return String
-     */
-    public String generateSwagger() {
-        
-        Swagger swagger = new Swagger().info(getInfo());
-
-        swagger.setPaths(getPaths());
-        swagger.setDefinitions(getDefinition());
-
-
-        return swagger.toString();
-    }
-
-    private Info getInfo() {
-        Info info = new Info();
-        Contact contact = new Contact();
-        contact.setName(serviceTemplate.getMetadata().get(BluePrintConstants.METADATA_TEMPLATE_AUTHOR));
-        info.setContact(contact);
-        info.setTitle(serviceTemplate.getMetadata().get(BluePrintConstants.METADATA_TEMPLATE_NAME));
-        info.setDescription(serviceTemplate.getDescription());
-        info.setVersion(serviceTemplate.getMetadata().get(BluePrintConstants.METADATA_TEMPLATE_VERSION));
-        return info;
-    }
-
-    private Map<String, Path> getPaths() {
-        Map<String, Path> paths = new HashMap<>();
-        Path path = new Path();
-        Operation post = new Operation();
-        post.setOperationId("configure");
-        post.setConsumes(Arrays.asList("application/json", "application/xml"));
-        post.setProduces(Arrays.asList("application/json", "application/xml"));
-        List<Parameter> parameters = new ArrayList<>();
-        Parameter in = new BodyParameter().schema(new RefModel("#/definitions/inputs"));
-        in.setRequired(true);
-        in.setName(INPUTS);
-        parameters.add(in);
-        post.setParameters(parameters);
-
-        Map<String, Response> responses = new HashMap<>();
-        Response response = new Response().description("Success");
-        responses.put("200", response);
-
-        Response failureResponse = new Response().description("Failure");
-        responses.put("400", failureResponse);
-        post.setResponses(responses);
-
-        path.setPost(post);
-        paths.put("/operations/config-selfservice-api:configure", path);
-        return paths;
-    }
-
-    private Map<String, Model> getDefinition() {
-        Map<String, Model> models = new HashMap<>();
-
-        ModelImpl inputmodel = new ModelImpl();
-        inputmodel.setTitle(INPUTS);
-        serviceTemplate.getTopologyTemplate().getInputs().forEach((propertyName, property) -> {
-            Property defProperty = getPropery(propertyName, property);
-            inputmodel.property(propertyName, defProperty);
-        });
-        models.put(INPUTS, inputmodel);
-
-        if (MapUtils.isNotEmpty(serviceTemplate.getDataTypes())) {
-            serviceTemplate.getDataTypes().forEach((name, dataType) -> {
-                ModelImpl model = new ModelImpl();
-                model.setDescription(dataType.getDescription());
-                if (dataType != null && MapUtils.isNotEmpty(dataType.getProperties())) {
-
-                    dataType.getProperties().forEach((propertyName, property) -> {
-                        Property defProperty = getPropery(propertyName, property);
-                        model.addProperty(propertyName, defProperty);
-                    });
-                }
-                models.put(name, model);
-            });
-        }
-        return models;
-
-    }
-
-    private Property getPropery(String name, PropertyDefinition propertyDefinition) {
-        Property defProperty = null;
-
-        if (BluePrintTypes.validPrimitiveTypes().contains(propertyDefinition.getType())) {
-            if (BluePrintConstants.DATA_TYPE_BOOLEAN.equals(propertyDefinition.getType())) {
-                defProperty = new BooleanProperty();
-            } else if (BluePrintConstants.DATA_TYPE_INTEGER.equals(propertyDefinition.getType())) {
-                StringProperty stringProperty = new StringProperty();
-                stringProperty.setType("integer");
-                defProperty = stringProperty;
-            } else if (BluePrintConstants.DATA_TYPE_FLOAT.equals(propertyDefinition.getType())) {
-                StringProperty stringProperty = new StringProperty();
-                stringProperty.setFormat("float");
-                defProperty = stringProperty;
-            } else if (BluePrintConstants.DATA_TYPE_TIMESTAMP.equals(propertyDefinition.getType())) {
-                DateTimeProperty dateTimeProperty = new DateTimeProperty();
-                dateTimeProperty.setFormat("date-time");
-                defProperty = dateTimeProperty;
-            } else {
-                defProperty = new StringProperty();
-            }
-        } else if (BluePrintTypes.validCollectionTypes().contains(propertyDefinition.getType())) {
-            Optional<Property> innerType = Optional.empty();
-            if (propertyDefinition.getEntrySchema() != null) {
-                String entrySchema = propertyDefinition.getEntrySchema().getType();
-                if (!BluePrintTypes.validPrimitiveTypes().contains(entrySchema)) {
-                    innerType = Optional.of(new RefProperty("#/definitions/" + entrySchema));
-                }
-            }
-            ArrayProperty arrayProperty = new ArrayProperty();
-            arrayProperty.setItems(innerType.orElseGet(StringProperty::new));
-            defProperty = arrayProperty;
-        } else {
-            defProperty = new RefProperty("#/definitions/" + propertyDefinition.getType());
-        }
-        defProperty.setName(name);
-        if (propertyDefinition.getDefaultValue() != null) {
-            defProperty.setDefault(String.valueOf(propertyDefinition.getDefaultValue()));
-        }
-
-        defProperty.setRequired(BooleanUtils.isTrue(propertyDefinition.getRequired()));
-        defProperty.setDescription(propertyDefinition.getDescription());
-        return defProperty;
-    }
-
-
-}
diff --git a/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/BluePrintDesignerCoreConfiguration.kt b/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/BluePrintDesignerCoreConfiguration.kt
deleted file mode 100644
index c69a94430..000000000
--- a/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/BluePrintDesignerCoreConfiguration.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T 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.cds.controllerblueprints.service
-
-import org.onap.ccsdk.cds.controllerblueprints.core.config.BluePrintLoadConfiguration
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.context.properties.bind.Bindable
-import org.springframework.boot.context.properties.bind.Binder
-import org.springframework.boot.context.properties.source.ConfigurationPropertySources
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.core.env.Environment
-import org.springframework.stereotype.Service
-
-@Configuration
-open class BluePrintDesignerCoreConfiguration(private val bluePrintProperties: BluePrintDesignerProperties) {
-
-    companion object {
-        const val PREFIX_BLUEPRINT_LOAD_CONFIGURATION = "blueprintsprocessor"
-    }
-
-    @Bean
-    open fun bluePrintDesignerLoadConfiguration(): BluePrintLoadConfiguration {
-        return bluePrintProperties
-                .propertyBeanType(PREFIX_BLUEPRINT_LOAD_CONFIGURATION, BluePrintLoadConfiguration::class.java)
-    }
-}
-
-@Configuration
-open class BlueprintDesignerPropertyConfiguration {
-    @Autowired
-    lateinit var environment: Environment
-
-    @Bean
-    open fun bluePrintDesignerPropertyBinder(): Binder {
-        val configurationPropertySource = ConfigurationPropertySources.get(environment)
-        return Binder(configurationPropertySource)
-    }
-}
-
-@Service
-open class BluePrintDesignerProperties(private var bluePrintDesignerPropertyBinder: Binder) {
-    fun <T> propertyBeanType(prefix: String, type: Class<T>): T {
-        return bluePrintDesignerPropertyBinder.bind(prefix, Bindable.of(type)).get()
-    }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json b/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json
deleted file mode 100644
index c482b9b30..000000000
--- a/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json
+++ /dev/null
@@ -1,862 +0,0 @@
-{

-	"version": "1.0.0",

-	"metadata": {

-		"template_author": "xxxx@onap.com",

-		"template_name": "default_netconf",

-		"template_version": "1.0.0",

-		"service-type": "XXXXXXXXXXX",

-		"vnf-type": "XXXXXXXXX"

-	},

-	"topology_template": {

-		"inputs": {

-			"request-id": {

-				"required": true,

-				"type": "string"

-			},

-			"template-name": {

-				"required": true,

-				"type": "string"

-			},

-			"template-version": {

-				"required": true,

-				"type": "string"

-			},

-			"action-name": {

-				"required": true,

-				"type": "string"

-			},

-			"service-instance-id": {

-				"required": true,

-				"type": "string"

-			},

-			"resource-type": {

-				"required": true,

-				"type": "string"

-			}

-		},

-		"node_templates": {

-			"base-config-template": {

-				"type": "artifact-config-template",

-				"properties": {

-					"action-names": [

-						"resource-assignment-action"

-					]

-				},

-				"capabilities": {

-					"content": {

-						"properties": {

-							"content": ""

-						}

-					},

-					"mapping": {

-						"properties": {

-							"mapping": []

-						}

-					}

-				}

-			},

-			"licence-template": {

-				"type": "artifact-config-template",

-				"properties": {

-					"action-names": [

-						"activate-netconf-action"

-					]

-				},

-				"capabilities": {

-					"content": {

-						"properties": {

-							"content": ""

-						}

-					},

-					"mapping": {

-						"properties": {

-							"mapping": []

-						}

-					}

-				}

-			},

-			"runningconfig-template": {

-				"type": "artifact-config-template",

-				"properties": {

-					"action-names": [

-						"activate-netconf-action"

-					]

-				},

-				"capabilities": {

-					"content": {

-						"properties": {

-							"content": "<get-config><source><running/></source></get-config>"

-						}

-					},

-					"mapping": {

-						"properties": {

-							"mapping": []

-						}

-					}

-				}

-			},

-			"resource-assignment-action": {

-				"type": "dg-resource-assignment",

-				"interfaces": {

-					"CONFIG": {

-						"operations": {

-							"ResourceAssignment": {

-								

-							}

-						}

-					}

-				},

-				"capabilities": {

-					"dg-node": {

-						

-					}

-				},

-				"requirements": {

-					"component-dependency": {

-						"capability": "component-node",

-						"node": "get-resource-assignment",

-						"relationship": "tosca.relationships.DependsOn"

-					}

-				}

-			},

-			"activate-netconf-action": {

-				"type": "dg-activate-netconf",

-				"interfaces": {

-					"CONFIG": {

-						"operations": {

-							"ActivateNetconf": {

-								

-							}

-						}

-					}

-				},

-				"capabilities": {

-					"dg-node": {

-						

-					}

-				},

-				"requirements": {

-					"component-dependency": {

-						"capability": "component-node",

-						"node": "transaction-netconf-baseconfig",

-						"relationship": "tosca.relationships.DependsOn"

-					}

-				}

-			},

-			"resource-assignment": {

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

-				"interfaces": {

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

-						"operations": {

-							"process": {

-								"inputs": {

-									"resource-type": "vnf-type",

-									"template-names": [

-										"base-config-template",

-										"licence-template"

-									],

-									"request-id": { "get_input" : "request-id" },

-									"resource-id": { "get_input" : "vnf-id" }

-								},

-								"outputs": {

-									"resource-assignment-params": "",

-									"status": ""

-								}

-							}

-						}

-					}

-				},

-				"capabilities": {

-					"component-node": {

-						

-					}

-				}

-			},

-			"edit-netconf-config": {

-				"type": "component-netconf-edit",

-				"interfaces": {

-					"org-openecomp-sdnc-netconf-adaptor-service-SimpleNetconfEditConfigNode": {

-						"operations": {

-							"process": {

-								"inputs": {

-									"rpc-message": false,

-									"wait": 0,

-									"unlock": false,

-									"config-target": "RUNNING",

-									"commit": true,

-									"edit-default-operation": "repalce",

-									"lock": false,

-									"post-restart-wait": false,

-									"pre-restart-wait": false

-								},

-								"outputs": {

-									"rpc-response-message": "",

-									"status": ""

-								}

-							}

-						}

-					}

-				},

-				"capabilities": {

-					"component-node": {

-						

-					}

-				}

-			},

-			"transaction-netconf-baseconfig": {

-				"type": "component-transaction-netconf",

-				"interfaces": {

-					"org-openecomp-sdnc-netconf-adaptor-service-NetconfTransactionNode": {

-						"operations": {

-							"process": {

-								"inputs": {

-									"rollback": false,

-									"transaction-templates": [

-										"runningconfig-template"

-									],

-									"assignment-action-name": "resource-assignment-action",

-									"transaction-components": [

-										"get-netconf-config"

-									],

-									"resource-type": "vnf-type",

-									"initialise-sftp": false,

-									"request-id": {"get_input" : "request-id"},

-									"initialise-ssh": false,

-									"resource-id": { "get_input" : "vnf-id" },

-									"action-name": {"get_input" : "action-name"}

-								},

-								"outputs": {

-									"rpc-response-message": "",

-									"status": ""

-								}

-							}

-						}

-					}

-				},

-				"capabilities": {

-					"component-node": {

-						

-					}

-				},

-				"requirements": {

-					"netconf-connection": {

-						"capability": "netconf",

-						"node": "vdbe-netconf-device",

-						"relationship": "tosca.relationships.ConnectsTo"

-					}

-				}

-			},

-			"get-netconf-config": {

-				"type": "component-netconf-get",

-				"interfaces": {

-					"org-openecomp-sdnc-netconf-adaptor-service-SimpleNetconfGetConfigNode": {

-						"operations": {

-							"process": {

-								"inputs": {

-									"rpc-message": true,

-									"wait": 1,

-									"message-time-out": 10

-								},

-								"outputs": {

-									"rpc-response-message": "",

-									"status": ""

-								}

-							}

-						}

-					}

-				},

-				"capabilities": {

-					"component-node": {

-						

-					}

-				}

-			}

-		}

-	},

-	"node_types": {

-		"vnf-netconf-device": {

-			"description": "This is VNF Device with Netconf and SSH Capability",

-			"version": "1.0.0",

-			"capabilities": {

-				"netconf": {

-					"type": "tosca.capabilities.Netconf",

-					"properties": {

-						"password": {

-							"required": false,

-							"type": "string"

-						},

-						"user-id": {

-							"required": true,

-							"type": "string"

-						},

-						"host-ip-address": {

-							"required": true,

-							"type": "string"

-						},

-						"port-number": {

-							"required": true,

-							"type": "integer",

-							"default": 830

-						},

-						"message-time-out": {

-							"required": false,

-							"type": "integer",

-							"default": 3000

-						},

-						"connection-time-out": {

-							"required": false,

-							"type": "integer",

-							"default": 30

-						}

-					}

-				},

-				"ssh": {

-					"type": "tosca.capabilities.Ssh",

-					"properties": {

-						"password": {

-							"required": false,

-							"type": "string"

-						},

-						"user-id": {

-							"required": true,

-							"type": "string"

-						},

-						"host-ip-address": {

-							"required": true,

-							"type": "string"

-						},

-						"port-number": {

-							"required": true,

-							"type": "integer",

-							"default": 22

-						},

-						"message-time-out": {

-							"required": false,

-							"type": "integer",

-							"default": 180

-						},

-						"connection-time-out": {

-							"required": false,

-							"type": "integer",

-							"default": 30

-						}

-					}

-				},

-				"sftp": {

-					"type": "tosca.capabilities.Sftp",

-					"properties": {

-						"password": {

-							"required": false,

-							"type": "string"

-						},

-						"user-id": {

-							"required": true,

-							"type": "string"

-						},

-						"host-ip-address": {

-							"required": true,

-							"type": "string"

-						},

-						"port-number": {

-							"required": true,

-							"type": "integer",

-							"default": 22

-						},

-						"message-time-out": {

-							"required": false,

-							"type": "integer",

-							"default": 180

-						},

-						"connection-time-out": {

-							"required": false,

-							"type": "integer",

-							"default": 30

-						}

-					}

-				}

-			},

-			"derived_from": "tosca.nodes.Vnf"

-		},

-		"dg-resource-assignment": {

-			"description": "This is Resource Assignment Directed Graph",

-			"version": "1.0.0",

-			"properties": {

-				"mode": {

-					"required": false,

-					"type": "string",

-					"default": "sync"

-				},

-				"version": {

-					"required": false,

-					"type": "string",

-					"default": "LATEST"

-				},

-				"is-start-flow": {

-					"required": false,

-					"type": "boolean",

-					"default": false

-				}

-			},

-			"capabilities": {

-				"dg-node": {

-					"type": "tosca.capabilities.Node"

-				}

-			},

-			"requirements": {

-				"component-dependency": {

-					"capability": "component-node",

-					"node": "component-resource-assignment",

-					"relationship": "tosca.relationships.DependsOn"

-				}

-			},

-			"interfaces": {

-				"CONFIG": {

-					"operations": {

-						"ResourceAssignment": {

-							"inputs": {

-								"params": {

-									"required": false,

-									"type": "list",

-									"entry_schema": {

-										"type": "datatype-property"

-									}

-								}

-							}

-						}

-					}

-				}

-			},

-			"derived_from": "tosca.nodes.Workflow"

-		},

-		"dg-activate-netconf": {

-			"description": "This is Download Netconf Directed Graph",

-			"version": "1.0.0",

-			"properties": {

-				"mode": {

-					"required": false,

-					"type": "string",

-					"default": "sync"

-				},

-				"version": {

-					"required": false,

-					"type": "string",

-					"default": "LATEST"

-				},

-				"is-start-flow": {

-					"required": false,

-					"type": "boolean",

-					"default": false

-				}

-			},

-			"capabilities": {

-				"dg-node": {

-					"type": "tosca.capabilities.Node"

-				}

-			},

-			"requirements": {

-				"component-dependency": {

-					"capability": "component-node",

-					"node": "component-transaction-netconf",

-					"relationship": "tosca.relationships.DependsOn"

-				}

-			},

-			"interfaces": {

-				"CONFIG": {

-					"operations": {

-						"ActivateNetconf": {

-							"inputs": {

-								"params": {

-									"required": false,

-									"type": "list",

-									"entry_schema": {

-										"type": "datatype-property"

-									}

-								}

-							}

-						}

-					}

-				}

-			},

-			"derived_from": "tosca.nodes.Workflow"

-		},

-		"artifact-config-template": {

-			"description": "This is Configuration Velocity Template",

-			"version": "1.0.0",

-			"properties": {

-				"action-names": {

-					"required": true,

-					"type": "list",

-					"entry_schema": {

-						"type": "string"

-					}

-				}

-			},

-			"capabilities": {

-				"content": {

-					"type": "tosca.capabilities.Content",

-					"properties": {

-						"content": {

-							"required": true,

-							"type": "string"

-						}

-					}

-				},

-				"mapping": {

-					"type": "tosca.capabilities.Mapping",

-					"properties": {

-						"mapping": {

-							"required": false,

-							"type": "list",

-							"entry_schema": {

-								"type": "datatype-resource-assignment"

-							}

-						}

-					}

-				}

-			},

-			"derived_from": "tosca.nodes.Artifact"

-		},

-		"component-resource-assignment": {

-			"description": "This is Resource Assignment Component API",

-			"version": "1.0.0",

-			"capabilities": {

-				"component-node": {

-					"type": "tosca.capabilities.Node"

-				}

-			},

-			"interfaces": {

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

-					"operations": {

-						"process": {

-							"inputs": {

-								"handler-name": {

-									"description": "Name of the Artifact Node Template, to get the template Content. If template-content is present, then content wont be reterived from the Artifact Node Template.",

-									"required": true,

-									"type": "string"

-								},

-								"resource-type": {

-									"required": false,

-									"type": "string"

-								},

-								"template-names": {

-									"description": "Name of the Artifact Node Templates, to get the template Content.",

-									"required": true,

-									"type": "list",

-									"entry_schema": {

-										"type": "string"

-									}

-								},

-								"request-id": {

-									"description": "Request Id used to store the generated configuration, in the database along with the template-name",

-									"required": true,

-									"type": "string"

-								},

-								"resource-id": {

-									"description": "Id used to pull the data content from the data base. Either template-data or resource-id should be present",

-									"required": true,

-									"type": "string"

-								},

-								"action-name": {

-									"description": "Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",

-									"required": false,

-									"type": "string"

-								}

-							},

-							"outputs": {

-								"resource-assignment-params": {

-									"required": true,

-									"type": "string"

-								},

-								"status": {

-									"required": true,

-									"type": "string"

-								}

-							}

-						}

-					}

-				}

-			},

-			"derived_from": "tosca.nodes.Component"

-		},

-		"component-netconf-get": {

-			"description": "This is Netconf Get Running Configuration Component API",

-			"version": "1.0.0",

-			"capabilities": {

-				"component-node": {

-					"type": "tosca.capabilities.Node"

-				}

-			},

-			"interfaces": {

-				"org-openecomp-sdnc-netconf-adaptor-service-SimpleNetconfGetConfigNode": {

-					"operations": {

-						"process": {

-							"inputs": {

-								"rpc-message": {

-									"description": "It should be true, If the message is Neconf RPC message, It should be false If it is plain Config message.",

-									"required": false,

-									"type": "boolean",

-									"default": false

-								},

-								"wait": {

-									"required": false,

-									"type": "integer",

-									"default": 0

-								},

-								"message-time-out": {

-									"required": false,

-									"type": "integer",

-									"default": 30

-								}

-							},

-							"outputs": {

-								"config-message": {

-									"type": "string"

-								},

-								"status": {

-									"description": "Status of the Component Execution ( success or failure )",

-									"required": true,

-									"type": "string"

-								}

-							}

-						}

-					}

-				}

-			},

-			"derived_from": "tosca.nodes.Component"

-		},

-		"component-netconf-edit": {

-			"description": "This is Netconf Edit Configuration Component API",

-			"version": "1.0.0",

-			"capabilities": {

-				"component-node": {

-					"type": "tosca.capabilities.Node"

-				}

-			},

-			"interfaces": {

-				"org-openecomp-sdnc-netconf-adaptor-service-SimpleNetconfEditConfigNode": {

-					"operations": {

-						"process": {

-							"inputs": {

-								"rpc-message": {

-									"description": "If the message is Neconf RPC message,It should be true or false.",

-									"required": false,

-									"type": "boolean",

-									"default": false

-								},

-								"wait": {

-									"description": "Delay time in sec before performing edit-config action.",

-									"required": false,

-									"type": "integer",

-									"default": 0

-								},

-								"unlock": {

-									"description": "If unLock command has to send before Edit Configuration.",

-									"required": false,

-									"type": "boolean",

-									"default": false

-								},

-								"config-target": {

-									"required": false,

-									"type": "string"

-								},

-								"commit": {

-									"description": "Issue commit command to the device after performing edit-config action.",

-									"required": false,

-									"type": "boolean",

-									"default": false

-								},

-								"edit-default-operation": {

-									"required": false,

-									"type": "string"

-								},

-								"lock": {

-									"description": "Issue lock command to the device before performing edit-config action.",

-									"required": false,

-									"type": "boolean",

-									"default": false

-								},

-								"post-restart-wait": {

-									"description": "If Restart command should be issued before the Edit Operation, Provide the time to wait after restart. 0 meanno restart required or wait time in sec ex : 3000 for 5 ",

-									"required": false,

-									"type": "integer",

-									"default": 0

-								},

-								"pre-restart-wait": {

-									"description": "If Restart command should be issued after the Edit Operation, Provide the time to wait after restart. 0 meanno restart required or wait time in sec ex : 3000 for 5 ",

-									"required": false,

-									"type": "integer",

-									"default": 0

-								},

-								"message-time-out": {

-									"required": false,

-									"type": "integer",

-									"default": 30

-								}

-							},

-							"outputs": {

-								"rpc-response-message": {

-									"type": "string"

-								},

-								"status": {

-									"description": "Status of the Component Execution ( success or failure )",

-									"required": true,

-									"type": "string"

-								}

-							}

-						}

-					}

-				}

-			},

-			"derived_from": "tosca.nodes.Component"

-		},

-		"component-transaction-netconf": {

-			"description": "This is Netconf Transaction Configuration Component API",

-			"version": "1.0.0",

-			"capabilities": {

-				"component-node": {

-					"type": "tosca.capabilities.Node"

-				}

-			},

-			"requirements": {

-				"netconf-connection": {

-					"capability": "netconf",

-					"node": "vnf-netconf-device",

-					"relationship": "tosca.relationships.ConnectsTo"

-				}

-			},

-			"interfaces": {

-				"org-openecomp-sdnc-netconf-adaptor-service-NetconfTransactionNode": {

-					"operations": {

-						"process": {

-							"inputs": {

-								"rollback": {

-									"required": false,

-									"type": "boolean"

-								},

-								"transaction-templates": {

-									"description": "Templates used by the Transaction Components during processing",

-									"required": true,

-									"type": "list",

-									"entry_schema": {

-										"type": "string"

-									}

-								},

-								"assignment-action-name": {

-									"description": "Assignment Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",

-									"required": true,

-									"type": "string"

-								},

-								"transaction-components": {

-									"description": "Components used to used for the atomic transaction, Default Handlers are org.openecomp.sdnc.netconf.adaptor.service.SimpleNetconfEditConfigNode and org.openecomp.sdnc.netconf.adaptor.service.SimpleNetconfGetConfigNode",

-									"required": true,

-									"type": "list",

-									"entry_schema": {

-										"type": "string"

-									}

-								},

-								"resource-type": {

-									"description": "Resource Type to get from Database, Either (message & mask-info ) or( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",

-									"required": false,

-									"type": "string"

-								},

-								"initialise-sftp": {

-									"required": false,

-									"type": "boolean"

-								},

-								"request-id": {

-									"description": "Request Id used to store the generated configuration, in the database along with the template-name",

-									"required": true,

-									"type": "string"

-								},

-								"initialise-ssh": {

-									"required": false,

-									"type": "boolean"

-								},

-								"resource-id": {

-									"description": "Resource Id to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",

-									"required": false,

-									"type": "string"

-								},

-								"action-name": {

-									"description": "Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",

-									"required": false,

-									"type": "string"

-								}

-							},

-							"outputs": {

-								"rpc-response-message": {

-									"type": "string"

-								},

-								"status": {

-									"description": "Status of the Component Execution ( success or failure )",

-									"required": true,

-									"type": "string"

-								}

-							}

-						}

-					}

-				}

-			},

-			"derived_from": "tosca.nodes.Component"

-		}

-	},

-	"data_types": {

-		"datatype-resource-assignment": {

-			"version": "1.0.0",

-			"description": "This is Resource Assignment Data Type",

-			"properties": {

-				"property": {

-					"required": true,

-					"type": "datatype-property"

-				},

-				"input-param": {

-					"required": true,

-					"type": "boolean"

-				},

-				"dictionary-name": {

-					"required": false,

-					"type": "string"

-				},

-				"dictionary-source": {

-					"required": false,

-					"type": "string"

-				},

-				"dependencies": {

-					"required": true,

-					"type": "list",

-					"entry_schema": {

-						"type": "string"

-					}

-				}

-			},

-			"derived_from": "tosca.datatypes.Root"

-		},

-		"datatype-property": {

-			"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/main/resources/sql/data.sql b/ms/controllerblueprints/modules/service/src/main/resources/sql/data.sql
deleted file mode 100644
index e69de29bb..000000000
--- a/ms/controllerblueprints/modules/service/src/main/resources/sql/data.sql
+++ /dev/null
diff --git a/ms/controllerblueprints/modules/service/src/main/resources/sql/schema-local.sql b/ms/controllerblueprints/modules/service/src/main/resources/sql/schema-local.sql
deleted file mode 100644
index ad5fdd054..000000000
--- a/ms/controllerblueprints/modules/service/src/main/resources/sql/schema-local.sql
+++ /dev/null
@@ -1,83 +0,0 @@
--- drop table sdnctl.MODEL_TYPE;

--- drop table sdnctl.RESOURCE_DICTIONARY;

--- drop table sdnctl.CONFIG_MODEL_CONTENT;

--- drop table sdnctl.CONFIG_MODEL;

-

--- -----------------------------------------------------

--- table CONFIG_MODEL

--- -----------------------------------------------------

-CREATE TABLE IF NOT EXISTS sdnctl.CONFIG_MODEL (

-  config_model_id 		VARCHAR(100) NOT NULL,

-  service_uuid 			VARCHAR(50) NULL DEFAULT NULL,

-  distribution_id 		VARCHAR(50) NULL DEFAULT NULL,

-  service_name 			VARCHAR(255) NULL DEFAULT NULL,

-  service_description 		VARCHAR(255) NULL DEFAULT NULL,

-  resource_uuid 		VARCHAR(255) NULL DEFAULT NULL,

-  resource_instance_name 	VARCHAR(255) NULL DEFAULT NULL,

-  resource_name 		varchar(255) null default null,

-  resource_version 		varchar(50) null default null,

-  resource_type 		varchar(50) null default null,

-  artifact_uuid 		varchar(50) null default null,

-  artifact_type 		varchar(50) not null,

-  artifact_version 		varchar(25) not null,

-  artifact_description 		longtext null default null,

-  internal_version 		int(11) null default null,

-  creation_date 		datetime not null default current_timestamp,

-  artifact_name 		varchar(100) not null,

-  published 			varchar(1) not null,

-  updated_by 			varchar(100) not null,

-  tags 				longtext null default null,

-  primary key PK_CONFIG_MODEL (config_model_id),

-  UNIQUE KEY UK_CONFIG_MODEL (artifact_name , artifact_version)

-) ENGINE=InnoDB;

-

-

--- -----------------------------------------------------

--- table CONFIG_MODEL_CONTENT

--- -----------------------------------------------------

-CREATE TABLE IF NOT EXISTS sdnctl.CONFIG_MODEL_CONTENT (

-  config_model_content_id 	VARCHAR(100) NOT NULL,

-  config_model_id 		INT NOT NULL,

-  name 				VARCHAR(100) NOT NULL,

-  content_type 			VARCHAR(50) NOT NULL,

-  description 			LONGTEXT NULL DEFAULT NULL,

-  updated_date 			DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,

-  content 			LONGTEXT NULL DEFAULT NULL,

-  PRIMARY KEY PK_CONFIG_MODEL_CONTENT (config_model_content_id),

-  UNIQUE KEY UK_CONFIG_MODEL_CONTENT (config_model_id, name, content_type),

-  FOREIGN KEY FK_CONFIG_MODEL_CONTENT (config_model_id) REFERENCES sdnctl.CONFIG_MODEL(config_model_id) ON DELETE CASCADE

-) ENGINE=InnoDB;

-

--- -----------------------------------------------------

--- table MODEL_TYPE

--- -----------------------------------------------------

-CREATE TABLE IF NOT EXISTS sdnctl.MODEL_TYPE (

-  model_name 		VARCHAR(100) NOT NULL,

-  derived_from 		VARCHAR(100) NOT NULL,

-  definition_type 	VARCHAR(100) NOT NULL,

-  definition 		LONGTEXT NOT NULL,

-  version 		VARCHAR(10) NOT NULL,

-  description 		LONGTEXT NOT NULL,

-  tags 			LONGTEXT NULL DEFAULT NULL,  

-  creation_date 	DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,

-  updated_by 		VARCHAR(100) NOT NULL,

-  PRIMARY KEY PK_MODEL_TYPE (model_name),

-  INDEX IX_MODEL_TYPE (model_name)

-) ENGINE=InnoDB;

-

-

--- -----------------------------------------------------

--- table RESOURCE_DICTIONARY

--- -----------------------------------------------------

-CREATE TABLE IF NOT EXISTS sdnctl.RESOURCE_DICTIONARY (

-  name 			VARCHAR(100) NOT NULL,

-  data_type 		VARCHAR(100) NOT NULL,

-  entry_schema 		VARCHAR(100) NULL DEFAULT NULL,

-  definition 		LONGTEXT NOT NULL,

-  description 		LONGTEXT NOT NULL,

-  tags 			LONGTEXT NOT NULL,  

-  creation_date 	DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,

-  updated_by 		VARCHAR(100) NOT NULL,

-  primary key PK_RESOURCE_DICTIONARY (name),

-  INDEX IX_RESOURCE_DICTIONARY (name)

-) ENGINE=InnoDB;
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/main/resources/sql/schema.sql b/ms/controllerblueprints/modules/service/src/main/resources/sql/schema.sql
deleted file mode 100644
index 015b03b31..000000000
--- a/ms/controllerblueprints/modules/service/src/main/resources/sql/schema.sql
+++ /dev/null
@@ -1,78 +0,0 @@
--- -----------------------------------------------------

--- table CONFIG_MODEL

--- -----------------------------------------------------

-CREATE TABLE IF NOT EXISTS configurator.CONFIG_MODEL (

-  config_model_id 		VARCHAR(100) NOT NULL,

-  service_uuid 			VARCHAR(50) NULL DEFAULT NULL,

-  distribution_id 		VARCHAR(50) NULL DEFAULT NULL,

-  service_name 			VARCHAR(255) NULL DEFAULT NULL,

-  service_description 		VARCHAR(255) NULL DEFAULT NULL,

-  resource_uuid 		VARCHAR(255) NULL DEFAULT NULL,

-  resource_instance_name 	VARCHAR(255) NULL DEFAULT NULL,

-  resource_name 		varchar(255) null default null,

-  resource_version 		varchar(50) null default null,

-  resource_type 		varchar(50) null default null,

-  artifact_uuid 		varchar(50) null default null,

-  artifact_type 		varchar(50) not null,

-  artifact_version 		varchar(25) not null,

-  artifact_description 		longtext null default null,

-  internal_version 		int(11) null default null,

-  creation_date 		datetime not null default current_timestamp,

-  artifact_name 		varchar(100) not null,

-  published 			varchar(1) not null,

-  updated_by 			varchar(100) not null,

-  tags 				longtext null default null,

-  primary key PK_CONFIG_MODEL (config_model_id),

-  UNIQUE KEY UK_CONFIG_MODEL (artifact_name , artifact_version)

-) ENGINE=InnoDB;

-

-

--- -----------------------------------------------------

--- table CONFIG_MODEL_CONTENT

--- -----------------------------------------------------

-CREATE TABLE IF NOT EXISTS configurator.CONFIG_MODEL_CONTENT (

-  config_model_content_id 	VARCHAR(100) NOT NULL,

-  config_model_id 		INT NOT NULL,

-  name 				VARCHAR(100) NOT NULL,

-  content_type 			VARCHAR(50) NOT NULL,

-  description 			LONGTEXT NULL DEFAULT NULL,

-  updated_date 			DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,

-  content 			LONGTEXT NULL DEFAULT NULL,

-  PRIMARY KEY PK_CONFIG_MODEL_CONTENT (config_model_content_id),

-  UNIQUE KEY UK_CONFIG_MODEL_CONTENT (config_model_id, name, content_type),

-  FOREIGN KEY FK_CONFIG_MODEL_CONTENT (config_model_id) REFERENCES configurator.CONFIG_MODEL(config_model_id) ON DELETE CASCADE

-) ENGINE=InnoDB;

-

--- -----------------------------------------------------

--- table MODEL_TYPE

--- -----------------------------------------------------

-CREATE TABLE IF NOT EXISTS configurator.MODEL_TYPE (

-  model_name 		VARCHAR(100) NOT NULL,

-  derived_from 		VARCHAR(100) NOT NULL,

-  definition_type 	VARCHAR(100) NOT NULL,

-  definition 		LONGTEXT NOT NULL,

-  version 		VARCHAR(10) NOT NULL,

-  description 		LONGTEXT NOT NULL,

-  tags 			LONGTEXT NULL DEFAULT NULL,  

-  creation_date 	DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,

-  updated_by 		VARCHAR(100) NOT NULL,

-  PRIMARY KEY PK_MODEL_TYPE (model_name),

-  INDEX IX_MODEL_TYPE (model_name)

-) ENGINE=InnoDB;

-

-

--- -----------------------------------------------------

--- table RESOURCE_DICTIONARY

--- -----------------------------------------------------

-CREATE TABLE IF NOT EXISTS configurator.RESOURCE_DICTIONARY (

-  name 			VARCHAR(100) NOT NULL,

-  data_type 		VARCHAR(100) NOT NULL,

-  entry_schema 		VARCHAR(100) NULL DEFAULT NULL,

-  definition 		LONGTEXT NOT NULL,

-  description 		LONGTEXT NOT NULL,

-  tags 			LONGTEXT NOT NULL,  

-  creation_date 	DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,

-  updated_by 		VARCHAR(100) NOT NULL,

-  primary key PK_RESOURCE_DICTIONARY (name),

-  INDEX IX_RESOURCE_DICTIONARY (name)

-) ENGINE=InnoDB;

diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/cds/controllerblueprints/DatabaseConfig.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/cds/controllerblueprints/DatabaseConfig.java
deleted file mode 100644
index 658d3072f..000000000
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/cds/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.cds.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.cds.controllerblueprints.service.domain")
-@EnableTransactionManagement
-@EnableJpaRepositories("org.onap.ccsdk.cds.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.cds.controllerblueprints.service.domain");
-        factory.setDataSource(dataSource);
-        return factory;
-    }
-
-}
diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/cds/controllerblueprints/TestApplication.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/cds/controllerblueprints/TestApplication.java
deleted file mode 100644
index d5ea7bc5d..000000000
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/cds/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.cds.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.cds.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/resources/application.properties b/ms/controllerblueprints/modules/service/src/test/resources/application.properties
deleted file mode 100755
index ac83276e6..000000000
--- 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-db,input=source-input,default=source-default,sdnc=source-rest,aai-data=source-rest,capability=source-capability
-# Controller Blueprints Core Configuration
-blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
-blueprintsprocessor.blueprintArchivePath=./target/blueprints/archive
-blueprintsprocessor.blueprintWorkingPath=./target/blueprints/work
-# Controller Blueprint Load Configurations
-blueprintsprocessor.loadInitialData=false
-blueprintsprocessor.loadBluePrint=false
-blueprintsprocessor.loadBluePrintPaths=./../../../../components/model-catalog/blueprint-model/test-blueprint
-blueprintsprocessor.loadModelType=false
-blueprintsprocessor.loadModeTypePaths=./../../../../components/model-catalog/definition-type/starter-type
-blueprintsprocessor.loadResourceDictionary=false
-blueprintsprocessor.loadResourceDictionaryPaths=./../../../../components/model-catalog/resource-dictionary/starter-dictionary
-
-# CBA file extension
-blueprintsprocessor.loadCbaExtension=zip
-
-# CBA examples for tests cases
-blueprintsprocessor.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprint
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/logback-test.xml b/ms/controllerblueprints/modules/service/src/test/resources/logback-test.xml
deleted file mode 100644
index feb4514d6..000000000
--- a/ms/controllerblueprints/modules/service/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,39 +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>
-
-     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- encoders are assigned the type
-             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} %-5level [%thread] %logger{50} - %msg%n</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.cds.controllerblueprints.core" level="warn"/>
-    <logger name="org.onap.ccsdk.cds.controllerblueprints" level="info"/>
-
-    <root level="warn">
-        <appender-ref ref="STDOUT"/>
-    </root>
-
-</configuration>