- Don't use vnf_name as private network name prefix. Added a new parameter named net_prefix
Change-Id: I2b54f49ce40635e1e5869dab8290f3dfc4ef6f16
Issue-ID: INT-853
Signed-off-by: Marco Platania <platania@research.att.com>
onap_private_net_cidr: 10.0.0.0/16
# METADATA
onap_private_net_cidr: 10.0.0.0/16
# METADATA
vnf_name: vFWSNK
vnf_id: vFirewall_demo_app
vf_module_id: vFirewallCL
vnf_name: vFWSNK
vnf_id: vFirewall_demo_app
vf_module_id: vFirewallCL
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
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
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 }
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
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 }