Merge "TOSCA Compliant Guard Policies"

35 files changed, 57 insertions, 201 deletions

diff --git a/models-examples/src/main/resources/policies/sdnc.policy.naming.input.tosca.yaml b/models-examples/src/main/resources/policies/sdnc.policy.naming.input.tosca.yaml
index f17e9096b..77c5a0cf0 100644
--- a/models-examples/src/main/resources/policies/sdnc.policy.naming.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/sdnc.policy.naming.input.tosca.yaml
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
     policies:
     -   SDNC_Policy.ONAP_VNF_NAMING_TIMESTAMP:
diff --git a/models-examples/src/main/resources/policies/vCPE.policies.optimization.input.tosca.json b/models-examples/src/main/resources/policies/vCPE.policies.optimization.input.tosca.json
index 929e29efa..406d12e13 100644
--- a/models-examples/src/main/resources/policies/vCPE.policies.optimization.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vCPE.policies.optimization.input.tosca.json
@@ -1,5 +1,5 @@
 {
-    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+    "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
     "topology_template": {
         "policies": [
             {
diff --git a/models-examples/src/main/resources/policies/vCPE.policies.optimization.input.tosca.yaml b/models-examples/src/main/resources/policies/vCPE.policies.optimization.input.tosca.yaml
index f893158b8..d4969eb44 100644
--- a/models-examples/src/main/resources/policies/vCPE.policies.optimization.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vCPE.policies.optimization.input.tosca.yaml
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
   policies:
     -
diff --git a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json
index eb0dec43d..5690a7b20 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json
@@ -1,5 +1,5 @@
 {
-    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+    "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
     "topology_template": {
         "policies": [
             {
diff --git a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml
index 7f01101c3..44533e5fd 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
    policies:
      -
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 a8a1cdac1..eae1cd4dc 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
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
    policies:
      -
diff --git a/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json b/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json
index 11db9cf59..305756064 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json
@@ -1,5 +1,5 @@
 {
-  "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+  "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
   "topology_template": {
     "policies": [
       {
diff --git a/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.yaml b/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.yaml
index 27d020240..b1c51ca8e 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.yaml
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
     policies:
     -   operational.restart:
diff --git a/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.json b/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.json
index aeac3093d..c57103eb5 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.json
+++ b/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.json
@@ -1,5 +1,5 @@
 {
-    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+    "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
     "topology_template": {
         "policies": [
             {
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 2c7981a29..3381c4b10 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
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
    policies:
      -
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.input.json b/models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.input.json
deleted file mode 100644
index db84a4eaa..000000000
--- a/models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.input.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "policy-id" : "guard.frequency.scaleout",
-  "policy-version" : "1",
-  "content" : {
-            "actor": "SO",
-            "recipe": "VF Module Create",
-            "targets": ".*",
-            "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
-            "limit": "1",
-            "timeWindow": "10",
-            "timeUnits": "minute",
-            "guardActiveStart": "00:00:01-05:00",
-            "guardActiveEnd": "23:59:59-05:00"
-   }
-}
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.input.tosca.json b/models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.input.tosca.json
deleted file mode 100644
index 9da85c412..000000000
--- a/models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.input.tosca.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
-    "topology_template": {
-        "policies": [
-            {
-                "guard.frequency.scaleout": {
-                    "type": "onap.policies.controlloop.guard.FrequencyLimiter",
-                    "version": "1.0.0",
-                    "metadata": {
-                        "policy-id" : "guard.frequency.scaleout"
-                    },
-                    "properties": {
-                        "actor": "SO",
-                        "recipe": "VF Module Create",
-                        "targets": ".*",
-                        "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
-                        "limit": "1",
-                        "timeWindow": "10",
-                        "timeUnits": "minute",
-                        "guardActiveStart": "00:00:01-05:00",
-                        "guardActiveEnd": "23:59:59-05:00"
-                    }
-                }
-            }
-        ]
-    }
-}
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.input.tosca.yaml
deleted file mode 100644
index efab1d0df..000000000
--- a/models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.input.tosca.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-topology_template:
-  policies:
-    -
-      guard.frequency.scaleout:
-        type: onap.policies.controlloop.guard.FrequencyLimiter
-        version: 1.0.0
-        metadata:
-          policy-id : guard.frequency.scaleout
-        properties:
-          actor: SO
-          recipe: VF Module Create
-          targets: .*
-          clname: ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3
-          limit: 1
-          timeWindow: 10
-          timeUnits: minute
-          guardActiveStart: 00:00:01-05:00
-          guardActiveEnd: 23:59:59-05:00
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.output.json b/models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.output.json
deleted file mode 100644
index f8b6ac59c..000000000
--- a/models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.output.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "guard.frequency.scaleout": {
-        "type": "onap.policies.controlloop.guard.FrequencyLimiter",
-        "version": "1.0.0",
-        "metadata": {
-            "policy-id": "guard.frequency.scaleout",
-            "policy-version": 1
-        },
-        "properties": {
-           "content": {
-                "actor": "SO",
-                "recipe": "VF Module Create",
-                "targets": ".*",
-                "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
-                "limit": "1",
-                "timeWindow": "10",
-                "timeUnits": "minute",
-                "guardActiveStart": "00:00:01-05:00",
-                "guardActiveEnd": "23:59:59-05:00"
-           }
-        }
-    }
-}
\ No newline at end of file
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.output.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.output.tosca.yaml
deleted file mode 100644
index c50b17829..000000000
--- a/models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.output.tosca.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-topology_template:
-  policies:
-    -
-      guard.frequency.scaleout:
-        type: onap.policies.controlloop.guard.FrequencyLimiter
-        version: 1.0.0
-        metadata:
-          policy-id : guard.frequency.scaleout
-          policy-version: 1
-        properties:
-          actor: SO
-          recipe: VF Module Create
-          targets: .*
-          clname: ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3
-          limit: 1
-          timeWindow: 10
-          timeUnits: minute
-          guardActiveStart: 00:00:01-05:00
-          guardActiveEnd: 23:59:59-05:00
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.guard.frequencylimiter.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.guard.frequencylimiter.input.tosca.yaml
new file mode 100644
index 000000000..964e1811c
--- /dev/null
+++ b/models-examples/src/main/resources/policies/vDNS.policy.guard.frequencylimiter.input.tosca.yaml
@@ -0,0 +1,17 @@
+tosca_definitions_version: tosca_simple_yaml_1_1_0
+topology_template:
+  policies:
+    -
+      guard.frequency.scaleout:
+        type: onap.policies.controlloop.guard.common.FrequencyLimiter
+        type_version: 1.0.0
+        version: 1.0.0
+        metadata:
+          policy-id : guard.frequency.scaleout
+        properties:
+          actor: SO
+          operation: VF Module Create
+          id: ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3
+          timeWindow: 10
+          timeUnits: minute
+          limit: 1
\ No newline at end of file
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.input.json b/models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.input.json
deleted file mode 100644
index f402b5d8a..000000000
--- a/models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.input.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "policy-id" : "guard.minmax.scaleout",
-  "policy-version" : "1",
-  "content" : {
-        "actor": "SO",
-        "recipe": "VF Module Create",
-        "targets": ".*",
-        "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
-        "min": "1",
-        "max": "5",
-        "guardActiveStart": "00:00:01-05:00",
-        "guardActiveEnd": "23:59:59-05:00"
-    }
-}
\ No newline at end of file
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.input.tosca.yaml
deleted file mode 100644
index a56917ebe..000000000
--- a/models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.input.tosca.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-topology_template:
-  policies:
-    -
-      guard.minmax.scaleout:
-        type: onap.policies.controlloop.guard.MinMax
-        version: 1.0.0
-        metadata:
-          policy-id : guard.minmax.scaleout
-        properties:
-          actor: SO
-          recipe: VF Module Create
-          targets: .*
-          clname: ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3
-          min: 1
-          max: 5
-          guardActiveStart: 00:00:01-05:00
-          guardActiveEnd: 23:59:59-05:00
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.output.json b/models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.output.json
deleted file mode 100644
index 778ea5447..000000000
--- a/models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.output.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "guard.minmax.scaleout": {
-        "type": "onap.policies.controlloop.guard.MinMax",
-        "version": "1.0.0",
-        "metadata": {
-            "policy-id": "guard.minmax.scaleout",
-            "policy-version": 1
-        },
-        "properties": {
-            "content": {
-                "actor": "SO",
-                "recipe": "VF Module Create",
-                "targets": ".*",
-                "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
-                "min": "1",
-                "max": "5",
-                "guardActiveStart": "00:00:01-05:00",
-                "guardActiveEnd": "23:59:59-05:00"
-           }
-        }
-    }
-}
\ No newline at end of file
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.output.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.output.tosca.yaml
deleted file mode 100644
index 97282a6f2..000000000
--- a/models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.output.tosca.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-topology_template:
-  policies:
-    -
-      guard.minmax.scaleout:
-        type: onap.policies.controlloop.guard.MinMax
-        version: 1.0.0
-        metadata:
-          policy-id : guard.minmax.scaleout
-          policy-version: 1
-        properties:
-          actor: SO
-          recipe: VF Module Create
-          targets: .*
-          clname: ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3
-          min: 1
-          max: 5
-          guardActiveStart: 00:00:01-05:00
-          guardActiveEnd: 23:59:59-05:00
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.guard.minmaxvnfs.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.guard.minmaxvnfs.input.tosca.yaml
new file mode 100644
index 000000000..dafc524b5
--- /dev/null
+++ b/models-examples/src/main/resources/policies/vDNS.policy.guard.minmaxvnfs.input.tosca.yaml
@@ -0,0 +1,16 @@
+tosca_definitions_version: tosca_simple_yaml_1_1_0
+topology_template:
+  policies:
+    -
+      guard.minmax.scaleout:
+        type: onap.policies.controlloop.guard.common.MinMax
+        type_version: 1.0.0
+        version: 1.0.0
+        metadata:
+          policy-id : guard.minmax.scaleout
+        properties:
+          actor: SO
+          operation: VF Module Create
+          id: ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3
+          min: 1
+          max: 2
\ No newline at end of file
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json
index bb31f4b2c..e5d074163 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json
@@ -1,5 +1,5 @@
 {
-    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+    "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
     "topology_template":
     {
         "policies":
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml
index d8e37da00..09a491584 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
    policies:
       -
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 669e8946c..963e193d3 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
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
    policies:
       -
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.json b/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.json
index 8205fc89e..bb90bbd43 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.json
@@ -1,5 +1,5 @@
 {
-    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+    "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
     "topology_template": {
         "policies": [
             {
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 0859ba898..bb12c951a 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
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
     policies:
     -   operational.scaleout:
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.json b/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.json
index 8205fc89e..bb90bbd43 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.json
+++ b/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.json
@@ -1,5 +1,5 @@
 {
-    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+    "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
     "topology_template": {
         "policies": [
             {
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 84d7efb0c..9da4b93ba 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
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
    policies:
       -   operational.scaleout:
diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json
index b247672eb..ae8623dca 100644
--- a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json
@@ -1,5 +1,5 @@
 {
-    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+    "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
     "topology_template":
     {
         "policies":
diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml
index 59fcf999d..20afb111b 100644
--- a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
   policies:
     -
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 eb3165f6e..750a84ca0 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
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
   policies:
     -
diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.json b/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.json
index 171694028..2d7f1c958 100644
--- a/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.json
@@ -1,5 +1,5 @@
 {
-    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+    "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
     "topology_template": {
         "policies": [
             {
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 468946520..061d3cca1 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
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
     policies:
     -   operational.modifyconfig:
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 555d84bee..923bc7d75 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
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
    policies:
      -
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 01da34093..617354327 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
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 topology_template:
     policies:
     -   operational.modifyconfig.cds: