From 9bc1d7291d579e80fcb9723ae3400902abb49063 Mon Sep 17 00:00:00 2001
From: ramverma <ram.krishna.verma@est.tech>
Date: Thu, 2 May 2019 12:58:30 +0000
Subject: Changing the PAP initial db data

Changing PAP initial db data to bring all the xacml supportedPolicyTypes
in one PdpGroup.

Change-Id: I9a0788c788bab470109b0f09fb631e7fbb90042e
Issue-ID: POLICY-1723
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
---
 main/src/main/resources/PapDb.json | 88 ++++++++++++--------------------------
 1 file changed, 28 insertions(+), 60 deletions(-)

diff --git a/main/src/main/resources/PapDb.json b/main/src/main/resources/PapDb.json
index 2967f3db..5be0bdb4 100644
--- a/main/src/main/resources/PapDb.json
+++ b/main/src/main/resources/PapDb.json
@@ -1,9 +1,9 @@
 {
   "groups": [
     {
-      "name": "controlloop",
+      "name": "defaultGroup",
       "version": "1.0.0",
-      "description": "This group should be used for managing all control loop related policies and pdps",
+      "description": "The default group that registers all supported policy types and pdps.",
       "pdpGroupState": "ACTIVE",
       "pdpSubgroups": [
         {
@@ -24,47 +24,7 @@
             {
               "name": "onap.policies.controlloop.guard.coordination.FirstBlocksSecond",
               "version": "1.0.0"
-            }
-          ],
-          "currentInstanceCount": 0,
-          "desiredInstanceCount": 1,
-          "policies": []
-        },
-        {
-          "pdpType": "drools",
-          "supportedPolicyTypes": [
-            {
-              "name": "onap.policies.controlloop.Operational",
-              "version": "1.0.0"
-            }
-          ],
-          "currentInstanceCount": 0,
-          "desiredInstanceCount": 1,
-          "policies": []
-        },
-        {
-          "pdpType": "apex",
-          "supportedPolicyTypes": [
-            {
-              "name": "onap.policies.controlloop.operational.Apex",
-              "version": "1.0.0"
-            }
-          ],
-          "currentInstanceCount": 0,
-          "desiredInstanceCount": 1,
-          "policies": []
-        }
-      ]
-    },
-    {
-      "name": "monitoring",
-      "version": "1.0.0",
-      "description": "This group should be used for managing all monitoring related policies and pdps",
-      "pdpGroupState": "ACTIVE",
-      "pdpSubgroups": [
-        {
-          "pdpType": "xacml",
-          "supportedPolicyTypes": [
+            },
             {
               "name": "onap.Monitoring",
               "version": "1.0.0"
@@ -76,23 +36,7 @@
             {
               "name": "onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server",
               "version": "1.0.0"
-            }
-          ],
-          "currentInstanceCount": 0,
-          "desiredInstanceCount": 1,
-          "policies": []
-        }
-      ]
-    },
-    {
-      "name": "optimization",
-      "version": "1.0.0",
-      "description": "This group should be used for managing all optimization related policies and pdps",
-      "pdpGroupState": "ACTIVE",
-      "pdpSubgroups": [
-        {
-          "pdpType": "xacml",
-          "supportedPolicyTypes": [
+            },
             {
               "name": "onap.policies.optimization.AffinityPolicy",
               "version": "1.0.0"
@@ -133,6 +77,30 @@
           "currentInstanceCount": 0,
           "desiredInstanceCount": 1,
           "policies": []
+        },
+        {
+          "pdpType": "drools",
+          "supportedPolicyTypes": [
+            {
+              "name": "onap.policies.controlloop.Operational",
+              "version": "1.0.0"
+            }
+          ],
+          "currentInstanceCount": 0,
+          "desiredInstanceCount": 1,
+          "policies": []
+        },
+        {
+          "pdpType": "apex",
+          "supportedPolicyTypes": [
+            {
+              "name": "onap.policies.controlloop.operational.Apex",
+              "version": "1.0.0"
+            }
+          ],
+          "currentInstanceCount": 0,
+          "desiredInstanceCount": 1,
+          "policies": []
         }
       ]
     }
-- 
cgit 1.2.3-korg