openstack/rally-openstack
Code Issues Proposed changes

Bump default Cirros version

Browse Source 
Replace heavily outdated Cirros version with a current one. Also,
slightly increase RAM allocation in default flavors for newer
version to work.

Change-Id: Ie80340b3382cd3bed9edb14f9b9aa40eed6ab476
This commit is contained in:
Piotr Parczewski 2022-01-31 16:48:25 +01:00 committed by Andrey Kurilin
parent 6d53058c39
commit a73e803e7c
36 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/rally/rally.conf.sample
View File

@ -764,7 +764,7 @@
#watcher_audit_launch_timeout = 300 #watcher_audit_launch_timeout = 300
# image URL (string value) # image URL (string value)
#img_url = http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img #img_url = http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img
# Image disk format to use when creating the image (string value) # Image disk format to use when creating the image (string value)
#img_disk_format = qcow2 #img_disk_format = qcow2

2
rally-jobs/certifcation_task_args.yaml
View File

@ -9,7 +9,7 @@
use_existing_users: false use_existing_users: false
image_name: "^(cirros.*-disk|TestVM)$" image_name: "^(cirros.*-disk|TestVM)$"
flavor_name: "m1.tiny" flavor_name: "m1.tiny"
glance_image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" glance_image_location: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img"
smoke: true smoke: true
users_amount: 1 users_amount: 1
tenants_amount: 1 tenants_amount: 1

8
rally_openstack/common/cfg/tempest.py
View File

