Unity: Add thick volumes support

Although the change is same as https://review.openstack.org/#/c/580087,
it is not easy to cherry pick directly. The above review is for Rocky
and based on the change of thinclone. While the Mitaka version doesn't
contain the change of thinclone. There are lots of conflicts to resolve
if using cherry-pick.

So I manually patch the change from above link.

Change-Id: I12d426a6ac2f87e14609d297e834a0111c940cca

Author: Murray-LIANG

README.md

@@ -22,16 +22,16 @@ distributed Python package
 Version
 -------
 
-0.4.5
+0.4.6
 
 Prerequisites
 -------------
 
-| Software  | Version        |
-|-----------|----------------|
-| Unity OE  | 4.1.X or newer |
-| OpenStack | Mitaka         |
-| storops   | 0.5.5 or newer |
+| Software  | Version         |
+|-----------|-----------------|
+| Unity OE  | 4.1.X or newer  |
+| OpenStack | Mitaka          |
+| storops   | 0.5.10 or newer |
 
 Supported operations
 --------------------
@@ -45,6 +45,7 @@ Supported operations
 -   Migrate a volume.
 -   Get volume statistics.
 -   Efficient non-disruptive volume backup.
+-   Create thick volumes.
 
 Driver configuration
 --------------------
@@ -261,7 +262,14 @@ To enable multipath in live migration:
 Thin and thick provisioning
 ---------------------------
 
-Only thin volume provisioning is supported in Unity volume driver.
+By default, the volume created by Unity driver is thin provisioned. Run the
+following commands to create a thick volume.
+
+```bash
+# openstack volume type create --property provisioning:type=thick \
+    --property thick_provisioning_support='<is> True' thick_volume_type
+# openstack volume create --type thick_volume_type thick_volume
+```
 
 QoS support
 -----------

cinder/tests/unit/volume/drivers/dell_emc/unity/test_adapter.py

@@ -74,8 +74,12 @@ def get_pools():
         return test_client.MockResourceList(['pool0', 'pool1'])
 
     @staticmethod
-    def create_lun(name, size, pool, description=None, io_limit_policy=None):
-        return test_client.MockResource(_id='lun_3')
+    def create_lun(name, size, pool, description=None, io_limit_policy=None,
+                   is_thin=None):
+        lun_id = name
+        if is_thin is not None and not is_thin:
+            lun_id += '_thick'
+        return test_client.MockResource(_id=lun_id)
 
     @staticmethod
     def get_lun(name=None, lun_id=None):
@@ -225,8 +229,17 @@ def get_connection_info(adapter, hlu, host, connector):
     return {}
 
 
+def get_volume_type_extra_specs(type_id):
+    if type_id == 'thick':
+        return {'provisioning:type': 'thick',
+                'thick_provisioning_support': '<is> True'}
+    return {}
+
+
 def patch_for_unity_adapter(func):
     @functools.wraps(func)
+    @mock.patch('cinder.volume.volume_types.get_volume_type_extra_specs',
+                new=get_volume_type_extra_specs)
     @mock.patch('cinder.volume.drivers.dell_emc.unity.utils.'
                 'get_backend_qos_specs',
                 new=get_backend_qos_specs)
@@ -283,6 +296,15 @@ def test_create_volume(self):
         expected = get_lun_pl('lun_3')
         self.assertEqual(expected, ret['provider_location'])
 
+    @patch_for_unity_adapter
+    def test_create_volume_thick(self):
+        volume = mock.Mock(name='lun_3', size=5, host='unity#pool1',
+                           volume_type_id='thick')
+        ret = self.adapter.create_volume(volume)
+
+        expected = get_lun_pl('lun_3_thick')
+        self.assertEqual(expected, ret['provider_location'])
+
     def test_create_snapshot(self):
         volume = mock.Mock(provider_location='id^lun_43')
         snap = mock.Mock(volume=volume)
@@ -324,15 +346,15 @@ def test_get_pool_stats(self):
         self.assertEqual(2, stats['free_capacity_gb'])
         self.assertEqual(300, stats['max_over_subscription_ratio'])
         self.assertEqual(5, stats['reserved_percentage'])
-        self.assertFalse(stats['thick_provisioning_support'])
+        self.assertTrue(stats['thick_provisioning_support'])
         self.assertTrue(stats['thin_provisioning_support'])
 
     def test_update_volume_stats(self):
         stats = self.adapter.update_volume_stats()
         self.assertEqual('backend', stats['volume_backend_name'])
         self.assertEqual('unknown', stats['storage_protocol'])
         self.assertTrue(stats['thin_provisioning_support'])
-        self.assertFalse(stats['thick_provisioning_support'])
+        self.assertTrue(stats['thick_provisioning_support'])
         self.assertEqual(1, len(stats['pools']))
 
     def test_serial_number(self):

