← Back to branch summary

~lutostag/ubuntu/trusty/maas/1.5.2+packagefix

« back to all changes in this revision

Viewing changes to src/maasserver/urls_api.py

  • Committer: Package Import Robot
  • Author(s): Andres Rodriguez
  • Date: 2014-03-28 10:43:53 UTC
  • mto: This revision was merged to the branch mainline in revision 57.
  • Revision ID: package-import@ubuntu.com-20140328104353-ekpolg0pm5xnvq2s
Tags: upstream-1.5+bzr2204
Import upstream version 1.5+bzr2204

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/urls_api.py
21
21
from maasserver.api import (
22
22
    AccountHandler,
23
23
    api_doc,
 
24
    BootImageHandler,
24
25
    BootImagesHandler,
25
26
    CommissioningResultsHandler,
26
27
    CommissioningScriptHandler,
46
47
    TagsHandler,
47
48
    UserHandler,
48
49
    UsersHandler,
 
50
    VersionHandler,
49
51
    ZoneHandler,
50
52
    ZonesHandler,
51
53
    )
76
78
    NodeGroupInterfacesHandler, authentication=api_auth)
77
79
boot_images_handler = RestrictedResource(
78
80
    BootImagesHandler, authentication=api_auth)
 
81
boot_image_handler = RestrictedResource(
 
82
    BootImageHandler, authentication=api_auth)
79
83
tag_handler = RestrictedResource(TagHandler, authentication=api_auth)
80
84
tags_handler = RestrictedResource(TagsHandler, authentication=api_auth)
 
85
version_handler = RestrictedResource(VersionHandler)
81
86
commissioning_results_handler = RestrictedResource(
82
87
    CommissioningResultsHandler, authentication=api_auth)
83
88
sshkey_handler = RestrictedResource(SSHKeyHandler, authentication=api_auth)
102
107
    url(r'doc/$', api_doc, name='api-doc'),
103
108
    url(r'describe/$', describe, name='describe'),
104
109
    url(r'pxeconfig/$', pxeconfig, name='pxeconfig'),
 
110
    url(r'version/$', version_handler, name='version'),
105
111
)
106
112
 
107
113
 
130
136
        nodegroupinterfaces_handler, name='nodegroupinterfaces_handler'),
131
137
    url(r'^nodegroups/(?P<uuid>[^/]+)/interfaces/(?P<interface>[^/]+)/$',
132
138
        nodegroupinterface_handler, name='nodegroupinterface_handler'),
 
139
    url(r'^nodegroups/(?P<uuid>[^/]+)/boot-images/$',
 
140
        boot_images_handler, name='boot_images_handler'),
 
141
    url(r'^nodegroups/(?P<uuid>[^/]+)/boot-images/(?P<id>[^/]+)/$',
 
142
        boot_image_handler, name='boot_image_handler'),
133
143
    url(
134
144
        r'^networks/(?P<name>[\w\-]+)/$',
135
145
        network_handler, name='network_handler'),
141
151
        r'^account/prefs/sshkeys/(?P<keyid>[^/]+)/$', sshkey_handler,
142
152
        name='sshkey_handler'),
143
153
    url(r'^account/prefs/sshkeys/$', sshkeys_handler, name='sshkeys_handler'),
144
 
    url(r'^boot-images/$', boot_images_handler, name='boot_images_handler'),
145
154
    url(r'^tags/(?P<name>[\w\-]+)/$', tag_handler, name='tag_handler'),
146
155
    url(r'^tags/$', tags_handler, name='tags_handler'),
147
156
    url(