openstack/rally
Code Issues Proposed changes

Update to latest available CirrOS version 0.3.4

Browse Source 
Change-Id: If35b719e215f61802fa9fecadb9dc0969d7f4c0c
This commit is contained in:
Christian Berendt 2015-08-06 23:41:23 +02:00
parent 14765ab0b4
commit b84c7269d3
15 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/tutorial/step_1_setting_up_env_and_running_benchmark_from_samples.rst
View File

@ -187,7 +187,7 @@ Note that the Rally input task above uses *regular expressions* to specify the i
| UUID | Name | Size (B) |
+--------------------------------------+-----------------------+-----------+
| 8dfd6098-0c26-4cb5-8e77-1ecb2db0b8ae | CentOS 6.5 (x86_64) | 344457216 |
| 2b8d119e-9461-48fc-885b-1477abe2edc5 | CirrOS 0.3.1 (x86_64) | 13147648 |
| 2b8d119e-9461-48fc-885b-1477abe2edc5 | CirrOS 0.3.4 (x86_64) | 13287936 |
+--------------------------------------+-----------------------+-----------+
$ rally show flavors

18
doc/source/tutorial/step_3_benchmarking_with_existing_users.rst
View File

@ -86,30 +86,30 @@ After that, the **rally show** command lists the resources for each user separat
+--------------------------------------+---------------------------------+-----------+
| UUID | Name | Size (B) |
+--------------------------------------+---------------------------------+-----------+
| 041cfd70-0e90-4ed6-8c0c-ad9c12a94191 | cirros-0.3.2-x86_64-uec | 25165824 |
| 041cfd70-0e90-4ed6-8c0c-ad9c12a94191 | cirros-0.3.4-x86_64-uec | 25165824 |
| 87710f09-3625-4496-9d18-e20e34906b72 | Fedora-x86_64-20-20140618-sda | 209649664 |
| b0f269be-4859-48e0-a0ca-03fb80d14602 | cirros-0.3.2-x86_64-uec-ramdisk | 3723817 |
| d82eaf7a-ff63-4826-9aa7-5fa105610e01 | cirros-0.3.2-x86_64-uec-kernel | 4969360 |
| b0f269be-4859-48e0-a0ca-03fb80d14602 | cirros-0.3.4-x86_64-uec-ramdisk | 3740163 |
| d82eaf7a-ff63-4826-9aa7-5fa105610e01 | cirros-0.3.4-x86_64-uec-kernel | 4979632 |
+--------------------------------------+---------------------------------+-----------+
Images for user `b1` in tenant `testing`:
+--------------------------------------+---------------------------------+-----------+
| UUID | Name | Size (B) |
+--------------------------------------+---------------------------------+-----------+
| 041cfd70-0e90-4ed6-8c0c-ad9c12a94191 | cirros-0.3.2-x86_64-uec | 25165824 |
| 041cfd70-0e90-4ed6-8c0c-ad9c12a94191 | cirros-0.3.4-x86_64-uec | 25165824 |
| 87710f09-3625-4496-9d18-e20e34906b72 | Fedora-x86_64-20-20140618-sda | 209649664 |
| b0f269be-4859-48e0-a0ca-03fb80d14602 | cirros-0.3.2-x86_64-uec-ramdisk | 3723817 |
| d82eaf7a-ff63-4826-9aa7-5fa105610e01 | cirros-0.3.2-x86_64-uec-kernel | 4969360 |
| b0f269be-4859-48e0-a0ca-03fb80d14602 | cirros-0.3.4-x86_64-uec-ramdisk | 3740163 |
| d82eaf7a-ff63-4826-9aa7-5fa105610e01 | cirros-0.3.4-x86_64-uec-kernel | 4979632 |
+--------------------------------------+---------------------------------+-----------+
Images for user `b2` in tenant `testing`:
+--------------------------------------+---------------------------------+-----------+
| UUID | Name | Size (B) |
+--------------------------------------+---------------------------------+-----------+
| 041cfd70-0e90-4ed6-8c0c-ad9c12a94191 | cirros-0.3.2-x86_64-uec | 25165824 |
| 041cfd70-0e90-4ed6-8c0c-ad9c12a94191 | cirros-0.3.4-x86_64-uec | 25165824 |
| 87710f09-3625-4496-9d18-e20e34906b72 | Fedora-x86_64-20-20140618-sda | 209649664 |
| b0f269be-4859-48e0-a0ca-03fb80d14602 | cirros-0.3.2-x86_64-uec-ramdisk | 3723817 |
| d82eaf7a-ff63-4826-9aa7-5fa105610e01 | cirros-0.3.2-x86_64-uec-kernel | 4969360 |
| b0f269be-4859-48e0-a0ca-03fb80d14602 | cirros-0.3.4-x86_64-uec-ramdisk | 3740163 |
| d82eaf7a-ff63-4826-9aa7-5fa105610e01 | cirros-0.3.4-x86_64-uec-kernel | 4979632 |
+--------------------------------------+---------------------------------+-----------+
With this new deployment being active, Rally will use the already existing users *"b1"* and *"b2"* instead of creating the temporary ones when launching benchmark task that do not specify the *"users"* context.

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

