diff options
author | 2021-03-02 21:59:43 +0530 | |
---|---|---|
committer | 2021-03-16 16:44:40 +0530 | |
commit | e36da5e32a3a8a83199f02a69d16843a36930a20 (patch) | |
tree | 294f7077f9e65e88bb2285449e3f4049cc34d6e7 /plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade | |
parent | 5f175a20d8bd5f6f4592a215c38732292ec318da (diff) |
Updated PNF-Sw upgrade CSIT with latest ccsdk-blueprintsprocessor docker image.
Issue-ID: INT-1820
Signed-off-by: ajay_dp001 <ajay.deep.singh@est.tech>
Change-Id: I1e06e571441003e0a258d0e9a0ff98488cfe0b0e
Diffstat (limited to 'plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade')
6 files changed, 70 insertions, 27 deletions
diff --git a/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/cds/cds_setup.sh b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/cds/cds_setup.sh index b6b46109..6eed7955 100755 --- a/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/cds/cds_setup.sh +++ b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/cds/cds_setup.sh @@ -26,9 +26,6 @@ cd $CDS_DATA_PATH export CDS_DOCKER_PATH=$CDS_DOCKER_PATH export APP_CONFIG_HOME=$APP_CONFIG_HOME -docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-blueprintsprocessor:$BP_IMAGE_TAG -docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-blueprintsprocessor:$BP_IMAGE_TAG onap/ccsdk-blueprintsprocessor:latest - docker-compose -f $CDS_DATA_PATH/docker-compose.yml -p $PROJECT_NAME up -d sleep 10 ################# Check state of BP #################### diff --git a/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/cds/docker-compose.yml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/cds/docker-compose.yml index f48a2039..03899897 100755 --- a/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/cds/docker-compose.yml +++ b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/cds/docker-compose.yml @@ -14,7 +14,7 @@ services: MYSQL_USER: sdnctl MYSQL_PASSWORD: sdnctl blueprints-processor: - image: onap/ccsdk-blueprintsprocessor:latest + image: nexus3.onap.org:10001/onap/ccsdk-blueprintsprocessor:1.0.3 depends_on: - db ports: diff --git a/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/cds/resources/application.properties b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/cds/resources/application.properties index d11bab62..2aae3936 100755 --- a/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/cds/resources/application.properties +++ b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/cds/resources/application.properties @@ -1,3 +1,18 @@ +# +# Copyright (c) 2017-2019 AT&T, IBM, Bell Canada, 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. +# # Web server config ### START -Controller Blueprints Properties # Load Resource Source Mappings @@ -9,7 +24,7 @@ blueprintsprocessor.blueprintArchivePath=/opt/app/onap/blueprints/archive blueprintsprocessor.blueprintWorkingPath=/opt/app/onap/blueprints/working # Controller Blueprint Load Configurations -blueprintsprocessor.loadBluePrintPaths=/opt/app/onap/model-catalog/blueprint-model +blueprintsprocessor.loadBlueprintPaths=/opt/app/onap/model-catalog/blueprint-model blueprintsprocessor.loadModeTypePaths=/opt/app/onap/model-catalog/definition-type blueprintsprocessor.loadResourceDictionaryPaths=/opt/app/onap/model-catalog/resource-dictionary @@ -45,6 +60,11 @@ blueprints.processor.functions.python.executor.modulePaths=/opt/app/onap/scripts security.user.password: {bcrypt}$2a$10$duaUzVUVW0YPQCSIbGEkQOXwafZGwQ/b32/Ys4R1iwSSawFgz7QNu security.user.name: ccsdkapps +# Error Managements +error.catalog.applicationId=cds +error.catalog.type=properties +error.catalog.errorDefinitionDir=/opt/app/onap/config/ + # Used in Health Check #endpoints.user.name=ccsdkapps #endpoints.user.password=ccsdkapps @@ -74,6 +94,18 @@ blueprintsprocessor.restclient.sdnc.url=http://sdnc:8282 blueprintsprocessor.restclient.sdnc.username=admin blueprintsprocessor.restclient.sdnc.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +# Naming MS REST client settings +blueprintsprocessor.restclient.naming-ms.type=basic-auth +blueprintsprocessor.restclient.naming-ms.url=http://naming-ms:8282 +blueprintsprocessor.restclient.naming-ms.username=admin +blueprintsprocessor.restclient.naming-ms.password=demo123456! + +# IPAssign MS REST client settings +blueprintsprocessor.restclient.ipassign-ms.type=basic-auth +blueprintsprocessor.restclient.ipassign-ms.url=http://naming-ms:8282 +blueprintsprocessor.restclient.ipassign-ms.username=admin +blueprintsprocessor.restclient.ipassign-ms.password=demo123456! + # Primary AAI Data REST Client settings blueprintsprocessor.restclient.aai-data.type=basic-auth blueprintsprocessor.restclient.aai-data.url=https://aai-simulator:9993 @@ -83,20 +115,35 @@ blueprintsprocessor.restclient.aai-data.additionalHeaders.X-TransactionId=cds-tr blueprintsprocessor.restclient.aai-data.additionalHeaders.X-FromAppId=cds-app-id blueprintsprocessor.restclient.aai-data.additionalHeaders.Accept=application/json -# Kafka-message-lib Configuration -blueprintsprocessor.messageconsumer.self-service-api.kafkaEnable=false -blueprintsprocessor.messageconsumer.self-service-api.type=kafka-basic-auth -blueprintsprocessor.messageconsumer.self-service-api.bootstrapServers=127.0.0.1:9092 -blueprintsprocessor.messageconsumer.self-service-api.topic=receiver.t -blueprintsprocessor.messageconsumer.self-service-api.groupId=receiver-id -blueprintsprocessor.messageconsumer.self-service-api.clientId=default-client-id -blueprintsprocessor.messageconsumer.self-service-api.pollMillSec=1000 - -blueprintsprocessor.messageproducer.self-service-api.type=kafka-basic-auth -blueprintsprocessor.messageproducer.self-service-api.bootstrapServers=127.0.0.1:9092 -blueprintsprocessor.messageproducer.self-service-api.clientId=default-client-id -blueprintsprocessor.messageproducer.self-service-api.topic=producer.t - +# Kafka audit service Configurations +## Audit request +blueprintsprocessor.messageproducer.self-service-api.audit.kafkaEnable=false +blueprintsprocessor.messageproducer.self-service-api.audit.request.type=kafka-basic-auth +blueprintsprocessor.messageproducer.self-service-api.audit.request.bootstrapServers=127.0.0.1:9092 +blueprintsprocessor.messageproducer.self-service-api.audit.request.clientId=audit-request-producer-client-id +blueprintsprocessor.messageproducer.self-service-api.audit.request.topic=audit-request-producer.t +#### Security settings +#### SSL +#blueprintsprocessor.messageproducer.self-service-api.audit.request.truststore=/path/to/truststore.jks +#blueprintsprocessor.messageproducer.self-service-api.audit.request.truststorePassword=truststorePassword +#blueprintsprocessor.messageproducer.self-service-api.audit.request.keystore=/path/to/keystore.jks +#blueprintsprocessor.messageproducer.self-service-api.audit.request.keystorePassword=keystorePassword +#### SCRAM +#blueprintsprocessor.messageproducer.self-service-api.audit.request.scramUsername=test-user +#blueprintsprocessor.messageproducer.self-service-api.audit.request.scramPassword=testUserPassword + +## Audit response +blueprintsprocessor.messageproducer.self-service-api.audit.response.type=kafka-basic-auth +blueprintsprocessor.messageproducer.self-service-api.audit.response.bootstrapServers=127.0.0.1:9092 +blueprintsprocessor.messageproducer.self-service-api.audit.response.clientId=audit-response-producer-client-id +blueprintsprocessor.messageproducer.self-service-api.audit.response.topic=audit-response-producer.t + +# Message prioritization kakfa properties, Enable if Prioritization service is needed +# Deploy message-prioritization function along with blueprintsprocessor application. +#blueprintsprocessor.messageconsumer.prioritize-input.type=kafka-streams-basic-auth +#blueprintsprocessor.messageconsumer.prioritize-input.bootstrapServers=127.0.0.1:9092 +#blueprintsprocessor.messageconsumer.prioritize-input.applicationId=cds-controller +#blueprintsprocessor.messageconsumer.prioritize-input.topic=prioritize-input-topic blueprintprocessor.remoteScriptCommand.enabled=true @@ -117,7 +164,7 @@ management.endpoints.web.exposure.include=* management.endpoint.health.show-details=always management.info.git.mode=full -# Error Managements -error.catalog.applicationId=cds -error.catalog.type=properties -error.catalog.errorDefinitionDir=/opt/app/onap/config/ +#K8s Plugin properties +blueprintprocessor.k8s.plugin.username=test +blueprintprocessor.k8s.plugin.password=pass +blueprintprocessor.k8s.plugin.url=http://multicloud-k8s:9015/ diff --git a/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/cds/resources/importCerAndStartService.sh b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/cds/resources/importCerAndStartService.sh index c5501d40..4e71e375 100755 --- a/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/cds/resources/importCerAndStartService.sh +++ b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/cds/resources/importCerAndStartService.sh @@ -5,7 +5,7 @@ cp -f /opt/app/onap/res/application.properties /opt/app/onap/config cp -f /opt/app/onap/res/error-messages_en.properties /opt/app/onap/config echo "importing aai cert." -keytool -import -noprompt -trustcacerts -keystore $JAVA_HOME/jre/lib/security/cacerts -storepass changeit -alias aai -import -file /opt/app/onap/res/aai.cert +keytool -import -noprompt -trustcacerts -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit -alias aai-cacert -file /opt/app/onap/res/aai.cert echo "starting service." -source /startService.sh
\ No newline at end of file +source /opt/app/onap/blueprints-processor/startService.sh
\ No newline at end of file diff --git a/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/env b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/env index 71e9daff..d5ce982f 100644 --- a/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/env +++ b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/env @@ -1,6 +1,6 @@ NEXUS_DOCKER_REPO_MSO=nexus3.onap.org:10001 DOCKER_ENVIRONMENT=remote -TAG=1.8.0-STAGING-latest +TAG=1.8.0 TIME_OUT_DEFAULT_VALUE_SEC=1200 PROJECT_NAME=pnfSwU DEFAULT_NETWORK_NAME=pnfswu_default diff --git a/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/test.properties b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/test.properties index f4890902..e81100fc 100644 --- a/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/test.properties +++ b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/test.properties @@ -13,5 +13,4 @@ SO_DOCKER_PATH=$TC_PLANS_PATH/sorch PROJECT_NAME=pnfSwU SDNC_IMAGE_TAG=1.8.1 -BP_IMAGE_TAG=0.7.1 NETOPEER_IMAGE_TAG=v2.5.0
\ No newline at end of file |