Merge "Fix VF Module Create in guard"

9 files changed, 20 insertions, 8 deletions

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
index 442f3ec40..346765efc 100644
--- 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
@@ -2,7 +2,7 @@
   "policy-id" : "guard.frequency.scaleout",
   "content" : {
             "actor": "SO",
-            "recipe": "scaleOut",
+            "recipe": "VF Module Create",
             "targets": ".*",
             "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
             "limit": "1",
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
index 494ade2b7..9da85c412 100644
--- 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
@@ -11,7 +11,7 @@
                     },
                     "properties": {
                         "actor": "SO",
-                        "recipe": "scaleOut",
+                        "recipe": "VF Module Create",
                         "targets": ".*",
                         "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
                         "limit": "1",
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
index 81d148586..efab1d0df 100644
--- 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
@@ -9,7 +9,7 @@ topology_template:
           policy-id : guard.frequency.scaleout
         properties:
           actor: SO
-          recipe: scaleOut
+          recipe: VF Module Create
           targets: .*
           clname: ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3
           limit: 1
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
index 48c92c3ba..f8b6ac59c 100644
--- 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
@@ -9,7 +9,7 @@
         "properties": {
            "content": {
                 "actor": "SO",
-                "recipe": "scaleOut",
+                "recipe": "VF Module Create",
                 "targets": ".*",
                 "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
                 "limit": "1",
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
index 9cd275e2c..c50b17829 100644
--- 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
@@ -10,7 +10,7 @@ topology_template:
           policy-version: 1
         properties:
           actor: SO
-          recipe: scaleOut
+          recipe: VF Module Create
           targets: .*
           clname: ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3
           limit: 1
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
index 2dbfe8ce9..b44a855fe 100644
--- 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
@@ -2,7 +2,7 @@
   "policy-id" : "guard.minmax.scaleout",
   "contents" : {
         "actor": "SO",
-        "recipe": "scaleOut",
+        "recipe": "VF Module Create",
         "targets": ".*",
         "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
         "min": "1",
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
index 6e0e9f24b..a56917ebe 100644
--- 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
@@ -9,7 +9,7 @@ topology_template:
           policy-id : guard.minmax.scaleout
         properties:
           actor: SO
-          recipe: scaleOut
+          recipe: VF Module Create
           targets: .*
           clname: ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3
           min: 1
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
index 83d2f272f..778ea5447 100644
--- 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
@@ -5,6 +5,18 @@
         "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
index 5ac760156..97282a6f2 100644
--- 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
@@ -10,7 +10,7 @@ topology_template:
           policy-version: 1
         properties:
           actor: SO
-          recipe: scaleOut
+          recipe: VF Module Create
           targets: .*
           clname: ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3
           min: 1