HACKING fixes, all but sqlalchemy.
Looks like this fixes all HACKING problems that were around. Thanks to Dina Belova and Alexander Kovalev for this work. Change-Id: I8157f0d4890184c1216aab63ef7180ee8b7a184d
This commit is contained in:
@@ -19,8 +19,7 @@
|
||||
|
||||
from nova import flags
|
||||
from nova.openstack.common import cfg
|
||||
from nova.rpc.common import RemoteError, LOG
|
||||
from nova.utils import import_object
|
||||
from nova import utils
|
||||
|
||||
|
||||
rpc_backend_opt = cfg.StrOpt('rpc_backend',
|
||||
@@ -199,5 +198,5 @@ def _get_impl():
|
||||
"""Delay import of rpc_backend until FLAGS are loaded."""
|
||||
global _RPCIMPL
|
||||
if _RPCIMPL is None:
|
||||
_RPCIMPL = import_object(FLAGS.rpc_backend)
|
||||
_RPCIMPL = utils.import_object(FLAGS.rpc_backend)
|
||||
return _RPCIMPL
|
||||
|
||||
@@ -37,8 +37,10 @@ from nova import context
|
||||
from nova import exception
|
||||
from nova import flags
|
||||
from nova import local
|
||||
from nova import log as logging
|
||||
import nova.rpc.common as rpc_common
|
||||
from nova.rpc.common import LOG
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
FLAGS = flags.FLAGS
|
||||
|
||||
@@ -43,11 +43,12 @@ from nova import context
|
||||
from nova import exception
|
||||
from nova import flags
|
||||
from nova import local
|
||||
from nova import log as logging
|
||||
from nova.rpc import common as rpc_common
|
||||
from nova.rpc.common import RemoteError, LOG
|
||||
from nova.testing import fake
|
||||
|
||||
FLAGS = flags.FLAGS
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class Connection(carrot_connection.BrokerConnection, rpc_common.Connection):
|
||||
@@ -558,7 +559,7 @@ class MulticallWaiter(object):
|
||||
"""Acks message and sets result."""
|
||||
message.ack()
|
||||
if data['failure']:
|
||||
self._results.put(RemoteError(*data['failure']))
|
||||
self._results.put(rpc_common.RemoteError(*data['failure']))
|
||||
elif data.get('ending', False):
|
||||
self._got_ending = True
|
||||
else:
|
||||
|
||||
@@ -26,11 +26,12 @@ import qpid.messaging
|
||||
import qpid.messaging.exceptions
|
||||
|
||||
from nova import flags
|
||||
from nova import log as logging
|
||||
from nova.openstack.common import cfg
|
||||
from nova.rpc import amqp as rpc_amqp
|
||||
from nova.rpc import common as rpc_common
|
||||
from nova.rpc.common import LOG
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
qpid_opts = [
|
||||
cfg.StrOpt('qpid_hostname',
|
||||
|
||||
Reference in New Issue
Block a user