Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Cleanup unittests for test_lmbench"
[yardstick.git]
/
samples
/
vnf_samples
/
nsut
/
prox
/
tc_prox_heat_context_l2fwd-4.yaml
diff --git
a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml
b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml
index
881bcfb
..
9079a70
100644
(file)
--- a/
samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml
+++ b/
samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml
@@
-22,18
+22,22
@@
scenarios:
topology: prox-tg-topology-4.yaml
nodes:
topology: prox-tg-topology-4.yaml
nodes:
- tg__0: t
rafficgen_1
.yardstick
- vnf__0: vnf.yardstick
+ tg__0: t
g_0
.yardstick
+ vnf__0: vnf
_0
.yardstick
options:
vnf__0:
options:
vnf__0:
- prox_path: /root/dppd-PROX-v037/build/prox
+ collectd:
+ interval: 1
+ prox_path: /opt/nsb_bin/prox
prox_config: "configs/handle_l2fwd-4.cfg"
prox_args:
"-t": ""
tg__0:
prox_config: "configs/handle_l2fwd-4.cfg"
prox_args:
"-t": ""
tg__0:
- prox_path: /root/dppd-PROX-v037/build/prox
+ collectd:
+ interval: 1
+ prox_path: /opt/nsb_bin/prox
prox_config: "configs/gen_l2fwd-4.cfg"
prox_args:
"-e": ""
prox_config: "configs/gen_l2fwd-4.cfg"
prox_args:
"-e": ""
@@
-42,7
+46,7
@@
scenarios:
runner:
type: Duration
# we kill after duration, independent of test duration, so set this high
runner:
type: Duration
# we kill after duration, independent of test duration, so set this high
- duration:
1
00
+ duration:
3
00
context:
name: yardstick
context:
name: yardstick
@@
-51,7
+55,7
@@
context:
flavor:
vcpus: 10
ram: 20480
flavor:
vcpus: 10
ram: 20480
- disk:
4
+ disk:
6
extra_specs:
hw:cpu_sockets: 1
hw:cpu_cores: 10
extra_specs:
hw:cpu_sockets: 1
hw:cpu_cores: 10
@@
-61,37
+65,33
@@
context:
policy: "availability"
servers:
policy: "availability"
servers:
- vnf:
+ vnf
_0
:
floating_ip: true
placement: "pgrp1"
floating_ip: true
placement: "pgrp1"
- t
rafficgen_1
:
+ t
g_0
:
floating_ip: true
placement: "pgrp1"
networks:
mgmt:
cidr: '10.0.1.0/24'
floating_ip: true
placement: "pgrp1"
networks:
mgmt:
cidr: '10.0.1.0/24'
-
xe
0:
+
uplink_
0:
cidr: '10.0.2.0/24'
cidr: '10.0.2.0/24'
- vld_id: downlink
- allowed_address_pairs:
- - ip_address:
- '0.0.0.0/0'
- xe1:
+ gateway_ip: 'null'
+ port_security_enabled: False
+ enable_dhcp: 'false'
+ downlink_0:
cidr: '10.0.3.0/24'
cidr: '10.0.3.0/24'
- vld_id: uplink
- allowed_address_pairs:
- - ip_address:
- '0.0.0.0/0'
- xe2:
+ gateway_ip: 'null'
+ port_security_enabled: False
+ enable_dhcp: 'false'
+ uplink_1:
cidr: '10.0.4.0/24'
cidr: '10.0.4.0/24'
- vld_id: downlink
- allowed_address_pairs:
- - ip_address:
- '0.0.0.0/0'
- xe3:
+ gateway_ip: 'null'
+ port_security_enabled: False
+ enable_dhcp: 'false'
+ downlink_1:
cidr: '10.0.5.0/24'
cidr: '10.0.5.0/24'
- vld_id: uplink
- allowed_address_pairs:
- - ip_address:
- '0.0.0.0/0'
+ gateway_ip: 'null'
+ port_security_enabled: False
+ enable_dhcp: 'false'