aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--csit/common-library.robot2
-rw-r--r--csit/config/apex-pdp/OnapPfConfig.json2
-rw-r--r--csit/config/clamp/HttpParticipantParameters.yaml5
-rw-r--r--csit/config/clamp/KubernetesParticipantParameters.yaml5
-rw-r--r--csit/config/clamp/PolicyParticipantParameters.yaml6
-rw-r--r--csit/config/distribution/defaultConfig.json2
-rw-r--r--csit/config/drools-applications/env/base.conf4
-rw-r--r--csit/config/drools-pdp/env/base.conf2
-rw-r--r--csit/config/xacml-pdp/defaultConfig.json2
-rw-r--r--csit/docker-compose-all.yml3
-rwxr-xr-xcsit/run-project-csit.sh1
-rwxr-xr-xcsit/start-containter.sh47
12 files changed, 72 insertions, 9 deletions
diff --git a/csit/common-library.robot b/csit/common-library.robot
index b90f854c..42d3ed12 100644
--- a/csit/common-library.robot
+++ b/csit/common-library.robot
@@ -11,7 +11,7 @@ PolicyAdminAuth
[return] ${policyadmin}
HealthCheckAuth
- ${healthcheck}= Create list healthcheck zb!XztG34
+ ${healthcheck}= Create list policyadmin zb!XztG34
[return] ${healthcheck}
PerformPostRequest
diff --git a/csit/config/apex-pdp/OnapPfConfig.json b/csit/config/apex-pdp/OnapPfConfig.json
index 5760259b..57ca7200 100644
--- a/csit/config/apex-pdp/OnapPfConfig.json
+++ b/csit/config/apex-pdp/OnapPfConfig.json
@@ -3,7 +3,7 @@
"restServerParameters": {
"host": "0.0.0.0",
"port": 6969,
- "userName": "healthcheck",
+ "userName": "policyadmin",
"password": "zb!XztG34",
"https": false,
"prometheus": true
diff --git a/csit/config/clamp/HttpParticipantParameters.yaml b/csit/config/clamp/HttpParticipantParameters.yaml
index 15768882..038e97af 100644
--- a/csit/config/clamp/HttpParticipantParameters.yaml
+++ b/csit/config/clamp/HttpParticipantParameters.yaml
@@ -3,6 +3,11 @@ spring:
user:
name: participantUser
password: zb!XztG34
+ autoconfigure:
+ exclude: >
+ org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,
+ org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,
+ org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
security:
enable-csrf: false
participant:
diff --git a/csit/config/clamp/KubernetesParticipantParameters.yaml b/csit/config/clamp/KubernetesParticipantParameters.yaml
index c13f8151..d9c3326f 100644
--- a/csit/config/clamp/KubernetesParticipantParameters.yaml
+++ b/csit/config/clamp/KubernetesParticipantParameters.yaml
@@ -3,6 +3,11 @@ spring:
user:
name: participantUser
password: zb!XztG34
+ autoconfigure:
+ exclude: >
+ org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,
+ org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,
+ org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
security:
enable-csrf: false
diff --git a/csit/config/clamp/PolicyParticipantParameters.yaml b/csit/config/clamp/PolicyParticipantParameters.yaml
index acaaebbe..8db98a78 100644
--- a/csit/config/clamp/PolicyParticipantParameters.yaml
+++ b/csit/config/clamp/PolicyParticipantParameters.yaml
@@ -3,7 +3,11 @@ spring:
user:
name: participantUser
password: zb!XztG34
-
+ autoconfigure:
+ exclude: >
+ org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,
+ org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,
+ org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
participant:
pdpGroup: defaultGroup
pdpType: apex
diff --git a/csit/config/distribution/defaultConfig.json b/csit/config/distribution/defaultConfig.json
index 7f09c6b4..c8451eba 100644
--- a/csit/config/distribution/defaultConfig.json
+++ b/csit/config/distribution/defaultConfig.json
@@ -3,7 +3,7 @@
"restServerParameters":{
"host":"0.0.0.0",
"port":6969,
- "userName":"healthcheck",
+ "userName":"policyadmin",
"password":"zb!XztG34",
"https": false,
"prometheus": true
diff --git a/csit/config/drools-applications/env/base.conf b/csit/config/drools-applications/env/base.conf
index 68ac61fc..ca944dbb 100644
--- a/csit/config/drools-applications/env/base.conf
+++ b/csit/config/drools-applications/env/base.conf
@@ -96,7 +96,7 @@ GUARD_DISABLED=false
PDP_HOST=policy-xacml-pdp
PDP_PORT=6969
PDP_CONTEXT_URI=policy/pdpx/v1/
-PDP_USERNAME=healthcheck
+PDP_USERNAME=policyadmin
PDP_PASSWORD=zb!XztG34
PDP_HTTPS=false
@@ -127,7 +127,7 @@ SO_PORT=6669
SO_CONTEXT_URI=
SO_URL=http://message-router:6669/
SO_USERNAME=InfraPortalClient
-SO_PASSWORD=password1$
+SO_PASSWORD='password1$'
# VFC
diff --git a/csit/config/drools-pdp/env/base.conf b/csit/config/drools-pdp/env/base.conf
index 3b8160e6..98cc10f8 100644
--- a/csit/config/drools-pdp/env/base.conf
+++ b/csit/config/drools-pdp/env/base.conf
@@ -125,7 +125,7 @@ SO_PORT=8080
SO_CONTEXT_URI=onap/so/infra/
SO_URL=http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra
SO_USERNAME=InfraPortalClient
-SO_PASSWORD=password1$
+SO_PASSWORD='password1$'
# VFC
diff --git a/csit/config/xacml-pdp/defaultConfig.json b/csit/config/xacml-pdp/defaultConfig.json
index a4bcc5ed..d6f3bd99 100644
--- a/csit/config/xacml-pdp/defaultConfig.json
+++ b/csit/config/xacml-pdp/defaultConfig.json
@@ -5,7 +5,7 @@
"restServerParameters": {
"host": "0.0.0.0",
"port": 6969,
- "userName": "healthcheck",
+ "userName": "policyadmin",
"password": "zb!XztG34",
"https": false,
"aaf": false,
diff --git a/csit/docker-compose-all.yml b/csit/docker-compose-all.yml
index 9e6666fd..d8f485b0 100644
--- a/csit/docker-compose-all.yml
+++ b/csit/docker-compose-all.yml
@@ -74,6 +74,8 @@ services:
- 6670
- 3904
- 6680
+ ports:
+ - 30227:3904
api:
image: ${CONTAINER_LOCATION}onap/policy-api:${POLICY_API_VERSION}
container_name: policy-api
@@ -124,6 +126,7 @@ services:
hostname: policy-xacml-pdp
ports:
- 30441:6969
+ - 30999:3904
volumes:
- ./config/xacml-pdp/defaultConfig.json:/opt/app/policy/pdpx/etc/defaultConfig.json:ro
- ./config/xacml-pdp/logback.xml:/opt/app/policy/pdpx/etc/logback.xml:ro
diff --git a/csit/run-project-csit.sh b/csit/run-project-csit.sh
index fd20c6af..6a4a9bb3 100755
--- a/csit/run-project-csit.sh
+++ b/csit/run-project-csit.sh
@@ -132,7 +132,6 @@ function source_safely() {
if $(docker images | grep -q "onap\/policy-api")
then
- echo where
export CONTAINER_LOCATION=$(
docker images |
grep onap/policy-api |
diff --git a/csit/start-containter.sh b/csit/start-containter.sh
new file mode 100755
index 00000000..3b1b167d
--- /dev/null
+++ b/csit/start-containter.sh
@@ -0,0 +1,47 @@
+# ============LICENSE_START====================================================
+# Copyright (C) 2022 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======================================================
+
+
+if [ "$#" -ne 1 ]
+then
+ echo "Usage: $0 <container-name>"
+ exit 1
+fi
+
+export PROJECT=$1
+
+if $(docker images | grep -q "onap\/policy-api")
+then
+ export CONTAINER_LOCATION=$(
+ docker images |
+ grep onap/policy-api |
+ head -1 |
+ sed 's/onap\/policy-api.*$//'
+ )
+else
+ export CONTAINER_LOCATION="nexus3.onap.org:10001/"
+fi
+
+SCRIPTS=$(git rev-parse --show-toplevel)
+export SCRIPTS="${SCRIPTS}"/csit
+
+source "${SCRIPTS}"/get-versions.sh
+
+docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up $*
+
+echo "Clamp GUI: https://localhost:2445/clamp"