Mike Kolesnik has uploaded a new change for review. Change subject: core: Change data center ID to not null in Network ......................................................................
core: Change data center ID to not null in Network Data center ID cannot be sent null since this state is not supported. Currently the clients don't send it null anyway so no change is necessary there. Change-Id: I4ed489cb4b0730bb04e7902a8fd73db094b8e6cd Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Network.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkDaoDbFacadeImpl.java 2 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/10643/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Network.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Network.java index 263fbd0..50a85d8 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Network.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Network.java @@ -12,6 +12,7 @@ import javax.persistence.Table; import javax.validation.constraints.Max; import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; @@ -28,7 +29,6 @@ import org.ovirt.engine.core.common.validation.group.CreateEntity; import org.ovirt.engine.core.common.validation.group.UpdateEntity; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.NGuid; @Entity @Table(name = "network") @@ -81,7 +81,8 @@ @Column(name = "storage_pool_id") @Type(type = "guid") - private NGuid dataCenterId; + @NotNull(message = "VALIDATION.STORAGE_POOL.ID.NOT_NULL", groups = { CreateEntity.class, UpdateEntity.class }) + private Guid dataCenterId; @ManyToOne @JoinTable(name = "network_cluster", joinColumns = @JoinColumn(name = "network_id"), @@ -190,11 +191,11 @@ this.stp = value; } - public NGuid getDataCenterId() { + public Guid getDataCenterId() { return this.dataCenterId; } - public void setDataCenterId(NGuid value) { + public void setDataCenterId(Guid value) { this.dataCenterId = value; } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkDaoDbFacadeImpl.java index ba726e9..2e518c1 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkDaoDbFacadeImpl.java @@ -9,7 +9,6 @@ import org.ovirt.engine.core.common.businessentities.network.NetworkCluster; import org.ovirt.engine.core.common.businessentities.network.NetworkStatus; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.NGuid; import org.ovirt.engine.core.dal.dbbroker.DbFacadeUtils; import org.ovirt.engine.core.dao.DefaultGenericDaoDbFacade; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; @@ -150,7 +149,7 @@ entity.setGateway(rs.getString("gateway")); entity.setVlanId((Integer) rs.getObject("vlan_id")); entity.setStp(rs.getBoolean("stp")); - entity.setDataCenterId(NGuid.createGuidFromString(rs + entity.setDataCenterId(Guid.createGuidFromString(rs .getString("storage_pool_id"))); entity.setMtu(rs.getInt("mtu")); entity.setVmNetwork(rs.getBoolean("vm_network")); @@ -164,6 +163,7 @@ static class NetworkRowMapper extends NetworkRowMapperBase<Network> { public final static NetworkRowMapper instance = new NetworkRowMapper(); + @Override protected Network createNetworkEntity() { return new Network(); } -- To view, visit http://gerrit.ovirt.org/10643 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ed489cb4b0730bb04e7902a8fd73db094b8e6cd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
