From def5a9d47a1b512f65917babd6613e2b743ad8da Mon Sep 17 00:00:00 2001
From: "a.sreekumar" <ajith.sreekumar@est.tech>
Date: Tue, 3 Dec 2019 19:10:47 +0000
Subject: Create PAP API to only create/update PdpGroups

Create an API to create/update PdpGroups.
Policies are not allowed to be deployed as part of PDPGroup
create/update operation. There will be a separate API as part of
POLICY-2274 to deploy policies into individual group/subgroups.

Change-Id: I4e2cb43fefe08b22d6f70a1db7c026e83f0ebde0
Issue-ID: POLICY-2273
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
---
 main/src/test/resources/e2e/createGroups.json      |  7 +---
 main/src/test/resources/e2e/createNewGroups.json   | 48 ++++++++++++++++++++++
 .../test/resources/simpleDeploy/createGroups.json  |  7 +---
 .../resources/simpleDeploy/createGroupsDelSub.json | 14 +------
 4 files changed, 52 insertions(+), 24 deletions(-)
 create mode 100644 main/src/test/resources/e2e/createNewGroups.json

(limited to 'main/src/test/resources')

diff --git a/main/src/test/resources/e2e/createGroups.json b/main/src/test/resources/e2e/createGroups.json
index 1c8774be..1630a8d5 100644
--- a/main/src/test/resources/e2e/createGroups.json
+++ b/main/src/test/resources/e2e/createGroups.json
@@ -29,12 +29,7 @@
                             "version": "1.0.0"
                         }
                     ],
-                    "policies": [
-                        {
-                            "name": "onap.restart.tca",
-                            "version": "1.0.0"
-                        }
-                    ]
+                    "policies": []
                 },
                 {
                     "pdpType": "pdpTypeB",
diff --git a/main/src/test/resources/e2e/createNewGroups.json b/main/src/test/resources/e2e/createNewGroups.json
new file mode 100644
index 00000000..45339322
--- /dev/null
+++ b/main/src/test/resources/e2e/createNewGroups.json
@@ -0,0 +1,48 @@
+{
+    "groups": [
+        {
+            "name": "newGroup1",
+            "pdpGroupState": "ACTIVE",
+            "properties": {
+                "hello": "world"
+            },
+            "pdpSubgroups": [
+                {
+                    "pdpType": "pdpTypeA",
+                    "desiredInstanceCount": 2,
+                    "properties": {},
+                    "pdpInstances": [],
+                    "supportedPolicyTypes": [
+                        {
+                            "name": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+                            "version": "1.0.0"
+                        }
+                    ],
+                    "policies": []
+                }
+            ]
+        },
+        {
+            "name": "newGroup2",
+            "pdpGroupState": "ACTIVE",
+            "properties": {
+                "hello": "world"
+            },
+            "pdpSubgroups": [
+                {
+                    "pdpType": "pdpTypeB",
+                    "desiredInstanceCount": 2,
+                    "properties": {},
+                    "pdpInstances": [],
+                    "supportedPolicyTypes": [
+                        {
+                            "name": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+                            "version": "1.0.0"
+                        }
+                    ],
+                    "policies": []
+                }
+            ]
+        }
+    ]
+}
diff --git a/main/src/test/resources/simpleDeploy/createGroups.json b/main/src/test/resources/simpleDeploy/createGroups.json
index 59c4eb87..daef17b7 100644
--- a/main/src/test/resources/simpleDeploy/createGroups.json
+++ b/main/src/test/resources/simpleDeploy/createGroups.json
@@ -26,12 +26,7 @@
                             "instanceId": "pdpA"
                         }
                     ],
-                    "policies": [
-                        {
-                            "name": "policyA",
-                            "version": "1.2.3"
-                        }
-                    ]
+                    "policies": []
                 }
             ]
         }
diff --git a/main/src/test/resources/simpleDeploy/createGroupsDelSub.json b/main/src/test/resources/simpleDeploy/createGroupsDelSub.json
index cba308ec..bcaa1c1f 100644
--- a/main/src/test/resources/simpleDeploy/createGroupsDelSub.json
+++ b/main/src/test/resources/simpleDeploy/createGroupsDelSub.json
@@ -26,12 +26,7 @@
                             "instanceId": "pdpA"
                         }
                     ],
-                    "policies": [
-                        {
-                            "name": "policyA",
-                            "version": "1.2.3"
-                        }
-                    ]
+                    "policies": []
                 },
                 {
                     "pdpType": "pdpTypeB",
@@ -51,12 +46,7 @@
                             "instanceId": "pdpD"
                         }
                     ],
-                    "policies": [
-                        {
-                            "name": "policyA",
-                            "version": "1.2.3"
-                        }
-                    ]
+                    "policies": []
                 }
             ]
         }
-- 
cgit 1.2.3-korg