From: Vipin Balachandran <vbala@vmware.com>
Date: Thu, 30 Jul 2015 08:58:01 +0000 (+0530)
Subject: VMware: Fix protocol in backend stats
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b8a9ec0511f9517e662fbc45f3ab32c2896d1fb6;p=openstack-build%2Fcinder-build.git

VMware: Fix protocol in backend stats

The VMDK driver reports the protocol as 'LSI Logic SCSI' in
backend stats. This patch changes the protocol to 'vmdk'
which is in sync with driver support matrix at:
https://wiki.openstack.org/wiki/CinderSupportMatrix

Change-Id: I8f9255088ce3d25a6b0d7f38dcbabfd15082ff32
Closes-Bug: #1479693
---

diff --git a/cinder/tests/unit/test_vmware_vmdk.py b/cinder/tests/unit/test_vmware_vmdk.py
index bd14c0c64..d28c5eb8b 100644
--- a/cinder/tests/unit/test_vmware_vmdk.py
+++ b/cinder/tests/unit/test_vmware_vmdk.py
@@ -198,12 +198,12 @@ class VMwareEsxVmdkDriverTestCase(test.TestCase):
     def test_get_volume_stats(self):
         """Test get_volume_stats."""
         stats = self._driver.get_volume_stats()
-        self.assertEqual(stats['vendor_name'], 'VMware')
-        self.assertEqual(stats['driver_version'], self._driver.VERSION)
-        self.assertEqual(stats['storage_protocol'], 'LSI Logic SCSI')
-        self.assertEqual(stats['reserved_percentage'], 0)
-        self.assertEqual(stats['total_capacity_gb'], 'unknown')
-        self.assertEqual(stats['free_capacity_gb'], 'unknown')
+        self.assertEqual('VMware', stats['vendor_name'])
+        self.assertEqual(self._driver.VERSION, stats['driver_version'])
+        self.assertEqual('vmdk', stats['storage_protocol'])
+        self.assertEqual(0, stats['reserved_percentage'])
+        self.assertEqual('unknown', stats['total_capacity_gb'])
+        self.assertEqual('unknown', stats['free_capacity_gb'])
 
     def test_create_volume(self):
         """Test create_volume."""
diff --git a/cinder/volume/drivers/vmware/vmdk.py b/cinder/volume/drivers/vmware/vmdk.py
index c374af31b..79edb36f0 100644
--- a/cinder/volume/drivers/vmware/vmdk.py
+++ b/cinder/volume/drivers/vmware/vmdk.py
@@ -303,7 +303,7 @@ class VMwareEsxVmdkDriver(driver.VolumeDriver):
             data = {'volume_backend_name': backend_name,
                     'vendor_name': 'VMware',
                     'driver_version': self.VERSION,
-                    'storage_protocol': 'LSI Logic SCSI',
+                    'storage_protocol': 'vmdk',
                     'reserved_percentage': 0,
                     'total_capacity_gb': 'unknown',
                     'free_capacity_gb': 'unknown'}