diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-27 14:33:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-27 14:33:07 +0000 |
| commit | b53008d4eb394b2fe542325ac97e91c9aaee14d7 (patch) | |
| tree | c1412b105f68e27e3f0c75aa4ab10eb733061d83 | |
| parent | 7f63f7d3835a5d6fb468a4759ca31ecc4cb105cc (diff) | |
| parent | 2ba24d09d7a030e15ec47fd7ff0f52ebe08ee1a3 (diff) | |
| download | tempest-b53008d4eb394b2fe542325ac97e91c9aaee14d7.tar.gz | |
Merge "Adjust registration of ami image in boto tests"
| -rw-r--r-- | tempest/thirdparty/boto/test_ec2_instance_run.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tempest/thirdparty/boto/test_ec2_instance_run.py b/tempest/thirdparty/boto/test_ec2_instance_run.py index 8894de023..19a77dce3 100644 --- a/tempest/thirdparty/boto/test_ec2_instance_run.py +++ b/tempest/thirdparty/boto/test_ec2_instance_run.py @@ -68,12 +68,21 @@ class InstanceRunTest(boto_test.BotoTestCase): "ari": {"name": data_utils.rand_name("ari-name"), "location": cls.bucket_name + "/" + ari_manifest}} - for image in cls.images.itervalues(): + for image_type in ("aki", "ari"): + image = cls.images[image_type] image["image_id"] = cls.ec2_client.register_image( name=image["name"], image_location=image["location"]) cls.addResourceCleanUp(cls.ec2_client.deregister_image, image["image_id"]) + image = cls.images["ami"] + image["image_id"] = cls.ec2_client.register_image( + name=image["name"], + image_location=image["location"], + kernel_id=cls.images["aki"]["image_id"], + ramdisk_id=cls.images["ari"]["image_id"]) + cls.addResourceCleanUp(cls.ec2_client.deregister_image, + image["image_id"]) for image in cls.images.itervalues(): def _state(): |