diff options
| author | Russell Bryant <rbryant@redhat.com> | 2012-06-13 10:48:54 -0400 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2012-06-20 12:57:21 -0400 |
| commit | ba3754e3ff672a877d90c78486c7f4d5fd4bf7b0 (patch) | |
| tree | 47f35e1ce9c22ec66155986484e54acb4089efdf /nova/compute | |
| parent | 83e6cf7b92ae6a845939adf1771f0422a5e5f2ca (diff) | |
Use rpc from openstack-common.
Final patch for blueprint common-rpc.
This patch removes nova.rpc in favor of the copy in openstack-common.
Change-Id: I9c2f6bdbe8cd0c44417f75284131dbf3c126d1dd
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/compute/rpcapi.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index f33dd3162..7e5070bce 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -68,8 +68,8 @@ from nova.openstack.common import cfg from nova.openstack.common import excutils from nova.openstack.common import importutils from nova.openstack.common import jsonutils +from nova.openstack.common import rpc from nova.openstack.common import timeutils -from nova import rpc from nova import utils from nova.virt import driver from nova import volume diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py index e7945c7d4..7a531fcf5 100644 --- a/nova/compute/rpcapi.py +++ b/nova/compute/rpcapi.py @@ -20,8 +20,8 @@ Client side of the compute RPC API. from nova import exception from nova import flags -from nova import rpc -import nova.rpc.proxy +from nova.openstack.common import rpc +import nova.openstack.common.rpc.proxy FLAGS = flags.FLAGS @@ -48,7 +48,7 @@ def _compute_topic(topic, ctxt, host, instance): return rpc.queue_get_for(ctxt, topic, host) -class ComputeAPI(nova.rpc.proxy.RpcProxy): +class ComputeAPI(nova.openstack.common.rpc.proxy.RpcProxy): '''Client side of the compute rpc API. API version history: @@ -358,7 +358,7 @@ class ComputeAPI(nova.rpc.proxy.RpcProxy): topic=_compute_topic(self.topic, ctxt, None, instance)) -class SecurityGroupAPI(nova.rpc.proxy.RpcProxy): +class SecurityGroupAPI(nova.openstack.common.rpc.proxy.RpcProxy): '''Client side of the security group rpc API. API version history: |