Merge lp:~rvb/maas/expose-maas-1.2 into lp:maas/1.2

[Raphaël Badin]

Fix MAASHandler (add a resource_uri method) so that it is scanned by the CLI.

[Raphaël Badin (rvb)]

This is not a simple backport because the original branch included some drive-by fixes that could not make it into 1.2 but this is simple enough for me to self-review and similar to what was done in the trunk branch (https://code.launchpad.net/~rvb/maas/expose-maas/+merge/140916).

review: Approve

=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py	2012-12-13 02:39:45 +0000
+++ src/maasserver/api.py	2012-12-20 15:03:06 +0000
@@ -63,6 +63,7 @@
     "BootImagesHandler",
     "FilesHandler",
     "get_oauth_token",
+    "MaasHandler",
     "NodeGroupsHandler",
     "NodeGroupInterfaceHandler",
     "NodeGroupInterfacesHandler",
@@ -1685,8 +1686,8 @@
         return ('tags_handler', [])
 
 
-class MAASHandler(OperationsHandler):
-    """Manage the MAAS' itself."""
+class MaasHandler(OperationsHandler):
+    """Manage the MAAS server."""
     create = read = update = delete = None
 
     @operation(idempotent=False)
@@ -1715,6 +1716,10 @@
         value = Config.objects.get_config(name)
         return HttpResponse(json.dumps(value), content_type='application/json')
 
+    @classmethod
+    def resource_uri(cls, *args, **kwargs):
+        return ('maas_handler', [])
+
 
 # Title section for the API documentation.  Matches in style, format,
 # etc. whatever render_api_docs() produces, so that you can concatenate
 
=== modified file 'src/maasserver/urls_api.py'
--- src/maasserver/urls_api.py	2012-09-20 15:10:28 +0000
+++ src/maasserver/urls_api.py	2012-12-20 15:03:06 +0000
@@ -23,7 +23,7 @@
     BootImagesHandler,
     describe,
     FilesHandler,
-    MAASHandler,
+    MaasHandler,
     NodeGroupHandler,
     NodeGroupInterfaceHandler,
     NodeGroupInterfacesHandler,
@@ -58,7 +58,7 @@
 
 
 # Admin handlers.
-maas_handler = AdminRestrictedResource(MAASHandler, authentication=api_auth)
+maas_handler = AdminRestrictedResource(MaasHandler, authentication=api_auth)
 nodegroupinterface_handler = AdminRestrictedResource(
     NodeGroupInterfaceHandler, authentication=api_auth)
 nodegroupinterfaces_handler = AdminRestrictedResource(