<fix>[storage]: refactor expon bm2

Resolves: ZSTAC-77315

Change-Id: I6670626f746f6e617466737965776f756a766774

Author: shenjin

header/src/main/java/org/zstack/header/storage/addon/IscsiRemoteTarget.java

@@ -1,6 +1,12 @@
 package org.zstack.header.storage.addon;
 
+import org.zstack.utils.Utils;
+import org.zstack.utils.logging.CLogger;
+
+import java.net.URI;
+
 public class IscsiRemoteTarget extends BlockRemoteTarget {
+    private final static CLogger logger = Utils.getLogger(IscsiRemoteTarget.class);
     private String transport = "tcp";
 
     private String iqn;
@@ -70,4 +76,44 @@ public enum DiskIdType {
         wwn,
         serial
     }
+
+    public static IscsiRemoteTarget fromUri(String uriString) {
+        try {
+            URI uri = URI.create(uriString);
+
+            if (!"iscsi".equals(uri.getScheme())) {
+                logger.info("Invalid URI scheme. Expected 'iscsi', got: " + uri.getScheme());
+                return null;
+            }
+
+            IscsiRemoteTarget target = new IscsiRemoteTarget();
+            target.setIp(uri.getHost());
+            target.setPort(uri.getPort());
+
+            // parse: /{iqn}/{diskIdType}_{diskId}
+            String path = uri.getPath();
+            if (path != null && path.startsWith("/")) {
+                String[] pathParts = path.substring(1).split("/");
+                if (pathParts.length >= 2) {
+                    target.setIqn(pathParts[0]);
+                    String[] diskParts = pathParts[1].split("_", 2);
+                    if (diskParts.length == 2) {
+                        target.setDiskIdType(diskParts[0]);
+                        target.setDiskId(diskParts[1]);
+                    } else {
+                        logger.info("Invalid diskId format in URI path: " + pathParts[1]);
+                        return null;
+                    }
+                } else {
+                    logger.info("Invalid URI path format: " + path);
+                    return null;
+                }
+            }
+
+            return target;
+        } catch (Exception e) {
+            logger.error("Failed to parse URI: " + uriString, e);
+            return null;
+        }
+    }
 }

plugin/expon/src/main/java/org/zstack/expon/ExponStorageController.java

@@ -37,10 +37,7 @@
 import org.zstack.header.storage.primary.ImageCacheInventory;
 import org.zstack.header.storage.primary.VolumeSnapshotCapability;
 import org.zstack.header.storage.snapshot.VolumeSnapshotStats;
-import org.zstack.header.volume.VolumeConstant;
-import org.zstack.header.volume.VolumeInventory;
-import org.zstack.header.volume.VolumeProtocol;
-import org.zstack.header.volume.VolumeStats;
+import org.zstack.header.volume.*;
 import org.zstack.iscsi.IscsiUtils;
 import org.zstack.iscsi.kvm.IscsiHeartbeatVolumeTO;
 import org.zstack.iscsi.kvm.IscsiVolumeTO;
@@ -239,6 +236,10 @@ public List<IscsiSeverNode> getIscsiServers(String tianshuId) {
 
     private synchronized ActiveVolumeTO activeIscsiVolume(HostInventory h, BaseVolumeInfo vol, boolean shareable) {
         String clientIqn = IscsiUtils.getHostInitiatorName(h.getUuid());
+        if (h.getHypervisorType().equals("baremetal2")) {
+            VolumeVO volume = dbf.findByUuid(vol.getUuid(), VolumeVO.class);
+            clientIqn = String.format("iqn.2015-01.io.zstack:initiator.instance.%s", volume.getVmInstanceUuid());
+        }
         if (clientIqn == null) {
             throw new RuntimeException(String.format("cannot get host[uuid:%s] initiator name", h.getUuid()));
         }
@@ -751,6 +752,12 @@ private void deactivateVhost(String installPath, HostInventory h) {
 
     private void deactivateIscsi(String installPath, HostInventory h) {
         String iqn = IscsiUtils.getHostInitiatorName(h.getUuid());
+        if (h.getHypervisorType().equals("baremetal2")) {
+            String[] parts = installPath.split("/");
+            String volumeUuid = parts[parts.length - 1];
+            VolumeVO volume = dbf.findByUuid(volumeUuid, VolumeVO.class);
+            iqn = String.format("iqn.2015-01.io.zstack:initiator.instance.%s", volume.getVmInstanceUuid());
+        }
         if (iqn == null) {
             throw new RuntimeException(String.format("cannot get host[uuid:%s] initiator name", h.getUuid()));
         }