openstack
/
manila
Code Issues Proposed changes

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:
Valeriy Ponomaryov 2016-01-28 12:33:19 +02:00 committed by vponomaryov
parent b81b98b2b7
commit 70871c2479
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/ci/common.sh
View File

@ -1,6 +1,6 @@
# Environment variables
export MANILA_TEMPEST_COMMIT="d160c29b" # 01 Dec, 2015
export MANILA_TEMPEST_COMMIT="047f6b27" # 28 Jan, 2016
# ----------------------------------------------

8
manila_tempest_tests/tests/scenario/test_share_basic_ops.py
View File

@ -48,7 +48,7 @@ class ShareBasicOpsBase(manager.ShareScenarioTest):
if not hasattr(self, 'flavor_ref'):
self.flavor_ref = CONF.share.client_vm_flavor_ref
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:
if img["name"] == CONF.share.image_with_share_tools:
self.image_ref = img['id']
@ -69,12 +69,12 @@ class ShareBasicOpsBase(manager.ShareScenarioTest):
create_kwargs = {
'key_name': self.keypair['name'],
'security_groups': security_groups,
'wait_until': 'ACTIVE',
}
if CONF.share.multitenancy_enabled:
create_kwargs['networks'] = [{'uuid': self.net['id']}, ]
instance = self.create_server(image=self.image_ref,
create_kwargs=create_kwargs,
flavor=self.flavor_ref)
instance = self.create_server(
image_id=self.image_ref, flavor=self.flavor_ref, **create_kwargs)
return instance
def init_ssh(self, instance, do_ping=False):