diff options
author | liamfallon <liam.fallon@est.tech> | 2022-09-01 12:05:47 +0100 |
---|---|---|
committer | liamfallon <liam.fallon@est.tech> | 2022-09-05 10:19:02 +0100 |
commit | faac45b578a29078700b5ea003c69cedc1a17b5f (patch) | |
tree | f2a079358441401e50c9933255122796b2134ea6 /csit/config/drools-apps/custom | |
parent | ff82245b200616cf30a6f6cd4d1e5305ae3d90ef (diff) |
Convert CSIT tests to use HTTP rather than HTTPS
This commit converts the CSITs from HTTPS to HTTP. It also does some
refactoring and didying up on the CSIT environment.
Issue-ID: POLICY-4338
Change-Id: Ie19908a8d2a457df3ae5f4e490d5528889f395c8
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'csit/config/drools-apps/custom')
4 files changed, 0 insertions, 158 deletions
diff --git a/csit/config/drools-apps/custom/engine-system.properties b/csit/config/drools-apps/custom/engine-system.properties deleted file mode 100644 index 19e03b51..00000000 --- a/csit/config/drools-apps/custom/engine-system.properties +++ /dev/null @@ -1,45 +0,0 @@ -# -# ============LICENSE_START======================================================= -# ONAP -# ================================================================================ -# Copyright (C) 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========================================================= -# - -# system properties set within the application - -java.net.preferIPv4Stack=true - -# jmx - -com.sun.management.jmxremote.port=9991 -com.sun.management.jmxremote.authenticate=false -com.sun.management.jmxremote.ssl=false - -# certs - -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} - -# symmetric key for sensitive configuration data - -engine.symm.key=${envd:SYMM_KEY} diff --git a/csit/config/drools-apps/custom/feature-lifecycle.properties b/csit/config/drools-apps/custom/feature-lifecycle.properties deleted file mode 100644 index dcbf290e..00000000 --- a/csit/config/drools-apps/custom/feature-lifecycle.properties +++ /dev/null @@ -1,38 +0,0 @@ -# ============LICENSE_START======================================================= -# ONAP -# ================================================================================ -# Copyright (C) 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========================================================= - -lifecycle.pdp.group=${envd:POLICY_PDP_PAP_GROUP:defaultGroup} -lifecycle.pdp.type=${envd:POLICY_PDP_PAP_TYPE:drools} - -# Mandatory policy types that this PDP-D must support at a minimum -lifecycle.pdp.policytypes=${envd:POLICY_PDP_PAP_POLICYTYPES} - -dmaap.source.topics=POLICY-PDP-PAP -dmaap.sink.topics=POLICY-PDP-PAP - -dmaap.source.topics.POLICY-PDP-PAP.servers=${envd:DMAAP_SERVERS} -dmaap.source.topics.POLICY-PDP-PAP.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC} -dmaap.source.topics.POLICY-PDP-PAP.apiKey=${envd:POLICY_PDP_PAP_API_KEY} -dmaap.source.topics.POLICY-PDP-PAP.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET} -dmaap.source.topics.POLICY-PDP-PAP.https=${envd:DMAAP_HTTPS:true} - -dmaap.sink.topics.POLICY-PDP-PAP.servers=${envd:DMAAP_SERVERS} -dmaap.sink.topics.POLICY-PDP-PAP.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC} -dmaap.sink.topics.POLICY-PDP-PAP.apiKey=${envd:POLICY_PDP_PAP_API_KEY} -dmaap.sink.topics.POLICY-PDP-PAP.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET} -dmaap.sink.topics.POLICY-PDP-PAP.https=${envd:DMAAP_HTTPS:true} diff --git a/csit/config/drools-apps/custom/features.pre.sh b/csit/config/drools-apps/custom/features.pre.sh deleted file mode 100755 index fd7b5b91..00000000 --- a/csit/config/drools-apps/custom/features.pre.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# ============LICENSE_START=================================================== -# Copyright (C) 2020 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===================================================== - -sh -c "features disable distributed-locking" diff --git a/csit/config/drools-apps/custom/standalone-settings.xml b/csit/config/drools-apps/custom/standalone-settings.xml deleted file mode 100644 index ebd6dd2a..00000000 --- a/csit/config/drools-apps/custom/standalone-settings.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ============LICENSE_START======================================================= - Base Package - ================================================================================ - Copyright (C) 2017-2019 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========================================================= - --> - - -<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> - - <offline>true</offline> - - <profiles> - - <profile> - <id>policy-local</id> - - <repositories> - <repository> - <id>file-repository</id> - <url>file:${user.home}/.m2/file-repository</url> - <releases> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - </snapshots> - </repository> - </repositories> - - </profile> - - </profiles> - - <activeProfiles> - <activeProfile>policy-local</activeProfile> - </activeProfiles> - -</settings> |