Merge "Remove controllerbluprints distribution."

6 files changed, 0 insertions, 350 deletions

diff --git a/ms/controllerblueprints/application/src/main/resources/application-dev.properties b/ms/controllerblueprints/application/src/main/resources/application-dev.properties
deleted file mode 100755
index 1d5d04b55..000000000
--- a/ms/controllerblueprints/application/src/main/resources/application-dev.properties
+++ /dev/null
@@ -1,70 +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.
-#
-appName=ControllerBluePrints
-ms_name=org.onap.ccsdk.cds.controllerblueprints
-appVersion=1.0.0
-
-# Basic Authentication
-basic-auth.user-name=ccsdkapps
-basic-auth.hashed-pwd={bcrypt}$2a$10$MJxhNiOAffxbyrV9.rrOUewP9Q/ASg5Nit2cmP.yBaXGsVXo8BW3y
-
-#logging.pattern.console=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr($ threadId: {PID:- }){magenta} %clr(---){faint} %clr([ hostname: %X{hostname} serviceName: %X{serviceName} version: %X{version} transactionId: %X{transactionId} requestTimeStamp: %X{requestTimestamp}  responseTimeStamp: %X{responseTimestamp} duration: %X{duration}]){yellow} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex
-
-logging.level.org.springframework.web=INFO
-logging.level.org.hibernate.SQL=warn
-logging.level.org.hibernate.type.descriptor.sql=debug
-
-#To Remove Null in JSON API Response
-spring.jackson.default-property-inclusion=non_null
-
-#Swagger Configuration
-swagger.contact.name=Brinda Santh Muthuramalingam
-swagger.contact.url=www.onap.com
-swagger.contact.email=brindasanth@onap.com
-
-spring.jpa.properties.hibernate.show_sql=true
-spring.jpa.properties.hibernate.use_sql_comments=true
-spring.jpa.properties.hibernate.format_sql=true
-
-# spring.datasource.url, spring.datasource.username,spring.datasource.password  may be overridden by ENV variables
-spring.datasource.url=jdbc:mysql://localhost:3306/sdnctl
-spring.datasource.username=sdnctl
-spring.datasource.password=sdnctl
-spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-spring.jpa.show-sql=true
-spring.jpa.hibernate.ddl-auto=none
-spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
-# 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=blueprints/deploy
-blueprintsprocessor.blueprintArchivePath=blueprints/archive
-blueprintsprocessor.blueprintWorkingPath=blueprints/work
-# Controller Blueprint Load Configurations
-blueprintsprocessor.loadInitialData=true
-blueprintsprocessor.loadBluePrint=false
-blueprintsprocessor.loadBluePrintPaths=./../../../components/model-catalog/blueprint-model/test-blueprint
-blueprintsprocessor.loadModelType=true
-blueprintsprocessor.loadModeTypePaths=./../../../components/model-catalog/definition-type/starter-type
-blueprintsprocessor.loadResourceDictionary=true
-blueprintsprocessor.loadResourceDictionaryPaths=./../../../components/model-catalog/resource-dictionary/starter-dictionary
-
-# CBA file extension
-blueprintsprocessor.loadCbaExtension=zip
-
-# Web server config
-server.port=8082
diff --git a/ms/controllerblueprints/application/src/main/resources/application.properties b/ms/controllerblueprints/application/src/main/resources/application.properties
deleted file mode 100755
index 55770db2d..000000000
--- a/ms/controllerblueprints/application/src/main/resources/application.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright © 2017-2018 AT&T Intellectual Property.
-# Modifications Copyright © 2018 IBM.
-# Modifications Copyright © 2019 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.
-#
-appName=ControllerBluePrints
-ms_name=org.onap.ccsdk.cds.controllerblueprints
-appVersion=1.0.0
-
-# Basic Authentication
-basic-auth.user-name=ccsdkapps
-basic-auth.hashed-pwd={bcrypt}$2a$10$MJxhNiOAffxbyrV9.rrOUewP9Q/ASg5Nit2cmP.yBaXGsVXo8BW3y
-
-#logging.pattern.console=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr($ threadId: {PID:- }){magenta} %clr(---){faint} %clr([ hostname: %X{hostname} serviceName: %X{serviceName} version: %X{version} transactionId: %X{transactionId} requestTimeStamp: %X{requestTimestamp}  responseTimeStamp: %X{responseTimestamp} duration: %X{duration}]){yellow} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex
-
-logging.level.org.springframework.web=INFO
-logging.level.org.hibernate.SQL=warn
-logging.level.org.hibernate.type.descriptor.sql=debug
-
-#To Remove Null in JSON API Response
-spring.jackson.default-property-inclusion=non_null
-
-#Swagger Configuration
-swagger.contact.name=CCSDK team
-swagger.contact.url=www.onap.org
-swagger.contact.email=onap-discuss@lists.onap.org
-
-spring.jpa.properties.hibernate.show_sql=true
-spring.jpa.properties.hibernate.use_sql_comments=true
-spring.jpa.properties.hibernate.format_sql=true
-
-# spring.datasource.url, spring.datasource.username,spring.datasource.password  may be overridden by ENV variables
-spring.datasource.url=jdbc:mysql://db:3306/sdnctl
-spring.datasource.username=sdnctl
-spring.datasource.password=sdnctl
-spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-spring.jpa.show-sql=true
-spring.jpa.hibernate.ddl-auto=none
-spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
-
-# 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=/etc/blueprints/deploy
-blueprintsprocessor.blueprintArchivePath=/etc/blueprints/archive
-blueprintsprocessor.blueprintWorkingPath=/etc/blueprints/work
-# Controller Blueprint Load Configurations
-# blueprints.load.initial-data may be overridden by ENV variables
-blueprintsprocessor.loadInitialData=true
-blueprintsprocessor.loadBluePrint=true
-blueprintsprocessor.loadBluePrintPaths=/opt/app/onap//model-catalog/blueprint-model/service-blueprint
-blueprintsprocessor.loadModelType=true
-blueprintsprocessor.loadModeTypePaths=/opt/app/onap//model-catalog/definition-type/starter-type
-blueprintsprocessor.loadResourceDictionary=true
-blueprintsprocessor.loadResourceDictionaryPaths=/opt/app/onap//model-catalog/resource-dictionary/starter-dictionary
-
-# CBA file extension
-blueprintsprocessor.loadCbaExtension=zip
-
-# Web server config
-server.port=8080
diff --git a/ms/controllerblueprints/application/src/main/resources/logback.xml b/ms/controllerblueprints/application/src/main/resources/logback.xml
deleted file mode 100644
index 2af5a92cc..000000000
--- a/ms/controllerblueprints/application/src/main/resources/logback.xml
+++ /dev/null
@@ -1,44 +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.
-  -->
-
-<configuration>
-
-    <property name="localPattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{100} - %msg%n" />
-
-    <property name="defaultPattern" value="%date{ISO8601,UTC}|%X{RequestID}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}| %msg%n" />
-
-    <property name="debugLoggerPattern" value="%date{ISO8601,UTC}|%X{RequestID}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}|[%caller{3}]| %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>${defaultPattern}</pattern>
-        </encoder>
-    </appender>
-
-
-    <logger name="org.springframework" level="info"/>
-    <logger name="org.springframework.web" level="info"/>
-    <logger name="org.springframework.security.web.authentication" level="warn"/>
-    <logger name="org.hibernate" level="error"/>
-    <logger name="org.onap.ccsdk.cds" level="info"/>
-
-    <root level="warn">
-        <appender-ref ref="STDOUT"/>
-    </root>
-
-</configuration>
diff --git a/ms/controllerblueprints/application/src/main/resources/sql/data.sql b/ms/controllerblueprints/application/src/main/resources/sql/data.sql
deleted file mode 100644
index e69de29bb..000000000
--- a/ms/controllerblueprints/application/src/main/resources/sql/data.sql
+++ /dev/null
diff --git a/ms/controllerblueprints/application/src/main/resources/sql/schema-local.sql b/ms/controllerblueprints/application/src/main/resources/sql/schema-local.sql
deleted file mode 100644
index 47e0cce7a..000000000
--- a/ms/controllerblueprints/application/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 		INT(11) NOT NULL AUTO_INCREMENT,

-  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 	INT(11) NOT NULL AUTO_INCREMENT, 

-  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/application/src/main/resources/sql/schema.sql b/ms/controllerblueprints/application/src/main/resources/sql/schema.sql
deleted file mode 100644
index 9c38bec0b..000000000
--- a/ms/controllerblueprints/application/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 		INT(11) NOT NULL AUTO_INCREMENT,

-  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 	INT(11) NOT NULL AUTO_INCREMENT, 

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