CLOUDSTACK-1670: Fix the order of user vm's multiple nics They should follow the order of networkIds parameter of deployVMCmd(). And eth0 would be always on default network.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/43ebb1c8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/43ebb1c8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/43ebb1c8 Branch: refs/heads/ldapplugin Commit: 43ebb1c822d695ca7db5649892004b6b2ddb9da1 Parents: ee664a1 Author: Sheng Yang <[email protected]> Authored: Tue Jul 16 16:06:01 2013 -0700 Committer: Sheng Yang <[email protected]> Committed: Tue Jul 16 16:07:36 2013 -0700 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43ebb1c8/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 461176e..674f29c 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -2563,7 +2564,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use List<Pair<NetworkVO, NicProfile>> networks = new ArrayList<Pair<NetworkVO, NicProfile>>(); - Map<String, NicProfile> networkNicMap = new HashMap<String, NicProfile>(); + LinkedHashMap<String, NicProfile> networkNicMap = new LinkedHashMap<String, NicProfile>(); short defaultNetworkNumber = 0; boolean securityGroupEnabled = false;
