Only update policies in PAP REST API

Modified the deploy controller and provider to only update the
policies within a group, while leaving the other fields unchanged.
Added delta operations so that only additions or deletions need
be included instead of providing the complete list of policies.

Change-Id: Id2b69dac15f97b8a898f459f8d3f09216fc3618e
Issue-ID: POLICY-2274
Signed-off-by: Jim Hahn <jrh3@att.com>

8 files changed, 249 insertions, 1 deletions

diff --git a/main/src/test/resources/e2e/deployGroups.json b/main/src/test/resources/e2e/deployGroups.json
new file mode 100644
index 00000000..1b9c33c3
--- /dev/null
+++ b/main/src/test/resources/e2e/deployGroups.json
@@ -0,0 +1,56 @@
+{
+    "groups": [
+        {
+            "name": "deployGroups",
+            "pdpGroupState": "PASSIVE",
+            "properties": {
+                "hello": "world"
+            },
+            "pdpSubgroups": [
+                {
+                    "pdpType": "pdpTypeA",
+                    "desiredInstanceCount": 2,
+                    "properties": {},
+                    "pdpInstances": [
+                        {
+                            "instanceId": "pdpAA_1",
+                            "pdpState": "ACTIVE",
+                            "healthy": "HEALTHY"
+                        },
+                        {
+                            "instanceId": "pdpAA_2",
+                            "pdpState": "ACTIVE",
+                            "healthy": "HEALTHY"
+                        }
+                    ],
+                    "supportedPolicyTypes": [
+                        {
+                            "name": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+                            "version": "1.0.0"
+                        }
+                    ],
+                    "policies": []
+                },
+                {
+                    "pdpType": "pdpTypeB",
+                    "desiredInstanceCount": 1,
+                    "properties": {},
+                    "pdpInstances": [
+                        {
+                            "instanceId": "pdpAB_1",
+                            "pdpState": "ACTIVE",
+                            "healthy": "HEALTHY"
+                        }
+                    ],
+                    "supportedPolicyTypes": [
+                        {
+                            "name": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+                            "version": "1.0.0"
+                        }
+                    ],
+                    "policies": []
+                }
+            ]
+        }
+    ]
+}
diff --git a/main/src/test/resources/e2e/deployGroups2.json b/main/src/test/resources/e2e/deployGroups2.json
new file mode 100644
index 00000000..6d784bfa
--- /dev/null
+++ b/main/src/test/resources/e2e/deployGroups2.json
@@ -0,0 +1,69 @@
+{
+    "groups": [
+        {
+            "name": "deployGroups",
+            "pdpGroupState": "PASSIVE",
+            "properties": {
+                "hello": "world"
+            },
+            "pdpSubgroups": [
+                {
+                    "pdpType": "pdpTypeA",
+                    "desiredInstanceCount": 2,
+                    "properties": {},
+                    "pdpInstances": [
+                        {
+                            "instanceId": "pdpAA_1",
+                            "pdpState": "ACTIVE",
+                            "healthy": "HEALTHY"
+                        },
+                        {
+                            "instanceId": "pdpAA_2",
+                            "pdpState": "ACTIVE",
+                            "healthy": "HEALTHY"
+                        }
+                    ],
+                    "supportedPolicyTypes": [
+                        {
+                            "name": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+                            "version": "1.0.0"
+                        }
+                    ],
+                    "policies": [
+                        {
+                            "name": "onap.restart.tca",
+                            "version": "1.0.0"
+                        },
+                        {
+                            "name": "onap.restart.tcaB",
+                            "version": "1.0.0"
+                        },
+                        {
+                            "name": "onap.restart.tcaC",
+                            "version": "1.0.0"
+                        }
+                    ]
+                },
+                {
+                    "pdpType": "pdpTypeB",
+                    "desiredInstanceCount": 1,
+                    "properties": {},
+                    "pdpInstances": [
+                        {
+                            "instanceId": "pdpAB_1",
+                            "pdpState": "ACTIVE",
+                            "healthy": "HEALTHY"
+                        }
+                    ],
+                    "supportedPolicyTypes": [
+                        {
+                            "name": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+                            "version": "1.0.0"
+                        }
+                    ],
+                    "policies": []
+                }
+            ]
+        }
+    ]
+}
diff --git a/main/src/test/resources/e2e/deployGroupsReq.json b/main/src/test/resources/e2e/deployGroupsReq.json
new file mode 100644
index 00000000..2e397d1d
--- /dev/null
+++ b/main/src/test/resources/e2e/deployGroupsReq.json
@@ -0,0 +1,24 @@
+{
+    "groups": [
+        {
+            "name": "deployGroups",
+            "deploymentSubgroups": [
+                {
+                    "pdpType": "pdpTypeA",
+                    "action": "PATCH",
+                    "policies": [
+                        {
+                            "name": "onap.restart.tca",
+                            "version": "1.0.0"
+                        }
+                    ]
+                },
+                {
+                    "pdpType": "pdpTypeB",
+                    "action": "PATCH",
+                    "policies": []
+                }
+            ]
+        }
+    ]
+}
diff --git a/main/src/test/resources/e2e/deployGroupsReq2.json b/main/src/test/resources/e2e/deployGroupsReq2.json
new file mode 100644
index 00000000..0993ddfa
--- /dev/null
+++ b/main/src/test/resources/e2e/deployGroupsReq2.json
@@ -0,0 +1,28 @@
+{
+    "groups": [
+        {
+            "name": "deployGroups",
+            "deploymentSubgroups": [
+                {
+                    "pdpType": "pdpTypeA",
+                    "action": "PATCH",
+                    "policies": [
+                        {
+                            "name": "onap.restart.tcaB",
+                            "version": "1.0.0"
+                        },
+                        {
+                            "name": "onap.restart.tcaC",
+                            "version": "1.0.0"
+                        }
+                    ]
+                },
+                {
+                    "pdpType": "pdpTypeB",
+                    "action": "PATCH",
+                    "policies": []
+                }
+            ]
+        }
+    ]
+}
diff --git a/main/src/test/resources/e2e/deployPolicies.json b/main/src/test/resources/e2e/deployPolicies.json
index 4cafe77b..90363ee7 100644
--- a/main/src/test/resources/e2e/deployPolicies.json
+++ b/main/src/test/resources/e2e/deployPolicies.json
@@ -1,7 +1,7 @@
 {
     "groups": [
         {
-            "name": "deployPolicies",
+            "name": "deployGroups",
             "pdpGroupState": "ACTIVE",
             "pdpSubgroups": [
                 {
diff --git a/main/src/test/resources/simpleDeploy/createGroupNewPolicy2.json b/main/src/test/resources/simpleDeploy/createGroupNewPolicy2.json
new file mode 100644
index 00000000..84ea2286
--- /dev/null
+++ b/main/src/test/resources/simpleDeploy/createGroupNewPolicy2.json
@@ -0,0 +1,10 @@
+{
+    "policies":  [
+        {
+            "name": "policyC",
+            "version": "1.2.3",
+            "type": "typeA",
+            "type_version": "100.2.3"
+        }
+    ]
+}
diff --git a/main/src/test/resources/simpleDeploy/daoPolicyList2.json b/main/src/test/resources/simpleDeploy/daoPolicyList2.json
new file mode 100644
index 00000000..d4d1446b
--- /dev/null
+++ b/main/src/test/resources/simpleDeploy/daoPolicyList2.json
@@ -0,0 +1,22 @@
+{
+    "policies":  [
+        {
+            "name": "policyA",
+            "version": "1.2.3",
+            "type": "typeA",
+            "type_version": "100.2.3"
+        },
+        {
+            "name": "policyB",
+            "version": "1.2.3",
+            "type": "typeA",
+            "type_version": "100.2.3"
+        },
+        {
+            "name": "policyC",
+            "version": "1.2.3",
+            "type": "typeA",
+            "type_version": "100.2.3"
+        }
+    ]
+}
diff --git a/main/src/test/resources/simpleDeploy/deployGroups.json b/main/src/test/resources/simpleDeploy/deployGroups.json
new file mode 100644
index 00000000..59c4eb87
--- /dev/null
+++ b/main/src/test/resources/simpleDeploy/deployGroups.json
@@ -0,0 +1,39 @@
+{
+    "groups": [
+        {
+            "name": "groupA",
+            "version": "200.2.3",
+            "description": "my description",
+            "pdpGroupState": "ACTIVE",
+            "properties": {
+                "hello": "world"
+            },
+            "pdpSubgroups": [
+                {
+                    "pdpType": "pdpTypeA",
+                    "desiredInstanceCount": 1,
+                    "properties": {
+                        "abc": "def"
+                    },
+                    "supportedPolicyTypes": [
+                        {
+                            "name": "typeA",
+                            "version": "100.2.3"
+                        }
+                    ],
+                    "pdpInstances": [
+                        {
+                            "instanceId": "pdpA"
+                        }
+                    ],
+                    "policies": [
+                        {
+                            "name": "policyA",
+                            "version": "1.2.3"
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}