From 81bb294365ebd65dce0e297cc79cb4a53b6d8d52 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Wed, 1 Oct 2014 00:51:54 -0700 Subject: [PATCH] VMware: delete the driver VMwareESXDriver In Juno we had a deprcation warning about the VMwareESXDriver no longer being supported. This class is now deleted. Change-Id: Id5b50fa944f57cd8fd61611d93caac8066cfd93d --- nova/virt/vmwareapi/__init__.py | 4 ---- nova/virt/vmwareapi/driver.py | 16 ---------------- 2 files changed, 20 deletions(-) diff --git a/nova/virt/vmwareapi/__init__.py b/nova/virt/vmwareapi/__init__.py index 022e525284d8..d9e04435ad18 100644 --- a/nova/virt/vmwareapi/__init__.py +++ b/nova/virt/vmwareapi/__init__.py @@ -18,8 +18,4 @@ # NOTE(sdague) for nicer compute_driver specification from nova.virt.vmwareapi import driver -# VMwareESXDriver is deprecated in Juno. This property definition -# allows those configurations to work which reference it while -# logging a deprecation warning -VMwareESXDriver = driver.VMwareESXDriver VMwareVCDriver = driver.VMwareVCDriver diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py index 43e4ea2120b7..7ec9fdc07a90 100644 --- a/nova/virt/vmwareapi/driver.py +++ b/nova/virt/vmwareapi/driver.py @@ -104,22 +104,6 @@ CONF.register_opts(spbm_opts, 'vmware') TIME_BETWEEN_API_CALL_RETRIES = 1.0 -# The following class was removed in the transition from Icehouse to -# Juno, but may still be referenced in configuration files. The -# following stub allow those configurations to work while logging a -# deprecation warning. -class VMwareESXDriver(driver.ComputeDriver): - """The ESX host connection object.""" - - def _do_deprecation_warning(self): - LOG.warn(_LW('The VMware ESX driver is now deprecated and has been ' - 'removed in the Juno release. The VC driver will remain ' - 'and continue to be supported.')) - - def __init__(self, virtapi, read_only=False, scheme="https"): - self._do_deprecation_warning() - - class VMwareVCDriver(driver.ComputeDriver): """The VC host connection object."""