From f45a8238fe28b69c8ef90af7f96daf7aa321bac6 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Sat, 15 Jan 2011 09:51:07 -0500 Subject: [PATCH] add bonding support, as long as people create a bonding device and a bridge on it by themself, then cloud-agent can use it --- .../agent/resource/computing/LibvirtComputingResource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java index dd41f873231..a508e4ea29b 100644 --- a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java +++ b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java @@ -646,10 +646,10 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv String pubPif = null; String privPif = null; if (_publicBridgeName != null) { - pubPif = Script.runSimpleBashScript("ls /sys/class/net/" + _publicBridgeName + "/brif/ |egrep eth[0-9]+"); + pubPif = Script.runSimpleBashScript("brctl show | grep " + _publicBridgeName + " | awk '{print $4}'"); } if (_privBridgeName != null) { - privPif = Script.runSimpleBashScript("ls /sys/class/net/" + _privBridgeName + "/brif/ |egrep eth[0-9]+"); + privPif = Script.runSimpleBashScript("brctl show | grep " + _privBridgeName + " | awk '{print $4}'"); } return new Pair(privPif, pubPif); }