Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C6D74E01E for ; Wed, 6 Feb 2013 23:28:09 +0000 (UTC) Received: (qmail 16932 invoked by uid 500); 6 Feb 2013 23:28:07 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 16840 invoked by uid 500); 6 Feb 2013 23:28:07 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 16156 invoked by uid 99); 6 Feb 2013 23:28:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Feb 2013 23:28:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BCEB12465B; Wed, 6 Feb 2013 23:28:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [15/23] git commit: refs/heads/vim51_win8 - Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack Message-Id: <20130206232806.BCEB12465B@tyr.zones.apache.org> Date: Wed, 6 Feb 2013 23:28:06 +0000 (UTC) Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6e4aeead Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6e4aeead Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6e4aeead Branch: refs/heads/vim51_win8 Commit: 6e4aeeadf4b3ab88afc7e2e5035bad3948b6a04f Parents: 944f7b0 44316f7 Author: Pranav Saxena Authored: Wed Feb 6 20:18:15 2013 +0530 Committer: Pranav Saxena Committed: Wed Feb 6 20:18:15 2013 +0530 ---------------------------------------------------------------------- api/src/com/cloud/dao/EntityManager.java | 10 + api/src/com/cloud/network/NetworkModel.java | 2 + api/src/com/cloud/network/NetworkUsageService.java | 37 ++ api/src/org/apache/cloudstack/api/BaseCmd.java | 4 + .../apache/cloudstack/api/ResponseGenerator.java | 7 + .../command/admin/usage/AddTrafficMonitorCmd.java | 107 +++++ .../admin/usage/DeleteTrafficMonitorCmd.java | 84 ++++ .../admin/usage/GenerateUsageRecordsCmd.java | 89 ++++ .../command/admin/usage/GetUsageRecordsCmd.java | 126 +++++ .../admin/usage/ListTrafficMonitorsCmd.java | 84 ++++ .../api/command/admin/usage/ListUsageTypesCmd.java | 51 ++ .../cloudstack/api/response/AccountResponse.java | 6 +- api/src/org/apache/cloudstack/usage/Usage.java | 69 +++ .../org/apache/cloudstack/usage/UsageService.java | 64 +++ .../org/apache/cloudstack/usage/UsageTypes.java | 58 +++ .../WEB-INF/classes/resources/messages.properties | 6 + .../classes/resources/messages_fr_FR.properties | 6 + .../classes/resources/messages_ja.properties | 8 +- .../classes/resources/messages_pt_BR.properties | 6 + .../classes/resources/messages_ru_RU.properties | 8 + .../classes/resources/messages_zh_CN.properties | 6 + client/bindir/cloud-setup-management.in | 2 +- client/pom.xml | 2 +- client/tomcatconf/componentContext.xml.in | 6 +- client/tomcatconf/nonossComponentContext.xml.in | 12 +- core/src/com/cloud/storage/SnapshotVO.java | 10 +- .../change-network-offering-on-guest-network.xml | 4 +- docs/en-US/creating-network-offerings.xml | 4 +- docs/en-US/host-add.xml | 3 +- docs/en-US/network-offerings.xml | 2 +- docs/en-US/prepare-system-vm-template.xml | 29 +- ...pgrade-virtual-router-with-service-offering.xml | 5 +- packaging/centos63/cloud-management.rc | 8 +- packaging/centos63/cloud-management.sysconfig | 2 +- packaging/centos63/cloud.spec | 2 + packaging/centos63/replace.properties | 8 +- .../discovery/ApiDiscoveryServiceImpl.java | 16 +- .../cloudstack/discovery/ApiDiscoveryTest.java | 18 +- .../kvm/resource/LibvirtComputingResource.java | 47 +-- .../server/ManagementServerSimulatorImpl.java | 2 +- .../hypervisor/vmware/VmwareServerDiscoverer.java | 7 +- .../vmware/resource/VmwareContextFactory.java | 29 +- .../dns-notifier/resources/components-example.xml | 2 +- .../server/auth/PlainTextUserAuthenticator.java | 3 - scripts/storage/qcow2/resizevolume.sh | 2 +- scripts/vm/hypervisor/xenserver/vmops | 1 + server/src/com/cloud/api/ApiDBUtils.java | 14 +- server/src/com/cloud/api/ApiResponseHelper.java | 253 ++++++++++ server/src/com/cloud/api/ApiServer.java | 3 + .../cloud/api/commands/AddTrafficMonitorCmd.java | 109 ----- .../api/commands/DeleteTrafficMonitorCmd.java | 86 ---- .../api/commands/GenerateUsageRecordsCmd.java | 91 ---- .../com/cloud/api/commands/GetUsageRecordsCmd.java | 370 --------------- .../cloud/api/commands/ListTrafficMonitorsCmd.java | 86 ---- .../com/cloud/api/commands/ListUsageTypesCmd.java | 53 -- server/src/com/cloud/configuration/Config.java | 3 +- server/src/com/cloud/dao/EntityManagerImpl.java | 7 +- .../com/cloud/network/Ipv6AddressManagerImpl.java | 46 ++- server/src/com/cloud/network/NetworkModelImpl.java | 19 +- .../src/com/cloud/network/NetworkServiceImpl.java | 12 +- .../src/com/cloud/network/NetworkUsageManager.java | 14 - .../com/cloud/network/NetworkUsageManagerImpl.java | 20 +- .../com/cloud/resource/ResourceManagerImpl.java | 72 +-- .../src/com/cloud/server/ManagementServerExt.java | 63 --- .../com/cloud/server/ManagementServerExtImpl.java | 254 ---------- .../src/com/cloud/server/ManagementServerImpl.java | 3 +- server/src/com/cloud/usage/UsageServiceImpl.java | 261 ++++++++++ server/src/com/cloud/usage/UsageTypes.java | 58 --- server/src/com/cloud/usage/UsageVO.java | 23 +- .../cloudstack/region/RegionManagerImpl.java | 2 + .../cloudstack/region/RegionServiceImpl.java | 2 + .../com/cloud/network/MockNetworkModelImpl.java | 5 + .../test/com/cloud/vpc/MockNetworkModelImpl.java | 6 + tools/appliance/.rvmrc | 24 + tools/appliance/Gemfile | 20 + tools/appliance/README.md | 52 ++ .../appliance/definitions/systemvmtemplate/base.sh | 42 ++ .../definitions/systemvmtemplate/cleanup.sh | 34 ++ .../definitions/systemvmtemplate/definition.rb | 60 +++ .../definitions/systemvmtemplate/preseed.cfg | 332 +++++++++++++ .../definitions/systemvmtemplate/zerodisk.sh | 20 + tools/cli/cloudmonkey/cloudmonkey.py | 4 +- ui/css/cloudstack3.css | 2 + ui/dictionary.jsp | 6 +- ui/scripts/storage.js | 99 ++++ usage/src/com/cloud/usage/UsageManagerImpl.java | 1 + .../cloud/usage/parser/IPAddressUsageParser.java | 2 +- .../usage/parser/LoadBalancerUsageParser.java | 2 +- .../usage/parser/NetworkOfferingUsageParser.java | 2 +- .../com/cloud/usage/parser/NetworkUsageParser.java | 2 +- .../usage/parser/PortForwardingUsageParser.java | 2 +- .../usage/parser/SecurityGroupUsageParser.java | 2 +- .../com/cloud/usage/parser/StorageUsageParser.java | 2 +- .../cloud/usage/parser/VMInstanceUsageParser.java | 2 +- .../com/cloud/usage/parser/VPNUserUsageParser.java | 2 +- .../com/cloud/usage/parser/VolumeUsageParser.java | 2 +- .../cloud/utils/component/ComponentContext.java | 8 + .../utils/crypt/EncryptionSecretKeyChecker.java | 10 +- utils/src/com/cloud/utils/db/Transaction.java | 8 +- utils/src/com/cloud/utils/net/NetUtils.java | 84 +++- utils/test/com/cloud/utils/net/NetUtilsTest.java | 26 +- 101 files changed, 2428 insertions(+), 1423 deletions(-) ----------------------------------------------------------------------