etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resend dhcp/userData entries as a part of Dhcp vm start.

This commit is contained in:
alena 2011-01-10 10:47:26 -08:00
parent d11978a82d
commit d31b3cc446
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -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());