From ba3754e3ff672a877d90c78486c7f4d5fd4bf7b0 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 13 Jun 2012 10:48:54 -0400 Subject: 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 --- nova/console/api.py | 2 +- nova/console/rpcapi.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nova/console') diff --git a/nova/console/api.py b/nova/console/api.py index 46718a49e..ecbdbf2fa 100644 --- a/nova/console/api.py +++ b/nova/console/api.py @@ -21,7 +21,7 @@ from nova.compute import rpcapi as compute_rpcapi from nova.console import rpcapi as console_rpcapi from nova.db import base from nova import flags -from nova import rpc +from nova.openstack.common import rpc from nova import utils diff --git a/nova/console/rpcapi.py b/nova/console/rpcapi.py index 8f0c5b97f..66c963403 100644 --- a/nova/console/rpcapi.py +++ b/nova/console/rpcapi.py @@ -19,13 +19,13 @@ Client side of the console RPC API. """ from nova import flags -import nova.rpc.proxy +import nova.openstack.common.rpc.proxy FLAGS = flags.FLAGS -class ConsoleAPI(nova.rpc.proxy.RpcProxy): +class ConsoleAPI(nova.openstack.common.rpc.proxy.RpcProxy): '''Client side of the console rpc API. API version history: -- cgit