CLOUDSTACK-1656: NicResponses in a UserVmResponse are not preseving the natural order.

minchen07 · minchen07 · commit 05f73d0950d3 · 2013-03-13T10:30:13.000-07:00
diff --git a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
@@ -18,6 +18,7 @@
 
 import java.util.Date;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.apache.cloudstack.api.ApiConstants;
@@ -157,7 +158,7 @@ public class DomainRouterResponse extends BaseResponse implements ControlledView
     private Set<NicResponse> nics;
 
     public DomainRouterResponse(){
-        nics = new HashSet<NicResponse>();
+        nics = new LinkedHashSet<NicResponse>();
     }
 
 
@@ -344,7 +345,7 @@ public void setNics(Set<NicResponse> nics) {
     public void addNic(NicResponse nic) {
         this.nics.add(nic);
     }
-    
+
 	public String getIp6Dns1() {
 		return ip6Dns1;
 	}
diff --git a/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java b/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java
@@ -17,6 +17,7 @@
 package org.apache.cloudstack.api.response;
 
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.apache.cloudstack.api.ApiConstants;
@@ -65,9 +66,9 @@ public class SecurityGroupResponse extends BaseResponse implements ControlledVie
     private Set<ResourceTagResponse> tags;
 
     public SecurityGroupResponse(){
-        this.ingressRules = new HashSet<SecurityGroupRuleResponse>();
-        this.egressRules = new HashSet<SecurityGroupRuleResponse>();
-        this.tags = new HashSet<ResourceTagResponse>();
+        this.ingressRules = new LinkedHashSet<SecurityGroupRuleResponse>();
+        this.egressRules = new LinkedHashSet<SecurityGroupRuleResponse>();
+        this.tags = new LinkedHashSet<ResourceTagResponse>();
     }
 
 
diff --git a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
@@ -18,6 +18,7 @@
 
 import java.util.Date;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.apache.cloudstack.api.ApiConstants;
@@ -169,9 +170,9 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
     private String keyPairName;
 
     public UserVmResponse(){
-        securityGroupList = new HashSet<SecurityGroupResponse>();
-        nics = new HashSet<NicResponse>();
-        tags = new HashSet<ResourceTagResponse>();
+        securityGroupList = new LinkedHashSet<SecurityGroupResponse>();
+        nics = new LinkedHashSet<NicResponse>();
+        tags = new LinkedHashSet<ResourceTagResponse>();
     }
 
     public void setHypervisor(String hypervisor) {
diff --git a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
@@ -18,6 +18,7 @@
 
 import java.util.Date;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.apache.cloudstack.api.ApiConstants;
@@ -161,7 +162,7 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity
     private Set<ResourceTagResponse> tags;
 
     public VolumeResponse(){
-        tags = new HashSet<ResourceTagResponse>();
+        tags = new LinkedHashSet<ResourceTagResponse>();
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`
`19`	`19`	`import java.util.Date;`
`20`	`20`	`import java.util.HashSet;`
	`21`	`+import java.util.LinkedHashSet;`
`21`	`22`	`import java.util.Set;`
`22`	`23`
`23`	`24`	`import org.apache.cloudstack.api.ApiConstants;`
`@@ -157,7 +158,7 @@ public class DomainRouterResponse extends BaseResponse implements ControlledView`
`157`	`158`	`private Set<NicResponse> nics;`
`158`	`159`
`159`	`160`	`public DomainRouterResponse(){`
`160`		`- nics = new HashSet<NicResponse>();`
	`161`	`+ nics = new LinkedHashSet<NicResponse>();`
`161`	`162`	`}`
`162`	`163`
`163`	`164`
`@@ -344,7 +345,7 @@ public void setNics(Set<NicResponse> nics) {`
`344`	`345`	`public void addNic(NicResponse nic) {`
`345`	`346`	`this.nics.add(nic);`
`346`	`347`	`}`
`347`		`-`
	`348`	`+`
`348`	`349`	`public String getIp6Dns1() {`
`349`	`350`	`return ip6Dns1;`
`350`	`351`	`}`