You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2014/01/30 23:41:41 UTC
[50/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Merge branch 'master' into ui-restyle
Conflicts:
client/WEB-INF/classes/resources/messages.properties
ui/dictionary.jsp
ui/scripts/ui-custom/accountsWizard.js
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/849d601c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/849d601c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/849d601c
Branch: refs/heads/ui-restyle
Commit: 849d601ccfed6ac9753957fda0bc6cbab96bba26
Parents: 326b3a6 b38c033
Author: Brian Federle <br...@citrix.com>
Authored: Thu Jan 30 14:40:22 2014 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Jan 30 14:40:22 2014 -0800
----------------------------------------------------------------------
.gitignore | 1 +
LICENSE.header | 16 +
agent/conf/agent.properties | 4 +
agent/pom.xml | 33 -
agent/src/com/cloud/agent/AgentShell.java | 2 +-
.../com/cloud/agent/resource/DummyResource.java | 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/agent/api/to/NfsTO.java | 8 +-
api/src/com/cloud/agent/api/to/VolumeTO.java | 6 +-
api/src/com/cloud/alert/Alert.java | 1 +
api/src/com/cloud/deploy/DeployDestination.java | 21 +-
api/src/com/cloud/deploy/DeploymentPlanner.java | 33 +-
api/src/com/cloud/deploy/HAPlanner.java | 21 +
api/src/com/cloud/event/EventTypes.java | 11 +-
api/src/com/cloud/exception/CloudException.java | 5 +-
.../exception/OperationTimedoutException.java | 10 +-
api/src/com/cloud/host/Host.java | 5 +
.../com/cloud/hypervisor/HypervisorGuru.java | 2 +
api/src/com/cloud/network/Network.java | 14 +-
api/src/com/cloud/network/NetworkModel.java | 2 +
api/src/com/cloud/network/NetworkService.java | 8 +-
api/src/com/cloud/network/Networks.java | 19 +-
api/src/com/cloud/network/OvsProvider.java | 4 +-
api/src/com/cloud/network/PhysicalNetwork.java | 2 +-
.../network/VirtualNetworkApplianceService.java | 2 +-
.../com/cloud/network/as/AutoScalePolicy.java | 4 +-
.../com/cloud/network/as/AutoScaleVmGroup.java | 2 +-
api/src/com/cloud/network/as/Counter.java | 2 +-
.../cloud/network/element/NetworkElement.java | 2 -
.../element/UserDataServiceProvider.java | 2 +-
.../element/VirtualRouterElementService.java | 5 +-
.../cloud/network/firewall/FirewallService.java | 2 +-
.../network/lb/LoadBalancingRulesService.java | 4 +-
.../com/cloud/network/rules/FirewallRule.java | 3 +-
.../network/security/SecurityGroupService.java | 2 +-
.../cloud/network/vpc/NetworkACLService.java | 2 +-
api/src/com/cloud/network/vpc/StaticRoute.java | 3 +-
api/src/com/cloud/offering/DiskOffering.java | 2 +-
.../cloud/region/ha/GlobalLoadBalancerRule.java | 4 +-
api/src/com/cloud/server/ResourceTag.java | 14 +-
api/src/com/cloud/storage/DataStoreRole.java | 4 +-
api/src/com/cloud/storage/Storage.java | 2 +
api/src/com/cloud/storage/StorageService.java | 30 +-
api/src/com/cloud/storage/Volume.java | 2 -
api/src/com/cloud/storage/VolumeApiService.java | 8 -
.../storage/snapshot/SnapshotApiService.java | 2 -
.../com/cloud/user/ResourceLimitService.java | 16 +-
api/src/com/cloud/vm/DiskProfile.java | 16 +-
api/src/com/cloud/vm/NicProfile.java | 107 +-
api/src/com/cloud/vm/UserVmService.java | 33 +-
api/src/com/cloud/vm/VirtualMachine.java | 19 +-
api/src/com/cloud/vm/VirtualMachineName.java | 13 +
.../apache/cloudstack/alert/AlertService.java | 18 +-
.../org/apache/cloudstack/api/ApiConstants.java | 15 +-
.../api/BaseAsyncCreateCustomIdCmd.java | 7 +-
.../cloudstack/api/BaseAsyncCustomIdCmd.java | 5 +-
api/src/org/apache/cloudstack/api/BaseCmd.java | 22 +-
.../apache/cloudstack/api/BaseCustomIdCmd.java | 4 +-
.../org/apache/cloudstack/api/BaseListCmd.java | 22 +-
.../BaseListTemplateOrIsoPermissionsCmd.java | 14 +-
.../BaseUpdateTemplateOrIsoPermissionsCmd.java | 24 +-
.../apache/cloudstack/api/IdentityService.java | 23 -
.../cloudstack/api/ResponseGenerator.java | 4 +-
.../cloudstack/api/ServerApiException.java | 4 +
.../command/admin/alert/GenerateAlertCmd.java | 21 +-
.../api/command/admin/config/ListCfgsByCmd.java | 20 +-
.../api/command/admin/config/UpdateCfgCmd.java | 16 +-
.../admin/host/AddSecondaryStorageCmd.java | 22 +-
.../ListInternalLoadBalancerElementsCmd.java | 4 +-
.../admin/network/CreateNetworkOfferingCmd.java | 8 +-
.../network/ListNetworkServiceProvidersCmd.java | 4 +-
.../network/ListStorageNetworkIpRangeCmd.java | 4 +-
.../ListSupportedNetworkServicesCmd.java | 4 +-
.../admin/network/UpdateNetworkOfferingCmd.java | 4 +-
.../offering/CreateServiceOfferingCmd.java | 4 +-
.../command/admin/resource/ListAlertsCmd.java | 6 +-
.../admin/router/ConfigureOvsElementCmd.java | 176 +-
.../admin/router/ListOvsElementsCmd.java | 106 +-
.../router/ListVirtualRouterElementsCmd.java | 4 +-
.../admin/router/UpgradeRouterTemplateCmd.java | 15 +-
.../command/admin/storage/AddImageStoreCmd.java | 10 +-
.../api/command/admin/storage/AddS3Cmd.java | 108 +-
.../PrepareSecondaryStorageForMigrationCmd.java | 110 -
.../storage/UpdateCloudToUseObjectStoreCmd.java | 142 +
.../api/command/admin/swift/AddSwiftCmd.java | 23 +-
.../admin/systemvm/ScaleSystemVMCmd.java | 39 +-
.../admin/systemvm/UpgradeSystemVMCmd.java | 39 +-
.../command/admin/usage/AddTrafficTypeCmd.java | 14 +-
.../usage/ListTrafficTypeImplementorsCmd.java | 4 +-
.../admin/usage/ListTrafficTypesCmd.java | 4 +-
.../admin/vlan/CreateVlanIpRangeCmd.java | 3 +
.../api/command/admin/vm/GetVMUserDataCmd.java | 81 +
.../command/admin/vpc/CreateVPCOfferingCmd.java | 4 +-
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 4 +-
.../affinitygroup/ListAffinityGroupsCmd.java | 7 +-
.../autoscale/ListAutoScaleVmProfilesCmd.java | 11 +-
.../api/command/user/iso/ListIsosCmd.java | 7 +
.../AssignCertToLoadBalancerCmd.java | 3 +-
.../RemoveCertFromLoadBalancerCmd.java | 2 +-
.../command/user/network/DeleteNetworkCmd.java | 10 +-
.../user/network/ListNetworkACLListsCmd.java | 9 +-
.../user/network/ListNetworkACLsCmd.java | 7 +-
.../user/network/ListNetworkOfferingsCmd.java | 4 +-
.../command/user/network/ListNetworksCmd.java | 29 +-
.../command/user/template/CopyTemplateCmd.java | 5 +-
.../command/user/template/ListTemplatesCmd.java | 7 +
.../api/command/user/vm/AddIpToVmNicCmd.java | 64 +-
.../api/command/user/vm/DeployVMCmd.java | 154 +-
.../api/command/user/vm/ListNicsCmd.java | 11 +-
.../api/command/user/vm/ListVMsCmd.java | 2 +-
.../command/user/vm/RemoveIpFromVmNicCmd.java | 2 +-
.../api/command/user/vm/ScaleVMCmd.java | 38 +-
.../api/command/user/vm/UpdateVMCmd.java | 5 +-
.../api/command/user/vm/UpgradeVMCmd.java | 35 +-
.../user/volume/AddResourceDetailCmd.java | 11 +-
.../command/user/volume/CreateVolumeCmd.java | 5 +-
.../command/user/volume/ResizeVolumeCmd.java | 5 +-
.../command/user/volume/UpdateVolumeCmd.java | 5 +-
.../api/command/user/vpc/CreateVPCCmd.java | 22 +-
.../command/user/vpc/ListVPCOfferingsCmd.java | 4 +-
.../api/command/user/vpc/RestartVPCCmd.java | 4 +-
.../api/command/user/vpc/UpdateVPCCmd.java | 4 +-
.../cloudstack/api/response/AlertResponse.java | 7 +-
.../api/response/CapabilitiesResponse.java | 6 +-
.../api/response/DiskOfferingResponse.java | 3 +-
.../cloudstack/api/response/NicResponse.java | 11 +-
.../api/response/OvsProviderResponse.java | 108 +-
.../api/response/ProviderResponse.java | 3 +-
.../api/response/ServiceOfferingResponse.java | 6 +-
.../cloudstack/api/response/UserVmResponse.java | 38 +-
.../api/response/VMUserDataResponse.java | 44 +
.../config/ApiServiceConfiguration.java | 40 +
.../apache/cloudstack/context/CallContext.java | 27 +-
.../network/ExternalNetworkDeviceManager.java | 1 +
.../apache/cloudstack/query/QueryService.java | 13 +-
api/test/com/cloud/network/NetworksTest.java | 15 +
.../api/command/test/AddIpToVmNicTest.java | 8 +-
.../test/AddSecondaryStorageCmdTest.java | 12 +-
awsapi/pom.xml | 64 +-
.../ec2/AmazonEC2MessageReceiverInOut.java | 288 +-
awsapi/src/com/amazon/ec2/UserDataType.java | 4 +-
.../com/amazon/ec2/client/AmazonEC2Stub.java | 1444 +--
.../amazon/s3/AmazonS3MessageReceiverInOut.java | 32 +-
awsapi/src/com/amazon/s3/MetadataDirective.java | 2 +-
awsapi/src/com/amazon/s3/MfaDeleteStatus.java | 2 +-
awsapi/src/com/amazon/s3/Payer.java | 2 +-
awsapi/src/com/amazon/s3/Permission.java | 2 +-
awsapi/src/com/amazon/s3/StorageClass.java | 2 +-
awsapi/src/com/amazon/s3/VersioningStatus.java | 2 +-
.../src/com/amazon/s3/client/AmazonS3Stub.java | 166 +-
.../cloud/bridge/service/EC2RestServlet.java | 36 +-
.../service/controller/s3/ServiceProvider.java | 2 +-
.../bridge/service/core/ec2/EC2Engine.java | 64 +-
.../classes/resources/messages.properties | 24 +-
.../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/pom.xml | 45 +-
client/tomcatconf/commands.properties.in | 8 +-
core/pom.xml | 5 +
.../core/spring-core-registry-core-context.xml | 5 +
...re-lifecycle-planner-context-inheritable.xml | 5 +
.../cloud/agent/api/AttachVolumeCommand.java | 2 +-
.../cloud/agent/api/ComputeChecksumCommand.java | 4 +-
.../CreatePrivateTemplateFromVolumeCommand.java | 4 +-
.../com/cloud/agent/api/GetVmConfigAnswer.java | 68 +
.../com/cloud/agent/api/GetVmConfigCommand.java | 46 +
.../cloud/agent/api/ManageSnapshotCommand.java | 4 +-
.../agent/api/ModifyVmNicConfigAnswer.java | 36 +
.../agent/api/ModifyVmNicConfigCommand.java | 42 +
.../agent/api/PerformanceMonitorAnswer.java | 12 +-
.../agent/api/PerformanceMonitorCommand.java | 34 +-
.../cloud/agent/api/SecStorageSetupCommand.java | 41 +-
core/src/com/cloud/agent/api/SetupCommand.java | 20 -
core/src/com/cloud/agent/api/StartAnswer.java | 8 +-
core/src/com/cloud/agent/api/StartCommand.java | 10 +
core/src/com/cloud/agent/api/StopAnswer.java | 4 +-
.../agent/api/UpdateHostPasswordCommand.java | 14 +-
.../baremetal/PrepareCreateTemplateCommand.java | 66 +
.../baremetal/prepareCreateTemplateCommand.java | 66 -
.../com/cloud/agent/api/routing/IpAliasTO.java | 8 +-
.../api/routing/LoadBalancerConfigCommand.java | 8 +-
.../api/routing/NetworkElementCommand.java | 13 +-
.../api/storage/AbstractDownloadCommand.java | 2 +-
.../storage/CreatePrivateTemplateAnswer.java | 4 +-
.../agent/api/storage/MigrateVolumeCommand.java | 12 +
.../com/cloud/agent/api/storage/SsCommand.java | 48 +
.../com/cloud/agent/api/storage/ssCommand.java | 48 -
.../virtualnetwork/VirtualRouterDeployer.java | 27 +
.../virtualnetwork/VirtualRoutingResource.java | 1036 +-
core/src/com/cloud/agent/transport/Request.java | 28 +-
core/src/com/cloud/host/HostInfo.java | 3 +-
.../cloud/info/RunningHostInfoAgregator.java | 8 +-
.../cloud/network/LoadBalancerValidator.java | 2 -
.../resource/TrafficSentinelResource.java | 8 +-
.../template/HttpTemplateDownloader.java | 14 +-
.../cloud/storage/template/OVAProcessor.java | 158 +
.../template/TemplateDownloaderBase.java | 6 +-
.../cloud/storage/template/VhdProcessor.java | 22 +-
.../cloud/storage/template/VmdkProcessor.java | 95 +-
.../cloudstack/storage/command/CopyCommand.java | 12 +
.../storage/command/DownloadCommand.java | 4 +-
.../cloudstack/storage/to/SnapshotObjectTO.java | 26 +
.../api/agent/test/CheckOnHostCommandTest.java | 5 +-
debian/control | 6 +-
deps/XenServerJava/pom.xml | 22 +-
.../src/com/xensource/xenapi/APIVersion.java | 44 +-
.../src/com/xensource/xenapi/Auth.java | 26 +-
.../src/com/xensource/xenapi/Blob.java | 139 +-
.../src/com/xensource/xenapi/Bond.java | 181 +-
.../src/com/xensource/xenapi/Connection.java | 66 +-
.../src/com/xensource/xenapi/Console.java | 127 +-
.../src/com/xensource/xenapi/Crashdump.java | 105 +-
.../src/com/xensource/xenapi/DRTask.java | 85 +-
.../src/com/xensource/xenapi/DataSource.java | 11 +-
.../src/com/xensource/xenapi/Event.java | 90 +-
.../src/com/xensource/xenapi/GPUGroup.java | 137 +-
.../src/com/xensource/xenapi/Host.java | 1083 +-
.../src/com/xensource/xenapi/HostCpu.java | 174 +-
.../src/com/xensource/xenapi/HostCrashdump.java | 125 +-
.../src/com/xensource/xenapi/HostMetrics.java | 112 +-
.../src/com/xensource/xenapi/HostPatch.java | 187 +-
.../src/com/xensource/xenapi/Marshalling.java | 18 +-
.../src/com/xensource/xenapi/Message.java | 84 +-
.../src/com/xensource/xenapi/Network.java | 267 +-
.../src/com/xensource/xenapi/PBD.java | 175 +-
.../src/com/xensource/xenapi/PCI.java | 125 +-
.../src/com/xensource/xenapi/PGPU.java | 101 +-
.../src/com/xensource/xenapi/PIF.java | 509 +-
.../src/com/xensource/xenapi/PIFMetrics.java | 165 +-
.../src/com/xensource/xenapi/Pool.java | 854 +-
.../src/com/xensource/xenapi/PoolPatch.java | 229 +-
.../src/com/xensource/xenapi/Role.java | 115 +-
.../src/com/xensource/xenapi/SM.java | 165 +-
.../src/com/xensource/xenapi/SR.java | 739 +-
.../src/com/xensource/xenapi/Secret.java | 117 +-
.../src/com/xensource/xenapi/Session.java | 219 +-
.../src/com/xensource/xenapi/Subject.java | 121 +-
.../src/com/xensource/xenapi/Task.java | 227 +-
.../src/com/xensource/xenapi/Tunnel.java | 157 +-
.../src/com/xensource/xenapi/Types.java | 3213 +++---
.../src/com/xensource/xenapi/User.java | 127 +-
.../src/com/xensource/xenapi/VBD.java | 413 +-
.../src/com/xensource/xenapi/VBDMetrics.java | 101 +-
.../src/com/xensource/xenapi/VDI.java | 824 +-
.../src/com/xensource/xenapi/VGPU.java | 141 +-
.../src/com/xensource/xenapi/VIF.java | 399 +-
.../src/com/xensource/xenapi/VIFMetrics.java | 101 +-
.../src/com/xensource/xenapi/VLAN.java | 127 +-
.../src/com/xensource/xenapi/VM.java | 2103 ++--
.../src/com/xensource/xenapi/VMAppliance.java | 233 +-
.../com/xensource/xenapi/VMGuestMetrics.java | 149 +-
.../src/com/xensource/xenapi/VMMetrics.java | 157 +-
.../src/com/xensource/xenapi/VMPP.java | 399 +-
.../src/com/xensource/xenapi/VTPM.java | 77 +-
.../src/com/cloud/vm/VirtualMachineManager.java | 65 +-
.../service/NetworkOrchestrationService.java | 6 +-
.../service/VolumeOrchestrationService.java | 18 +
.../subsystem/api/storage/DataStoreManager.java | 2 +
.../subsystem/api/storage/EndPointSelector.java | 6 +
.../api/storage/PrimaryDataStoreDriver.java | 10 +
.../api/storage/SnapshotDataFactory.java | 2 +
.../subsystem/api/storage/SnapshotService.java | 2 +
.../subsystem/api/storage/StorageAction.java | 25 +
.../subsystem/api/storage/VolumeInfo.java | 2 +
.../subsystem/api/storage/VolumeService.java | 4 +
.../src/com/cloud/alert/AlertManager.java | 8 +-
.../cloud/deploy/DeploymentPlanningManager.java | 9 +-
.../src/com/cloud/event/UsageEventUtils.java | 40 +-
.../src/com/cloud/network/IpAddressManager.java | 5 +-
.../com/cloud/network/NetworkStateListener.java | 6 +-
.../src/com/cloud/network/vpc/VpcManager.java | 2 +-
.../src/com/cloud/resource/ResourceManager.java | 3 +
.../src/com/cloud/template/TemplateManager.java | 4 +-
.../components-api/src/com/cloud/vm/VmWork.java | 37 +-
.../src/com/cloud/vm/VmWorkConstants.java | 24 +
.../src/com/cloud/vm/VmWorkJobHandler.java | 25 +
.../src/com/cloud/vm/VmWorkJobHandlerProxy.java | 133 +
.../src/com/cloud/vm/VmWorkSerializer.java | 74 +
.../cloud/vm/snapshot/VMSnapshotManager.java | 1 -
...spring-engine-orchestration-core-context.xml | 16 +-
.../cloud/agent/manager/AgentManagerImpl.java | 23 +-
.../manager/ClusteredAgentManagerImpl.java | 78 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 1862 ++--
.../cloud/vm/VirtualMachinePowerStateSync.java | 18 +-
.../vm/VirtualMachinePowerStateSyncImpl.java | 21 +-
.../src/com/cloud/vm/VmWorkAddVmToNetwork.java | 40 +-
.../src/com/cloud/vm/VmWorkJobDispatcher.java | 168 +-
.../com/cloud/vm/VmWorkJobWakeupDispatcher.java | 147 +
.../src/com/cloud/vm/VmWorkMigrate.java | 11 +-
.../src/com/cloud/vm/VmWorkMigrateForScale.java | 38 +-
.../com/cloud/vm/VmWorkMigrateWithStorage.java | 40 +-
.../src/com/cloud/vm/VmWorkReboot.java | 70 +-
.../src/com/cloud/vm/VmWorkReconfigure.java | 35 +-
.../src/com/cloud/vm/VmWorkRemoveNicFromVm.java | 20 +-
.../com/cloud/vm/VmWorkRemoveVmFromNetwork.java | 38 +-
.../src/com/cloud/vm/VmWorkSerializer.java | 75 -
.../src/com/cloud/vm/VmWorkStart.java | 180 +-
.../src/com/cloud/vm/VmWorkStop.java | 22 +-
.../com/cloud/vm/VmWorkStorageMigration.java | 18 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 2 +-
.../entity/api/VirtualMachineEntityImpl.java | 2 -
.../entity/api/db/dao/EngineHostDaoImpl.java | 4 +-
.../orchestration/NetworkOrchestrator.java | 394 +-
.../orchestration/VolumeOrchestrator.java | 195 +-
.../cloud/vm/VirtualMachineManagerImplTest.java | 1 -
.../spring-engine-schema-core-daos-context.xml | 38 +-
engine/schema/src/com/cloud/alert/AlertVO.java | 5 +-
.../src/com/cloud/alert/dao/AlertDao.java | 4 +-
.../src/com/cloud/alert/dao/AlertDaoImpl.java | 8 +-
.../src/com/cloud/capacity/dao/CapacityDao.java | 11 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 59 +-
.../src/com/cloud/dc/dao/DataCenterDaoImpl.java | 12 +-
.../com/cloud/event/dao/UsageEventDaoImpl.java | 34 +-
.../cloud/event/dao/UsageEventDetailsDao.java | 1 -
.../event/dao/UsageEventDetailsDaoImpl.java | 47 -
.../src/com/cloud/keystore/KeystoreDao.java | 31 -
.../src/com/cloud/keystore/KeystoreDaoImpl.java | 121 -
.../src/com/cloud/keystore/KeystoreVO.java | 102 -
.../com/cloud/network/as/AutoScalePolicyVO.java | 26 +-
.../cloud/network/as/AutoScaleVmGroupVO.java | 28 +-
.../network/as/AutoScaleVmGroupVmMapVO.java | 46 +-
.../as/dao/AutoScalePolicyConditionMapDao.java | 4 +-
.../dao/AutoScalePolicyConditionMapDaoImpl.java | 16 +-
.../as/dao/AutoScaleVmGroupVmMapDao.java | 6 +-
.../as/dao/AutoScaleVmGroupVmMapDaoImpl.java | 46 +-
.../network/dao/ExternalFirewallDeviceDao.java | 12 +-
.../network/dao/ExternalFirewallDeviceVO.java | 6 +-
.../dao/ExternalLoadBalancerDeviceDao.java | 16 +-
.../dao/ExternalLoadBalancerDeviceDaoImpl.java | 8 +-
.../dao/ExternalLoadBalancerDeviceVO.java | 12 +-
.../network/dao/FirewallRulesCidrsDao.java | 3 +
.../network/dao/FirewallRulesCidrsDaoImpl.java | 11 +
.../cloud/network/dao/FirewallRulesCidrsVO.java | 4 +
.../network/dao/LoadBalancerCertMapDaoImpl.java | 4 +-
.../com/cloud/network/dao/NetworkDaoImpl.java | 2 +
.../com/cloud/network/dao/OvsProviderDao.java | 6 +-
.../cloud/network/dao/OvsProviderDaoImpl.java | 68 +-
.../com/cloud/network/dao/SslCertDaoImpl.java | 2 +-
.../cloud/network/element/OvsProviderVO.java | 128 +-
.../security/dao/VmRulesetLogDaoImpl.java | 4 +-
.../com/cloud/offerings/NetworkOfferingVO.java | 4 +-
.../com/cloud/service/ServiceOfferingVO.java | 63 +-
.../cloud/service/dao/ServiceOfferingDao.java | 2 +-
.../service/dao/ServiceOfferingDaoImpl.java | 8 +-
.../src/com/cloud/storage/DiskOfferingVO.java | 2 +-
.../schema/src/com/cloud/storage/VolumeVO.java | 1 -
.../src/com/cloud/storage/dao/SnapshotDao.java | 9 -
.../com/cloud/storage/dao/SnapshotDaoImpl.java | 22 +-
.../cloud/storage/dao/SnapshotDetailsVO.java | 4 +
.../storage/dao/VMTemplateHostDaoImpl.java | 28 +-
.../cloud/upgrade/DatabaseIntegrityChecker.java | 2 +-
.../cloud/upgrade/DatabaseUpgradeChecker.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade218to22.java | 20 +-
.../cloud/upgrade/dao/Upgrade2213to2214.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade2214to30.java | 236 +-
.../com/cloud/upgrade/dao/Upgrade410to420.java | 186 +-
.../com/cloud/upgrade/dao/Upgrade420to421.java | 16 +-
.../com/cloud/upgrade/dao/Upgrade421to430.java | 301 +
.../com/cloud/upgrade/dao/Upgrade430to440.java | 148 +-
.../src/com/cloud/usage/UsageVMInstanceVO.java | 12 +-
.../src/com/cloud/usage/dao/UsageDaoImpl.java | 5 +-
.../com/cloud/usage/dao/UsageStorageDao.java | 2 +-
.../cloud/usage/dao/UsageStorageDaoImpl.java | 4 +-
.../src/com/cloud/user/dao/AccountDaoImpl.java | 2 +-
.../src/com/cloud/vm/dao/DomainRouterDao.java | 10 +-
.../com/cloud/vm/dao/DomainRouterDaoImpl.java | 38 +-
engine/schema/src/com/cloud/vm/dao/NicDao.java | 2 +-
.../schema/src/com/cloud/vm/dao/NicDaoImpl.java | 11 +-
.../src/com/cloud/vm/dao/NicIpAliasDao.java | 2 +-
.../src/com/cloud/vm/dao/NicSecondaryIpDao.java | 2 +
.../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java | 13 +
.../src/com/cloud/vm/dao/NicSecondaryIpVO.java | 46 +-
.../src/com/cloud/vm/dao/UserVmDaoImpl.java | 6 +-
.../src/com/cloud/vm/dao/VMInstanceDao.java | 2 +
.../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 119 +-
.../cloud/vm/snapshot/dao/VMSnapshotDao.java | 2 +-
.../vm/snapshot/dao/VMSnapshotDaoImpl.java | 4 +-
.../engine/cloud/entity/api/db/VMEntityVO.java | 17 -
.../AutoScaleVmProfileDetailVO.java | 81 +
.../resourcedetail/DiskOfferingDetailVO.java | 81 +
.../resourcedetail/NetworkACLItemDetailVO.java | 1 -
.../resourcedetail/NetworkACLListDetailVO.java | 1 -
.../Site2SiteCustomerGatewayDetailVO.java | 81 +
.../Site2SiteVpnConnectionDetailVO.java | 81 +
.../Site2SiteVpnGatewayDetailVO.java | 84 +
.../cloudstack/resourcedetail/UserDetailVO.java | 81 +
.../dao/AutoScaleVmProfileDetailsDao.java | 26 +
.../dao/AutoScaleVmProfileDetailsDaoImpl.java | 33 +
.../dao/DiskOfferingDetailsDao.java | 26 +
.../dao/DiskOfferingDetailsDaoImpl.java | 33 +
.../dao/NetworkACLItemDetailsDaoImpl.java | 7 +-
.../dao/NetworkACLListDetailsDaoImpl.java | 9 +-
.../dao/Site2SiteCustomerGatewayDetailsDao.java | 26 +
.../Site2SiteCustomerGatewayDetailsDaoImpl.java | 34 +
.../dao/Site2SiteVpnConnectionDetailsDao.java | 26 +
.../Site2SiteVpnConnectionDetailsDaoImpl.java | 32 +
.../dao/Site2SiteVpnGatewayDetailsDao.java | 27 +
.../dao/Site2SiteVpnGatewayDetailsDaoImpl.java | 34 +
.../resourcedetail/dao/UserDetailsDao.java | 26 +
.../resourcedetail/dao/UserDetailsDaoImpl.java | 33 +
.../resourcedetail/dao/VpcDetailsDaoImpl.java | 7 +-
.../dao/VpcGatewayDetailsDao.java | 1 -
.../dao/VpcGatewayDetailsDaoImpl.java | 7 +-
.../datastore/db/SnapshotDataStoreDao.java | 4 +
.../datastore/db/TemplateDataStoreDao.java | 5 +
.../service/src/main/webapp/WEB-INF/beans.xml | 6 +-
.../motion/AncientDataMotionStrategy.java | 37 +-
.../storage/image/TemplateServiceImpl.java | 47 +-
engine/storage/integration-test/pom.xml | 35 -
.../cloudstack/storage/test/AllTests.java | 2 +-
.../storage/test/ChildTestConfiguration.java | 16 +-
.../storage/test/CloudStackTestNGBase.java | 12 +-
.../storage/test/EndpointSelectorTest.java | 1 -
.../test/FakePrimaryDataStoreDriver.java | 23 +-
.../cloudstack/storage/test/SnapshotTest.java | 3 +-
.../storage/test/SnapshotTestWithFakeData.java | 9 +-
.../storage/test/VolumeServiceTest.java | 470 +
.../cloudstack/storage/test/VolumeTest.java | 2 +-
.../storage/test/VolumeTestVmware.java | 2 +-
.../storage/test/volumeServiceTest.java | 470 -
.../resources/StorageAllocatorTestContext.xml | 36 +-
.../snapshot/SnapshotDataFactoryImpl.java | 12 +
.../storage/snapshot/SnapshotObject.java | 13 +-
.../storage/snapshot/SnapshotServiceImpl.java | 114 +-
.../SnapshotStateMachineManagerImpl.java | 2 +-
.../snapshot/XenserverSnapshotStrategy.java | 27 +-
.../vmsnapshot/DefaultVMSnapshotStrategy.java | 8 +-
.../cloudstack/storage/RemoteHostEndPoint.java | 24 +-
.../ClusterScopeStoragePoolAllocator.java | 8 +
.../allocator/ZoneWideStoragePoolAllocator.java | 6 +
.../storage/datastore/DataStoreManagerImpl.java | 9 +
.../datastore/ObjectInDataStoreManagerImpl.java | 1 +
.../endpoint/DefaultEndPointSelector.java | 98 +-
.../storage/helper/HypervisorHelperImpl.java | 3 +-
.../image/datastore/ImageStoreHelper.java | 9 +-
.../image/db/ImageStoreDetailsDaoImpl.java | 9 +-
.../image/db/SnapshotDataStoreDaoImpl.java | 42 +
.../image/db/TemplateDataStoreDaoImpl.java | 26 +-
.../cloudstack/storage/volume/VolumeObject.java | 15 +-
.../storage/volume/VolumeServiceImpl.java | 39 +-
.../src/com/cloud/cluster/ClusterManager.java | 1 -
.../com/cloud/cluster/ClusterManagerImpl.java | 52 +-
.../dao/ManagementServerHostDaoImpl.java | 204 +-
.../framework/config/ConfigDepot.java | 8 +-
.../framework/config/impl/ConfigDepotImpl.java | 74 +-
.../config/impl/ConfigDepotAdminTest.java | 4 +-
.../db/src/com/cloud/utils/db/GenericDao.java | 6 +-
.../src/com/cloud/utils/db/GenericDaoBase.java | 62 +-
.../db/src/com/cloud/utils/db/Merovingian2.java | 4 +-
.../db/src/com/cloud/utils/db/SqlGenerator.java | 4 +-
.../com/cloud/utils/db/TransactionLegacy.java | 26 +-
.../com/cloud/utils/db/GenericDaoBaseTest.java | 134 +
.../test/com/cloud/utils/db/GlobalLockTest.java | 6 +-
.../framework/messagebus/MessageDispatcher.java | 62 +-
.../jobs/AsyncJobExecutionContext.java | 197 +-
.../framework/jobs/AsyncJobManager.java | 12 +-
.../framework/jobs/dao/VmWorkJobDao.java | 2 +
.../framework/jobs/dao/VmWorkJobDaoImpl.java | 93 +-
.../jobs/impl/AsyncJobManagerImpl.java | 24 +-
.../framework/jobs/impl/OutcomeImpl.java | 6 +-
.../managed/threadlocal/ManagedThreadLocal.java | 6 +-
framework/pom.xml | 1 +
framework/security/pom.xml | 60 +
.../spring-framework-security-core-context.xml | 32 +
.../framework/security/keys/KeysManager.java | 38 +
.../security/keys/KeysManagerImpl.java | 127 +
.../security/keystore/KeystoreDao.java | 31 +
.../security/keystore/KeystoreDaoImpl.java | 121 +
.../security/keystore/KeystoreManager.java | 64 +
.../security/keystore/KeystoreManagerImpl.java | 154 +
.../framework/security/keystore/KeystoreVO.java | 102 +
.../lifecycle/registry/ExtensionRegistry.java | 3 +-
framework/spring/module/pom.xml | 1 +
packaging/centos63/cloud.spec | 11 +-
parents/checkstyle/pom.xml | 21 -
.../src/main/resources/tooling/checkstyle.xml | 53 -
.../acl/StaticRoleBasedAPIAccessChecker.java | 4 +-
.../discovery/ApiDiscoveryServiceImpl.java | 8 +-
.../cloudstack/discovery/ApiDiscoveryTest.java | 26 +-
.../cloudstack/ratelimit/ApiRateLimitTest.java | 74 +-
.../implicitplanner/ImplicitPlannerTest.java | 1 -
plugins/event-bus/inmemory/pom.xml | 40 +
.../mom/inmemory/InMemoryEventBus.java | 163 +
.../mom/rabbitmq/RabbitMQEventBus.java | 64 +-
.../netapp/NetappDefaultAllocatorImpl.java | 15 +-
.../src/com/cloud/netapp/NetappManagerImpl.java | 5 -
plugins/ha-planners/skip-heurestics/pom.xml | 29 +
.../skip-heurestics/module.properties | 18 +
.../spring-skip-heurestics-context.xml | 26 +
.../com/cloud/deploy/SkipHeuresticsPlanner.java | 61 +
.../BareMetalPingServiceImpl.java | 4 +-
.../BaremetalKickStartPxeResource.java | 2 +-
.../BaremetalPingPxeResource.java | 10 +-
.../BaremetalUserdataElement.java | 2 +-
.../AgentShell/AgentService.Designer.cs | 2 +-
.../ServerResource/AgentShell/AgentService.cs | 2 +-
.../DotNet/ServerResource/AgentShell/App.config | 9 +-
.../DotNet/ServerResource/AgentShell/Program.cs | 95 +-
.../AgentShell/ProjectInstaller.Designer.cs | 55 +-
.../ServerResource/HypervResource/App.config | 6 +-
.../HypervResource/CloudStackTypes.cs | 184 +-
.../HypervResource/HypervResourceController.cs | 607 +-
.../HypervResource/IWmiCallsV2.cs | 6 +-
.../ServerResource/HypervResource/Utils.cs | 24 +-
.../ServerResource/HypervResource/WmiCallsV2.cs | 272 +-
plugins/hypervisors/hyperv/pom.xml | 1 -
.../core/spring-hyperv-core-context.xml | 32 +
.../spring-hyperv-compute-context.xml | 4 +-
.../src/com/cloud/ha/HypervInvestigator.java | 77 +
.../discoverer/HypervServerDiscoverer.java | 215 -
.../hypervisor/hyperv/guru/HypervGuru.java | 113 +
.../hyperv/manager/HypervManager.java | 25 +
.../hyperv/manager/HypervManagerImpl.java | 384 +
.../resource/HypervDirectConnectResource.java | 607 +-
plugins/hypervisors/kvm/pom.xml | 2 -
.../kvm/resource/BridgeVifDriver.java | 5 +-
.../hypervisor/kvm/resource/KVMHABase.java | 2 +-
.../hypervisor/kvm/resource/KVMHAChecker.java | 2 +-
.../hypervisor/kvm/resource/KVMHAMonitor.java | 6 +-
.../kvm/resource/LibvirtCapXMLParser.java | 8 +-
.../kvm/resource/LibvirtComputingResource.java | 984 +-
.../kvm/resource/LibvirtConnection.java | 16 +-
.../kvm/resource/LibvirtNetworkDef.java | 10 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 47 +-
.../hypervisor/kvm/resource/OvsVifDriver.java | 8 +-
.../kvm/storage/IscsiAdmStorageAdaptor.java | 367 +
.../kvm/storage/IscsiAdmStoragePool.java | 167 +
.../kvm/storage/KVMStoragePoolManager.java | 7 +-
.../kvm/storage/KVMStorageProcessor.java | 115 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 76 +-
.../kvm/storage/iScsiAdmStorageAdaptor.java | 367 -
.../kvm/storage/iScsiAdmStoragePool.java | 167 -
.../apache/cloudstack/utils/qemu/QemuImg.java | 7 +-
.../resource/LibvirtComputingResourceTest.java | 162 +-
.../kvm/resource/LibvirtSecretDefTest.java | 55 +
.../kvm/resource/LibvirtStoragePoolDefTest.java | 84 +
.../kvm/resource/LibvirtVMDefTest.java | 25 +
.../kvm/resource/LibvirtVifDriverTest.java | 26 +-
.../src/com/cloud/ovm/hypervisor/OvmHelper.java | 66 +-
.../cloud/ovm/hypervisor/OvmResourceBase.java | 46 +-
.../ovm/src/com/cloud/ovm/object/Coder.java | 18 +-
.../ovm/src/com/cloud/ovm/object/OvmBridge.java | 2 +-
.../ovm/src/com/cloud/ovm/object/OvmHost.java | 4 +-
.../agent/manager/MockAgentManagerImpl.java | 7 +
.../com/cloud/resource/AgentResourceBase.java | 4 +-
.../com/cloud/hypervisor/guru/VMwareGuru.java | 45 +-
.../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 | 66 +-
.../vmware/manager/VmwareStorageManager.java | 4 +
.../manager/VmwareStorageManagerImpl.java | 401 +-
.../vmware/resource/VmwareContextFactory.java | 2 +-
.../vmware/resource/VmwareResource.java | 2424 ++---
.../cloud/network/CiscoNexusVSMDeviceVO.java | 38 +-
.../network/element/CiscoNexusVSMElement.java | 2 -
.../VmwareSecondaryStorageResourceHandler.java | 73 +-
.../resource/VmwareStorageProcessor.java | 164 +-
.../VmwareStorageSubsystemCommandHandler.java | 3 +
.../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 | 98 +
.../xen/discoverer/XcpServerDiscoverer.java | 63 +-
.../hypervisor/xen/resource/CitrixHelper.java | 3270 +++---
.../xen/resource/CitrixResourceBase.java | 2484 +----
.../xen/resource/XenServer56Resource.java | 44 +-
.../xen/resource/XenServer56SP2Resource.java | 4 +-
.../xen/resource/XenServerConnectionPool.java | 464 +-
.../xen/resource/XenServerPoolVms.java | 21 +-
.../xen/resource/XenServerStorageProcessor.java | 269 +-
.../xen/resource/Xenserver625Resource.java | 112 +
.../resource/Xenserver625StorageProcessor.java | 822 ++
.../xenserver/XenServerResourceNewBase.java | 320 +
.../motion/XenServerStorageMotionStrategy.java | 8 +-
.../network/bigswitch/BigSwitchVnsApi.java | 22 +-
.../cloud/network/bigswitch/NetworkData.java | 22 +-
.../com/cloud/network/bigswitch/PortData.java | 10 +-
.../network/resource/BigSwitchVnsResource.java | 6 +-
.../api/ConfigureNexusVsmForAsaCommand.java | 24 +-
.../api/CreateLogicalEdgeFirewallCommand.java | 8 +-
.../network/cisco/CiscoVnmcConnectionImpl.java | 19 +-
.../cloud/network/element/CiscoVnmcElement.java | 9 +-
.../element/CiscoVnmcElementService.java | 2 +-
.../network/resource/CiscoVnmcResource.java | 4 +-
.../resources/components-example.xml | 1 -
.../lb/ElasticLoadBalancerManagerImpl.java | 17 +-
plugins/network-elements/f5/pom.xml | 5 +
.../element/F5ExternalLoadBalancerElement.java | 4 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 4 +-
.../network-elements/juniper-contrail/pom.xml | 8 +-
.../cloudstack/contrail/module.properties | 18 +
.../contrail/spring-contrail-context.xml | 50 +
.../management/ContrailElementImpl.java | 84 +-
.../contrail/management/ContrailGuru.java | 59 +-
.../contrail/management/ContrailManager.java | 31 +-
.../management/ContrailManagerImpl.java | 270 +-
.../network/contrail/management/EventUtils.java | 7 +-
.../management/ManagementNetworkGuru.java | 26 +-
.../contrail/management/ModelDatabase.java | 24 +-
.../contrail/management/ServerDBSyncImpl.java | 232 +-
.../management/ServerEventHandlerImpl.java | 10 -
.../contrail/management/ServiceManagerImpl.java | 32 +-
.../contrail/model/NetworkPolicyModel.java | 305 +
.../contrail/model/ServiceInstanceModel.java | 128 +-
.../contrail/model/VirtualMachineModel.java | 111 +-
.../contrail/model/VirtualNetworkModel.java | 84 +-
.../IntegrationTestConfiguration.java | 80 +-
.../management/ManagementServerMock.java | 30 +-
.../contrail/management/MockAccountManager.java | 3 -
.../management/NetworkProviderTest.java | 32 +-
.../contrail/management/PublicNetworkTest.java | 28 +-
.../management/VirtualNetworkModelTest.java | 56 -
.../contrail/model/VirtualMachineModelTest.java | 124 +
.../contrail/model/VirtualNetworkModelTest.java | 102 +
.../test/resources/commonContext.xml | 192 +-
.../JuniperSRXExternalFirewallElement.java | 5 +-
.../network/resource/JuniperSrxResource.java | 12 +-
.../commands/AddNetscalerLoadBalancerCmd.java | 6 +-
.../cloud/network/element/NetscalerElement.java | 2 +-
.../network/resource/NetscalerResource.java | 114 +-
plugins/network-elements/nicira-nvp/pom.xml | 80 +-
.../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 | 78 +-
.../element/NiciraNvpElementService.java | 3 +
.../network/guru/NiciraNvpGuestNetworkGuru.java | 3 +
.../network/nicira/AccessConfiguration.java | 132 +
.../com/cloud/network/nicira/AccessRule.java | 58 +
.../src/com/cloud/network/nicira/Acl.java | 24 +
.../src/com/cloud/network/nicira/AclRule.java | 209 +
.../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 | 380 +-
.../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 | 24 +
.../com/cloud/network/nicira/SecurityRule.java | 138 +
.../SingleDefaultRouteImplictRoutingConfig.java | 5 +-
.../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 | 166 +
.../cloud/network/nicira/NiciraNvpApiTest.java | 199 +-
.../com/cloud/network/nicira/NiciraTagTest.java | 3 +
.../network/resource/NiciraNvpResourceTest.java | 3 +
.../nicira-nvp/test/resources/config.properties | 23 +
plugins/network-elements/opendaylight/pom.xml | 86 +
.../opendaylight/OpendaylightElement.java | 174 +
.../OpendaylightGuestNetworkGuru.java | 276 +
.../agent/OpenDaylightControllerResource.java | 344 +
.../OpenDaylightControllerResourceManager.java | 42 +
...enDaylightControllerResourceManagerImpl.java | 219 +
.../agent/commands/AddHypervisorCommand.java | 58 +
.../agent/commands/ConfigureNetworkCommand.java | 54 +
.../agent/commands/ConfigurePortCommand.java | 80 +
.../agent/commands/DestroyNetworkCommand.java | 45 +
.../agent/commands/DestroyPortCommand.java | 50 +
.../StartupOpenDaylightControllerCommand.java | 29 +
.../agent/responses/AddHypervisorAnswer.java | 35 +
.../agent/responses/ConfigureNetworkAnswer.java | 43 +
.../agent/responses/ConfigurePortAnswer.java | 35 +
.../agent/responses/DestroyNetworkAnswer.java | 35 +
.../agent/responses/DestroyPortAnswer.java | 35 +
.../api/NeutronInvalidCredentialsException.java | 38 +
.../opendaylight/api/NeutronRestApi.java | 217 +
.../api/NeutronRestApiException.java | 38 +
.../opendaylight/api/NeutronRestFactory.java | 55 +
.../commands/AddOpenDaylightControllerCmd.java | 114 +
.../DeleteOpenDaylightControllerCmd.java | 99 +
.../ListOpenDaylightControllersCmd.java | 104 +
.../api/enums/NeutronNorthboundEnum.java | 44 +
.../opendaylight/api/model/NeutronNetwork.java | 213 +
.../api/model/NeutronNetworkWrapper.java | 70 +
.../api/model/NeutronNetworksList.java | 42 +
.../opendaylight/api/model/NeutronNode.java | 98 +
.../api/model/NeutronNodeWrapper.java | 65 +
.../api/model/NeutronNodesList.java | 42 +
.../opendaylight/api/model/NeutronPort.java | 265 +
.../api/model/NeutronPortWrapper.java | 70 +
.../api/model/NeutronPortsList.java | 42 +
.../opendaylight/api/resources/Action.java | 289 +
.../NeutronNetworksNorthboundAction.java | 113 +
.../resources/NeutronNodesNorthboundAction.java | 89 +
.../resources/NeutronPortsNorthboundAction.java | 111 +
.../OpenDaylightControllerResponse.java | 73 +
.../dao/OpenDaylightControllerMappingDao.java | 28 +
.../OpenDaylightControllerMappingDaoImpl.java | 45 +
.../dao/OpenDaylightControllerVO.java | 100 +
.../cloudstack/opendaylight/module.properties | 21 +
.../spring-opendaylight-context.xml | 42 +
.../opendaylight/api/test/NeutronEnumsTest.java | 85 +
.../api/test/NeutronNetworkAdapterTest.java | 88 +
.../api/test/NeutronNodeAdapterTest.java | 74 +
.../api/test/NeutronPortAdapterTest.java | 95 +
.../opendaylight/api/test/NeutronRestApiIT.java | 95 +
.../api/test/NeutronRestApiTest.java | 254 +
.../agent/api/OvsCreateGreTunnelAnswer.java | 98 +-
.../agent/api/OvsCreateGreTunnelCommand.java | 67 +-
.../cloud/agent/api/OvsCreateTunnelAnswer.java | 104 +-
.../cloud/agent/api/OvsCreateTunnelCommand.java | 77 +-
.../cloud/agent/api/OvsDeleteFlowCommand.java | 23 +-
.../agent/api/OvsDestroyBridgeCommand.java | 33 +-
.../agent/api/OvsDestroyTunnelCommand.java | 55 +-
.../agent/api/OvsFetchInterfaceAnswer.java | 70 +-
.../agent/api/OvsFetchInterfaceCommand.java | 23 +-
.../cloud/agent/api/OvsSetTagAndFlowAnswer.java | 30 +-
.../agent/api/OvsSetTagAndFlowCommand.java | 79 +-
.../cloud/agent/api/OvsSetupBridgeCommand.java | 53 +-
.../com/cloud/agent/api/StartupOvsCommand.java | 7 +-
.../com/cloud/network/element/OvsElement.java | 1014 +-
.../cloud/network/guru/OvsGuestNetworkGuru.java | 334 +-
.../cloud/network/ovs/OvsTunnelManagerImpl.java | 479 +-
.../PaloAltoExternalFirewallElement.java | 3 -
.../element/PaloAltoFirewallElementService.java | 3 -
.../network/resource/PaloAltoResource.java | 70 +-
.../resource/MockablePaloAltoResource.java | 31 +-
.../network/resource/PaloAltoResourceTest.java | 96 +-
.../network-elements/stratosphere-ssp/pom.xml | 2 +-
.../cloudstack/ssp/spring-ssp-context.xml | 1 -
.../cloudstack/network/element/SspElement.java | 4 +-
plugins/pom.xml | 4 +
.../driver/CloudStackImageStoreDriverImpl.java | 2 +-
.../CloudStackImageStoreLifeCycleImpl.java | 34 +-
.../lifecycle/S3ImageStoreLifeCycleImpl.java | 4 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 24 +-
...CloudStackPrimaryDataStoreLifeCycleImpl.java | 4 +-
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 +
.../SamplePrimaryDataStoreDriverImpl.java | 14 +
.../driver/SolidfirePrimaryDataStoreDriver.java | 397 +-
.../SolidFirePrimaryDataStoreLifeCycle.java | 10 -
.../storage/datastore/util/SolidFireUtil.java | 559 +-
plugins/user-authenticators/ldap/pom.xml | 35 -
.../cloudstack/api/command/LDAPConfigCmd.java | 277 +
.../cloudstack/api/command/LDAPRemoveCmd.java | 77 +
.../api/command/LdapImportUsersCmd.java | 26 +-
.../api/response/LDAPConfigResponse.java | 115 +
.../api/response/LDAPRemoveResponse.java | 30 +
.../cloudstack/ldap/LdapAuthenticator.java | 15 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 6 +-
.../cloud/server/auth/MD5UserAuthenticator.java | 9 +-
.../server/auth/PlainTextUserAuthenticator.java | 9 +-
.../auth/SHA256SaltedUserAuthenticator.java | 10 +-
.../server/auth/test/AuthenticatorTest.java | 10 +-
pom.xml | 256 +-
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/storage/secondary/createtmplt.sh | 4 +-
scripts/storage/secondary/createvolume.sh | 23 +-
scripts/vm/hypervisor/xenserver/cloudlog | 25 +
scripts/vm/hypervisor/xenserver/hostvmstats.py | 19 +-
scripts/vm/hypervisor/xenserver/ovstunnel | 4 +
scripts/vm/hypervisor/xenserver/vhd-util | Bin 318977 -> 0 bytes
scripts/vm/hypervisor/xenserver/vmops | 128 +-
scripts/vm/hypervisor/xenserver/vmopsSnapshot | 17 +-
scripts/vm/hypervisor/xenserver/vmopspremium | 9 +-
.../vm/hypervisor/xenserver/xenserver56/patch | 1 +
.../hypervisor/xenserver/xenserver56fp1/patch | 1 +
.../xenserver/xenserver62/cloud-plugin-storage | 301 +
.../vm/hypervisor/xenserver/xenserver62/patch | 74 +
scripts/vm/network/security_group.py | 2 +-
scripts/vm/network/vnet/ovstunnel.py | 4 +
server/pom.xml | 51 +-
.../spring-server-core-managers-context.xml | 15 +-
server/src/com/cloud/acl/DomainChecker.java | 4 +-
.../allocator/impl/FirstFitAllocator.java | 4 +-
.../impl/UserConcentratedAllocator.java | 47 +-
.../src/com/cloud/alert/AlertManagerImpl.java | 55 +-
.../com/cloud/alert/ClusterAlertAdapter.java | 3 +-
.../cloud/alert/ConsoleProxyAlertAdapter.java | 14 +-
.../alert/SecondaryStorageVmAlertAdapter.java | 14 +-
server/src/com/cloud/api/ApiDBUtils.java | 882 +-
server/src/com/cloud/api/ApiDispatcher.java | 4 +-
server/src/com/cloud/api/ApiResponseHelper.java | 240 +-
.../src/com/cloud/api/ApiSerializerHelper.java | 2 +-
server/src/com/cloud/api/ApiServer.java | 68 +-
server/src/com/cloud/api/ApiServlet.java | 2 +-
.../com/cloud/api/EncodedStringTypeAdapter.java | 2 +-
server/src/com/cloud/api/doc/Alert.java | 12 +-
.../src/com/cloud/api/doc/ApiXmlDocWriter.java | 90 +-
server/src/com/cloud/api/doc/Command.java | 11 +-
.../com/cloud/api/query/QueryManagerImpl.java | 96 +-
.../com/cloud/api/query/ViewResponseHelper.java | 3 +-
.../api/query/dao/DiskOfferingJoinDaoImpl.java | 2 +-
.../api/query/dao/DomainRouterJoinDaoImpl.java | 5 +-
.../api/query/dao/ImageStoreJoinDaoImpl.java | 28 +-
.../api/query/dao/StoragePoolJoinDaoImpl.java | 13 +-
.../cloud/api/query/dao/TemplateJoinDao.java | 7 +-
.../api/query/dao/TemplateJoinDaoImpl.java | 30 +-
.../api/query/dao/UserAccountJoinDaoImpl.java | 2 +-
.../cloud/api/query/dao/UserVmJoinDaoImpl.java | 30 +-
.../cloud/api/query/dao/VolumeJoinDaoImpl.java | 4 +-
.../api/query/vo/ServiceOfferingJoinVO.java | 8 +-
.../com/cloud/api/query/vo/TemplateJoinVO.java | 7 +
.../com/cloud/api/query/vo/UserVmJoinVO.java | 63 +-
.../api/response/ApiResponseSerializer.java | 12 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 97 +-
.../cloud/capacity/ComputeCapacityListener.java | 6 +-
server/src/com/cloud/configuration/Config.java | 81 +-
.../configuration/ConfigurationManagerImpl.java | 470 +-
.../src/com/cloud/configuration/ZoneConfig.java | 6 +-
.../AgentBasedConsoleProxyManager.java | 14 +-
.../com/cloud/consoleproxy/AgentHookBase.java | 34 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 121 +-
.../consoleproxy/StaticConsoleProxyManager.java | 4 +-
.../src/com/cloud/dc/DedicatedResourceVO.java | 15 +-
.../deploy/DeploymentPlanningManagerImpl.java | 86 +-
.../src/com/cloud/deploy/FirstFitPlanner.java | 15 +-
.../src/com/cloud/event/ActionEventUtils.java | 37 +-
server/src/com/cloud/event/AlertGenerator.java | 19 +-
.../cloud/ha/HighAvailabilityManagerImpl.java | 58 +-
.../cloud/hypervisor/HypervisorGuruBase.java | 5 +
.../kvm/discoverer/LibvirtServerDiscoverer.java | 13 -
.../src/com/cloud/keystore/KeystoreManager.java | 32 -
.../com/cloud/keystore/KeystoreManagerImpl.java | 155 -
.../metadata/ResourceMetaDataManagerImpl.java | 66 +-
.../network/ExternalIpAddressAllocator.java | 9 +-
.../src/com/cloud/network/IpAddrAllocator.java | 4 +-
.../com/cloud/network/IpAddressManagerImpl.java | 224 +-
.../src/com/cloud/network/NetworkModelImpl.java | 48 +-
.../com/cloud/network/NetworkServiceImpl.java | 592 +-
.../cloud/network/NetworkUsageManagerImpl.java | 3 +-
.../com/cloud/network/as/AutoScaleManager.java | 4 +-
.../cloud/network/as/AutoScaleManagerImpl.java | 411 +-
.../element/CloudZonesNetworkElement.java | 2 +-
.../network/element/VirtualRouterElement.java | 101 +-
.../element/VpcVirtualRouterElement.java | 16 +-
.../cloud/network/guru/ControlNetworkGuru.java | 14 +-
.../cloud/network/guru/DirectNetworkGuru.java | 6 +-
.../network/guru/ExternalGuestNetworkGuru.java | 33 +-
.../cloud/network/guru/GuestNetworkGuru.java | 6 +-
.../cloud/network/guru/PodBasedNetworkGuru.java | 6 +-
.../cloud/network/guru/PrivateNetworkGuru.java | 6 +-
.../cloud/network/guru/PublicNetworkGuru.java | 20 +-
.../cloud/network/guru/StorageNetworkGuru.java | 6 +-
.../lb/LoadBalancingRulesManagerImpl.java | 16 +-
.../router/VirtualNetworkApplianceManager.java | 2 +-
.../VirtualNetworkApplianceManagerImpl.java | 132 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 23 +-
.../security/SecurityGroupManagerImpl.java | 100 +-
.../network/vpc/NetworkACLManagerImpl.java | 13 +-
.../network/vpc/NetworkACLServiceImpl.java | 50 +-
.../com/cloud/network/vpc/VpcManagerImpl.java | 13 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 2 +-
.../com/cloud/projects/ProjectManagerImpl.java | 1 +
.../com/cloud/resource/ResourceManagerImpl.java | 55 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 66 +-
.../cloud/server/ConfigurationServerImpl.java | 134 +-
.../src/com/cloud/server/ManagementServer.java | 17 +-
.../com/cloud/server/ManagementServerImpl.java | 310 +-
server/src/com/cloud/server/StatsCollector.java | 739 +-
.../cloud/server/auth/UserAuthenticator.java | 8 +-
.../cloud/servlet/ConsoleProxyClientParam.java | 41 +-
.../com/cloud/servlet/ConsoleProxyServlet.java | 94 +-
.../com/cloud/storage/StorageManagerImpl.java | 117 +-
.../storage/StoragePoolAutomationImpl.java | 24 +-
.../com/cloud/storage/VmWorkAttachVolume.java | 40 +
.../com/cloud/storage/VmWorkDetachVolume.java | 34 +
.../com/cloud/storage/VmWorkMigrateVolume.java | 46 +
.../com/cloud/storage/VmWorkResizeVolume.java | 61 +
.../cloud/storage/VmWorkTakeVolumeSnapshot.java | 54 +
.../com/cloud/storage/VolumeApiServiceImpl.java | 844 +-
.../storage/download/DownloadListener.java | 16 +-
.../storage/download/DownloadMonitorImpl.java | 1 -
.../storage/listener/SnapshotStateListener.java | 7 +-
.../storage/listener/StoragePoolMonitor.java | 6 +-
.../storage/listener/VolumeStateListener.java | 7 +-
.../resource/DummySecondaryStorageResource.java | 4 +-
.../secondary/SecondaryStorageManagerImpl.java | 27 +-
.../secondary/SecondaryStorageVmManager.java | 2 +-
.../storage/snapshot/SnapshotManagerImpl.java | 47 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 8 +-
.../cloud/storage/upload/UploadListener.java | 12 +-
.../cloud/storage/upload/UploadMonitorImpl.java | 4 +-
.../cloud/tags/TaggedResourceManagerImpl.java | 259 +-
.../template/HypervisorTemplateAdapter.java | 56 +-
.../com/cloud/template/TemplateAdapterBase.java | 8 +-
.../com/cloud/template/TemplateManagerImpl.java | 97 +-
server/src/com/cloud/test/IPRangeConfig.java | 29 +-
.../src/com/cloud/user/AccountManagerImpl.java | 145 +-
.../src/com/cloud/user/DomainManagerImpl.java | 3 +-
.../cloud/uuididentity/IdentityServiceImpl.java | 44 -
.../src/com/cloud/uuididentity/UUIDManager.java | 1 -
.../com/cloud/uuididentity/UUIDManagerImpl.java | 46 +-
.../com/cloud/uuididentity/dao/IdentityDao.java | 38 -
.../cloud/uuididentity/dao/IdentityDaoImpl.java | 241 -
.../com/cloud/uuididentity/dao/IdentityVO.java | 25 -
.../src/com/cloud/vm/SystemVmLoadScanner.java | 18 +-
server/src/com/cloud/vm/UserVmManager.java | 7 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 629 +-
.../src/com/cloud/vm/UserVmStateListener.java | 55 +-
.../vm/snapshot/VMSnapshotManagerImpl.java | 597 +-
.../vm/snapshot/VmWorkCreateVMSnapshot.java | 41 +
.../vm/snapshot/VmWorkDeleteAllVMSnapshots.java | 35 +
.../vm/snapshot/VmWorkDeleteVMSnapshot.java | 35 +
.../vm/snapshot/VmWorkRevertToVMSnapshot.java | 35 +
.../cloudstack/network/lb/CertServiceImpl.java | 24 +-
server/test/async-job-component.xml | 371 +-
.../com/cloud/capacity/CapacityManagerTest.java | 28 +-
.../network/DedicateGuestVlanRangesTest.java | 16 +-
.../cloud/network/MockFirewallManagerImpl.java | 2 +-
.../com/cloud/network/MockNetworkModelImpl.java | 9 +
.../network/UpdatePhysicalNetworkTest.java | 6 +-
.../SecurityGroupManagerTestConfiguration.java | 12 +-
.../cloud/resource/MockResourceManagerImpl.java | 9 +
.../snapshot/SnapshotDaoTestConfiguration.java | 2 +-
.../vm/DeploymentPlanningManagerImplTest.java | 6 +-
.../vm/snapshot/VMSnapshotManagerTest.java | 2 +-
.../com/cloud/vpc/MockNetworkManagerImpl.java | 19 +-
.../com/cloud/vpc/MockNetworkModelImpl.java | 10 +
.../cloud/vpc/MockResourceLimitManagerImpl.java | 1 -
.../MockVpcVirtualNetworkApplianceManager.java | 2 +-
.../com/cloud/vpc/NetworkACLManagerTest.java | 95 +-
.../com/cloud/vpc/NetworkACLServiceTest.java | 14 +-
.../com/cloud/vpc/VpcTestConfiguration.java | 28 +-
.../networkoffering/ChildTestConfiguration.java | 18 +-
.../SecurityGroupManagerTestContext.xml | 20 +-
.../test/resources/SnapshotDaoTestContext.xml | 20 +-
.../resources/StoragePoolDaoTestContext.xml | 20 +-
server/test/resources/network-mgr-component.xml | 1 -
.../console-proxy-rdp/rdpconsole/README.txt | 54 +-
services/console-proxy-rdp/rdpconsole/pom.xml | 8 +-
.../console-proxy-rdp/rdpconsole/rdp-config.bat | 2 +-
.../src/main/java/common/AwtBellAdapter.java | 77 -
.../src/main/java/common/AwtCanvasAdapter.java | 166 -
.../main/java/common/AwtClipboardAdapter.java | 56 -
.../src/main/java/common/AwtKeyEventSource.java | 0
.../main/java/common/AwtMouseEventSource.java | 0
.../src/main/java/common/BitmapOrder.java | 3 +-
.../src/main/java/common/BitmapRectangle.java | 6 +-
.../main/java/common/BufferedImageCanvas.java | 8 +-
.../common/BufferedImageCopyRectAdapter.java | 32 +-
.../java/common/BufferedImagePixelsAdapter.java | 46 +-
.../rdpconsole/src/main/java/common/Client.java | 283 +-
.../src/main/java/common/CopyRectOrder.java | 0
.../src/main/java/common/KeyOrder.java | 0
.../src/main/java/common/MouseOrder.java | 0
.../src/main/java/common/OrderType.java | 0
.../src/main/java/common/ScreenDescription.java | 56 +-
.../main/java/common/SizeChangeListener.java | 0
.../java/common/adapter/AwtBellAdapter.java | 77 +
.../java/common/adapter/AwtCanvasAdapter.java | 173 +
.../common/adapter/AwtClipboardAdapter.java | 57 +
.../src/main/java/common/asn1/Any.java | 78 +
.../main/java/common/asn1/Asn1Constants.java | 83 +
.../src/main/java/common/asn1/Asn1Integer.java | 116 +
.../src/main/java/common/asn1/BerType.java | 40 +
.../src/main/java/common/asn1/BitString.java | 67 +
.../src/main/java/common/asn1/ObjectID.java | 67 +
.../src/main/java/common/asn1/OctetString.java | 80 +
.../src/main/java/common/asn1/Sequence.java | 143 +
.../src/main/java/common/asn1/SequenceOf.java | 82 +
.../src/main/java/common/asn1/Tag.java | 462 +
.../main/java/common/opt/IncrementalOption.java | 28 +
.../src/main/java/common/opt/IntOption.java | 41 +
.../opt/NoArgumentForOptionException.java | 26 +
.../src/main/java/common/opt/Option.java | 102 +
.../src/main/java/common/opt/OptionParser.java | 147 +
.../common/opt/OptionRequiredException.java | 26 +
.../main/java/common/opt/StringArrayOption.java | 38 +
.../common/opt/StringEnumerationOption.java | 72 +
.../src/main/java/common/opt/StringOption.java | 41 +
.../java/common/opt/UnknownOptionException.java | 27 +
.../java/rdpclient/AwtRdpKeyboardAdapter.java | 350 -
.../main/java/rdpclient/AwtRdpMouseAdapter.java | 180 -
.../java/rdpclient/ClientConfirmActivePDU.java | 1129 ---
.../main/java/rdpclient/ClientFastPathPDU.java | 55 -
.../src/main/java/rdpclient/ClientInfoPDU.java | 455 -
.../rdpclient/ClientMCSAttachUserRequest.java | 103 -
...JoinRequest_ServerMCSChannelConfirmPDUs.java | 222 -
.../java/rdpclient/ClientMCSConnectInitial.java | 669 --
.../rdpclient/ClientMCSErectDomainRequest.java | 189 -
.../java/rdpclient/ClientPacketSniffer.java | 49 -
.../java/rdpclient/ClientSynchronizePDU.java | 248 -
.../src/main/java/rdpclient/ClientTpkt.java | 54 -
.../ClientX224ConnectionRequestPDU.java | 156 -
.../main/java/rdpclient/ClientX224DataPdu.java | 52 -
.../src/main/java/rdpclient/HandshakeEnd.java | 27 -
.../src/main/java/rdpclient/MockServer.java | 198 -
.../src/main/java/rdpclient/PacketSniffer.java | 75 -
.../java/rdpclient/RLEBitmapDecompression.java | 985 --
.../src/main/java/rdpclient/RdpClient.java | 312 +-
.../src/main/java/rdpclient/RdpConstants.java | 70 -
.../src/main/java/rdpclient/RdpState.java | 33 -
.../main/java/rdpclient/ServerBitmapUpdate.java | 200 -
.../java/rdpclient/ServerChannel1003Router.java | 533 -
.../rdpclient/ServerControlPDUCooperate.java | 117 -
.../ServerControlPDUGrantedControl.java | 114 -
.../java/rdpclient/ServerDemandActivePDU.java | 660 --
.../src/main/java/rdpclient/ServerFastPath.java | 258 -
.../ServerLicenseErrorPDUValidClient.java | 121 -
.../ServerMCSAttachUserConfirmPDU.java | 134 -
.../ServerMCSChannelJoinConfirmPDU.java | 89 -
.../rdpclient/ServerMCSConnectResponse.java | 283 -
.../src/main/java/rdpclient/ServerMCSPDU.java | 149 -
.../java/rdpclient/ServerPacketSniffer.java | 50 -
.../java/rdpclient/ServerPaletteUpdate.java | 77 -
.../java/rdpclient/ServerSynchronizePDU.java | 115 -
.../src/main/java/rdpclient/ServerTpkt.java | 70 -
.../ServerX224ConnectionConfirmPDU.java | 237 -
.../main/java/rdpclient/ServerX224DataPdu.java | 64 -
.../rdpclient/TrustAllX509TrustManager.java | 40 -
.../main/java/rdpclient/UpgradeSocketToSSL.java | 44 -
.../adapter/AwtRdpKeyboardAdapter.java | 350 +
.../rdpclient/adapter/AwtRdpMouseAdapter.java | 179 +
.../rdpclient/clip/ClipboardDataFormat.java | 143 +
.../java/rdpclient/clip/ClipboardState.java | 70 +
.../clip/ServerClipRdrChannelRouter.java | 193 +
.../clip/ServerClipboardCapabilitiesPDU.java | 180 +
.../clip/ServerFormatDataResponsePDU.java | 97 +
.../rdpclient/clip/ServerFormatListPDU.java | 237 +
.../rdpclient/clip/ServerMonitorReadyPDU.java | 85 +
.../rdpclient/debug/ClientPacketSniffer.java | 51 +
.../java/rdpclient/debug/PacketSniffer.java | 75 +
.../rdpclient/debug/ServerPacketSniffer.java | 49 +
.../hyperv/ClientPreConnectionBlob.java | 121 +
.../ntlmssp/ClientNtlmsspNegotiate.java | 177 +
.../ntlmssp/ClientNtlmsspPubKeyAuth.java | 680 ++
.../ntlmssp/ClientNtlmsspUserCredentials.java | 128 +
.../java/rdpclient/ntlmssp/CryptoAlgos.java | 361 +
.../main/java/rdpclient/ntlmssp/NegoFlags.java | 492 +
.../java/rdpclient/ntlmssp/NtlmCompute.java | 24 +
.../java/rdpclient/ntlmssp/NtlmConstants.java | 157 +
.../main/java/rdpclient/ntlmssp/NtlmState.java | 887 ++
.../main/java/rdpclient/ntlmssp/SecBuffer.java | 21 +
.../ntlmssp/ServerNtlmsspChallenge.java | 293 +
.../ntlmssp/ServerNtlmsspPubKeyPlus1.java | 125 +
.../ntlmssp/asn1/AlgorithmIdentifier.java | 40 +
.../java/rdpclient/ntlmssp/asn1/NegoData.java | 64 +
.../java/rdpclient/ntlmssp/asn1/NegoItem.java | 73 +
.../ntlmssp/asn1/SubjectPublicKeyInfo.java | 35 +
.../rdpclient/ntlmssp/asn1/TSCredentials.java | 62 +
.../rdpclient/ntlmssp/asn1/TSCspDataDetail.java | 98 +
.../rdpclient/ntlmssp/asn1/TSPasswordCreds.java | 76 +
.../java/rdpclient/ntlmssp/asn1/TSRequest.java | 201 +
.../ntlmssp/asn1/TSSmartCardCreds.java | 90 +
.../java/rdpclient/ntlmssp/package-info.java | 71 +
.../rdpclient/rdp/ClientConfirmActivePDU.java | 1131 +++
.../java/rdpclient/rdp/ClientFastPathPDU.java | 55 +
.../main/java/rdpclient/rdp/ClientInfoPDU.java | 456 +
.../rdp/ClientMCSAttachUserRequest.java | 103 +
...lJoinRequestServerMCSChannelConfirmPDUs.java | 223 +
.../rdpclient/rdp/ClientMCSConnectInitial.java | 696 ++
.../rdp/ClientMCSErectDomainRequest.java | 189 +
.../rdpclient/rdp/ClientSynchronizePDU.java | 248 +
.../src/main/java/rdpclient/rdp/ClientTpkt.java | 54 +
.../rdp/ClientX224ConnectionRequestPDU.java | 162 +
.../java/rdpclient/rdp/ClientX224DataPDU.java | 52 +
.../rdpclient/rdp/RLEBitmapDecompression.java | 1014 ++
.../main/java/rdpclient/rdp/RdpConstants.java | 91 +
.../src/main/java/rdpclient/rdp/RdpState.java | 33 +
.../java/rdpclient/rdp/ServerBitmapUpdate.java | 199 +
.../rdp/ServerControlPDUCooperate.java | 117 +
.../rdp/ServerControlPDUGrantedControl.java | 114 +
.../rdpclient/rdp/ServerDemandActivePDU.java | 660 ++
.../main/java/rdpclient/rdp/ServerFastPath.java | 315 +
.../rdpclient/rdp/ServerIOChannelRouter.java | 534 +
.../rdp/ServerLicenseErrorPDUValidClient.java | 121 +
.../rdp/ServerMCSAttachUserConfirmPDU.java | 116 +
.../rdp/ServerMCSChannelJoinConfirmPDU.java | 89 +
.../rdpclient/rdp/ServerMCSConnectResponse.java | 283 +
.../main/java/rdpclient/rdp/ServerMCSPDU.java | 149 +
.../java/rdpclient/rdp/ServerPaletteUpdate.java | 77 +
.../rdpclient/rdp/ServerSynchronizePDU.java | 115 +
.../src/main/java/rdpclient/rdp/ServerTpkt.java | 70 +
.../rdp/ServerX224ConnectionConfirmPDU.java | 234 +
.../java/rdpclient/rdp/ServerX224DataPdu.java | 64 +
.../main/java/streamer/AssertingByteBuffer.java | 107 -
.../src/main/java/streamer/BaseElement.java | 98 +-
.../src/main/java/streamer/BufferPool.java | 0
.../src/main/java/streamer/ByteBuffer.java | 466 +-
.../src/main/java/streamer/DataSink.java | 0
.../src/main/java/streamer/DataSource.java | 0
.../src/main/java/streamer/Direction.java | 0
.../src/main/java/streamer/Element.java | 2 +-
.../src/main/java/streamer/Event.java | 3 +-
.../src/main/java/streamer/FakeSink.java | 69 -
.../src/main/java/streamer/FakeSource.java | 125 -
.../main/java/streamer/InputStreamSource.java | 36 +-
.../rdpconsole/src/main/java/streamer/Link.java | 0
.../src/main/java/streamer/MockSink.java | 113 -
.../src/main/java/streamer/MockSource.java | 89 -
.../src/main/java/streamer/OneTimeSwitch.java | 3 +
.../src/main/java/streamer/Order.java | 0
.../main/java/streamer/OutputStreamSink.java | 42 +-
.../src/main/java/streamer/Pipeline.java | 2 +
.../src/main/java/streamer/PipelineImpl.java | 77 +-
.../src/main/java/streamer/Queue.java | 28 +-
.../src/main/java/streamer/SocketWrapper.java | 216 +-
.../main/java/streamer/SocketWrapperImpl.java | 249 +
.../src/main/java/streamer/SyncLink.java | 123 +-
.../main/java/streamer/apr/AprSocketSink.java | 129 +
.../main/java/streamer/apr/AprSocketSource.java | 171 +
.../java/streamer/apr/AprSocketWrapperImpl.java | 281 +
.../java/streamer/bco/BcoSocketWrapperImpl.java | 119 +
.../streamer/debug/AssertingByteBuffer.java | 109 +
.../src/main/java/streamer/debug/Dumper.java | 28 +
.../src/main/java/streamer/debug/FakeSink.java | 77 +
.../main/java/streamer/debug/FakeSource.java | 138 +
.../main/java/streamer/debug/MockServer.java | 203 +
.../src/main/java/streamer/debug/MockSink.java | 154 +
.../main/java/streamer/debug/MockSource.java | 95 +
.../src/main/java/streamer/ssl/SSLState.java | 26 +
.../streamer/ssl/TrustAllX509TrustManager.java | 52 +
.../java/streamer/ssl/UpgradeSocketToSSL.java | 44 +
.../vncclient/AwtKeyboardEventToVncAdapter.java | 368 -
.../vncclient/AwtMouseEventToVncAdapter.java | 72 -
.../main/java/vncclient/EncodingsMessage.java | 63 -
.../vncclient/FrameBufferUpdateRequest.java | 126 -
.../vncclient/RGB888LE32PixelFormatRequest.java | 89 -
.../src/main/java/vncclient/RfbConstants.java | 85 -
.../src/main/java/vncclient/VncClient.java | 58 +-
.../src/main/java/vncclient/VncInitializer.java | 245 -
.../main/java/vncclient/VncMessageHandler.java | 420 -
.../java/vncclient/Vnc_3_3_Authentication.java | 292 -
.../src/main/java/vncclient/Vnc_3_3_Hello.java | 116 -
.../adapter/AwtVncKeyboardAdapter.java | 369 +
.../vncclient/adapter/AwtVncMouseAdapter.java | 71 +
.../java/vncclient/vnc/EncodingsMessage.java | 63 +
.../vncclient/vnc/FrameBufferUpdateRequest.java | 126 +
.../vnc/RGB888LE32PixelFormatRequest.java | 89 +
.../main/java/vncclient/vnc/RfbConstants.java | 85 +
.../java/vncclient/vnc/Vnc33Authentication.java | 292 +
.../src/main/java/vncclient/vnc/Vnc33Hello.java | 116 +
.../main/java/vncclient/vnc/VncInitializer.java | 245 +
.../java/vncclient/vnc/VncMessageHandler.java | 420 +
.../src/main/resources/jaas_ntlm_config.txt | 21 +
.../rdpconsole/src/test/doc/README.txt | 2 +
.../rdpconsole/src/test/doc/dev-rdp-config.bat | 13 +
.../src/test/doc/freerdp-debug-log.txt | 772 ++
.../rdpconsole/src/test/doc/rdp.pfx | Bin 0 -> 2572 bytes
.../src/test/java/rdpclient/MockServerTest.java | 9 +-
services/console-proxy/server/pom.xml | 5 +
.../com/cloud/consoleproxy/ConsoleProxy.java | 21 +-
.../consoleproxy/ConsoleProxyAjaxHandler.java | 8 +
.../consoleproxy/ConsoleProxyClientBase.java | 6 +-
.../consoleproxy/ConsoleProxyClientParam.java | 40 +-
.../ConsoleProxyHttpHandlerHelper.java | 37 +-
.../consoleproxy/ConsoleProxyRdpClient.java | 322 +
.../cloud/consoleproxy/rdp/KeysymToKeycode.java | 138 +
.../rdp/RdpBufferedImageCanvas.java | 103 +
.../consoleproxy/vnc/VncScreenDescription.java | 6 +-
.../resource/NfsSecondaryStorageResource.java | 46 +-
.../storage/template/DownloadManagerImpl.java | 13 +-
setup/bindir/cloud-setup-databases.in | 7 +-
setup/db/db/schema-410to420.sql | 19 -
setup/db/db/schema-420to421.sql | 25 +-
setup/db/db/schema-421to430.sql | 330 +-
setup/db/db/schema-430to440.sql | 243 +
setup/db/templates.simulator.sql | 8 +-
setup/db/templates.sql | 9 +-
systemvm/js/ajaxviewer.js | 10 +-
.../debian/config/etc/init.d/cloud-early-config | 22 +-
.../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 | 357 -
.../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 -
systemvm/scripts/ssvm-check.sh | 20 +-
.../component/test_add_remove_network.py | 6 +-
.../component/test_advancedsg_networks.py | 3785 +++++--
test/integration/component/test_assign_vm.py | 2 +-
.../component/test_base_image_updation.py | 6 +-
test/integration/component/test_blocker_bugs.py | 4 +-
.../component/test_cpu_domain_limits.py | 2 +-
test/integration/component/test_cpu_limits.py | 2 +-
.../component/test_cpu_max_limits.py | 4 +-
.../component/test_cpu_project_limits.py | 2 +-
.../component/test_egress_fw_rules.py | 203 +-
test/integration/component/test_egress_rules.py | 114 +-
test/integration/component/test_haproxy.py | 6 +-
test/integration/component/test_ldap.py | 9 -
.../integration/component/test_memory_limits.py | 4 +-
.../component/test_mm_domain_limits.py | 2 +-
.../integration/component/test_mm_max_limits.py | 4 +-
.../component/test_mm_project_limits.py | 2 +-
.../component/test_non_contiguous_vlan.py | 199 +-
.../component/test_project_resources.py | 16 +-
.../component/test_reset_ssh_keypair.py | 2 +-
.../component/test_resource_limits.py | 89 +-
test/integration/component/test_routers.py | 25 +-
test/integration/component/test_snapshots.py | 5 +-
.../component/test_snapshots_improvement.py | 7 +-
test/integration/component/test_templates.py | 5 +-
test/integration/component/test_vmware_drs.py | 2 +-
test/integration/component/test_vpc_network.py | 162 +-
.../component/test_vpc_network_lbrules.py | 5 +-
.../component/test_vpc_network_pfrules.py | 33 +-
.../component/test_vpc_network_staticnatrule.py | 35 +-
.../integration/component/test_vpc_offerings.py | 12 +-
.../component/test_vpc_vm_life_cycle.py | 104 +-
test/integration/component/test_vpn_users.py | 4 +-
.../smoke/test_deploy_vm_with_userdata.py | 7 +-
...deploy_vms_with_varied_deploymentplanners.py | 4 +-
test/integration/smoke/test_guest_vlan_range.py | 53 +-
.../integration/smoke/test_service_offerings.py | 19 +-
test/integration/smoke/test_volumes.py | 4 +
.../cloud/test/longrun/BuildGuestNetwork.java | 10 +-
.../com/cloud/test/longrun/GuestNetwork.java | 107 +
.../cloud/test/longrun/PerformanceWithAPI.java | 36 +-
.../com/cloud/test/longrun/guestNetwork.java | 107 -
.../com/cloud/test/regression/ApiCommand.java | 4 +-
.../cloud/test/regression/TestCaseEngine.java | 110 +-
.../test/stress/StressTestDirectAttach.java | 156 +-
.../cloud/test/stress/TestClientWithAPI.java | 362 +-
test/src/com/cloud/test/stress/WgetTest.java | 2 +-
test/src/com/cloud/test/utils/ConsoleProxy.java | 4 +-
tools/apidoc/XmlToHtmlConverter.java | 117 +-
tools/apidoc/gen_toc.py | 2 +-
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 +
.../systemvm64template/postinstall.sh | 12 +-
.../definitions/systemvmtemplate/postinstall.sh | 3 +
tools/build/build_asf.sh | 9 +-
tools/checkstyle/pom.xml | 43 +
.../src/main/resources/cloud-style.xml | 55 +
tools/marvin/marvin/cloudstackConnection.py | 2 +-
tools/marvin/marvin/cloudstackTestClient.py | 8 +-
tools/marvin/marvin/config/config.cfg | 159 +
tools/marvin/marvin/configGenerator.py | 5 +-
tools/marvin/marvin/deployDataCenter.py | 4 +-
tools/marvin/marvin/integration/lib/base.py | 2 +
tools/marvin/marvin/integration/lib/common.py | 193 +-
tools/marvin/marvin/integration/lib/utils.py | 56 +-
tools/marvin/marvin/marvinInit.py | 8 +-
tools/marvin/marvin/marvinPlugin.py | 21 +-
tools/marvin/marvin/misc/build/CI.md | 18 +
tools/marvin/marvin/misc/build/README.md | 18 +
tools/marvin/marvin/misc/build/advanced_env.py | 7 +-
tools/marvin/marvin/misc/build/asf_test.cfg | 18 +
tools/marvin/marvin/misc/build/bashUtils.py | 18 +
.../marvin/marvin/misc/build/buildGenerator.py | 18 +
tools/marvin/marvin/misc/build/configure.py | 17 +
tools/marvin/marvin/misc/build/hudson.sh | 17 +
tools/marvin/marvin/misc/build/kvm.cfg | 20 +-
tools/marvin/marvin/misc/build/openport.py | 18 +
tools/marvin/marvin/misc/build/redeploy.sh | 19 +
tools/marvin/marvin/misc/build/restartMgmt.py | 17 +
.../marvin/marvin/misc/build/system.properties | 19 +-
.../marvin/misc/build/testSetupSuccess.py | 17 +
tools/marvin/marvin/misc/build/vm-start.sh | 18 +
tools/marvin/marvin/misc/build/vm-uninstall.sh | 17 +
tools/marvin/marvin/misc/build/xen.cfg | 20 +-
tools/marvin/marvin/misc/build/xunitmp/setup.py | 9 +-
.../misc/build/xunitmp/xunitmultiprocess.py | 16 +
tools/marvin/pom.xml | 14 +-
tools/transifex/.tx/config | 4 +-
tools/transifex/sync-transifex-ui.sh | 2 +-
ui/css/cloudstack3.css | 90 +-
ui/dictionary.jsp | 20 +
ui/images/infrastructure-icons.png | Bin 40266 -> 62059 bytes
ui/index.jsp | 10 +-
ui/scripts/accounts.js | 44 +-
ui/scripts/accountsWizard.js | 2 +-
ui/scripts/affinity.js | 3 +-
ui/scripts/configuration.js | 6 +-
ui/scripts/events.js | 3 +-
ui/scripts/globalSettings.js | 33 +-
ui/scripts/instanceWizard.js | 6 +-
ui/scripts/instances.js | 42 +-
ui/scripts/network.js | 129 +-
ui/scripts/plugins.js | 49 +-
ui/scripts/sharedFunctions.js | 24 +-
ui/scripts/storage.js | 66 +-
ui/scripts/system.js | 9454 +++++++++---------
ui/scripts/templates.js | 56 +-
ui/scripts/ui-custom/accountsWizard.js | 12 +-
ui/scripts/ui-custom/zoneWizard.js | 8 +-
ui/scripts/ui/widgets/cloudBrowser.js | 11 +-
ui/scripts/ui/widgets/detailView.js | 23 +-
ui/scripts/ui/widgets/listView.js | 10 +-
ui/scripts/ui/widgets/multiEdit.js | 2 +
ui/scripts/ui/widgets/tagger.js | 6 +-
ui/scripts/vpc.js | 10 +-
ui/scripts/zoneWizard.js | 8 +-
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 +
usage/pom.xml | 58 +-
.../com/cloud/usage/UsageAlertManagerImpl.java | 6 +-
usage/src/com/cloud/usage/UsageManagerImpl.java | 490 +-
.../src/com/cloud/usage/UsageSanityChecker.java | 356 +-
.../usage/parser/IPAddressUsageParser.java | 34 +-
.../usage/parser/LoadBalancerUsageParser.java | 12 +-
.../parser/NetworkOfferingUsageParser.java | 20 +-
.../cloud/usage/parser/NetworkUsageParser.java | 14 +-
.../usage/parser/PortForwardingUsageParser.java | 12 +-
.../usage/parser/SecurityGroupUsageParser.java | 12 +-
.../cloud/usage/parser/StorageUsageParser.java | 12 +-
.../usage/parser/VMInstanceUsageParser.java | 12 +-
.../usage/parser/VMSnapshotUsageParser.java | 18 +-
.../cloud/usage/parser/VPNUserUsageParser.java | 12 +-
.../cloud/usage/parser/VmDiskUsageParser.java | 14 +-
.../cloud/usage/parser/VolumeUsageParser.java | 12 +-
.../usage/UsageManagerTestConfiguration.java | 12 +-
.../com/cloud/usage/UsageSanityCheckerIT.java | 159 +
.../com/cloud/usage/UsageSanityCheckerTest.java | 68 +
.../test/resources/UsageManagerTestContext.xml | 20 +-
usage/test/resources/cloud1.xml | 24 +
usage/test/resources/cloud2.xml | 24 +
usage/test/resources/cloud3.xml | 13 +
usage/test/resources/cloud_usage1.xml | 26 +
usage/test/resources/cloud_usage2.xml | 43 +
usage/test/resources/cloud_usage3.xml | 13 +
utils/src/com/cloud/utils/DateUtil.java | 6 +-
utils/src/com/cloud/utils/ExecutionResult.java | 44 +
utils/src/com/cloud/utils/StringUtils.java | 16 +-
utils/src/com/cloud/utils/SwiftUtil.java | 2 +-
utils/src/com/cloud/utils/UriUtils.java | 2 +
utils/src/com/cloud/utils/events/EventArgs.java | 2 +-
.../utils/exception/CloudRuntimeException.java | 49 +-
.../utils/exception/ExceptionProxyObject.java | 14 +-
utils/src/com/cloud/utils/net/NetUtils.java | 65 +-
utils/src/com/cloud/utils/nio/Link.java | 21 +-
.../cloud/utils/script/OutputInterpreter.java | 4 +-
utils/src/com/cloud/utils/script/Script.java | 15 +-
.../cloud/utils/security/CertificateHelper.java | 4 +-
utils/src/com/cloud/utils/ssh/SSHCmdHelper.java | 14 +-
utils/src/com/cloud/utils/ssh/SshException.java | 27 +
utils/src/com/cloud/utils/ssh/SshHelper.java | 4 +-
utils/src/com/cloud/utils/ssh/sshException.java | 27 -
.../utils/identity/ManagementServerNode.java | 2 +-
.../test/com/cloud/utils/net/NetUtilsTest.java | 10 +
.../cloud/hypervisor/vmware/mo/ClusterMO.java | 33 +-
.../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 | 62 +-
.../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 | 109 +-
.../vmware/mo/VmwareHypervisorHost.java | 2 +
.../hypervisor/vmware/util/VmwareClient.java | 75 +-
.../hypervisor/vmware/util/VmwareContext.java | 48 +-
.../vmware/util/VmwareContextPool.java | 35 -
.../vmware/util/VmwareGuestOsMapper.java | 4 +
.../hypervisor/vmware/util/VmwareHelper.java | 87 +-
1451 files changed, 87702 insertions(+), 55843 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849d601c/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --cc client/WEB-INF/classes/resources/messages.properties
index df09cf2,f1c166b..54721cd
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@@ -14,13 -14,24 +14,28 @@@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+message.select.compute.offering=Please select a compute offering to associate with this instance.
+message.select.disk.offering=(Optional) Select an additional disk offering to attach to this instance.
+label.home=Home
+label.use.default.language=Use default language
+ label.port=Port
+ label.remove.ldap=Remove LDAP
+ message.remove.ldap=Are you sure you want to delete the LDAP configuration?
+ label.configure.ldap=Configure LDAP
+ message.configure.ldap=Please confirm you would like to configure LDAP.
+ label.ldap.configuration=LDAP Configuration
+ label.ldap.port=LDAP port
+ label.create.nfs.secondary.staging.store=Create NFS secondary staging store
+ label.volatile=Volatile
+ label.planner.mode=Planner mode
+ label.deployment.planner=Deployment planner
+ label.quiesce.vm=Quiesce VM
+ label.smb.username=SMB Username
+ label.smb.password=SMB Password
+ label.smb.domain=SMB Domain
label.hypervisors=Hypervisors
label.home=Home
- label.sockets=Sockets
+ label.sockets=CPU Sockets
label.root.disk.size=Root disk size
label.s3.nfs.server=S3 NFS Server
label.s3.nfs.path=S3 NFS Path
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849d601c/ui/dictionary.jsp
----------------------------------------------------------------------
diff --cc ui/dictionary.jsp
index 501bb71,16ecbab..33f0fd7
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@@ -25,10 -25,21 +25,25 @@@ under the License
<% long now = System.currentTimeMillis(); %>
<script type="text/javascript">
dictionary = {
+'message.select.compute.offering': '<fmt:message key="message.select.compute.offering" />',
+'message.select.disk.offering': '<fmt:message key="message.select.disk.offering" />',
+'label.home': '<fmt:message key="label.home" />',
+'label.use.default.language': '<fmt:message key="label.use.default.language" />',
+ 'label.port': '<fmt:message key="label.port" />',
+ 'label.remove.ldap': '<fmt:message key="label.remove.ldap" />',
+ 'message.remove.ldap': '<fmt:message key="message.remove.ldap" />',
+ 'message.configure.ldap': '<fmt:message key="message.configure.ldap" />',
+ 'label.configure.ldap': '<fmt:message key="label.configure.ldap" />',
+ 'label.ldap.port': '<fmt:message key="label.ldap.port" />',
+ 'label.ldap.configuration': '<fmt:message key="label.ldap.configuration" />',
+ 'label.create.nfs.secondary.staging.store': '<fmt:message key="label.create.nfs.secondary.staging.store" />',
+ 'label.volatile': '<fmt:message key="label.volatile" />',
+ 'label.planner.mode': '<fmt:message key="label.planner.mode" />',
+ 'label.deployment.planner': '<fmt:message key="label.deployment.planner" />',
+ 'label.quiesce.vm': '<fmt:message key="label.quiesce.vm" />',
+ 'label.smb.username': '<fmt:message key="label.smb.username" />',
+ 'label.smb.password': '<fmt:message key="label.smb.password" />',
+ 'label.smb.domain': '<fmt:message key="label.smb.domain" />',
'label.hypervisors': '<fmt:message key="label.hypervisors" />',
'label.home': '<fmt:message key="label.home" />',
'label.sockets': '<fmt:message key="label.sockets" />',