Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CI: Migrate Sonar Scan job to GHA
[nonrtric.git]
/
test
/
auto-test
/
FTC2002.sh
diff --git
a/test/auto-test/FTC2002.sh
b/test/auto-test/FTC2002.sh
index
37d3576
..
547492c
100755
(executable)
--- a/
test/auto-test/FTC2002.sh
+++ b/
test/auto-test/FTC2002.sh
@@
-1,7
+1,8
@@
#!/usr/bin/env bash
# ============LICENSE_START===============================================
#!/usr/bin/env bash
# ============LICENSE_START===============================================
-# Copyright (C) 2020 Nordix Foundation. All rights reserved.
+# Copyright (C) 2020-2023 Nordix Foundation. All rights reserved.
+# Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
# ========================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# ========================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-23,11
+24,16
@@
TC_ONELINE_DESCR="Testing southbound proxy for SDNC - docker only"
DOCKER_INCLUDED_IMAGES="RICSIM SDNC HTTPPROXY KUBEPROXY"
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES=""
DOCKER_INCLUDED_IMAGES="RICSIM SDNC HTTPPROXY KUBEPROXY"
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES=""
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre
-
started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=" "
KUBE_PRESTARTED_IMAGES=" "
+#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
+#the image is not configured in the supplied env_file
+#Used for images not applicable to all supported profile
+CONDITIONALLY_IGNORED_IMAGES=""
+
#Supported test environment profiles
#Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-
ISTANBUL ONAP-JAKARTA
"
+SUPPORTED_PROFILES="ONAP-
KOHN ONAP-LONDON ONAP-MONTREAL
"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER"
@@
-37,9
+43,9
@@
setup_testenvironment
#### TEST BEGIN ####
#### TEST BEGIN ####
-generate_policy_uuid
+
sim_
generate_policy_uuid
-#Test a
gent
and simulator protocol versions (others are http only)
+#Test a
1pms
and simulator protocol versions (others are http only)
NB_TESTED_PROTOCOLS="HTTP HTTPS"
SB_TESTED_PROTOCOLS="HTTP HTTPS"
NB_TESTED_PROTOCOLS="HTTP HTTPS"
SB_TESTED_PROTOCOLS="HTTP HTTPS"
@@
-67,15
+73,19
@@
for __nb_httpx in $NB_TESTED_PROTOCOLS ; do
start_ric_simulators ricsim_g1 1 OSC_2.1.0
start_ric_simulators ricsim_g2 1 STD_1.1.3
start_ric_simulators ricsim_g1 1 OSC_2.1.0
start_ric_simulators ricsim_g2 1 STD_1.1.3
- if [ "$PMS_VERSION" == "V2" ]; then
- start_ric_simulators ricsim_g3 1 STD_2.0.0
- fi
+ start_ric_simulators ricsim_g3 1 STD_2.0.0
start_sdnc
start_sdnc
+ controller_api_wait_for_status_ok 200 ricsim_g1_1
if [ $__nb_httpx == "HTTPS" ]; then
# "Using secure ports towards SDNC"
if [ $__nb_httpx == "HTTPS" ]; then
# "Using secure ports towards SDNC"
- use_sdnc_https
+ if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+ deviation "SDNC does not support NB https"
+ use_sdnc_http
+ else
+ use_sdnc_https
+ fi
else
#"Using non-secure ports towards SDNC"
use_sdnc_http
else
#"Using non-secure ports towards SDNC"
use_sdnc_http