apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 10586: apply Nils's patch

Browse Source 
status 10586: resolved fixed
This commit is contained in:
Edison Su 2012-01-10 16:19:49 -08:00
parent 1b0b88c43a
commit 470ec2cabc
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -714,11 +714,20 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
/*get pifs from bridge*/
String pubPif = null;
String privPif = null;
String vlan = null;
if (_publicBridgeName != null) {
pubPif = Script.runSimpleBashScript("brctl show | grep " + _publicBridgeName + " | awk '{print $4}'");
pubPif = Script.runSimpleBashScript("brctl show | grep " + _publicBridgeName + " | awk '{print $4}'");
vlan = Script.runSimpleBashScript("ls /proc/net/vlan/" + pubPif);
if ( vlan != null && !vlan.isEmpty() ) {
pubPif = Script.runSimpleBashScript("grep ^Device\\: /proc/net/vlan/" + pubPif + " | awk {'print $2'}");
}
}
if (_guestBridgeName != null) {
privPif = Script.runSimpleBashScript("brctl show | grep " + _guestBridgeName + " | awk '{print $4}'");
vlan = Script.runSimpleBashScript("ls /proc/net/vlan/" + privPif);
if ( vlan != null && !vlan.isEmpty() ) {
privPif = Script.runSimpleBashScript("grep ^Device\\: /proc/net/vlan/" + privPif + " | awk {'print $2'}");
}
}
return new Pair<String, String>(privPif, pubPif);
}