summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@yahoo.com>2010-09-30 20:24:42 -0700
committerVishvananda Ishaya <vishvananda@yahoo.com>2010-09-30 20:24:42 -0700
commitddaaebb28649811d723f93a89ee46d69cc3ecabc (patch)
tree9a1cf57775d03358c443fdcbe2ee541848f7fe64
parenta86507b3224eb051fea97f65bd5653758fa91668 (diff)
downloadnova-ddaaebb28649811d723f93a89ee46d69cc3ecabc.tar.gz
nova-ddaaebb28649811d723f93a89ee46d69cc3ecabc.tar.xz
nova-ddaaebb28649811d723f93a89ee46d69cc3ecabc.zip
show project ids for groups instead of user ids
-rw-r--r--nova/api/ec2/cloud.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 6c67db28d..8aa76a787 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -260,7 +260,7 @@ class CloudController(object):
g = {}
g['groupDescription'] = group.description
g['groupName'] = group.name
- g['ownerId'] = context.user.id
+ g['ownerId'] = group.project_id
g['ipPermissions'] = []
for rule in group.rules:
r = {}
@@ -272,7 +272,7 @@ class CloudController(object):
if rule.group_id:
source_group = db.security_group_get(context, rule.group_id)
r['groups'] += [{'groupName': source_group.name,
- 'userId': source_group.user_id}]
+ 'userId': source_group.project_id}]
else:
r['ipRanges'] += [{'cidrIp': rule.cidr}]
g['ipPermissions'] += [r]