f194a5abad
Add return-request-id-to-caller function to resources and resource managers in the following files. The methods in the resource class and resource manager return a wrapper class that has 'request_ids' property. The caller can get request ids of the callee via the property. * novaclient/v2/agents.py * novaclient/v2/aggregates.py * novaclient/v2/availability_zones.py * novaclient/v2/certs.py * novaclient/v2/cloudpipe.py * novaclient/v2/fixed_ips.py * novaclient/v2/flavor_access.py * novaclient/v2/flavors.py * novaclient/v2/floating_ip_dns.py * novaclient/v2/floating_ip_pools.py * novaclient/v2/floating_ips_bulk.py * novaclient/v2/floating_ips.py * novaclient/v2/fping.py * novaclient/v2/hosts.py * novaclient/v2/hypervisors.py * novaclient/v2/images.py Co-authored-by: Ankit Agrawal <ankit11.agrawal@nttdata.com> Change-Id: Ic624d532f1a468dd45105bbb5aa6d8a730984338 Implements: blueprint return-request-id-to-caller
88 lines
2.8 KiB
Python
88 lines
2.8 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.
|
|
|
|
from oslo_serialization import jsonutils
|
|
|
|
from novaclient.tests.unit import fakes
|
|
from novaclient.tests.unit.fixture_data import base
|
|
|
|
|
|
class V1(base.Fixture):
|
|
|
|
base_url = 'images'
|
|
|
|
def setUp(self):
|
|
super(V1, self).setUp()
|
|
|
|
get_images = {
|
|
'images': [
|
|
{'id': 1, 'name': 'CentOS 5.2'},
|
|
{'id': 2, 'name': 'My Server Backup'}
|
|
]
|
|
}
|
|
|
|
headers = self.json_headers
|
|
|
|
self.requests.register_uri('GET', self.url(),
|
|
json=get_images,
|
|
headers=headers)
|
|
|
|
image_1 = {
|
|
'id': 1,
|
|
'name': 'CentOS 5.2',
|
|
"updated": "2010-10-10T12:00:00Z",
|
|
"created": "2010-08-10T12:00:00Z",
|
|
"status": "ACTIVE",
|
|
"metadata": {
|
|
"test_key": "test_value",
|
|
},
|
|
"links": {},
|
|
}
|
|
|
|
image_2 = {
|
|
"id": 2,
|
|
"name": "My Server Backup",
|
|
"serverId": 1234,
|
|
"updated": "2010-10-10T12:00:00Z",
|
|
"created": "2010-08-10T12:00:00Z",
|
|
"status": "SAVING",
|
|
"progress": 80,
|
|
"links": {},
|
|
}
|
|
|
|
self.requests.register_uri('GET', self.url('detail'),
|
|
json={'images': [image_1, image_2]},
|
|
headers=headers)
|
|
|
|
self.requests.register_uri('GET', self.url(1),
|
|
json={'image': image_1},
|
|
headers=headers)
|
|
|
|
def post_images_1_metadata(request, context):
|
|
body = jsonutils.loads(request.body)
|
|
assert list(body) == ['metadata']
|
|
fakes.assert_has_keys(body['metadata'], required=['test_key'])
|
|
return {'metadata': image_1['metadata']}
|
|
|
|
self.requests.register_uri('POST', self.url(1, 'metadata'),
|
|
json=post_images_1_metadata,
|
|
headers=headers)
|
|
|
|
for u in (1, '1/metadata/test_key'):
|
|
self.requests.register_uri('DELETE', self.url(u), status_code=204,
|
|
headers=headers)
|
|
|
|
|
|
class V3(V1):
|
|
|
|
base_url = 'v1/images'
|