replace nova flavor_list call with trove call

The create instance workflow errantly pulls in the nova flavor list. Trove maintains a separate flavor list and that API call is now made instead. Closes-Bug #1227886 Change-Id: I6b9314d493800fb342d925500a680626878ef744
openstack · Sep 19, 2013 · 4ca98ad · 4ca98ad
1 parent cda0660
commit 4ca98ad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/openstack_dashboard/dashboards/project/databases/tests.py b/openstack_dashboard/dashboards/project/databases/tests.py
@@ -117,10 +117,10 @@ def test_index_flavor_list_exception(self):
         self.assertMessageCount(res, error=1)
 
     @test.create_stubs({
-        api.nova: ('flavor_list', 'tenant_absolute_limits'),
-        api.trove: ('backup_list',)})
+        api.nova: ('tenant_absolute_limits',),
+        api.trove: ('flavor_list', 'backup_list',)})
     def test_launch_instance(self):
-        api.nova.flavor_list(IsA(http.HttpRequest))\
+        api.trove.flavor_list(IsA(http.HttpRequest))\
             .AndReturn(self.flavors.list())
         api.nova.tenant_absolute_limits(IsA(http.HttpRequest))\
             .AndReturn([])
@@ -132,10 +132,9 @@ def test_launch_instance(self):
         self.assertTemplateUsed(res, 'project/databases/launch.html')
 
     @test.create_stubs({
-        api.nova: ('flavor_list',),
-        api.trove: ('backup_list', 'instance_create',)})
+        api.trove: ('flavor_list', 'backup_list', 'instance_create',)})
     def test_create_simple_instance(self):
-        api.nova.flavor_list(IsA(http.HttpRequest))\
+        api.trove.flavor_list(IsA(http.HttpRequest))\
             .AndReturn(self.flavors.list())
         api.trove.backup_list(IsA(http.HttpRequest))\
             .AndReturn(self.database_backups.list())
@@ -161,11 +160,10 @@ def test_create_simple_instance(self):
         self.assertRedirectsNoFollow(res, INDEX_URL)
 
     @test.create_stubs({
-        api.nova: ('flavor_list',),
-        api.trove: ('backup_list', 'instance_create',)})
+        api.trove: ('flavor_list', 'backup_list', 'instance_create',)})
     def test_create_simple_instance_exception(self):
         trove_exception = self.exceptions.nova
-        api.nova.flavor_list(IsA(http.HttpRequest))\
+        api.trove.flavor_list(IsA(http.HttpRequest))\
             .AndReturn(self.flavors.list())
         api.trove.backup_list(IsA(http.HttpRequest))\
             .AndReturn(self.database_backups.list())

diff --git a/openstack_dashboard/dashboards/project/databases/workflows/create_instance.py b/openstack_dashboard/dashboards/project/databases/workflows/create_instance.py
@@ -44,7 +44,7 @@ class Meta:
     def flavors(self, request):
         if not hasattr(self, '_flavors'):
             try:
-                self._flavors = api.nova.flavor_list(request)
+                self._flavors = api.trove.flavor_list(request)
             except Exception:
                 LOG.exception("Exception while obtaining flavors list")
                 self._flavors = []