Tal Nisan has uploaded a new change for review. Change subject: restapi: Allow import of Posix/Gluster export storage domains ......................................................................
restapi: Allow import of Posix/Gluster export storage domains Change-Id: I70b2d4856714b8c95157dd885e91f354071d8c4b Bug-Url: https://bugzilla.redhat.com/1160731 Signed-off-by: Tal Nisan <tni...@redhat.com> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResourceTest.java 2 files changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/37341/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResource.java index b7c9ff3..eaf2488 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResource.java @@ -92,7 +92,8 @@ connection.setid(addStorageServerConnection(connection, hostId)); } entity.setStorage(connection.getid()); - if (action == VdcActionType.AddNFSStorageDomain) { + if (action == VdcActionType.AddNFSStorageDomain || action == VdcActionType.AddPosixFsStorageDomain || + action == VdcActionType.AddGlusterFsStorageDomain) { org.ovirt.engine.core.common.businessentities.StorageDomain existing = getExistingStorageDomain(hostId, entity.getStorageType(), diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResourceTest.java index 3032156..d4b325b 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResourceTest.java @@ -238,6 +238,11 @@ new String[] { "ServerConnectionId" }, new Object[] { GUIDS[POSIX_IDX].toString() }, setUpPosixStorageServerConnection(POSIX_IDX)); + setUpGetEntityExpectations(VdcQueryType.GetExistingStorageDomainList, + GetExistingStorageDomainListParameters.class, + new String[] { "VdsId", "StorageType", "StorageDomainType", "Path" }, + new Object[] { GUIDS[0], STORAGE_TYPES_MAPPED[POSIX_IDX], TYPES_MAPPED[0], ADDRESSES[POSIX_IDX] + ":" + PATHS[POSIX_IDX] }, + new ArrayList<StorageDomainStatic>()); setUpCreationExpectations(VdcActionType.AddPosixFsStorageDomain, StorageDomainManagementParameter.class, @@ -419,6 +424,12 @@ new Object[] { GUIDS[POSIX_IDX].toString() }, setUpPosixStorageServerConnection(POSIX_IDX)); + setUpGetEntityExpectations(VdcQueryType.GetExistingStorageDomainList, + GetExistingStorageDomainListParameters.class, + new String[] { "VdsId", "StorageType", "StorageDomainType", "Path" }, + new Object[] { GUIDS[0], STORAGE_TYPES_MAPPED[POSIX_IDX], TYPES_MAPPED[0], ADDRESSES[POSIX_IDX] + ":" + PATHS[POSIX_IDX] }, + new ArrayList<StorageDomainStatic>()); + setUpCreationExpectations(VdcActionType.AddPosixFsStorageDomain, StorageDomainManagementParameter.class, new String[] { "VdsId" }, -- To view, visit http://gerrit.ovirt.org/37341 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I70b2d4856714b8c95157dd885e91f354071d8c4b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Tal Nisan <tni...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
