incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [12/40] git commit: refs/heads/master - Merge branch 'master' into vim51_win8
Date Tue, 05 Mar 2013 02:09:46 GMT
Merge branch 'master' into vim51_win8


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b9cf5c21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b9cf5c21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b9cf5c21

Branch: refs/heads/master
Commit: b9cf5c2147018fcf1db49792f1f03c98c67755a9
Parents: a224287 f89dd90
Author: Min Chen <min.chen@citrix.com>
Authored: Tue Feb 5 14:40:53 2013 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Tue Feb 5 14:40:53 2013 -0800

----------------------------------------------------------------------
 agent/test/com/cloud/agent/TestAgentShell.java     |    2 +-
 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          |    5 +-
 client/tomcatconf/nonossComponentContext.xml.in    |   12 +-
 .../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 +-
 ...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 +-
 .../kvm/resource/LibvirtComputingResource.java     |   47 +--
 .../server/ManagementServerSimulatorImpl.java      |    2 +-
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |    5 +
 .../dns-notifier/resources/components-example.xml  |    2 +-
 scripts/storage/qcow2/resizevolume.sh              |    2 +-
 server/src/com/cloud/api/ApiDBUtils.java           |   14 +-
 server/src/com/cloud/api/ApiResponseHelper.java    |  253 ++++++++++
 server/src/com/cloud/api/ApiServer.java            |   23 +-
 server/src/com/cloud/api/ApiServlet.java           |    2 +-
 .../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 |   13 +-
 .../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 ----------
 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 +
 ui/css/cloudstack3.css                             |    2 +
 ui/dictionary.jsp                                  |    6 +-
 ui/scripts/storage.js                              |   99 ++++
 ui/scripts/ui/utils.js                             |    6 +-
 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 +-
 .../utils/crypt/EncryptionSecretKeyChecker.java    |   10 +-
 utils/src/com/cloud/utils/db/Transaction.java      |    8 +-
 utils/src/com/cloud/utils/net/NetUtils.java        |   34 ++
 utils/test/com/cloud/utils/net/NetUtilsTest.java   |   11 +
 94 files changed, 2305 insertions(+), 1381 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b9cf5c21/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
----------------------------------------------------------------------
diff --cc plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
index e0033b9,ddbce66..e3a8560
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
@@@ -95,7 -95,11 +96,11 @@@ public class VmwareServerDiscoverer ext
  	CiscoNexusVSMDeviceDao _nexusDao;
  	@Inject
      NetworkModel _netmgr;
 -	
 +
+ 	public VmwareServerDiscoverer() {
+ 		s_logger.info("VmwareServerDiscoverer is constructed");
+ 	}
+ 	
  	@Override
  	public Map<? extends ServerResource, Map<String, String>> find(long dcId,
  			Long podId, Long clusterId, URI url, String username,


Mime
View raw message