Merge branch 'api_limit'
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5a865462 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5a865462 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5a865462 Branch: refs/heads/cloud-agent-with-openvswitch Commit: 5a865462e90faf00795047da793836099300384b Parents: ce4b49d 2fd1d47 Author: Min Chen <[email protected]> Authored: Fri Jan 18 09:43:54 2013 -0800 Committer: Min Chen <[email protected]> Committed: Fri Jan 18 09:43:54 2013 -0800 ---------------------------------------------------------------------- .../com/cloud/exception/RequestLimitException.java | 43 +++ api/src/org/apache/cloudstack/acl/APIChecker.java | 3 +- .../org/apache/cloudstack/acl/APILimitChecker.java | 30 ++ client/pom.xml | 5 + client/tomcatconf/commands.properties.in | 5 + client/tomcatconf/components.xml.in | 6 + plugins/api/rate-limit/pom.xml | 51 ++++ .../command/admin/ratelimit/ResetApiLimitCmd.java | 99 +++++++ .../api/command/user/ratelimit/GetApiLimitCmd.java | 89 ++++++ .../cloudstack/api/response/ApiLimitResponse.java | 82 ++++++ .../cloudstack/ratelimit/ApiRateLimitService.java | 37 +++ .../ratelimit/ApiRateLimitServiceImpl.java | 196 +++++++++++++ .../cloudstack/ratelimit/EhcacheLimitStore.java | 99 +++++++ .../apache/cloudstack/ratelimit/LimitStore.java | 51 ++++ .../apache/cloudstack/ratelimit/StoreEntry.java | 33 ++ .../cloudstack/ratelimit/StoreEntryImpl.java | 64 ++++ .../cloudstack/ratelimit/ApiRateLimitTest.java | 226 +++++++++++++++ .../cloudstack/ratelimit/integration/APITest.java | 211 ++++++++++++++ .../ratelimit/integration/LoginResponse.java | 142 +++++++++ .../integration/RateLimitIntegrationTest.java | 214 ++++++++++++++ plugins/pom.xml | 1 + server/src/com/cloud/api/ApiServer.java | 11 + server/src/com/cloud/api/ApiServlet.java | 6 +- server/src/com/cloud/configuration/Config.java | 1 - server/test/com/cloud/api/APITest.java | 39 ++- server/test/com/cloud/api/ListPerfTest.java | 9 +- .../utils/exception/CSExceptionErrorCode.java | 1 + 27 files changed, 1737 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
