womax/nova
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix cloud instances method

Browse Source
This commit is contained in:
Vishvananda Ishaya
2010-06-11 10:45:31 -07:00
parent 8f06d9b2ed
commit 835c985b44
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nova/endpoint/cloud.py
+2 -6
View File
@@ -66,8 +66,7 @@ class CloudController(object):
@property @property
def instances(self): def instances(self):
""" All instances in the system, as dicts """ """ All instances in the system, as dicts """
for instance in self.instdir.all: return self.instdir.all
yield {instance['instance_id']: instance}
@property @property
def volumes(self): def volumes(self):
@@ -337,11 +336,8 @@ class CloudController(object):
return defer.succeed(self._format_instances(context)) return defer.succeed(self._format_instances(context))
def _format_instances(self, context, reservation_id = None): def _format_instances(self, context, reservation_id = None):
if self.instances == {}:
return {'reservationSet': []}
reservations = {} reservations = {}
for inst in self.instances: for instance in self.instances:
instance = inst.values()[0]
res_id = instance.get('reservation_id', 'Unknown') res_id = instance.get('reservation_id', 'Unknown')
if ((context.user.is_admin() or context.project.id == instance['project_id']) if ((context.user.is_admin() or context.project.id == instance['project_id'])
and (reservation_id == None or reservation_id == res_id)): and (reservation_id == None or reservation_id == res_id)):