Code Review
/
demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Improve CBA to derive variables from others on same level
[demo.git]
/
heat
/
vFW_CNF_CDS
/
templates
/
cba
/
Templates
/
vsn-template.vtl
diff --git
a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
index
a7a61d6
..
f71379c
100644
(file)
--- a/
heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
+++ b/
heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
@@
-38,10
+38,6
@@
{
"param-name": "VF_MODULE_LABEL",
"param-value": "${vf-module-label}"
{
"param-name": "VF_MODULE_LABEL",
"param-value": "${vf-module-label}"
- },
- {
- "param-name": "VF_MODULE_TYPE",
- "param-value": "${vf-module-type}"
}
]
}
}
]
}
@@
-96,6
+92,19
@@
]
}
]
]
}
]
+ },
+ {
+ "capability-name": "unresolved-composite-data",
+ "key-mapping": [
+ {
+ "output-key-mapping": [
+ {
+ "resource-name": "vsn_name_0",
+ "resource-value": "${vf_module_name}"
+ }
+ ]
+ }
+ ]
}
],
"resource-accumulator-resolved-data": [
}
],
"resource-accumulator-resolved-data": [
@@
-171,10
+180,6
@@
"param-name": "int_private2_net_cidr",
"param-value": "${int_private2_net_cidr}"
},
"param-name": "int_private2_net_cidr",
"param-value": "${int_private2_net_cidr}"
},
- {
- "param-name": "onap_private_net_id",
- "param-value": "${vnf-id}-management-network"
- },
{
"param-name": "onap_private_net_cidr",
"param-value": "${onap_private_net_cidr}"
{
"param-name": "onap_private_net_cidr",
"param-value": "${onap_private_net_cidr}"
@@
-222,14
+227,6
@@
{
"param-name": "int_private2_gw_ip",
"param-value": "${int_private2_gw_ip}"
{
"param-name": "int_private2_gw_ip",
"param-value": "${int_private2_gw_ip}"
- },
- {
- "param-name": "int_private2_net_id",
- "param-value": "${vnf-id}-protected-network"
- },
- {
- "param-name": "vsn_name_0",
- "param-value": "vsn-${vf-module-id}"
}
]
}
}
]
}