Allow admin user to get instances attached with any configuration

Change-Id: I5e5f0b99f79ba78c82cbb12482b9167ec69e50f7

1 files changed, 17 insertions, 7 deletions

diff --git a/trove/configuration/service.py b/trove/configuration/service.py
index 7cd6576d..48f705a0 100644
--- a/trove/configuration/service.py
+++ b/trove/configuration/service.py
@@ -64,10 +64,15 @@ class ConfigurationsController(wsgi.Controller):
         self.authorize_config_action(context, 'show', configuration)
         configuration_items = models.Configuration.load_items(context, id)
 
+        find_instance = {
+            'configuration_id': configuration.id,
+            'deleted': False
+        }
+        if not context.is_admin:
+            find_instance['tenant_id'] = context.project_id
+
         configuration.instance_count = instances_models.DBInstance.find_all(
-            tenant_id=context.project_id,
-            configuration_id=configuration.id,
-            deleted=False).count()
+            **find_instance).count()
 
         return wsgi.Result(views.DetailedConfigurationView(
                            configuration,
@@ -77,10 +82,15 @@ class ConfigurationsController(wsgi.Controller):
         context = req.environ[wsgi.CONTEXT_KEY]
         configuration = models.Configuration.load(context, id)
         self.authorize_config_action(context, 'instances', configuration)
-        instances = instances_models.DBInstance.find_all(
-            tenant_id=context.tenant,
-            configuration_id=configuration.id,
-            deleted=False)
+
+        kwargs = {
+            'configuration_id': configuration.id,
+            'deleted': False
+        }
+        if not context.is_admin:
+            kwargs['tenant_id'] = context.tenant
+        instances = instances_models.DBInstance.find_all(**kwargs)
+
         limit = int(context.limit or CONF.instances_page_size)
         if limit > CONF.instances_page_size:
             limit = CONF.instances_page_size