etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Sheng Yang 2013-07-16 16:06:01 -07:00
parent 9a9d277884
commit 13c1c6291c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -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;