aboutsummaryrefslogtreecommitdiffstats
path: root/models-examples
diff options
context:
space:
mode:
authorjhh <jorge.hernandez-herrero@att.com>2020-02-20 15:40:08 -0600
committerjhh <jorge.hernandez-herrero@att.com>2020-02-20 18:25:15 -0600
commit4d99fa993f76b9bc271dff7dbe336b281800403e (patch)
tree8e25e68d7f845c02b3231785fe85725f8af5a16a /models-examples
parentf6da7772d9dc01ce4ddd21a55b0f1c5fb7ad814f (diff)
Corrections in vCPE and vFW tosca to match spec.
Issue-ID: POLICY-2375 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: Ibffc67dd0b68da8597a5fdff7c65321ef4313352 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Diffstat (limited to 'models-examples')
-rw-r--r--models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json2
-rw-r--r--models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.yaml2
-rw-r--r--models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.json2
-rw-r--r--models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.json2
-rw-r--r--models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.yaml2
-rw-r--r--models-examples/src/main/resources/policies/vFirewall.policy.operational.output.tosca.yaml5
6 files changed, 8 insertions, 7 deletions
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 6d9c03052..11db9cf59 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
@@ -23,7 +23,7 @@
"actor": "APPC",
"operation": "Restart",
"target": {
- "type": "VNF"
+ "targetType": "VNF"
}
},
"timeout": 1200,
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 9641eece8..27d020240 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
@@ -19,7 +19,7 @@ topology_template:
actor: APPC
operation: Restart
target:
- type: VNF
+ targetType: VNF
timeout: 1200
retries: 3
success: final_success
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 d73853735..aeac3093d 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
@@ -26,7 +26,7 @@
"actor": "APPC",
"recipe": "Restart",
"target": {
- "type": "VM"
+ "targetType": "VM"
},
"retry": 3,
"timeout": 1200,
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 f6f15fe50..171694028 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
@@ -23,7 +23,7 @@
"operation": "ModifyConfig",
"target": {
"targetType": "VNF",
- "entityId": {
+ "entityIds": {
"resourceID": "bbb3cefd-01c8-413c-9bdd-2b92f9ca3d38"
}
}
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 e3166f7ab..468946520 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
@@ -19,7 +19,7 @@ topology_template:
operation: ModifyConfig
target:
targetType: VNF
- entityId:
+ entityIds:
resourceID: bbb3cefd-01c8-413c-9bdd-2b92f9ca3d38
timeout: 300
retries: 0
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 42ea511d9..555d84bee 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
@@ -24,8 +24,9 @@ topology_template:
recipe: ModifyConfig
target:
# TBD - Cannot be known until instantiation is done
- resourceID: Eace933104d443b496b8.nodes.heat.vpg
- type: VNF
+ targetType: VNF
+ entityIds:
+ resourceID: Eace933104d443b496b8.nodes.heat.vpg
retry: 0
timeout: 300
success: final_success