From d31b3cc446ba74e797f30eacf0215c3d1689ed71 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Mon, 10 Jan 2011 10:47:26 -0800
Subject: [PATCH] Resend dhcp/userData entries as a part of Dhcp vm start.

---
 .../VirtualNetworkApplianceManagerImpl.java   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index e60617a2814..bf3d40d400f 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1310,12 +1310,12 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
                     }
                 }
                 
-                s_logger.debug("Found " + rulesToReapply.size() + " port forwarding rule(s) to apply as a part of domR " + router.getId() + " start.");
+                s_logger.debug("Found " + rulesToReapply.size() + " port forwarding rule(s) to apply as a part of domR " + router + " start.");
                 if (!rulesToReapply.isEmpty()) {
                     createApplyPortForwardingRulesCommands(rulesToReapply, router, cmds);
                 } 
                 
-                s_logger.debug("Found " + vpns.size() + " vpn(s) to apply as a part of domR " + router.getId() + " start.");
+                s_logger.debug("Found " + vpns.size() + " vpn(s) to apply as a part of domR " + router + " start.");
                 if (!vpns.isEmpty()) {
                     for (RemoteAccessVpn vpn : vpns) {
                         createApplyVpnCommands(vpn, router, cmds);
@@ -1331,19 +1331,21 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
                     lbRules.add(loadBalancing);
                 }
                 
-                s_logger.debug("Found " + lbRules.size() + " load balancing rule(s) to apply as a part of domR " + router.getId() + " start.");
+                s_logger.debug("Found " + lbRules.size() + " load balancing rule(s) to apply as a part of domR " + router + " start.");
                 if (!lbRules.isEmpty()) {
                     createApplyLoadBalancingRulesCommands(lbRules, router, cmds);
                 } 
-                
-                //Resend dhcp
-                createDhcpEntriesCommands(router, cmds);
-                
-                //Resend user data
-                createUserDataCommands(router, cmds);
             } 
         }
         
+        //Resend dhcp
+        s_logger.debug("Reapplying dhcp entries as a part of domR " + router + " start...");
+        createDhcpEntriesCommands(router, cmds);
+        
+        //Resend user data
+        s_logger.debug("Reapplying user data entries as a part of domR " + router + " start...");
+        createUserDataCommands(router, cmds);
+        
         return true;
     }
 
@@ -1731,7 +1733,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
             for (UserVmVO vm : vms) {
                 NicVO nic = _nicDao.findByInstanceIdAndNetworkId(networkId, vm.getId());
                 if (nic != null) {
-                    s_logger.debug("Creating dhcp entry for vm " + vm + " on domR " + router);
+                    s_logger.debug("Creating dhcp entry for vm " + vm + " on domR " + router + ".");
                     
                     DhcpEntryCommand dhcpCommand = new DhcpEntryCommand(nic.getMacAddress(), nic.getIp4Address(), vm.getName());
                     dhcpCommand.setAccessDetail(NetworkElementCommand.ROUTER_IP, router.getPrivateIpAddress());