Repair policy types in TOSCA service template

Changed policy types from a list of maps to a map.
Changed data types from a list of maps to a map.
Made all knock on changes to adapters and tests.

Updated Issue ID.

Added
onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml
policy type that is required to be preloaded in policy-api.

Issue-ID: POLICY-2047
Change-Id: Ic8e809eab248fd7242f0e565fa2e3da75bcfbdeb
Signed-off-by: liamfallon <liam.fallon@est.tech>

2 files changed, 223 insertions, 226 deletions

diff --git a/models-provider/src/main/resources/dummyimpl/DummyToscaPolicyTypeGetResponse.json b/models-provider/src/main/resources/dummyimpl/DummyToscaPolicyTypeGetResponse.json
index c28c2d2f2..477d4477a 100644
--- a/models-provider/src/main/resources/dummyimpl/DummyToscaPolicyTypeGetResponse.json
+++ b/models-provider/src/main/resources/dummyimpl/DummyToscaPolicyTypeGetResponse.json
@@ -1,223 +1,213 @@
 {
-   "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
-   "policy_types": [
-      {
-         "onap.policies.Monitoring": {
-            "derived_from": "tosca.policies.Root",
-            "description": "a base policy type for all policies that governs monitoring provisioning"
-         }
-      },
-      {
-         "onap.policy.monitoring.cdap.tca.hi.lo.app": {
-            "derived_from": "onap.policies.Monitoring",
-            "version": "1.0.0",
-            "properties": {
-               "tca_policy": {
-                  "type": "map",
-                  "description": "TCA Policy JSON",
-                  "entry_schema": {
-                     "type": "onap.datatypes.monitoring.tca_policy"
-                  }
-               }
-            }
-         }
+  "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+  "policy_types": {
+    "onap.policies.Monitoring": {
+      "derived_from": "tosca.policies.Root",
+      "description": "a base policy type for all policies that governs monitoring provisioning"
+    },
+    "onap.policy.monitoring.cdap.tca.hi.lo.app": {
+      "derived_from": "onap.policies.Monitoring",
+      "version": "1.0.0",
+      "properties": {
+        "tca_policy": {
+          "type": "map",
+          "description": "TCA Policy JSON",
+          "entry_schema": {
+            "type": "onap.datatypes.monitoring.tca_policy"
+          }
+        }
       }
-   ],
-   "data_types": [
-      {
-         "onap.datatypes.monitoring.metricsPerEventName": {
-            "derived_from": "tosca.datatypes.Root",
-            "properties": {
-               "controlLoopSchemaType": {
-                  "type": "string",
-                  "required": true,
-                  "description": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
-                  "constraints": [
-                     {
-                        "valid_values": [
-                           "VM",
-                           "VNF"
-                        ]
-                     }
-                  ]
-               },
-               "eventName": {
-                  "type": "string",
-                  "required": true,
-                  "description": "Event name to which thresholds need to be applied"
-               },
-               "policyName": {
-                  "type": "string",
-                  "required": true,
-                  "description": "TCA Policy Scope Name"
-               },
-               "policyScope": {
-                  "type": "string",
-                  "required": true,
-                  "description": "TCA Policy Scope"
-               },
-               "policyVersion": {
-                  "type": "string",
-                  "required": true,
-                  "description": "TCA Policy Scope Version"
-               },
-               "thresholds": {
-                  "type": "list",
-                  "required": true,
-                  "description": "Thresholds associated with eventName",
-                  "entry_schema": {
-                     "type": "onap.datatypes.monitoring.thresholds"
-                  }
-               }
+    }
+  },
+  "data_types": {
+    "onap.datatypes.monitoring.metricsPerEventName": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "controlLoopSchemaType": {
+          "type": "string",
+          "required": true,
+          "description": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
+          "constraints": [
+            {
+              "valid_values": [
+                "VM",
+                "VNF"
+              ]
             }
-         }
+          ]
+        },
+        "eventName": {
+          "type": "string",
+          "required": true,
+          "description": "Event name to which thresholds need to be applied"
+        },
+        "policyName": {
+          "type": "string",
+          "required": true,
+          "description": "TCA Policy Scope Name"
+        },
+        "policyScope": {
+          "type": "string",
+          "required": true,
+          "description": "TCA Policy Scope"
+        },
+        "policyVersion": {
+          "type": "string",
+          "required": true,
+          "description": "TCA Policy Scope Version"
+        },
+        "thresholds": {
+          "type": "list",
+          "required": true,
+          "description": "Thresholds associated with eventName",
+          "entry_schema": {
+            "type": "onap.datatypes.monitoring.thresholds"
+          }
+        }
+      }
+    }
+  },
+  "onap.datatypes.monitoring.tca_policy": {
+    "derived_from": "tosca.datatypes.Root",
+    "properties": {
+      "domain": {
+        "type": "string",
+        "required": true,
+        "description": "Domain name to which TCA needs to be applied",
+        "default": "measurementsForVfScaling",
+        "constraints": [
+          {
+            "equal": "measurementsForVfScaling"
+          }
+        ]
       },
-      {
-         "onap.datatypes.monitoring.tca_policy": {
-            "derived_from": "tosca.datatypes.Root",
-            "properties": {
-               "domain": {
-                  "type": "string",
-                  "required": true,
-                  "description": "Domain name to which TCA needs to be applied",
-                  "default": "measurementsForVfScaling",
-                  "constraints": [
-                     {
-                        "equal": "measurementsForVfScaling"
-                     }
-                  ]
-               },
-               "metricsPerEventName": {
-                  "type": "list",
-                  "required": true,
-                  "description": "Contains eventName and threshold details that need to be applied to given eventName",
-                  "entry_schema": {
-                     "type": "onap.datatypes.monitoring.metricsPerEventName"
-                  }
-               }
-            }
-         }
+      "metricsPerEventName": {
+        "type": "list",
+        "required": true,
+        "description": "Contains eventName and threshold details that need to be applied to given eventName",
+        "entry_schema": {
+          "type": "onap.datatypes.monitoring.metricsPerEventName"
+        }
+      }
+    }
+  },
+  "onap.datatypes.monitoring.thresholds": {
+    "derived_from": "tosca.datatypes.Root",
+    "properties": {
+      "closedLoopControlName": {
+        "type": "string",
+        "required": true,
+        "description": "Closed Loop Control Name associated with the threshold"
       },
-      {
-         "onap.datatypes.monitoring.thresholds": {
-            "derived_from": "tosca.datatypes.Root",
-            "properties": {
-               "closedLoopControlName": {
-                  "type": "string",
-                  "required": true,
-                  "description": "Closed Loop Control Name associated with the threshold"
-               },
-               "closedLoopEventStatus": {
-                  "type": "string",
-                  "required": true,
-                  "description": "Closed Loop Event Status of the threshold",
-                  "constraints": [
-                     {
-                        "valid_values": [
-                           "ONSET",
-                           "ABATED"
-                        ]
-                     }
-                  ]
-               },
-               "direction": {
-                  "type": "string",
-                  "required": true,
-                  "description": "Direction of the threshold",
-                  "constraints": [
-                     {
-                        "valid_values": [
-                           "LESS",
-                           "LESS_OR_EQUAL",
-                           "GREATER",
-                           "GREATER_OR_EQUAL",
-                           "EQUAL"
-                        ]
-                     }
-                  ]
-               },
-               "fieldPath": {
-                  "type": "string",
-                  "required": true,
-                  "description": "Json field Path as per CEF message which needs to be analyzed for TCA",
-                  "constraints": [
-                     {
-                        "valid_values": [
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
-                           "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
-                           "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
-                           "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
-                           "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
-                           "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
-                           "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
-                           "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
-                           "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
-                           "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
-                           "$.event.measurementsForVfScalingFields.meanRequestLatency",
-                           "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
-                           "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
-                           "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
-                           "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
-                           "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
-                           "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
-                        ]
-                     }
-                  ]
-               },
-               "severity": {
-                  "type": "string",
-                  "required": true,
-                  "description": "Threshold Event Severity",
-                  "constraints": [
-                     {
-                        "valid_values": [
-                           "CRITICAL",
-                           "MAJOR",
-                           "MINOR",
-                           "WARNING",
-                           "NORMAL"
-                        ]
-                     }
-                  ]
-               },
-               "thresholdValue": {
-                  "type": "integer",
-                  "required": true,
-                  "description": "Threshold value for the field Path inside CEF message"
-               },
-               "version": {
-                  "type": "string",
-                  "required": true,
-                  "description": "Version number associated with the threshold"
-               }
-            }
-         }
+      "closedLoopEventStatus": {
+        "type": "string",
+        "required": true,
+        "description": "Closed Loop Event Status of the threshold",
+        "constraints": [
+          {
+            "valid_values": [
+              "ONSET",
+              "ABATED"
+            ]
+          }
+        ]
+      },
+      "direction": {
+        "type": "string",
+        "required": true,
+        "description": "Direction of the threshold",
+        "constraints": [
+          {
+            "valid_values": [
+              "LESS",
+              "LESS_OR_EQUAL",
+              "GREATER",
+              "GREATER_OR_EQUAL",
+              "EQUAL"
+            ]
+          }
+        ]
+      },
+      "fieldPath": {
+        "type": "string",
+        "required": true,
+        "description": "Json field Path as per CEF message which needs to be analyzed for TCA",
+        "constraints": [
+          {
+            "valid_values": [
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
+              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
+              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
+              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
+              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
+              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
+              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
+              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
+              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
+              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
+              "$.event.measurementsForVfScalingFields.meanRequestLatency",
+              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
+              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
+              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
+              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
+              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
+              "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
+            ]
+          }
+        ]
+      },
+      "severity": {
+        "type": "string",
+        "required": true,
+        "description": "Threshold Event Severity",
+        "constraints": [
+          {
+            "valid_values": [
+              "CRITICAL",
+              "MAJOR",
+              "MINOR",
+              "WARNING",
+              "NORMAL"
+            ]
+          }
+        ]
+      },
+      "thresholdValue": {
+        "type": "integer",
+        "required": true,
+        "description": "Threshold value for the field Path inside CEF message"
+      },
+      "version": {
+        "type": "string",
+        "required": true,
+        "description": "Version number associated with the threshold"
       }
-   ]
-}
\ No newline at end of file
+    }
+  }
+}
diff --git a/models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyTypePersistenceTest.java b/models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyTypePersistenceTest.java
index 7b7690009..2ccf215c9 100644
--- a/models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyTypePersistenceTest.java
+++ b/models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyTypePersistenceTest.java
@@ -22,6 +22,7 @@ package org.onap.policy.models.provider.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import com.google.gson.GsonBuilder;
@@ -62,16 +63,22 @@ public class PolicyTypePersistenceTest {
 
     // @formatter:off
     private String[] policyTypeResourceNames = {
-        "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml",
-        "policytypes/onap.policies.optimization.AffinityPolicy.yaml",
+        "policytypes/onap.policies.controlloop.Operational.yaml",
         "policytypes/onap.policies.optimization.DistancePolicy.yaml",
-        "policytypes/onap.policies.optimization.HpaPolicy.yaml",
-        "policytypes/onap.policies.optimization.OptimizationPolicy.yaml",
+        "policytypes/onap.policies.optimization.VnfPolicy.yaml",
         "policytypes/onap.policies.optimization.PciPolicy.yaml",
-        "policytypes/onap.policies.optimization.QueryPolicy.yaml",
-        "policytypes/onap.policies.optimization.SubscriberPolicy.yaml",
+        "policytypes/onap.policies.optimization.OptimizationPolicy.yaml",
+        "policytypes/onap.policies.controlloop.guard.Blacklist.yaml",
+        "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml",
+        "policytypes/onap.policies.optimization.HpaPolicy.yaml",
         "policytypes/onap.policies.optimization.Vim_fit.yaml",
-        "policytypes/onap.policies.optimization.VnfPolicy.yaml",
+        "policytypes/onap.policies.optimization.SubscriberPolicy.yaml",
+        "policytypes/onap.policies.optimization.AffinityPolicy.yaml",
+        "policytypes/onap.policies.optimization.QueryPolicy.yaml",
+        "policytypes/onap.policies.controlloop.guard.MinMax.yaml",
+        "policytypes/onap.policies.controlloop.guard.FrequencyLimiter.yaml",
+        "policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml",
+        "policytypes/onap.policies.Optimization.yaml",
         "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml"
     };
     // @formatter:on
@@ -141,7 +148,7 @@ public class PolicyTypePersistenceTest {
         ToscaServiceTemplate serviceTemplate = standardCoder.decode(policyTypeString, ToscaServiceTemplate.class);
 
         assertNotNull(serviceTemplate);
-        ToscaPolicyType inPolicyType = serviceTemplate.getPolicyTypes().get(0).values().iterator().next();
+        ToscaPolicyType inPolicyType = serviceTemplate.getPolicyTypes().values().iterator().next();
 
         databaseProvider.createPolicyTypes(serviceTemplate);
         databaseProvider.updatePolicyTypes(serviceTemplate);
@@ -162,7 +169,7 @@ public class PolicyTypePersistenceTest {
         assertEquals(inPolicyType.getName(), policyTypeList.get(0).getName());
 
         policyTypeList = databaseProvider.getFilteredPolicyTypeList(ToscaPolicyTypeFilter.builder().build());
-        assertEquals(2, policyTypeList.size());
+        assertTrue(policyTypeList.size() <= 3);
         assertEquals(inPolicyType.getName(), policyTypeList.get(0).getName());
 
         for (ToscaPolicyType policyType: databaseProvider.getPolicyTypeList(null, null)) {