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

merge conflict with alena's changes

This commit is contained in:
Alex Huang 2010-11-08 12:40:38 -08:00
parent 16b6850bea
commit c8a3ea3080
5 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,7 @@ listSystemVms=com.cloud.api.commands.ListSystemVMsCmd;1
#### configuration commands
updateConfiguration=com.cloud.api.commands.UpdateCfgCmd;1
listConfigurations=com.cloud.api.commands.ListCfgsByCmd;1
createConfiguration=com.cloud.api.commands.CreateCfgCmd;1
addConfig=com.cloud.api.commands.AddConfigCmd;15
listCapabilities=com.cloud.api.commands.ListCapabilitiesCmd;15
#### pod commands
@ -195,11 +195,11 @@ enableStorageMaintenance=com.cloud.api.commands.PreparePrimaryStorageForMaintena
cancelStorageMaintenance=com.cloud.api.commands.CancelPrimaryStorageMaintenanceCmd;1
#### network group commands
createSecurityGroup=com.cloud.api.commands.CreateNetworkGroupCmd;11
deleteSecurityGroup=com.cloud.api.commands.DeleteNetworkGroupCmd;11
authorizeSecurityGroupIngress=com.cloud.api.commands.AuthorizeNetworkGroupIngressCmd;11
revokeSecurityGroupIngress=com.cloud.api.commands.RevokeNetworkGroupIngressCmd;11
listSecurityGroups=com.cloud.api.commands.ListNetworkGroupsCmd;11
createNetworkGroup=com.cloud.api.commands.CreateNetworkGroupCmd;11
deleteNetworkGroup=com.cloud.api.commands.DeleteNetworkGroupCmd;11
authorizeNetworkGroupIngress=com.cloud.api.commands.AuthorizeNetworkGroupIngressCmd;11
revokeNetworkGroupIngress=com.cloud.api.commands.RevokeNetworkGroupIngressCmd;11
listNetworkGroups=com.cloud.api.commands.ListNetworkGroupsCmd;11
registerPreallocatedLun=com.cloud.api.commands.RegisterPreallocatedLunCmd;1
deletePreallocatedLun=com.cloud.api.commands.DeletePreallocatedLunCmd;1

4
server/src/com/cloud/api/BaseCmd.java
View File

@ -37,6 +37,7 @@ import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.DomainRouterService;
import com.cloud.network.NetworkManager;
import com.cloud.network.security.NetworkGroupManager;
import com.cloud.server.ManagementServer;
@ -123,7 +124,7 @@ public abstract class BaseCmd {
public static NetworkGroupManager _networkGroupMgr;
public static SnapshotManager _snapshotMgr;
public static ConsoleProxyManager _consoleProxyMgr;
public static DomainRouterService _routerMgr;
private Object _responseObject = null;
@ -146,6 +147,7 @@ public abstract class BaseCmd {
_networkGroupMgr = locator.getManager(NetworkGroupManager.class);
_snapshotMgr = locator.getManager(SnapshotManager.class);
_consoleProxyMgr = locator.getManager(ConsoleProxyManager.class);
_routerMgr = locator.getManager(DomainRouterService.class);
return locator;
}

11
server/src/com/cloud/api/commands/StartRouter2Cmd.java
View File

@ -26,8 +26,14 @@ import com.cloud.api.ApiResponseHelper;
import com.cloud.api.BaseAsyncCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.DomainRouterResponse;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.DomainRouterService;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
@ -87,6 +93,11 @@ public class StartRouter2Cmd extends BaseAsyncCmd {
public String getEventDescription() {
return "starting router: " + getId();
}
@Override
public Object execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException {
return _routerMgr.startRouter(this);
}
@Override @SuppressWarnings("unchecked")
public DomainRouterResponse getResponse() {

13
server/src/com/cloud/api/commands/StopRouter2Cmd.java
View File

@ -26,8 +26,15 @@ import com.cloud.api.ApiResponseHelper;
import com.cloud.api.BaseAsyncCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.DomainRouterResponse;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientAddressCapacityException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.DomainRouterService;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
@ -90,4 +97,10 @@ public class StopRouter2Cmd extends BaseAsyncCmd {
response.setResponseName(getName());
return response;
}
@Override
public Object execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException{
DomainRouter result = _routerMgr.stopRouter(this);
return result;
}
}

3
server/src/com/cloud/network/DomainRouterService.java
View File

@ -26,10 +26,9 @@ import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.utils.component.Manager;
import com.cloud.vm.DomainRouter;
public interface DomainRouterService extends Manager {
public interface DomainRouterService {
/**
* Starts domain router
* @param cmd the command specifying router's id