Mike Kolesnik has uploaded a new change for review. Change subject: engine: Change OpenStack SDK version ......................................................................
engine: Change OpenStack SDK version Subnet creation code updated to use the non-deprecated entities. Also marking subnet explicitly as DHCP to make sure it will be used. Change-Id: I148e6efa3edc9adbae52778fd8e1aed34e03da90 Bug-Url: https://bugzilla.redhat.com/1064749 Signed-off-by: Mike Kolesnik <mkole...@redhat.com> (cherry picked from commit b81d3657489a6e5e043396672a2ccdb92ef825ff) --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java M pom.xml 2 files changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/27361/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 44ec07b..5cc01ff 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 @@ -35,7 +35,6 @@ import com.woorea.openstack.quantum.model.Networks; import com.woorea.openstack.quantum.model.Port; import com.woorea.openstack.quantum.model.Subnet; -import com.woorea.openstack.quantum.model.SubnetForCreate; import com.woorea.openstack.quantum.model.Subnets; public class OpenstackNetworkProviderProxy implements NetworkProviderProxy { @@ -154,12 +153,14 @@ @Override public void addSubnet(ExternalSubnet subnet) { com.woorea.openstack.quantum.model.Network externalNetwork = getExternalNetwork(subnet.getExternalNetwork()); - SubnetForCreate subnetForCreate = new SubnetForCreate(); + Subnet subnetForCreate = new Subnet(); subnetForCreate.setCidr(subnet.getCidr()); - subnetForCreate.setIpVersion(subnet.getIpVersion() == IpVersion.IPV6 ? 6 : 4); + subnetForCreate.setIpversion(subnet.getIpVersion() == IpVersion.IPV6 + ? Subnet.IpVersion.IPV6 : Subnet.IpVersion.IPV4); subnetForCreate.setName(subnet.getName()); subnetForCreate.setNetworkId(externalNetwork.getId()); subnetForCreate.setTenantId(externalNetwork.getTenantId()); + subnetForCreate.setEnableDHCP(true); try { getClient().subnets().create(subnetForCreate).execute(); diff --git a/pom.xml b/pom.xml index d41fa24..00b567b 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ <aopalliance.version>1.0</aopalliance.version> <snmp4j.version>2.2.2</snmp4j.version> <!-- OpenStack --> - <openstack-client.version>3.0.2</openstack-client.version> + <openstack-client.version>3.0.4</openstack-client.version> <!-- Plugins Versions --> <maven-surefire-plugin.version>2.7.2</maven-surefire-plugin.version> -- To view, visit http://gerrit.ovirt.org/27361 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I148e6efa3edc9adbae52778fd8e1aed34e03da90 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
