← Back to branch summary

~rvb/maas/bug-1384001-redux-2

« back to all changes in this revision

Viewing changes to src/maasserver/api.py

  • Committer: Gavin Panella
  • Date: 2012-03-15 13:58:32 UTC
  • mto: This revision was merged to the branch mainline in revision 291.
  • Revision ID: gavin.panella@canonical.com-20120315135832-8i2rkbvp6gwdhkzt
Change MaaS to MAAS everywhere.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/api.py
41
41
from formencode import validators
42
42
from formencode.validators import Invalid
43
43
from maasserver.exceptions import (
44
 
    MaaSAPIBadRequest,
45
 
    MaaSAPINotFound,
 
44
    MAASAPIBadRequest,
 
45
    MAASAPINotFound,
46
46
    NodesNotAvailable,
47
47
    NodeStateViolation,
48
48
    PermissionDenied,
477
477
        """
478
478
        filename = request.GET.get("filename", None)
479
479
        if not filename:
480
 
            raise MaaSAPIBadRequest("Filename not supplied")
 
480
            raise MAASAPIBadRequest("Filename not supplied")
481
481
        try:
482
482
            db_file = FileStorage.objects.get(filename=filename)
483
483
        except FileStorage.DoesNotExist:
484
 
            raise MaaSAPINotFound("File not found")
 
484
            raise MAASAPINotFound("File not found")
485
485
        return HttpResponse(db_file.data.read(), status=httplib.OK)
486
486
 
487
487
    @api_exported('add', 'POST')
495
495
        """
496
496
        filename = request.data.get("filename", None)
497
497
        if not filename:
498
 
            raise MaaSAPIBadRequest("Filename not supplied")
 
498
            raise MAASAPIBadRequest("Filename not supplied")
499
499
        files = request.FILES
500
500
        if not files:
501
 
            raise MaaSAPIBadRequest("File not supplied")
 
501
            raise MAASAPIBadRequest("File not supplied")
502
502
        if len(files) != 1:
503
 
            raise MaaSAPIBadRequest("Exactly one file must be supplied")
 
503
            raise MAASAPIBadRequest("Exactly one file must be supplied")
504
504
        uploaded_file = files['file']
505
505
 
506
506
        # As per the comment in FileStorage, this ought to deal in
555
555
 
556
556
 
557
557
@api_operations
558
 
class MaaSHandler(BaseHandler):
559
 
    """Manage the MaaS' itself."""
 
558
class MAASHandler(BaseHandler):
 
559
    """Manage the MAAS' itself."""
560
560
    allowed_methods = ('POST', 'GET')
561
561
 
562
562
    @api_exported('set_config', method='POST')
608
608
    if add_title:
609
609
        messages.extend([
610
610
            '**********************\n',
611
 
            'MaaS API documentation\n',
 
611
            'MAAS API documentation\n',
612
612
            '**********************\n',
613
613
            '\n\n']
614
614
            )