Updated Branches: refs/heads/api_refactoring 27482045c -> efa034e82
API-refactoring -- Add pod annotation, needed for the deployVM flow test. Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/efa034e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/efa034e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/efa034e8 Branch: refs/heads/api_refactoring Commit: efa034e821df2333864ebaff94df2b7331905135 Parents: a2a3ef6 Author: Fang Wang <[email protected]> Authored: Fri Dec 14 12:50:29 2012 -0800 Committer: Rohit Yadav <[email protected]> Committed: Fri Dec 14 13:52:21 2012 -0800 ---------------------------------------------------------------------- .../api/command/admin/pod/CreatePodCmd.java | 6 ++++-- .../api/command/admin/pod/DeletePodCmd.java | 7 +++++-- .../api/command/admin/pod/ListPodsByCmd.java | 10 ++++++---- .../api/command/admin/pod/UpdatePodCmd.java | 6 ++++-- 4 files changed, 19 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/efa034e8/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java index f1763b4..f3f1c18 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java @@ -25,6 +25,8 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.PodResponse; +import org.apache.cloudstack.api.response.ZoneResponse; + import com.cloud.dc.Pod; import com.cloud.user.Account; @@ -40,8 +42,8 @@ public class CreatePodCmd extends BaseCmd { @Parameter(name=ApiConstants.NAME, type=CommandType.STRING, required=true, description="the name of the Pod") private String podName; - @IdentityMapper(entityTableName="data_center") - @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, required=true, description="the Zone ID in which the Pod will be created ") + //@IdentityMapper(entityTableName="data_center") + @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, required=true, description="the Zone ID in which the Pod will be created ", entityType=ZoneResponse.class) private Long zoneId; @Parameter(name=ApiConstants.START_IP, type=CommandType.STRING, required=true, description="the starting IP address for the Pod") http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/efa034e8/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java index fcf22df..e2e3fa8 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java @@ -24,7 +24,10 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.ZoneResponse; + import com.cloud.user.Account; @Implementation(description="Deletes a Pod.", responseObject=SuccessResponse.class) @@ -37,8 +40,8 @@ public class DeletePodCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @IdentityMapper(entityTableName="host_pod_ref") - @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, description="the ID of the Pod") + //@IdentityMapper(entityTableName="host_pod_ref") + @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, description="the ID of the Pod", entityType=PodResponse.class) private Long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/efa034e8/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java index 1516c0e..713fbb0 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java @@ -28,6 +28,8 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PodResponse; +import org.apache.cloudstack.api.response.ZoneResponse; + import com.cloud.dc.Pod; import com.cloud.utils.Pair; @@ -41,15 +43,15 @@ public class ListPodsByCmd extends BaseListCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @IdentityMapper(entityTableName="host_pod_ref") - @Parameter(name=ApiConstants.ID, type=CommandType.LONG, description="list Pods by ID") + //@IdentityMapper(entityTableName="host_pod_ref") + @Parameter(name=ApiConstants.ID, type=CommandType.LONG, description="list Pods by ID", entityType=PodResponse.class) private Long id; @Parameter(name=ApiConstants.NAME, type=CommandType.STRING, description="list Pods by name") private String podName; - @IdentityMapper(entityTableName="data_center") - @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, description="list Pods by Zone ID") + //@IdentityMapper(entityTableName="data_center") + @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, description="list Pods by Zone ID", entityType=ZoneResponse.class) private Long zoneId; @Parameter(name=ApiConstants.ALLOCATION_STATE, type=CommandType.STRING, description="list pods by allocation state") http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/efa034e8/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java index 30b8a2f..08f1086 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java @@ -25,6 +25,8 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.PodResponse; +import org.apache.cloudstack.api.response.ZoneResponse; + import com.cloud.dc.Pod; import com.cloud.user.Account; @@ -38,8 +40,8 @@ public class UpdatePodCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @IdentityMapper(entityTableName="host_pod_ref") - @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, description="the ID of the Pod") + //@IdentityMapper(entityTableName="host_pod_ref") + @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, description="the ID of the Pod", entityType=PodResponse.class) private Long id; @Parameter(name=ApiConstants.NAME, type=CommandType.STRING, description="the name of the Pod")
