From 13c1c6291c88c51048971da8a5649fcd1602b730 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Tue, 16 Jul 2013 16:06:01 -0700
Subject: [PATCH] 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.
---
 server/src/com/cloud/vm/UserVmManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 53316b85158..99686908485 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;
@@ -2569,7 +2570,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;