@ -606,10 +606,10 @@
#
# Version of cirros image (string value)
#cirros_version = 0.3.2
#cirros_version = 0.3.4
# Cirros image name (string value)
#cirros_image = cirros-0.3.2-x86_64-disk.img
#cirros_image = cirros-0.3.4-x86_64-disk.img
# Cirros image base URL (string value)
#cirros_base_url = http://download.cirros-cloud.net

4
rally-jobs/rally.yaml
View File

@ -930,7 +930,7 @@
GlanceImages.create_and_delete_image:
-
args:
image_location: "http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-disk.img"
image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
container_format: "bare"
disk_format: "qcow2"
runner:
@ -966,7 +966,7 @@
GlanceImages.create_image_and_boot_instances:
-
args:
image_location: "http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-disk.img"
image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
container_format: "bare"
disk_format: "qcow2"
flavor:

4
rally/verification/tempest/config.py
View File

@ -36,10 +36,10 @@ LOG = logging.getLogger(__name__)
IMAGE_OPTS = [
cfg.StrOpt("cirros_version",
default="0.3.2",
default="0.3.4",
help="Version of cirros image"),
cfg.StrOpt("cirros_image",
default="cirros-0.3.2-x86_64-disk.img",
default="cirros-0.3.4-x86_64-disk.img",
help="Cirros image name"),
cfg.StrOpt("cirros_base_url",
default="http://download.cirros-cloud.net",

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

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

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

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

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

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

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

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

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

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

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

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

2
samples/tasks/scenarios/glance/list_images.json
View File

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

2
samples/tasks/scenarios/glance/list_images.yaml
View File

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

4
tests/unit/plugins/openstack/context/nova/test_servers.py
View File

@ -87,7 +87,7 @@ class ServerGeneratorTestCase(test.ScenarioTestCase):
"servers": {
"servers_per_tenant": 5,
"image": {
"name": "cirros-0.3.2-x86_64-uec",
"name": "cirros-0.3.4-x86_64-uec",
},
"flavor": {
"name": "m1.tiny",
@ -140,7 +140,7 @@ class ServerGeneratorTestCase(test.ScenarioTestCase):
"servers": {
"servers_per_tenant": 5,
"image": {
"name": "cirros-0.3.2-x86_64-uec",
"name": "cirros-0.3.4-x86_64-uec",
},
"flavor": {
"name": "m1.tiny",

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

@ -127,14 +127,14 @@ class ImageResourceTypeTestCase(test.TestCase):
def setUp(self):
super(ImageResourceTypeTestCase, self).setUp()
self.clients = fakes.FakeClients()
image1 = fakes.FakeResource(name="cirros-0.3.1-uec", id="100")
image1 = fakes.FakeResource(name="cirros-0.3.4-uec", id="100")
self.clients.glance().images._cache(image1)
image2 = fakes.FakeResource(name="cirros-0.3.1-uec-ramdisk", id="101")
image2 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk", id="101")
self.clients.glance().images._cache(image2)
image3 = fakes.FakeResource(name="cirros-0.3.1-uec-ramdisk-copy",
image3 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy",
id="102")
self.clients.glance().images._cache(image3)
image4 = fakes.FakeResource(name="cirros-0.3.1-uec-ramdisk-copy",
image4 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy",
id="103")
self.clients.glance().images._cache(image4)
@ -145,19 +145,19 @@ class ImageResourceTypeTestCase(test.TestCase):
self.assertEqual(image_id, "100")
def test_transform_by_name(self):
resource_config = {"name": "^cirros-0.3.1-uec$"}
resource_config = {"name": "^cirros-0.3.4-uec$"}
image_id = types.ImageResourceType.transform(
clients=self.clients, resource_config=resource_config)
self.assertEqual(image_id, "100")
def test_transform_by_name_no_match(self):
resource_config = {"name": "cirros-0.3.1-uec-boot"}
resource_config = {"name": "cirros-0.3.4-uec-boot"}
self.assertRaises(exceptions.InvalidScenarioArgument,
types.ImageResourceType.transform, self.clients,
resource_config)
def test_transform_by_name_match_multiple(self):
resource_config = {"name": "cirros-0.3.1-uec-ramdisk-copy"}
resource_config = {"name": "cirros-0.3.4-uec-ramdisk-copy"}
self.assertRaises(exceptions.InvalidScenarioArgument,
types.ImageResourceType.transform, self.clients,
resource_config)
@ -186,30 +186,30 @@ class EC2ImageResourceTypeTestCase(test.TestCase):
def setUp(self):
super(EC2ImageResourceTypeTestCase, self).setUp()
self.clients = fakes.FakeClients()
image1 = fakes.FakeResource(name="cirros-0.3.1-uec", id="100")
image1 = fakes.FakeResource(name="cirros-0.3.4-uec", id="100")
self.clients.glance().images._cache(image1)
image2 = fakes.FakeResource(name="cirros-0.3.1-uec-ramdisk", id="102")
image2 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk", id="102")
self.clients.glance().images._cache(image2)
image3 = fakes.FakeResource(name="cirros-0.3.1-uec-ramdisk-copy",
image3 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy",
id="102")
self.clients.glance().images._cache(image3)
image4 = fakes.FakeResource(name="cirros-0.3.1-uec-ramdisk-copy",
image4 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy",
id="103")
self.clients.glance().images._cache(image4)
ec2_image1 = fakes.FakeResource(name="cirros-0.3.1-uec", id="200")
ec2_image2 = fakes.FakeResource(name="cirros-0.3.1-uec-ramdisk",
ec2_image1 = fakes.FakeResource(name="cirros-0.3.4-uec", id="200")
ec2_image2 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk",
id="201")
ec2_image3 = fakes.FakeResource(name="cirros-0.3.1-uec-ramdisk-copy",
ec2_image3 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy",
id="202")
ec2_image4 = fakes.FakeResource(name="cirros-0.3.1-uec-ramdisk-copy",
ec2_image4 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy",
id="203")
self.clients.ec2().get_all_images = mock.Mock(
return_value=[ec2_image1, ec2_image2, ec2_image3, ec2_image4])
def test_transform_by_name(self):
resource_config = {"name": "^cirros-0.3.1-uec$"}
resource_config = {"name": "^cirros-0.3.4-uec$"}
ec2_image_id = types.EC2ImageResourceType.transform(
clients=self.clients, resource_config=resource_config)
self.assertEqual(ec2_image_id, "200")
@ -233,13 +233,13 @@ class EC2ImageResourceTypeTestCase(test.TestCase):
resource_config)
def test_transform_by_name_no_match(self):
resource_config = {"name": "cirros-0.3.1-uec-boot"}
resource_config = {"name": "cirros-0.3.4-uec-boot"}
self.assertRaises(exceptions.InvalidScenarioArgument,
types.EC2ImageResourceType.transform, self.clients,
resource_config)
def test_transform_by_name_match_multiple(self):
resource_config = {"name": "cirros-0.3.1-uec-ramdisk-copy"}
resource_config = {"name": "cirros-0.3.4-uec-ramdisk-copy"}
self.assertRaises(exceptions.InvalidScenarioArgument,
types.EC2ImageResourceType.transform, self.clients,
resource_config)