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

bug 10440: ipassoca failed, if the public network is untagged 

status 10440: resolved fixed
This commit is contained in:
Edison Su 2011-06-27 16:08:30 -04:00
parent 499bdff397
commit 7e195ae6ae
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
View File

@ -1008,11 +1008,17 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
OutputInterpreter.OneLineParser vlanIdParser = new OutputInterpreter.OneLineParser();
final Script cmd = new Script("/bin/bash", s_logger);
cmd.add("-c");
cmd.add("vlanid=$(brctl show |grep " + brName + " |awk '{print $4}' | cut -d. -f 2);echo $vlanid");
if (cmd.execute(vlanIdParser) != null) {
cmd.add("vlanid=$(brctl show |grep " + brName + " |awk '{print $4}' | cut -s -d. -f 2);echo $vlanid");
String result = cmd.execute(vlanIdParser);
if (result != null) {
return null;
}
return vlanIdParser.getLine();
String vlanId = vlanIdParser.getLine();
if (vlanId.equalsIgnoreCase("")) {
return null;
} else {
return vlanId;
}
}
private void VifHotPlug(Connect conn, String vmName, String vlanId, String macAddr) throws InternalErrorException, LibvirtException {