diff --git a/api/src/com/cloud/network/Networks.java b/api/src/com/cloud/network/Networks.java index b96eaa2ff6c..83002017f9e 100755 --- a/api/src/com/cloud/network/Networks.java +++ b/api/src/com/cloud/network/Networks.java @@ -48,7 +48,7 @@ public class Networks { public enum AddressFormat { Ip4, Ip6, - Mixed + DualStack } /** diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 00058542b72..dd61715351e 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -1361,10 +1361,8 @@ public class NetworkManagerImpl implements NetworkManager, Manager, Listener { vo.setDefaultNic(profile.isDefaultNic()); - if (profile.getIp4Address() != null) { - vo.setIp4Address(profile.getIp4Address()); - vo.setAddressFormat(AddressFormat.Ip4); - } + vo.setIp4Address(profile.getIp4Address()); + vo.setAddressFormat(profile.getFormat()); if (profile.getMacAddress() != null) { vo.setMacAddress(profile.getMacAddress()); @@ -3441,7 +3439,7 @@ public class NetworkManagerImpl implements NetworkManager, Manager, Listener { nic.setIp6Gateway(vlan.getIp6Gateway()); nic.setIp6Cidr(vlan.getIp6Cidr()); if (ipv4) { - nic.setFormat(AddressFormat.Mixed); + nic.setFormat(AddressFormat.DualStack); } else { nic.setIsolationUri(IsolationType.Vlan.toUri(vlan.getVlanTag())); nic.setBroadcastType(BroadcastDomainType.Vlan);