b560b1777c
Added request_ids attribute to resource object for all the volume, volume_types, volume_type_access and volume_snapshots APIs by updating following APIs: volumes: delete, update, force_delete, reset_state, extend, migrate_volume, retype, update_readonly_flag, manage, unmanage, promote, reenable, get_pools, initialize_connection, terminate_connection, get_encryption_metadata volume_types: delete volume_type_access: add_project_access remove_project_access volume_snapshots: delete and update Returning list with request_ids as attribute in case of 'delete_metadata' and 'delete_image_metadata' APIs. These changes are required to return 'request_id' from client to log request_id mappings of cross projects. For more details on how request_id will be returned to the caller, please refer to the approved blueprint [1] discussed with the cross-project team. [1] http://specs.openstack.org/openstack/openstack-specs/specs/return-request-id.html DocImpact 'request-ids' will be returned as an attribute with response object. User can access it using 'res.request_ids' where 'res' is a response object. Change-Id: Icc4565291220278a65e6910a840fba623b750cc4 Partial-Implements: blueprint return-request-id-to-caller
59 lines
2.3 KiB
Python
59 lines
2.3 KiB
Python
# Copyright 2013 Red Hat, Inc.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from cinderclient.tests.unit import utils
|
|
from cinderclient.tests.unit.fixture_data import client
|
|
from cinderclient.tests.unit.fixture_data import snapshots
|
|
|
|
|
|
class SnapshotActionsTest(utils.FixturedTestCase):
|
|
|
|
client_fixture_class = client.V2
|
|
data_fixture_class = snapshots.Fixture
|
|
|
|
def test_update_snapshot_status(self):
|
|
snap = self.cs.volume_snapshots.get('1234')
|
|
self._assert_request_id(snap)
|
|
stat = {'status': 'available'}
|
|
stats = self.cs.volume_snapshots.update_snapshot_status(snap, stat)
|
|
self.assert_called('POST', '/snapshots/1234/action')
|
|
self._assert_request_id(stats)
|
|
|
|
def test_update_snapshot_status_with_progress(self):
|
|
s = self.cs.volume_snapshots.get('1234')
|
|
self._assert_request_id(s)
|
|
stat = {'status': 'available', 'progress': '73%'}
|
|
stats = self.cs.volume_snapshots.update_snapshot_status(s, stat)
|
|
self.assert_called('POST', '/snapshots/1234/action')
|
|
self._assert_request_id(stats)
|
|
|
|
def test_list_snapshots_with_marker_limit(self):
|
|
lst = self.cs.volume_snapshots.list(marker=1234, limit=2)
|
|
self.assert_called('GET', '/snapshots/detail?limit=2&marker=1234')
|
|
self._assert_request_id(lst)
|
|
|
|
def test_list_snapshots_with_sort(self):
|
|
lst = self.cs.volume_snapshots.list(sort="id")
|
|
self.assert_called('GET', '/snapshots/detail?sort=id')
|
|
self._assert_request_id(lst)
|
|
|
|
def test_snapshot_unmanage(self):
|
|
s = self.cs.volume_snapshots.get('1234')
|
|
self._assert_request_id(s)
|
|
snap = self.cs.volume_snapshots.unmanage(s)
|
|
self.assert_called('POST', '/snapshots/1234/action',
|
|
{'os-unmanage': None})
|
|
self._assert_request_id(snap)
|