summaryrefslogtreecommitdiffstats
path: root/controlloop/common/feature-controlloop-management
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-07-26 09:08:21 -0400
committerJim Hahn <jrh3@att.com>2021-07-26 09:15:05 -0400
commit5979c33356f956a2d937251ce0b6c5e51dc22cee (patch)
treec73b9e249c513b03d3a2b828fc4c5c24d5fbcc15 /controlloop/common/feature-controlloop-management
parent27c0d0c0a925e4fa0fed41fd7cf794b02be15595 (diff)
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 <jrh3@att.com>
Diffstat (limited to 'controlloop/common/feature-controlloop-management')
-rw-r--r--controlloop/common/feature-controlloop-management/src/main/feature/config/XACML-http-client.properties (renamed from controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties)18
-rw-r--r--controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties12
2 files changed, 15 insertions, 15 deletions
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/XACML-http-client.properties
index b0d88b483..6865c68ed 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/XACML-http-client.properties
@@ -1,7 +1,7 @@
# ============LICENSE_START=======================================================
# ONAP
# ================================================================================
-# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+# 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.
@@ -16,12 +16,12 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-http.client.services=GUARD
+http.client.services=XACML
-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/}
+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