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 "Replace neutron network deletion with shade."
[yardstick.git]
/
samples
/
vnf_samples
/
nsut
/
prox
/
tc_prox_heat_context_l2fwd-2.yaml
diff --git
a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml
b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml
index
6193fd3
..
68218f3
100644
(file)
--- a/
samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml
+++ b/
samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml
@@
-22,27
+22,27
@@
scenarios:
topology: prox-tg-topology-2.yaml
nodes:
topology: prox-tg-topology-2.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
+ prox_path: /
opt/nsb_bin
/prox
prox_config: "configs/handle_l2fwd-2.cfg"
prox_args:
"-t": ""
tg__0:
prox_config: "configs/handle_l2fwd-2.cfg"
prox_args:
"-t": ""
tg__0:
- prox_path: /
root/dppd-PROX-v037/build
/prox
+ prox_path: /
opt/nsb_bin
/prox
prox_config: "configs/gen_l2fwd-2.cfg"
prox_args:
"-e": ""
"-t": ""
runner:
prox_config: "configs/gen_l2fwd-2.cfg"
prox_args:
"-e": ""
"-t": ""
runner:
- type:
Search
- interval: 5
-
timeout: 12
00
+ type:
Duration
+ # we kill after duration, independent of test duration, so set this high
+
duration: 3
00
context:
name: yardstick
context:
name: yardstick
@@
-61,21
+61,24
@@
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:
- cidr: '10.
1.1
.0/24'
+
uplink_
0:
+ cidr: '10.
0.2
.0/24'
gateway_ip: 'null'
port_security_enabled: False
gateway_ip: 'null'
port_security_enabled: False
- xe1:
- cidr: '10.1.1.0/24'
+ enable_dhcp: 'false'
+ downlink_0:
+ cidr: '10.0.3.0/24'
gateway_ip: 'null'
port_security_enabled: False
gateway_ip: 'null'
port_security_enabled: False
+ enable_dhcp: 'false'
+