diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-26 11:02:28 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-26 11:02:28 -0700 |
| commit | b1bc1e2edc9fdafabfc27b5ea313dbb934c374eb (patch) | |
| tree | c51a31f5c90eba7935458c0052539799dc67937d /nova/endpoint | |
| parent | 3233f7a964564fba9ec88c277d566eebed50d12a (diff) | |
| parent | 340f9fc8d63ec931485aba1dcfeccdc1cb3849fa (diff) | |
| download | nova-b1bc1e2edc9fdafabfc27b5ea313dbb934c374eb.tar.gz nova-b1bc1e2edc9fdafabfc27b5ea313dbb934c374eb.tar.xz nova-b1bc1e2edc9fdafabfc27b5ea313dbb934c374eb.zip | |
merged trunk
Diffstat (limited to 'nova/endpoint')
| -rw-r--r-- | nova/endpoint/cloud.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py index 8eac1ce4a..8c6c05566 100644 --- a/nova/endpoint/cloud.py +++ b/nova/endpoint/cloud.py @@ -453,21 +453,21 @@ class CloudController(object): def format_addresses(self, context): addresses = [] - # TODO(vish): move authorization checking into network.py for address in self.network.host_objs: - #logging.debug(address_record) - address_rv = { - 'public_ip': address['address'], - 'instance_id' : address.get('instance_id', 'free') - } - if context.user.is_admin(): - address_rv['instance_id'] = "%s (%s, %s)" % ( - address['instance_id'], - address['user_id'], - address['project_id'], - ) + # TODO(vish): implement a by_project iterator for addresses + if (context.user.is_admin() or + address['project_id'] == self.project.id): + address_rv = { + 'public_ip': address['address'], + 'instance_id' : address.get('instance_id', 'free') + } + if context.user.is_admin(): + address_rv['instance_id'] = "%s (%s, %s)" % ( + address['instance_id'], + address['user_id'], + address['project_id'], + ) addresses.append(address_rv) - # logging.debug(addresses) return {'addressesSet': addresses} @rbac.allow('netadmin') |