From c99870941fa8375ec964cf78b13db38e1cbb5a0b Mon Sep 17 00:00:00 2001
From: Edison Su <Edison.Su@citrix.com>
Date: Thu, 3 Nov 2011 16:58:25 -0700
Subject: [PATCH] fall back to private network if can't find public network

---
 .../resource/computing/LibvirtComputingResource.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
index dd8b88c40b5..eff66682ed0 100644
--- a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
+++ b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
@@ -699,12 +699,16 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
 		/*get pifs from bridge*/
 		String pubPif = null;
 		String privPif = null;
-		if (_publicBridgeName != null) {
-			pubPif = Script.runSimpleBashScript("brctl show | grep " + _publicBridgeName + " | awk '{print $4}'");			
-		}
 		if (_guestBridgeName != null) {
 			privPif = Script.runSimpleBashScript("brctl show | grep " + _guestBridgeName + " | awk '{print $4}'");	
 		}
+		if (_publicBridgeName != null) {
+			pubPif = Script.runSimpleBashScript("brctl show | grep " + _publicBridgeName + " | awk '{print $4}'");			
+			if (pubPif == null) {
+				pubPif = privPif;
+			}
+		}
+		
 		return new Pair<String, String>(privPif, pubPif);
 	}
 	private String getVnetId(String vnetId) {