diff options
| author | Zed Shaw <zedshaw@zedshaw.com> | 2011-07-29 12:08:59 -0700 |
|---|---|---|
| committer | Zed Shaw <zedshaw@zedshaw.com> | 2011-07-29 12:08:59 -0700 |
| commit | 87f021f73c01806bc1c22106e3a169d60024104f (patch) | |
| tree | d4833950d974e18d2d2529d391a191af8c996cb0 | |
| parent | 14b5036d01cdfecd650755345589424969b675ff (diff) | |
| download | nova-87f021f73c01806bc1c22106e3a169d60024104f.tar.gz nova-87f021f73c01806bc1c22106e3a169d60024104f.tar.xz nova-87f021f73c01806bc1c22106e3a169d60024104f.zip | |
Reorganize the code to satisfy review comments.
| -rw-r--r-- | nova/rpc/__init__.py (renamed from nova/rpc.py) | 4 | ||||
| -rw-r--r-- | nova/rpc/amqp.py (renamed from nova/rpc_backends/amqp.py) | 2 | ||||
| -rw-r--r-- | nova/rpc/common.py (renamed from nova/rpc_backends/common.py) | 0 | ||||
| -rw-r--r-- | nova/rpc_backends/__init__.py | 0 | ||||
| -rw-r--r-- | nova/tests/test_rpc_amqp.py | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/nova/rpc.py b/nova/rpc/__init__.py index f5dd49982..bdf7f705b 100644 --- a/nova/rpc.py +++ b/nova/rpc/__init__.py @@ -18,12 +18,12 @@ from nova.utils import import_object -from nova.rpc_backends.common import RemoteError, LOG +from nova.rpc.common import RemoteError, LOG from nova import flags FLAGS = flags.FLAGS flags.DEFINE_string('rpc_backend', - 'nova.rpc_backends.amqp', + 'nova.rpc.amqp', "The messaging module to use, defaults to AMQP.") RPCIMPL = import_object(FLAGS.rpc_backend) diff --git a/nova/rpc_backends/amqp.py b/nova/rpc/amqp.py index efa178bd2..61555795a 100644 --- a/nova/rpc_backends/amqp.py +++ b/nova/rpc/amqp.py @@ -44,7 +44,7 @@ from nova import fakerabbit from nova import flags from nova import log as logging from nova import utils -from nova.rpc_backends.common import RemoteError, LOG +from nova.rpc.common import RemoteError, LOG FLAGS = flags.FLAGS diff --git a/nova/rpc_backends/common.py b/nova/rpc/common.py index 1d3065a83..1d3065a83 100644 --- a/nova/rpc_backends/common.py +++ b/nova/rpc/common.py diff --git a/nova/rpc_backends/__init__.py b/nova/rpc_backends/__init__.py deleted file mode 100644 index e69de29bb..000000000 --- a/nova/rpc_backends/__init__.py +++ /dev/null diff --git a/nova/tests/test_rpc_amqp.py b/nova/tests/test_rpc_amqp.py index e3df2393a..d29f7ae32 100644 --- a/nova/tests/test_rpc_amqp.py +++ b/nova/tests/test_rpc_amqp.py @@ -2,7 +2,7 @@ from nova import context from nova import flags from nova import log as logging from nova import rpc -from nova.rpc_backends import amqp +from nova.rpc import amqp from nova import test |