Preload legacy operational policy type and guard policy types

Includes:
a) Add legacy operational policy type and guard policy types into
preloading list.
b) Fix corresponding junit test failure.

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

4 files changed, 89 insertions, 0 deletions

diff --git a/main/src/test/resources/policytypes/onap.policies.controlloop.Operational.json b/main/src/test/resources/policytypes/onap.policies.controlloop.Operational.json
new file mode 100644
index 00000000..2d36a258
--- /dev/null
+++ b/main/src/test/resources/policytypes/onap.policies.controlloop.Operational.json
@@ -0,0 +1,12 @@
+{
+   "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+   "policy_types": [
+      {
+         "onap.policies.controlloop.Operational": {
+            "derived_from": "tosca.policies.Root",
+            "version": "1.0.0",
+            "description": "Operational Policy for Control Loops"
+         }
+      }
+   ]
+}
\ No newline at end of file
diff --git a/main/src/test/resources/policytypes/onap.policies.controlloop.guard.FrequencyLimiter.json b/main/src/test/resources/policytypes/onap.policies.controlloop.guard.FrequencyLimiter.json
new file mode 100644
index 00000000..598bd3c7
--- /dev/null
+++ b/main/src/test/resources/policytypes/onap.policies.controlloop.guard.FrequencyLimiter.json
@@ -0,0 +1,77 @@
+{
+   "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+   "policy_types": [
+      {
+         "onap.policies.controlloop.Guard": {
+            "derived_from": "tosca.policies.Root",
+            "version": "1.0.0",
+            "description": "Guard Policies for Control Loop Operational Policies"
+         }
+      },
+      {
+         "onap.policies.controlloop.guard.FrequencyLimiter": {
+            "derived_from": "onap.policies.controlloop.Guard",
+            "version": "1.0.0",
+            "description": "Supports limiting the frequency of actions being taken by a Actor.",
+            "properties": {
+               "frequency_policy": {
+                  "type": "map",
+                  "description": null,
+                  "entry_schema": {
+                     "type": "onap.datatypes.guard.FrequencyLimiter"
+                  }
+               }
+            }
+         }
+      }
+   ],
+   "data_types": [
+      {
+         "onap.datatypes.guard.FrequencyLimiter": {
+            "derived_from": "tosca.datatypes.Root",
+            "properties": {
+               "actor": {
+                  "type": "string",
+                  "description": "Specifies the Actor",
+                  "required": true
+               },
+               "recipe": {
+                  "type": "string",
+                  "description": "Specified the Recipe",
+                  "required": true
+               },
+               "time_window": {
+                  "type": "scalar-unit.time",
+                  "description": "The time window to count the actions against.",
+                  "required": true
+               },
+               "limit": {
+                  "type": "integer",
+                  "description": "The limit",
+                  "required": true,
+                  "constraints": [
+                     {
+                        "greater_than": 0
+                     }
+                  ]
+               },
+               "time_range": {
+                  "type": "tosca.datatypes.TimeInterval",
+                  "description": "An optional range of time during the day the frequency is valid for.",
+                  "required": false
+               },
+               "controlLoopName": {
+                  "type": "string",
+                  "description": "An optional specific control loop to apply this guard to.",
+                  "required": false
+               },
+               "target": {
+                  "type": "string",
+                  "description": "An optional specific VNF to apply this guard to.",
+                  "required": false
+               }
+            }
+         }
+      }
+   ]
+}
\ No newline at end of file
diff --git a/main/src/test/resources/policytypes/onap.policy.monitoring.cdap.tca.hi.lo.app.json b/main/src/test/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.json
index 1d1a4d64..1d1a4d64 100644
--- a/main/src/test/resources/policytypes/onap.policy.monitoring.cdap.tca.hi.lo.app.json
+++ b/main/src/test/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.json
diff --git a/main/src/test/resources/policytypes/onap.policy.monitoring.cdap.tca.hi.lo.app.yaml b/main/src/test/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml
index 2985603a..2985603a 100644
--- a/main/src/test/resources/policytypes/onap.policy.monitoring.cdap.tca.hi.lo.app.yaml
+++ b/main/src/test/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml