summaryrefslogtreecommitdiff
path: root/nova/cmd
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2014-05-20 14:55:13 -0700
committerMichael Still <mikal@stillhq.com>2014-07-22 19:37:12 +1000
commit3883697d31809ab6c5c448bf853bfde69ca53db0 (patch)
tree6df2a0af4822092af9af691302b39c4d91b1c444 /nova/cmd
parenta905cf2c0cacfc5d0503b3a4ac19ef21eb32e287 (diff)
downloadnova-3883697d31809ab6c5c448bf853bfde69ca53db0.tar.gz
Fix last of direct use of object modules
This replaces all uses of nova.objects.<module>.<object> with nova.objects.<object> in the remaining places. Implements-Blueprint: object-subclassing Change-Id: Ic7632cca2455a38abcbdb94feb7e39cfb898bb27
Diffstat (limited to 'nova/cmd')
-rw-r--r--nova/cmd/dhcpbridge.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/cmd/dhcpbridge.py b/nova/cmd/dhcpbridge.py
index 2abb6a8ffd..114b7484a2 100644
--- a/nova/cmd/dhcpbridge.py
+++ b/nova/cmd/dhcpbridge.py
@@ -35,7 +35,6 @@ from nova.i18n import _
from nova.network import rpcapi as network_rpcapi
from nova import objects
from nova.objects import base as objects_base
-from nova.objects import network as network_obj
from nova.openstack.common import importutils
from nova.openstack.common import jsonutils
from nova.openstack.common import log as logging
@@ -72,7 +71,7 @@ def del_lease(mac, ip_address):
def init_leases(network_id):
"""Get the list of hosts for a network."""
ctxt = context.get_admin_context()
- network = network_obj.Network.get_by_id(ctxt, network_id)
+ network = objects.Network.get_by_id(ctxt, network_id)
network_manager = importutils.import_object(CONF.network_manager)
return network_manager.get_dhcp_leases(ctxt, network)