Add more filtering conditions to filter returned PdpGroups with specified policy...

Add groupState=ACTIVE and pdpState=ACTIVE to pdpGroupFilter for filtering
returned pdpGroup list with specified policy deployed in it.

Issue-ID: POLICY-1738
Change-Id: Ie777ab1f6438871b2034c8f2fe7a61595a3f633c
Signed-off-by: Chenfei Gao <cgao@research.att.com>

diff --git a/main/src/main/java/org/onap/policy/api/main/rest/provider/PolicyProvider.java b/main/src/main/java/org/onap/policy/api/main/rest/provider/PolicyProvider.java
index 8060ee7..102f6f8 100644 (file)
--- a/main/src/main/java/org/onap/policy/api/main/rest/provider/PolicyProvider.java
+++ b/main/src/main/java/org/onap/policy/api/main/rest/provider/PolicyProvider.java
@@ -34,6 +34,7 @@ import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.pdp.concepts.PdpGroup;\r
 import org.onap.policy.models.pdp.concepts.PdpGroupFilter;\r
 import org.onap.policy.models.pdp.concepts.PdpSubGroup;\r
+import org.onap.policy.models.pdp.enums.PdpState;\r
 import org.onap.policy.models.provider.PolicyModelsProvider;\r
 import org.onap.policy.models.provider.PolicyModelsProviderFactory;\r
 import org.onap.policy.models.provider.PolicyModelsProviderParameters;\r
@@ -133,7 +134,8 @@ public class PolicyProvider implements AutoCloseable {
 \r
         List<ToscaPolicyTypeIdentifier> policyTypes = new ArrayList<>();\r
         policyTypes.add(new ToscaPolicyTypeIdentifier(policyTypeId, policyTypeVersion));\r
-        PdpGroupFilter pdpGroupFilter = PdpGroupFilter.builder().policyTypeList(policyTypes).build();\r
+        PdpGroupFilter pdpGroupFilter = PdpGroupFilter.builder().policyTypeList(policyTypes)\r
+                .groupState(PdpState.ACTIVE).pdpState(PdpState.ACTIVE).build();\r
         List<PdpGroup> pdpGroups = modelsProvider.getFilteredPdpGroups(pdpGroupFilter);\r
 \r
         if (pdpGroups.isEmpty()) {\r