From e0333fa56a0f998a5d44ebeade5b754875c3c7d3 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 29 Jan 2013 18:37:29 +0000 Subject: Remove deprecation notice in LibvirtBridgeDriver After further discussions with Quantum team, it was agreed not to deprecate the existing libvirt VIF drivers until the Havana release, to allow more time for Quantum plugins to be updated. Blueprint: libvirt-vif-driver Change-Id: I0226c4117630de489543d35662a8ee6b6c7729f9 Signed-off-by: Daniel P. Berrange --- nova/virt/libvirt/vif.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py index 45c299830..78ed848a2 100644 --- a/nova/virt/libvirt/vif.py +++ b/nova/virt/libvirt/vif.py @@ -205,17 +205,9 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver): class LibvirtBridgeDriver(LibvirtGenericVIFDriver): - """Deprecated in favour of LibvirtGenericVIFDriver. - Retained in Grizzly for compatibility with Quantum + """Retained in Grizzly for compatibility with Quantum drivers which do not yet report 'vif_type' port binding. - To be removed in Hxxxx.""" - - def __init__(self): - LOG.deprecated( - _("LibvirtBridgeDriver is deprecated and " - "will be removed in the Hxxxx release. Please " - "update the 'libvirt_vif_driver' config parameter " - "to use the LibvirtGenericVIFDriver class instead")) + Will be deprecated in Havana, and removed in Ixxxx.""" def get_config(self, instance, network, mapping): return self.get_config_bridge(instance, network, mapping) -- cgit