openstack/deb-nova
Code Issues Proposed changes

Deprecate old vif drivers.

Browse Source 
As per commit 4c0cecd3 (Change-Id I292c2fd7aa0c32b1c91d737152ed8e54ea2cf6ac)
Deprecate:
* LibvirtBridgeDriver
* LibvirtOpenVswitchDriver
* LibvirtHybridOVSBridgeDriver
* LibvirtOpenVswitchVirtualPortDriver
* QuantumLinuxBridgeVIFDriver

Change-Id: Iad854dfe91aaa18622f78aa92746d3ea2f986960
This commit is contained in:
Joe Gordon
2013-04-04 01:28:59 +00:00
parent 820f43fc61
commit 3a8b2daa46
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
nova/virt/libvirt/vif.py
View File

@@ -497,6 +497,11 @@ class LibvirtBridgeDriver(LibvirtGenericVIFDriver):
Will be deprecated in Havana, and removed in Ixxxx."""
def get_config(self, instance, network, mapping, image_meta):
LOG.deprecated(_("The LibvirtBridgeDriver VIF driver is now "
"deprecated and will be removed in the next release. "
"Please use the LibvirtGenericVIFDriver VIF driver, "
"together with a network plugin that reports the "
"'vif_type' attribute"))
return self.get_config_bridge(instance, network, mapping, image_meta)
def plug(self, instance, vif):
@@ -518,6 +523,11 @@ class LibvirtOpenVswitchDriver(LibvirtGenericVIFDriver):
return mapping.get('ovs_interfaceid') or mapping['vif_uuid']
def get_config(self, instance, network, mapping, image_meta):
LOG.deprecated(_("The LibvirtOpenVswitchDriver VIF driver is now "
"deprecated and will be removed in the next release. "
"Please use the LibvirtGenericVIFDriver VIF driver, "
"together with a network plugin that reports the "
"'vif_type' attribute"))
return self.get_config_ovs_ethernet(instance,
network, mapping,
image_meta)
@@ -541,6 +551,11 @@ class LibvirtHybridOVSBridgeDriver(LibvirtGenericVIFDriver):
return mapping.get('ovs_interfaceid') or mapping['vif_uuid']
def get_config(self, instance, network, mapping, image_meta):
LOG.deprecated(_("The LibvirtHybridOVSBridgeDriver VIF driver is now "
"deprecated and will be removed in the next release. "
"Please use the LibvirtGenericVIFDriver VIF driver, "
"together with a network plugin that reports the "
"'vif_type' attribute"))
return self.get_config_ovs_hybrid(instance,
network, mapping,
image_meta)
@@ -564,6 +579,11 @@ class LibvirtOpenVswitchVirtualPortDriver(LibvirtGenericVIFDriver):
return mapping.get('ovs_interfaceid') or mapping['vif_uuid']
def get_config(self, instance, network, mapping, image_meta):
LOG.deprecated(_("The LibvirtOpenVswitchVirtualPortDriver VIF driver "
"is now deprecated and will be removed in the next "
"release. Please use the LibvirtGenericVIFDriver VIF "
"driver, together with a network plugin that reports "
"the 'vif_type' attribute"))
return self.get_config_ovs_bridge(instance,
network, mapping,
image_meta)
@@ -585,6 +605,11 @@ class QuantumLinuxBridgeVIFDriver(LibvirtGenericVIFDriver):
return network.get('bridge') or def_bridge
def get_config(self, instance, network, mapping, image_meta):
LOG.deprecated(_("The QuantumLinuxBridgeVIFDriver VIF driver is now "
"deprecated and will be removed in the next release. "
"Please use the LibvirtGenericVIFDriver VIF driver, "
"together with a network plugin that reports the "
"'vif_type' attribute"))
# In order for libvirt to make use of the bridge name then it has
# to ensure that the bridge exists
if 'should_create_bridge' not in mapping: