From 34a94b92edd0c359291445735eb3d7e974deea1f Mon Sep 17 00:00:00 2001 From: tragait Date: Tue, 30 Mar 2021 12:02:27 +0100 Subject: rename nf-proxy to network-cm-proxy This commit renames two modules cps-nf-proxy-rest and cps-nf-proxy-service to cps-ncmp-rest, cps-ncmp-service. Docker image names are also changed respectively. Swagger auto generated api files are also modified. Signed-off-by: tragait Issue-ID: CPS-315 Change-Id: Ic2a2f8c4bafe8cffa3c83ccb52499720aaba1415 --- docker-compose/README.md | 10 +++++----- docker-compose/application.yml | 19 ++++++++++++++++++- docker-compose/docker-compose.yml | 15 ++++++++------- 3 files changed, 31 insertions(+), 13 deletions(-) (limited to 'docker-compose') diff --git a/docker-compose/README.md b/docker-compose/README.md index 0a38283535..e443bdf2eb 100644 --- a/docker-compose/README.md +++ b/docker-compose/README.md @@ -6,7 +6,7 @@ Following command builds all Java components to `cps-application/target/cps-appl without generating any docker images: ```bash -mvn clean install -Pcps-docker -Pxnf-docker -Pcps-xnf-docker -Djib.skip +mvn clean install -Pcps-docker -Pncmp-docker -Pcps-ncmp-docker -Djib.skip ``` ## Building Java Archive and Docker images @@ -14,11 +14,11 @@ mvn clean install -Pcps-docker -Pxnf-docker -Pcps-xnf-docker -Djib.skip * Following command builds the JAR file and also generates the Docker image for all CPS components: ```bash -mvn clean install -Pcps-docker -Pxnf-docker -Pcps-xnf-docker -Dnexus.repository= +mvn clean install -Pcps-docker -Pncmp-docker -Pcps-ncmp-docker -Dnexus.repository= ``` * Following command builds the JAR file and generates the Docker image for specified CPS component: - (with `` being one of `cps-docker`, `xnf-docker` or `cps-xnf-docker`): + (with `` being one of `cps-docker`, `ncmp-docker` or `cps-ncmp-docker`): ```bash mvn clean install -P -Dnexus.repository= @@ -29,8 +29,8 @@ mvn clean install -P -Dnexus.repository= `docker-compose/docker-compose.yml` file is provided to be run with `docker-compose` tool and images previously built. It starts both Postgres database and CPS services. -1. Edit `docker-compose.yml` and uncomment desired service to be deployed, by default `cps-and-nf-proxy` - is enabled. You can comment it and uncomment `cps-standalone` or `nf-proxy-standalone`. +1. Edit `docker-compose.yml` and uncomment desired service to be deployed, by default `cps-and-ncmp` + is enabled. You can comment it and uncomment `cps-standalone` or `ncmp-standalone`. 2. Execute following command from `docker-compose` folder: ```bash diff --git a/docker-compose/application.yml b/docker-compose/application.yml index be4b688cf3..d9b9e7c38d 100644 --- a/docker-compose/application.yml +++ b/docker-compose/application.yml @@ -1,10 +1,27 @@ +# ============LICENSE_START======================================================= +# Modification (C) 2021 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========================================================= + server: port: 8080 rest: api: cps-base-path: /cps/api - xnf-base-path: /cps-nf-proxy/api + ncmp-base-path: /cps-ncmp/api spring: main: diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index a2241bcc23..4da74584c4 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -1,6 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (c) 2020 Pantheon.tech. # Modifications Copyright (C) 2021 Bell Canada. +# Modification (C) 2021 Nordix Foundation # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -33,9 +34,9 @@ services: # depends_on: # - dbpostgresql - #nf-proxy-standalone: - # container_name: cps-nf-proxy - # image: cps-nf-proxy:${VERSION} + #ncmp-standalone: + # container_name: cps-ncmp + # image: cps-ncmp:${VERSION} # volumes: # - "./application.yml:/app/resources/application.yml" # ports: @@ -48,9 +49,9 @@ services: # depends_on: # - dbpostgresql - cps-and-nf-proxy: - container_name: cps-and-nf-proxy - image: cps-and-nf-proxy:${VERSION} + cps-and-ncmp: + container_name: cps-and-ncmp + image: cps-and-ncmp:${VERSION} volumes: - "./application.yml:/app/resources/application.yml" ports: @@ -71,4 +72,4 @@ services: environment: POSTGRES_DB: cpsdb POSTGRES_USER: ${DB_USERNAME} - POSTGRES_PASSWORD: ${DB_PASSWORD} \ No newline at end of file + POSTGRES_PASSWORD: ${DB_PASSWORD} -- cgit 1.2.3-korg