Mike Kolesnik has uploaded a new change for review. Change subject: engine: Change OpenStack SDK version ......................................................................
engine: Change OpenStack SDK version Subnet and Network 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 Related-To: https://bugzilla.redhat.com/1064749 Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/25356/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..5669792 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 @@ -31,11 +31,9 @@ import com.woorea.openstack.base.client.OpenStackRequest; import com.woorea.openstack.keystone.utils.KeystoneTokenProvider; import com.woorea.openstack.quantum.Quantum; -import com.woorea.openstack.quantum.model.NetworkForCreate; 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 { @@ -81,7 +79,7 @@ @Override public String add(Network network) { - NetworkForCreate networkForCreate = new NetworkForCreate(); + com.woorea.openstack.quantum.model.Network networkForCreate = new com.woorea.openstack.quantum.model.Network(); networkForCreate.setAdminStateUp(true); networkForCreate.setName(network.getName()); if (NetworkUtils.isLabeled(network)) { @@ -154,12 +152,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(); @@ -214,9 +214,9 @@ network.setVmNetwork(true); network.setProvidedBy(new ProviderNetwork(provider.getId(), externalNetwork.getId())); network.setName(externalNetwork.getName()); - network.setLabel(externalNetwork.getProviderPhyNet()); - if (VLAN_NETWORK.equals(externalNetwork.getNetType())) { - network.setVlanId(Integer.valueOf(externalNetwork.getProviderSegID())); + network.setLabel(externalNetwork.getProviderPhysicalNetwork()); + if (VLAN_NETWORK.equals(externalNetwork.getProviderNetworkType())) { + network.setVlanId(Integer.valueOf(externalNetwork.getProviderSegmentationId())); } networks.add(network); } -- To view, visit http://gerrit.ovirt.org/25356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I148e6efa3edc9adbae52778fd8e1aed34e03da90 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
