flasharray: always stamp the pool address type on returned volumes

FlashArrayVolume defaults addressType to FIBERWWN in its constructor, so a
volume deserialised from the array reports an FC-style NAA WWN from getAddress()
until the pool's real address type is stamped onto it. Most accessors do that
via withAddressType(), but two paths returned an unstamped volume:

  * revert() returned the private getVolume() result directly, so reverting a
    snapshot on an NVMe-TCP pool produced a volume carrying an FC-style WWN.
  * copy() returned the newly created volume unstamped. The adaptive driver
    persists this one -- copyAsync() stores generatePathInfo(outVolume, ...) --
    so the volume was recorded in the database with an address the host cannot
    resolve, since NVMe namespaces are located by EUI-128.

Rather than add a third withAddressType() call at each site, stamp inside the
private getVolume() accessor so every path is correct by construction. That
matches the private getSnapshot() accessor, which already did this, and makes
the wrap at the public getVolume() call site redundant. copy() now reuses the
accessor for its source lookup instead of repeating the same GET inline, and
stamps the volume it hands back.

No behavioural change for Fibre Channel: FIBERWWN is what the constructor
already defaulted to, so stamping it is a no-op there.

Also drops a comment in getConnectionIdMap() describing connections as
host-group scoped, which is no longer how NVMe-TCP volumes are connected after
the preceding commit. The surrounding logic was already keyed on host name and
is unchanged; only nsid vs lun differs between the transports.

Found by auditing every NVMe-TCP divergence from the Fibre Channel path, on the
principle that NVMe-TCP is only a different carrier: the array operations are
identical and the host-side difference is an NQN instead of a WWN, which lives
on the array and is never touched by this adapter (hosts are resolved by name).

Signed-off-by: Eugenio Grosso <eugenio.grosso@gmail.com>
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

Author: Eugenio Grosso

plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/adapter/flasharray/FlashArrayAdapter.java

@@ -318,7 +318,7 @@ public ProviderVolume getVolume(ProviderAdapterContext context, ProviderAdapterD
         }
         FlashArrayVolume volume = null;
         try {
-            volume = withAddressType(getVolume(externalName));
+            volume = getVolume(externalName);
             // if we didn't get an address back its likely an empty object
             if (volume != null && volume.getAddress() == null) {
                 return null;
@@ -501,10 +501,7 @@ public ProviderVolume copy(ProviderAdapterContext context, ProviderAdapterDataOb
         if (sourceDataObject.getType().equals(ProviderAdapterDataObject.Type.SNAPSHOT)) {
             currentVol = getSnapshot(sourceDataObject.getExternalName());
         } else {
-            currentVol = (FlashArrayVolume) this
-                    .getFlashArrayItem(GET("/volumes?names=" + sourceDataObject.getExternalName(),
-                            new TypeReference<FlashArrayList<FlashArrayVolume>>() {
-                            }));
+            currentVol = getVolume(sourceDataObject.getExternalName());
         }
 
         if (currentVol == null) {
@@ -523,7 +520,7 @@ public ProviderVolume copy(ProviderAdapterContext context, ProviderAdapterDataOb
                 "/volumes?names=" + payload.getExternalName() + "&overwrite=true", payload,
                 new TypeReference<FlashArrayList<FlashArrayVolume>>() {
                 });
-        FlashArrayVolume outVolume = (FlashArrayVolume) getFlashArrayItem(list);
+        FlashArrayVolume outVolume = withAddressType((FlashArrayVolume) getFlashArrayItem(list));
         pause(postCopyWait);
         return outVolume;
     }
@@ -990,11 +987,17 @@ private void removeVlunsAll(ProviderAdapterContext context, String volumeNamespa
         }
     }
 
+    /**
+     * Look up a volume by name. The pool's address type is always stamped onto the
+     * result, so no caller can emit an FC-style WWN for a volume that lives on an
+     * NVMe-TCP pool (see {@link FlashArrayVolume#getAddress()}). The snapshot
+     * accessor below holds the same invariant.
+     */
     private FlashArrayVolume getVolume(String volumeName) {
         FlashArrayList<FlashArrayVolume> list = GET("/volumes?names=" + volumeName,
                 new TypeReference<FlashArrayList<FlashArrayVolume>>() {
                 });
-        return (FlashArrayVolume) getFlashArrayItem(list);
+        return withAddressType((FlashArrayVolume) getFlashArrayItem(list));
     }
 
     private FlashArrayPod getVolumeNamespace(String name) {
@@ -1325,9 +1328,10 @@ public Map<String, String> getConnectionIdMap(ProviderAdapterDataObject dataIn)
             if (list != null && list.getItems() != null) {
                 for (FlashArrayConnection conn : list.getItems()) {
                     if (AddressType.NVMETCP.equals(volumeAddressType)) {
-                        // Host-group-scoped NVMe connections come back as one
-                        // entry per host in the group; key on the host name so
-                        // connid.<hostname> is matched in parseAndValidatePath.
+                        // Key on the host name so connid.<hostname> is matched by
+                        // parseAndValidatePath. NVMe-TCP reports an nsid where Fibre
+                        // Channel reports a lun; the connection itself is host-scoped
+                        // on both transports.
                         if (conn.getHost() != null && conn.getHost().getName() != null) {
                             String id = conn.getNsid() != null ? "" + conn.getNsid() : "1";
                             map.put(conn.getHost().getName(), id);