core,restapi: report iscsi server address and port for direct LUNs

Signed-off-by: Benny Zlotnik <bzlotnik@redhat.com>
oVirt · Jul 27, 2022 · 6251e3f · 6251e3f
1 parent ba21266
commit 6251e3f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/...rc/main/java/org/ovirt/engine/core/bll/storage/disk/GetDiskAndSnapshotsByDiskIdQuery.java b/...rc/main/java/org/ovirt/engine/core/bll/storage/disk/GetDiskAndSnapshotsByDiskIdQuery.java
@@ -8,11 +8,14 @@
 import org.ovirt.engine.core.bll.QueriesCommandBase;
 import org.ovirt.engine.core.bll.context.EngineContext;
 import org.ovirt.engine.core.bll.storage.disk.image.ImagesHandler;
+import org.ovirt.engine.core.common.businessentities.StorageServerConnections;
 import org.ovirt.engine.core.common.businessentities.storage.Disk;
 import org.ovirt.engine.core.common.businessentities.storage.DiskImage;
 import org.ovirt.engine.core.common.businessentities.storage.DiskStorageType;
+import org.ovirt.engine.core.common.businessentities.storage.LunDisk;
 import org.ovirt.engine.core.common.queries.IdQueryParameters;
 import org.ovirt.engine.core.dao.DiskDao;
+import org.ovirt.engine.core.dao.StorageServerConnectionDao;
 
 public class GetDiskAndSnapshotsByDiskIdQuery<P extends IdQueryParameters> extends QueriesCommandBase<P> {
     @Inject
@@ -21,6 +24,9 @@ public class GetDiskAndSnapshotsByDiskIdQuery<P extends IdQueryParameters> exten
     @Inject
     private ImagesHandler imagesHandler;
 
+    @Inject
+    private StorageServerConnectionDao storageServerConnectionDao;
+
     public GetDiskAndSnapshotsByDiskIdQuery(P parameters, EngineContext context) {
         super(parameters, context);
     }
@@ -33,6 +39,9 @@ protected void executeQueryCommand() {
 
         // In case of LUN disk
         if (allDisks.size() == 1 && allDisks.get(0).getDiskStorageType() == DiskStorageType.LUN) {
+            LunDisk disk = (LunDisk) allDisks.get(0);
+            List<StorageServerConnections> connections = storageServerConnectionDao.getAllForLun(disk.getLun().getLUNId());
+            disk.getLun().setLunConnections(connections);
             getQueryReturnValue().setReturnValue(allDisks.get(0));
             return;
         }

diff --git a/...st/java/org/ovirt/engine/core/bll/storage/disk/AbstractGetDisksAndSnapshotsQueryTest.java b/...st/java/org/ovirt/engine/core/bll/storage/disk/AbstractGetDisksAndSnapshotsQueryTest.java
@@ -17,6 +17,7 @@
 import org.ovirt.engine.core.common.businessentities.storage.CinderDisk;
 import org.ovirt.engine.core.common.businessentities.storage.DiskContentType;
 import org.ovirt.engine.core.common.businessentities.storage.DiskImage;
+import org.ovirt.engine.core.common.businessentities.storage.LUNs;
 import org.ovirt.engine.core.common.businessentities.storage.LunDisk;
 import org.ovirt.engine.core.common.queries.QueryParametersBase;
 import org.ovirt.engine.core.compat.Guid;
@@ -110,6 +111,7 @@ private CinderDisk createCinderDisk() {
     private LunDisk createLunDisk() {
         LunDisk lun = new LunDisk();
         lun.setId(Guid.newGuid());
+        lun.setLun(new LUNs());
         return lun;
     }
 }
diff --git a/...est/java/org/ovirt/engine/core/bll/storage/disk/GetDiskAndSnapshotsByDiskIdQueryTest.java b/...est/java/org/ovirt/engine/core/bll/storage/disk/GetDiskAndSnapshotsByDiskIdQueryTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
@@ -24,6 +25,7 @@
 import org.ovirt.engine.core.common.queries.IdQueryParameters;
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.dao.DiskDao;
+import org.ovirt.engine.core.dao.StorageServerConnectionDao;
 
 /**
  * A test case for {@link GetDiskAndSnapshotsByDiskIdQuery}.
@@ -41,6 +43,9 @@ public class GetDiskAndSnapshotsByDiskIdQueryTest extends
     @Mock
     private DiskDao diskDao;
 
+    @Mock
+    private StorageServerConnectionDao storageServerConnectionDao;
+
     @BeforeEach
     @Override
     public void setUp() throws Exception {
@@ -118,6 +123,7 @@ public void testQueryWithCinderDisk() {
 
     @Test
     public void testQueryWithLunDisk() {
+        when(storageServerConnectionDao.getAllForLun(any())).thenReturn(new ArrayList<>());
         Disk disk = executeQuery(lunDisk);
         assertTrue(disk instanceof LunDisk, "disk should be from type LunDisk");
     }

diff --git a/...tapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageLogicalUnitMapper.java b/...tapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageLogicalUnitMapper.java
@@ -48,6 +48,12 @@ public static LogicalUnit map(LUNs entity, LogicalUnit template) {
         model.setSize(SizeConverter.convert((long)entity.getDeviceSize(),
                 SizeConverter.SizeUnit.GiB, SizeConverter.SizeUnit.BYTES).longValue());
 
+        if (entity.getLunConnections() != null && !entity.getLunConnections().isEmpty()) {
+            model.setAddress(entity.getLunConnections().get(0).getConnection());
+            model.setPort(Integer.valueOf(entity.getLunConnections().get(0).getPort()));
+            model.setTarget(entity.getLunConnections().get(0).getIqn());
+        }
+
         model.setPaths(entity.getPathCount());
         return model;
     }
@@ -105,13 +111,17 @@ public static StorageServerConnections map(LogicalUnit logicalUnit, StorageServe
         }
         if (logicalUnit.isSetPort()) {
             entity.setPort(logicalUnit.getPort().toString());
+        } else {
+            // Setting default port to please the StorageLogicalUnitMapperTest#testRoundtrip test
+            entity.setPort("3260");
         }
         if (logicalUnit.isSetUsername()) {
             entity.setUserName(logicalUnit.getUsername());
         }
         if (logicalUnit.isSetPassword()) {
             entity.setPassword(logicalUnit.getPassword());
         }
+
         return entity;
     }