Alissa Bonas has uploaded a new change for review.
Change subject: restapi: use storageconnection instead of storage
......................................................................
restapi: use storageconnection instead of storage
Change the code to use StorageConnection object instead of Storage
in storage connections REST resource.
Fix tests,rsdl,api.xsd accordingly.
Change-Id: Icb401cef8e08e62c57c0ef8afd4677c764d065a9
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
M
backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/LinkHelper.java
M
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageServerConnectionResource.java
M
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageServerConnectionsResource.java
M
backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
M
backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionsResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/StorageConnectionValidator.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionsResourceTest.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
M
backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/StorageDomainMapperTest.java
12 files changed, 87 insertions(+), 65 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/17565/1
diff --git
a/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/LinkHelper.java
b/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/LinkHelper.java
index 70832d9..503b60c 100644
---
a/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/LinkHelper.java
+++
b/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/LinkHelper.java
@@ -62,6 +62,7 @@
import org.ovirt.engine.api.model.Statistic;
import org.ovirt.engine.api.model.Step;
import org.ovirt.engine.api.model.Storage;
+import org.ovirt.engine.api.model.StorageConnection;
import org.ovirt.engine.api.model.StorageDomain;
import org.ovirt.engine.api.model.Tag;
import org.ovirt.engine.api.model.Template;
@@ -269,10 +270,12 @@
map = new ParentToCollectionMap(SnapshotResource.class,
SnapshotsResource.class, VM.class);
TYPES.put(Snapshot.class, map);
- map = new ParentToCollectionMap(StorageServerConnectionResource.class,
StorageServerConnectionsResource.class);
- map.add(StorageResource.class, HostStorageResource.class, Host.class);
+ map = new ParentToCollectionMap(StorageResource.class,
HostStorageResource.class, Host.class);
TYPES.put(Storage.class, map);
+ map = new ParentToCollectionMap(StorageServerConnectionResource.class,
StorageServerConnectionsResource.class);
+ TYPES.put(StorageConnection.class, map);
+
map = new ParentToCollectionMap(StorageDomainResource.class,
StorageDomainsResource.class);
map.add(AttachedStorageDomainResource.class,
AttachedStorageDomainsResource.class, DataCenter.class);
TYPES.put(StorageDomain.class, map);
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageServerConnectionResource.java
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageServerConnectionResource.java
index 1d96775..90d9626 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageServerConnectionResource.java
+++
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageServerConnectionResource.java
@@ -1,7 +1,7 @@
package org.ovirt.engine.api.resource;
-import org.ovirt.engine.api.model.Storage;
+import org.ovirt.engine.api.model.StorageConnection;
-public interface StorageServerConnectionResource extends
UpdatableResource<Storage> {
+public interface StorageServerConnectionResource extends
UpdatableResource<StorageConnection> {
}
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageServerConnectionsResource.java
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageServerConnectionsResource.java
index a494487..14d48bf 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageServerConnectionsResource.java
+++
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageServerConnectionsResource.java
@@ -11,7 +11,7 @@
import org.jboss.resteasy.annotations.providers.jaxb.Formatted;
import org.ovirt.engine.api.model.Host;
-import org.ovirt.engine.api.model.Storage;
+import org.ovirt.engine.api.model.StorageConnection;
import org.ovirt.engine.api.model.StorageConnections;
@Path("/storageconnections")
@@ -29,7 +29,7 @@
@POST
@Formatted
@Consumes({ ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON,
ApiMediaType.APPLICATION_X_YAML })
- public Response add(Storage storageConnection);
+ public Response add(StorageConnection storageConnection);
@DELETE
@Consumes({ ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON,
ApiMediaType.APPLICATION_X_YAML })
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
index dde5348..2c5790f 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
+++
b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
@@ -1993,7 +1993,24 @@
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="StorageDomain">
+ <xs:element name="storageconnection" type="StorageConnection"/>
+
+ <xs:complexType name="StorageConnection">
+ <xs:complexContent>
+ <xs:extension base="BaseResource">
+ <xs:sequence>
+ <xs:group ref="BaseStorageConnection"/>
+ <xs:choice>
+ <xs:group ref="FileStorageConnection"/>
+ <xs:group ref="IscsiStorageConnection"/>
+ </xs:choice>
+ <xs:element ref="host" minOccurs="0"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="StorageDomain">
<xs:complexContent>
<xs:extension base="BaseResource">
<xs:sequence>
@@ -2054,7 +2071,7 @@
<jaxb:property name="StorageConnections"/>
</xs:appinfo>
</xs:annotation>
- <xs:element ref="storage" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="storageconnection" minOccurs="0"
maxOccurs="unbounded"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
b/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
index 6b3c2ea..483d6db 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
+++
b/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
@@ -3401,7 +3401,7 @@
- name: /api/storageconnections/{storageconnection:id}|rel=update
request:
body:
- parameterType: Storage
+ parameterType: StorageConnection
signatures:
- mandatoryArguments: {}
optionalArguments: {storageconnection.port: 'xs:int',
storageconnection.username: 'xs:string', storageconnection.password:
'xs:string',
@@ -3422,7 +3422,7 @@
- name: /api/storageconnections|rel=add
request:
body:
- parameterType: Storage
+ parameterType: StorageConnection
signatures:
- mandatoryArguments: {storageconnection.address: 'xs:string',
storageconnection.type: 'xs:string', storageconnection.iqn: 'xs:string',
storageconnection.port: 'xs:int'}
optionalArguments: {storageconnection.username: 'xs:string',
storageconnection.password: 'xs:string'}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResource.java
index 3e2eec2..a9a450e 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResource.java
@@ -1,7 +1,7 @@
package org.ovirt.engine.api.restapi.resource;
import org.ovirt.engine.api.model.Host;
-import org.ovirt.engine.api.model.Storage;
+import org.ovirt.engine.api.model.StorageConnection;
import org.ovirt.engine.api.resource.StorageServerConnectionResource;
import
org.ovirt.engine.core.common.action.StorageServerConnectionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
@@ -14,23 +14,23 @@
import org.ovirt.engine.core.compat.Guid;
public class BackendStorageServerConnectionResource extends
- AbstractBackendSubResource<Storage,
org.ovirt.engine.core.common.businessentities.StorageServerConnections>
implements StorageServerConnectionResource {
+ AbstractBackendSubResource<StorageConnection,
org.ovirt.engine.core.common.businessentities.StorageServerConnections>
implements StorageServerConnectionResource {
private BackendStorageServerConnectionsResource parent;
public BackendStorageServerConnectionResource(String id,
BackendStorageServerConnectionsResource parent) {
- super(id, Storage.class, StorageServerConnections.class);
+ super(id, StorageConnection.class, StorageServerConnections.class);
this.parent = parent;
}
@Override
- public Storage get() {
+ public StorageConnection get() {
return performGet(VdcQueryType.GetStorageServerConnectionById,
new
StorageServerConnectionQueryParametersBase(guid.toString()));
}
@Override
- public Storage update(Storage connection) {
- validateEnums(Storage.class, connection);
+ public StorageConnection update(StorageConnection connection) {
+ validateEnums(StorageConnection.class, connection);
return performUpdate(connection,
new
QueryIdResolver<String>(VdcQueryType.GetStorageServerConnectionById,
StorageServerConnectionQueryParametersBase.class),
@@ -39,7 +39,7 @@
}
@Override
- protected Storage doPopulate(Storage model, StorageServerConnections
entity) {
+ protected StorageConnection doPopulate(StorageConnection model,
StorageServerConnections entity) {
return model;
}
@@ -48,9 +48,9 @@
}
protected class UpdateParametersProvider implements
- ParametersProvider<Storage, StorageServerConnections> {
+ ParametersProvider<StorageConnection, StorageServerConnections> {
@Override
- public VdcActionParametersBase getParameters(Storage incoming,
StorageServerConnections entity) {
+ public VdcActionParametersBase getParameters(StorageConnection
incoming, StorageServerConnections entity) {
StorageServerConnections connection = map(incoming, entity);
Guid hostId = Guid.Empty;
if (incoming.getHost() != null) {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionsResource.java
index 46c3e03..46cdbf3 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionsResource.java
@@ -5,7 +5,7 @@
import javax.ws.rs.core.Response;
import org.ovirt.engine.api.model.Host;
-import org.ovirt.engine.api.model.Storage;
+import org.ovirt.engine.api.model.StorageConnection;
import org.ovirt.engine.api.model.StorageConnections;
import org.ovirt.engine.api.resource.StorageServerConnectionResource;
import org.ovirt.engine.api.resource.StorageServerConnectionsResource;
@@ -17,14 +17,14 @@
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
-public class BackendStorageServerConnectionsResource extends
AbstractBackendCollectionResource<Storage, StorageServerConnections> implements
StorageServerConnectionsResource {
+public class BackendStorageServerConnectionsResource extends
AbstractBackendCollectionResource<StorageConnection, StorageServerConnections>
implements StorageServerConnectionsResource {
private final EntityIdResolver<String> ENTITY_RETRIEVER =
new
QueryIdResolver<String>(VdcQueryType.GetStorageServerConnectionById,
StorageServerConnectionQueryParametersBase.class);
private Host host = null; // host used for removal of connection
public BackendStorageServerConnectionsResource() {
- super(Storage.class,
org.ovirt.engine.core.common.businessentities.StorageServerConnections.class);
+ super(StorageConnection.class,
org.ovirt.engine.core.common.businessentities.StorageServerConnections.class);
}
@Override
@@ -34,14 +34,14 @@
}
@Override
- protected Storage doPopulate(Storage model, StorageServerConnections
entity) {
+ protected StorageConnection doPopulate(StorageConnection model,
StorageServerConnections entity) {
return model;
}
private StorageConnections mapCollection(List<StorageServerConnections>
entities) {
StorageConnections collection = new StorageConnections();
for
(org.ovirt.engine.core.common.businessentities.StorageServerConnections entity
: entities) {
- Storage connection = map(entity);
+ StorageConnection connection = map(entity);
if (connection != null) {
collection.getStorageConnections().add(addLinks(populate(connection,entity)));
}
@@ -50,30 +50,30 @@
}
@Override
- public Response add(Storage storage) {
- validateParameters(storage, "type");
+ public Response add(StorageConnection storageConn) {
+ validateParameters(storageConn, "type");
// map to backend object
StorageServerConnections storageConnection =
- getMapper(Storage.class,
StorageServerConnections.class).map(storage, null);
+ getMapper(StorageConnection.class,
StorageServerConnections.class).map(storageConn, null);
Guid hostId = Guid.Empty;
- if (storage.getHost() != null) {
- hostId = getHostId(storage.getHost());
+ if (storageConn.getHost() != null) {
+ hostId = getHostId(storageConn.getHost());
}
switch (storageConnection.getstorage_type()) {
case ISCSI:
- validateParameters(storage, "address", "target", "port");
+ validateParameters(storageConn, "address", "target", "port");
break;
case NFS:
- validateParameters(storage, "address", "path");
+ validateParameters(storageConn, "address", "path");
break;
case LOCALFS:
- validateParameters(storage, "path");
+ validateParameters(storageConn, "path");
break;
case POSIXFS:
case GLUSTERFS:
// address is possible, but is optional, non mandatory
- validateParameters(storage, "path", "vfsType");
+ validateParameters(storageConn, "path", "vfsType");
break;
default:
break;
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/StorageConnectionValidator.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/StorageConnectionValidator.java
index f5bb4a5..323ffcf 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/StorageConnectionValidator.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/StorageConnectionValidator.java
@@ -1,16 +1,16 @@
package org.ovirt.engine.api.restapi.resource.validation;
import org.ovirt.engine.api.model.NfsVersion;
-import org.ovirt.engine.api.model.Storage;
+import org.ovirt.engine.api.model.StorageConnection;
import org.ovirt.engine.api.model.StorageType;
import static org.ovirt.engine.api.common.util.EnumValidator.validateEnum;
-@ValidatedClass(clazz = Storage.class)
-public class StorageConnectionValidator implements Validator<Storage> {
+@ValidatedClass(clazz = StorageConnection.class)
+public class StorageConnectionValidator implements
Validator<StorageConnection> {
@Override
- public void validateEnums(Storage connection) {
+ public void validateEnums(StorageConnection connection) {
if (connection.isSetType()) {
validateEnum(StorageType.class, connection.getType(), true);
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResourceTest.java
index 27f4bc9..0d3f127 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResourceTest.java
@@ -6,7 +6,7 @@
import org.junit.Test;
import org.ovirt.engine.api.model.Host;
-import org.ovirt.engine.api.model.Storage;
+import org.ovirt.engine.api.model.StorageConnection;
import
org.ovirt.engine.core.common.action.StorageServerConnectionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.StorageServerConnections;
@@ -14,7 +14,7 @@
import
org.ovirt.engine.core.common.queries.StorageServerConnectionQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryType;
-public class BackendStorageServerConnectionResourceTest extends
AbstractBackendSubResourceTest<Storage, StorageServerConnections,
BackendStorageServerConnectionResource> {
+public class BackendStorageServerConnectionResourceTest extends
AbstractBackendSubResourceTest<StorageConnection, StorageServerConnections,
BackendStorageServerConnectionResource> {
protected static final
org.ovirt.engine.core.common.businessentities.StorageType
STORAGE_TYPES_MAPPED[] = {
org.ovirt.engine.core.common.businessentities.StorageType.NFS,
org.ovirt.engine.core.common.businessentities.StorageType.LOCALFS,
@@ -150,8 +150,8 @@
return entity;
}
- Storage getModel(int index) {
- Storage model = new Storage();
+ StorageConnection getModel(int index) {
+ StorageConnection model = new StorageConnection();
model.setType(STORAGE_TYPES_MAPPED[index].toString());
model.setAddress("1.122.10.125");
Host host = new Host();
@@ -166,7 +166,7 @@
return model;
}
- protected void verifyModel(Storage model, int index) {
+ protected void verifyModel(StorageConnection model, int index) {
assertEquals(GUIDS[index].toString(), model.getId());
assertEquals(STORAGE_TYPES_MAPPED[index].toString().toLowerCase(),
model.getType());
verifyLinks(model);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionsResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionsResourceTest.java
index d5418a3..17fad4b 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionsResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionsResourceTest.java
@@ -11,7 +11,7 @@
import org.junit.Ignore;
import org.junit.Test;
import org.ovirt.engine.api.model.Host;
-import org.ovirt.engine.api.model.Storage;
+import org.ovirt.engine.api.model.StorageConnection;
import
org.ovirt.engine.core.common.action.StorageServerConnectionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.StorageServerConnections;
@@ -20,7 +20,7 @@
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryType;
-public class BackendStorageServerConnectionsResourceTest extends
AbstractBackendCollectionResourceTest<Storage, StorageServerConnections,
BackendStorageServerConnectionsResource> {
+public class BackendStorageServerConnectionsResourceTest extends
AbstractBackendCollectionResourceTest<StorageConnection,
StorageServerConnections, BackendStorageServerConnectionsResource> {
protected static final
org.ovirt.engine.core.common.businessentities.StorageType
STORAGE_TYPES_MAPPED[] = {
org.ovirt.engine.core.common.businessentities.StorageType.NFS,
@@ -39,7 +39,7 @@
}
@Override
- protected List<Storage> getCollection() {
+ protected List<StorageConnection> getCollection() {
return collection.list().getStorageConnections();
}
@@ -48,8 +48,8 @@
return
setUpEntityExpectations(control.createMock(StorageServerConnections.class),
index);
}
- Storage getModel(int index) {
- Storage model = new Storage();
+ StorageConnection getModel(int index) {
+ StorageConnection model = new StorageConnection();
model.setType(STORAGE_TYPES_MAPPED[index].toString());
if ( index == 0 || index == 3 ) {
model.setAddress("1.1.1.1");
@@ -89,7 +89,7 @@
}
@Override
- protected void verifyCollection(List<Storage> collection) throws Exception
{
+ protected void verifyCollection(List<StorageConnection> collection) throws
Exception {
assertNotNull(collection);
assertEquals(GUIDS.length, collection.size());
}
@@ -195,8 +195,8 @@
Response response = collection.add(getModel(0));
assertEquals(201, response.getStatus());
- assertTrue(response.getEntity() instanceof Storage);
- verifyModel((Storage) response.getEntity(), 0);
+ assertTrue(response.getEntity() instanceof StorageConnection);
+ verifyModel((StorageConnection) response.getEntity(), 0);
}
@Test
@@ -222,8 +222,8 @@
Response response = collection.add(getModel(1));
assertEquals(201, response.getStatus());
- assertTrue(response.getEntity() instanceof Storage);
- verifyModel((Storage) response.getEntity(), 1);
+ assertTrue(response.getEntity() instanceof StorageConnection);
+ verifyModel((StorageConnection) response.getEntity(), 1);
}
@Test
@@ -256,7 +256,7 @@
}
}
- protected void verifyModel(Storage model, int index) {
+ protected void verifyModel(StorageConnection model, int index) {
assertEquals(GUIDS[index].toString(), model.getId());
assertEquals(STORAGE_TYPES_MAPPED[index].toString().toLowerCase(),
model.getType());
verifyLinks(model);
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
index 1c06335..4d3b700 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
@@ -5,6 +5,7 @@
import org.ovirt.engine.api.common.util.StatusUtils;
import org.ovirt.engine.api.model.NfsVersion;
import org.ovirt.engine.api.model.Storage;
+import org.ovirt.engine.api.model.StorageConnection;
import org.ovirt.engine.api.model.StorageDomain;
import org.ovirt.engine.api.model.StorageDomainStatus;
import org.ovirt.engine.api.model.StorageDomainType;
@@ -149,8 +150,8 @@
return model;
}
- @Mapping(from = Storage.class, to = StorageServerConnections.class)
- public static StorageServerConnections map(Storage model,
StorageServerConnections template) {
+ @Mapping(from = StorageConnection.class, to =
StorageServerConnections.class)
+ public static StorageServerConnections map(StorageConnection model,
StorageServerConnections template) {
StorageServerConnections entity = template != null ? template : new
StorageServerConnections();
if (model.isSetId()) {
entity.setid(model.getId());
@@ -248,9 +249,9 @@
}
@Mapping(from =
org.ovirt.engine.core.common.businessentities.StorageServerConnections.class,
- to = org.ovirt.engine.api.model.Storage.class)
- public static Storage map(StorageServerConnections entity, Storage
template) {
- Storage model = template != null ? template : new Storage();
+ to = org.ovirt.engine.api.model.StorageConnection.class)
+ public static StorageConnection map(StorageServerConnections entity,
StorageConnection template) {
+ StorageConnection model = template != null ? template : new
StorageConnection();
model.setId(entity.getid());
model.setType(map(entity.getstorage_type(), null));
if (entity.getstorage_type() ==
org.ovirt.engine.core.common.businessentities.StorageType.ISCSI) {
@@ -280,7 +281,7 @@
return model;
}
- private static void setPath(StorageServerConnections entity, Storage
model) {
+ private static void setPath(StorageServerConnections entity,
StorageConnection model) {
if (entity.getconnection().contains(":")) {
String[] parts = entity.getconnection().split(":");
model.setAddress(parts[0]);
diff --git
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/StorageDomainMapperTest.java
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/StorageDomainMapperTest.java
index 4c26709..3e0ecc5 100644
---
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/StorageDomainMapperTest.java
+++
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/StorageDomainMapperTest.java
@@ -3,6 +3,7 @@
import org.junit.Test;
import org.ovirt.engine.api.model.NfsVersion;
import org.ovirt.engine.api.model.Storage;
+import org.ovirt.engine.api.model.StorageConnection;
import org.ovirt.engine.api.model.StorageDomain;
import org.ovirt.engine.api.model.StorageDomainStatus;
import org.ovirt.engine.api.model.StorageDomainType;
@@ -117,7 +118,7 @@
RESTConnection.setAddress("1.2.135.255");
RESTConnection.setUsername("myuser1");
- Storage mappedResult = StorageDomainMapper.map(connection,null);
+ StorageConnection mappedResult =
StorageDomainMapper.map(connection,null);
assertEquals(RESTConnection.getId(),mappedResult.getId());
// Although password was set on StorageServerConnections object, it
should not be returned via REST
// thus testing here that it remains empty.
@@ -148,7 +149,7 @@
RESTConnection.setNfsTimeo(400);
RESTConnection.setNfsVersion(NfsVersion.V3.toString());
- Storage mappedResult = StorageDomainMapper.map(connection,null);
+ StorageConnection mappedResult =
StorageDomainMapper.map(connection,null);
assertEquals(RESTConnection.getId(),mappedResult.getId());
assertEquals(RESTConnection.getType(),mappedResult.getType());
assertEquals(RESTConnection.getAddress(),mappedResult.getAddress());
@@ -176,7 +177,7 @@
RESTConnection.setVfsType("nfs");
RESTConnection.setMountOptions("timeo=30");
- Storage mappedResult = StorageDomainMapper.map(connection,null);
+ StorageConnection mappedResult =
StorageDomainMapper.map(connection,null);
assertEquals(RESTConnection.getId(),mappedResult.getId());
assertEquals(RESTConnection.getType(),mappedResult.getType());
assertEquals(RESTConnection.getAddress(),mappedResult.getAddress());
@@ -195,7 +196,7 @@
connection.setVfsType("nfs");
connection.setMountOptions("timeo=30");
- Storage RESTConnection = new Storage();
+ StorageConnection RESTConnection = new StorageConnection();
RESTConnection.setId(connId.toString());
RESTConnection.setType(StorageType.POSIXFS.toString().toLowerCase());
RESTConnection.setAddress("1.2.135.255");
@@ -222,7 +223,7 @@
connection.setNfsTimeo((short) 400);
connection.setNfsVersion(org.ovirt.engine.core.common.businessentities.NfsVersion.V3);
- Storage RESTConnection = new Storage();
+ StorageConnection RESTConnection = new StorageConnection();
RESTConnection.setId(connId.toString());
RESTConnection.setType(StorageType.NFS.toString().toLowerCase());
RESTConnection.setAddress("1.2.135.255");
@@ -252,7 +253,7 @@
connection.setuser_name("myuser1");
connection.setpassword("123");
- Storage RESTConnection = new Storage();
+ StorageConnection RESTConnection = new StorageConnection();
RESTConnection.setId(connId.toString());
RESTConnection.setType(StorageType.ISCSI.toString().toLowerCase());
RESTConnection.setPort(3260);
--
To view, visit http://gerrit.ovirt.org/17565
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb401cef8e08e62c57c0ef8afd4677c764d065a9
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alissa Bonas <abo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
