From 894fbae8ec4f22a71b3021c1b695dc0e4975aa96 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Wed, 23 Jul 2014 17:47:37 +0100 Subject: [PATCH] libvirt: remove VIF driver classes deprecated in Icehouse In Icehouse the old VIF driver classes were set as deprecated to be removed in Juno. Now they can be finally deleted. Related-bug: #1302796 Change-Id: I7be735062e6cc6aa54dec1bf43d3cce1ac544988 --- nova/virt/libvirt/vif.py | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py index 108dc1aabdb..eda546eeecd 100644 --- a/nova/virt/libvirt/vif.py +++ b/nova/virt/libvirt/vif.py @@ -24,7 +24,6 @@ from nova import exception from nova.i18n import _ from nova.i18n import _LE -from nova.i18n import _LW from nova.network import linux_net from nova.network import model as network_model from nova.openstack.common import log as logging @@ -758,36 +757,3 @@ def unplug(self, instance, vif): raise exception.NovaException( _("Unexpected vif_type=%s") % vif_type) func(instance, vif) - -# The following classes were removed in the transition from Havana to -# Icehouse, but may still be referenced in configuration files. The -# following stubs allow those configurations to work while logging a -# deprecation warning. - - -class _LibvirtDeprecatedDriver(LibvirtGenericVIFDriver): - def __init__(self, *args, **kwargs): - LOG.warn(_LW('VIF driver \"%s\" is marked as deprecated and will be ' - 'removed in the Juno release.'), - self.__class__.__name__) - super(_LibvirtDeprecatedDriver, self).__init__(*args, **kwargs) - - -class LibvirtBridgeDriver(_LibvirtDeprecatedDriver): - pass - - -class LibvirtOpenVswitchDriver(_LibvirtDeprecatedDriver): - pass - - -class LibvirtHybridOVSBridgeDriver(_LibvirtDeprecatedDriver): - pass - - -class LibvirtOpenVswitchVirtualPortDriver(_LibvirtDeprecatedDriver): - pass - - -class NeutronLinuxBridgeVIFDriver(_LibvirtDeprecatedDriver): - pass