Merge pull request #64 from huangpeng5/1216

Support DM-Multipath for NvME Over RoCE

Author: huangpeng5

Cinder/Zed/huawei_flow.py

@@ -1992,7 +1992,7 @@ def __init__(self, client, *args, **kwargs):
         self.client = client
 
     @staticmethod
-    def _set_de_replicas(mapping_info):
+    def _set_dm_replicas(mapping_info):
         portals = mapping_info.get('portals')
         if len(portals) == 1:
             return
@@ -2008,15 +2008,15 @@ def _set_de_replicas(mapping_info):
             'dm_replicas': dm_replicas
         })
 
-    def execute(self, target_ips, host_id, lun_id, lun_info, lun):
+    def execute(self, target_ips, lun_info):
         mapping_info = {
-            'vol_uuid': lun.id,
+            'vol_uuid': lun_info.get('NGUID'),
             'portals': [(ip, constants.ROCE_TARGET_PORT, 'rdma') for ip in target_ips],
             'target_nqn': constants.ROCE_TARGET_NQN_PREFIX + self.client._login_device_id,
             'discard': True,
             'volume_nguid': lun_info.get('NGUID')
         }
-        self._set_de_replicas(mapping_info)
+        self._set_dm_replicas(mapping_info)
         return mapping_info