From 750a0c9b413ad3912d522355332cffadd9667d0c Mon Sep 17 00:00:00 2001
From: Eric Day <eday@oddments.org>
Date: Wed, 29 Dec 2010 21:41:42 -0800
Subject: [PATCH] Converted a few more ec2 calls to use compute api.

---
 nova/api/ec2/cloud.py    | 13 ++++---------
 nova/compute/__init__.py | 12 +++++++++---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index cc58f3cfe718..5ffc301be3f8 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -138,7 +138,7 @@ class CloudController(object):
 
     def get_metadata(self, address):
         ctxt = context.get_admin_context()
-        instance_ref = db.fixed_ip_get_instance(ctxt, address)
+        instance_ref = self.compute_api.get(ctxt, fixed_ip=address)
         if instance_ref is None:
             return None
         mpi = self._get_mpi_data(ctxt, instance_ref['project_id'])
@@ -555,13 +555,9 @@ class CloudController(object):
         assert len(i) == 1
         return i[0]
 
-    def _format_instances(self, context, reservation_id=None):
+    def _format_instances(self, context, **kwargs):
         reservations = {}
-        if reservation_id:
-            instances = db.instance_get_all_by_reservation(context,
-                                                           reservation_id)
-        else:
-            instances = self.compute_api.get(context)
+        instances = self.compute_api.get(context, **kwargs)
         for instance in instances:
             if not context.user.is_admin():
                 if instance['image_id'] == FLAGS.vpn_image_id:
@@ -747,8 +743,7 @@ class CloudController(object):
                 changes[field] = kwargs[field]
         if changes:
             instance_id = ec2_id_to_id(ec2_id)
-            inst = self.compute_api.get(context, instance_id)
-            db.instance_update(context, inst['id'], kwargs)
+            self.compute_api.update(context, instance_id, **kwargs)
         return True
 
     def describe_images(self, context, image_id=None, **kwargs):
diff --git a/nova/compute/__init__.py b/nova/compute/__init__.py
index 648c0ff6a9c6..fd1cdcd1beb0 100644
--- a/nova/compute/__init__.py
+++ b/nova/compute/__init__.py
@@ -243,12 +243,18 @@ class API(base.Base):
         else:
             self.db.instance_destroy(context, instance['id'])
 
-    def get(self, context, instance_id=None, project_id=None):
-        """Get one or more instances, possibly filtered by project
-        ID or user ID. If there is no filter and the context is
+    def get(self, context, instance_id=None, project_id=None,
+            reservation_id=None, fixed_ip=None):
+        """Get one or more instances, possibly filtered by one of the
+        given parameters. If there is no filter and the context is
         an admin, it will retreive all instances in the system."""
         if instance_id is not None:
             return self.db.instance_get_by_id(context, instance_id)
+        if reservation_id is not None:
+            return self.db.instance_get_all_by_reservation(context,
+                                                           reservation_id)
+        if fixed_ip is not None:
+            return self.db.fixed_ip_get_instance(context, fixed_ip)
         if project_id or not context.is_admin:
             if not context.project:
                 return self.db.instance_get_all_by_user(context,