Merge "VNX: update sg in cache" into stable/pike

cinder/tests/unit/volume/drivers/dell_emc/vnx/mocked_vnx.yaml

@@ -2047,6 +2047,8 @@ test_terminate_connection_cleanup_remove_sg:
       delete:
       disconnect_host:
       get_alu_hlu_map: {}
+      update:
+      with_poll: _context
 
 test_terminate_connection_cleanup_sg_absent:
   sg:
@@ -2060,6 +2062,8 @@ test_terminate_connection_cleanup_deregister:
       delete:
       disconnect_host:
       get_alu_hlu_map: {}
+      update:
+      with_poll: _context
   vnx:
     _methods:
       delete_hba:

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

@@ -1079,6 +1079,11 @@ class CommonAdapter(replication.ReplicationAdapter):
             LOG.info("Storage Group %s is empty.", sg.name)
             sg.disconnect_host(sg.name)
             sg.delete()
+
+            # Update sg with poll makes the one in client.sg_cache is with
+            # latest status which is un-exist. This makes sure the sg is
+            # created during next attaching.
+            self.update_storage_group_if_required(sg)
             if host is not None and self.itor_auto_dereg:
                 # `host` is None when force-detach
                 self._deregister_initiator(host)

cinder/volume/drivers/dell_emc/vnx/driver.py

@@ -76,10 +76,13 @@ class VNXDriver(driver.ManageableVD,
                    image cache volume
           10.1.0 - Add QoS support
           10.2.0 - Add replication group support
-          11.0.0 - Fix failure of migration during cloning
+          10.2.1 - Fix failure of migration during cloning
+          10.2.2 - Fix bug https://bugs.launchpad.net/cinder/+bug/1817385 to
+                   make sure sg can be created again after it was destroyed
+                   under `destroy_empty_stroage_group` setting to `True`
     """
 
-    VERSION = '11.00.00'
+    VERSION = '10.02.02'
     VENDOR = 'Dell EMC'
     # ThirdPartySystems wiki page
     CI_WIKI_NAME = "EMC_VNX_CI"

releasenotes/notes/vnx-update-sg-in-cache-3ecb673727bea79b.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Dell EMC VNX Driver: Fixes `bug 1817385
+    <https://bugs.launchpad.net/cinder/+bug/1817385>`__ to make sure the sg can
+    be created again after it was destroyed under `destroy_empty_storage_group`
+    setting to `True`.