Bump tempest version
After merge of change [1] to Devstack project Manila Tempest plugin not compatible anymore with latest Devstack. So, bump Tempest version to latest and fix compatibility with it. [1] If66096cde31fedda407e1e6ac6899b196569a454 Change-Id: Idf9a9eabf9c98d090e47207cf89d9e5a5fc0ea97 Closes-Bug: #1539007
This commit is contained in:
parent
b81b98b2b7
commit
70871c2479
|
@ -1,6 +1,6 @@
|
||||||
# Environment variables
|
# Environment variables
|
||||||
|
|
||||||
export MANILA_TEMPEST_COMMIT="d160c29b" # 01 Dec, 2015
|
export MANILA_TEMPEST_COMMIT="047f6b27" # 28 Jan, 2016
|
||||||
|
|
||||||
# ----------------------------------------------
|
# ----------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@ class ShareBasicOpsBase(manager.ShareScenarioTest):
|
||||||
if not hasattr(self, 'flavor_ref'):
|
if not hasattr(self, 'flavor_ref'):
|
||||||
self.flavor_ref = CONF.share.client_vm_flavor_ref
|
self.flavor_ref = CONF.share.client_vm_flavor_ref
|
||||||
if CONF.share.image_with_share_tools:
|
if CONF.share.image_with_share_tools:
|
||||||
images = self.images_client.list_images()["images"]
|
images = self.compute_images_client.list_images()["images"]
|
||||||
for img in images:
|
for img in images:
|
||||||
if img["name"] == CONF.share.image_with_share_tools:
|
if img["name"] == CONF.share.image_with_share_tools:
|
||||||
self.image_ref = img['id']
|
self.image_ref = img['id']
|
||||||
|
@ -69,12 +69,12 @@ class ShareBasicOpsBase(manager.ShareScenarioTest):
|
||||||
create_kwargs = {
|
create_kwargs = {
|
||||||
'key_name': self.keypair['name'],
|
'key_name': self.keypair['name'],
|
||||||
'security_groups': security_groups,
|
'security_groups': security_groups,
|
||||||
|
'wait_until': 'ACTIVE',
|
||||||
}
|
}
|
||||||
if CONF.share.multitenancy_enabled:
|
if CONF.share.multitenancy_enabled:
|
||||||
create_kwargs['networks'] = [{'uuid': self.net['id']}, ]
|
create_kwargs['networks'] = [{'uuid': self.net['id']}, ]
|
||||||
instance = self.create_server(image=self.image_ref,
|
instance = self.create_server(
|
||||||
create_kwargs=create_kwargs,
|
image_id=self.image_ref, flavor=self.flavor_ref, **create_kwargs)
|
||||||
flavor=self.flavor_ref)
|
|
||||||
return instance
|
return instance
|
||||||
|
|
||||||
def init_ssh(self, instance, do_ping=False):
|
def init_ssh(self, instance, do_ping=False):
|
||||||
|
|
Loading…
Reference in New Issue