mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
CLOUDSTACK-1656: NicResponses in a UserVmResponse are not preseving the natural order.
This commit is contained in:
parent
8d7d1cd562
commit
05f73d0950
@ -18,6 +18,7 @@ package org.apache.cloudstack.api.response;
|
|||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.apache.cloudstack.api.ApiConstants;
|
import org.apache.cloudstack.api.ApiConstants;
|
||||||
@ -157,7 +158,7 @@ public class DomainRouterResponse extends BaseResponse implements ControlledView
|
|||||||
private Set<NicResponse> nics;
|
private Set<NicResponse> nics;
|
||||||
|
|
||||||
public DomainRouterResponse(){
|
public DomainRouterResponse(){
|
||||||
nics = new HashSet<NicResponse>();
|
nics = new LinkedHashSet<NicResponse>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -344,7 +345,7 @@ public class DomainRouterResponse extends BaseResponse implements ControlledView
|
|||||||
public void addNic(NicResponse nic) {
|
public void addNic(NicResponse nic) {
|
||||||
this.nics.add(nic);
|
this.nics.add(nic);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getIp6Dns1() {
|
public String getIp6Dns1() {
|
||||||
return ip6Dns1;
|
return ip6Dns1;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,6 +17,7 @@
|
|||||||
package org.apache.cloudstack.api.response;
|
package org.apache.cloudstack.api.response;
|
||||||
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.apache.cloudstack.api.ApiConstants;
|
import org.apache.cloudstack.api.ApiConstants;
|
||||||
@ -65,9 +66,9 @@ public class SecurityGroupResponse extends BaseResponse implements ControlledVie
|
|||||||
private Set<ResourceTagResponse> tags;
|
private Set<ResourceTagResponse> tags;
|
||||||
|
|
||||||
public SecurityGroupResponse(){
|
public SecurityGroupResponse(){
|
||||||
this.ingressRules = new HashSet<SecurityGroupRuleResponse>();
|
this.ingressRules = new LinkedHashSet<SecurityGroupRuleResponse>();
|
||||||
this.egressRules = new HashSet<SecurityGroupRuleResponse>();
|
this.egressRules = new LinkedHashSet<SecurityGroupRuleResponse>();
|
||||||
this.tags = new HashSet<ResourceTagResponse>();
|
this.tags = new LinkedHashSet<ResourceTagResponse>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -18,6 +18,7 @@ package org.apache.cloudstack.api.response;
|
|||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.apache.cloudstack.api.ApiConstants;
|
import org.apache.cloudstack.api.ApiConstants;
|
||||||
@ -169,9 +170,9 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
|
|||||||
private String keyPairName;
|
private String keyPairName;
|
||||||
|
|
||||||
public UserVmResponse(){
|
public UserVmResponse(){
|
||||||
securityGroupList = new HashSet<SecurityGroupResponse>();
|
securityGroupList = new LinkedHashSet<SecurityGroupResponse>();
|
||||||
nics = new HashSet<NicResponse>();
|
nics = new LinkedHashSet<NicResponse>();
|
||||||
tags = new HashSet<ResourceTagResponse>();
|
tags = new LinkedHashSet<ResourceTagResponse>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setHypervisor(String hypervisor) {
|
public void setHypervisor(String hypervisor) {
|
||||||
|
|||||||
@ -18,6 +18,7 @@ package org.apache.cloudstack.api.response;
|
|||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.apache.cloudstack.api.ApiConstants;
|
import org.apache.cloudstack.api.ApiConstants;
|
||||||
@ -161,7 +162,7 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity
|
|||||||
private Set<ResourceTagResponse> tags;
|
private Set<ResourceTagResponse> tags;
|
||||||
|
|
||||||
public VolumeResponse(){
|
public VolumeResponse(){
|
||||||
tags = new HashSet<ResourceTagResponse>();
|
tags = new LinkedHashSet<ResourceTagResponse>();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user