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
79 lines
2.5 KiB
Python
79 lines
2.5 KiB
Python
# 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.
|
|
|
|
import json
|
|
|
|
from cinderclient.tests.unit.fixture_data import base
|
|
|
|
|
|
REQUEST_ID = 'req-test-request-id'
|
|
|
|
|
|
def _stub_snapshot(**kwargs):
|
|
snapshot = {
|
|
"created_at": "2012-08-28T16:30:31.000000",
|
|
"display_description": None,
|
|
"display_name": None,
|
|
"id": '11111111-1111-1111-1111-111111111111',
|
|
"size": 1,
|
|
"status": "available",
|
|
"volume_id": '00000000-0000-0000-0000-000000000000',
|
|
}
|
|
snapshot.update(kwargs)
|
|
return snapshot
|
|
|
|
|
|
class Fixture(base.Fixture):
|
|
|
|
base_url = 'snapshots'
|
|
|
|
def setUp(self):
|
|
super(Fixture, self).setUp()
|
|
|
|
snapshot_1234 = _stub_snapshot(id='1234')
|
|
self.requests.register_uri(
|
|
'GET', self.url('1234'),
|
|
json={'snapshot': snapshot_1234},
|
|
headers={'x-openstack-request-id': REQUEST_ID}
|
|
)
|
|
|
|
def action_1234(request, context):
|
|
return ''
|
|
body = json.loads(request.body.decode('utf-8'))
|
|
assert len(list(body)) == 1
|
|
action = list(body)[0]
|
|
if action == 'os-reset_status':
|
|
assert 'status' in body['os-reset_status']
|
|
elif action == 'os-update_snapshot_status':
|
|
assert 'status' in body['os-update_snapshot_status']
|
|
else:
|
|
raise AssertionError("Unexpected action: %s" % action)
|
|
return ''
|
|
|
|
self.requests.register_uri(
|
|
'POST', self.url('1234', 'action'),
|
|
text=action_1234, status_code=202,
|
|
headers={'x-openstack-request-id': REQUEST_ID}
|
|
)
|
|
|
|
self.requests.register_uri(
|
|
'GET', self.url('detail?limit=2&marker=1234'),
|
|
status_code=200, json={'snapshots': []},
|
|
headers={'x-openstack-request-id': REQUEST_ID}
|
|
)
|
|
|
|
self.requests.register_uri(
|
|
'GET', self.url('detail?sort=id'),
|
|
status_code=200, json={'snapshots': []},
|
|
headers={'x-openstack-request-id': REQUEST_ID}
|
|
)
|