From 13c2cec6752530adf481cebb1d89c66a3170a124 Mon Sep 17 00:00:00 2001
From: Jean Pierre Roquesalane <jeanpierre.roquesalane@dell.com>
Date: Wed, 21 Sep 2022 15:40:00 +0000
Subject: [PATCH] Revert "PowerFlex driver - fix the display of the incorrect
 volume"

This reverts commit b1b09d40856071727f43e1b1888124c79f84019e.

Reason for revert: Introducing regression, Any volume extension operation fails.

Change-Id: I0e72f3b74209120fd82ae55c5951fe5e878c124f
---
 .../dell_emc/powerflex/test_create_volume.py  | 19 +------------------
 .../drivers/dell_emc/powerflex/driver.py      |  5 ++++-
 ...e-provided-by-driver-4555edf1abab141c.yaml |  8 --------
 3 files changed, 5 insertions(+), 27 deletions(-)
 delete mode 100644 releasenotes/notes/bug-1968164-powerflex-fixed-volume-size-provided-by-driver-4555edf1abab141c.yaml

diff --git a/cinder/tests/unit/volume/drivers/dell_emc/powerflex/test_create_volume.py b/cinder/tests/unit/volume/drivers/dell_emc/powerflex/test_create_volume.py
index 7a6dae1e2a5..1d8457faaa7 100644
--- a/cinder/tests/unit/volume/drivers/dell_emc/powerflex/test_create_volume.py
+++ b/cinder/tests/unit/volume/drivers/dell_emc/powerflex/test_create_volume.py
@@ -82,27 +82,10 @@ class TestCreateVolume(powerflex.TestPowerFlexDriver):
         """Valid create volume parameters"""
         self.driver.create_volume(self.volume)
 
-    def test_create_volume_non_8_gran_with_off_round_parameter(self):
-        self.driver.configuration.powerflex_round_volume_capacity = False
-        self.volume.size = 14
-        self.assertRaises(exception.VolumeBackendAPIException,
-                          self.driver.create_volume, self.volume)
-
     def test_create_volume_non_8_gran(self):
-        self.driver.configuration.powerflex_round_volume_capacity = True
         self.volume.size = 14
         model_update = self.driver.create_volume(self.volume)
-        self.assertEqual(self.volume.size, 14)
-        self.assertFalse(model_update.get('size', False))
-
-    def test_create_volume_rest_client(self):
-        self.driver.configuration.powerflex_round_volume_capacity = True
-        self.driver.primary_client.create_volume = mock.Mock()
-        self.volume.size = 12
-        self.driver.create_volume(self.volume)
-        self.driver.primary_client.create_volume.assert_called_with(
-            self.PROT_DOMAIN_NAME, self.STORAGE_POOL_NAME, self.volume.id,
-            self.volume.size, 'ThinProvisioned', 'None')
+        self.assertEqual(16, model_update['size'])
 
     def test_create_volume_badstatus_response(self):
         self.set_https_response_mode(self.RESPONSE_MODE.BadStatus)
diff --git a/cinder/volume/drivers/dell_emc/powerflex/driver.py b/cinder/volume/drivers/dell_emc/powerflex/driver.py
index d5b5db6081e..5331e0ff4ad 100644
--- a/cinder/volume/drivers/dell_emc/powerflex/driver.py
+++ b/cinder/volume/drivers/dell_emc/powerflex/driver.py
@@ -628,15 +628,18 @@ class PowerFlexDriver(driver.VolumeDriver):
                                            volume.size,
                                            provisioning,
                                            compression)
+        real_size = int(flex_utils.round_to_num_gran(volume.size))
         model_updates = {
             "provider_id": provider_id,
+            "size": real_size,
             "replication_status": fields.ReplicationStatus.DISABLED,
         }
         LOG.info("Successfully created volume %(vol_id)s. "
-                 "PowerFlex volume name: %(vol_name)s, "
+                 "Volume size: %(size)s. PowerFlex volume name: %(vol_name)s, "
                  "id: %(provider_id)s.",
                  {
                      "vol_id": volume.id,
+                     "size": real_size,
                      "vol_name": flex_utils.id_to_base64(volume.id),
                      "provider_id": provider_id,
                  })
diff --git a/releasenotes/notes/bug-1968164-powerflex-fixed-volume-size-provided-by-driver-4555edf1abab141c.yaml b/releasenotes/notes/bug-1968164-powerflex-fixed-volume-size-provided-by-driver-4555edf1abab141c.yaml
deleted file mode 100644
index 902813e6ced..00000000000
--- a/releasenotes/notes/bug-1968164-powerflex-fixed-volume-size-provided-by-driver-4555edf1abab141c.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-fixes:
-  - |
-    PowerFlex driver `Bug #1968164 <https://bugs.launchpad.net/cinder/+bug/1968164>`_:
-    Fixed the display of the incorrect volume size on volume or snapshot creation.
-    PowerFlex storage requires volumes sizes to be a multiple of 8 GiB. This size 
-    was being reported to the end user, potentially causing confusion by being 
-    different than what they requested.