diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-10-14 00:30:42 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-10-14 00:30:42 -0700 |
| commit | 914786b8f9d30e2762e290ef911710efcbe6d310 (patch) | |
| tree | 7f0edec63a89658c4b10c4fe824e7d1f1e84c7c9 | |
| parent | af9910d935b7b3839774e3485b87b4a0dcdb78ff (diff) | |
review fixes
| -rw-r--r-- | nova/api/cloud.py | 8 | ||||
| -rw-r--r-- | nova/context.py | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/nova/api/cloud.py b/nova/api/cloud.py index e16229e7d..aa84075dc 100644 --- a/nova/api/cloud.py +++ b/nova/api/cloud.py @@ -29,12 +29,8 @@ FLAGS = flags.FLAGS def reboot(instance_id, context=None): - """Reboot the given instance. - - #TODO(gundlach) not actually sure what context is used for by ec2 here - -- I think we can just remove it and use None all the time. - """ - instance_ref = db.instance_get_by_ec2_id(context, instance_id) + """Reboot the given instance.""" + instance_ref = db.instance_get_by_internal_id(context, instance_id) host = instance_ref['host'] rpc.cast(context, db.queue_get_for(context, FLAGS.compute_topic, host), diff --git a/nova/context.py b/nova/context.py index 977866d59..2a94d643d 100644 --- a/nova/context.py +++ b/nova/context.py @@ -63,7 +63,7 @@ class RequestContext(object): @property def user(self): - # NOTE(visn): Delay import of manager, so that we can import this + # NOTE(vish): Delay import of manager, so that we can import this # file from manager. from nova.auth import manager if not self._user: @@ -72,7 +72,7 @@ class RequestContext(object): @property def project(self): - # NOTE(visn): Delay import of manager, so that we can import this + # NOTE(vish): Delay import of manager, so that we can import this # file from manager. from nova.auth import manager if not self._project: @@ -85,7 +85,7 @@ class RequestContext(object): 'is_admin': self.is_admin, 'read_deleted': self.read_deleted, 'remote_address': self.remote_address, - 'timestamp': utils.isotime(), + 'timestamp': utils.isotime(self.timestamp), 'request_id': self.request_id} @classmethod |