From 5203c5cb6c8bdd59792890d815c355461d46aed6 Mon Sep 17 00:00:00 2001 From: maestropandy Date: Tue, 28 Jun 2016 18:51:08 +0530 Subject: zone_name is null in zone trasfer request response The response to API call has zone_id set with zone id but zone name is set to 'null'. Change-Id: Id2d093891953efcbb125560ea1113b8a9e613a9c Closes-Bug: #1580014 --- designate/api/v2/controllers/zones/tasks/transfer_requests.py | 2 ++ designate/objects/adapters/api_v2/zone_transfer_request.py | 1 + designate/tests/test_api/test_v2/test_zone_transfers.py | 3 +++ .../zone_name-null-zone-trasfer-request-response-a2e316872798d1df.yaml | 3 +++ 4 files changed, 9 insertions(+) create mode 100644 releasenotes/notes/zone_name-null-zone-trasfer-request-response-a2e316872798d1df.yaml diff --git a/designate/api/v2/controllers/zones/tasks/transfer_requests.py b/designate/api/v2/controllers/zones/tasks/transfer_requests.py index 3012338b..eba70d04 100644 --- a/designate/api/v2/controllers/zones/tasks/transfer_requests.py +++ b/designate/api/v2/controllers/zones/tasks/transfer_requests.py @@ -75,6 +75,8 @@ class TransferRequestsController(rest.RestController): except exceptions.EmptyRequestBody: body = dict() + zone = self.central_api.get_zone(context, zone_id) + body['zone_name'] = zone.name body['zone_id'] = zone_id zone_transfer_request = DesignateAdapter.parse( diff --git a/designate/objects/adapters/api_v2/zone_transfer_request.py b/designate/objects/adapters/api_v2/zone_transfer_request.py index e7ea939c..7eaf8ada 100644 --- a/designate/objects/adapters/api_v2/zone_transfer_request.py +++ b/designate/objects/adapters/api_v2/zone_transfer_request.py @@ -49,6 +49,7 @@ class ZoneTransferRequestAPIv2Adapter(base.APIv2Adapter): 'protected': False }, "zone_name": { + 'immutable': True, 'protected': False }, "created_at": {}, diff --git a/designate/tests/test_api/test_v2/test_zone_transfers.py b/designate/tests/test_api/test_v2/test_zone_transfers.py index 8b204e8a..a42c1ff6 100644 --- a/designate/tests/test_api/test_v2/test_zone_transfers.py +++ b/designate/tests/test_api/test_v2/test_zone_transfers.py @@ -41,6 +41,9 @@ class ApiV2ZoneTransfersTest(ApiV2TestCase): self.assertIn('id', response.json) self.assertIn('created_at', response.json) self.assertEqual('ACTIVE', response.json['status']) + self.assertEqual( + self.zone.name, + response.json['zone_name']) self.assertEqual( self.zone.id, response.json['zone_id']) diff --git a/releasenotes/notes/zone_name-null-zone-trasfer-request-response-a2e316872798d1df.yaml b/releasenotes/notes/zone_name-null-zone-trasfer-request-response-a2e316872798d1df.yaml new file mode 100644 index 00000000..5e015453 --- /dev/null +++ b/releasenotes/notes/zone_name-null-zone-trasfer-request-response-a2e316872798d1df.yaml @@ -0,0 +1,3 @@ +--- +fixes: + - Added zone_name in zone trasfer request response. Closed bug#1580014 -- cgit v1.2.1