Code Review
/
demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix vFWCL Heat template for instantiation with Robot
[demo.git]
/
heat
/
vFWCL
/
vFWSNK
/
base_vfw.yaml
diff --git
a/heat/vFWCL/vFWSNK/base_vfw.yaml
b/heat/vFWCL/vFWSNK/base_vfw.yaml
index
fe7d96c
..
a11d4b4
100644
(file)
--- a/
heat/vFWCL/vFWSNK/base_vfw.yaml
+++ b/
heat/vFWCL/vFWSNK/base_vfw.yaml
@@
-125,6
+125,10
@@
parameters:
type: string
label: VNF NAME
description: The VNF NAME is provided by ONAP
type: string
label: VNF NAME
description: The VNF NAME is provided by ONAP
+ net_prefix:
+ type: string
+ label: Network prefix
+ description: Prefix for private network names - Workaround for Dublin
vnf_id:
type: string
label: VNF ID
vnf_id:
type: string
label: VNF ID
@@
-201,7
+205,7
@@
resources:
template: vnfname_netid
params:
netid: { get_param: int_unprotected_private_net_id }
template: vnfname_netid
params:
netid: { get_param: int_unprotected_private_net_id }
- vnfname: { get_param:
vnf_name
}
+ vnfname: { get_param:
net_prefix
}
int_unprotected_private_subnet:
type: OS::Neutron::Subnet
int_unprotected_private_subnet:
type: OS::Neutron::Subnet
@@
-211,7
+215,7
@@
resources:
template: vnfname_subnetid
params:
subnetid: { get_param: int_unprotected_private_subnet_id }
template: vnfname_subnetid
params:
subnetid: { get_param: int_unprotected_private_subnet_id }
- vnfname: { get_param:
vnf_name
}
+ vnfname: { get_param:
net_prefix
}
network: { get_resource: int_unprotected_private_network }
cidr: { get_param: unprotected_private_net_cidr }
network: { get_resource: int_unprotected_private_network }
cidr: { get_param: unprotected_private_net_cidr }
@@
-223,7
+227,7
@@
resources:
template: vnfname_netid
params:
netid: { get_param: int_protected_private_net_id }
template: vnfname_netid
params:
netid: { get_param: int_protected_private_net_id }
- vnfname: { get_param:
vnf_name
}
+ vnfname: { get_param:
net_prefix
}
int_protected_private_subnet:
type: OS::Neutron::Subnet
int_protected_private_subnet:
type: OS::Neutron::Subnet
@@
-233,7
+237,7
@@
resources:
template: vnfname_subnetid
params:
subnetid: { get_param: int_protected_private_subnet_id }
template: vnfname_subnetid
params:
subnetid: { get_param: int_protected_private_subnet_id }
- vnfname: { get_param:
vnf_name
}
+ vnfname: { get_param:
net_prefix
}
network: { get_resource: int_protected_private_network }
cidr: { get_param: protected_private_net_cidr }
network: { get_resource: int_protected_private_network }
cidr: { get_param: protected_private_net_cidr }