From ddaaebb28649811d723f93a89ee46d69cc3ecabc Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@yahoo.com>
Date: Thu, 30 Sep 2010 20:24:42 -0700
Subject: show project ids for groups instead of user ids

---
 nova/api/ec2/cloud.py | 4 ++--
 1 file 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]
-- 
cgit