API changes for createAffinityGroup

This commit is contained in:
Prachi Damle 2013-02-25 10:23:15 -08:00
parent a4e61b71cc
commit 119c5ceada
2 changed files with 8 additions and 4 deletions

View File

@ -27,6 +27,7 @@ import java.util.regex.Pattern;
import javax.inject.Inject; import javax.inject.Inject;
import org.apache.cloudstack.affinity.AffinityGroupService;
import org.apache.cloudstack.query.QueryService; import org.apache.cloudstack.query.QueryService;
import org.apache.cloudstack.usage.UsageService; import org.apache.cloudstack.usage.UsageService;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -60,7 +61,6 @@ import com.cloud.projects.ProjectService;
import com.cloud.resource.ResourceService; import com.cloud.resource.ResourceService;
import com.cloud.server.ManagementService; import com.cloud.server.ManagementService;
import com.cloud.server.TaggedResourceService; import com.cloud.server.TaggedResourceService;
import com.cloud.storage.DataStoreProviderApiService;
import com.cloud.storage.StorageService; import com.cloud.storage.StorageService;
import com.cloud.storage.VolumeApiService; import com.cloud.storage.VolumeApiService;
import com.cloud.storage.snapshot.SnapshotService; import com.cloud.storage.snapshot.SnapshotService;
@ -132,6 +132,7 @@ public abstract class BaseCmd {
@Inject public VMSnapshotService _vmSnapshotService; @Inject public VMSnapshotService _vmSnapshotService;
@Inject public DataStoreProviderApiService dataStoreProviderApiService; @Inject public DataStoreProviderApiService dataStoreProviderApiService;
@Inject public VpcProvisioningService _vpcProvSvc; @Inject public VpcProvisioningService _vpcProvSvc;
@Inject public AffinityGroupService _affinityGroupService;
public abstract void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException; public abstract void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException;
@ -154,7 +155,7 @@ public abstract class BaseCmd {
/** /**
* For commands the API framework needs to know the owner of the object being acted upon. This method is * For commands the API framework needs to know the owner of the object being acted upon. This method is
* used to determine that information. * used to determine that information.
* *
* @return the id of the account that owns the object being acted upon * @return the id of the account that owns the object being acted upon
*/ */
public abstract long getEntityOwnerId(); public abstract long getEntityOwnerId();
@ -467,7 +468,7 @@ public abstract class BaseCmd {
if (!enabledOnly || account.getState() == Account.State.enabled) { if (!enabledOnly || account.getState() == Account.State.enabled) {
return account.getId(); return account.getId();
} else { } else {
throw new PermissionDeniedException("Can't add resources to the account id=" + account.getId() + " in state=" + account.getState() + " as it's no longer active"); throw new PermissionDeniedException("Can't add resources to the account id=" + account.getId() + " in state=" + account.getState() + " as it's no longer active");
} }
} else { } else {
// idList is not used anywhere, so removed it now // idList is not used anywhere, so removed it now
@ -484,7 +485,7 @@ public abstract class BaseCmd {
return project.getProjectAccountId(); return project.getProjectAccountId();
} else { } else {
PermissionDeniedException ex = new PermissionDeniedException("Can't add resources to the project with specified projectId in state=" + project.getState() + " as it's no longer active"); PermissionDeniedException ex = new PermissionDeniedException("Can't add resources to the project with specified projectId in state=" + project.getState() + " as it's no longer active");
ex.addProxyObject(project, projectId, "projectId"); ex.addProxyObject(project, projectId, "projectId");
throw ex; throw ex;
} }
} else { } else {

View File

@ -568,3 +568,6 @@ revertToSnapshot=15
#### Baremetal commands #### Baremetal commands
addBaremetalHost=1 addBaremetalHost=1
#### Affinity group commands
createAffinityGroup=15