Updated Branches: refs/heads/4.0 c898b72b3 -> f797d4502
Fix incorrect Annotation on deleteUser, addTrafficMonitor and listTrafficMonitor apis. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f797d450 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f797d450 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f797d450 Branch: refs/heads/4.0 Commit: f797d450261d8a4d2734db2cfc7e40c67167cd14 Parents: c898b72 Author: Min Chen <[email protected]> Authored: Thu Apr 18 11:34:49 2013 -0700 Committer: Min Chen <[email protected]> Committed: Thu Apr 18 11:34:49 2013 -0700 ---------------------------------------------------------------------- api/src/com/cloud/api/commands/DeleteUserCmd.java | 2 +- .../cloud/api/commands/AddTrafficMonitorCmd.java | 2 +- .../cloud/api/commands/ListTrafficMonitorsCmd.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f797d450/api/src/com/cloud/api/commands/DeleteUserCmd.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/api/commands/DeleteUserCmd.java b/api/src/com/cloud/api/commands/DeleteUserCmd.java index e436495..f966d2b 100644 --- a/api/src/com/cloud/api/commands/DeleteUserCmd.java +++ b/api/src/com/cloud/api/commands/DeleteUserCmd.java @@ -30,7 +30,7 @@ import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.user.UserContext; -@Implementation(description="Creates a user for an account", responseObject=UserResponse.class) +@Implementation(description="Deletes a user for an account", responseObject=SuccessResponse.class) public class DeleteUserCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteUserCmd.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f797d450/server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java b/server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java index 6bbdde7..d125516 100644 --- a/server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java +++ b/server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java @@ -34,7 +34,7 @@ import com.cloud.user.Account; import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.exception.CloudRuntimeException; -@Implementation(description="Adds Traffic Monitor Host for Direct Network Usage", responseObject = ExternalFirewallResponse.class) +@Implementation(description="Adds Traffic Monitor Host for Direct Network Usage", responseObject = TrafficMonitorResponse.class) public class AddTrafficMonitorCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddTrafficMonitorCmd.class.getName()); private static final String s_name = "addtrafficmonitorresponse"; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f797d450/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java b/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java index 78338d8..b3fd2a7 100644 --- a/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java +++ b/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java @@ -34,7 +34,7 @@ import com.cloud.server.api.response.ExternalFirewallResponse; import com.cloud.server.api.response.TrafficMonitorResponse; import com.cloud.utils.component.ComponentLocator; -@Implementation(description="List traffic monitor Hosts.", responseObject = ExternalFirewallResponse.class) +@Implementation(description="List traffic monitor Hosts.", responseObject = TrafficMonitorResponse.class) public class ListTrafficMonitorsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListServiceOfferingsCmd.class.getName()); private static final String s_name = "listtrafficmonitorsresponse";
