change m1.* flavor to "yardstick-flavor"

JIRA: YARDSTICK-485

In OpenStack Newton, the 'm1.tiny', 'm1.small', 'm1.medium' and 'm1.large' will
not be automatic created. This may cause errors as some Yardstick testcases are
using one of these flavor. Therefore, it's better change all the flavor option
in task configuration file to 'yardstick-flavor'.

Change-Id: Ibb29a77ef331bbf728dec9894a2e9f17c19d5ebd
Signed-off-by: JingLu5 <lvjing5@huawei.com>

diff --git a/samples/ping-ext-ip.yaml b/samples/ping-ext-ip.yaml
index d36c295..3ce71e8 100644 (file)
--- 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 451f010..d7efe06 100644 (file)
--- 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 5a8d09f..913912e 100644 (file)
--- 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 b4b8f52..1619a56 100644 (file)
--- 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 a5e9094..d399b39 100755 (executable)
--- 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 1c27e1b..71b7994 100644 (file)
--- 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 4055af1..e8ebf49 100644 (file)
--- 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 30d133e..1c31677 100644 (file)
--- 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 00d2613..5761543 100644 (file)
--- 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 9c492e4..59653db 100644 (file)
--- 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 cfc7920..825dde2 100644 (file)
--- 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 845d10d..5e922ea 100644 (file)
--- 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 732d73a..f5a2778 100644 (file)
--- 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 8b21c5b..7221518 100644 (file)
--- 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 107c28d..6f99ea6 100644 (file)
--- 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 f64968c..6c7f967 100644 (file)
--- 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 a86943a..ba246ff 100644 (file)
--- 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 7e57560..cbdaf39 100644 (file)
--- 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 769d756..1724978 100644 (file)
--- 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