diff options
| author | Ed Leafe <ed@leafe.com> | 2011-01-06 07:21:11 -0600 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2011-01-06 07:21:11 -0600 |
| commit | 0209ad587b2d8d35a7abdf60ca9b33391cab4a83 (patch) | |
| tree | 355800d301ae5c691bcd35d7e882671b86ae2a53 | |
| parent | 504e9a62b39f5743d8a1d8993705e56e07d78a14 (diff) | |
merged trunk changes
| -rw-r--r-- | nova/compute/api.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 476667fa8..19cdf2d0a 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -61,13 +61,11 @@ class API(base.Base): def get_network_topic(self, context, instance_id): try: -<<<<<<< TREE instance = self.get_instance(context, instance_id) + # TODO (dabo) Need to verify whether an internal_id or a db id + # id being passed; use get_instance or get, respectively. + #instance = self.get(context, instance_id) except exception.NotFound, e: -======= - instance = self.get(context, instance_id) - except exception.NotFound as e: ->>>>>>> MERGE-SOURCE logging.warning("Instance %d was not found in get_network_topic", instance_id) raise e |