From 5979c33356f956a2d937251ce0b6c5e51dc22cee Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 26 Jul 2021 09:08:21 -0400 Subject: Fix drools-apps CSIT actor.xacml properties I know I checked for the guard property names when doing the change from actor.guard to actor.xacml, but it appears that some were overlooked anyway. Made the appropriate updates. Issue-ID: POLICY-3503 Change-Id: Ia703628154beec38d464500fb779f9eadea8652c Signed-off-by: Jim Hahn --- .../feature/config/GUARD-http-client.properties | 27 ---------------------- .../feature/config/XACML-http-client.properties | 27 ++++++++++++++++++++++ .../main/feature/config/event-manager.properties | 12 +++++----- 3 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties create mode 100644 controlloop/common/feature-controlloop-management/src/main/feature/config/XACML-http-client.properties (limited to 'controlloop/common/feature-controlloop-management/src/main/feature') diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties deleted file mode 100644 index b0d88b483..000000000 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties +++ /dev/null @@ -1,27 +0,0 @@ -# ============LICENSE_START======================================================= -# ONAP -# ================================================================================ -# 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========================================================= - -http.client.services=GUARD - -http.client.services.GUARD.managed=true -http.client.services.GUARD.https=true -http.client.services.GUARD.host=${envd:PDP_HOST} -http.client.services.GUARD.port=${envd:PDP_PORT} -http.client.services.GUARD.userName=${envd:PDP_USERNAME} -http.client.services.GUARD.password=${envd:PDP_PASSWORD} -http.client.services.GUARD.contextUriPath=${envd:PDP_CONTEXT_URI:policy/pdpx/v1/} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/XACML-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/XACML-http-client.properties new file mode 100644 index 000000000..6865c68ed --- /dev/null +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/XACML-http-client.properties @@ -0,0 +1,27 @@ +# ============LICENSE_START======================================================= +# ONAP +# ================================================================================ +# Copyright (C) 2020-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========================================================= + +http.client.services=XACML + +http.client.services.XACML.managed=true +http.client.services.XACML.https=true +http.client.services.XACML.host=${envd:PDP_HOST} +http.client.services.XACML.port=${envd:PDP_PORT} +http.client.services.XACML.userName=${envd:PDP_USERNAME} +http.client.services.XACML.password=${envd:PDP_PASSWORD} +http.client.services.XACML.contextUriPath=${envd:PDP_CONTEXT_URI:policy/pdpx/v1/} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties index fb291c19c..f427a2cbf 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties @@ -30,12 +30,12 @@ operation.history.password=${env:SQL_PASSWORD} # configured and started. Thus some of them have a "placeholder" property. # -actor.service.GUARD.disabled=${envd:GUARD_DISABLED:false} -actor.service.GUARD.clientName=GUARD -actor.service.GUARD.onapName=Policy -actor.service.GUARD.onapComponent=Drools PDP -actor.service.GUARD.onapInstance=Usecases -actor.service.GUARD.operations.Decision.path=decision +actor.service.XACML.disabled=${envd:GUARD_DISABLED:false} +actor.service.XACML.clientName=XACML +actor.service.XACML.onapName=Policy +actor.service.XACML.onapComponent=Drools PDP +actor.service.XACML.onapInstance=Usecases +actor.service.XACML.operations.Decision.path=decision actor.service.AAI.clientName=AAI actor.service.AAI.operations.CustomQuery.path=aai/v21/query -- cgit 1.2.3-korg