From: Vipin Balachandran <vbala@vmware.com>
Date: Mon, 17 Mar 2014 21:01:42 +0000 (+0530)
Subject: vmware: Remove deprecation warning from VC driver
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=52869508c81957f441128419c9ae7396715127be;p=openstack-build%2Fcinder-build.git

vmware: Remove deprecation warning from VC driver

The vCenter vmdk driver prints a deprecation warning for ESX vmdk driver.
This change removes that deprecation warning.

Change-Id: I90c00c08ae7b8e5507308de8d0bec32f8683a1d0
Closes-Bug: #1293960
---

diff --git a/cinder/volume/drivers/vmware/vmdk.py b/cinder/volume/drivers/vmware/vmdk.py
index 5f8561527..476d596f5 100644
--- a/cinder/volume/drivers/vmware/vmdk.py
+++ b/cinder/volume/drivers/vmware/vmdk.py
@@ -1115,6 +1115,10 @@ class VMwareVcVmdkDriver(VMwareEsxVmdkDriver):
     # PBM is enabled only for VC versions 5.5 and above
     PBM_ENABLED_VC_VERSION = dist_version.LooseVersion('5.5')
 
+    def _do_deprecation_warning(self):
+        # no deprecation warning for vCenter vmdk driver
+        pass
+
     def __init__(self, *args, **kwargs):
         super(VMwareVcVmdkDriver, self).__init__(*args, **kwargs)
         self.configuration.append_config_values(spbm_opts)