diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-08-12 13:43:14 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-08-12 13:43:14 -0700 |
| commit | 63c2fd9d4fe17f06e80a5d9674b58cb65ee491d9 (patch) | |
| tree | db5e7e0336fbadbcae622b9d0281f7ad7a9200a5 | |
| parent | ef48a727d1c6b824170995fffa59949960ea5d11 (diff) | |
| parent | eeda6e0970d6f19b985719a04b06fda0b3514c24 (diff) | |
| download | nova-63c2fd9d4fe17f06e80a5d9674b58cb65ee491d9.tar.gz nova-63c2fd9d4fe17f06e80a5d9674b58cb65ee491d9.tar.xz nova-63c2fd9d4fe17f06e80a5d9674b58cb65ee491d9.zip | |
die classmethod
| -rw-r--r-- | nova/endpoint/cloud.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py index 1b07f2adb..27310577f 100644 --- a/nova/endpoint/cloud.py +++ b/nova/endpoint/cloud.py @@ -311,7 +311,7 @@ class CloudController(object): def _get_address(self, context, public_ip): # FIXME(vish) this should move into network.py - address = network_model.PublicNetworkController.get_address(public_ip) + address = network_model.ElasticIp.lookup(public_ip) if address and (context.user.is_admin() or address['project_id'] == context.project.id): return address raise exception.NotFound("Address at ip %s not found" % public_ip) @@ -456,7 +456,7 @@ class CloudController(object): def format_addresses(self, context): addresses = [] - for address in network_model.PublicNetworkController.assigned_objs(): + for address in network_model.ElasticIp.all(): # TODO(vish): implement a by_project iterator for addresses if (context.user.is_admin() or address['project_id'] == context.project.id): |