Add version to example yaml files

Determined that some of the yaml files were not suitable for use
in the CSITs, because they were missing the "version" property.
Added it where needed.  Also added type_version where it was missing,
as well.

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

9 files changed, 19 insertions, 10 deletions

diff --git a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.output.tosca.yaml b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.output.tosca.yaml
index eae1cd4dc..4928bbe80 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.output.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.output.tosca.yaml
@@ -4,6 +4,7 @@ topology_template:
      -
        onap.restart.tca:
            type: onap.policies.monitoring.cdap.tca.hi.lo.app
+           type_version: 1.0.0
            version: 1.0.0
            metadata:
              policy-id: onap.restart.tca
@@ -11,15 +12,15 @@ topology_template:
            properties:
              tca_policy:
                 domain: measurementsForVfScaling
-                metricsPerEventName: 
-                  - 
+                metricsPerEventName:
+                  -
                     eventName: Measurement_vGMUX
                     controlLoopSchemaType: VNF
                     policyScope: DCAE
                     policyName: "DCAE.Config_tca-hi-lo"
                     policyVersion: "v0.0.1"
-                    thresholds: 
-                      - 
+                    thresholds:
+                      -
                         closedLoopControlName: "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e"
                         version: "1.0.2"
                         fieldPath: "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
@@ -27,7 +28,7 @@ topology_template:
                         direction: EQUAL
                         severity: MAJOR
                         closedLoopEventStatus: ABATED
-                      - 
+                      -
                         closedLoopControlName: "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e"
                         version: "1.0.2"
                         fieldPath: "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
diff --git a/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.yaml b/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.yaml
index 3381c4b10..1d8927d25 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.yaml
@@ -2,10 +2,11 @@ tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
    policies:
      -
-       operational.restart: 
+       operational.restart:
          type: onap.policies.controlloop.Operational
+         type_version: 1.0.0
          version: 1.0.0
-         metadata: 
+         metadata:
            policy-id: operational.restart
            policy-version: 1
          properties:
@@ -15,7 +16,7 @@ topology_template:
              trigger_policy: unique-policy-id-1-restart
              timeout: 3600
              abatement: true
- 
+
            policies:
              - id: unique-policy-id-1-restart
                name: Restart the VM
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml
index 963e193d3..b49571c26 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml
@@ -4,6 +4,7 @@ topology_template:
       -
          onap.scaleout.tca:
             type: onap.policies.monitoring.cdap.tca.hi.lo.app
+            type_version: 1.0.0
             version: 1.0.0
             metadata:
                policy-id: onap.scaleout.tca
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.yaml
index c7bafc66f..abe6b2193 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.yaml
@@ -4,6 +4,7 @@ topology_template:
     -   operational.scaleout:
             type: onap.policies.controlloop.operational.common.Drools
             type_version: 1.0.0
+            version: 1.0.0
             metadata:
                 policy-id: operational.scaleout
             properties:
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.yaml
index 8bd8de782..1fe2132df 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.yaml
@@ -4,6 +4,7 @@ topology_template:
       -   operational.scaleout:
              type: onap.policies.controlloop.operational.common.Drools
              type_version: 1.0.0
+             version: 1.0.0
              metadata:
                 policy-id: operational.scaleout
              properties:
diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml
index 750a84ca0..62a470596 100644
--- a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml
@@ -4,6 +4,7 @@ topology_template:
     -
       onap.vfirewall.tca:
         type: onap.policy.monitoring.cdap.tca.hi.lo.app
+        type_version: 1.0.0
         version: 1.0.0
         metadata:
            policy-id: onap.vfirewall.tca
diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.yaml b/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.yaml
index d2bf8c42f..5ad7ef613 100644
--- a/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.yaml
@@ -4,6 +4,7 @@ topology_template:
     -   operational.modifyconfig:
             type: onap.policies.controlloop.operational.common.Drools
             type_version: 1.0.0
+            version: 1.0.0
             metadata:
                 policy-id: operational.modifyconfig
             properties:
diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.operational.output.tosca.yaml b/models-examples/src/main/resources/policies/vFirewall.policy.operational.output.tosca.yaml
index 923bc7d75..22aced815 100644
--- a/models-examples/src/main/resources/policies/vFirewall.policy.operational.output.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.operational.output.tosca.yaml
@@ -4,8 +4,9 @@ topology_template:
      -
       operational.modifyconfig:
          type: onap.policies.controlloop.Operational
+         type_version: 1.0.0
          version: 1.0.0
-         metadata: 
+         metadata:
            policy-id: operational.modifyconfig
            policy-version: 1
          properties:
@@ -15,7 +16,7 @@ topology_template:
              trigger_policy: unique-policy-id-1-modifyConfig
              timeout: 1200
              abatement: false
- 
+
            policies:
               - id: unique-policy-id-1-modifyConfig
                 name: modify packet gen config
diff --git a/models-examples/src/main/resources/policies/vFirewallCDS.policy.operational.input.tosca.yaml b/models-examples/src/main/resources/policies/vFirewallCDS.policy.operational.input.tosca.yaml
index 7784b1c1e..91d73350b 100644
--- a/models-examples/src/main/resources/policies/vFirewallCDS.policy.operational.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vFirewallCDS.policy.operational.input.tosca.yaml
@@ -4,6 +4,7 @@ topology_template:
     -   operational.modifyconfig.cds:
             type: onap.policies.controlloop.operational.common.Drools
             type_version: 1.0.0
+            version: 1.0.0
             metadata:
                 policy-id: operational.modifyconfig.cds
             properties: