From a0d785868c859fcd016bbcfb033340e187721054 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Thu, 12 Sep 2013 11:14:30 -0400
Subject: [PATCH] Move required keymgr classes out of nova/tests

Currently the Nova default keymgr implementation tries to
import classes from nova/tests. This could be a very bad
thing for production deployments which may not include
code from nova/tests.

This change moves two required modules (single_key_mgr and
mock_key_mgr) into the nova/keymgr tree.

Fixes bug: #1224526

Change-Id: I683b0245ab6b6acf8a4ba26f96d8c505f7c7cac8
---
 nova/keymgr/conf_key_mgr.py               | 2 +-
 nova/{tests => }/keymgr/mock_key_mgr.py   | 0
 nova/{tests => }/keymgr/single_key_mgr.py | 2 +-
 nova/tests/keymgr/fake.py                 | 2 +-
 nova/tests/keymgr/test_mock_key_mgr.py    | 2 +-
 nova/tests/keymgr/test_single_key_mgr.py  | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename nova/{tests => }/keymgr/mock_key_mgr.py (100%)
 rename nova/{tests => }/keymgr/single_key_mgr.py (98%)

diff --git a/nova/keymgr/conf_key_mgr.py b/nova/keymgr/conf_key_mgr.py
index 1240cb487b81..b32731754199 100644
--- a/nova/keymgr/conf_key_mgr.py
+++ b/nova/keymgr/conf_key_mgr.py
@@ -34,8 +34,8 @@ encryption key so *any* volume can be decrypted once the fixed key is known.
 
 from oslo.config import cfg
 
+from nova.keymgr import single_key_mgr
 from nova.openstack.common.gettextutils import _
-from nova.tests.keymgr import single_key_mgr
 
 key_mgr_opts = [
     cfg.StrOpt('fixed_key',
diff --git a/nova/tests/keymgr/mock_key_mgr.py b/nova/keymgr/mock_key_mgr.py
similarity index 100%
rename from nova/tests/keymgr/mock_key_mgr.py
rename to nova/keymgr/mock_key_mgr.py
diff --git a/nova/tests/keymgr/single_key_mgr.py b/nova/keymgr/single_key_mgr.py
similarity index 98%
rename from nova/tests/keymgr/single_key_mgr.py
rename to nova/keymgr/single_key_mgr.py
index b5aca56d09c2..d41e84381453 100644
--- a/nova/tests/keymgr/single_key_mgr.py
+++ b/nova/keymgr/single_key_mgr.py
@@ -21,9 +21,9 @@ all invocations of get_key.
 
 
 from nova import exception
+from nova.keymgr import mock_key_mgr
 from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
-from nova.tests.keymgr import mock_key_mgr
 
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/tests/keymgr/fake.py b/nova/tests/keymgr/fake.py
index 4c99bf649f73..85e62e3dcf90 100644
--- a/nova/tests/keymgr/fake.py
+++ b/nova/tests/keymgr/fake.py
@@ -19,7 +19,7 @@
 """Implementation of a fake key manager."""
 
 
-from nova.tests.keymgr import mock_key_mgr
+from nova.keymgr import mock_key_mgr
 
 
 def fake_api():
diff --git a/nova/tests/keymgr/test_mock_key_mgr.py b/nova/tests/keymgr/test_mock_key_mgr.py
index ec8f3c168b66..e749621df342 100644
--- a/nova/tests/keymgr/test_mock_key_mgr.py
+++ b/nova/tests/keymgr/test_mock_key_mgr.py
@@ -23,7 +23,7 @@ import array
 from nova import context
 from nova import exception
 from nova.keymgr import key as keymgr_key
-from nova.tests.keymgr import mock_key_mgr
+from nova.keymgr import mock_key_mgr
 from nova.tests.keymgr import test_key_mgr
 
 
diff --git a/nova/tests/keymgr/test_single_key_mgr.py b/nova/tests/keymgr/test_single_key_mgr.py
index 85eb74e50381..19103240cbe0 100644
--- a/nova/tests/keymgr/test_single_key_mgr.py
+++ b/nova/tests/keymgr/test_single_key_mgr.py
@@ -22,7 +22,7 @@ import array
 
 from nova import exception
 from nova.keymgr import key
-from nova.tests.keymgr import single_key_mgr
+from nova.keymgr import single_key_mgr
 from nova.tests.keymgr import test_mock_key_mgr