cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject [50/50] git commit: updated refs/heads/marvin to df58f51
Date Wed, 29 Jan 2014 08:54:25 GMT
Merge remote-tracking branch 'origin/master' into marvin


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

Branch: refs/heads/marvin
Commit: df58f51e33183912b320742a5006a16bdcbab87f
Parents: dedd41e 1c4bbec
Author: Girish Shilamkar <girish@clogeny.com>
Authored: Wed Jan 29 14:20:04 2014 +0530
Committer: Girish Shilamkar <girish@clogeny.com>
Committed: Wed Jan 29 14:20:04 2014 +0530

----------------------------------------------------------------------
 LICENSE.header                                  |   10 +-
 agent/conf/agent.properties                     |    4 +
 .../cloudstack/api-config/module.properties     |   18 +
 .../api-config/spring-api-config-context.xml    |   32 +
 api/src/com/cloud/agent/api/to/IpAddressTO.java |   17 +
 api/src/com/cloud/network/Network.java          |    2 +-
 api/src/com/cloud/network/NetworkService.java   |    2 +-
 api/src/com/cloud/network/Networks.java         |   17 +-
 api/src/com/cloud/network/PhysicalNetwork.java  |    2 +-
 .../network/VirtualNetworkApplianceService.java |    2 +-
 .../com/cloud/network/rules/FirewallRule.java   |    3 +-
 api/src/com/cloud/network/vpc/StaticRoute.java  |    3 +-
 api/src/com/cloud/server/ResourceTag.java       |   38 +-
 api/src/com/cloud/vm/UserVmService.java         |    8 +
 api/src/com/cloud/vm/VirtualMachine.java        |    1 +
 .../org/apache/cloudstack/api/ApiConstants.java |    1 +
 api/src/org/apache/cloudstack/api/BaseCmd.java  |    9 +-
 .../apache/cloudstack/api/IdentityService.java  |   23 -
 .../command/admin/usage/AddTrafficTypeCmd.java  |   14 +-
 .../api/command/admin/vm/GetVMUserDataCmd.java  |   81 +
 .../api/command/user/vm/AddIpToVmNicCmd.java    |    2 +-
 .../api/response/VMUserDataResponse.java        |   44 +
 .../config/ApiServiceConfiguration.java         |   40 +
 awsapi/pom.xml                                  |   15 +-
 .../bridge/service/core/ec2/EC2Engine.java      |   10 +-
 .../classes/resources/messages.properties       |    4 +-
 .../classes/resources/messages_es.properties    |   66 +-
 .../classes/resources/messages_fr_FR.properties |    2 +
 .../classes/resources/messages_ja.properties    | 1599 ------------
 .../classes/resources/messages_ja_JP.properties | 1599 ++++++++++++
 .../classes/resources/messages_nl_NL.properties | 1216 ++++++++++
 .../classes/resources/messages_pl.properties    |  469 ++++
 .../classes/resources/messages_pt_BR.properties |   36 +
 client/tomcatconf/commands.properties.in        |    1 +
 .../com/cloud/agent/api/GetVmConfigAnswer.java  |   68 +
 .../com/cloud/agent/api/GetVmConfigCommand.java |   46 +
 .../agent/api/ModifyVmNicConfigAnswer.java      |   36 +
 .../agent/api/ModifyVmNicConfigCommand.java     |   42 +
 .../api/routing/NetworkElementCommand.java      |   13 +-
 .../virtualnetwork/VirtualRouterDeployer.java   |   27 +
 .../virtualnetwork/VirtualRoutingResource.java  | 1036 +++-----
 core/src/com/cloud/agent/transport/Request.java |   28 +-
 debian/control                                  |    6 +-
 deps/XenServerJava/pom.xml                      |    2 +-
 .../src/com/cloud/vm/VmWorkConstants.java       |    1 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java |  232 +-
 .../cloud/vm/VirtualMachinePowerStateSync.java  |    2 +
 .../vm/VirtualMachinePowerStateSyncImpl.java    |   21 +-
 .../src/com/cloud/vm/VmWorkJobDispatcher.java   |   49 +-
 .../orchestration/VolumeOrchestrator.java       |   26 +
 .../spring-engine-schema-core-daos-context.xml  |    1 -
 .../com/cloud/upgrade/dao/Upgrade410to420.java  |  170 --
 .../com/cloud/upgrade/dao/Upgrade421to430.java  |  218 ++
 .../com/cloud/upgrade/dao/Upgrade430to440.java  |  144 ++
 .../src/com/cloud/vm/dao/NicSecondaryIpDao.java |    2 +
 .../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java |   13 +
 .../src/com/cloud/vm/dao/VMInstanceDao.java     |    2 +
 .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java |  117 +-
 .../storage/image/TemplateServiceImpl.java      |    8 +
 engine/storage/integration-test/pom.xml         |    2 -
 .../image/datastore/ImageStoreHelper.java       |    9 +-
 .../image/db/ImageStoreDetailsDaoImpl.java      |    9 +-
 .../storage/volume/VolumeServiceImpl.java       |    6 +-
 .../src/com/cloud/cluster/ClusterManager.java   |    1 -
 .../com/cloud/cluster/ClusterManagerImpl.java   |    2 +-
 .../framework/config/ConfigDepot.java           |    4 +
 .../framework/config/impl/ConfigDepotImpl.java  |   60 +-
 .../src/com/cloud/utils/db/GenericDaoBase.java  |   38 +-
 .../com/cloud/utils/db/GenericDaoBaseTest.java  |  134 +
 .../framework/messagebus/MessageDispatcher.java |   62 +-
 .../jobs/AsyncJobExecutionContext.java          |   48 +-
 .../framework/jobs/dao/VmWorkJobDao.java        |    2 +
 .../framework/jobs/dao/VmWorkJobDaoImpl.java    |   93 +-
 .../jobs/impl/AsyncJobManagerImpl.java          |    4 +-
 framework/security/pom.xml                      |    8 +-
 .../spring-framework-security-core-context.xml  |    1 +
 .../framework/security/keys/KeysManager.java    |   38 +
 .../security/keys/KeysManagerImpl.java          |  127 +
 framework/spring/module/pom.xml                 |    1 +
 packaging/centos63/cloud.spec                   |    9 +-
 .../AgentShell/AgentService.Designer.cs         |    2 +-
 .../ServerResource/AgentShell/AgentService.cs   |    2 +-
 .../DotNet/ServerResource/AgentShell/App.config |    9 +-
 .../HypervResource/CloudStackTypes.cs           |   55 +-
 .../HypervResource/HypervResourceController.cs  |  180 +-
 .../HypervResource/IWmiCallsV2.cs               |    1 +
 .../ServerResource/HypervResource/Utils.cs      |   10 +
 .../ServerResource/HypervResource/WmiCallsV2.cs |   62 +
 plugins/hypervisors/hyperv/pom.xml              |    1 -
 .../hypervisor/hyperv/guru/HypervGuru.java      |  113 +
 .../hyperv/manager/HypervManager.java           |    1 +
 .../hyperv/manager/HypervManagerImpl.java       |   20 +-
 .../resource/HypervDirectConnectResource.java   |  401 ++-
 plugins/hypervisors/kvm/pom.xml                 |    2 -
 .../kvm/resource/LibvirtComputingResource.java  |  354 ++-
 .../hypervisor/kvm/resource/LibvirtVMDef.java   |    2 +
 .../kvm/storage/LibvirtStorageAdaptor.java      |   68 +-
 .../kvm/resource/LibvirtSecretDefTest.java      |   55 +
 .../kvm/resource/LibvirtStoragePoolDefTest.java |   84 +
 .../kvm/resource/LibvirtVMDefTest.java          |   25 +
 .../agent/manager/MockAgentManagerImpl.java     |    7 +
 .../cloud/hypervisor/vmware/LegacyZoneVO.java   |   10 +-
 .../hypervisor/vmware/VmwareCleanupMaid.java    |   11 -
 .../hypervisor/vmware/VmwareDatacenterVO.java   |   16 +-
 .../vmware/VmwareDatacenterZoneMapVO.java       |    2 +
 .../vmware/VmwareServerDiscoverer.java          |   30 +-
 .../vmware/manager/VmwareHostService.java       |    9 +-
 .../vmware/manager/VmwareManagerImpl.java       |   62 +-
 .../manager/VmwareStorageManagerImpl.java       |  170 +-
 .../vmware/resource/VmwareResource.java         | 2283 ++++--------------
 .../cloud/network/CiscoNexusVSMDeviceVO.java    |   38 +-
 .../network/element/CiscoNexusVSMElement.java   |    2 -
 .../VmwareSecondaryStorageResourceHandler.java  |   54 +-
 .../resource/VmwareStorageProcessor.java        |   44 +-
 .../motion/VmwareStorageMotionStrategy.java     |    6 +-
 .../vmware/resource/VmwareResourceTest.java     |    2 +-
 .../motion/VmwareStorageMotionStrategyTest.java |   15 +-
 plugins/hypervisors/xen/pom.xml                 |    2 -
 .../src/com/cloud/hypervisor/XenServerGuru.java |    6 +-
 .../xen/discoverer/XcpServerDiscoverer.java     |   11 +-
 .../xen/resource/CitrixResourceBase.java        | 1554 +++---------
 .../xen/resource/XenServer56Resource.java       |   44 +-
 .../xen/resource/XenServerConnectionPool.java   |  442 +---
 .../xen/resource/XenServerStorageProcessor.java |   16 +-
 .../motion/XenServerStorageMotionStrategy.java  |    8 +-
 .../resources/components-example.xml            |    1 -
 .../lb/ElasticLoadBalancerManagerImpl.java      |    9 +-
 .../network-elements/juniper-contrail/pom.xml   |    8 +-
 .../cloudstack/contrail/module.properties       |   18 +
 .../contrail/spring-contrail-context.xml        |   50 +
 .../management/ContrailElementImpl.java         |   82 +-
 .../contrail/management/ContrailGuru.java       |   53 +-
 .../contrail/management/ContrailManager.java    |   25 +-
 .../management/ContrailManagerImpl.java         |  254 +-
 .../contrail/management/ModelDatabase.java      |   22 +-
 .../contrail/management/ServerDBSyncImpl.java   |  214 +-
 .../management/ServerEventHandlerImpl.java      |   10 -
 .../contrail/management/ServiceManagerImpl.java |   24 +-
 .../contrail/model/NetworkPolicyModel.java      |  305 +++
 .../contrail/model/ServiceInstanceModel.java    |  116 +-
 .../contrail/model/VirtualMachineModel.java     |   38 +-
 .../contrail/model/VirtualNetworkModel.java     |   84 +-
 .../IntegrationTestConfiguration.java           |   78 +-
 .../management/ManagementServerMock.java        |   16 +-
 .../contrail/management/MockAccountManager.java |    3 -
 .../management/NetworkProviderTest.java         |    2 +-
 .../test/resources/commonContext.xml            |  126 +-
 .../network/resource/JuniperSrxResource.java    |    2 +-
 plugins/network-elements/nicira-nvp/pom.xml     |   45 +-
 .../META-INF/cloudstack/nvp/module.properties   |    3 +
 .../cloudstack/nvp/spring-nvp-context.xml       |   30 +-
 ...ortForwardingRulesOnLogicalRouterAnswer.java |    3 +
 ...rtForwardingRulesOnLogicalRouterCommand.java |    3 +
 ...ConfigurePublicIpsOnLogicalRouterAnswer.java |    3 +
 ...onfigurePublicIpsOnLogicalRouterCommand.java |    3 +
 ...gureStaticNatRulesOnLogicalRouterAnswer.java |    3 +
 ...ureStaticNatRulesOnLogicalRouterCommand.java |    3 +
 .../agent/api/CreateLogicalRouterAnswer.java    |    3 +
 .../agent/api/CreateLogicalRouterCommand.java   |    3 +
 .../agent/api/CreateLogicalSwitchAnswer.java    |    3 +
 .../agent/api/CreateLogicalSwitchCommand.java   |    3 +
 .../api/CreateLogicalSwitchPortAnswer.java      |    3 +
 .../api/CreateLogicalSwitchPortCommand.java     |    3 +
 .../agent/api/DeleteLogicalRouterAnswer.java    |    3 +
 .../agent/api/DeleteLogicalRouterCommand.java   |    3 +
 .../agent/api/DeleteLogicalSwitchAnswer.java    |    3 +
 .../agent/api/DeleteLogicalSwitchCommand.java   |    3 +
 .../api/DeleteLogicalSwitchPortAnswer.java      |    3 +
 .../api/DeleteLogicalSwitchPortCommand.java     |    3 +
 .../agent/api/FindLogicalSwitchPortAnswer.java  |    3 +
 .../agent/api/FindLogicalSwitchPortCommand.java |    3 +
 .../agent/api/StartupNiciraNvpCommand.java      |    3 +
 .../api/UpdateLogicalSwitchPortAnswer.java      |    3 +
 .../api/UpdateLogicalSwitchPortCommand.java     |    3 +
 .../api/commands/AddNiciraNvpDeviceCmd.java     |    3 +
 .../api/commands/DeleteNiciraNvpDeviceCmd.java  |    3 +
 .../ListNiciraNvpDeviceNetworksCmd.java         |    3 +
 .../api/commands/ListNiciraNvpDevicesCmd.java   |    3 +
 .../api/response/NiciraNvpDeviceResponse.java   |    3 +
 .../com/cloud/network/NiciraNvpDeviceVO.java    |    3 +
 .../cloud/network/NiciraNvpNicMappingVO.java    |    3 +
 .../cloud/network/NiciraNvpRouterMappingVO.java |    3 +
 .../src/com/cloud/network/dao/NiciraNvpDao.java |    3 +
 .../com/cloud/network/dao/NiciraNvpDaoImpl.java |    3 +
 .../network/dao/NiciraNvpNicMappingDao.java     |    3 +
 .../network/dao/NiciraNvpNicMappingDaoImpl.java |    3 +
 .../network/dao/NiciraNvpRouterMappingDao.java  |    3 +
 .../dao/NiciraNvpRouterMappingDaoImpl.java      |    3 +
 .../cloud/network/element/NiciraNvpElement.java |    3 +
 .../element/NiciraNvpElementService.java        |    3 +
 .../network/guru/NiciraNvpGuestNetworkGuru.java |    3 +
 .../network/nicira/AccessConfiguration.java     |    3 +
 .../com/cloud/network/nicira/AccessRule.java    |    3 +
 .../src/com/cloud/network/nicira/Acl.java       |    3 +
 .../src/com/cloud/network/nicira/AclRule.java   |    3 +
 .../com/cloud/network/nicira/Attachment.java    |    3 +
 .../network/nicira/ControlClusterStatus.java    |    3 +
 .../network/nicira/DestinationNatRule.java      |    3 +
 .../network/nicira/L3GatewayAttachment.java     |    3 +
 .../network/nicira/LogicalRouterConfig.java     |    3 +
 .../cloud/network/nicira/LogicalRouterPort.java |    3 +
 .../com/cloud/network/nicira/LogicalSwitch.java |    3 +
 .../cloud/network/nicira/LogicalSwitchPort.java |    3 +
 .../src/com/cloud/network/nicira/Match.java     |    3 +
 .../src/com/cloud/network/nicira/NatRule.java   |    3 +
 .../com/cloud/network/nicira/NiciraNvpApi.java  |    9 +-
 .../network/nicira/NiciraNvpApiException.java   |    3 +
 .../com/cloud/network/nicira/NiciraNvpList.java |    3 +
 .../com/cloud/network/nicira/NiciraNvpTag.java  |    3 +
 .../cloud/network/nicira/PatchAttachment.java   |    3 +
 .../com/cloud/network/nicira/RouterNextHop.java |    3 +
 .../com/cloud/network/nicira/RoutingConfig.java |    3 +
 .../cloud/network/nicira/SecurityProfile.java   |    3 +
 .../com/cloud/network/nicira/SecurityRule.java  |    3 +
 .../SingleDefaultRouteImplictRoutingConfig.java |    3 +
 .../com/cloud/network/nicira/SourceNatRule.java |    3 +
 .../network/nicira/TransportZoneBinding.java    |    3 +
 .../com/cloud/network/nicira/VifAttachment.java |    3 +
 .../network/resource/NiciraNvpResource.java     |    3 +
 .../network/element/NiciraNvpElementTest.java   |    3 +
 .../guru/NiciraNvpGuestNetworkGuruTest.java     |    3 +
 .../com/cloud/network/nicira/NatRuleTest.java   |    3 +
 .../cloud/network/nicira/NiciraNvpApiIT.java    |    3 +
 .../cloud/network/nicira/NiciraNvpApiTest.java  |    3 +
 .../com/cloud/network/nicira/NiciraTagTest.java |    3 +
 .../network/resource/NiciraNvpResourceTest.java |    3 +
 .../nicira-nvp/test/resources/config.properties |    2 +
 plugins/network-elements/opendaylight/pom.xml   |   36 +-
 .../opendaylight/OpendaylightElement.java       |   10 +-
 .../OpendaylightGuestNetworkGuru.java           |   10 +-
 .../agent/OpenDaylightControllerResource.java   |   10 +-
 .../OpenDaylightControllerResourceManager.java  |   10 +-
 ...enDaylightControllerResourceManagerImpl.java |   10 +-
 .../agent/commands/AddHypervisorCommand.java    |   10 +-
 .../agent/commands/ConfigureNetworkCommand.java |   10 +-
 .../agent/commands/ConfigurePortCommand.java    |   10 +-
 .../agent/commands/DestroyNetworkCommand.java   |   10 +-
 .../agent/commands/DestroyPortCommand.java      |   10 +-
 .../StartupOpenDaylightControllerCommand.java   |   10 +-
 .../agent/responses/AddHypervisorAnswer.java    |   10 +-
 .../agent/responses/ConfigureNetworkAnswer.java |   10 +-
 .../agent/responses/ConfigurePortAnswer.java    |   10 +-
 .../agent/responses/DestroyNetworkAnswer.java   |   10 +-
 .../agent/responses/DestroyPortAnswer.java      |   10 +-
 .../api/NeutronInvalidCredentialsException.java |   10 +-
 .../opendaylight/api/NeutronRestApi.java        |   10 +-
 .../api/NeutronRestApiException.java            |   10 +-
 .../opendaylight/api/NeutronRestFactory.java    |   10 +-
 .../commands/AddOpenDaylightControllerCmd.java  |   10 +-
 .../DeleteOpenDaylightControllerCmd.java        |   10 +-
 .../ListOpenDaylightControllersCmd.java         |   10 +-
 .../api/enums/NeutronNorthboundEnum.java        |   10 +-
 .../opendaylight/api/model/NeutronNetwork.java  |   10 +-
 .../api/model/NeutronNetworkWrapper.java        |   10 +-
 .../api/model/NeutronNetworksList.java          |   10 +-
 .../opendaylight/api/model/NeutronNode.java     |   10 +-
 .../api/model/NeutronNodeWrapper.java           |   10 +-
 .../api/model/NeutronNodesList.java             |   10 +-
 .../opendaylight/api/model/NeutronPort.java     |   10 +-
 .../api/model/NeutronPortWrapper.java           |   10 +-
 .../api/model/NeutronPortsList.java             |   10 +-
 .../opendaylight/api/resources/Action.java      |   14 +-
 .../NeutronNetworksNorthboundAction.java        |   10 +-
 .../resources/NeutronNodesNorthboundAction.java |   10 +-
 .../resources/NeutronPortsNorthboundAction.java |   10 +-
 .../OpenDaylightControllerResponse.java         |   10 +-
 .../dao/OpenDaylightControllerMappingDao.java   |   10 +-
 .../OpenDaylightControllerMappingDaoImpl.java   |   10 +-
 .../dao/OpenDaylightControllerVO.java           |   10 +-
 .../cloudstack/opendaylight/module.properties   |   10 +-
 .../spring-opendaylight-context.xml             |   10 +-
 .../opendaylight/api/test/NeutronEnumsTest.java |   10 +-
 .../api/test/NeutronNetworkAdapterTest.java     |   10 +-
 .../api/test/NeutronNodeAdapterTest.java        |   10 +-
 .../api/test/NeutronPortAdapterTest.java        |   10 +-
 .../opendaylight/api/test/NeutronRestApiIT.java |   10 +-
 .../api/test/NeutronRestApiTest.java            |   10 +-
 .../network-elements/stratosphere-ssp/pom.xml   |    2 +-
 plugins/pom.xml                                 |    1 +
 .../CloudStackImageStoreLifeCycleImpl.java      |   30 +-
 plugins/storage/volume/nexenta/pom.xml          |   47 +
 .../module.properties                           |   18 +
 .../spring-storage-volume-nexenta-context.xml   |   32 +
 .../driver/NexentaPrimaryDataStoreDriver.java   |  194 ++
 .../NexentaPrimaryDataStoreLifeCycle.java       |  176 ++
 .../datastore/provider/NexentaHostListener.java |   35 +
 .../NexentaPrimaryDataStoreProvider.java        |   81 +
 .../datastore/util/NexentaNmsClient.java        |  229 ++
 .../storage/datastore/util/NexentaNmsUrl.java   |   85 +
 .../datastore/util/NexentaStorAppliance.java    |  418 ++++
 .../storage/datastore/util/NexentaUtil.java     |  242 ++
 .../util/NexentaStorApplianceTest.java          |  337 +++
 .../storage/datastore/util/NexentaUtilTest.java |  135 ++
 .../driver/SolidfirePrimaryDataStoreDriver.java |    7 +
 .../cloudstack/ldap/LdapAuthenticator.java      |   15 +-
 .../cloud/server/auth/MD5UserAuthenticator.java |    9 +-
 .../server/auth/PlainTextUserAuthenticator.java |    9 +-
 .../auth/SHA256SaltedUserAuthenticator.java     |   10 +-
 .../server/auth/test/AuthenticatorTest.java     |   10 +-
 pom.xml                                         |  225 +-
 scripts/network/domr/bumpUpPriority.sh          |   47 -
 scripts/network/domr/call_dnsmasq.sh            |   27 -
 scripts/network/domr/call_firewall.sh           |   70 -
 scripts/network/domr/call_loadbalancer.sh       |  101 -
 scripts/network/domr/createipAlias.sh           |   26 -
 scripts/network/domr/deleteipAlias.sh           |   25 -
 scripts/network/domr/dhcp_entry.sh              |   82 -
 scripts/network/domr/s2s_vpn.sh                 |   29 -
 scripts/network/domr/save_password_to_domr.sh   |   73 -
 scripts/vm/hypervisor/xenserver/vhd-util        |  Bin 318977 -> 0 bytes
 scripts/vm/hypervisor/xenserver/vmops           |  128 +-
 scripts/vm/network/security_group.py            |    2 +-
 server/pom.xml                                  |    1 -
 .../spring-server-core-managers-context.xml     |    4 -
 server/src/com/cloud/acl/DomainChecker.java     |    4 +-
 .../impl/UserConcentratedAllocator.java         |   47 +-
 server/src/com/cloud/api/ApiDBUtils.java        |    8 -
 server/src/com/cloud/api/ApiDispatcher.java     |    2 +-
 server/src/com/cloud/api/ApiResponseHelper.java |   18 +-
 .../src/com/cloud/api/ApiSerializerHelper.java  |    2 +-
 server/src/com/cloud/api/ApiServer.java         |   36 +-
 server/src/com/cloud/api/ApiServlet.java        |    2 +-
 .../com/cloud/api/EncodedStringTypeAdapter.java |    2 +-
 server/src/com/cloud/api/doc/Alert.java         |   12 +-
 server/src/com/cloud/api/doc/Command.java       |   11 +-
 .../com/cloud/api/query/ViewResponseHelper.java |    3 +-
 .../api/query/dao/ImageStoreJoinDaoImpl.java    |   28 +-
 .../api/query/dao/StoragePoolJoinDaoImpl.java   |   13 +-
 .../api/query/dao/TemplateJoinDaoImpl.java      |   14 +-
 .../cloud/api/query/dao/UserVmJoinDaoImpl.java  |    6 +-
 .../com/cloud/api/query/vo/UserVmJoinVO.java    |   32 +-
 .../api/response/ApiResponseSerializer.java     |    2 +-
 server/src/com/cloud/configuration/Config.java  |    7 +-
 .../configuration/ConfigurationManagerImpl.java |   10 +-
 .../AgentBasedConsoleProxyManager.java          |   12 +-
 .../com/cloud/consoleproxy/AgentHookBase.java   |   32 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java   |   84 +-
 .../src/com/cloud/dc/DedicatedResourceVO.java   |   15 +-
 .../deploy/DeploymentPlanningManagerImpl.java   |   31 +-
 .../src/com/cloud/event/ActionEventUtils.java   |    5 +-
 .../kvm/discoverer/LibvirtServerDiscoverer.java |   13 -
 .../network/ExternalIpAddressAllocator.java     |    9 +-
 .../com/cloud/network/IpAddressManagerImpl.java |   60 +-
 .../src/com/cloud/network/NetworkModelImpl.java |    7 +-
 .../com/cloud/network/NetworkServiceImpl.java   |   24 +-
 .../cloud/network/guru/ControlNetworkGuru.java  |    4 +-
 .../cloud/network/guru/PublicNetworkGuru.java   |   14 +-
 .../VirtualNetworkApplianceManagerImpl.java     |   23 +-
 .../security/SecurityGroupManagerImpl.java      |    7 +-
 .../com/cloud/network/vpc/VpcManagerImpl.java   |    4 +-
 .../com/cloud/projects/ProjectManagerImpl.java  |    1 +
 .../resourcelimit/ResourceLimitManagerImpl.java |    2 +-
 .../cloud/server/ConfigurationServerImpl.java   |    9 +-
 .../src/com/cloud/server/ManagementServer.java  |   11 +-
 .../com/cloud/server/ManagementServerImpl.java  |   80 +-
 server/src/com/cloud/server/StatsCollector.java |   10 +-
 .../cloud/server/auth/UserAuthenticator.java    |    8 +-
 .../cloud/servlet/ConsoleProxyClientParam.java  |   45 +-
 .../com/cloud/servlet/ConsoleProxyServlet.java  |   90 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java |  119 +-
 .../secondary/SecondaryStorageManagerImpl.java  |    6 +-
 .../secondary/SecondaryStorageVmManager.java    |    2 +-
 .../cloud/tags/TaggedResourceManagerImpl.java   |  277 +--
 .../com/cloud/template/TemplateAdapterBase.java |    8 +-
 .../com/cloud/template/TemplateManagerImpl.java |    4 +-
 server/src/com/cloud/test/IPRangeConfig.java    |   29 +-
 .../src/com/cloud/user/AccountManagerImpl.java  |   29 +-
 .../cloud/uuididentity/IdentityServiceImpl.java |   44 -
 .../com/cloud/uuididentity/dao/IdentityDao.java |   38 -
 .../cloud/uuididentity/dao/IdentityDaoImpl.java |  241 --
 .../com/cloud/uuididentity/dao/IdentityVO.java  |   25 -
 server/src/com/cloud/vm/UserVmManagerImpl.java  |   44 +-
 .../vm/snapshot/VMSnapshotManagerImpl.java      |   81 +-
 .../com/cloud/vpc/MockNetworkManagerImpl.java   |    4 +-
 server/test/resources/network-mgr-component.xml |    1 -
 services/console-proxy-rdp/rdpconsole/pom.xml   |    1 -
 .../main/java/common/BufferedImageCanvas.java   |    6 +-
 .../java/common/adapter/AwtCanvasAdapter.java   |    4 +-
 .../src/main/java/rdpclient/RdpClient.java      |   15 +-
 .../adapter/AwtRdpKeyboardAdapter.java          |    2 +-
 services/console-proxy/server/pom.xml           |    5 +
 .../com/cloud/consoleproxy/ConsoleProxy.java    |   20 +-
 .../consoleproxy/ConsoleProxyAjaxHandler.java   |    6 +
 .../consoleproxy/ConsoleProxyClientParam.java   |   32 +-
 .../ConsoleProxyHttpHandlerHelper.java          |   34 +-
 .../consoleproxy/ConsoleProxyRdpClient.java     |  322 +++
 .../cloud/consoleproxy/rdp/KeysymToKeycode.java |  138 ++
 .../rdp/RdpBufferedImageCanvas.java             |  103 +
 .../resource/NfsSecondaryStorageResource.java   |    9 +-
 setup/db/db/schema-421to430.sql                 |  225 +-
 setup/db/db/schema-430to440.sql                 |    5 +-
 setup/db/templates.simulator.sql                |    8 +-
 setup/db/templates.sql                          |    2 +-
 .../debian/config/etc/init.d/cloud-early-config |    6 +-
 .../config/opt/cloud/bin/bumpup_priority.sh     |   19 +
 .../config/opt/cloud/bin/createIpAlias.sh       |  100 +
 .../config/opt/cloud/bin/deleteIpAlias.sh       |   60 +
 .../debian/config/opt/cloud/bin/dnsmasq.sh      |  130 +
 .../debian/config/opt/cloud/bin/edithosts.sh    |  234 ++
 .../config/opt/cloud/bin/firewall_egress.sh     |  187 ++
 .../config/opt/cloud/bin/firewall_ingress.sh    |  202 ++
 .../debian/config/opt/cloud/bin/firewall_nat.sh |  358 +++
 .../debian/config/opt/cloud/bin/ipassoc.sh      |    3 +-
 .../debian/config/opt/cloud/bin/loadbalancer.sh |  320 +++
 .../debian/config/root/bumpup_priority.sh       |   19 -
 .../patches/debian/config/root/createIpAlias.sh |  100 -
 .../patches/debian/config/root/deleteIpAlias.sh |   60 -
 systemvm/patches/debian/config/root/dnsmasq.sh  |  130 -
 .../patches/debian/config/root/edithosts.sh     |  234 --
 systemvm/patches/debian/config/root/firewall.sh |  358 ---
 .../debian/config/root/firewallRule_egress.sh   |  187 --
 .../patches/debian/config/root/firewall_rule.sh |  202 --
 .../patches/debian/config/root/loadbalancer.sh  |  320 ---
 systemvm/patches/debian/config/root/userdata.py |   92 -
 systemvm/patches/debian/config/root/userdata.sh |  165 --
 systemvm/pom.xml                                |    3 -
 tools/appliance/build.sh                        |   14 +-
 tools/appliance/convert/Convert.class           |  Bin 0 -> 984 bytes
 tools/appliance/convert/Convert.java            |   36 +
 tools/appliance/convert_ovf_vbox_to_esx.xslt    |   42 +
 tools/marvin/pom.xml                            |   14 +-
 tools/transifex/.tx/config                      |    4 +-
 tools/transifex/sync-transifex-ui.sh            |    2 +-
 ui/css/cloudstack3.css                          |    1 -
 ui/images/infrastructure-icons.png              |  Bin 62257 -> 62059 bytes
 ui/index.jsp                                    |    4 +-
 ui/scripts/instanceWizard.js                    |    6 +-
 ui/scripts/instances.js                         |   31 +-
 ui/scripts/network.js                           |   24 +-
 ui/scripts/plugins.js                           |   49 +-
 ui/scripts/sharedFunctions.js                   |    4 +-
 ui/scripts/system.js                            |  113 +-
 ui/scripts/ui-custom/zoneWizard.js              |    5 +-
 ui/scripts/ui/widgets/cloudBrowser.js           |   11 +-
 ui/scripts/ui/widgets/listView.js               |   10 +-
 ui/tests/index.html                             |   71 +-
 ui/tests/test.cloudBrowser.js                   |  116 -
 ui/tests/test.core.js                           |   79 -
 ui/tests/test.detailView.js                     |  799 ------
 ui/tests/test.listView.js                       |  527 ----
 ui/tests/test.multiEdit.js                      |   55 -
 ui/tests/test.notifications.js                  |  107 -
 ui/tests/test.widget.listView.js                |  245 ++
 utils/src/com/cloud/utils/ExecutionResult.java  |   44 +
 utils/src/com/cloud/utils/net/NetUtils.java     |   13 +-
 .../cloud/utils/script/OutputInterpreter.java   |    4 +-
 utils/src/com/cloud/utils/script/Script.java    |   15 +-
 .../cloud/hypervisor/vmware/mo/ClusterMO.java   |   28 +-
 .../vmware/mo/CustomFieldsManagerMO.java        |    2 +-
 .../cloud/hypervisor/vmware/mo/DatastoreMO.java |    9 +-
 .../vmware/mo/DistributedVirtualSwitchMO.java   |    3 +-
 .../vmware/mo/HostDatastoreSystemMO.java        |    2 +-
 .../vmware/mo/HostFirewallSystemMO.java         |    1 +
 .../com/cloud/hypervisor/vmware/mo/HostMO.java  |   52 +-
 .../vmware/mo/HostNetworkSystemMO.java          |    1 +
 .../vmware/mo/HypervisorHostHelper.java         |   54 +-
 .../vmware/mo/LicenseAssignmentManagerMO.java   |    4 +-
 .../hypervisor/vmware/mo/LicenseManagerMO.java  |    1 +
 .../cloud/hypervisor/vmware/mo/NetworkMO.java   |    2 +-
 .../hypervisor/vmware/mo/PerfManagerMO.java     |    6 +-
 .../vmware/mo/VirtualDiskManagerMO.java         |    3 +-
 .../hypervisor/vmware/mo/VirtualMachineMO.java  |   75 +-
 .../hypervisor/vmware/util/VmwareClient.java    |   10 +-
 .../hypervisor/vmware/util/VmwareContext.java   |   15 +-
 .../vmware/util/VmwareContextPool.java          |   35 -
 .../vmware/util/VmwareGuestOsMapper.java        |    4 +
 .../hypervisor/vmware/util/VmwareHelper.java    |   87 +-
 467 files changed, 15951 insertions(+), 13117 deletions(-)
----------------------------------------------------------------------



Mime
View raw message