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 "Remove network_services.vnf_generic.vnf.prox_helpers.ProxSocketHelper.rx_stats"
[yardstick.git]
/
samples
/
vnf_samples
/
nsut
/
prox
/
tc_prox_heat_context.yaml
diff --git
a/samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml
b/samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml
index
8ae58dd
..
9e0654e
100644
(file)
--- a/
samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml
+++ b/
samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml
@@
-22,17
+22,17
@@
scenarios:
topology: prox-tg-topology-2.yaml
nodes:
topology: prox-tg-topology-2.yaml
nodes:
- tg__
1: trafficgen_1
.yardstick
- vnf__
1: vnf
.yardstick
+ tg__
0: tg_0
.yardstick
+ vnf__
0: vnf_0
.yardstick
-
vnf_
options:
- vnf__
1
:
+ options:
+ vnf__
0
:
prox_path: /root/dppd-PROX-v035/build/prox
prox_config: "configs/l3-swap-2.cfg"
prox_args:
"-t": ""
prox_path: /root/dppd-PROX-v035/build/prox
prox_config: "configs/l3-swap-2.cfg"
prox_args:
"-t": ""
- tg__
1
:
+ tg__
0
:
prox_path: /root/dppd-PROX-v035/build/prox
prox_config: "configs/l3-gen-2.cfg"
prox_args:
prox_path: /root/dppd-PROX-v035/build/prox
prox_config: "configs/l3-gen-2.cfg"
prox_args:
@@
-46,13
+46,13
@@
scenarios:
context:
name: yardstick
context:
name: yardstick
- image: yardstick-
image-prox-dpdk1702
+ image: yardstick-
samplevnfs
user: ubuntu
flavor:
# name: yardstick-dpdk-flavor
vcpus: 5
ram: 20480
user: ubuntu
flavor:
# name: yardstick-dpdk-flavor
vcpus: 5
ram: 20480
- disk:
4
+ disk:
6
extra_specs:
hw:cpu_sockets: 1
hw:cpu_cores: 5
extra_specs:
hw:cpu_sockets: 1
hw:cpu_cores: 5
@@
-63,20
+63,17
@@
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'
- external_network: "yardstick-public"
- xe0:
+ uplink_0:
cidr: '10.0.2.0/24'
cidr: '10.0.2.0/24'
- vld_id: public
- xe1:
+ downlink_0:
cidr: '10.0.3.0/24'
cidr: '10.0.3.0/24'
- vld_id: private