Merge branch 'asf-master' into ui-restyle
Conflicts:
client/WEB-INF/classes/resources/messages.properties
ui/dictionary.jsp
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b7259a48
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b7259a48
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b7259a48
Branch: refs/heads/ui-restyle
Commit: b7259a48eae5b19fea1ba68b077fec857e8fabf8
Parents: e13c32f ed6c2d2
Author: Brian Federle <[email protected]>
Authored: Mon Nov 4 14:30:38 2013 -0800
Committer: Brian Federle <[email protected]>
Committed: Mon Nov 4 14:30:38 2013 -0800
----------------------------------------------------------------------
.../cloud/agent/dao/impl/PropertiesStorage.java | 14 +-
.../agent/dao/impl/PropertiesStorageTest.java | 69 +
api/src/com/cloud/agent/api/to/DataStoreTO.java | 5 +-
api/src/com/cloud/agent/api/to/DiskTO.java | 36 +-
api/src/com/cloud/agent/api/to/NfsTO.java | 1 +
api/src/com/cloud/agent/api/to/S3TO.java | 6 +-
api/src/com/cloud/event/EventTypes.java | 3 +
api/src/com/cloud/network/Network.java | 1 +
api/src/com/cloud/network/RemoteAccessVpn.java | 3 +-
.../cloud/network/Site2SiteVpnConnection.java | 1 +
.../network/vpn/RemoteAccessVpnService.java | 3 +-
.../cloud/server/ResourceMetaDataService.java | 12 +-
api/src/com/cloud/server/ResourceTag.java | 5 +-
api/src/com/cloud/storage/StorageService.java | 16 +-
api/src/com/cloud/user/DomainService.java | 3 +
.../cloud/vm/snapshot/VMSnapshotService.java | 2 +-
.../org/apache/cloudstack/api/APICommand.java | 4 +
.../cloudstack/api/ApiCommandJobType.java | 1 +
.../org/apache/cloudstack/api/ApiConstants.java | 5 +-
.../org/apache/cloudstack/api/Parameter.java | 3 +
.../apache/cloudstack/api/ResourceDetail.java | 8 +-
.../PrepareSecondaryStorageForMigrationCmd.java | 109 +
.../command/admin/usage/GetUsageRecordsCmd.java | 19 +-
.../api/command/admin/vm/AssignVMCmd.java | 2 +-
.../user/vmsnapshot/CreateVMSnapshotCmd.java | 13 +-
.../user/volume/ListResourceDetailsCmd.java | 50 +-
.../api/command/user/volume/ListVolumesCmd.java | 9 +
.../user/vpn/CreateRemoteAccessVpnCmd.java | 17 +-
.../user/vpn/CreateVpnConnectionCmd.java | 10 +
.../api/response/ResourceDetailResponse.java | 15 +-
.../Site2SiteVpnConnectionResponse.java | 7 +
.../cloudstack/api/response/ZoneResponse.java | 9 +
.../apache/cloudstack/query/QueryService.java | 2 +-
.../apache/cloudstack/usage/UsageService.java | 4 +-
.../api/command/test/UsageCmdTest.java | 9 +-
.../com/cloud/bridge/persist/dao/BaseDao.java | 28 +-
.../util/EncryptionSecretKeyCheckerUtil.java | 138 -
.../classes/resources/messages.properties | 3 +
client/pom.xml | 10 +
client/tomcatconf/commands.properties.in | 17 +-
.../bootstrap/spring-bootstrap-context.xml | 3 +-
.../core/spring-core-registry-core-context.xml | 78 +-
...re-lifecycle-network-context-inheritable.xml | 38 +-
...ng-lifecycle-storage-context-inheritable.xml | 6 +
.../cloud/agent/api/CreateVMSnapshotAnswer.java | 12 +-
.../agent/api/CreateVMSnapshotCommand.java | 4 +-
.../cloud/agent/api/DeleteVMSnapshotAnswer.java | 12 +-
.../agent/api/DeleteVMSnapshotCommand.java | 3 +-
.../src/com/cloud/agent/api/MigrateCommand.java | 11 +-
.../agent/api/RevertToVMSnapshotAnswer.java | 14 +-
.../agent/api/RevertToVMSnapshotCommand.java | 3 +-
core/src/com/cloud/agent/api/SetupCommand.java | 20 +
core/src/com/cloud/agent/api/StartAnswer.java | 11 +
.../cloud/agent/api/VMSnapshotBaseCommand.java | 10 +-
core/src/com/cloud/agent/api/VMSnapshotTO.java | 12 +
.../api/routing/RemoteAccessVpnCfgCommand.java | 35 +-
.../api/routing/Site2SiteVpnCfgCommand.java | 12 +-
.../virtualnetwork/VirtualRoutingResource.java | 5 +
.../StorageSubsystemCommandHandlerBase.java | 7 +-
.../storage/command/AttachCommand.java | 72 -
.../cloudstack/storage/to/ImageStoreTO.java | 5 +
.../storage/to/PrimaryDataStoreTO.java | 10 +-
.../cloudstack/storage/to/VolumeObjectTO.java | 12 +
.../api/storage/DataStoreLifeCycle.java | 2 +
.../subsystem/api/storage/DataStoreManager.java | 3 +
.../subsystem/api/storage/PrimaryDataStore.java | 43 +
.../api/storage/SnapshotDataFactory.java | 4 +
.../api/storage/StorageStrategyFactory.java | 5 +-
.../api/storage/TemplateDataFactory.java | 6 +
.../subsystem/api/storage/TemplateService.java | 6 +-
.../api/storage/VMSnapshotOptions.java | 30 +
.../api/storage/VMSnapshotStrategy.java | 28 +
.../api/storage/VolumeDataFactory.java | 4 +
.../com/cloud/agent/manager/AgentAttache.java | 5 +-
.../cloud/agent/manager/AgentManagerImpl.java | 28 +-
.../cloud/agent/manager/DirectAgentAttache.java | 33 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 77 +-
.../orchestration/NetworkOrchestrator.java | 2 +-
.../orchestration/VolumeOrchestrator.java | 43 +-
.../spring-engine-schema-core-daos-context.xml | 7 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 2 +-
.../src/com/cloud/dc/DataCenterDetailVO.java | 82 +
engine/schema/src/com/cloud/dc/DcDetailVO.java | 79 -
.../src/com/cloud/dc/dao/DataCenterDaoImpl.java | 14 +-
.../com/cloud/dc/dao/DataCenterDetailsDao.java | 25 +
.../cloud/dc/dao/DataCenterDetailsDaoImpl.java | 49 +
.../src/com/cloud/dc/dao/DcDetailsDao.java | 37 -
.../src/com/cloud/dc/dao/DcDetailsDaoImpl.java | 133 -
.../com/cloud/network/dao/NetworkDetailVO.java | 44 +-
.../cloud/network/dao/NetworkDetailsDao.java | 16 +-
.../network/dao/NetworkDetailsDaoImpl.java | 71 +-
.../cloud/network/dao/RemoteAccessVpnDao.java | 3 +-
.../network/dao/RemoteAccessVpnDaoImpl.java | 9 +
.../cloud/network/dao/RemoteAccessVpnVO.java | 15 +-
.../network/dao/Site2SiteVpnConnectionVO.java | 14 +-
.../cloud/service/ServiceOfferingDetailsVO.java | 30 +-
.../service/dao/ServiceOfferingDaoImpl.java | 15 +-
.../service/dao/ServiceOfferingDetailsDao.java | 8 +-
.../dao/ServiceOfferingDetailsDaoImpl.java | 72 +-
.../com/cloud/storage/VMTemplateDetailVO.java | 40 +-
.../src/com/cloud/storage/VolumeDetailVO.java | 40 +-
.../schema/src/com/cloud/storage/VolumeVO.java | 2 +-
.../storage/dao/StoragePoolDetailsDaoImpl.java | 63 +-
.../cloud/storage/dao/VMTemplateDaoImpl.java | 27 +-
.../cloud/storage/dao/VMTemplateDetailsDao.java | 16 +-
.../storage/dao/VMTemplateDetailsDaoImpl.java | 97 +-
.../com/cloud/storage/dao/VolumeDetailsDao.java | 16 +-
.../cloud/storage/dao/VolumeDetailsDaoImpl.java | 91 +-
.../src/com/cloud/upgrade/DatabaseCreator.java | 12 +-
.../com/cloud/upgrade/dao/Upgrade307to410.java | 25 +-
.../com/cloud/upgrade/dao/Upgrade40to41.java | 20 +-
.../src/com/cloud/usage/dao/UsageDao.java | 3 +-
.../src/com/cloud/usage/dao/UsageDaoImpl.java | 5 +-
engine/schema/src/com/cloud/vm/NicDetailVO.java | 39 +-
.../schema/src/com/cloud/vm/UserVmDetailVO.java | 42 +-
.../src/com/cloud/vm/dao/NicDetailDao.java | 35 -
.../src/com/cloud/vm/dao/NicDetailDaoImpl.java | 103 -
.../src/com/cloud/vm/dao/NicDetailsDao.java | 25 +
.../src/com/cloud/vm/dao/NicDetailsDaoImpl.java | 34 +
.../src/com/cloud/vm/dao/UserVmDaoImpl.java | 18 +-
.../src/com/cloud/vm/dao/UserVmDetailsDao.java | 18 +-
.../com/cloud/vm/dao/UserVmDetailsDaoImpl.java | 106 +-
.../cloud/vm/snapshot/VMSnapshotDetailsVO.java | 87 +
.../src/com/cloud/vm/snapshot/VMSnapshotVO.java | 18 +-
.../vm/snapshot/dao/VMSnapshotDetailsDao.java | 28 +
.../snapshot/dao/VMSnapshotDetailsDaoImpl.java | 52 +
.../resourcedetail/FirewallRuleDetailVO.java | 80 +
.../resourcedetail/ResourceDetailsDao.java | 71 +
.../resourcedetail/ResourceDetailsDaoBase.java | 139 +
.../dao/FirewallRuleDetailsDao.java | 26 +
.../dao/FirewallRuleDetailsDaoImpl.java | 34 +
.../storage/datastore/db/ImageStoreDao.java | 2 +
.../datastore/db/PrimaryDataStoreDaoImpl.java | 14 +-
.../datastore/db/PrimaryDataStoreDetailVO.java | 40 +-
.../db/PrimaryDataStoreDetailsDao.java | 10 +-
.../datastore/db/SnapshotDataStoreDao.java | 9 +
.../datastore/db/SnapshotDataStoreVO.java | 34 +-
.../datastore/db/StoragePoolDetailVO.java | 44 +-
.../datastore/db/StoragePoolDetailsDao.java | 10 +-
.../datastore/db/TemplateDataStoreDao.java | 10 +-
.../datastore/db/TemplateDataStoreVO.java | 51 +-
.../datastore/db/VolumeDataStoreDao.java | 2 +
.../storage/datastore/db/VolumeDataStoreVO.java | 47 +-
.../motion/AncientDataMotionStrategy.java | 155 +-
.../storage/image/TemplateDataFactoryImpl.java | 38 +-
.../storage/image/TemplateServiceImpl.java | 113 +-
.../manager/ImageStoreProviderManagerImpl.java | 15 +-
.../storage/image/store/TemplateObject.java | 8 +
.../vm/snapshot/dao/VmSnapshotDaoTest.java | 46 +
.../storage/test/ChildTestConfiguration.java | 51 +-
.../cloudstack/storage/test/SnapshotTest.java | 89 +-
.../test/resources/storageContext.xml | 5 +
.../core/spring-engine-storage-core-context.xml | 5 +
engine/storage/snapshot/pom.xml | 32 +
...-engine-storage-snapshot-storage-context.xml | 5 +-
.../snapshot/SnapshotDataFactoryImpl.java | 22 +-
.../storage/snapshot/SnapshotServiceImpl.java | 46 +-
.../snapshot/XenserverSnapshotStrategy.java | 34 +-
.../vmsnapshot/DefaultVMSnapshotStrategy.java | 371 +++
.../snapshot/test/resources/db.properties | 70 +
.../test/src/VMSnapshotStrategyTest.java | 256 ++
.../storage/datastore/DataStoreManagerImpl.java | 5 +
.../storage/datastore/PrimaryDataStore.java | 43 -
.../PrimaryDataStoreProviderManager.java | 1 +
.../endpoint/DefaultEndPointSelector.java | 33 +-
.../storage/helper/HypervisorHelper.java | 11 +-
.../storage/helper/HypervisorHelperImpl.java | 106 +-
.../helper/StorageStrategyFactoryImpl.java | 22 +
.../storage/helper/VMSnapshotHelperImpl.java | 148 +
.../storage/image/BaseImageStoreDriverImpl.java | 45 +-
.../image/datastore/ImageStoreHelper.java | 21 +-
.../datastore/ImageStoreProviderManager.java | 2 +
.../storage/image/db/ImageStoreDaoImpl.java | 10 +-
.../image/db/SnapshotDataStoreDaoImpl.java | 82 +-
.../image/db/TemplateDataStoreDaoImpl.java | 104 +
.../image/db/VolumeDataStoreDaoImpl.java | 55 +-
.../storage/vmsnapshot/VMSnapshotHelper.java | 38 +
.../volume/TemplateOnPrimaryDataStoreInfo.java | 2 +-
.../db/PrimaryDataStoreDetailsDaoImpl.java | 50 +-
engine/storage/storage.ucls | 2 +-
.../storage/datastore/PrimaryDataStoreImpl.java | 16 +-
.../PrimaryDataStoreProviderManagerImpl.java | 2 +-
.../storage/volume/VolumeDataFactoryImpl.java | 33 +-
.../storage/volume/VolumeServiceImpl.java | 26 +-
.../com/cloud/cluster/ClusterManagerImpl.java | 12 +-
.../cluster/ClusterServiceServletAdapter.java | 19 +-
.../src/com/cloud/utils/db/GenericDaoBase.java | 7 +
.../com/cloud/utils/db/TransactionLegacy.java | 38 +-
.../jobs/impl/AsyncJobManagerImpl.java | 15 +-
parents/checkstyle/pom.xml | 7 +
.../src/main/resources/tooling/checkstyle.xml | 21 +
.../debian/config/etc/logrotate.d/cloud | 11 +
.../debian/config/opt/cloud/bin/savepassword.sh | 62 -
.../acl/StaticRoleBasedAPIAccessChecker.java | 37 +-
.../cloud/deploy/ImplicitDedicationPlanner.java | 2 +-
.../implicitplanner/ImplicitPlannerTest.java | 2 +-
.../hyperv/DotNet/ServerResource/.gitignore | 9 +
.../DotNet/ServerResource/.nuget/NuGet.Config | 15 +
.../DotNet/ServerResource/.nuget/NuGet.targets | 136 +
.../AgentShell/AgentService.Designer.cs | 53 +
.../ServerResource/AgentShell/AgentService.cs | 132 +
.../AgentShell/AgentSettings.Designer.cs | 402 +++
.../AgentShell/AgentSettings.settings | 130 +
.../ServerResource/AgentShell/AgentShell.csproj | 140 +
.../AgentShell/AgentShellException.cs | 28 +
.../DotNet/ServerResource/AgentShell/App.config | 145 +
.../DotNet/ServerResource/AgentShell/Program.cs | 58 +
.../AgentShell/Properties/AssemblyInfo.cs | 56 +
.../ServerResource/AgentShell/packages.config | 13 +
.../ServerResource/HypervResource/App.config | 128 +
.../HypervResource/CloudStackTypes.cs | 642 +++++
.../HypervResource/HypervResource.csproj | 103 +
.../HypervResource/HypervResourceController.cs | 1459 ++++++++++
.../HypervResource/IWmiCallsV2.cs | 67 +
.../HypervResource/Properties/AssemblyInfo.cs | 53 +
.../ServerResource/HypervResource/Utils.cs | 131 +
.../ServerResource/HypervResource/WmiCallsV2.cs | 2120 +++++++++++++++
.../HypervResource/packages.config | 9 +
.../ServerResource.Tests/App.config | 139 +
.../HypervResourceController1Test.cs | 350 +++
.../HypervResourceControllerTest.cs | 1147 ++++++++
.../Properties/AssemblyInfo.cs | 52 +
.../ServerResource.Tests.csproj | 135 +
.../ServerResource.Tests/packages.config | 9 +
.../DotNet/ServerResource/ServerResource.sln | 61 +
.../WmiWrappers/Properties/AssemblyInfo.cs | 53 +
.../ROOT.CIMV2.Win32_OperatingSystem.cs | 2452 +++++++++++++++++
.../WmiWrappers/ROOT.CIMV2.Win32_Processor.cs | 2540 ++++++++++++++++++
...OOT.virtualization.v2.Msvm_ComputerSystem.cs | 1818 +++++++++++++
.../ROOT.virtualization.v2.Msvm_ConcreteJob.cs | 1843 +++++++++++++
...v2.Msvm_EthernetPortAllocationSettingData.cs | 1164 ++++++++
...virtualization.v2.Msvm_EthernetSwitchPort.cs | 2119 +++++++++++++++
...v2.Msvm_EthernetSwitchPortVlanSettingData.cs | 1022 +++++++
...rtualization.v2.Msvm_ExternalEthernetPort.cs | 2087 ++++++++++++++
...ualization.v2.Msvm_ImageManagementService.cs | 1525 +++++++++++
...rtualization.v2.Msvm_KvpExchangeComponent.cs | 1615 +++++++++++
...n.v2.Msvm_KvpExchangeComponentSettingData.cs | 1054 ++++++++
...irtualization.v2.Msvm_KvpExchangeDataItem.cs | 670 +++++
.../ROOT.virtualization.v2.Msvm_LANEndpoint.cs | 1422 ++++++++++
....virtualization.v2.Msvm_MemorySettingData.cs | 1163 ++++++++
...rtualization.v2.Msvm_ProcessorSettingData.cs | 1134 ++++++++
...ion.v2.Msvm_ResourceAllocationSettingData.cs | 1010 +++++++
...tion.v2.Msvm_StorageAllocationSettingData.cs | 1214 +++++++++
...virtualization.v2.Msvm_SummaryInformation.cs | 1537 +++++++++++
....v2.Msvm_SyntheticEthernetPortSettingData.cs | 1083 ++++++++
...tualization.v2.Msvm_VirtualEthernetSwitch.cs | 1386 ++++++++++
...vm_VirtualEthernetSwitchManagementService.cs | 1515 +++++++++++
...zation.v2.Msvm_VirtualHardDiskSettingData.cs | 1051 ++++++++
...on.v2.Msvm_VirtualSystemManagementService.cs | 1916 +++++++++++++
...VirtualSystemManagementServiceSettingData.cs | 809 ++++++
...lization.v2.Msvm_VirtualSystemSettingData.cs | 1690 ++++++++++++
.../ServerResource/WmiWrappers/Readme.txt | 20 +
.../WmiWrappers/WmiWrappers.csproj | 175 ++
...rmattedData_Counters_ProcessorInformation.cs | 1754 ++++++++++++
plugins/hypervisors/hyperv/buildagent.sh | 28 +
.../hypervisors/hyperv/conf/agent.properties | 35 +
.../hyperv/conf/developer.properties.template | 55 +
.../hyperv/conf/environment.properties.in | 21 +
plugins/hypervisors/hyperv/conf/log4j-cloud.xml | 93 +
.../hypervisors/hyperv/conf/log4j-cloud.xml.in | 93 +
plugins/hypervisors/hyperv/conf/log4j.xml | 93 +
plugins/hypervisors/hyperv/pom.xml | 163 ++
.../cloudstack/hyperv-compute/module.properties | 18 +
.../spring-hyperv-compute-context.xml | 24 +
.../hyperv-discoverer/module.properties | 18 +
.../spring-hyperv-discoverer-context.xml | 25 +
.../discoverer/HypervServerDiscoverer.java | 690 +++++
.../hypervisor/hyperv/guru/HypervGuru.java | 68 +
.../resource/HypervDirectConnectResource.java | 1745 ++++++++++++
.../test/HypervDirectConnectResourceTest.java | 938 +++++++
.../kvm/resource/BridgeVifDriver.java | 29 +-
.../kvm/resource/LibvirtComputingResource.java | 95 +-
.../hypervisor/kvm/storage/KVMStoragePool.java | 12 +-
.../kvm/storage/KVMStoragePoolManager.java | 112 +-
.../kvm/storage/KVMStorageProcessor.java | 8 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 85 +-
.../kvm/storage/LibvirtStoragePool.java | 11 +
.../hypervisor/kvm/storage/StorageAdaptor.java | 13 +
.../kvm/storage/iScsiAdmStorageAdaptor.java | 373 +++
.../kvm/storage/iScsiAdmStoragePool.java | 167 ++
.../simulator-planner/module.properties | 18 -
.../simulator-planner/spring-context.xml | 34 -
.../driver/SimulatorImageStoreDriverImpl.java | 34 +-
.../SimulatorImageStoreLifeCycleImpl.java | 36 +-
.../vmware/manager/VmwareHostService.java | 3 +
.../manager/VmwareStorageManagerImpl.java | 87 +-
.../vmware/resource/VmwareResource.java | 74 +-
.../VmwareSecondaryStorageResourceHandler.java | 4 +
.../resource/VmwareStorageProcessor.java | 123 +-
.../xen/discoverer/XcpServerDiscoverer.java | 3 +
.../xen/resource/CitrixResourceBase.java | 315 ++-
.../xen/resource/XenServer56FP1Resource.java | 133 -
.../xen/resource/XenServerStorageProcessor.java | 33 +-
.../api/ConfigureNexusVsmForAsaCommand.java | 3 +
.../cloud/network/element/CiscoVnmcElement.java | 206 +-
.../network-elements/juniper-contrail/pom.xml | 136 +
.../api/command/CreateServiceInstanceCmd.java | 182 ++
.../api/response/ServiceInstanceResponse.java | 83 +
.../contrail/management/ContrailElement.java | 28 +
.../management/ContrailElementImpl.java | 349 +++
.../contrail/management/ContrailGuru.java | 333 +++
.../contrail/management/ContrailManager.java | 93 +
.../management/ContrailManagerImpl.java | 769 ++++++
.../contrail/management/DBSyncGeneric.java | 322 +++
.../network/contrail/management/EventUtils.java | 120 +
.../management/ManagementNetworkGuru.java | 114 +
.../contrail/management/ModelDatabase.java | 89 +
.../contrail/management/ServerDBSync.java | 39 +
.../contrail/management/ServerDBSyncImpl.java | 965 +++++++
.../contrail/management/ServerEventHandler.java | 22 +
.../management/ServerEventHandlerImpl.java | 251 ++
.../contrail/management/ServiceManager.java | 40 +
.../contrail/management/ServiceManagerImpl.java | 249 ++
.../management/ServiceVirtualMachine.java | 30 +
.../network/contrail/model/FloatingIpModel.java | 213 ++
.../contrail/model/FloatingIpPoolModel.java | 170 ++
.../network/contrail/model/InstanceIpModel.java | 174 ++
.../network/contrail/model/ModelController.java | 85 +
.../network/contrail/model/ModelObject.java | 118 +
.../network/contrail/model/ModelObjectBase.java | 111 +
.../contrail/model/ServiceInstanceModel.java | 320 +++
.../contrail/model/VMInterfaceModel.java | 265 ++
.../contrail/model/VirtualMachineModel.java | 349 +++
.../contrail/model/VirtualNetworkModel.java | 494 ++++
.../management/ApiConnectorMockito.java | 149 +
.../IntegrationTestConfiguration.java | 835 ++++++
.../management/ManagementServerMock.java | 393 +++
.../contrail/management/MockAccountManager.java | 372 +++
.../management/NetworkProviderTest.java | 477 ++++
.../management/ProviderTestConfiguration.java | 12 +
.../contrail/management/PublicNetworkTest.java | 147 +
.../PublicNetworkTestConfiguration.java | 13 +
.../contrail/management/TestDbSetup.java | 151 ++
.../management/VirtualNetworkModelTest.java | 62 +
.../test/resources/commonContext.xml | 172 ++
.../test/resources/contrail.properties | 19 +
.../test/resources/db.properties | 66 +
.../test/resources/log4j.properties | 35 +
.../test/resources/mysql_db_start.sh | 51 +
.../test/resources/mysql_db_stop.sh | 31 +
.../test/resources/providerContext.xml | 16 +
.../test/resources/publicNetworkContext.xml | 16 +
plugins/network-elements/nicira-nvp/pom.xml | 35 +
.../cloudstack/nvp/spring-nvp-context.xml | 2 +-
...ortForwardingRulesOnLogicalRouterAnswer.java | 18 +-
...rtForwardingRulesOnLogicalRouterCommand.java | 69 +-
...ConfigurePublicIpsOnLogicalRouterAnswer.java | 13 +-
...onfigurePublicIpsOnLogicalRouterCommand.java | 80 +-
...gureStaticNatRulesOnLogicalRouterAnswer.java | 36 +-
...ureStaticNatRulesOnLogicalRouterCommand.java | 74 +-
.../agent/api/CreateLogicalRouterAnswer.java | 8 +-
.../agent/api/CreateLogicalRouterCommand.java | 178 +-
.../agent/api/CreateLogicalSwitchAnswer.java | 4 +-
.../agent/api/CreateLogicalSwitchCommand.java | 10 +-
.../api/CreateLogicalSwitchPortAnswer.java | 6 +-
.../api/CreateLogicalSwitchPortCommand.java | 14 +-
.../agent/api/DeleteLogicalRouterAnswer.java | 6 +-
.../agent/api/DeleteLogicalRouterCommand.java | 37 +-
.../agent/api/DeleteLogicalSwitchCommand.java | 6 +-
.../api/DeleteLogicalSwitchPortCommand.java | 10 +-
.../agent/api/FindLogicalSwitchPortAnswer.java | 6 +-
.../agent/api/FindLogicalSwitchPortCommand.java | 16 +-
.../api/UpdateLogicalSwitchPortAnswer.java | 6 +-
.../api/UpdateLogicalSwitchPortCommand.java | 16 +-
.../api/commands/AddNiciraNvpDeviceCmd.java | 45 +-
.../api/commands/DeleteNiciraNvpDeviceCmd.java | 24 +-
.../ListNiciraNvpDeviceNetworksCmd.java | 8 +-
.../api/commands/ListNiciraNvpDevicesCmd.java | 14 +-
.../api/response/NiciraNvpDeviceResponse.java | 30 +-
.../com/cloud/network/NiciraNvpDeviceVO.java | 25 +-
.../cloud/network/NiciraNvpNicMappingVO.java | 17 +-
.../cloud/network/NiciraNvpRouterMappingVO.java | 92 +-
.../com/cloud/network/dao/NiciraNvpDaoImpl.java | 6 +-
.../network/dao/NiciraNvpNicMappingDao.java | 9 +-
.../network/dao/NiciraNvpNicMappingDaoImpl.java | 6 +-
.../network/dao/NiciraNvpRouterMappingDao.java | 2 +-
.../dao/NiciraNvpRouterMappingDaoImpl.java | 29 +-
.../cloud/network/element/NiciraNvpElement.java | 38 +-
.../network/guru/NiciraNvpGuestNetworkGuru.java | 1 -
.../network/nicira/ControlClusterStatus.java | 108 +-
.../network/nicira/DestinationNatRule.java | 5 +-
.../network/nicira/L3GatewayAttachment.java | 60 +-
.../network/nicira/LogicalRouterConfig.java | 53 +-
.../cloud/network/nicira/LogicalRouterPort.java | 132 +-
.../com/cloud/network/nicira/LogicalSwitch.java | 28 +-
.../cloud/network/nicira/LogicalSwitchPort.java | 4 +-
.../src/com/cloud/network/nicira/Match.java | 238 +-
.../src/com/cloud/network/nicira/NatRule.java | 14 +-
.../com/cloud/network/nicira/NiciraNvpApi.java | 351 +--
.../com/cloud/network/nicira/NiciraNvpList.java | 4 +-
.../com/cloud/network/nicira/NiciraNvpTag.java | 14 +-
.../cloud/network/nicira/PatchAttachment.java | 31 +-
.../com/cloud/network/nicira/RouterNextHop.java | 34 +-
.../SingleDefaultRouteImplictRoutingConfig.java | 34 +-
.../com/cloud/network/nicira/SourceNatRule.java | 4 +-
.../network/nicira/TransportZoneBinding.java | 6 +-
.../com/cloud/network/nicira/VifAttachment.java | 8 +-
.../network/resource/NiciraNvpResource.java | 978 +++----
.../network/element/NiciraNvpElementTest.java | 21 +-
.../guru/NiciraNvpGuestNetworkGuruTest.java | 811 +++---
.../com/cloud/network/nicira/NatRuleTest.java | 16 +-
.../cloud/network/nicira/NiciraNvpApiTest.java | 542 ++--
.../network/resource/NiciraNvpResourceTest.java | 1533 +++++------
plugins/pom.xml | 2 +
.../driver/CloudStackImageStoreDriverImpl.java | 16 +-
.../CloudStackImageStoreLifeCycleImpl.java | 9 +
.../lifecycle/S3ImageStoreLifeCycleImpl.java | 12 +-
.../SampleImageStoreLifeCycleImpl.java | 9 +
.../driver/SwiftImageStoreDriverImpl.java | 30 +-
.../lifecycle/SwiftImageStoreLifeCycleImpl.java | 30 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 16 +-
...CloudStackPrimaryDataStoreLifeCycleImpl.java | 18 +-
.../SamplePrimaryDataStoreDriverImpl.java | 9 +-
.../SamplePrimaryDataStoreLifeCycleImpl.java | 34 +-
.../SolidFirePrimaryDataStoreLifeCycle.java | 54 +-
.../provider/SolidFireHostListener.java | 102 +
.../SolidfirePrimaryDataStoreProvider.java | 10 +-
.../api/command/LdapImportUsersCmd.java | 161 ++
.../api/response/LdapUserResponse.java | 162 +-
.../cloudstack/ldap/LdapConfiguration.java | 16 +-
.../org/apache/cloudstack/ldap/LdapManager.java | 2 +
.../apache/cloudstack/ldap/LdapManagerImpl.java | 24 +-
.../org/apache/cloudstack/ldap/LdapUser.java | 12 +-
.../apache/cloudstack/ldap/LdapUserManager.java | 230 +-
.../ldap/LdapConfigurationSpec.groovy | 37 +-
.../ldap/LdapCreateAccountCmdSpec.groovy | 8 +-
.../ldap/LdapImportUsersCmdSpec.groovy | 191 ++
.../cloudstack/ldap/LdapListUsersCmdSpec.groovy | 10 +-
.../cloudstack/ldap/LdapManagerImplSpec.groovy | 55 +-
.../ldap/LdapSearchUserCmdSpec.groovy | 5 +-
.../cloudstack/ldap/LdapUserManagerSpec.groovy | 77 +
.../cloudstack/ldap/LdapUserResponseSpec.groovy | 18 +
.../apache/cloudstack/ldap/LdapUserSpec.groovy | 31 +-
pom.xml | 11 +
python/lib/cloudutils/serviceConfig.py | 5 +-
scripts/storage/secondary/createtmplt.sh | 23 +-
scripts/vm/hypervisor/xenserver/s3xen | 68 +-
scripts/vm/hypervisor/xenserver/vmops | 8 +-
scripts/vm/network/vnet/modifyvxlan.sh | 37 +-
.../spring-server-core-managers-context.xml | 20 +-
.../system/spring-server-system-context.xml | 36 +
server/src/com/cloud/api/ApiDBUtils.java | 35 +-
server/src/com/cloud/api/ApiDispatcher.java | 21 +-
server/src/com/cloud/api/ApiResponseHelper.java | 8 +-
.../com/cloud/api/query/QueryManagerImpl.java | 88 +-
.../com/cloud/api/query/ViewResponseHelper.java | 6 +-
.../api/query/dao/DataCenterJoinDaoImpl.java | 2 +
.../query/dao/ServiceOfferingJoinDaoImpl.java | 3 +-
server/src/com/cloud/configuration/Config.java | 3 +
.../configuration/ConfigurationManagerImpl.java | 36 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 2 +-
.../cloud/ha/HighAvailabilityManagerImpl.java | 9 +-
.../hypervisor/CloudZonesStartupProcessor.java | 13 +-
.../cloud/hypervisor/HypervisorGuruBase.java | 2 +-
.../metadata/ResourceMetaDataManagerImpl.java | 162 +-
.../ExternalFirewallDeviceManagerImpl.java | 17 +-
.../com/cloud/network/NetworkServiceImpl.java | 26 +-
.../network/element/VirtualRouterElement.java | 15 +-
.../element/VpcVirtualRouterElement.java | 45 +
.../network/firewall/FirewallManagerImpl.java | 51 +-
.../cloud/network/guru/ControlNetworkGuru.java | 4 +-
.../lb/LoadBalancingRulesManagerImpl.java | 10 +-
.../VirtualNetworkApplianceManagerImpl.java | 13 +-
.../VpcVirtualNetworkApplianceManager.java | 29 +
.../VpcVirtualNetworkApplianceManagerImpl.java | 120 +-
.../network/vpc/NetworkACLManagerImpl.java | 10 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 89 +-
.../network/vpn/Site2SiteVpnManagerImpl.java | 20 +-
.../com/cloud/server/ManagementServerImpl.java | 89 +-
.../com/cloud/storage/StorageManagerImpl.java | 76 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 190 +-
.../storage/download/DownloadMonitorImpl.java | 15 +-
.../storage/listener/StoragePoolMonitor.java | 3 +
.../secondary/SecondaryStorageManagerImpl.java | 2 +-
.../storage/snapshot/SnapshotManagerImpl.java | 110 +-
.../cloud/storage/upload/UploadListener.java | 7 +-
.../cloud/storage/upload/UploadMonitorImpl.java | 118 +-
.../cloud/tags/TaggedResourceManagerImpl.java | 5 +
.../template/HypervisorTemplateAdapter.java | 29 +-
.../com/cloud/template/TemplateManagerImpl.java | 109 +-
.../src/com/cloud/usage/UsageServiceImpl.java | 15 +-
.../src/com/cloud/user/DomainManagerImpl.java | 9 +
server/src/com/cloud/vm/UserVmManagerImpl.java | 32 +-
.../vm/snapshot/VMSnapshotManagerImpl.java | 456 +---
.../cloudstack/region/RegionManagerImpl.java | 21 +-
.../metadata/ResourceMetaDataManagerTest.java | 12 +-
.../SecurityGroupManagerTestConfiguration.java | 4 +-
.../com/cloud/user/MockDomainManagerImpl.java | 6 +
.../vm/snapshot/VMSnapshotManagerTest.java | 7 -
.../MockVpcVirtualNetworkApplianceManager.java | 22 +
.../com/cloud/vpc/VpcTestConfiguration.java | 4 +-
.../networkoffering/ChildTestConfiguration.java | 4 +-
setup/db/db/schema-420to421.sql | 7 +-
setup/db/db/schema-421to430.sql | 41 +
.../debian/config/etc/init.d/cloud-early-config | 17 +-
.../debian/config/opt/cloud/bin/ipsectunnel.sh | 47 +-
.../debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh | 178 --
.../debian/vpn/opt/cloud/bin/vpn_l2tp.sh | 95 +-
.../component/maint/test_multiple_ip_ranges.py | 557 ++--
.../component/test_base_image_updation.py | 648 +++++
.../component/test_deploy_vm_userdata_reg.py | 220 ++
test/integration/component/test_egress_rules.py | 207 --
.../component/test_non_contiguous_vlan.py | 446 +++
.../component/test_reset_ssh_keypair.py | 48 +-
.../component/test_resource_limits.py | 2 +-
test/integration/component/test_routers.py | 52 +-
.../component/test_shared_network_offering.py | 213 --
.../component/test_shared_networks.py | 786 +++---
.../component/test_snapshots_improvement.py | 693 +++++
test/integration/component/test_vpc_network.py | 241 +-
.../component/test_vpc_vms_deployment.py | 40 +-
test/integration/smoke/test_routers.py | 15 +-
test/integration/smoke/test_vpc_vpn.py | 391 +++
tools/apidoc/gen_toc.py | 1 +
tools/eclipse/ApacheCloudStack.xml | 309 +++
tools/marvin/marvin/asyncJobMgr.py | 4 +-
tools/marvin/marvin/cloudstackTestClient.py | 15 +
tools/marvin/marvin/codes.py | 9 +-
tools/marvin/marvin/config/setup.cfg | 228 ++
tools/marvin/marvin/configGenerator.py | 169 +-
tools/marvin/marvin/deployDataCenter.py | 18 +-
tools/marvin/marvin/integration/lib/base.py | 11 +
tools/marvin/marvin/integration/lib/utils.py | 75 +
tools/marvin/marvin/marvinPlugin.py | 20 +-
ui/css/cloudstack3.css | 1301 +++++----
ui/dictionary.jsp | 3 +
ui/images/header-gradient.png | Bin 0 -> 62651 bytes
ui/images/overlay-pattern.png | Bin 0 -> 14969 bytes
ui/images/sprites.png | Bin 193277 -> 207810 bytes
ui/index.jsp | 37 +-
ui/scripts/accounts.js | 22 +-
ui/scripts/configuration.js | 33 +-
ui/scripts/events.js | 142 +-
ui/scripts/instanceWizard.js | 43 +-
ui/scripts/instances.js | 197 +-
ui/scripts/network.js | 53 +
ui/scripts/plugins.js | 3 +-
ui/scripts/sharedFunctions.js | 2 +-
ui/scripts/system.js | 40 +-
ui/scripts/ui-custom/instanceWizard.js | 23 +-
ui/scripts/ui-custom/physicalResources.js | 24 +
ui/scripts/ui-custom/pluginListing.js | 8 +
ui/scripts/ui/core.js | 21 +-
ui/scripts/ui/widgets/detailView.js | 43 +-
ui/scripts/ui/widgets/listView.js | 6 +-
ui/scripts/ui/widgets/notifications.js | 20 +-
ui/scripts/vpc.js | 10 +-
utils/src/com/cloud/utils/ProcessUtil.java | 5 +-
utils/src/com/cloud/utils/PropertiesUtil.java | 10 +-
.../com/cloud/utils/crypt/DBEncryptionUtil.java | 26 +-
.../utils/crypt/EncryptionSecretKeyChecker.java | 179 +-
utils/src/com/cloud/utils/db/DbProperties.java | 105 +
.../com/cloud/utils/PropertiesUtilsTest.java | 13 +
.../hypervisor/vmware/mo/VirtualMachineMO.java | 16 +-
554 files changed, 77172 insertions(+), 9481 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7259a48/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --cc client/WEB-INF/classes/resources/messages.properties
index 5536b07,12d2a11..e473eb4
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@@ -14,10 -14,9 +14,13 @@@
# 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.hypervisors=Hypervisors
+ label.home=Home
+ label.sockets=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/b7259a48/ui/dictionary.jsp
----------------------------------------------------------------------
diff --cc ui/dictionary.jsp
index 8db8308,1bf0eab..92ea06c
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@@ -25,10 -25,9 +25,13 @@@ under the License
<% long now = System.currentTimeMillis(); %>
<script language="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.hypervisors': '<fmt:message key="label.hypervisors" />',
+ 'label.home': '<fmt:message key="label.home" />',
+ 'label.sockets': '<fmt:message key="label.sockets" />',
'label.root.disk.size': '<fmt:message key="label.root.disk.size" />',
'label.s3.nfs.path': '<fmt:message key="label.s3.nfs.path" />',
'label.s3.nfs.server': '<fmt:message key="label.s3.nfs.server" />',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7259a48/ui/index.jsp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7259a48/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7259a48/ui/scripts/ui-custom/instanceWizard.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7259a48/ui/scripts/ui/core.js
----------------------------------------------------------------------
diff --cc ui/scripts/ui/core.js
index 8e84acd,06be12b..97f10aa
--- a/ui/scripts/ui/core.js
+++ b/ui/scripts/ui/core.js
@@@ -292,9 -302,9 +303,9 @@@
var $options = $('<div>').attr({
id: 'user-options'
})
- .appendTo($('#header'));
+ .appendTo($('#user'));
- $(['label.logout', 'label.help', 'label.about']).each(function() {
+ $(['label.about', 'label.help', 'label.logout']).each(function() {
var $link = $('<a>')
.attr({
href: '#'
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7259a48/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7259a48/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7259a48/ui/scripts/ui/widgets/notifications.js
----------------------------------------------------------------------
