Merge pull request #1730 from tseaver/1720-update_zone_dns_name_in_re…

…load Update 'zone.dns_name' during 'zone.reload'.
googleapis · Apr 19, 2016 · f498b06 · f498b06
2 parents 18a1af4 + 660f8bb
commit f498b06
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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'])