Merge branch 'master' into nomenclature

Conflicts:
	test/data/test.db

endpoints/api/image.py

@@ -73,7 +73,7 @@ class RepositoryImage(RepositoryParamResource):
   @nickname('getImage')
   def get(self, namespace, repository, image_id):
     """ Get the information available for the specified image. """
-    image = model.get_repo_image(namespace, repository, image_id)
+    image = model.get_repo_image_extended(namespace, repository, image_id)
     if not image:
       raise NotFound()
 
@@ -94,7 +94,7 @@ class RepositoryImageChanges(RepositoryParamResource):
   @nickname('getImageChanges')
   def get(self, namespace, repository, image_id):
     """ Get the list of changes for the specified image. """
-    image = model.get_repo_image(namespace, repository, image_id)
+    image = model.get_repo_image_extended(namespace, repository, image_id)
 
     if not image:
       raise NotFound()

endpoints/api/superuser.py

@@ -52,6 +52,25 @@ def user_view(user):
     'super_user': user.username in app.config['SUPER_USERS']
   }
 
+@resource('/v1/superuser/usage/')
+@internal_only
+@show_if(features.SUPER_USERS)
+class UsageInformation(ApiResource):
+  """ Resource for returning the usage information for enterprise customers. """
+  @require_fresh_login
+  @nickname('getSystemUsage')
+  def get(self):
+    """ Returns the number of repository handles currently held. """
+    if SuperUserPermission().can():
+      return {
+        'usage': model.get_repository_usage(),
+        'allowed': app.config.get('MAXIMUM_REPOSITORY_USAGE', 20)
+      }
+
+    abort(403)
+
+
+
 @resource('/v1/superuser/users/')
 @internal_only
 @show_if(features.SUPER_USERS)