Updated Branches: refs/heads/network-refactor 5e3408ee4 -> 730da70d7
IPv6: Fix missed AddressFormat in nic table Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/730da70d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/730da70d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/730da70d Branch: refs/heads/network-refactor Commit: 730da70d7dc8cfe3ce6f33353bbe0f7855e6a077 Parents: 5e3408e Author: Sheng Yang <[email protected]> Authored: Wed Jan 30 19:46:30 2013 -0800 Committer: Sheng Yang <[email protected]> Committed: Thu Jan 31 00:45:50 2013 -0800 ---------------------------------------------------------------------- api/src/com/cloud/network/Networks.java | 2 +- .../src/com/cloud/network/NetworkManagerImpl.java | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/730da70d/api/src/com/cloud/network/Networks.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/Networks.java b/api/src/com/cloud/network/Networks.java index b96eaa2..8300201 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 } /** http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/730da70d/server/src/com/cloud/network/NetworkManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 0005854..dd61715 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);
