Pass availability zone through to volume creation.

New config option `enable_volume_az` (defaults to false)
ensures that the instance and volume will be created in the same
availability zone.

Story: 2008313
Task: 41208

Change-Id: I62ea46991c7398fba4e5027d5170038624d5aec9

2 files changed, 7 insertions, 9 deletions

diff --git a/trove/tests/fakes/nova.py b/trove/tests/fakes/nova.py
index cc896c5c..a0779147 100644
--- a/trove/tests/fakes/nova.py
+++ b/trove/tests/fakes/nova.py
@@ -358,7 +358,7 @@ class FakeRdServers(object):
 class FakeVolume(object):
 
     def __init__(self, parent, owner, id, size, name,
-                 description, volume_type):
+                 description, volume_type, availability_zone):
         self.attachments = []
         self.parent = parent
         self.owner = owner  # This is a context.
@@ -371,6 +371,7 @@ class FakeVolume(object):
         # point.
         self.device = "vdb"
         self.volume_type = volume_type
+        self.availability_zone = availability_zone
 
     def __repr__(self):
         msg = ("FakeVolume(id=%s, size=%s, name=%s, "
@@ -380,10 +381,6 @@ class FakeVolume(object):
         return (msg % params)
 
     @property
-    def availability_zone(self):
-        return "fake-availability-zone"
-
-    @property
     def created_at(self):
         return "2001-01-01-12:30:30"
 
@@ -445,10 +442,11 @@ class FakeVolumes(object):
             else:
                 raise nova_exceptions.NotFound(404, "Bad permissions")
 
-    def create(self, size, name=None, description=None, volume_type=None):
+    def create(self, size, name=None, description=None, volume_type=None,
+               availability_zone=None):
         id = "FAKE_VOL_%s" % uuid.uuid4()
         volume = FakeVolume(self, self.context, id, size, name,
-                            description, volume_type)
+                            description, volume_type, availability_zone)
         self.db[id] = volume
         if size == 9:
             volume.schedule_status("error", 2)
diff --git a/trove/tests/unittests/taskmanager/test_models.py b/trove/tests/unittests/taskmanager/test_models.py
index 1db929de..353f82f4 100644
--- a/trove/tests/unittests/taskmanager/test_models.py
+++ b/trove/tests/unittests/taskmanager/test_models.py
@@ -386,7 +386,7 @@ class FreshInstanceTasksTest(BaseFreshInstanceTasksTest):
             is_public=False
         )
         mock_build_volume_info.assert_called_with(
-            'mysql', volume_size=2,
+            'mysql', availability_zone=None, volume_size=2,
             volume_type='volume_type'
         )
         mock_guest_prepare.assert_called_with(
@@ -457,7 +457,7 @@ class FreshInstanceTasksTest(BaseFreshInstanceTasksTest):
         )
 
         mock_build_volume_info.assert_called_with(
-            'mysql', volume_size=2,
+            'mysql', availability_zone=None, volume_size=2,
             volume_type='volume_type'
         )
         mock_guest_prepare.assert_called_with(