@ -18,7 +18,7 @@ from rally.common import cfg
OPTS = {"openstack": [ OPTS = {"openstack": [
cfg.StrOpt("img_url", cfg.StrOpt("img_url",
default="http://download.cirros-cloud.net/" default="http://download.cirros-cloud.net/"
"0.3.5/cirros-0.3.5-x86_64-disk.img", "0.5.2/cirros-0.5.2-x86_64-disk.img",
deprecated_group="tempest", deprecated_group="tempest",
help="image URL"), help="image URL"),
cfg.StrOpt("img_disk_format", cfg.StrOpt("img_disk_format",
@ -59,11 +59,11 @@ OPTS = {"openstack": [
deprecated_group="tempest", deprecated_group="tempest",
help="Role for Heat template-defined users"), help="Role for Heat template-defined users"),
cfg.IntOpt("flavor_ref_ram", cfg.IntOpt("flavor_ref_ram",
default="64", default="128",
deprecated_group="tempest", deprecated_group="tempest",
help="Primary flavor RAM size used by most of the test cases"), help="Primary flavor RAM size used by most of the test cases"),
cfg.IntOpt("flavor_ref_alt_ram", cfg.IntOpt("flavor_ref_alt_ram",
default="128", default="192",
deprecated_group="tempest", deprecated_group="tempest",
help="Alternate reference flavor RAM size used by test that " help="Alternate reference flavor RAM size used by test that "
"need two flavors, like those that resize an instance"), "need two flavors, like those that resize an instance"),
@ -77,7 +77,7 @@ OPTS = {"openstack": [
"tests that need two flavors, like those that resize an " "tests that need two flavors, like those that resize an "
"instance"), "instance"),
cfg.IntOpt("heat_instance_type_ram", cfg.IntOpt("heat_instance_type_ram",
default="64", default="128",
deprecated_group="tempest", deprecated_group="tempest",
help="RAM size flavor used for orchestration test cases"), help="RAM size flavor used for orchestration test cases"),
cfg.IntOpt("heat_instance_type_disk", cfg.IntOpt("heat_instance_type_disk",

2
samples/tasks/contexts/images.json
View File

@ -15,7 +15,7 @@
"users_per_tenant": 2 "users_per_tenant": 2
}, },
"images": { "images": {
"image_url": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", "image_url": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img",
"image_type": "qcow2", "image_type": "qcow2",
"image_container": "bare", "image_container": "bare",
"images_per_tenant": 4 "images_per_tenant": 4

2
samples/tasks/contexts/images.yaml
View File

@ -12,7 +12,7 @@
tenants: 1 tenants: 1
users_per_tenant: 2 users_per_tenant: 2
images: images:
image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" image_url: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img"
image_type: "qcow2" image_type: "qcow2"
image_container: "bare" image_container: "bare"
images_per_tenant: 4 images_per_tenant: 4

2
samples/tasks/contexts/profiles.json
View File

@ -20,7 +20,7 @@
"properties": { "properties": {
"name": "cirros_server", "name": "cirros_server",
"flavor": 1, "flavor": 1,
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.5.2-x86_64-disk",
"networks": [ "networks": [
{ "network": "private" } { "network": "private" }
] ]

2
samples/tasks/contexts/profiles.yaml
View File

@ -17,6 +17,6 @@
properties: properties:
name: "cirros_server" name: "cirros_server"
flavor: 1 flavor: 1
image: "cirros-0.3.5-x86_64-disk" image: "cirros-0.5.2-x86_64-disk"
networks: networks:
- network: "private" - network: "private"

2
samples/tasks/scenarios/elasticsearch/log-instance.json
View File

@ -60,7 +60,7 @@
], ],
"images": { "images": {
"image_name": "{{ image_name }}", "image_name": "{{ image_name }}",
"image_url": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", "image_url": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img",
"disk_format": "qcow2", "disk_format": "qcow2",
"container_format": "bare", "container_format": "bare",
"visibility": "public" "visibility": "public"

2
samples/tasks/scenarios/elasticsearch/log-instance.yaml
View File

@ -40,7 +40,7 @@
vcpus: 1 vcpus: 1
images: images:
image_name: {{ image_name }} image_name: {{ image_name }}
image_url: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img image_url: http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img
disk_format: qcow2 disk_format: qcow2
container_format: bare container_format: bare
visibility: public visibility: public

2
samples/tasks/scenarios/glance/create-and-deactivate-image.json
View File

@ -2,7 +2,7 @@
"GlanceImages.create_and_deactivate_image": [ "GlanceImages.create_and_deactivate_image": [
{ {
"args": { "args": {
"image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", "image_location": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img",
"container_format": "bare", "container_format": "bare",
"disk_format": "qcow2" "disk_format": "qcow2"
}, },

2
samples/tasks/scenarios/glance/create-and-deactivate-image.yaml
View File

@ -2,7 +2,7 @@
GlanceImages.create_and_deactivate_image: GlanceImages.create_and_deactivate_image:
- -
args: args:
image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" image_location: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img"
container_format: "bare" container_format: "bare"
disk_format: "qcow2" disk_format: "qcow2"
runner: runner:

2
samples/tasks/scenarios/glance/create-and-delete-image.json
View File

@ -2,7 +2,7 @@
"GlanceImages.create_and_delete_image": [ "GlanceImages.create_and_delete_image": [
{ {
"args": { "args": {
"image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", "image_location": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img",
"container_format": "bare", "container_format": "bare",
"disk_format": "qcow2" "disk_format": "qcow2"
}, },

2
samples/tasks/scenarios/glance/create-and-delete-image.yaml
View File

@ -2,7 +2,7 @@
GlanceImages.create_and_delete_image: GlanceImages.create_and_delete_image:
- -
args: args:
image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" image_location: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img"
container_format: "bare" container_format: "bare"
disk_format: "qcow2" disk_format: "qcow2"
runner: runner:

2
samples/tasks/scenarios/glance/create-and-download-image.json
View File

@ -2,7 +2,7 @@
"GlanceImages.create_and_download_image": [ "GlanceImages.create_and_download_image": [
{ {
"args": { "args": {
"image_location": "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img", "image_location": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img",
"container_format": "bare", "container_format": "bare",
"disk_format": "qcow2" "disk_format": "qcow2"
}, },

2
samples/tasks/scenarios/glance/create-and-download-image.yaml
View File

@ -2,7 +2,7 @@
GlanceImages.create_and_download_image: GlanceImages.create_and_download_image:
- -
args: args:
image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" image_location: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img"
container_format: "bare" container_format: "bare"
disk_format: "qcow2" disk_format: "qcow2"
runner: runner:

2
samples/tasks/scenarios/glance/create-and-get-image.json
View File

@ -2,7 +2,7 @@
"GlanceImages.create_and_get_image": [ "GlanceImages.create_and_get_image": [
{ {
"args": { "args": {
"image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", "image_location": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img",
"container_format": "bare", "container_format": "bare",
"disk_format": "qcow2" "disk_format": "qcow2"
}, },

2
samples/tasks/scenarios/glance/create-and-get-image.yaml
View File

@ -2,7 +2,7 @@
GlanceImages.create_and_get_image: GlanceImages.create_and_get_image:
- -
args: args:
image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" image_location: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img"
container_format: "bare" container_format: "bare"
disk_format: "qcow2" disk_format: "qcow2"
runner: runner:

2
samples/tasks/scenarios/glance/create-and-list-image.json
View File

@ -2,7 +2,7 @@
"GlanceImages.create_and_list_image": [ "GlanceImages.create_and_list_image": [
{ {
"args": { "args": {
"image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", "image_location": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img",
"container_format": "bare", "container_format": "bare",
"disk_format": "qcow2" "disk_format": "qcow2"
}, },

2
samples/tasks/scenarios/glance/create-and-list-image.yaml
View File

@ -2,7 +2,7 @@
GlanceImages.create_and_list_image: GlanceImages.create_and_list_image:
- -
args: args:
image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" image_location: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img"
container_format: "bare" container_format: "bare"
disk_format: "qcow2" disk_format: "qcow2"
runner: runner:

2
samples/tasks/scenarios/glance/create-and-update-image.json
View File

@ -2,7 +2,7 @@
"GlanceImages.create_and_update_image": [ "GlanceImages.create_and_update_image": [
{ {
"args": { "args": {
"image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", "image_location": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img",
"container_format": "bare", "container_format": "bare",
"disk_format": "qcow2" "disk_format": "qcow2"
}, },

2
samples/tasks/scenarios/glance/create-and-update-image.yaml
View File

@ -2,7 +2,7 @@
GlanceImages.create_and_update_image: GlanceImages.create_and_update_image:
- -
args: args:
image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" image_location: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img"
container_format: "bare" container_format: "bare"
disk_format: "qcow2" disk_format: "qcow2"
runner: runner:

2
samples/tasks/scenarios/glance/create-image-and-boot-instances.json
View File

@ -3,7 +3,7 @@
"GlanceImages.create_image_and_boot_instances": [ "GlanceImages.create_image_and_boot_instances": [
{ {
"args": { "args": {
"image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", "image_location": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img",
"container_format": "bare", "container_format": "bare",
"disk_format": "qcow2", "disk_format": "qcow2",
"flavor": { "flavor": {

2
samples/tasks/scenarios/glance/create-image-and-boot-instances.yaml
View File

@ -3,7 +3,7 @@
GlanceImages.create_image_and_boot_instances: GlanceImages.create_image_and_boot_instances:
- -
args: args:
image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" image_location: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img"
container_format: "bare" container_format: "bare"
disk_format: "qcow2" disk_format: "qcow2"
flavor: flavor:

2
samples/tasks/scenarios/glance/list-images.json
View File

@ -12,7 +12,7 @@
"users_per_tenant": 2 "users_per_tenant": 2
}, },
"images": { "images": {
"image_url": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", "image_url": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img",
"disk_format": "qcow2", "disk_format": "qcow2",
"container_format": "bare", "container_format": "bare",
"images_per_tenant": 4 "images_per_tenant": 4

2
samples/tasks/scenarios/glance/list-images.yaml
View File

@ -10,7 +10,7 @@
tenants: 2 tenants: 2
users_per_tenant: 2 users_per_tenant: 2
images: images:
image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" image_url: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img"
disk_format: "qcow2" disk_format: "qcow2"
container_format: "bare" container_format: "bare"
images_per_tenant: 4 images_per_tenant: 4

2
samples/tasks/scenarios/grafana/push-metric-from-instance.json
View File

@ -42,7 +42,7 @@
], ],
"images": { "images": {
"image_name": "{{ image_name }}", "image_name": "{{ image_name }}",
"image_url": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", "image_url": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img",
"disk_format": "qcow2", "disk_format": "qcow2",
"container_format": "bare", "container_format": "bare",
"visibility": "public" "visibility": "public"

2
samples/tasks/scenarios/grafana/push-metric-from-instance.yaml
View File

@ -34,7 +34,7 @@
vcpus: 1 vcpus: 1
images: images:
image_name: {{ image_name }} image_name: {{ image_name }}
image_url: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img image_url: http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img
disk_format: qcow2 disk_format: qcow2
container_format: bare container_format: bare
visibility: public visibility: public

2
samples/tasks/scenarios/heat/templates/autoscaling-group.yaml.template
View File

@ -8,7 +8,7 @@ parameters:
- custom_constraint: nova.flavor - custom_constraint: nova.flavor
image: image:
type: string type: string
default: cirros-0.3.5-x86_64-disk default: cirros-0.5.2-x86_64-disk
constraints: constraints:
- custom_constraint: glance.image - custom_constraint: glance.image
scaling_adjustment: scaling_adjustment:

2
samples/tasks/scenarios/heat/templates/resource-group-server-with-volume.yaml.template
View File

@ -14,7 +14,7 @@ parameters:
- range: {min: 1} - range: {min: 1}
instance_image: instance_image:
type: string type: string
default: cirros-0.3.5-x86_64-disk default: cirros-0.5.2-x86_64-disk
instance_volume_size: instance_volume_size:
type: number type: number
description: Size of volume to attach to instance description: Size of volume to attach to instance

2
samples/tasks/scenarios/heat/templates/server-with-ports.yaml.template
View File

@ -7,7 +7,7 @@ parameters:
default: public default: public
image: image:
type: string type: string
default: cirros-0.3.5-x86_64-disk default: cirros-0.5.2-x86_64-disk
flavor: flavor:
type: string type: string
default: m1.tiny default: m1.tiny

2
samples/tasks/scenarios/heat/templates/server-with-volume.yaml.template
View File

@ -4,7 +4,7 @@ parameters:
# set all correct defaults for parameters before launch test # set all correct defaults for parameters before launch test
image: image:
type: string type: string
default: cirros-0.3.5-x86_64-disk default: cirros-0.5.2-x86_64-disk
flavor: flavor:
type: string type: string
default: m1.tiny default: m1.tiny

2
samples/tasks/scenarios/senlin/create-and-delete-profile-cluster.json
View File

@ -22,7 +22,7 @@
"properties": { "properties": {
"name": "cirros_server", "name": "cirros_server",
"flavor": 1, "flavor": 1,
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.5.2-x86_64-disk",
"networks": [ "networks": [
{ "network": "private" } { "network": "private" }
] ]

2
samples/tasks/scenarios/senlin/create-and-delete-profile-cluster.yaml
View File

@ -19,7 +19,7 @@
properties: properties:
name: cirros_server name: cirros_server
flavor: 1 flavor: 1
image: "cirros-0.3.5-x86_64-disk" image: "cirros-0.5.2-x86_64-disk"
networks: networks:
- network: private - network: private
sla: sla:

2
tasks/openstack/task.yaml
View File

@ -1,4 +1,4 @@
{%- set glance_image_location = glance_image_location|default("https://download.cirros-cloud.net/0.3.5/cirros-0.3.5-i386-disk.img") %} {%- set glance_image_location = glance_image_location|default("https://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img") %}
{%- set image_name = image_name|default("^(cirros.*-disk|TestVM)$") %} {%- set image_name = image_name|default("^(cirros.*-disk|TestVM)$") %}
{%- set flavor_name = flavor_name|default("m1.tiny") %} {%- set flavor_name = flavor_name|default("m1.tiny") %}
{%- set use_existing_users = use_existing_users|default(false) %} {%- set use_existing_users = use_existing_users|default(false) %}

4
tests/unit/task/contexts/nova/test_servers.py
View File

@ -84,7 +84,7 @@ class ServerGeneratorTestCase(test.ScenarioTestCase):
"auto_assign_nic": True, "auto_assign_nic": True,
"servers_per_tenant": 5, "servers_per_tenant": 5,
"image": { "image": {
"name": "cirros-0.3.4-x86_64-uec", "name": "cirros-0.5.2-x86_64-uec",
}, },
"flavor": { "flavor": {
"name": "m1.tiny", "name": "m1.tiny",
@ -148,7 +148,7 @@ class ServerGeneratorTestCase(test.ScenarioTestCase):
"servers": { "servers": {
"servers_per_tenant": 5, "servers_per_tenant": 5,
"image": { "image": {
"name": "cirros-0.3.4-x86_64-uec", "name": "cirros-0.5.2-x86_64-uec",
}, },
"flavor": { "flavor": {
"name": "m1.tiny", "name": "m1.tiny",

36
tests/unit/task/test_types.py
View File

@ -177,14 +177,14 @@ class GlanceImageTestCase(test.TestCase):
def setUp(self): def setUp(self):
super(GlanceImageTestCase, self).setUp() super(GlanceImageTestCase, self).setUp()
self.clients = fakes.FakeClients() self.clients = fakes.FakeClients()
image1 = fakes.FakeResource(name="cirros-0.3.4-uec", id="100") image1 = fakes.FakeResource(name="cirros-0.5.2-uec", id="100")
self.clients.glance().images._cache(image1) self.clients.glance().images._cache(image1)
image2 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk", id="101") image2 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk", id="101")
self.clients.glance().images._cache(image2) self.clients.glance().images._cache(image2)
image3 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy", image3 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk-copy",
id="102") id="102")
self.clients.glance().images._cache(image3) self.clients.glance().images._cache(image3)
image4 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy", image4 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk-copy",
id="103") id="103")
self.clients.glance().images._cache(image4) self.clients.glance().images._cache(image4)
self.type_cls = types.GlanceImage( self.type_cls = types.GlanceImage(
@ -198,19 +198,19 @@ class GlanceImageTestCase(test.TestCase):
self.assertEqual("100", image_id) self.assertEqual("100", image_id)
def test_preprocess_by_name(self): def test_preprocess_by_name(self):
resource_spec = {"name": "^cirros-0.3.4-uec$"} resource_spec = {"name": "^cirros-0.5.2-uec$"}
image_id = self.type_cls.pre_process( image_id = self.type_cls.pre_process(
resource_spec=resource_spec, config={}) resource_spec=resource_spec, config={})
self.assertEqual("100", image_id) self.assertEqual("100", image_id)
def test_preprocess_by_name_no_match(self): def test_preprocess_by_name_no_match(self):
resource_spec = {"name": "cirros-0.3.4-uec-boot"} resource_spec = {"name": "cirros-0.5.2-uec-boot"}
self.assertRaises(exceptions.InvalidScenarioArgument, self.assertRaises(exceptions.InvalidScenarioArgument,
self.type_cls.pre_process, self.type_cls.pre_process,
resource_spec=resource_spec, config={}) resource_spec=resource_spec, config={})
def test_preprocess_by_name_match_multiple(self): def test_preprocess_by_name_match_multiple(self):
resource_spec = {"name": "cirros-0.3.4-uec-ramdisk-copy"} resource_spec = {"name": "cirros-0.5.2-uec-ramdisk-copy"}
self.assertRaises(exceptions.InvalidScenarioArgument, self.assertRaises(exceptions.InvalidScenarioArgument,
self.type_cls.pre_process, self.type_cls.pre_process,
resource_spec=resource_spec, config={}) resource_spec=resource_spec, config={})
@ -263,23 +263,23 @@ class EC2ImageTestCase(test.TestCase):
def setUp(self): def setUp(self):
super(EC2ImageTestCase, self).setUp() super(EC2ImageTestCase, self).setUp()
self.clients = fakes.FakeClients() self.clients = fakes.FakeClients()
image1 = fakes.FakeResource(name="cirros-0.3.4-uec", id="100") image1 = fakes.FakeResource(name="cirros-0.5.2-uec", id="100")
self.clients.glance().images._cache(image1) self.clients.glance().images._cache(image1)
image2 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk", id="102") image2 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk", id="102")
self.clients.glance().images._cache(image2) self.clients.glance().images._cache(image2)
image3 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy", image3 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk-copy",
id="102") id="102")
self.clients.glance().images._cache(image3) self.clients.glance().images._cache(image3)
image4 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy", image4 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk-copy",
id="103") id="103")
self.clients.glance().images._cache(image4) self.clients.glance().images._cache(image4)
ec2_image1 = fakes.FakeResource(name="cirros-0.3.4-uec", id="200") ec2_image1 = fakes.FakeResource(name="cirros-0.5.2-uec", id="200")
ec2_image2 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk", ec2_image2 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk",
id="201") id="201")
ec2_image3 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy", ec2_image3 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk-copy",
id="202") id="202")
ec2_image4 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy", ec2_image4 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk-copy",
id="203") id="203")
self.clients.ec2().get_all_images = mock.Mock( self.clients.ec2().get_all_images = mock.Mock(
@ -290,7 +290,7 @@ class EC2ImageTestCase(test.TestCase):
self.type_cls._clients = self.clients self.type_cls._clients = self.clients
def test_preprocess_by_name(self): def test_preprocess_by_name(self):
resource_spec = {"name": "^cirros-0.3.4-uec$"} resource_spec = {"name": "^cirros-0.5.2-uec$"}
ec2_image_id = self.type_cls.pre_process(resource_spec=resource_spec, ec2_image_id = self.type_cls.pre_process(resource_spec=resource_spec,
config={}) config={})
self.assertEqual("200", ec2_image_id) self.assertEqual("200", ec2_image_id)
@ -308,13 +308,13 @@ class EC2ImageTestCase(test.TestCase):
resource_spec=resource_spec, config={}) resource_spec=resource_spec, config={})
def test_preprocess_by_name_no_match(self): def test_preprocess_by_name_no_match(self):
resource_spec = {"name": "cirros-0.3.4-uec-boot"} resource_spec = {"name": "cirros-0.5.2-uec-boot"}
self.assertRaises(exceptions.InvalidScenarioArgument, self.assertRaises(exceptions.InvalidScenarioArgument,
self.type_cls.pre_process, self.type_cls.pre_process,
resource_spec=resource_spec, config={}) resource_spec=resource_spec, config={})
def test_preprocess_by_name_match_multiple(self): def test_preprocess_by_name_match_multiple(self):
resource_spec = {"name": "cirros-0.3.4-uec-ramdisk-copy"} resource_spec = {"name": "cirros-0.5.2-uec-ramdisk-copy"}
self.assertRaises(exceptions.InvalidScenarioArgument, self.assertRaises(exceptions.InvalidScenarioArgument,
self.type_cls.pre_process, self.type_cls.pre_process,
resource_spec=resource_spec, config={}) resource_spec=resource_spec, config={})