Updated Branches:
refs/heads/master 4bbaac2d2 -> 36c022414
CLOUDSTACK-3584: fixed security group related apis with the correct class
reference for projectid parameter
Conflicts:
api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/36c02241
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/36c02241
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/36c02241
Branch: refs/heads/master
Commit: 36c0224142228ed0e69ec4f3337dd74caf1fa21e
Parents: 4bbaac2
Author: Alena Prokharchyk <[email protected]>
Authored: Wed Jul 17 10:53:41 2013 -0700
Committer: Alena Prokharchyk <[email protected]>
Committed: Wed Jul 17 10:58:44 2013 -0700
----------------------------------------------------------------------
.../user/securitygroup/AuthorizeSecurityGroupEgressCmd.java | 4 ++--
.../user/securitygroup/AuthorizeSecurityGroupIngressCmd.java | 4 ++--
.../api/command/user/securitygroup/CreateSecurityGroupCmd.java | 4 ++--
.../api/command/user/securitygroup/DeleteSecurityGroupCmd.java | 4 ++--
.../cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java | 5 ++---
5 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36c02241/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
----------------------------------------------------------------------
diff --git
a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
index cac9614..49a42ec 100644
---
a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
+++
b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
@@ -30,7 +30,7 @@ import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainResponse;
-import org.apache.cloudstack.api.response.ProjectAccountResponse;
+import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.SecurityGroupRuleResponse;
import org.apache.cloudstack.context.CallContext;
@@ -80,7 +80,7 @@ public class AuthorizeSecurityGroupEgressCmd extends
BaseAsyncCmd {
@Parameter(name=ApiConstants.ACCOUNT, type=CommandType.STRING,
description="an optional account for the security group. Must be used with
domainId.")
private String accountName;
- @Parameter(name=ApiConstants.PROJECT_ID, type=CommandType.UUID,
description="an optional project of the security group",
entityType=ProjectAccountResponse.class)
+ @Parameter(name=ApiConstants.PROJECT_ID, type=CommandType.UUID,
description="an optional project of the security group",
entityType=ProjectResponse.class)
private Long projectId;
@Parameter(name=ApiConstants.SECURITY_GROUP_ID, type=CommandType.UUID,
description="The ID of the security group. Mutually exclusive with
securityGroupName parameter", entityType=SecurityGroupResponse.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36c02241/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
----------------------------------------------------------------------
diff --git
a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
index 3dfcd05..910d70b 100644
---
a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
+++
b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
@@ -30,7 +30,7 @@ import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainResponse;
-import org.apache.cloudstack.api.response.ProjectAccountResponse;
+import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.SecurityGroupRuleResponse;
import org.apache.cloudstack.context.CallContext;
@@ -81,7 +81,7 @@ public class AuthorizeSecurityGroupIngressCmd extends
BaseAsyncCmd {
@Parameter(name=ApiConstants.ACCOUNT, type=CommandType.STRING,
description="an optional account for the security group. Must be used with
domainId.")
private String accountName;
- @Parameter(name=ApiConstants.PROJECT_ID, type=CommandType.UUID,
description="an optional project of the security group",
entityType=ProjectAccountResponse.class)
+ @Parameter(name=ApiConstants.PROJECT_ID, type=CommandType.UUID,
description="an optional project of the security group",
entityType=ProjectResponse.class)
private Long projectId;
@Parameter(name=ApiConstants.SECURITY_GROUP_ID, type=CommandType.UUID,
description="The ID of the security group. Mutually exclusive with
securityGroupName parameter", entityType=SecurityGroupResponse.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36c02241/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java
----------------------------------------------------------------------
diff --git
a/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java
b/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java
index 52611b8..2d7396e 100644
---
a/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java
+++
b/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java
@@ -23,7 +23,7 @@ import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainResponse;
-import org.apache.cloudstack.api.response.ProjectAccountResponse;
+import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.context.CallContext;
@@ -54,7 +54,7 @@ public class CreateSecurityGroupCmd extends BaseCmd {
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required =
true, description = "name of the security group")
private String securityGroupName;
- @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID,
description = "Deploy vm for the project",
entityType=ProjectAccountResponse.class)
+ @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID,
description = "Create security group for project",
entityType=ProjectResponse.class)
private Long projectId;
// ///////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36c02241/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java
----------------------------------------------------------------------
diff --git
a/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java
b/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java
index 7e9b9de..43be88d 100644
---
a/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java
+++
b/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java
@@ -23,7 +23,7 @@ import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainResponse;
-import org.apache.cloudstack.api.response.ProjectAccountResponse;
+import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
@@ -48,7 +48,7 @@ public class DeleteSecurityGroupCmd extends BaseCmd {
@Parameter(name=ApiConstants.DOMAIN_ID, type=CommandType.UUID,
description="the domain ID of account owning the security group",
entityType=DomainResponse.class)
private Long domainId;
- @Parameter(name=ApiConstants.PROJECT_ID, type=CommandType.UUID,
description="the project of the security group",
entityType=ProjectAccountResponse.class)
+ @Parameter(name=ApiConstants.PROJECT_ID, type=CommandType.UUID,
description="the project of the security group",
entityType=ProjectResponse.class)
private Long projectId;
@Parameter(name=ApiConstants.ID, type=CommandType.UUID, description="The
ID of the security group. Mutually exclusive with name parameter",
entityType=SecurityGroupResponse.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36c02241/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
----------------------------------------------------------------------
diff --git
a/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
b/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
index daaf094..541b4fc 100644
---
a/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
+++
b/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
@@ -24,9 +24,8 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.InstanceGroupResponse;
-import org.apache.cloudstack.api.response.ProjectAccountResponse;
import org.apache.cloudstack.context.CallContext;
-
+import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.log4j.Logger;
import com.cloud.vm.InstanceGroup;
@@ -52,7 +51,7 @@ public class CreateVMGroupCmd extends BaseCmd {
description = "the domain ID of account owning the instance group")
private Long domainId;
- @Parameter(name = ApiConstants.PROJECT_ID, type=CommandType.UUID,
entityType=ProjectAccountResponse.class,
+ @Parameter(name = ApiConstants.PROJECT_ID, type=CommandType.UUID,
entityType=ProjectResponse.class,
description = "The project of the instance group")
private Long projectId;
