From be67c84fe1baa3906e4c594f56d093beeb6756e2 Mon Sep 17 00:00:00 2001 From: BjornMagnussonXA Date: Thu, 3 Feb 2022 15:57:33 +0100 Subject: [PATCH] Uplift of test profile for e-release Issue-ID: NONRTRIC-720 Signed-off-by: BjornMagnussonXA Change-Id: Icc651fbda3959c72d176ee299a41584dfa9859e7 --- test/common/test_env-oran-e-release.sh | 38 ++++++--------------------------- test/simulator-group/ics/mnt/.gitignore | 17 +++++++++++++++ 2 files changed, 23 insertions(+), 32 deletions(-) create mode 100644 test/simulator-group/ics/mnt/.gitignore diff --git a/test/common/test_env-oran-e-release.sh b/test/common/test_env-oran-e-release.sh index 4523c4df..180208a5 100755 --- a/test/common/test_env-oran-e-release.sh +++ b/test/common/test_env-oran-e-release.sh @@ -150,17 +150,6 @@ HELM_MANAGER_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.1-SNAPSHOT" HELM_MANAGER_IMAGE_TAG_REMOTE="1.1.1" HELM_MANAGER_IMAGE_TAG_REMOTE_RELEASE="1.1.1" -#Consul remote image and tag -CONSUL_IMAGE_BASE="consul" -CONSUL_IMAGE_TAG_REMOTE_PROXY="1.7.2" -#No local image for Consul, remote image always used - - -#CBS remote image and tag -CBS_IMAGE_BASE="onap/org.onap.dcaegen2.platform.configbinding.app-app" -CBS_IMAGE_TAG_REMOTE_RELEASE_ONAP="2.3.0" -#No local image for CBS, remote image always used - #MR stub image and tag MRSTUB_IMAGE_BASE="mrstub" @@ -226,7 +215,7 @@ PROJECT_IMAGES_APP_NAMES="PA ICS CP RC RICSIM NGW DMAAPADP DMAAPMED HELMMANAGER" ORAN_IMAGES_APP_NAMES="" # Not used # List of app short names which images pulled from ONAP -ONAP_IMAGES_APP_NAMES="CBS DMAAPMR SDNC" # SDNC added as ONAP image +ONAP_IMAGES_APP_NAMES="DMAAPMR SDNC" # SDNC added as ONAP image ######################################## @@ -277,7 +266,7 @@ POLICY_AGENT_DATA_MOUNT_PATH="/opt/app/policy-agent/data" # Path in container fo POLICY_AGENT_CONFIG_FILE="application.yaml" # Container config file name POLICY_AGENT_DATA_FILE="application_configuration.json" # Container data file name POLICY_AGENT_CONTAINER_MNT_DIR="/var/policy-management-service" # Mounted dir in the container -PMS_FEATURE_LEVEL="" # Space separated list of features +PMS_FEATURE_LEVEL="NOCONSUL INITIALCONFIGMAP" # Space separated list of features ICS_APP_NAME="informationservice" # Name for ICS container ICS_DISPLAY_NAME="Information Coordinator Service" # Display name for ICS container @@ -352,21 +341,6 @@ PROD_STUB_SUPERVISION_CALLBACK="/callbacks/supervision" # Callback path for pro PROD_STUB_ALIVE_URL="/" # Base path for alive check PROD_STUB_COMPOSE_DIR="prodstub" # Dir in simulator_group for docker-compose -CONSUL_HOST="consul-server" # Host name of consul -CONSUL_DISPLAY_NAME="Consul" -CONSUL_EXTERNAL_PORT=8500 # Consul container external port (host -> container) -CONSUL_INTERNAL_PORT=8500 # Consul container internal port (container -> container) -CONSUL_APP_NAME="polman-consul" # Name for consul container -CONSUL_ALIVE_URL="/ui/dc1/kv" # Base path for alive check -CONSUL_CBS_COMPOSE_DIR="consul_cbs" # Dir in simulator group for docker compose - -CBS_APP_NAME="polman-cbs" # Name for CBS container -CBS_DISPLAY_NAME="Config Binding Service" -CBS_EXTERNAL_PORT=10000 # CBS container external port (host -> container) -CBS_INTERNAL_PORT=10000 # CBS container internal port (container -> container) -CONFIG_BINDING_SERVICE="config-binding-service" # Host name of CBS -CBS_ALIVE_URL="/healthcheck" # Base path for alive check - RIC_SIM_DISPLAY_NAME="Near-RT RIC A1 Simulator" RIC_SIM_BASE="g" # Base name of the RIC Simulator container, shall be the group code # Note, a prefix is added to each container name by the .env file in the 'ric' dir @@ -536,13 +510,13 @@ DMAAP_MED_HOST_MNT_DIR="./mnt" # Mounted db dir, relati #MAAP_ADP_CONTAINER_MNT_DIR="/var/dmaap-adaptor-service" # Mounted dir in the container #DMAAP_MED_ACTUATOR="/actuator/loggers/org.oransc.information" # Url for trace/debug #DMAAP_MED_CERT_MOUNT_DIR="./cert" -DMAAP_MED_ALIVE_URL="/status" # Base path for alive check +DMAAP_MED_ALIVE_URL="/health_check" # Base path for alive check DMAAP_MED_COMPOSE_DIR="dmaapmed" # Dir in simulator_group for docker-compose #MAAP_MED_CONFIG_MOUNT_PATH="/app" # Internal container path for configuration DMAAP_MED_DATA_MOUNT_PATH="/configs" # Path in container for data file -DMAAP_MED_HOST_DATA_FILE="type_config.json" # Host data file name +DMAAP_MED_HOST_DATA_FILE="type_config_1.json" # Host data file name DMAAP_MED_CONTR_DATA_FILE="type_config.json" # Container data file name -DMAAP_MED_FEATURE_LEVEL="" # Space separated list of features +DMAAP_MED_FEATURE_LEVEL="KAFKATYPES" # Space separated list of features KAFKAPC_APP_NAME="kafka-procon" # Name for the Kafka procon KAFKAPC_DISPLAY_NAME="Kafka Producer/Consumer" @@ -550,7 +524,7 @@ KAFKAPC_EXTERNAL_PORT=8096 # Kafka procon containe KAFKAPC_INTERNAL_PORT=8090 # Kafka procon container internal port (container -> container) KAFKAPC_EXTERNAL_SECURE_PORT=8097 # Kafka procon container external secure port (host -> container) KAFKAPC_INTERNAL_SECURE_PORT=8091 # Kafka procon container internal secure port (container -> container) -KAFKAPC_ALIVE_URL="/" # Base path for alive check +KAFKAPC_ALIVE_URL="/" # Base path for alive check KAFKAPC_COMPOSE_DIR="kafka-procon" # Dir in simulator_group for docker-compose KAFKAPC_BUILD_DIR="kafka-procon" # Build dir diff --git a/test/simulator-group/ics/mnt/.gitignore b/test/simulator-group/ics/mnt/.gitignore new file mode 100644 index 00000000..b94353c3 --- /dev/null +++ b/test/simulator-group/ics/mnt/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# Copyright (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. # +################################################################################ +* +!.gitignore \ No newline at end of file -- 2.16.6