diff options
| -rwxr-xr-x | csit/plans/setup.sh | 46 | ||||
| -rwxr-xr-x | csit/plans/teardown.sh | 19 | ||||
| -rw-r--r-- | csit/plans/testplan.txt | 3 | ||||
| -rw-r--r-- | csit/tests/drools-pdp-test.robot | 16 | ||||
| -rw-r--r-- | policy-management/src/main/server-gen/bin/rest-add-controller | 35 | ||||
| -rw-r--r-- | policy-management/src/main/server-gen/bin/rest-delete-controller | 39 | ||||
| -rw-r--r-- | policy-management/src/main/server/config/engine-system.properties | 3 | ||||
| -rw-r--r-- | policy-management/src/main/server/config/engine.properties | 22 |
8 files changed, 11 insertions, 172 deletions
diff --git a/csit/plans/setup.sh b/csit/plans/setup.sh deleted file mode 100755 index 003f21ba..00000000 --- a/csit/plans/setup.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# ============LICENSE_START======================================================= -# Copyright 2017-2021 AT&T Intellectual Property. 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. -# 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========================================================= -source ${SCRIPTS}/get-branch-mariadb.sh - -# OS upgrades - -echo "Uninstall docker-py and reinstall docker." -pip uninstall -y docker-py -pip uninstall -y docker -pip install -U docker==2.7.0 - -sudo apt-get -y install libxml2-utils - -source ${SCRIPTS}/detmVers.sh - -docker-compose -f ${SCRIPTS}/docker-compose-all.yml up -d drools - -POLICY_DROOLS_IP=`get-instance-ip.sh drools` -MARIADB_IP=`get-instance-ip.sh mariadb` - -echo DROOLS IP IS ${POLICY_DROOLS_IP} -echo MARIADB IP IS ${MARIADB_IP} - -# wait for the app to start up - looking for telemtry service on port 9696 -${SCRIPTS}/wait_for_port.sh ${POLICY_DROOLS_IP} 9696 - -# give enough time for the controllers to come up -sleep 15 - -ROBOT_VARIABLES="-v POLICY_DROOLS_IP:${POLICY_DROOLS_IP}" diff --git a/csit/plans/teardown.sh b/csit/plans/teardown.sh deleted file mode 100755 index d16c1647..00000000 --- a/csit/plans/teardown.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# ============LICENSE_START======================================================= -# Copyright 2017-2021 AT&T Intellectual Property. 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. -# 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. -# ============LICENSE_END========================================================= - -docker-compose -f ${SCRIPTS}/docker-compose-all.yml down -v diff --git a/csit/plans/testplan.txt b/csit/plans/testplan.txt deleted file mode 100644 index 76cf0fb0..00000000 --- a/csit/plans/testplan.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Test suites are relative paths under [policy/drools-pdp.git]/tests/. -# Place the suites in run order. -drools-pdp-test.robot diff --git a/csit/tests/drools-pdp-test.robot b/csit/tests/drools-pdp-test.robot deleted file mode 100644 index d819a808..00000000 --- a/csit/tests/drools-pdp-test.robot +++ /dev/null @@ -1,16 +0,0 @@ -*** Settings *** -Library Collections -Library RequestsLibrary -Library OperatingSystem -Library json - -*** Test Cases *** -Alive - [Documentation] Runs Policy PDP Alive Check - ${auth}= Create List demo@people.osaaf.org demo123456! - Log Creating session https://${POLICY_DROOLS_IP}:9696 - ${session}= Create Session policy https://${POLICY_DROOLS_IP}:9696 auth=${auth} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= GET On Session policy /policy/pdp/engine headers=${headers} expected_status=200 - Log Received response from policy ${resp.text} - Should Be Equal As Strings ${resp.json()['alive']} True diff --git a/policy-management/src/main/server-gen/bin/rest-add-controller b/policy-management/src/main/server-gen/bin/rest-add-controller deleted file mode 100644 index 28369ab6..00000000 --- a/policy-management/src/main/server-gen/bin/rest-add-controller +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env sh - -# ============LICENSE_START======================================================= -# ONAP -# ================================================================================ -# Copyright (C) 2017-2021 AT&T Intellectual Property. 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. -# 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. -# ============LICENSE_END========================================================= - -source $POLICY_HOME/etc/profile.d/env.sh - -json=$1-controller.rest.json - -if [ -f "${json}" ]; then - if [ -n "${TELEMETRY_PASSWORD}" ]; then - curl -k --silent --user ${TELEMETRY_USER}:${TELEMETRY_PASSWORD} -X POST --data @${json} --header "Content-Type: application/json" \ - https://localhost:${TELEMETRY_PORT}/policy/pdp/engine/controllers - else - curl -k --silent -X POST --data @${json} --header "Content-Type: application/json" \ - https://localhost:${TELEMETRY_PORT}/policy/pdp/engine/controllers - fi -else - echo "Usage: rest-add-controller.sh closed-loop-sample|reporter|sepc|vsegw|.. (or any other config file ending with *-controller.rest.json)" -fi diff --git a/policy-management/src/main/server-gen/bin/rest-delete-controller b/policy-management/src/main/server-gen/bin/rest-delete-controller deleted file mode 100644 index 8782a8b3..00000000 --- a/policy-management/src/main/server-gen/bin/rest-delete-controller +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env sh - -# ============LICENSE_START======================================================= -# ONAP -# ================================================================================ -# Copyright (C) 2017-2021 AT&T Intellectual Property. 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. -# 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. -# ============LICENSE_END========================================================= - -source $POLICY_HOME/etc/profile.d/env.sh - -if [ -n "$1" ]; then - if [ -n "${TELEMETRY_PASSWORD}" ]; then - curl -k --silent --user ${TELEMETRY_USER}:${TELEMETRY_PASSWORD} -X DELETE --header "Content-Type: application/json" \ - https://localhost:${TELEMETRY_PORT}/policy/pdp/engine/controllers/${1} - else - curl -k --silent -X DELETE --header "Content-Type: application/json" \ - https://localhost:${TELEMETRY_PORT}/policy/pdp/engine/controllers/${1} - fi - echo - exit -fi - -cat <<-'EOF' - -Usage: rest-delete-controller.sh closed-loop-sample|reporter|sepc|vsegw|.. (or any other controller idenfied by name) - -EOF diff --git a/policy-management/src/main/server/config/engine-system.properties b/policy-management/src/main/server/config/engine-system.properties index 722e7c2a..a0313d0d 100644 --- a/policy-management/src/main/server/config/engine-system.properties +++ b/policy-management/src/main/server/config/engine-system.properties @@ -33,9 +33,6 @@ com.sun.management.jmxremote.ssl=false javax.net.ssl.trustStore=${envd:TRUSTSTORE:/opt/app/policy/etc/ssl/policy-truststore} javax.net.ssl.trustStorePassword=${envd:TRUSTSTORE_PASSWD:Pol1cy_0nap} -javax.net.ssl.keyStore=${envd:KEYSTORE:/opt/app/policy/etc/ssl/policy-keystore} -javax.net.ssl.keyStorePassword=${envd:KEYSTORE_PASSWD:Pol1cy_0nap} - # kie kie.maven.offline.force=${envd:REPOSITORY_OFFLINE:false} diff --git a/policy-management/src/main/server/config/engine.properties b/policy-management/src/main/server/config/engine.properties index de93b97e..85a24f08 100644 --- a/policy-management/src/main/server/config/engine.properties +++ b/policy-management/src/main/server/config/engine.properties @@ -20,18 +20,18 @@ # Policy Engine Telemetry Server -http.server.services=SECURED-CONFIG +http.server.services=CONFIG -http.server.services.SECURED-CONFIG.host=${envd:TELEMETRY_HOST} -http.server.services.SECURED-CONFIG.port=9696 -http.server.services.SECURED-CONFIG.userName=${envd:TELEMETRY_USER} -http.server.services.SECURED-CONFIG.password=${envd:TELEMETRY_PASSWORD} -http.server.services.SECURED-CONFIG.restPackages=org.onap.policy.drools.server.restful -http.server.services.SECURED-CONFIG.managed=false -http.server.services.SECURED-CONFIG.swagger=true -http.server.services.SECURED-CONFIG.https=true -http.server.services.SECURED-CONFIG.aaf=${envd:AAF:false} -http.server.services.SECURED-CONFIG.serialization.provider=org.onap.policy.common.gson.JacksonHandler,org.onap.policy.common.endpoints.http.server.YamlJacksonHandler +http.server.services.CONFIG.host=${envd:TELEMETRY_HOST} +http.server.services.CONFIG.port=9696 +http.server.services.CONFIG.userName=${envd:TELEMETRY_USER} +http.server.services.CONFIG.password=${envd:TELEMETRY_PASSWORD} +http.server.services.CONFIG.restPackages=org.onap.policy.drools.server.restful +http.server.services.CONFIG.managed=false +http.server.services.CONFIG.swagger=true +http.server.services.CONFIG.https=false +http.server.services.CONFIG.aaf=${envd:AAF:false} +http.server.services.CONFIG.serialization.provider=org.onap.policy.common.gson.JacksonHandler,org.onap.policy.common.endpoints.http.server.YamlJacksonHandler aaf.namespace=${envd:AAF_NAMESPACE:false} aaf.root.permission=${envd:AAF_NAMESPACE:org.onap.policy}.pdpd |