← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/api/ec2/ec2utils.py

  • Committer: Package Import Robot
  • Author(s): Adam Gandelman, Adam Gandelman, Chuck Short
  • Date: 2012-08-27 15:37:18 UTC
  • mfrom: (1.1.60)
  • Revision ID: package-import@ubuntu.com-20120827153718-lj8er44eqqz1gsrj
Tags: 2012.2~rc1~20120827.15815-0ubuntu1
https://launchpad.net/bugs/820694
[ Adam Gandelman ]
* New upstream release.

[ Chuck Short ]
* debian/patches/0001-Update-tools-hacking-for-pep8-1.2-and-
  beyond.patch: Dropped we dont run pep8 tests anymore.
* debian/control: Drop pep8 build depends
* debian/*.upstart.in: Make sure we transition correctly from runlevel
  1 to 2. (LP: #820694)

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/ec2/ec2utils.py
138
138
 
139
139
 
140
140
def ec2_inst_id_to_uuid(context, ec2_id):
141
 
    """"Convert an instance id to  uuid."""
 
141
    """"Convert an instance id to uuid."""
142
142
    int_id = ec2_id_to_id(ec2_id)
143
143
    return get_instance_uuid_from_int_id(context, int_id)
144
144
 
168
168
 
169
169
 
170
170
def ec2_vol_id_to_uuid(ec2_id):
171
 
    """Get the cooresponding UUID for the given ec2-id."""
 
171
    """Get the corresponding UUID for the given ec2-id."""
172
172
    ctxt = context.get_admin_context()
173
173
 
174
174
    # NOTE(jgriffith) first strip prefix to get just the numeric
199
199
 
200
200
 
201
201
def ec2_snap_id_to_uuid(ec2_id):
202
 
    """Get the cooresponding UUID for the given ec2-id."""
 
202
    """Get the corresponding UUID for the given ec2-id."""
203
203
    ctxt = context.get_admin_context()
204
204
 
205
205
    # NOTE(jgriffith) first strip prefix to get just the numeric