diff options
| author | Stephen Finucane <sfinucan@redhat.com> | 2019-12-16 09:57:34 +0000 |
|---|---|---|
| committer | Stephen Finucane <sfinucan@redhat.com> | 2020-01-08 13:54:12 +0000 |
| commit | df001770938afdad61f4579498d4153450554788 (patch) | |
| tree | efd27b5a37b79610ede81d64b7b3e1e8fb03bedc /nova/virt/powervm | |
| parent | 656c18eaf290a3b6ddf743c953f5cdf1d3fb2f05 (diff) | |
| download | nova-df001770938afdad61f4579498d4153450554788.tar.gz | |
nova-net: Remove final references to nova-network
Strip out everything matching '(is|use)_neutron', except the tests for
nova-network code and two other places that these tests rely on. Along
the way, remove a whole load of apparently unnecessary mocking that
clearly wasn't caught when we switched over the bulk of testing to use
the neutron network driver.
Change-Id: Ifa9c5c468400261a5e1f66b72c575845173a4f8f
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
Diffstat (limited to 'nova/virt/powervm')
| -rw-r--r-- | nova/virt/powervm/driver.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py index 9f35cf1af0..6b62aa7539 100644 --- a/nova/virt/powervm/driver.py +++ b/nova/virt/powervm/driver.py @@ -483,8 +483,8 @@ class PowerVMDriver(driver.ComputeDriver): is paused or halted/stopped. :param instance: nova.objects.instance.Instance - :param network_info: - :py:meth:`~nova.network.manager.NetworkManager.get_instance_nw_info` + :param network_info: `nova.network.models.NetworkInfo` object + describing the network metadata. :param reboot_type: Either a HARD or SOFT reboot :param block_device_info: Info pertaining to attached volumes :param bad_volumes_callback: Function to handle any bad volumes @@ -580,14 +580,6 @@ class PowerVMDriver(driver.ComputeDriver): sare.reraise = False raise exc.InstanceNotFound(instance_id=instance.uuid) - def deallocate_networks_on_reschedule(self, instance): - """Does the driver want networks deallocated on reschedule? - - :param instance: the instance object. - :returns: Boolean value. If True deallocate networks on reschedule. - """ - return True - def attach_volume(self, context, connection_info, instance, mountpoint, disk_bus=None, device_type=None, encryption=None): """Attach the volume to the instance using the connection_info. |