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

backend/manager/modules/bll/src/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,7 +39,10 @@ protected void executeQueryCommand() {
 
         // In case of LUN disk
         if (allDisks.size() == 1 && allDisks.get(0).getDiskStorageType() == DiskStorageType.LUN) {
-            getQueryReturnValue().setReturnValue(allDisks.get(0));
+            LunDisk disk = (LunDisk) allDisks.get(0);
+            List<StorageServerConnections> connections = storageServerConnectionDao.getAllForLun(disk.getLun().getLUNId());
+            disk.getLun().setLunConnections(connections);
+            getQueryReturnValue().setReturnValue(disk);
             return;
         }
 

backend/manager/modules/bll/src/test/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;
     }
 }

backend/manager/modules/bll/src/test/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");
     }

backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageServerConnections.java

@@ -13,6 +13,7 @@ public class StorageServerConnections implements BusinessEntity<String> {
     private static final long serialVersionUID = 5444293590307760809L;
 
     public static final String DEFAULT_TPGT = "1";
+    public static final String DEFAULT_ISCSI_PORT = "3260";
 
     public StorageServerConnections() {
         storageType = StorageType.UNKNOWN;

backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java

@@ -1,5 +1,7 @@
 package org.ovirt.engine.api.restapi.resource;
 
+import static org.ovirt.engine.core.common.businessentities.StorageServerConnections.DEFAULT_ISCSI_PORT;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -89,8 +91,6 @@ public class BackendHostResource extends AbstractBackendActionableResource<Host,
     public static final String FORCE = "force";
     public static final String STOP_GLUSTER_SERVICE = "stop_gluster_service";
 
-    private static final String DEFAULT_ISCSI_PORT = "3260";
-
     private BackendHostsResource parent;
 
     public BackendHostResource(String id, BackendHostsResource parent) {

backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageLogicalUnitMapper.java

@@ -1,5 +1,8 @@
 package org.ovirt.engine.api.restapi.types;
 
+import static org.ovirt.engine.core.common.businessentities.StorageServerConnections.DEFAULT_ISCSI_PORT;
+
+
 import java.util.ArrayList;
 
 import org.ovirt.engine.api.model.HostStorage;
@@ -48,6 +51,13 @@ 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()) {
+            StorageServerConnections lunConnection = entity.getLunConnections().get(0);
+            model.setAddress(lunConnection.getConnection());
+            model.setPort(Integer.valueOf(lunConnection.getPort()));
+            model.setTarget(lunConnection.getIqn());
+        }
+
         model.setPaths(entity.getPathCount());
         return model;
     }
@@ -105,13 +115,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(DEFAULT_ISCSI_PORT);
         }
         if (logicalUnit.isSetUsername()) {
             entity.setUserName(logicalUnit.getUsername());
         }
         if (logicalUnit.isSetPassword()) {
             entity.setPassword(logicalUnit.getPassword());
         }
+
         return entity;
     }