Merge lp:~soren/nova/redisectomy into lp:~hudson-openstack/nova/trunk

[Soren Hansen]

Make Redis completely optional:

 * Move Redis code into fakeldap, since it's the only thing that still uses it.
 * Adjust auth unittests to skip fakeldap tests if Redis isn't around.
 * Adjust auth unittests to actually run the fakeldap tests if Redis /is/ around.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Jay Pipes (jaypipes)]

yup, rock n roll.

review: Approve

=== modified file 'nova/auth/fakeldap.py'
--- nova/auth/fakeldap.py	2010-09-10 11:52:48 +0000
+++ nova/auth/fakeldap.py	2010-10-14 20:21:03 +0000
@@ -24,8 +24,30 @@
 """
 
 import json
-
-from nova import datastore
+import redis
+
+from nova import flags
+
+FLAGS = flags.FLAGS
+flags.DEFINE_string('redis_host', '127.0.0.1',
+                    'Host that redis is running on.')
+flags.DEFINE_integer('redis_port', 6379,
+                    'Port that redis is running on.')
+flags.DEFINE_integer('redis_db', 0, 'Multiple DB keeps tests away')
+
+class Redis(object):
+    def __init__(self):
+        if hasattr(self.__class__, '_instance'):
+            raise Exception('Attempted to instantiate singleton')
+
+    @classmethod
+    def instance(cls):
+        if not hasattr(cls, '_instance'):
+            inst = redis.Redis(host=FLAGS.redis_host,
+                               port=FLAGS.redis_port,
+                               db=FLAGS.redis_db)
+            cls._instance = inst
+        return cls._instance
 
 
 SCOPE_BASE = 0
@@ -164,11 +186,11 @@
         key = "%s%s" % (self.__redis_prefix, dn)
 
         value_dict = dict([(k, _to_json(v)) for k, v in attr])
-        datastore.Redis.instance().hmset(key, value_dict)
+        Redis.instance().hmset(key, value_dict)
 
     def delete_s(self, dn):
         """Remove the ldap object at specified dn."""
-        datastore.Redis.instance().delete("%s%s" % (self.__redis_prefix, dn))
+        Redis.instance().delete("%s%s" % (self.__redis_prefix, dn))
 
     def modify_s(self, dn, attrs):
         """Modify the object at dn using the attribute list.
@@ -179,7 +201,7 @@
             ([MOD_ADD | MOD_DELETE | MOD_REPACE], attribute, value)
 
         """
-        redis = datastore.Redis.instance()
+        redis = Redis.instance()
         key = "%s%s" % (self.__redis_prefix, dn)
 
         for cmd, k, v in attrs:
@@ -204,7 +226,7 @@
         """
         if scope != SCOPE_BASE and scope != SCOPE_SUBTREE:
             raise NotImplementedError(str(scope))
-        redis = datastore.Redis.instance()
+        redis = Redis.instance()
         if scope == SCOPE_BASE:
             keys = ["%s%s" % (self.__redis_prefix, dn)]
         else:
@@ -232,3 +254,5 @@
     def __redis_prefix(self): # pylint: disable-msg=R0201
         """Get the prefix to use for all redis keys."""
         return 'ldap:'
+
+

=== modified file 'nova/auth/manager.py'
--- nova/auth/manager.py	2010-10-13 02:00:34 +0000
+++ nova/auth/manager.py	2010-10-14 20:21:03 +0000
@@ -201,7 +201,7 @@
 
     def __new__(cls, *args, **kwargs):
         """Returns the AuthManager singleton"""
-        if not cls._instance:
+        if not cls._instance or ('new' in kwargs and kwargs['new']):
             cls._instance = super(AuthManager, cls).__new__(cls)
         return cls._instance
 

=== removed file 'nova/datastore.py'
--- nova/datastore.py	2010-08-15 01:31:23 +0000
+++ nova/datastore.py	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""
-Datastore:
-
-MAKE Sure that ReDIS is running, and your flags are set properly,
-before trying to run this.
-"""
-
-import logging
-import redis
-
-from nova import flags
-
-FLAGS = flags.FLAGS
-flags.DEFINE_string('redis_host', '127.0.0.1',
-                    'Host that redis is running on.')
-flags.DEFINE_integer('redis_port', 6379,
-                    'Port that redis is running on.')
-flags.DEFINE_integer('redis_db', 0, 'Multiple DB keeps tests away')
-
-
-class Redis(object):
-    def __init__(self):
-        if hasattr(self.__class__, '_instance'):
-            raise Exception('Attempted to instantiate singleton')
-
-    @classmethod
-    def instance(cls):
-        if not hasattr(cls, '_instance'):
-            inst = redis.Redis(host=FLAGS.redis_host,
-                               port=FLAGS.redis_port,
-                               db=FLAGS.redis_db)
-            cls._instance = inst
-        return cls._instance
-
-

=== modified file 'nova/tests/auth_unittest.py'
--- nova/tests/auth_unittest.py	2010-09-30 22:42:09 +0000
+++ nova/tests/auth_unittest.py	2010-10-14 20:21:03 +0000
@@ -80,7 +80,7 @@
         FLAGS.auth_driver = self.auth_driver
         super(AuthManagerTestCase, self).setUp()
         self.flags(connection_type='fake')
-        self.manager = manager.AuthManager()
+        self.manager = manager.AuthManager(new=True)
 
     def test_create_and_find_user(self):
         with user_generator(self.manager):
@@ -117,7 +117,7 @@
                 self.assert_(filter(lambda u: u.id == 'test1', users))
                 self.assert_(filter(lambda u: u.id == 'test2', users))
                 self.assert_(not filter(lambda u: u.id == 'test3', users))
-        
+
     def test_can_add_and_remove_user_role(self):
         with user_generator(self.manager):
             self.assertFalse(self.manager.has_role('test1', 'itsec'))
@@ -324,6 +324,19 @@
 class AuthManagerLdapTestCase(AuthManagerTestCase, test.TrialTestCase):
     auth_driver = 'nova.auth.ldapdriver.FakeLdapDriver'
 
+    def __init__(self, *args, **kwargs):
+        AuthManagerTestCase.__init__(self)
+        test.TrialTestCase.__init__(self, *args, **kwargs)
+        import nova.auth.fakeldap as fakeldap
+        FLAGS.redis_db = 8
+        if FLAGS.flush_db:
+            logging.info("Flushing redis datastore")
+            try:
+                r = fakeldap.Redis.instance()
+                r.flushdb()
+            except:
+                self.skip = True
+
 class AuthManagerDbTestCase(AuthManagerTestCase, test.TrialTestCase):
     auth_driver = 'nova.auth.dbdriver.DbDriver'
 

=== modified file 'run_tests.py'
--- run_tests.py	2010-10-12 20:04:46 +0000
+++ run_tests.py	2010-10-14 20:21:03 +0000
@@ -45,7 +45,6 @@
 
 from twisted.scripts import trial as trial_script
 
-from nova import datastore
 from nova import flags
 from nova import twistd
 
@@ -86,12 +85,6 @@
     # TODO(termie): these should make a call instead of doing work on import
     if FLAGS.fake_tests:
         from nova.tests.fake_flags import *
-        # use db 8 for fake tests
-        FLAGS.redis_db = 8
-        if FLAGS.flush_db:
-            logging.info("Flushing redis datastore")
-            r = datastore.Redis.instance()
-            r.flushdb()
     else:
         from nova.tests.real_flags import *