summaryrefslogtreecommitdiffstats
path: root/tests/opnfv/test_cases
diff options
context:
space:
mode:
authoruser <user@TRAFCLASS-PACKET1.fuel.local>2016-01-13 12:36:50 -0500
committerJörgen Karlsson <jorgen.w.karlsson@ericsson.com>2016-01-14 09:18:31 +0000
commitb356331917be4a05dc3363b6e8aba7af340fc376 (patch)
treefae381ec8b1dc4d278990f780c3b71997ee33364 /tests/opnfv/test_cases
parent2369528e0fd5cfda4eb29a62501e2646887ea8ff (diff)
Fix small bugs for running Apexlake on Montreal testbed
JIRA: YARDSTICK-219 Change-Id: I5f403e6c922f5e6ea790dc9cdb589cbc98e66ded Signed-off-by: user <user@TRAFCLASS-PACKET1.fuel.local> (cherry picked from commit 174560a6b7d4a23763564fcfc87c2dd7e60aa241)
Diffstat (limited to 'tests/opnfv/test_cases')
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml18
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml16
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml24
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml16
4 files changed, 34 insertions, 40 deletions
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
index 3d4091293..94d52c350 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
@@ -7,15 +7,15 @@ scenarios:
options:
packet_size: 1280
- vlan_sender: 1007
- vlan_receiver: 1006
- default_net_name: monitoring
- default_subnet_name: monitoring_subnet
- vlan_net_1_name: inbound_traffic_network
- vlan_subnet_1_name: inbound_traffic_subnet
- vlan_net_2_name: inbound_traffic_network
- vlan_subnet_2_name: inbound_traffic_subnet
- vnic_type: direct # [normal (OvS), direct (SR-IOV)]
+ vlan_sender: 2025
+ vlan_receiver: 2021
+ default_net_name: net04
+ default_subnet_name: net04__subnet
+ vlan_net_1_name: apexlake_inbound_net
+ vlan_subnet_1_name: inbound_sub
+ vlan_net_2_name: apexlake_outbound_net
+ vlan_subnet_2_name: outbound_sub
+ vnic_type: direct
vtc_flavor: m1.large
runner:
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml
index 30d59f797..0cd0a04d4 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml
@@ -10,14 +10,14 @@ scenarios:
options:
packet_size: 1280
- vlan_sender: 1007
- vlan_receiver: 1006
- default_net_name: monitoring
- default_subnet_name: monitoring_subnet
- vlan_net_1_name: inbound_traffic_network
- vlan_subnet_1_name: inbound_traffic_subnet
- vlan_net_2_name: inbound_traffic_network
- vlan_subnet_2_name: inbound_traffic_subnet
+ vlan_sender: 2025
+ vlan_receiver: 2021
+ default_net_name: net04
+ default_subnet_name: net04__subnet
+ vlan_net_1_name: apexlake_inbound_net
+ vlan_subnet_1_name: inbound_sub
+ vlan_net_2_name: apexlake_outbound_net
+ vlan_subnet_2_name: outbound_sub
vnic_type: direct # [normal (OvS), direct (SR-IOV)]
vtc_flavor: m1.large
num_of_neighbours: 2
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml
index 8d9edfe7b..13beeffdb 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml
@@ -1,7 +1,4 @@
---
-# Sample benchmark task config file
-# vTC
-
schema: "yardstick:task:0.1"
scenarios:
@@ -9,14 +6,14 @@ scenarios:
type: vtc_instantiation_validation
options:
- vlan_sender: 1007
- vlan_receiver: 1006
- default_net_name: monitoring
- default_subnet_name: monitoring_subnet
- vlan_net_1_name: inbound_traffic_network
- vlan_subnet_1_name: inbound_traffic_subnet
- vlan_net_2_name: inbound_traffic_network
- vlan_subnet_2_name: inbound_traffic_subnet
+ vlan_sender: 2025
+ vlan_receiver: 2021
+ default_net_name: net04
+ default_subnet_name: net04__subnet
+ vlan_net_1_name: apexlake_inbound_net
+ vlan_subnet_1_name: inbound_sub
+ vlan_net_2_name: apexlake_outbound_net
+ vlan_subnet_2_name: outbound_sub
vnic_type: direct # [normal (OvS), direct (SR-IOV)]
vtc_flavor: m1.large
@@ -24,8 +21,5 @@ scenarios:
type: Iteration
iterations: 1
-# dummy context, will not be used by vTC
context:
- type: Node
- name: LF
- file: /etc/yardstick/nodes/fuel_virtual/pod.yaml
+ type: Dummy
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml
index c62ce2a32..be410dfe2 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml
@@ -6,14 +6,14 @@ scenarios:
type: vtc_instantiation_validation_noisy
options:
- vlan_sender: 1007
- vlan_receiver: 1006
- default_net_name: monitoring
- default_subnet_name: monitoring_subnet
- vlan_net_1_name: inbound_traffic_network
- vlan_subnet_1_name: inbound_traffic_subnet
- vlan_net_2_name: inbound_traffic_network
- vlan_subnet_2_name: inbound_traffic_subnet
+ vlan_sender: 2025
+ vlan_receiver: 2021
+ default_net_name: net04
+ default_subnet_name: net04__subnet
+ vlan_net_1_name: apexlake_inbound_net
+ vlan_subnet_1_name: inbound_sub
+ vlan_net_2_name: apexlake_outbound_net
+ vlan_subnet_2_name: outbound_sub
vnic_type: direct # [normal (OvS), direct (SR-IOV)]
vtc_flavor: m1.large
num_of_neighbours: 2