From da5fb5097ccabc2979bc8dce8140ef3f10f0d016 Mon Sep 17 00:00:00 2001
From: Edison Su <Edison.Su@citrix.com>
Date: Thu, 15 Dec 2011 17:06:17 -0800
Subject: [PATCH] put the default network as cloudbr0, if not specified

---
 .../resource/computing/LibvirtComputingResource.java   |  4 ++++
 .../hypervisor/kvm/discoverer/KvmServerDiscoverer.java | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
index 61e1943e55f..28241e259a7 100644
--- a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
+++ b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
@@ -724,6 +724,10 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
 	}
 	
 	private boolean checkNetwork(String networkName) {
+		if (networkName == null) {
+			return true;
+		}
+		
 		String name = Script.runSimpleBashScript("brctl show | grep " + networkName + " | awk '{print $4}'");	
 		if (name == null) {
 			return false;
diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
index b474ca75abf..69c20f8e241 100755
--- a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
+++ b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
@@ -190,8 +190,18 @@ public class KvmServerDiscoverer extends DiscovererBase implements Discoverer,
 			} else {
 				PhysicalNetworkSetupInfo network = networks.get(0);
 				_kvmPublicNic = network.getPublicNetworkName();
+				if (_kvmPublicNic == null) {
+					_kvmPublicNic = "cloudbr0";
+				}
 				_kvmPrivateNic = network.getPrivateNetworkName();
+				if (_kvmPrivateNic == null) {
+					_kvmPrivateNic = _kvmPublicNic;
+				}
 				_kvmGuestNic = network.getGuestNetworkName();
+				if (_kvmGuestNic == null) {
+					_kvmGuestNic = _kvmPrivateNic;
+				}
+				
 			}
 			
 			String parameters = " -m " + _hostIp + " -z " + dcId + " -p " + podId + " -c " + clusterId + " -g " + guid + " -a";