Merge lp:~anso/nova/lp700974 into lp:~hudson-openstack/nova/trunk

[Todd Willey]

Bugfix.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

=== modified file 'nova/api/ec2/cloud.py'
--- nova/api/ec2/cloud.py	2011-01-10 14:49:34 +0000
+++ nova/api/ec2/cloud.py	2011-01-10 16:06:51 +0000
@@ -42,6 +42,7 @@
 
 
 FLAGS = flags.FLAGS
+flags.DECLARE('service_down_time', 'nova.scheduler.driver')
 
 LOG = logging.getLogger("nova.api.cloud")
 
@@ -198,7 +199,7 @@
                                         'zoneState': 'available'}]}
 
         services = db.service_get_all(context)
-        now = db.get_time()
+        now = datetime.datetime.utcnow()
         hosts = []
         for host in [service['host'] for service in services]:
             if not host in hosts:
 
=== modified file 'nova/db/api.py'
--- nova/db/api.py	2011-01-07 11:03:45 +0000
+++ nova/db/api.py	2011-01-10 16:06:51 +0000
@@ -81,6 +81,11 @@
     return IMPL.service_get(context, service_id)
 
 
+def service_get_all(context):
+    """Get a list of all services on any machine on any topic of any type"""
+    return IMPL.service_get_all(context)
+
+
 def service_get_all_by_topic(context, topic):
     """Get all compute services for a given topic."""
     return IMPL.service_get_all_by_topic(context, topic)
 
=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py	2011-01-07 11:08:22 +0000
+++ nova/db/sqlalchemy/api.py	2011-01-10 16:06:51 +0000
@@ -135,6 +135,18 @@
 
 
 @require_admin_context
+def service_get_all(context, session=None):
+    if not session:
+        session = get_session()
+
+    result = session.query(models.Service).\
+                     filter_by(deleted=can_read_deleted(context)).\
+                     all()
+
+    return result
+
+
+@require_admin_context
 def service_get_all_by_topic(context, topic):
     session = get_session()
     return session.query(models.Service).\