summaryrefslogtreecommitdiffstats
path: root/docker-compose
diff options
context:
space:
mode:
authoremaclee <lee.anjella.macabuhay@est.tech>2023-02-09 15:17:13 +0000
committeremaclee <lee.anjella.macabuhay@est.tech>2023-03-03 14:43:52 +0000
commit02bffef6d216ed03206526d49a4fb20124bfafe9 (patch)
treedbdd98ee9fa75aa0a24bd154c26d51d4c8da8110 /docker-compose
parente28b62148676d189bdd11b78d8d78419d548e358 (diff)
JAVA onboarding of YANG model
- removed docker compose init container - removed init container script files - created new model loader class to onboard YANG model which runs after the application has set up - new model loader class is created in new package in cps-service (org.onap.cps.ncmp.init) Issue-ID: CPS-1467 Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech> Change-Id: I35fe82817aff7783520acf8db66ad504271026bd
Diffstat (limited to 'docker-compose')
-rw-r--r--docker-compose/docker-compose.yml16
-rw-r--r--docker-compose/initfile/Dockerfile6
-rw-r--r--docker-compose/initfile/onboardSubscriptionModel.sh70
3 files changed, 0 insertions, 92 deletions
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 08929ab222..5c785873d5 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -31,11 +31,6 @@ services:
POSTGRES_DB: cpsdb
POSTGRES_USER: ${DB_USERNAME:-cps}
POSTGRES_PASSWORD: ${DB_PASSWORD:-cps}
- healthcheck:
- test: ["CMD", "pg_isready"]
- interval: 30s
- timeout: 5s
- retries: 5
cps-and-ncmp:
container_name: cps-and-ncmp
@@ -123,17 +118,6 @@ services:
profiles:
- dmi-stub
- init-db:
- build: ${CPS_HOME:-.}/docker-compose/initfile
- environment:
- CPS_CORE_PORT: ${CPS_CORE_PORT:-8883}
- CPS_CORE_MANAGEMENT_PORT: ${CPS_CORE_MANAGEMENT_PORT:-8887}
- volumes:
- - ${CPS_HOME:-.}/cps-ncmp-service/src/main/resources/model/:/model
- depends_on:
- cps-and-ncmp:
- condition: service_started
-
prometheus:
container_name: prometheus-container
image: prom/prometheus:latest
diff --git a/docker-compose/initfile/Dockerfile b/docker-compose/initfile/Dockerfile
deleted file mode 100644
index 3c3231e623..0000000000
--- a/docker-compose/initfile/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM alpine:latest
-RUN apk --no-cache add curl
-RUN apk --no-cache add bash
-COPY onboardSubscriptionModel.sh /onboardSubscriptionModel.sh
-CMD ["sh", "onboardSubscriptionModel.sh"] \ No newline at end of file
diff --git a/docker-compose/initfile/onboardSubscriptionModel.sh b/docker-compose/initfile/onboardSubscriptionModel.sh
deleted file mode 100644
index 59fa471d04..0000000000
--- a/docker-compose/initfile/onboardSubscriptionModel.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-#
-# ============LICENSE_START=======================================================
-# Copyright (C) 2023 Nordix Foundation.
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-
-echo "Getting ready to upload model for subscription events ..."
-
-createSchemaSetBasePath="/cps/api/v2/dataspaces/NCMP-Admin/schema-sets?schema-set-name=subscriptions"
-createAnchorBasePath="/cps/api/v2/dataspaces/NCMP-Admin/anchors?schema-set-name=subscriptions&anchor-name=AVC-subscriptions"
-
-ATTEMPT_COUNT=0
-while :
-do
- status="UP"
- hostIpAddress=$(ip -4 route show default | cut -d" " -f3)
-
- if curl -X 'GET' 'http://'"$hostIpAddress"':'"$CPS_CORE_MANAGEMENT_PORT"'/manage/health/readiness' | grep -q "$status"
- then
- echo "Checking that NCMP dataspace exists ..."
- ncmpDataspaceExists=$(curl --write-out %{http_code} --silent --output /dev/null -X 'GET' 'http://'"$hostIpAddress"':'"$CPS_CORE_PORT"'/cps/api/v2/admin/dataspaces/NCMP-Admin' -H 'accept: */*' --header 'Authorization: Basic Y3BzdXNlcjpjcHNyMGNrcyE=')
-
- echo "NCMP dataspace exist: $ncmpDataspaceExists"
-
- if [ "$ncmpDataspaceExists" == 200 ]
- then
- echo "Uploading model ..."
- create_schema_set_status_code=$(curl --write-out %{http_code} --silent --output /dev/null -X 'POST' 'http://'"$hostIpAddress"':'"$CPS_CORE_PORT"''"$createSchemaSetBasePath"'' -H 'accept: */*' --form "file=@"/model/subscription.yang"" --header 'Authorization: Basic Y3BzdXNlcjpjcHNyMGNrcyE=')
- create_anchor_status_code=$(curl --write-out %{http_code} --silent --output /dev/null -X 'POST' 'http://'"$hostIpAddress"':'"$CPS_CORE_PORT"''"$createAnchorBasePath"'' -H 'accept: */*' --header 'Authorization: Basic Y3BzdXNlcjpjcHNyMGNrcyE=')
-
- echo "create schema set status: $create_schema_set_status_code"
- echo "create anchor status: $create_anchor_status_code"
-
- if [ "$create_schema_set_status_code" == 201 ] && [ "$create_anchor_status_code" == 201 ]
- then
- echo "Model upload finish!"
- echo "Exiting container ..."
- echo "Bye Bye!"
- break
- fi
- fi
- fi
-
- if [ $ATTEMPT_COUNT == 20 ]
- then
- echo -e "Creating schema set last status:\n $(curl -X 'POST' 'http://'"$hostIpAddress"':'"$CPS_CORE_PORT"''"$createSchemaSetBasePath"'' -H 'accept: */*' --form "file=@"/model/subscription.yang"" --header 'Authorization: Basic Y3BzdXNlcjpjcHNyMGNrcyE=')\n"
- echo -e "Creating anchor last status:\n $(curl -X 'POST' 'http://'"$hostIpAddress"':'"$CPS_CORE_PORT"''"$createAnchorBasePath"'' -H 'accept: */*' --header 'Authorization: Basic Y3BzdXNlcjpjcHNyMGNrcyE=')\n"
- echo -e "\nToo many attempts. Bye Bye!"
- break
- else
- echo "RETRYING ...[ $ATTEMPT_COUNT attempt(s) ]"
- ATTEMPT_COUNT=$(($ATTEMPT_COUNT +1))
- sleep 10
- fi
-done \ No newline at end of file