Change-Id: I9990cc0f3535df96f1ea7679fb87aea36398f433
Issue-ID: VVP-179
Signed-off-by: stark, steven <steven.stark@att.com>
+ testr0:
+ type: testr
+ properties:
+ name:
+ str_replace:
+ template: vnfname_param
+ params:
+ vnfname: { get_param: vnf_name }
+ param: { get_param: [params, 0]}
+
+ testr1:
+ type: testr
+ properties:
+ name:
+ str_replace:
+ template: vnfname_param
+ params:
+ vnfname: { get_param: vnf_name }
+ param: { get_param: [params, 1]}
+
vm_typeX_0_bialy_port_2:
type: OS::Neutron::Port
properties:
vm_typeX_0_bialy_port_2:
type: OS::Neutron::Port
properties:
# regex parses the proper resource id format.
@staticmethod
# regex parses the proper resource id format.
@staticmethod
- def get_param_value(value):
+ def get_param_value(value, withIndex=False):
"""Return get_param value of `value`
"""
if isinstance(value, dict) and len(value) == 1:
v = value.get("get_param")
if isinstance(v, list) and v:
"""Return get_param value of `value`
"""
if isinstance(value, dict) and len(value) == 1:
v = value.get("get_param")
if isinstance(v, list) and v:
+ if withIndex and len(v) > 1:
+ idx = v[1]
+ if isinstance(idx, dict):
+ idx = idx.get("get_param", idx)
+ v = "{}{}".format(v[0], idx)
+ else:
+ v = v[0]
# are replaced in the template in arbitrary order.
name = template
for key, value in params.items():
# are replaced in the template in arbitrary order.
name = template
for key, value in params.items():
- param = cls.get_param_value(value)
+ param = cls.get_param_value(value, withIndex=True)
if param is None:
return None
name = name.replace(key, str(param))
if param is None:
return None
name = name.replace(key, str(param))