Amit Aviram has uploaded a new change for review. Change subject: restapi: Enabling connection details editing for ISO & Export domains. ......................................................................
restapi: Enabling connection details editing for ISO & Export domains. Editing and viewing ISO & Export connection details via REST API were not enabled. This patch adds this possibility. Change-Id: Iab555a55899dc10bf7677d6ee5ee1fa4cc91f921 Bug-Url: https://bugzilla.redhat.com/1099412 Signed-off-by: Amit Aviram <aavi...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommandTest.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageDomainsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java 4 files changed, 26 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/36481/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java index d549fa7..fa15be6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java @@ -184,9 +184,7 @@ } protected boolean isDomainInEditState(StorageDomain storageDomain) { - boolean isEditable = storageDomain.getStorageDomainType().isDataDomain() - && (storageDomain.getStatus() == StorageDomainStatus.Maintenance || storageDomain.getStorageDomainSharedStatus() == StorageDomainSharedStatus.Unattached); - return isEditable; + return (storageDomain.getStatus() == StorageDomainStatus.Maintenance || storageDomain.getStorageDomainSharedStatus() == StorageDomainSharedStatus.Unattached); } @Override diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommandTest.java index 1c7db47..066de01 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommandTest.java @@ -713,6 +713,28 @@ assertFalse(isExists); } + @Test + public void failDomainIsActive() { + StorageServerConnections NFSConnection = createNFSConnection( + "multipass.my.domain.tlv.company.com:/export/allstorage/data2", + StorageType.NFS, + NfsVersion.V4, + 300, + 0); + when(command.getConnection()).thenReturn(NFSConnection); + doReturn(oldNFSConnection).when(storageConnDao).get(any(String.class)); + + // Create an active domain. + StorageDomain domain = new StorageDomain(); + domain.setStatus(StorageDomainStatus.Active); + domain.setStorageDomainSharedStatus(StorageDomainSharedStatus.Active); + doReturn(domain).when(storageDomainDAO).get(any(Guid.class)); + + initDomainListForConnection(NFSConnection.getid(), domain); + CanDoActionTestUtils.runAndAssertCanDoActionFailure(command, + VdcBllMessages.ACTION_TYPE_FAILED_UNSUPPORTED_ACTION_DOMAIN_MUST_BE_IN_MAINTENANCE_OR_UNATTACHED); + } + private void initDomainListForConnection(String connId, StorageDomain... domains) { doReturn(Arrays.asList(domains)).when(command).getStorageDomainsByConnId(connId); } diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageDomainsResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageDomainsResource.java index 92cb039..d0f1934 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageDomainsResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageDomainsResource.java @@ -45,7 +45,7 @@ public Response remove(@PathParam("id") String id, StorageDomain storageDomain); /** - * Sub-resource locator method, returns individual DataCenterResource on which the + * Sub-resource locator method, returns individual StorageDomainResource on which the * remainder of the URI is dispatched. * * @param id the StorageDomain ID diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java index 1ebd92a..3fc32b7 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java @@ -122,8 +122,8 @@ } public static synchronized String[] getLinksToExclude(StorageDomain storageDomain) { - return isIsoDomain(storageDomain) ? new String[] { "templates", "vms", "disks", "storageconnections", "images" } - : isExportDomain(storageDomain) ? new String[] { "files", "storageconnections", "images" } + return isIsoDomain(storageDomain) ? new String[] { "templates", "vms", "disks", "images" } + : isExportDomain(storageDomain) ? new String[] { "files", "images" } : isImageDomain(storageDomain) ? new String[] { "templates", "vms", "files", "disks", "storageconnections" } : new String[] { "templates", "vms", "files", "images" }; -- To view, visit http://gerrit.ovirt.org/36481 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iab555a55899dc10bf7677d6ee5ee1fa4cc91f921 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Amit Aviram <aavi...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
