openstack/manila
Code Issues Proposed changes

Merge "Fix experimental=True for view in microversion 2.5"

Browse Source
This commit is contained in:
Jenkins 2015-09-18 22:00:55 +00:00 committed by Gerrit Code Review
commit 3504ea68c4
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manila/api/views/shares.py
View File

@ -100,7 +100,7 @@ class ViewBuilder(common.ViewBuilder):
share_dict['source_cgsnapshot_member_id'] = share.get( share_dict['source_cgsnapshot_member_id'] = share.get(
'source_cgsnapshot_member_id') 'source_cgsnapshot_member_id')
@common.ViewBuilder.versioned_method("2.5", None, True) @common.ViewBuilder.versioned_method("2.5")
def add_task_state_field(self, share_dict, share): def add_task_state_field(self, share_dict, share):
share_dict['task_state'] = share.get('task_state') share_dict['task_state'] = share.get('task_state')

6
manila/tests/api/v1/test_shares.py
View File

@ -164,6 +164,9 @@ class ShareApiTest(test.TestCase):
expected = self._get_expected_share_detailed_response(self.share) expected = self._get_expected_share_detailed_response(self.share)
expected['share']['consistency_group_id'] = None expected['share']['consistency_group_id'] = None
expected['share']['source_cgsnapshot_member_id'] = None expected['share']['source_cgsnapshot_member_id'] = None
if (api_version.APIVersionRequest(microversion) >=
api_version.APIVersionRequest('2.5')):
expected['share']['task_state'] = None
self.assertEqual(expected, res_dict) self.assertEqual(expected, res_dict)
def test_share_create_with_valid_default_share_type(self): def test_share_create_with_valid_default_share_type(self):
@ -457,6 +460,7 @@ class ShareApiTest(test.TestCase):
expected['share']['consistency_group_id'] = None expected['share']['consistency_group_id'] = None
expected['share']['source_cgsnapshot_member_id'] = None expected['share']['source_cgsnapshot_member_id'] = None
expected['share']['share_type_name'] = None expected['share']['share_type_name'] = None
expected['share']['task_state'] = None
self.assertEqual(expected, res_dict) self.assertEqual(expected, res_dict)
def test_share_show_admin(self): def test_share_show_admin(self):
@ -783,7 +787,7 @@ class ShareApiTest(test.TestCase):
def test_share_list_detail_with_task_state(self): def test_share_list_detail_with_task_state(self):
env = {'QUERY_STRING': 'name=Share+Test+Name'} env = {'QUERY_STRING': 'name=Share+Test+Name'}
req = fakes.HTTPRequest.blank('/shares/detail', environ=env, req = fakes.HTTPRequest.blank('/shares/detail', environ=env,
version="2.5", experimental=True) version="2.5")
expected = self._list_detail_common_expected() expected = self._list_detail_common_expected()
expected['shares'][0]['consistency_group_id'] = None expected['shares'][0]['consistency_group_id'] = None
expected['shares'][0]['source_cgsnapshot_member_id'] = None expected['shares'][0]['source_cgsnapshot_member_id'] = None

18
manila_tempest_tests/services/share/v2/json/shares_client.py
View File

@ -220,15 +220,8 @@ class SharesV2Client(shares_client.SharesClient):
"""Get detailed list of shares w/o filters.""" """Get detailed list of shares w/o filters."""
return self.list_shares(detailed=True, params=params, version=version) return self.list_shares(detailed=True, params=params, version=version)
def get_share(self, share_id, version=LATEST_MICROVERSION, def get_share(self, share_id, version=LATEST_MICROVERSION):
experimental=False): resp, body = self.get("shares/%s" % share_id, version=version)
headers = None
extra_headers = False
if experimental:
headers = EXPERIMENTAL
extra_headers = True
resp, body = self.get("shares/%s" % share_id, version=version,
headers=headers, extra_headers=extra_headers)
self.expected_success(200, resp.status) self.expected_success(200, resp.status)
return self._parse_resp(body) return self._parse_resp(body)
@ -498,14 +491,15 @@ class SharesV2Client(shares_client.SharesClient):
headers=EXPERIMENTAL, extra_headers=True, headers=EXPERIMENTAL, extra_headers=True,
version=version) version=version)
def wait_for_migration_completed(self, share_id, dest_host): def wait_for_migration_completed(self, share_id, dest_host,
version=LATEST_MICROVERSION):
"""Waits for a share to migrate to a certain host.""" """Waits for a share to migrate to a certain host."""
share = self.get_share(share_id, "2.5", True) share = self.get_share(share_id, version=version)
migration_timeout = CONF.share.migration_timeout migration_timeout = CONF.share.migration_timeout
start = int(time.time()) start = int(time.time())
while share['task_state'] != 'migration_success': while share['task_state'] != 'migration_success':
time.sleep(self.build_interval) time.sleep(self.build_interval)
share = self.get_share(share_id, "2.5", True) share = self.get_share(share_id, version=version)
if share['task_state'] == 'migration_success': if share['task_state'] == 'migration_success':
return share return share
elif share['task_state'] == 'migration_error': elif share['task_state'] == 'migration_error':