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 "Check RS for virtualized OpenStack/Yardstick"
[yardstick.git]
/
samples
/
vnf_samples
/
nsut
/
prox
/
tc_prox_heat_context_mpls_tagging-2.yaml
diff --git
a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml
b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml
index
0f71195
..
e5e94ad
100644
(file)
--- a/
samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml
+++ b/
samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml
@@
-22,18
+22,18
@@
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
options:
options:
- vnf__
1
:
- prox_path: /
root/dppd-PROX-v037/build
/prox
+ vnf__
0
:
+ prox_path: /
opt/nsb_bin
/prox
prox_config: "configs/handle_mpls_tag_untag-2.cfg"
prox_args:
"-t": ""
prox_config: "configs/handle_mpls_tag_untag-2.cfg"
prox_args:
"-t": ""
- tg__
1
:
- prox_path: /
root/dppd-PROX-v037/build
/prox
+ tg__
0
:
+ prox_path: /
opt/nsb_bin
/prox
prox_config: "configs/gen_mpls_tag_untag-2.cfg"
prox_args:
"-e": ""
prox_config: "configs/gen_mpls_tag_untag-2.cfg"
prox_args:
"-e": ""
@@
-51,37
+51,34
@@
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
hw:cpu_threads: 1
extra_specs:
hw:cpu_sockets: 1
hw:cpu_cores: 10
hw:cpu_threads: 1
-# hw:mem_page_size: large
+
placement_groups:
pgrp1:
policy: "availability"
servers:
placement_groups:
pgrp1:
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
- 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: private
- allowed_address_pairs:
- - ip_address:
- '0.0.0.0/0'
+ gateway_ip: 'null'
+ port_security_enabled: False
+ enable_dhcp: 'false'