Test case updates
Updates to image tags for oran and onap
Updates to image tag for aegis image
Minor maintainance
Issue-ID: NONRTRIC-742
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: I99b73d463688faa3448d6f121da9bf239da1b349
diff --git a/test/auto-test/FTC1100.sh b/test/auto-test/FTC1100.sh
index 0ff083c..82bb8dd 100755
--- a/test/auto-test/FTC1100.sh
+++ b/test/auto-test/FTC1100.sh
@@ -54,6 +54,11 @@
clean_environment
+if [ $RUNMODE != "KUBE" ]; then
+ USE_ISTIO=0
+ echo "ISTIO not supported by docker - setting USE-ISTIO=0"
+fi
+
if [ $USE_ISTIO -eq 1 ]; then
echo -e $RED"#########################################"$ERED
echo -e $RED"# Work around istio jwks cache"$ERED
@@ -66,6 +71,7 @@
istio_enable_istio_namespace $KUBE_SIM_NAMESPACE
istio_enable_istio_namespace $KUBE_NONRTRIC_NAMESPACE
+ istio_enable_istio_namespace $KUBE_A1SIM_NAMESPACE
fi
start_kube_proxy
diff --git a/test/auto-test/FTC2003.sh b/test/auto-test/FTC2003.sh
index dcd9f9c..3076bb1 100755
--- a/test/auto-test/FTC2003.sh
+++ b/test/auto-test/FTC2003.sh
@@ -68,7 +68,7 @@
start_mr
-start_dmaapadp PROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_DATA_FILE
+start_dmaapadp PROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE_TEMPLATE $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_DATA_FILE
set_dmaapadp_trace
diff --git a/test/auto-test/FTC3000.sh b/test/auto-test/FTC3000.sh
index 4031f49..a25f2bd 100755
--- a/test/auto-test/FTC3000.sh
+++ b/test/auto-test/FTC3000.sh
@@ -80,7 +80,7 @@
kafkapc_api_start_sending 200 "unauthenticated.dmaapadp_kafka.text"
-start_dmaapadp NOPROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_DATA_FILE
+start_dmaapadp NOPROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE_TEMPLATE $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_DATA_FILE
set_dmaapadp_trace
diff --git a/test/auto-test/FTC3001.sh b/test/auto-test/FTC3001.sh
index 390df59..7346287 100755
--- a/test/auto-test/FTC3001.sh
+++ b/test/auto-test/FTC3001.sh
@@ -95,7 +95,7 @@
adp_config_data=$adp_config_data']}'
echo $adp_config_data > tmp/adp_config_data.json
-start_dmaapadp NOPROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE tmp/adp_config_data.json
+start_dmaapadp NOPROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE_TEMPLATE tmp/adp_config_data.json
set_dmaapadp_trace
diff --git a/test/auto-test/FTC_HELM_E_RELEASE.sh b/test/auto-test/FTC_HELM_E_RELEASE.sh
index c54cb4f..ce1115e 100755
--- a/test/auto-test/FTC_HELM_E_RELEASE.sh
+++ b/test/auto-test/FTC_HELM_E_RELEASE.sh
@@ -411,7 +411,7 @@
fi
# Dmaap mediator and adapter
-start_dmaapadp NOPROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_DATA_FILE
+start_dmaapadp NOPROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE_TEMPLATE $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_DATA_FILE
start_dmaapmed NOPROXY $SIM_GROUP/$DMAAP_MED_COMPOSE_DIR/$DMAAP_MED_HOST_DATA_FILE
diff --git a/test/auto-test/Suite-aegis.sh b/test/auto-test/Suite-alternative-a1pms.sh
similarity index 90%
rename from test/auto-test/Suite-aegis.sh
rename to test/auto-test/Suite-alternative-a1pms.sh
index ddb1f08..cca3eb7 100755
--- a/test/auto-test/Suite-aegis.sh
+++ b/test/auto-test/Suite-alternative-a1pms.sh
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-TS_ONELINE_DESCR="Test suite - A1PMS endpoint aegis image testing. a1pms REST, DMAAP and SNDC controller resconf"
+TS_ONELINE_DESCR="Test suite - alternative A1PMS endpoint image testing. a1pms REST, DMAAP and SNDC controller resconf"
. ../common/testsuite_common.sh
diff --git a/test/auto-test/override_aegis_a1pms.sh b/test/auto-test/override_alternative_a1pms.sh
similarity index 69%
rename from test/auto-test/override_aegis_a1pms.sh
rename to test/auto-test/override_alternative_a1pms.sh
index 4fef6d5..7cae22e 100644
--- a/test/auto-test/override_aegis_a1pms.sh
+++ b/test/auto-test/override_alternative_a1pms.sh
@@ -15,7 +15,12 @@
# limitations under the License. #
################################################################################
-# Override file for running the e-release helm recipe including all components
+# Override file for running the latest alternative a1 pms image
+# NOTE: This image is aussmed to be located in a different image repo (other than oran and onap)
+# NOTE: Begin with manually pulling the image to your local docker image reqistry
+# NOTE: Re-tag the image to: alternative-a1pms:<image-tag> (use same tage is specified in var A1PMS_IMAGE_TAG_LOCAL below)
+# NOTE: Run the test using the flags "--use-local-image A1PMS --override override_alternative_a1pms.sh"
-A1PMS_IMAGE_BASE="aegis-onap-docker-local.artifactory.est.tech/onap/ccsdk-oran-a1policymanagementservice"
+A1PMS_IMAGE_BASE="alternative-a1pms"
+A1PMS_IMAGE_TAG_LOCAL="1.4.0-SNAPSHOT"
diff --git a/test/common/clean_kube.sh b/test/common/clean_kube.sh
index 5997abc..c3e7743 100755
--- a/test/common/clean_kube.sh
+++ b/test/common/clean_kube.sh
@@ -88,7 +88,7 @@
namespace=$1
resources="deployments replicaset statefulset services pods configmaps pvc serviceaccounts secrets authorizationpolicies requestauthentications"
for restype in $resources; do
- result=$(kubectl $KUBECONF get $restype -n $namespace -o jsonpath='{.items[?(@.metadata.labels.autotest)].metadata.name}')
+ result=$(kubectl $KUBECONF get $restype -n $namespace -o jsonpath='{.items[?(@.metadata.labels.autotest)].metadata.name}' 2> /dev/null)
if [ $? -eq 0 ] && [ ! -z "$result" ]; then
for resid in $result; do
echo " Deleting $restype $resid in namespace $namespace with label autotest "
diff --git a/test/common/test_env-onap-jakarta.sh b/test/common/test_env-onap-jakarta.sh
index 33ac6ac..7d50007 100644
--- a/test/common/test_env-onap-jakarta.sh
+++ b/test/common/test_env-onap-jakarta.sh
@@ -69,16 +69,16 @@
# A1PMS image and tags
A1PMS_IMAGE_BASE="onap/ccsdk-oran-a1policymanagementservice"
-A1PMS_IMAGE_TAG_LOCAL="1.3.0-SNAPSHOT"
-A1PMS_IMAGE_TAG_REMOTE_SNAPSHOT="1.3.0-SNAPSHOT"
-A1PMS_IMAGE_TAG_REMOTE="1.3.0-STAGING-latest" #Will use snapshot repo
-A1PMS_IMAGE_TAG_REMOTE_RELEASE="1.3.0"
+A1PMS_IMAGE_TAG_LOCAL="1.4.0-SNAPSHOT"
+A1PMS_IMAGE_TAG_REMOTE_SNAPSHOT="1.4.0-SNAPSHOT"
+A1PMS_IMAGE_TAG_REMOTE="1.4.0-STAGING-latest" #Will use snapshot repo
+A1PMS_IMAGE_TAG_REMOTE_RELEASE="1.4.0"
# SDNC A1 Controller remote image and tag
SDNC_A1_CONTROLLER_IMAGE_BASE="onap/sdnc-image"
-SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="2.3.0-SNAPSHOT" ###CHECK THIS
-SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="2.3.0-STAGING-latest"
-SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="2.3.0-STAGING-latest" #Will use snapshot repo
+SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="2.3.1-SNAPSHOT" ###CHECK THIS
+SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="2.3.1-STAGING-latest"
+SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="2.3.1-STAGING-latest" #Will use snapshot repo
SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.3.0"
#SDNC DB remote image and tag
diff --git a/test/common/test_env-oran-e-release.sh b/test/common/test_env-oran-e-release.sh
index 4e57ac5..6f956b7 100755
--- a/test/common/test_env-oran-e-release.sh
+++ b/test/common/test_env-oran-e-release.sh
@@ -523,6 +523,7 @@
DMAAP_ADP_DATA_MOUNT_PATH="/opt/app/dmaap-adaptor-service/data" # Path in container for data file
DMAAP_ADP_DATA_FILE="application_configuration.json" # Container data file name
DMAAP_ADP_CONFIG_FILE=application.yaml # Config file name
+DMAAP_ADP_CONFIG_FILE_TEMPLATE=application.yaml # Template config file name
DMAAP_MED_APP_NAME="dmaapmediatorservice" # Name for Dmaap Mediator container
DMAAP_MED_DISPLAY_NAME="Dmaap Mediator Service" # Display name for Dmaap Mediator container
diff --git a/test/common/test_env-oran-f-release.sh b/test/common/test_env-oran-f-release.sh
index 4beddd1..85f4764 100755
--- a/test/common/test_env-oran-f-release.sh
+++ b/test/common/test_env-oran-f-release.sh
@@ -59,14 +59,14 @@
# A1PMS base image and tags
-A1PMS_IMAGE_BASE="o-ran-sc/nonrtric-a1-policy-management-service"
+A1PMS_IMAGE_BASE="o-ran-sc/nonrtric-plt-a1policymanagementservice"
A1PMS_IMAGE_TAG_LOCAL="2.4.0-SNAPSHOT"
A1PMS_IMAGE_TAG_REMOTE_SNAPSHOT="2.4.0-SNAPSHOT"
A1PMS_IMAGE_TAG_REMOTE="2.4.0"
A1PMS_IMAGE_TAG_REMOTE_RELEASE="2.4.0"
# ICS image and tags
-ICS_IMAGE_BASE="o-ran-sc/nonrtric-information-coordinator-service"
+ICS_IMAGE_BASE="o-ran-sc/nonrtric-plt-informationcoordinatorservice"
ICS_IMAGE_TAG_LOCAL="1.3.0-SNAPSHOT"
ICS_IMAGE_TAG_REMOTE_SNAPSHOT="1.3.0-SNAPSHOT"
ICS_IMAGE_TAG_REMOTE="1.3.0"
@@ -115,7 +115,7 @@
# RAPP Catalogue image and tags
-RAPP_CAT_IMAGE_BASE="o-ran-sc/nonrtric-r-app-catalogue"
+RAPP_CAT_IMAGE_BASE="o-ran-sc/nonrtric-plt-rappcatalogue"
RAPP_CAT_IMAGE_TAG_LOCAL="1.1.0-SNAPSHOT"
RAPP_CAT_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.0-SNAPSHOT"
RAPP_CAT_IMAGE_TAG_REMOTE="1.1.0"
@@ -130,21 +130,21 @@
RIC_SIM_IMAGE_TAG_REMOTE_RELEASE="2.3.0"
# DMAAP Mediator Service
-DMAAP_MED_IMAGE_BASE="o-ran-sc/nonrtric-dmaap-mediator-producer"
+DMAAP_MED_IMAGE_BASE="o-ran-sc/nonrtric-plt-dmaapmediatorproducer"
DMAAP_MED_IMAGE_TAG_LOCAL="1.1.0-SNAPSHOT"
DMAAP_MED_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.0-SNAPSHOT"
DMAAP_MED_IMAGE_TAG_REMOTE="1.1.0"
DMAAP_MED_IMAGE_TAG_REMOTE_RELEASE="1.1.0"
# DMAAP Adapter Service
-DMAAP_ADP_IMAGE_BASE="o-ran-sc/nonrtric-dmaap-adaptor"
+DMAAP_ADP_IMAGE_BASE="o-ran-sc/nonrtric-plt-dmaapadapter"
DMAAP_ADP_IMAGE_TAG_LOCAL="1.1.0-SNAPSHOT"
DMAAP_ADP_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.0-SNAPSHOT"
DMAAP_ADP_IMAGE_TAG_REMOTE="1.1.0"
DMAAP_ADP_IMAGE_TAG_REMOTE_RELEASE="1.1.0"
# Helm Manager
-HELM_MANAGER_IMAGE_BASE="o-ran-sc/nonrtric-helm-manager"
+HELM_MANAGER_IMAGE_BASE="o-ran-sc/nonrtric-plt-helmmanager"
HELM_MANAGER_IMAGE_TAG_LOCAL="1.2.0-SNAPSHOT"
HELM_MANAGER_IMAGE_TAG_REMOTE_SNAPSHOT="1.2.0-SNAPSHOT"
HELM_MANAGER_IMAGE_TAG_REMOTE="1.2.0"
@@ -386,7 +386,7 @@
# SDNC_KARAF_LOG="/opt/opendaylight/data/log/karaf.log" # Path to karaf log
# SDNC_RESPONSE_JSON_KEY="output" # Key name for output json in replies from sdnc
-# For ONAP sdan
+# For ONAP sdnc
SDNC_APP_NAME="a1controller" # Name of the SNDC A1 Controller container
SDNC_DISPLAY_NAME="SDNC A1 Controller"
SDNC_EXTERNAL_PORT=8282 # SNDC A1 Controller container external port (host -> container)
@@ -498,17 +498,15 @@
DMAAP_ADP_EXTERNAL_SECURE_PORT=9088 # Dmaap Adapter container external secure port (host -> container)
DMAAP_ADP_INTERNAL_SECURE_PORT=8435 # Dmaap Adapter container internal secure port (container -> container)
-#DMAAP_ADP_LOGPATH="/var/log/dmaap-adaptor-service/application.log" # Path the application log in the Dmaap Adapter container
DMAAP_ADP_HOST_MNT_DIR="./mnt" # Mounted db dir, relative to compose file, on the host
-#MAAP_ADP_CONTAINER_MNT_DIR="/var/dmaap-adaptor-service" # Mounted dir in the container
DMAAP_ADP_ACTUATOR="/actuator/loggers/org.oran.dmaapadapter" # Url for trace/debug
-#DMAAP_ADP_CERT_MOUNT_DIR="./cert"
DMAAP_ADP_ALIVE_URL="/actuator/info" # Base path for alive check
DMAAP_ADP_COMPOSE_DIR="dmaapadp" # Dir in simulator_group for docker-compose
-DMAAP_ADP_CONFIG_MOUNT_PATH="/opt/app/dmaap-adaptor-service/config" # Internal container path for configuration
-DMAAP_ADP_DATA_MOUNT_PATH="/opt/app/dmaap-adaptor-service/data" # Path in container for data file
+DMAAP_ADP_CONFIG_MOUNT_PATH="/opt/app/dmaap-adapter-service/config" # Internal container path for configuration
+DMAAP_ADP_DATA_MOUNT_PATH="/opt/app/dmaap-adapter-service/data" # Path in container for data file
DMAAP_ADP_DATA_FILE="application_configuration.json" # Container data file name
DMAAP_ADP_CONFIG_FILE=application.yaml # Config file name
+DMAAP_ADP_CONFIG_FILE_TEMPLATE=application1.yaml # Template config file name
DMAAP_MED_APP_NAME="dmaapmediatorservice" # Name for Dmaap Mediator container
DMAAP_MED_DISPLAY_NAME="Dmaap Mediator Service" # Display name for Dmaap Mediator container
@@ -517,14 +515,9 @@
DMAAP_MED_EXTERNAL_SECURE_PORT=8185 # Dmaap Mediator container external secure port (host -> container)
DMAAP_MED_INTERNAL_SECURE_PORT=8185 # Dmaap Mediator container internal secure port (container -> container)
-DMAAP_MED_LOGPATH="/var/log/dmaap-adaptor-service/application.log" # Path the application log in the Dmaap Mediator container
DMAAP_MED_HOST_MNT_DIR="./mnt" # Mounted db dir, relative to compose file, on the host
-#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="/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_1.json" # Host data file name
DMAAP_MED_CONTR_DATA_FILE="type_config.json" # Container data file name
diff --git a/test/common/testcase_common.sh b/test/common/testcase_common.sh
index 1c77eda..78f27fd 100755
--- a/test/common/testcase_common.sh
+++ b/test/common/testcase_common.sh
@@ -1117,7 +1117,7 @@
echo -e $RED"docker-compose is required to run the test environment, pls install"$ERED
exit 1
else
- tmp=$(docker-compose version --short)
+ tmp=$(docker-compose version)
echo " docker-compose installed and using version $tmp"
if [[ "$tmp" == *'v2'* ]]; then
DOCKER_COMPOSE_VERION="V2"
@@ -2360,7 +2360,7 @@
ns_flag=""
ns_text=""
fi
- result=$(kubectl $KUBECONF get $restype $ns_flag -o jsonpath='{.items[?(@.metadata.labels.'$labelname'=="'$labelid'")].metadata.name}')
+ result=$(kubectl $KUBECONF get $restype $ns_flag -o jsonpath='{.items[?(@.metadata.labels.'$labelname'=="'$labelid'")].metadata.name}' 2> /dev/null)
if [ $? -eq 0 ] && [ ! -z "$result" ]; then
deleted_resourcetypes=$deleted_resourcetypes" "$restype
for resid in $result; do
diff --git a/test/mrstub/app/main.py b/test/mrstub/app/main.py
index 9ad75e6..0995428 100644
--- a/test/mrstub/app/main.py
+++ b/test/mrstub/app/main.py
@@ -244,7 +244,7 @@
print(APP_WRITE_URL+" operation="+oper+" url="+url)
correlation_id=str(time.time_ns())
payload=None
- if (oper == "PUT") and (request.json is not None):
+ if (oper == "PUT") and len(request.data) > 0:
payload=json.dumps(request.json)
msg=create_message(oper, correlation_id, payload, url)
diff --git a/test/simulator-group/dmaapadp/application1.yaml b/test/simulator-group/dmaapadp/application1.yaml
new file mode 100644
index 0000000..c787d2f
--- /dev/null
+++ b/test/simulator-group/dmaapadp/application1.yaml
@@ -0,0 +1,74 @@
+################################################################################
+# 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. #
+################################################################################
+
+spring:
+ profiles:
+ active: prod
+ main:
+ allow-bean-definition-overriding: true
+ aop:
+ auto: false
+management:
+ endpoints:
+ web:
+ exposure:
+ # Enabling of springboot actuator features. See springboot documentation.
+ include: "loggers,logfile,health,info,metrics,threaddump,heapdump"
+springdoc:
+ show-actuator: true
+logging:
+ # Configuration of logging
+ level:
+ ROOT: ERROR
+ org.springframework: ERROR
+ org.springframework.data: ERROR
+ org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
+ org.oran.dmaapadapter: INFO
+ file:
+ name: /var/log/dmaap-adapter-service/application.log
+server:
+ # Configuration of the HTTP/REST server. The parameters are defined and handeled by the springboot framework.
+ # See springboot documentation.
+ port : $DMAAP_ADP_INTERNAL_SECURE_PORT
+ http-port: $DMAAP_ADP_INTERNAL_PORT
+ ssl:
+ key-store-type: JKS
+ key-store-password: policy_agent
+ key-store: /opt/app/dmaap-adapter-service/etc/cert/keystore.jks
+ key-password: policy_agent
+ key-alias: policy_agent
+app:
+ webclient:
+ # Configuration of the trust store used for the HTTP client (outgoing requests)
+ # The file location and the password for the truststore is only relevant if trust-store-used == true
+ # Note that the same keystore as for the server is used.
+ trust-store-used: false
+ trust-store-password: policy_agent
+ trust-store: /opt/app/dmaap-adapter-service/etc/cert/truststore.jks
+ # Configuration of usage of HTTP Proxy for the southbound accesses.
+ # The HTTP proxy (if configured) will only be used for accessing NearRT RIC:s
+ http.proxy-host: $DMAAP_ADP_HTTP_PROXY_CONFIG_HOST_NAME
+ http.proxy-port: $DMAAP_ADP_HTTP_PROXY_CONFIG_PORT
+ ics-base-url: $ICS_SERVICE_PATH
+ # Location of the component configuration file. The file will only be used if the Consul database is not used;
+ # configuration from the Consul will override the file.
+ configuration-filepath: /opt/app/dmaap-adapter-service/data/application_configuration.json
+ dmaap-base-url: $MR_SERVICE_PATH
+ # The url used to adress this component. This is used as a callback url sent to other components.
+ dmaap-adapter-base-url: $DMAAP_ADP_SERVICE_PATH
+ # KAFKA boostrap server. This is only needed if there are Information Types that uses a kafkaInputTopic
+ kafka:
+ bootstrap-servers: $MR_KAFKA_SERVICE_PATH