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 "Bugfix: HA kill process recovery has a conflict"
[yardstick.git]
/
samples
/
vnf_samples
/
nsut
/
prox
/
tc_prox_heat_context_mpls_tagging-4.yaml
diff --git
a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
index
0f50e1e
..
24f7ce4
100644
(file)
--- a/
samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
+++ b/
samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
@@
-27,13
+27,13
@@
scenarios:
options:
vnf__0:
options:
vnf__0:
- prox_path: /
root/dppd-PROX-v037/build
/prox
+ prox_path: /
opt/nsb_bin
/prox
prox_config: "configs/handle_mpls_tag_untag-4.cfg"
prox_args:
"-t": ""
tg__0:
prox_config: "configs/handle_mpls_tag_untag-4.cfg"
prox_args:
"-t": ""
tg__0:
- prox_path: /
root/dppd-PROX-v037/build
/prox
+ prox_path: /
opt/nsb_bin
/prox
prox_config: "configs/gen_mpls_tag_untag-4.cfg"
prox_args:
"-e": ""
prox_config: "configs/gen_mpls_tag_untag-4.cfg"
prox_args:
"-e": ""
@@
-56,7
+56,7
@@
context:
hw:cpu_sockets: 1
hw:cpu_cores: 10
hw:cpu_threads: 1
hw:cpu_sockets: 1
hw:cpu_cores: 10
hw:cpu_threads: 1
-# hw:mem_page_size: large
+
placement_groups:
pgrp1:
policy: "availability"
placement_groups:
pgrp1:
policy: "availability"
@@
-74,22
+74,21
@@
context:
cidr: '10.0.1.0/24'
uplink_0:
cidr: '10.0.2.0/24'
cidr: '10.0.1.0/24'
uplink_0:
cidr: '10.0.2.0/24'
- allowed_address_pairs:
- - ip_address:
-
'0.0.0.0/0
'
+ gateway_ip: 'null'
+ port_security_enabled: False
+
enable_dhcp: 'false
'
downlink_0:
cidr: '10.0.3.0/24'
downlink_0:
cidr: '10.0.3.0/24'
- allowed_address_pairs:
- - ip_address:
-
'0.0.0.0/0
'
+ gateway_ip: 'null'
+ port_security_enabled: False
+
enable_dhcp: 'false
'
uplink_1:
cidr: '10.0.4.0/24'
uplink_1:
cidr: '10.0.4.0/24'
- allowed_address_pairs:
- - ip_address:
-
'0.0.0.0/0
'
+ gateway_ip: 'null'
+ port_security_enabled: False
+
enable_dhcp: 'false
'
downlink_1:
cidr: '10.0.5.0/24'
downlink_1:
cidr: '10.0.5.0/24'
- allowed_address_pairs:
- - ip_address:
- '0.0.0.0/0'
-
+ gateway_ip: 'null'
+ port_security_enabled: False
+ enable_dhcp: 'false'