aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Williams <marcus.williams@intel.com>2017-11-09 16:50:21 +0000
committerGerrit Code Review <gerrit@onap.org>2017-11-09 16:50:21 +0000
commitc0682b82e7579a29e3fc3f942bb0582213f9468b (patch)
treef461d6d1e15e3b55d3c7bb1de28a48601087aa0c
parent598c74334c8403f14bbe2a25c18e3a286dbd9e35 (diff)
parent490d7cb647e3e2da3cfe16c3cd8647d66063d08f (diff)
Merge "vGW VF HEAT Parameters"
Former-commit-id: ca2f8ad39af9591a98212a1a1ba77490594e2a1e
-rw-r--r--installation/src/main/properties/generic-resource-api-dg.properties4
-rw-r--r--platform-logic/restapi-templates/src/main/json/vfmodule-vim-parameters.vgw.json79
2 files changed, 82 insertions, 1 deletions
diff --git a/installation/src/main/properties/generic-resource-api-dg.properties b/installation/src/main/properties/generic-resource-api-dg.properties
index 7d6ce821..ecf8c37d 100644
--- a/installation/src/main/properties/generic-resource-api-dg.properties
+++ b/installation/src/main/properties/generic-resource-api-dg.properties
@@ -18,6 +18,7 @@ restapi.parentsvc.templatefile=parent-provided-allotted-resource.json
restapi.network-ar.templatefile=network-provided-allotted-resources.json
restapi.vnf-ar.templatefile=vnf-provided-allotted-resources.json
restapi.services.templatefile=vcpe-services-service.json
+restapi.services.vnf.vfmodule.templatefile=vfmodule-vim-parameters.vgw.json
# URLs
restapi.cr-allottedresource=/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/
restapi.sz-allottedresource=/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/
@@ -32,4 +33,5 @@ restapi.vnf=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-inst
restapi.vnf-api.service-information=/restconf/config/VNF-API:vnfs/vnf-list/{vnf-id}/service-data
restapi.parent-provided-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/provided-allotted-resources/provided-allotted-resource/{allotted-resource-id}/
restapi.network-provided-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-provided-allotted-resources/
-restapi.services=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id} \ No newline at end of file
+restapi.services=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}
+restapi.service.vnf.vfmodule-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}
diff --git a/platform-logic/restapi-templates/src/main/json/vfmodule-vim-parameters.vgw.json b/platform-logic/restapi-templates/src/main/json/vfmodule-vim-parameters.vgw.json
new file mode 100644
index 00000000..10cb4a91
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/vfmodule-vim-parameters.vgw.json
@@ -0,0 +1,79 @@
+{
+ "GENERIC-RESOURCE-API:vf-module": [
+ {
+ "GENERIC-RESOURCE-API:vf-module-id": ${tmp.service.vnf.vf-module.vf-module-id}",
+ "GENERIC-RESOURCE-API:vf-module-data": {
+ "GENERIC-RESOURCE-API:vf-module-topology": {
+ "GENERIC-RESOURCE-API:vf-module-parameters": {
+ "GENERIC-RESOURCE-API:param": [
+ {
+ "name": "public_net_id",
+ "value": "external"
+ },
+ {
+ "name": "mux_gw_private_subnet_id",
+ "value": "zdfw1muxgw01_private"
+ },
+ {
+ "name": "mux_gw_private_net_id",
+ "value": "zdfw1muxgw01_private"
+ },
+ {
+ "name": "mux_gw_private_subnet_id",
+ "value": "zdfw1muxgw01_sub_private"
+ },
+ {
+ "name": "mux_gw_private_net_cidr",
+ "value": "10.5.0.0/24"
+ },
+ {
+ "name": "cpe_public_net_id",
+ "value": "vCPEInfraCPEPUBLIC110306"
+ },
+ {
+ "name": "cpe_public_subnet_id",
+ "value": "vCPEInfraCPEPUBLICSUB110306"
+ },
+ {
+ "name": "cpe_public_net_cidr",
+ "value": "10.2.0.0/24"
+ },
+ {
+ "name": "onap_private_net_id",
+ "value": "oam_onap_hUnI"
+ },
+ {
+ "name": "onap_private_subnet_id",
+ "value": "oam_onap_hUnI"
+ },
+ {
+ "name": "onap_private_net_cidr",
+ "value": "10.0.0.0/16"
+ },
+ {
+ "name": "vgw_private_ip_0",
+ "value": "10.5.0.22"
+ },
+ {
+ "name": "vgw_private_ip_1",
+ "value": "10.0.101.30"
+ },
+ {
+ "name": "vgw_name_0",
+ "value": "zdcpe1cpe01gw01_110801"
+ },
+ {
+ "name": "mux_ip_addr",
+ "value": "10.5.0.21"
+ },
+ {
+ "name": "vg_vgmux_tunnel_vni",
+ "value": ${tmp.service.vnf.vf-module.vf-module-id.vg-mux-tunnel-vni}
+ }
+ ]
+ }
+ }
+ }
+ }
+ ]
+}