Mike Kolesnik has uploaded a new change for review. Change subject: engine: Added fields to subnet ......................................................................
engine: Added fields to subnet Added gateway and DNS servers list to the ExternalSubnet entity in order to allow the users to set these fields. Change-Id: I1b3718b83bcfb588eb97a55ba559d5407b857955 Bug-Url: https://bugzilla.redhat.com/1064749 Signed-off-by: Mike Kolesnik <mkole...@redhat.com> (cherry picked from commit 4e5e32b968e82ec2907c2b008c237d7f05f9bd77) --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/ExternalSubnet.java 2 files changed, 45 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/62/27362/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java index 5cc01ff..d4b9e5c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java @@ -147,6 +147,8 @@ : IpVersion.IPV4); s.setName(subnet.getName()); s.setExternalNetwork(network); + s.setGateway(subnet.getGw()); + s.setDnsServers(subnet.getDnsNames()); return s; } @@ -161,6 +163,8 @@ subnetForCreate.setNetworkId(externalNetwork.getId()); subnetForCreate.setTenantId(externalNetwork.getTenantId()); subnetForCreate.setEnableDHCP(true); + subnetForCreate.setGw(subnet.getGateway()); + subnetForCreate.setDnsNames(subnet.getDnsServers()); try { getClient().subnets().create(subnetForCreate).execute(); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/ExternalSubnet.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/ExternalSubnet.java index bbfdf0d..70ab587 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/ExternalSubnet.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/ExternalSubnet.java @@ -1,6 +1,7 @@ package org.ovirt.engine.core.common.businessentities.network; import java.io.Serializable; +import java.util.List; import javax.validation.constraints.NotNull; @@ -23,6 +24,10 @@ @NotNull(groups = { RemoveEntity.class }) private ProviderNetwork externalNetwork; + + private String gateway; + + private List<String> dnsServers; public String getId() { return id; @@ -70,6 +75,22 @@ this.externalNetwork = externalNetwork; } + public String getGateway() { + return gateway; + } + + public void setGateway(String gateway) { + this.gateway = gateway; + } + + public List<String> getDnsServers() { + return dnsServers; + } + + public void setDnsServers(List<String> dnsServers) { + this.dnsServers = dnsServers; + } + @Override public String toString() { StringBuilder builder = new StringBuilder(); @@ -83,6 +104,10 @@ .append(getIpVersion()) .append(", externalNetwork=") .append(getExternalNetwork()) + .append(", gateway=") + .append(getGateway()) + .append(", dnsServers=") + .append(getDnsServers()) .append("]"); return builder.toString(); } @@ -96,6 +121,8 @@ result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getIpVersion() == null) ? 0 : getIpVersion().hashCode()); result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); + result = prime * result + ((getGateway() == null) ? 0 : getGateway().hashCode()); + result = prime * result + ((getDnsServers() == null) ? 0 : getDnsServers().hashCode()); return result; } @@ -142,6 +169,20 @@ } else if (!getName().equals(other.getName())) { return false; } + if (getGateway() == null) { + if (other.getGateway() != null) { + return false; + } + } else if (!getGateway().equals(other.getGateway())) { + return false; + } + if (getDnsServers() == null) { + if (other.getDnsServers() != null) { + return false; + } + } else if (!getDnsServers().equals(other.getDnsServers())) { + return false; + } return true; } -- To view, visit http://gerrit.ovirt.org/27362 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b3718b83bcfb588eb97a55ba559d5407b857955 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
