diff options
| author |   Brinda Santh <bs2796@att.com> | 2019-12-03 16:15:20 -0500 |
|---|---|---|
| committer | Brinda Santh <bs2796@att.com> | 2019-12-06 13:37:24 -0500 |
| commit | ea84b36447601d0d6a633ae708b72c6aaae6dc67 (patch) | |
| tree | 732ae48ab262fd2ff8ddda1748728d9764eb0d79 /ms/blueprintsprocessor/application | |
| parent | 7466e4277c9fe098a61ae126d1892b3cd30d6f89 (diff) | |
Refractor controller blueprint modules
Move controller blueprints modules to blueprints processor and change the maven group name.
Fix test cba and model type paths
Fix dependencies issues.
Issue-ID: CCSDK-1663
Signed-off-by: Brinda Santh <bs2796@att.com>
Change-Id: I3654e6f04811470327acba90e8a452b66e3e189b
Diffstat (limited to 'ms/blueprintsprocessor/application')
3 files changed, 10 insertions, 8 deletions
diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml index 1ed2eb3f9..f4d784bd3 100755 --- a/ms/blueprintsprocessor/application/pom.xml +++ b/ms/blueprintsprocessor/application/pom.xml @@ -47,9 +47,9 @@ <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId> - <artifactId>blueprint-core</artifactId> - <exclusions> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <artifactId>blueprint-core</artifactId> + <exclusions> <exclusion> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-logging</artifactId> diff --git a/ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml b/ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml index ada461b52..0ff04bf3a 100755 --- a/ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml +++ b/ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml @@ -5,9 +5,9 @@ services: image: mariadb:latest container_name: ccsdk-mariadb ports: - - "3306:3306" + - "3306:3306" volumes: - - ~/vm_mysql:/var/lib/mysql + - ~/vm_mysql:/var/lib/mysql restart: always environment: MYSQL_ROOT_PASSWORD: sdnctl @@ -19,6 +19,7 @@ services: - db image: onap/ccsdk-blueprintsprocessor:latest container_name: cds-controller-default + hostname: cds-controller-default ports: - "8000:8080" - "9111:9111" @@ -26,7 +27,7 @@ services: volumes: - blueprints-deploy:/opt/app/onap/blueprints/deploy environment: - APPLICATIONNAME: BlueprintsProcessor + APPLICATIONNAME: cds-controller BUNDLEVERSION: 1.0.0 APP_CONFIG_HOME: /opt/app/onap/config STICKYSELECTORKEY: @@ -46,13 +47,14 @@ services: - db image: onap/ccsdk-py-executor container_name: py-executor-default + hostname: py-executor-default ports: - "50052:50052" restart: always volumes: - blueprints-deploy:/opt/app/onap/blueprints/deploy environment: - APPLICATIONNAME: PythonExecutor + APPLICATIONNAME: py-executor BUNDLEVERSION: 1.0.0 APP_CONFIG_HOME: /opt/app/onap/config STICKYSELECTORKEY: diff --git a/ms/blueprintsprocessor/application/src/main/docker/startService.sh b/ms/blueprintsprocessor/application/src/main/docker/startService.sh index 11c471f2d..7dcb5ff16 100644 --- a/ms/blueprintsprocessor/application/src/main/docker/startService.sh +++ b/ms/blueprintsprocessor/application/src/main/docker/startService.sh @@ -16,6 +16,6 @@ exec java -classpath "/etc:${APP_HOME}/lib/*:/lib/*:/src:/schema:/generated-sour -Dms_name=org.onap.ccsdk.cds.blueprintsprocessor \ -Dlogging.config=${APP_CONFIG_HOME}/logback.xml \ -Djava.security.egd=file:/dev/./urandom \ --DAPPNAME=${APP_NAME} -DAPPENV=${APP_ENV} -DAPPVERSION=${APP_VERSION} -DNAMESPACE=${NAMESPACE} \ +-DAPPNAME=${APPLICATIONNAME} -DAPPENV=${APP_ENV} -DAPPVERSION=${APP_VERSION} -DNAMESPACE=${NAMESPACE} \ -Dspring.config.location=${APP_CONFIG_HOME}/ \ org.onap.ccsdk.cds.blueprintsprocessor.BlueprintProcessorApplicationKt |