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

bug 11307: Add destroyRouter command

This commit is contained in:
Sheng Yang 2011-09-14 02:58:44 -07:00
parent 684a603a6e
commit 474d1a6034
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/com/cloud/network/VirtualNetworkApplianceService.java
View File

@ -52,5 +52,6 @@ public interface VirtualNetworkApplianceService{
VirtualRouter stopRouter(long routerId, boolean forced) throws ResourceUnavailableException, ConcurrentOperationException;
VirtualRouter startRouter(StartRouterCmd cmd) throws ResourceUnavailableException, InsufficientCapacityException, ConcurrentOperationException;
VirtualRouter destroyRouter(long routerId) throws ResourceUnavailableException, ConcurrentOperationException;
}

3
client/tomcatconf/commands.properties.in
View File

@ -135,6 +135,7 @@ updateLoadBalancerRule=com.cloud.api.commands.UpdateLoadBalancerRuleCmd;15
startRouter=com.cloud.api.commands.StartRouterCmd;7
rebootRouter=com.cloud.api.commands.RebootRouterCmd;7
stopRouter=com.cloud.api.commands.StopRouterCmd;7
destroyRouter=com.cloud.api.commands.DestroyRouterCmd;7
changeServiceForRouter=com.cloud.api.commands.UpgradeRouterCmd;7
listRouters=com.cloud.api.commands.ListRoutersCmd;7
@ -277,4 +278,4 @@ listFirewallRules=com.cloud.api.commands.ListFirewallRulesCmd;15
#### hypervisor capabilities commands
updateHypervisorCapabilities=com.cloud.api.commands.UpdateHypervisorCapabilitiesCmd;1
listHypervisorCapabilities=com.cloud.api.commands.ListHypervisorCapabilitiesCmd;1
listHypervisorCapabilities=com.cloud.api.commands.ListHypervisorCapabilitiesCmd;1

2
server/src/com/cloud/network/element/DhcpElement.java
View File

@ -167,7 +167,7 @@ public class DhcpElement extends AdapterBase implements NetworkElement, Password
}
boolean result = true;
for (DomainRouterVO router : routers) {
result = result && _routerMgr.destroyRouter(router.getId());
result = result && (_routerMgr.destroyRouter(router.getId()) != null);
}
return result;
}

4
server/src/com/cloud/network/element/VirtualRouterElement.java
View File

@ -165,7 +165,7 @@ public class VirtualRouterElement extends DhcpElement implements NetworkElement,
if (router.getState() != State.Stopped || _routerMgr.stopRouter(router.getId(), false) == null) {
s_logger.warn("Failed to stop virtual router element " + router + " as a part of network " + network + " restart");
}
if (!_routerMgr.destroyRouter(router.getId())) {
if (_routerMgr.destroyRouter(router.getId()) == null) {
s_logger.warn("Failed to destroy virtual router element " + router + " as a part of network " + network + " restart");
}
}
@ -361,7 +361,7 @@ public class VirtualRouterElement extends DhcpElement implements NetworkElement,
}
boolean result = true;
for (DomainRouterVO router : routers) {
result = result && _routerMgr.destroyRouter(router.getId());
result = result && (_routerMgr.destroyRouter(router.getId()) != null);
}
return result;
}

2
server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
View File

@ -64,8 +64,6 @@ public interface VirtualNetworkApplianceManager extends Manager, VirtualNetworkA
*/
boolean savePasswordToRouter(Network network, NicProfile nic, VirtualMachineProfile<UserVm> profile, List<? extends VirtualRouter> routers) throws ResourceUnavailableException;
boolean destroyRouter(long routerId) throws ResourceUnavailableException, ConcurrentOperationException;
boolean getRouterStatistics(long vmId, Map<String, long[]> netStats, Map<String, long[]> diskStats);
List<DomainRouterVO> getRouters(long accountId, long zoneId);

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

@ -354,7 +354,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
}
@Override
public boolean destroyRouter(final long routerId) throws ResourceUnavailableException, ConcurrentOperationException {
public VirtualRouter destroyRouter(final long routerId) throws ResourceUnavailableException, ConcurrentOperationException {
UserContext context = UserContext.current();
User user = _accountMgr.getActiveUser(context.getCallerUserId());
@ -364,11 +364,14 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
DomainRouterVO router = _routerDao.findById(routerId);
if (router == null) {
return true;
return null;
}
boolean result = _itMgr.expunge(router, user, _accountMgr.getAccount(router.getAccountId()));
return result;
if (result) {
return router;
}
return null;
}
@Override