diff options
author | 2017-07-24 02:44:26 +0000 | |
---|---|---|
committer | 2017-07-29 04:51:47 +0000 | |
commit | 5abe4fe013a14c528bfb1e0ff4c8bcb9b8817551 (patch) | |
tree | 61209faeb003c4eb2e4bc6fb40c22a97712a8e53 /yardstick/benchmark/contexts | |
parent | f089a528c30b8163f52db9e5ff09f8632bc9078e (diff) |
Heat: support vnic_type in heat type context
JIRA: YARDSTICK-757
Some test scenarios require VM with specific vnic type.
This work is about supporting using different vnic types in heat type context.
context:
name: demo
image: cirros-0.3.5
flavor: yardstick-flavor
user: cirros
placement_groups:
pgrp1:
policy: "availability"
servers:
athena:
floating_ip: true
placement: "pgrp1"
ares:
placement: "pgrp1"
networks:
test:
cidr: '10.0.1.0/24'
vnic_type: "normal"
Change-Id: Ia229fda72f47b04288ea107e2d58fd3e8ac91dd9
Signed-off-by: JingLu5 <lvjing5@huawei.com>
Diffstat (limited to 'yardstick/benchmark/contexts')
-rw-r--r-- | yardstick/benchmark/contexts/model.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/yardstick/benchmark/contexts/model.py b/yardstick/benchmark/contexts/model.py index 0bf85d03d..aed1a3f60 100644 --- a/yardstick/benchmark/contexts/model.py +++ b/yardstick/benchmark/contexts/model.py @@ -111,6 +111,7 @@ class Network(Object): self.segmentation_id = attrs.get('segmentation_id') self.network_type = attrs.get('network_type') self.port_security_enabled = attrs.get('port_security_enabled') + self.vnic_type = attrs.get('vnic_type', 'normal') self.allowed_address_pairs = attrs.get('allowed_address_pairs', []) try: # we require 'null' or '' to disable setting gateway_ip @@ -263,7 +264,8 @@ class Server(Object): # pragma: no cover # don't refactor to pass in network object, that causes JSON # circular ref encode errors template.add_port(port_name, network.stack_name, network.subnet_stack_name, - sec_group_id=sec_group_id, provider=network.provider, + network.vnic_type, sec_group_id=sec_group_id, + provider=network.provider, allowed_address_pairs=network.allowed_address_pairs) port_name_list.append(port_name) |