summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRam Krishna Verma <ram_krishna.verma@bell.ca>2020-10-05 14:59:48 -0400
committerRam Krishna Verma <ram_krishna.verma@bell.ca>2020-10-06 14:46:21 -0400
commit3dc6d2ed0b51d834751d2eef788e71eba3b4bafe (patch)
treecf03f68b02357a6e777edf65a0c763bd99944f54
parent61dafe1cb86e4f82b2062d56bbc343df19c31c5f (diff)
Remove legacy operational apex policy type from pap
The legacy operational policy type for apex has been removed in Guilin release. Removing it fron pdpGroup config in PAP. Issue-ID: POLICY-2857 Change-Id: Iddf2e6b6301dbab3addcbff4c806142f4cf8e6c6 Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
-rw-r--r--main/src/main/resources/PapDb.json4
-rw-r--r--main/src/test/java/org/onap/policy/pap/main/comm/PdpHeartbeatListenerTest.java2
-rw-r--r--main/src/test/resources/e2e/PdpGroups.json46
3 files changed, 28 insertions, 24 deletions
diff --git a/main/src/main/resources/PapDb.json b/main/src/main/resources/PapDb.json
index 9c4123c5..6ee30e1c 100644
--- a/main/src/main/resources/PapDb.json
+++ b/main/src/main/resources/PapDb.json
@@ -119,10 +119,6 @@
"pdpType": "apex",
"supportedPolicyTypes": [
{
- "name": "onap.policies.controlloop.operational.Apex",
- "version": "1.0.0"
- },
- {
"name": "onap.policies.controlloop.operational.common.Apex",
"version": "1.0.0"
},
diff --git a/main/src/test/java/org/onap/policy/pap/main/comm/PdpHeartbeatListenerTest.java b/main/src/test/java/org/onap/policy/pap/main/comm/PdpHeartbeatListenerTest.java
index 14396602..a8c47043 100644
--- a/main/src/test/java/org/onap/policy/pap/main/comm/PdpHeartbeatListenerTest.java
+++ b/main/src/test/java/org/onap/policy/pap/main/comm/PdpHeartbeatListenerTest.java
@@ -50,7 +50,7 @@ import org.onap.policy.pap.main.rest.e2e.End2EndBase;
public class PdpHeartbeatListenerTest extends End2EndBase {
private static final String POLICY_VERSION = "1.0.0";
- private static final String POLICY_NAME = "onap.policies.controlloop.operational.Apex.SampleDomain";
+ private static final String POLICY_NAME = "onap.policies.controlloop.operational.common.apex.SampleDomain";
private static final String APEX_TYPE = "apex";
private static final String DEFAULT_GROUP = "defaultGroup";
private static final String PDP_NAME = "pdp_1";
diff --git a/main/src/test/resources/e2e/PdpGroups.json b/main/src/test/resources/e2e/PdpGroups.json
index e15a7acd..5ec387ed 100644
--- a/main/src/test/resources/e2e/PdpGroups.json
+++ b/main/src/test/resources/e2e/PdpGroups.json
@@ -10,15 +10,19 @@
"pdpType": "xacml",
"supportedPolicyTypes": [
{
- "name": "onap.policies.controlloop.guard.FrequencyLimiter",
+ "name": "onap.policies.controlloop.guard.common.FrequencyLimiter",
"version": "1.0.0"
},
{
- "name": "onap.policies.controlloop.guard.MinMax",
+ "name": "onap.policies.controlloop.guard.common.MinMax",
"version": "1.0.0"
},
{
- "name": "onap.policies.controlloop.guard.Blacklist",
+ "name": "onap.policies.controlloop.guard.common.Blacklist",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Filter",
"version": "1.0.0"
},
{
@@ -26,55 +30,59 @@
"version": "1.0.0"
},
{
- "name": "onap.Monitoring",
+ "name": "onap.policies.monitoring.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.*",
"version": "1.0.0"
},
{
- "name": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+ "name": "onap.policies.optimization.resource.AffinityPolicy",
"version": "1.0.0"
},
{
- "name": "onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server",
+ "name": "onap.policies.optimization.resource.DistancePolicy",
"version": "1.0.0"
},
{
- "name": "onap.policies.monitoring.docker.sonhandler.app",
+ "name": "onap.policies.optimization.resource.HpaPolicy",
"version": "1.0.0"
},
{
- "name": "onap.policies.optimization.AffinityPolicy",
+ "name": "onap.policies.optimization.resource.OptimizationPolicy",
"version": "1.0.0"
},
{
- "name": "onap.policies.optimization.DistancePolicy",
+ "name": "onap.policies.optimization.resource.PciPolicy",
"version": "1.0.0"
},
{
- "name": "onap.policies.optimization.HpaPolicy",
+ "name": "onap.policies.optimization.service.QueryPolicy",
"version": "1.0.0"
},
{
- "name": "onap.policies.optimization.OptimizationPolicy",
+ "name": "onap.policies.optimization.service.SubscriberPolicy",
"version": "1.0.0"
},
{
- "name": "onap.policies.optimization.PciPolicy",
+ "name": "onap.policies.optimization.resource.Vim_fit",
"version": "1.0.0"
},
{
- "name": "onap.policies.optimization.QueryPolicy",
+ "name": "onap.policies.optimization.resource.VnfPolicy",
"version": "1.0.0"
},
{
- "name": "onap.policies.optimization.SubscriberPolicy",
+ "name": "onap.policies.native.Xacml",
"version": "1.0.0"
},
{
- "name": "onap.policies.optimization.Vim_fit",
+ "name": "onap.policies.Naming",
"version": "1.0.0"
},
{
- "name": "onap.policies.optimization.VnfPolicy",
+ "name": "onap.policies.match.*",
"version": "1.0.0"
}
],
@@ -86,7 +94,7 @@
"pdpType": "drools",
"supportedPolicyTypes": [
{
- "name": "onap.policies.controlloop.Operational",
+ "name": "onap.policies.controlloop.operational.common.Drools",
"version": "1.0.0"
}
],
@@ -98,13 +106,13 @@
"pdpType": "apex",
"supportedPolicyTypes": [
{
- "name": "onap.policies.controlloop.operational.Apex",
+ "name": "onap.policies.controlloop.operational.common.Apex",
"version": "1.0.0"
}
],
"policies": [
{
- "name": "onap.policies.controlloop.operational.Apex.SampleDomain",
+ "name": "onap.policies.controlloop.operational.common.apex.SampleDomain",
"version": "1.0.0"
}
],