summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAli Hockla <ah999m@att.com>2019-11-12 11:49:32 -0600
committerHOCKLA <ah999m@att.com>2019-11-13 12:27:17 -0600
commit9269643c4d0962ed0cb6100c1d2a65d1ead76c02 (patch)
tree2470f12f23cc672ca922e4db778a0a3a939f8c71
parent8d28c6fc936eb4bd95ad1ebd013996cff4787e0e (diff)
Added 'onap.monitoring.*' in list of supported policy types
Issue-ID: POLICY-2223 Change-Id: I1a7a1b4083ff74ca86455e1ab6ae7f96b8c04d35 Signed-off-by: Ali Hockla <ah999m@att.com>
-rw-r--r--applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringPdpApplication.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringPdpApplication.java b/applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringPdpApplication.java
index 318c9411..27bb24e5 100644
--- a/applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringPdpApplication.java
+++ b/applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringPdpApplication.java
@@ -56,7 +56,11 @@ public class MonitoringPdpApplication extends StdXacmlApplicationServiceProvider
private static final String ONAP_MONITORING_APPSERVER =
"onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server";
private static final String ONAP_MONITORING_SONHANDLER = "onap.policies.monitoring.docker.sonhandler.app";
- private static final String ONAP_MONITORING_DERIVED_POLICY_TYPE = "onap.policies.monitoring";
+ private static final String ONAP_MONITORING_DERIVED_POLICY_TYPE = "onap.policies.monitoring.";
+ // Note: this requirement is temporary; it will no longer be necessary once the PDPs and PAP
+ // are updated to use the PDP Group name instead of the supported types.
+ private static final String ONAP_MONITORING_ALL_DERIVED_POLICY_TYPE = ONAP_MONITORING_DERIVED_POLICY_TYPE + "*";
+
private static final String VERSION_100 = "1.0.0";
private StdCombinedPolicyResultsTranslator translator = new StdCombinedPolicyResultsTranslator();
@@ -73,6 +77,9 @@ public class MonitoringPdpApplication extends StdXacmlApplicationServiceProvider
supportedPolicyTypes.add(new ToscaPolicyTypeIdentifier(ONAP_MONITORING_CDAP, VERSION_100));
supportedPolicyTypes.add(new ToscaPolicyTypeIdentifier(ONAP_MONITORING_APPSERVER, VERSION_100));
supportedPolicyTypes.add(new ToscaPolicyTypeIdentifier(ONAP_MONITORING_SONHANDLER, VERSION_100));
+
+ // temporary requirement
+ supportedPolicyTypes.add(new ToscaPolicyTypeIdentifier(ONAP_MONITORING_ALL_DERIVED_POLICY_TYPE, VERSION_100));
}
@Override