cinder/tests/unit/volume/drivers/dell_emc/unity/test_client.py

@@ -47,6 +47,7 @@ def __init__(self, name=None, _id=None):
         self.max_kbps = None
         self.pool_name = 'Pool0'
         self.host_cache = []
+        self.is_thin = None
 
     @property
     def id(self):
@@ -103,13 +104,16 @@ def get_hlu(self, lun):
         return self.alu_hlu_map.get(lun.get_id(), None)
 
     @staticmethod
-    def create_lun(lun_name, size_gb, description=None, io_limit_policy=None):
+    def create_lun(lun_name, size_gb, description=None, io_limit_policy=None,
+                   is_thin=None):
         if lun_name == 'in_use':
             raise ex.UnityLunNameInUseError()
         ret = MockResource(lun_name, 'lun_2')
         if io_limit_policy is not None:
             ret.max_iops = io_limit_policy.max_iops
             ret.max_kbps = io_limit_policy.max_kbps
+        if is_thin is not None:
+            ret.is_thin = is_thin
         return ret
 
     @staticmethod
@@ -303,6 +307,13 @@ def test_create_lun_with_io_limit(self):
         lun = self.client.create_lun('LUN 4', 6, pool, io_limit_policy=limit)
         self.assertEqual(100, lun.max_kbps)
 
+    def test_create_lun_thick(self):
+        name = 'thick_lun'
+        pool = MockResource('Pool 0')
+        lun = self.client.create_lun(name, 6, pool, is_thin=False)
+        self.assertIsNotNone(lun.is_thin)
+        self.assertFalse(lun.is_thin)
+
     def test_delete_lun_normal(self):
         self.assertIsNone(self.client.delete_lun('lun3'))
 

cinder/volume/drivers/dell_emc/unity/adapter.py

@@ -176,16 +176,21 @@ def create_volume(self, volume):
         qos_specs = utils.get_backend_qos_specs(volume)
         limit_policy = self.client.get_io_limit_policy(qos_specs)
 
+        provision = utils.get_extra_spec(volume, 'provisioning:type')
+        support = utils.get_extra_spec(volume, 'thick_provisioning_support')
+        is_thick = (provision == 'thick' and support == '<is> True')
+
         LOG.info(_LI('Create Volume: %(volume)s  Size: %(size)s '
-                     'Pool: %(pool)s Qos: %(qos)s.'),
+                     'Pool: %(pool)s Qos: %(qos)s Thick: %(is_thick)s.'),
                  {'volume': volume_name,
                   'size': volume_size,
                   'pool': pool.name,
-                  'qos': qos_specs})
+                  'qos': qos_specs,
+                  'is_thick': is_thick})
 
         lun = self.client.create_lun(
             volume_name, volume_size, pool, description=volume_description,
-            io_limit_policy=limit_policy)
+            io_limit_policy=limit_policy, is_thin=False if is_thick else None)
         location = self._build_provider_location(
             lun_type='lun',
             lun_id=lun.get_id())
@@ -263,7 +268,7 @@ def update_volume_stats(self):
             'volume_backend_name': self.volume_backend_name,
             'storage_protocol': self.protocol,
             'thin_provisioning_support': True,
-            'thick_provisioning_support': False,
+            'thick_provisioning_support': True,
             'pools': self.get_pools_stats(),
         }
 
@@ -287,7 +292,7 @@ def _get_pool_stats(self, pool):
                               {'pool_name': pool.name,
                                'array_serial': self.serial_number}),
             'thin_provisioning_support': True,
-            'thick_provisioning_support': False,
+            'thick_provisioning_support': True,
             'max_over_subscription_ratio': (
                 self.max_over_subscription_ratio)}
 

cinder/volume/drivers/dell_emc/unity/client.py

@@ -57,20 +57,22 @@ def get_serial(self):
         return self.system.serial_number
 
     def create_lun(self, name, size, pool, description=None,
-                   io_limit_policy=None):
+                   io_limit_policy=None, is_thin=None):
         """Creates LUN on the Unity system.
 
         :param name: lun name
         :param size: lun size in GiB
         :param pool: UnityPool object represent to pool to place the lun
         :param description: lun description
         :param io_limit_policy: io limit on the LUN
+        :param is_thin: if False, a thick LUN will be created
         :return: UnityLun object
         """
         try:
             lun = pool.create_lun(lun_name=name, size_gb=size,
                                   description=description,
-                                  io_limit_policy=io_limit_policy)
+                                  io_limit_policy=io_limit_policy,
+                                  is_thin=is_thin)
         except storops_ex.UnityLunNameInUseError:
             LOG.debug("LUN %s already exists. Return the existing one.",
                       name)