diff options
author | 2017-09-20 20:57:29 +0000 | |
---|---|---|
committer | 2017-09-20 20:57:29 +0000 | |
commit | 62c775f7261dca0081283fadcaa18e53cf2f181c (patch) | |
tree | de06c3c9f20a6aaab1522b99a0b12f198e5dc34f /yardstick/benchmark/scenarios | |
parent | 42f53e76396ef18b2b4078e90c3bca96dd4cec69 (diff) | |
parent | b84509793a3bc776220de892fd715dbced04da4e (diff) |
Merge "Heat: use pkey from string instead of key_filename"
Diffstat (limited to 'yardstick/benchmark/scenarios')
-rw-r--r-- | yardstick/benchmark/scenarios/networking/vnf_generic.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/yardstick/benchmark/scenarios/networking/vnf_generic.py b/yardstick/benchmark/scenarios/networking/vnf_generic.py index 905f1f4c5..479206952 100644 --- a/yardstick/benchmark/scenarios/networking/vnf_generic.py +++ b/yardstick/benchmark/scenarios/networking/vnf_generic.py @@ -470,6 +470,10 @@ printf "%s/driver:" $1 ; basename $(readlink -s $1/device/driver); } \ ext_intfs = vnfd["vdu"][0]["external-interface"] = [] # have to sort so xe0 goes first for intf_name, intf in sorted(node['interfaces'].items()): + # only interfaces with vld_id are added. + # Thus there are two layers of filters, only intefaces with vld_id + # show up in interfaces, and only interfaces with traffic profiles + # are used by the generators if intf.get('vld_id'): # force dpkd_port_num to int so we can do reverse lookup try: @@ -511,6 +515,13 @@ printf "%s/driver:" $1 ; basename $(readlink -s $1/device/driver); } \ vnfd = vnfdgen.generate_vnfd(vnf_model, node) # TODO: here add extra context_cfg["nodes"] regardless of template vnfd = vnfd["vnfd:vnfd-catalog"]["vnfd"][0] + # force inject pkey if it exists + # we want to standardize Heat using pkey as a string so we don't rely + # on the filesystem + try: + vnfd['mgmt-interface']['pkey'] = node['pkey'] + except KeyError: + pass self.create_interfaces_from_node(vnfd, node) vnf_impl = self.get_vnf_impl(vnfd['id']) vnf_instance = vnf_impl(node_name, vnfd) |