openstack
/
tempest
Code Issues Proposed changes

Merge "Add same extra specs as self.flavor_ref for created new flavor"

This commit is contained in:
Zuul 2018-01-18 07:00:23 +00:00 committed by Gerrit Code Review
parent cfa0041a41 c88e0a1fb8
commit 1555a2b090
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tempest/api/compute/admin/test_create_server.py
View File

@ -56,6 +56,18 @@ class ServersWithSpecificFlavorTestJSON(base.BaseV2ComputeAdminTest):
# Create a flavor with ephemeral disk
flavor = self.create_flavor(name=flavor_name, ram=ram, vcpus=vcpus,
disk=disk, ephemeral=ephem_disk)
# Set extra specs same as self.flavor_ref for the created flavor,
# because the environment may need some special extra specs to
# create server which should have been contained in
# self.flavor_ref.
extra_spec_keys = \
self.admin_flavors_client.list_flavor_extra_specs(
self.flavor_ref)['extra_specs']
if extra_spec_keys:
self.admin_flavors_client.set_flavor_extra_spec(
flavor['id'], **extra_spec_keys)
return flavor['id']
flavor_with_eph_disk_id = create_flavor_with_ephemeral(ephem_disk=1)

10
tempest/api/compute/admin/test_migrations.py
View File

@ -77,6 +77,16 @@ class MigrationsAdminTest(base.BaseV2ComputeAdminTest):
)['flavor']
self.addCleanup(self._flavor_clean_up, flavor['id'])
# Set extra specs same as self.flavor_ref for the created flavor,
# because the environment may need some special extra specs to
# create server which should have been contained in
# self.flavor_ref.
extra_spec_keys = self.admin_flavors_client.list_flavor_extra_specs(
self.flavor_ref)['extra_specs']
if extra_spec_keys:
self.admin_flavors_client.set_flavor_extra_spec(
flavor['id'], **extra_spec_keys)
# Now boot a server with the copied flavor.
server = self.create_test_server(
wait_until='ACTIVE', flavor=flavor['id'])