Code Review
/
policy
/
models.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
(from parent 2:
467247c
)
Merge "More actor clean-up"
author
Ram Krishna Verma
<ram_krishna.verma@bell.ca>
Fri, 21 Feb 2020 15:37:22 +0000
(15:37 +0000)
committer
Gerrit Code Review
<gerrit@onap.org>
Fri, 21 Feb 2020 15:37:22 +0000
(15:37 +0000)
models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json
patch
|
blob
|
history
models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.yaml
patch
|
blob
|
history
models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.json
patch
|
blob
|
history
models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.json
patch
|
blob
|
history
models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.yaml
patch
|
blob
|
history
models-examples/src/main/resources/policies/vFirewall.policy.operational.output.tosca.yaml
patch
|
blob
|
history
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
6d9c030
..
11db9cf
100644
(file)
--- 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"
+ "t
argetT
ype": "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
9641eec
..
27d0202
100644
(file)
--- 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
+ t
argetT
ype: 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
d738537
..
aeac309
100644
(file)
--- 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"
+ "t
argetT
ype": "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
f6f15fe
..
1716940
100644
(file)
--- 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": {
+ "entityId
s
": {
"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
e3166f7
..
4689465
100644
(file)
--- 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:
+ entityId
s
:
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
42ea511
..
555d84b
100644
(file)
--- 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