IPv6: Fix missed AddressFormat in nic table

Sheng Yang · Sheng Yang · commit f45576bce592 · 2013-01-30T19:46:30.000-08:00
diff --git a/api/src/com/cloud/network/Networks.java b/api/src/com/cloud/network/Networks.java
@@ -48,7 +48,7 @@ public enum Mode {
     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
@@ -1317,10 +1317,8 @@ protected Integer applyProfileToNic(NicVO vo, NicProfile profile, Integer device
 
         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());
@@ -3372,7 +3370,7 @@ public void allocateDirectIp(NicProfile nic, DataCenter dc, VirtualMachineProfil
     			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);
