Knock on of changing policy types to map

This review adapts policy-api for the change in the structure
of the toasca service template from a list of maps to a plain map.

DUplication of policy types and policies removed and policy-models
examples used instead.

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

16 files changed, 0 insertions, 962 deletions

diff --git a/main/src/test/resources/policytypes/onap.policies.Optimization.yaml b/main/src/test/resources/policytypes/onap.policies.Optimization.yaml
deleted file mode 100644
index 6e99f6a8..00000000
--- a/main/src/test/resources/policytypes/onap.policies.Optimization.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.Optimization:
-        derived_from: tosca.policies.Root
-        version: 1.0.0
-        description: The base policy type for all policies that govern optimization
-        properties:
-            scope:
-                description: Scope for the policy - could be for a specific release.
-                type: list
-                matchable: true
-                required: true
-            services:
-                description: One or more services that the policy applies to.
-                type: list
-                matchable: true
-                required: true
-                entry_schema:
-                    type: string
-            resources:
-                description: One or more VNF resources that the policy applies to.
-                type: list
-                matchable: true
-                required: true
-                entry_schema:
-                    type: string
-            geography:
-                description: One or more geographic regions
-                type: list
-                matchable: true
-                required: true
-                entry_schema:
-                    type: string
-                    constraints:
-                        - valid_values: ["US", "International"]
-            identity:
-                description: Used internally for identification
-                type: string
-                required: true
diff --git a/main/src/test/resources/policytypes/onap.policies.controlloop.Operational.json b/main/src/test/resources/policytypes/onap.policies.controlloop.Operational.json
deleted file mode 100644
index 2d36a258..00000000
--- a/main/src/test/resources/policytypes/onap.policies.controlloop.Operational.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-   "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
deleted file mode 100644
index 598bd3c7..00000000
--- a/main/src/test/resources/policytypes/onap.policies.controlloop.guard.FrequencyLimiter.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-   "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.policies.monitoring.cdap.tca.hi.lo.app.json b/main/src/test/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.json
deleted file mode 100644
index 1d1a4d64..00000000
--- a/main/src/test/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-    "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.policies.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"
-                        }
-                    }
-                }
-            }
-        },
-        {
-            "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"
-                        }
-                    }
-                }
-            }
-        },
-        {
-            "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"
-                    }
-                }
-            }
-        }
-    ]
-}
\ No newline at end of file
diff --git a/main/src/test/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml b/main/src/test/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml
deleted file mode 100644
index 2985603a..00000000
--- a/main/src/test/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml
+++ /dev/null
@@ -1,163 +0,0 @@
-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.policies.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
-  -
-    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
-  -
-    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
\ No newline at end of file
diff --git a/main/src/test/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.json b/main/src/test/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.json
deleted file mode 100644
index 26f4c021..00000000
--- a/main/src/test/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "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 govern monitoring provision",
-        "version": "1.0.0"
-      }
-    },
-    {
-      "onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server": {
-        "derived_from": "policy.nodes.Root",
-        "version": "1.0.0",
-        "properties": {
-          "buscontroller_feed_publishing_endpoint": {
-            "type": "string",
-            "description": "DMAAP Bus Controller feed endpoint"
-          },
-          "datafile.policy": {
-            "type": "string",
-            "description": "datafile Policy JSON as string"
-          }
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/main/src/test/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml b/main/src/test/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml
deleted file mode 100644
index 63796fa3..00000000
--- a/main/src/test/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-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 govern monitoring provision
-        version: 1.0.0
-  -
-    onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server:
-        derived_from: policy.nodes.Root
-        version: 1.0.0
-        properties:
-            buscontroller_feed_publishing_endpoint:
-                type: string
-                description: DMAAP Bus Controller feed endpoint
-            datafile.policy:
-                type: string
-                description: datafile Policy JSON as string
\ No newline at end of file
diff --git a/main/src/test/resources/policytypes/onap.policies.optimization.AffinityPolicy.yaml b/main/src/test/resources/policytypes/onap.policies.optimization.AffinityPolicy.yaml
deleted file mode 100644
index f0d47ed6..00000000
--- a/main/src/test/resources/policytypes/onap.policies.optimization.AffinityPolicy.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.optimization.AffinityPolicy:
-        derived_from: onap.policies.Optimization
-        properties:
-            applicableResources:
-                type: list
-                required: true
-                entry_schema:
-                    type: string
-                    constraints:
-                    -   valid_values:
-                        - any
-                        - all
-            affinityProperties:
-                type: policy.data.affinityProperties_properties
-                required: true
-data_types:
-    policy.data.affinityProperties_properties:
-        derived_from: tosca.nodes.Root
-        properties:
-            qualifier:
-                type: string
-                constraints:
-                -   valid_values:
-                    - same
-                    - different
-            category:
-                type: string
-                required: true
diff --git a/main/src/test/resources/policytypes/onap.policies.optimization.DistancePolicy.yaml b/main/src/test/resources/policytypes/onap.policies.optimization.DistancePolicy.yaml
deleted file mode 100644
index 9bcdd7a6..00000000
--- a/main/src/test/resources/policytypes/onap.policies.optimization.DistancePolicy.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.optimization.DistancePolicy:
-        derived_from: onap.policies.Optimization
-        properties:
-            applicableResources:
-                type: list
-                required: true
-                entry_schema:
-                    type: string
-                    constraints:
-                    -   valid_values:
-                        - any
-                        - all
-            distanceProperties:
-                type: policy.data.distanceProperties_properties
-                required: true
-data_types:
-    policy.data.distanceProperties_properties:
-        derived_from: tosca.nodes.Root
-        properties:
-            locationInfo:
-                type: string
-                required: true
-            distance:
-                type: policy.data.distance_properties
-                required: true
-                entry_schema:
-                    type: policy.data.distance_properties
-    policy.data.distance_properties:
-        derived_from: tosca.nodes.Root
-        properties:
-            value:
-                type: string
-                required: true
-            operator:
-                type: list
-                required: true
-                entry_schema:
-                    type: string
-                    constraints:
-                    -   valid_values:
-                        - <
-                        - <=
-                        - >
-                        - >=
-                        - =
-            unit:
-                type: list
-                required: true
-                entry_schema:
-                    type: string
-                    constraints:
-                    -   valid_values:
-                        - km
diff --git a/main/src/test/resources/policytypes/onap.policies.optimization.HpaPolicy.yaml b/main/src/test/resources/policytypes/onap.policies.optimization.HpaPolicy.yaml
deleted file mode 100644
index 21a2e722..00000000
--- a/main/src/test/resources/policytypes/onap.policies.optimization.HpaPolicy.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.optimization.HpaPolicy:
-        derived_from: onap.policies.Optimization
-        properties:
-            flavorFeatures:
-                type: list
-                required: true
-                entry_schema:
-                    type: policy.data.flavorFeatures_properties
-data_types:
-    policy.data.flavorFeatures_properties:
-        derived_from: tosca.nodes.Root
-        properties:
-            id:
-                type: string
-                required: true
-            type:
-                type: string
-                required: true
-            directives:
-                type: list
-                required: true
-                entry_schema:
-                    type: policy.data.directives_properties
-            flavorProperties:
-                type: list
-                required: true
-                entry_schema:
-                    type: policy.data.flavorProperties_properties
-    policy.data.directives_properties:
-        derived_from: tosca.nodes.Root
-        properties:
-            type:
-                type: string
-            attributes:
-                type: list
-                entry_schema:
-                    type: policy.data.directives_attributes_properties
-    policy.data.directives_attributes_properties:
-        derived_from: tosca.nodes.Root
-        properties:
-            attribute_name:
-                type: string
-            attribute_value:
-                type: string
-    policy.data.flavorProperties_properties:
-        derived_from: tosca.nodes.Root
-        properties:
-            hpa-feature:
-                type: string
-                required: true
-            mandatory:
-                type: string
-                required: true
-            score:
-                type: string
-                required: false
-            architecture:
-                type: string
-                required: true
-            hpa-version:
-                type: string
-                required: true
-            directives:
-                type: list
-                required: true
-                entry_schema:
-                    type: policy.data.directives_properties
-            hpa-feature-attributes:
-                type: list
-                required: true
-                entry_schema:
-                    type: policy.data.hpa-feature-attributes_properties
-    policy.data.hpa-feature-attributes_properties:
-        derived_from: tosca.nodes.Root
-        properties:
-            hpa-attribute-key:
-                type: string
-                required: true
-            hpa-attribute-value:
-                type: string
-                required: true
-            operator:
-                type: list
-                required: true
-                entry_schema:
-                    type: string
-                    constraints:
-                    -   valid_values:
-                        - <
-                        - <=
-                        - >
-                        - >=
-                        - =
-                        - !=
-                        - any
-                        - all
-                        - subset
-            unit:
-                type: string
-                required: false
diff --git a/main/src/test/resources/policytypes/onap.policies.optimization.OptimizationPolicy.yaml b/main/src/test/resources/policytypes/onap.policies.optimization.OptimizationPolicy.yaml
deleted file mode 100644
index 76bc550d..00000000
--- a/main/src/test/resources/policytypes/onap.policies.optimization.OptimizationPolicy.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.optimization.OptimizationPolicy:
-        derived_from: onap.policies.Optimization
-        properties:
-            objective:
-                type: list
-                required: true
-                entry_schema:
-                    type: string
-                    constraints:
-                    -   valid_values:
-                        - minimize
-                        - maximize
-            objectiveParameter:
-                type: policy.data.objectiveParameter_properties
-                required: true
-data_types:
-    policy.data.objectiveParameter_properties:
-        derived_from: tosca.nodes.Root
-        properties:
-            parameterAttributes:
-                type: list
-                required: true
-                entry_schema:
-                    type: policy.data.parameterAttributes_properties
-            operator:
-                type: list
-                required: true
-                entry_schema:
-                    type: string
-                    constraints:
-                    -   valid_values:
-                        - '*'
-                        - +
-                        - '-'
-                        - /
-                        - '%'
-    policy.data.parameterAttributes_properties:
-        derived_from: tosca.nodes.Root
-        properties:
-            resources:
-                type: string
-                required: true
-            customerLocationInfo:
-                type: string
-                required: true
-            parameter:
-                type: string
-                required: true
-            weight:
-                type: string
-                required: true
-            operator:
-                type: list
-                required: true
-                entry_schema:
-                    type: string
-                    constraints:
-                    -   valid_values:
-                        - '*'
-                        - +
-                        - '-'
-                        - /
-                        - '%'
diff --git a/main/src/test/resources/policytypes/onap.policies.optimization.PciPolicy.yaml b/main/src/test/resources/policytypes/onap.policies.optimization.PciPolicy.yaml
deleted file mode 100644
index 81187964..00000000
--- a/main/src/test/resources/policytypes/onap.policies.optimization.PciPolicy.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.optimization.PciPolicy:
-        derived_from: onap.policies.Optimization
-        properties:
-            pciProperties:
-                type: list
-                required: false
-                entry_schema:
-                  type: policy.data.pciProperties_properties
-data_types:
-    policy.data.pciProperties_properties:
-        derived_from: tosca.nodes.Root
-        properties:
-            algoCategory:
-                type: string
-                required: false
-            pciOptmizationAlgoName:
-                type: string
-                required: false
-            pciOptimizationNwConstraint:
-                type: string
-                required: false
-            pciOptimizationPriority:
-                type: string
-                required: false
-            pciOptimizationTimeConstraint:
-                type: string
-                required: false
diff --git a/main/src/test/resources/policytypes/onap.policies.optimization.QueryPolicy.yaml b/main/src/test/resources/policytypes/onap.policies.optimization.QueryPolicy.yaml
deleted file mode 100644
index 7f85c777..00000000
--- a/main/src/test/resources/policytypes/onap.policies.optimization.QueryPolicy.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.optimization.QueryPolicy:
-        derived_from: onap.policies.Optimization
-        properties:
-            queryProperties:
-                type: list
-                required: true
-                entry_schema:
-                    type: policy.data.queryProperties_properties
-data_types:
-    policy.data.queryProperties_properties:
-        derived_from: tosca.nodes.Root
-        properties:
-            attribute:
-                type: string
-                required: true
-            value:
-                type: string
-                required: true
-            attribute_location:
-                type: string
-                required: true
diff --git a/main/src/test/resources/policytypes/onap.policies.optimization.SubscriberPolicy.yaml b/main/src/test/resources/policytypes/onap.policies.optimization.SubscriberPolicy.yaml
deleted file mode 100644
index 6b24fbc9..00000000
--- a/main/src/test/resources/policytypes/onap.policies.optimization.SubscriberPolicy.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.optimization.SubscriberPolicy:
-        derived_from: onap.policies.Optimization
-        properties:
-            subscriberProperties:
-                type: policy.data.subscriberProperties_properties
-                required: true
-data_types:
-    policy.data.subscriberProperties_properties:
-        derived_from: tosca.nodes.Root
-        properties:
-            subscriberName:
-                type: list
-                required: true
-                entry_schema:
-                    type: string
-            subscriberRole:
-                type: list
-                required: true
-                entry_schema:
-                    type: string
-            provStatus:
-                type: list
-                required: true
-                entry_schema:
-                    type: string
diff --git a/main/src/test/resources/policytypes/onap.policies.optimization.Vim_fit.yaml b/main/src/test/resources/policytypes/onap.policies.optimization.Vim_fit.yaml
deleted file mode 100644
index 2d35741a..00000000
--- a/main/src/test/resources/policytypes/onap.policies.optimization.Vim_fit.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.optimization.Vim_fit:
-        derived_from: onap.policies.Optimization
-        properties:
-            applicableResources:
-                type: list
-                required: true
-                entry_schema:
-                    type: string
-                    constraints:
-                    -   valid_values:
-                        - any
-                        - all
-           capacityProperties:
-                type: policy.data.capacityProperties_properties
-                required: true
-data_types:
-    policy.data.capacityProperties_properties:
-        derived_from: tosca.nodes.Root
-        properties:
-            controller:
-                type: string
-                required: true
-            request:
-                type: string
-                required: true
diff --git a/main/src/test/resources/policytypes/onap.policies.optimization.VnfPolicy.yaml b/main/src/test/resources/policytypes/onap.policies.optimization.VnfPolicy.yaml
deleted file mode 100644
index 3ee62483..00000000
--- a/main/src/test/resources/policytypes/onap.policies.optimization.VnfPolicy.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.optimization.VnfPolicy:
-        derived_from: onap.policies.Optimization
-        properties:
-            applicableResources:
-                type: list
-                required: true
-                entry_schema:
-                    type: string
-                    constraints:
-                    -   valid_values:
-                        - any
-                        - all
-            vnfProperties:
-                type: list
-                required: true
-                entry_schema:
-                    type: policy.data.vnfProperties_properties
-data_types:
-    policy.data.vnfProperties_properties:
-        derived_from: tosca.nodes.Root
-        properties:
-            inventoryProvider:
-                type: string
-                required: true
-            serviceType:
-                type: string
-                required: true
-            inventoryType:
-                type: list
-                required: true
-                entry_schema:
-                    type: string
-                    constraints:
-                    -   valid_values:
-                        - serviceInstanceId
-                        - vnfName
-                        - cloudRegionId
-                        - vimId
-            customerId:
-                type: string
-                required: true
-