Merge lp:~rvb/maas/expose-maas into lp:~maas-committers/maas/trunk

[Raphaël Badin]

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

Drive-by fix: s/MAASHandler/MaasHandler/ so that it appears on the cli as 'maas'
Drive-by fix: add resource_uri methods for CommissioningResultsHandler, CommissioningScriptsHandler and CommissioningScriptHandler.
Drive-by fix: add a 'delete' method on CommissioningScriptHandler just to have it properly documented on the API (the test for the functionality is already there)

[Gavin Panella (allenap)]

review: Approve

=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py	2012-12-20 11:09:21 +0000
+++ src/maasserver/api.py	2012-12-20 15:09:38 +0000
@@ -60,9 +60,12 @@
     "api_doc",
     "api_doc_title",
     "BootImagesHandler",
+    "CommissioningScriptHandler",
+    "CommissioningScriptsHandler",
     "CommissioningResultsHandler",
     "FilesHandler",
     "get_oauth_token",
+    "MaasHandler",
     "NodeGroupsHandler",
     "NodeGroupInterfaceHandler",
     "NodeGroupInterfacesHandler",
@@ -1467,8 +1470,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)
@@ -1497,6 +1500,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
@@ -1780,7 +1787,7 @@
 
 
 class CommissioningScriptsHandler(OperationsHandler):
-    """Management of custom commissioning scripts.
+    """Manage custom commissioning scripts.
 
     This functionality is only available to administrators.
     """
@@ -1829,9 +1836,13 @@
         content = Bin(get_content_parameter(request))
         return CommissioningScript.objects.create(name=name, content=content)
 
+    @classmethod
+    def resource_uri(cls):
+        return ('commissioning_scripts_handler', [])
+
 
 class CommissioningScriptHandler(OperationsHandler):
-    """A CommissioningScript.
+    """Manage a custom commissioning script.
 
     This functionality is only available to administrators.
     """
@@ -1847,6 +1858,12 @@
         script = get_object_or_404(CommissioningScript, name=name)
         return HttpResponse(script.content, content_type='application/binary')
 
+    def delete(self, request, name):
+        """Delete a commissioning script."""
+        script = get_object_or_404(CommissioningScript, name=name)
+        script.delete()
+        return rc.DELETED
+
     def update(self, request, name):
         """Update a commissioning script."""
         content = Bin(get_content_parameter(request))
@@ -1854,6 +1871,14 @@
         script.content = content
         script.save()
 
+    @classmethod
+    def resource_uri(cls, script=None):
+        # See the comment in NodeHandler.resource_uri
+        script_name = 'name'
+        if script is not None:
+            script_name = script.name
+        return ('commissioning_script_handler', (script_name, ))
+
 
 class CommissioningResultsHandler(OperationsHandler):
     """Read the collection of NodeCommissionResult in the MAAS."""
@@ -1884,6 +1909,10 @@
             results = results.filter(name__in=names)
         return results
 
+    @classmethod
+    def resource_uri(cls, result=None):
+        return ('commissioning_results_handler', [])
+
 
 def describe(request):
     """Return a description of the whole MAAS API.

=== modified file 'src/maasserver/urls_api.py'
--- src/maasserver/urls_api.py	2012-12-19 17:24:01 +0000
+++ src/maasserver/urls_api.py	2012-12-20 15:09:38 +0000
@@ -25,7 +25,7 @@
     CommissioningScriptsHandler,
     describe,
     FilesHandler,
-    MAASHandler,
+    MaasHandler,
     NodeGroupHandler,
     NodeGroupInterfaceHandler,
     NodeGroupInterfacesHandler,
@@ -65,7 +65,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(