Handle nova network deprecation
The Neutron API class has been moved as part of the nova network deprecation. We'll have to pick this up in compute-hyperv. Change-Id: I19eae24317c0ccaa470d3711e943c612b36b1740
This commit is contained in:
parent
bd2aacc14f
commit
71b317276f
|
@ -22,7 +22,7 @@ from nova.compute import power_state
|
|||
from nova.compute import task_states
|
||||
from nova.compute import vm_states
|
||||
from nova import context
|
||||
from nova import network
|
||||
from nova.network import neutron
|
||||
from nova import objects
|
||||
from nova import utils
|
||||
from nova.virt import block_device
|
||||
|
@ -54,7 +54,7 @@ class ClusterOps(object):
|
|||
self._this_node = hostops.HostOps.get_hostname()
|
||||
|
||||
self._context = context.get_admin_context()
|
||||
self._network_api = network.API()
|
||||
self._network_api = neutron.API()
|
||||
self._vmops = vmops.VMOps()
|
||||
self._serial_console_ops = serialconsoleops.SerialConsoleOps()
|
||||
self._placement = placement_utils.PlacementUtils()
|
||||
|
|
|
@ -19,7 +19,7 @@ from nova.compute import power_state
|
|||
from nova.compute import task_states
|
||||
from nova.compute import vm_states
|
||||
from nova import exception
|
||||
from nova.network.neutronv2 import api as network_api
|
||||
from nova.network import neutron
|
||||
from nova import objects
|
||||
from nova.virt import event as virtevent
|
||||
from os_win import constants as os_win_const
|
||||
|
@ -39,7 +39,7 @@ class ClusterOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
|
||||
_autospec_classes = [
|
||||
clusterops.hostops.HostOps,
|
||||
network_api.API,
|
||||
neutron.API,
|
||||
clusterops.vmops.VMOps,
|
||||
clusterops.serialconsoleops.SerialConsoleOps,
|
||||
clusterops.placement_utils.PlacementUtils,
|
||||
|
|
Loading…
Reference in New Issue