aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRex Lee <limingjiang@huawei.com>2016-12-20 01:28:57 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-20 01:28:57 +0000
commit367691281be05a5f2c76455465ff14078415e6c2 (patch)
treef532792cdffb2b36e42bad716b903a40349494a3
parentbeeeec75ea196f14659d9836d26dc0654df5fd4d (diff)
parent142dc6a007828318fa56055cb1fb8b56552cfbe8 (diff)
Merge "change m1.* flavor to "yardstick-flavor""
-rw-r--r--samples/ping-ext-ip.yaml2
-rw-r--r--samples/ping-ext-stimuli.yaml2
-rw-r--r--samples/ping-heat-context.yaml2
-rw-r--r--samples/ping-hot.yaml2
-rwxr-xr-xsamples/ping-iteration.yaml2
-rw-r--r--samples/ping-multiple-context.yaml4
-rw-r--r--samples/ping-multiple-vm.yaml2
-rw-r--r--samples/ping-option-list.yaml2
-rw-r--r--samples/ping-parallel.yaml2
-rw-r--r--samples/ping-serial.yaml2
-rw-r--r--samples/ping-template.yaml2
-rw-r--r--samples/ping.yaml2
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml2
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml2
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml2
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml2
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml2
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml2
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml2
19 files changed, 20 insertions, 20 deletions
diff --git a/samples/ping-ext-ip.yaml b/samples/ping-ext-ip.yaml
index d36c29544..3ce71e8a7 100644
--- a/samples/ping-ext-ip.yaml
+++ b/samples/ping-ext-ip.yaml
@@ -24,7 +24,7 @@ scenarios:
context:
name: demo
image: cirros-0.3.3
- flavor: m1.tiny
+ flavor: yardstick-flavor
user: cirros
servers:
hermes:
diff --git a/samples/ping-ext-stimuli.yaml b/samples/ping-ext-stimuli.yaml
index 451f0105f..d7efe063f 100644
--- a/samples/ping-ext-stimuli.yaml
+++ b/samples/ping-ext-stimuli.yaml
@@ -37,7 +37,7 @@ scenarios:
context:
name: demo
image: cirros-0.3.3
- flavor: m1.tiny
+ flavor: yardstick-flavor
user: cirros
servers:
goofy:
diff --git a/samples/ping-heat-context.yaml b/samples/ping-heat-context.yaml
index 5a8d09fbe..913912e50 100644
--- a/samples/ping-heat-context.yaml
+++ b/samples/ping-heat-context.yaml
@@ -25,7 +25,7 @@ context:
type: Heat
name: demo
image: cirros-0.3.3
- flavor: m1.tiny
+ flavor: yardstick-flavor
user: cirros
placement_groups:
diff --git a/samples/ping-hot.yaml b/samples/ping-hot.yaml
index b4b8f5228..1619a561f 100644
--- a/samples/ping-hot.yaml
+++ b/samples/ping-hot.yaml
@@ -33,7 +33,7 @@ context:
heat_template: /tmp/heat-templates/hot/servers_in_new_neutron_net.yaml
heat_parameters:
image: cirros-0.3.3
- flavor: m1.tiny
+ flavor: yardstick-flavor
key_name: yardstick
public_net: "660fc7c3-7a56-4faf-91e5-3c9ebdda0104"
private_net_name: "test"
diff --git a/samples/ping-iteration.yaml b/samples/ping-iteration.yaml
index a5e90941b..d399b399a 100755
--- a/samples/ping-iteration.yaml
+++ b/samples/ping-iteration.yaml
@@ -24,7 +24,7 @@ scenarios:
context:
name: demo
image: cirros-0.3.3
- flavor: m1.tiny
+ flavor: yardstick-flavor
user: cirros
placement_groups:
diff --git a/samples/ping-multiple-context.yaml b/samples/ping-multiple-context.yaml
index 1c27e1bf1..71b7994ff 100644
--- a/samples/ping-multiple-context.yaml
+++ b/samples/ping-multiple-context.yaml
@@ -24,7 +24,7 @@ contexts:
-
name: demo1
image: cirros-0.3.3
- flavor: m1.tiny
+ flavor: yardstick-flavor
user: cirros
placement_groups:
pgrp1:
@@ -39,7 +39,7 @@ contexts:
-
name: demo2
image: cirros-0.3.3
- flavor: m1.tiny
+ flavor: yardstick-flavor
user: cirros
placement_groups:
pgrp1:
diff --git a/samples/ping-multiple-vm.yaml b/samples/ping-multiple-vm.yaml
index 4055af14b..e8ebf495e 100644
--- a/samples/ping-multiple-vm.yaml
+++ b/samples/ping-multiple-vm.yaml
@@ -28,7 +28,7 @@ scenarios:
context:
name: demo
image: cirros-0.3.3
- flavor: m1.tiny
+ flavor: yardstick-flavor
user: cirros
servers:
diff --git a/samples/ping-option-list.yaml b/samples/ping-option-list.yaml
index 30d133eb8..1c31677ac 100644
--- a/samples/ping-option-list.yaml
+++ b/samples/ping-option-list.yaml
@@ -22,7 +22,7 @@ scenarios:
context:
name: demo
image: cirros-0.3.3
- flavor: m1.tiny
+ flavor: yardstick-flavor
user: cirros
placement_groups:
diff --git a/samples/ping-parallel.yaml b/samples/ping-parallel.yaml
index 00d261383..5761543b4 100644
--- a/samples/ping-parallel.yaml
+++ b/samples/ping-parallel.yaml
@@ -36,7 +36,7 @@ scenarios:
context:
name: demo
image: cirros-0.3.3
- flavor: m1.tiny
+ flavor: yardstick-flavor
user: cirros
placement_groups:
diff --git a/samples/ping-serial.yaml b/samples/ping-serial.yaml
index 9c492e481..59653db34 100644
--- a/samples/ping-serial.yaml
+++ b/samples/ping-serial.yaml
@@ -35,7 +35,7 @@ scenarios:
context:
name: demo
image: cirros-0.3.3
- flavor: m1.tiny
+ flavor: yardstick-flavor
user: cirros
servers:
diff --git a/samples/ping-template.yaml b/samples/ping-template.yaml
index cfc79206a..825dde285 100644
--- a/samples/ping-template.yaml
+++ b/samples/ping-template.yaml
@@ -29,7 +29,7 @@ scenarios:
context:
name: demo
image: cirros-0.3.3
- flavor: m1.tiny
+ flavor: yardstick-flavor
user: cirros
placement_groups:
diff --git a/samples/ping.yaml b/samples/ping.yaml
index 845d10dcc..5e922ea56 100644
--- a/samples/ping.yaml
+++ b/samples/ping.yaml
@@ -24,7 +24,7 @@ scenarios:
context:
name: demo
image: cirros-0.3.3
- flavor: m1.tiny
+ flavor: yardstick-flavor
user: cirros
placement_groups:
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml
index 732d73af7..f5a2778e8 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml
@@ -36,7 +36,7 @@ scenarios:
context:
name: yardstick-TC005
image: yardstick-image
- flavor: m1.small
+ flavor: yardstick-flavor
user: ubuntu
servers:
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
index 8b21c5bf1..7221518ab 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
@@ -16,7 +16,7 @@ scenarios:
vlan_net_2_name: apexlake_outbound_network
vlan_subnet_2_name: apexlake_outbound_subnet
vnic_type: direct
- vtc_flavor: m1.large
+ vtc_flavor: yardstick-flavor
runner:
type: Iteration
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml
index 107c28d1d..6f99ea6f2 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml
@@ -19,7 +19,7 @@ scenarios:
vlan_net_2_name: apexlake_outbound_network
vlan_subnet_2_name: apexlake_outbound_subnet
vnic_type: direct
- vtc_flavor: m1.large
+ vtc_flavor: yardstick-flavor
num_of_neighbours: 2
amount_of_ram: 1G
number_of_cores: 2
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml
index f64968cb1..6c7f96799 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml
@@ -26,7 +26,7 @@ scenarios:
context:
name: yardstick-TC010
image: yardstick-image
- flavor: m1.small
+ flavor: yardstick-flavor
user: ubuntu
servers:
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml
index a86943a51..ba246ff11 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml
@@ -27,7 +27,7 @@ scenarios:
context:
name: demo
image: yardstick-image
- flavor: m1.small
+ flavor: yardstick-flavor
user: ubuntu
servers:
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml
index 7e5756001..cbdaf3970 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml
@@ -15,7 +15,7 @@ scenarios:
vlan_net_2_name: apexlake_outbound_network
vlan_subnet_2_name: apexlake_outbound_subnet
vnic_type: direct
- vtc_flavor: m1.large
+ vtc_flavor: yardstick-flavor
runner:
type: Iteration
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml
index 769d75618..17249785a 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml
@@ -15,7 +15,7 @@ scenarios:
vlan_net_2_name: apexlake_outbound_network
vlan_subnet_2_name: apexlake_outbound_subnet
vnic_type: direct
- vtc_flavor: m1.large
+ vtc_flavor: yardstick-flavor
num_of_neighbours: 2
amount_of_ram: 1G
number_of_cores: 2