← Back to branch summary

~zulcss/nova/nova-lxc

« back to all changes in this revision

Viewing changes to nova/api/openstack/__init__.py

  • Committer: Chuck Short
  • Date: 2011-03-29 10:51:30 UTC
  • mfrom: (749.1.156 nova)
  • Revision ID: zulcss@ubuntu.com-20110329105130-aqaxmrphf6hmurb9
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/openstack/__init__.py
106
106
                            controller=accounts.Controller(),
107
107
                            collection={'detail': 'GET'})
108
108
 
109
 
        mapper.resource("backup_schedule", "backup_schedule",
110
 
                        controller=backup_schedules.Controller(),
111
 
                        parent_resource=dict(member_name='server',
112
 
                        collection_name='servers'))
113
 
 
114
109
        mapper.resource("console", "consoles",
115
110
                        controller=consoles.Controller(),
116
111
                        parent_resource=dict(member_name='server',
119
114
        mapper.resource("image", "images", controller=images.Controller(),
120
115
                        collection={'detail': 'GET'})
121
116
 
122
 
        mapper.resource("shared_ip_group", "shared_ip_groups",
123
 
                        collection={'detail': 'GET'},
124
 
                        controller=shared_ip_groups.Controller())
125
 
 
126
117
        _limits = limits.LimitsController()
127
118
        mapper.resource("limit", "limits", controller=_limits)
128
119
 
141
132
                        controller=flavors.ControllerV10(),
142
133
                        collection={'detail': 'GET'})
143
134
 
 
135
        mapper.resource("shared_ip_group", "shared_ip_groups",
 
136
                        collection={'detail': 'GET'},
 
137
                        controller=shared_ip_groups.Controller())
 
138
 
 
139
        mapper.resource("backup_schedule", "backup_schedule",
 
140
                        controller=backup_schedules.Controller(),
 
141
                        parent_resource=dict(member_name='server',
 
142
                        collection_name='servers'))
 
143
 
144
144
 
145
145
class APIRouterV11(APIRouter):
146
146
    """Define routes specific to OpenStack API V1.1."""