From 55175fb2fd945b1c043e7b986d31a083be5a5bc9 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Mon, 19 Dec 2011 14:48:47 -0800
Subject: [PATCH] bug 12653: add default gateway support for multiple networks
 under VMware

---
 .../vmware/resource/VmwareResource.java       | 19 ++++++++++++++++---
 .../cloud/hypervisor/vmware/mo/HostMO.java    |  4 ++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 3d2fcfaf40a..857fc565630 100755
--- a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -933,11 +933,24 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
             s_logger.info("Executing resource DhcpEntryCommand: " + _gson.toJson(cmd));
         }
 
+        // ssh -p 3922 -o StrictHostKeyChecking=no -i $cert root@$domr "/root/edithosts.sh $mac $ip $vm $dfltrt $ns $staticrt" >/dev/null
         String args = " " + cmd.getVmMac();
         args += " " + cmd.getVmIpAddress();
-        args += " " + cmd.getVmName();
-
-        if (s_logger.isDebugEnabled()) {
+        args += " " + cmd.getVmName();
+        
+        if (cmd.getDefaultRouter() != null) {
+            args += " " + cmd.getDefaultRouter();
+        }
+        
+        if (cmd.getDefaultDns() != null) {
+            args += " " + cmd.getDefaultDns();
+        }
+
+        if (cmd.getStaticRoutes() != null) {
+            args +=  " " + cmd.getStaticRoutes();
+        }
+        
+        if (s_logger.isDebugEnabled()) {
             s_logger.debug("Run command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + ", /root/edithosts.sh " + args);
         }
 
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
index 1b512c36eca..1c3d2a6aa1b 100755
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
@@ -469,8 +469,8 @@ public class HostMO extends BaseMO implements VmwareHypervisorHost {
             for(ObjectContent oc : ocs) {
                 String vmName = oc.getPropSet()[0].getVal().toString();
                 
-                if(s_logger.isDebugEnabled())
-                	s_logger.debug("put " + vmName + " into host cache");
+                if(s_logger.isTraceEnabled())
+                	s_logger.trace("put " + vmName + " into host cache");
                 
                 _vmCache.put(vmName, new VirtualMachineMO(_context, oc.getObj()));
             }