From 660f8bbb0193d471d8c2ef0c14f4f21f4a58c7c8 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 18 Apr 2016 17:07:20 -0400 Subject: [PATCH] Update 'zone.dns_name' during 'zone.reload'. Closes #1720. --- gcloud/dns/test_zone.py | 4 +++- gcloud/dns/zone.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gcloud/dns/test_zone.py b/gcloud/dns/test_zone.py index 4e2b0c87900e..b0609c2138e0 100644 --- a/gcloud/dns/test_zone.py +++ b/gcloud/dns/test_zone.py @@ -349,10 +349,12 @@ def test_reload_w_bound_client(self): RESOURCE = self._makeResource() conn = _Connection(RESOURCE) client = _Client(project=self.PROJECT, connection=conn) - zone = self._makeOne(self.ZONE_NAME, self.DNS_NAME, client) + zone = self._makeOne(self.ZONE_NAME, client=client) zone.reload() + self.assertEqual(zone.dns_name, self.DNS_NAME) + self.assertEqual(len(conn._requested), 1) req = conn._requested[0] self.assertEqual(req['method'], 'GET') diff --git a/gcloud/dns/zone.py b/gcloud/dns/zone.py index d5183880a531..2a7df03da6ea 100644 --- a/gcloud/dns/zone.py +++ b/gcloud/dns/zone.py @@ -219,6 +219,7 @@ def _set_properties(self, api_response): """ self._properties.clear() cleaned = api_response.copy() + self.dns_name = cleaned.pop('dnsName', None) if 'creationTime' in cleaned: cleaned['creationTime'] = _rfc3339_to_datetime( cleaned['creationTime'])