Merge "Rename compute.service.zone to availability_zone"

openstack/compute/v2/service.py

@@ -37,7 +37,7 @@ class Service(resource.Resource):
     #: Host where service runs
     host = resource.Body('host')
     #: The availability zone of service
-    zone = resource.Body("zone")
+    availability_zone = resource.Body("zone")
 
     def _action(self, session, action, body):
         url = utils.urljoin(Service.base_path, action)

openstack/tests/unit/compute/v2/test_service.py

@@ -51,7 +51,7 @@ class TestService(base.TestCase):
         self.assertEqual(EXAMPLE['binary'], sot.binary)
         self.assertEqual(EXAMPLE['status'], sot.status)
         self.assertEqual(EXAMPLE['state'], sot.state)
-        self.assertEqual(EXAMPLE['zone'], sot.zone)
+        self.assertEqual(EXAMPLE['zone'], sot.availability_zone)
         self.assertEqual(EXAMPLE['id'], sot.id)
 
     def test_force_down(self):

releasenotes/notes/compute-service-zone-2b25ec705b0156c4.yaml

@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    The ``zone`` attribute on compute ``Service`` objects
+    has been renamed to ``availability_zone`` to match all
+    of the other resources, and also to better integrate
+    with the ``Resource.location`` attribute.