summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaestropandy <maestropandy@gmail.com>2016-06-28 18:51:08 +0530
committerKiall Mac Innes <kiall@macinnes.ie>2016-10-28 12:52:22 +0000
commit5203c5cb6c8bdd59792890d815c355461d46aed6 (patch)
treef4e869ab3d1c45a051745037bd0038f4d1ed5761
parent160c17114b48275ab1ae87cd254a1c9662dce6cf (diff)
downloaddesignate-stable/mitaka.tar.gz
zone_name is null in zone trasfer request responsemitaka-eol2.1.0stable/mitaka
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
-rw-r--r--designate/api/v2/controllers/zones/tasks/transfer_requests.py2
-rw-r--r--designate/objects/adapters/api_v2/zone_transfer_request.py1
-rw-r--r--designate/tests/test_api/test_v2/test_zone_transfers.py3
-rw-r--r--releasenotes/notes/zone_name-null-zone-trasfer-request-response-a2e316872798d1df.yaml3
4 files changed, 9 insertions, 0 deletions
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
@@ -42,6 +42,9 @@ class ApiV2ZoneTransfersTest(ApiV2TestCase):
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'])
self.assertIsNone(response.json['updated_at'])
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