← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

Viewing changes to nova/tests/integrated/api/client.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-01-20 11:54:15 UTC
  • mto: This revision was merged to the branch mainline in revision 62.
  • Revision ID: package-import@ubuntu.com-20120120115415-h2ujma9o536o1ut6
Tags: upstream-2012.1~e3~20120120.12170
Import upstream version 2012.1~e3~20120120.12170

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/integrated/api/client.py
261
261
        return self.api_delete('/flavors/%s' % flavor_id)
262
262
 
263
263
    def get_volume(self, volume_id):
264
 
        return self.api_get('/os-volumes/%s' % volume_id)['volume']
 
264
        return self.api_get('/volumes/%s' % volume_id)['volume']
265
265
 
266
266
    def get_volumes(self, detail=True):
267
 
        rel_url = '/os-volumes/detail' if detail else '/os-volumes'
 
267
        rel_url = '/volumes/detail' if detail else '/volumes'
268
268
        return self.api_get(rel_url)['volumes']
269
269
 
270
270
    def post_volume(self, volume):
271
 
        return self.api_post('/os-volumes', volume)['volume']
 
271
        return self.api_post('/volumes', volume)['volume']
272
272
 
273
273
    def delete_volume(self, volume_id):
274
 
        return self.api_delete('/os-volumes/%s' % volume_id)
 
274
        return self.api_delete('/volumes/%s' % volume_id)
275
275
 
276
276
    def get_server_volume(self, server_id, attachment_id):
277
277
        return self.api_get('/servers/%s/os-volume_attachments/%s' %