cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [63/63] [abbrv] git commit: updated refs/heads/rbac to ce3638b
Date Mon, 04 Nov 2013 23:51:51 GMT
Merge branch 'master' into rbac.


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

Branch: refs/heads/rbac
Commit: ce3638bb03545d01b2e3b5648a1ab6d7b256176e
Parents: 168be3e eb9cfff
Author: Min Chen <min.chen@citrix.com>
Authored: Mon Nov 4 15:49:29 2013 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Mon Nov 4 15:49:29 2013 -0800

----------------------------------------------------------------------
 agent/pom.xml                                   |   33 +
 .../cloud/agent/dao/impl/PropertiesStorage.java |   57 +-
 .../com/cloud/agent/dhcp/FakeDhcpSnooper.java   |    5 -
 agent/src/com/cloud/agent/mockvm/MockVm.java    |    7 -
 .../consoleproxy/ConsoleProxyResource.java      |   20 +-
 api/src/com/cloud/agent/api/to/DataStoreTO.java |    5 +-
 api/src/com/cloud/agent/api/to/NfsTO.java       |    1 +
 api/src/com/cloud/agent/api/to/S3TO.java        |    5 +
 api/src/com/cloud/network/Network.java          |    1 +
 .../cloud/network/Site2SiteVpnConnection.java   |    1 +
 .../cloud/vm/snapshot/VMSnapshotService.java    |    2 +-
 .../org/apache/cloudstack/api/ApiConstants.java |    2 +
 .../org/apache/cloudstack/api/Parameter.java    |    3 +
 .../command/admin/usage/GetUsageRecordsCmd.java |   19 +-
 .../user/vmsnapshot/CreateVMSnapshotCmd.java    |   13 +-
 .../api/command/user/volume/ListVolumesCmd.java |    9 +
 .../user/vpn/CreateVpnConnectionCmd.java        |   10 +
 .../Site2SiteVpnConnectionResponse.java         |    7 +
 .../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       |    8 +-
 client/pom.xml                                  |   10 +
 client/tomcatconf/commands.properties.in        |   13 +-
 .../bootstrap/spring-bootstrap-context.xml      |    3 +-
 core/src/com/cloud/agent/api/SetupCommand.java  |   20 +
 core/src/com/cloud/agent/api/VMSnapshotTO.java  |   12 +
 .../api/routing/Site2SiteVpnCfgCommand.java     |   12 +-
 .../virtualnetwork/VirtualRoutingResource.java  |    3 +
 .../StorageSubsystemCommandHandlerBase.java     |    7 +-
 .../cloudstack/storage/to/ImageStoreTO.java     |    5 +
 .../storage/to/PrimaryDataStoreTO.java          |   10 +-
 .../subsystem/api/storage/PrimaryDataStore.java |   43 +
 .../api/storage/VMSnapshotOptions.java          |   30 +
 .../com/cloud/agent/manager/AgentAttache.java   |    5 +-
 .../cloud/agent/manager/AgentManagerImpl.java   |   28 +-
 .../cloud/agent/manager/DirectAgentAttache.java |   33 +-
 .../orchestration/NetworkOrchestrator.java      |    2 +-
 .../orchestration/VolumeOrchestrator.java       |    5 +-
 .../network/dao/Site2SiteVpnConnectionVO.java   |   14 +-
 .../schema/src/com/cloud/storage/VolumeVO.java  |    2 +-
 .../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 +-
 .../src/com/cloud/vm/snapshot/VMSnapshotVO.java |   16 +-
 .../motion/AncientDataMotionStrategy.java       |   92 +-
 .../storage/image/TemplateServiceImpl.java      |   66 +-
 engine/storage/integration-test/pom.xml         |   33 +
 .../test/resources/storageContext.xml           |    3 -
 .../core/spring-engine-storage-core-context.xml |    3 +
 ...-engine-storage-snapshot-storage-context.xml |    2 -
 .../storage/snapshot/SnapshotServiceImpl.java   |    2 +-
 .../storage/vmsnapshot/VMSnapshotHelper.java    |   38 -
 .../vmsnapshot/VMSnapshotHelperImpl.java        |  148 -
 .../storage/datastore/PrimaryDataStore.java     |   43 -
 .../PrimaryDataStoreProviderManager.java        |    1 +
 .../endpoint/DefaultEndPointSelector.java       |   33 +-
 .../storage/helper/HypervisorHelper.java        |   11 +-
 .../storage/helper/HypervisorHelperImpl.java    |  106 +-
 .../storage/helper/VMSnapshotHelperImpl.java    |  148 +
 .../storage/image/BaseImageStoreDriverImpl.java |   45 +-
 .../storage/vmsnapshot/VMSnapshotHelper.java    |   38 +
 .../volume/TemplateOnPrimaryDataStoreInfo.java  |    2 +-
 engine/storage/storage.ucls                     |    2 +-
 .../storage/datastore/PrimaryDataStoreImpl.java |   16 +-
 .../PrimaryDataStoreProviderManagerImpl.java    |    2 +-
 .../storage/volume/VolumeServiceImpl.java       |  150 +-
 .../com/cloud/cluster/ClusterManagerImpl.java   |   11 +-
 .../cluster/ClusterServiceServletAdapter.java   |   18 +-
 .../src/com/cloud/utils/db/GenericDaoBase.java  |    7 +
 .../com/cloud/utils/db/TransactionLegacy.java   |   39 +-
 .../jobs/impl/AsyncJobManagerImpl.java          |   14 +-
 parents/checkstyle/pom.xml                      |   21 +
 .../src/main/resources/tooling/checkstyle.xml   |   39 +
 .../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/LibvirtComputingResource.java  |    2 +-
 .../kvm/storage/LibvirtStorageAdaptor.java      |   38 +-
 .../driver/SimulatorImageStoreDriverImpl.java   |   34 +-
 .../vmware/manager/VmwareHostService.java       |    3 +
 .../vmware/resource/VmwareResource.java         |   72 +-
 .../VmwareSecondaryStorageResourceHandler.java  |    4 +
 .../resource/VmwareStorageProcessor.java        |   80 +-
 .../xen/resource/CitrixResourceBase.java        |   16 +-
 .../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 |  383 +++
 .../management/NetworkProviderTest.java         |  477 ++++
 .../management/ProviderTestConfiguration.java   |   30 +
 .../contrail/management/PublicNetworkTest.java  |  147 +
 .../PublicNetworkTestConfiguration.java         |   31 +
 .../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          |   34 +
 .../test/resources/publicNetworkContext.xml     |   26 +
 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 +-
 .../driver/SwiftImageStoreDriverImpl.java       |   30 +-
 .../CloudStackPrimaryDataStoreDriverImpl.java   |   16 +-
 ...CloudStackPrimaryDataStoreLifeCycleImpl.java |    1 +
 .../SamplePrimaryDataStoreDriverImpl.java       |    9 +-
 .../SolidFirePrimaryDataStoreLifeCycle.java     |    2 +
 plugins/user-authenticators/ldap/pom.xml        |   37 +-
 .../api/command/LdapImportUsersCmd.java         |   52 +-
 .../cloudstack/ldap/LdapConfiguration.java      |   10 +
 .../org/apache/cloudstack/ldap/LdapManager.java |    2 +
 .../apache/cloudstack/ldap/LdapManagerImpl.java |   15 +-
 .../apache/cloudstack/ldap/LdapUserManager.java |   65 +-
 .../ldap/LdapConfigurationSpec.groovy           |   33 +
 .../ldap/LdapCreateAccountCmdSpec.groovy        |    8 +-
 .../ldap/LdapImportUsersCmdSpec.groovy          |  124 +-
 .../cloudstack/ldap/LdapManagerImplSpec.groovy  |   16 +
 .../cloudstack/ldap/LdapUserManagerSpec.groovy  |   77 +
 pom.xml                                         |   12 +
 python/lib/cloudutils/serviceConfig.py          |    5 +-
 scripts/storage/secondary/createtmplt.sh        |   23 +-
 server/pom.xml                                  |   33 +
 server/src/com/cloud/api/ApiDBUtils.java        |   10 +-
 server/src/com/cloud/api/ApiDispatcher.java     |   21 +-
 server/src/com/cloud/api/ApiResponseHelper.java |    1 +
 .../com/cloud/api/query/QueryManagerImpl.java   |   10 +-
 .../com/cloud/api/query/ViewResponseHelper.java |    6 +-
 server/src/com/cloud/configuration/Config.java  |    3 +
 .../cloud/ha/HighAvailabilityManagerImpl.java   |    9 +-
 .../cloud/network/guru/ControlNetworkGuru.java  |    4 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java  |    2 +-
 .../network/vpn/Site2SiteVpnManagerImpl.java    |    8 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java |   15 +-
 .../storage/download/DownloadMonitorImpl.java   |   21 +-
 .../storage/snapshot/SnapshotManagerImpl.java   |   17 +-
 .../cloud/storage/upload/UploadListener.java    |    7 +-
 .../cloud/storage/upload/UploadMonitorImpl.java |  118 +-
 .../com/cloud/template/TemplateManagerImpl.java |    9 +-
 .../src/com/cloud/usage/UsageServiceImpl.java   |   13 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java  |    9 +-
 .../vm/snapshot/VMSnapshotManagerImpl.java      |    5 +-
 .../cloudstack/region/RegionManagerImpl.java    |   21 +-
 setup/db/db/schema-420to421.sql                 |    7 +-
 setup/db/db/schema-421to430.sql                 |   12 +-
 .../debian/config/etc/init.d/cloud-early-config |   17 +-
 .../patches/debian/config/etc/logrotate.d/cloud |   27 +
 .../debian/config/opt/cloud/bin/ipsectunnel.sh  |   47 +-
 .../component/test_base_image_updation.py       |  648 +++++
 .../component/test_deploy_vm_userdata_reg.py    |  220 ++
 .../component/test_reset_ssh_keypair.py         |   48 +-
 .../component/test_shared_network_offering.py   |  213 --
 .../component/test_shared_networks.py           |  786 +++---
 .../component/test_vpc_vms_deployment.py        |   40 +-
 test/integration/smoke/test_vpc_vpn.py          |  229 +-
 tools/marvin/marvin/cloudstackTestClient.py     |   18 +
 tools/marvin/marvin/codes.py                    |    3 +
 tools/marvin/marvin/config/setup.cfg            |  228 ++
 tools/marvin/marvin/configGenerator.py          |  161 +-
 tools/marvin/marvin/integration/lib/base.py     |   11 +
 tools/marvin/marvin/integration/lib/utils.py    |   42 +-
 ui/css/cloudstack3.css                          |  155 +-
 ui/dictionary.jsp                               |    2 +
 ui/images/sprites.png                           |  Bin 193277 -> 207810 bytes
 ui/index.jsp                                    |   15 +-
 ui/scripts/accounts.js                          |   22 +-
 ui/scripts/events.js                            |  142 +-
 ui/scripts/instanceWizard.js                    |   38 +-
 ui/scripts/instances.js                         |  158 +-
 ui/scripts/network.js                           |   55 +-
 ui/scripts/plugins.js                           |    3 +-
 ui/scripts/sharedFunctions.js                   |    2 +-
 ui/scripts/system.js                            |   64 +-
 ui/scripts/ui-custom/instanceWizard.js          |    1 +
 ui/scripts/ui-custom/pluginListing.js           |    8 +
 ui/scripts/ui/core.js                           |   19 +-
 ui/scripts/ui/widgets/listView.js               |    6 +-
 ui/scripts/ui/widgets/notifications.js          |   20 +-
 ui/scripts/vpc.js                               |   10 +-
 usage/pom.xml                                   |   33 +
 utils/src/com/cloud/utils/PropertiesUtil.java   |    8 +-
 .../com/cloud/utils/crypt/DBEncryptionUtil.java |   26 +-
 .../utils/crypt/EncryptionSecretKeyChecker.java |  178 +-
 utils/src/com/cloud/utils/db/DbProperties.java  |  105 +
 .../hypervisor/vmware/mo/VirtualMachineMO.java  |   16 +-
 351 files changed, 68370 insertions(+), 4977 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce3638bb/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/ApiConstants.java
index 32c2c5e,3b2bc67..d887910
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@@ -536,8 -525,8 +537,9 @@@ public class ApiConstants 
      public static final String RESOURCE_DETAILS = "resourcedetails";
      public static final String EXPUNGE = "expunge";
      public static final String FOR_DISPLAY = "fordisplay";
+     public static final String PASSIVE = "passive";
  
 +
      public enum HostDetails {
          all, capacity, events, stats, min;
      }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce3638bb/client/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce3638bb/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------
diff --cc client/tomcatconf/commands.properties.in
index 428042a,8cbe972..8829cc5
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@@ -682,21 -682,5 +682,22 @@@ listLdapUsers=
  ldapCreateAccount=3
  importLdapUsers=3
  
 +### Acl commands
 +createAclRole=7
 +deleteAclRole=7
 +listAclRoles=7
 +grantPermissionToAclRole=7
 +revokePermissionFromAclRole=7
 +createAclGroup=7
 +deleteAclGroup=7
 +listAclGroups=7
 +addAclRoleToAclGroup=7
 +removeAclRoleFromAclGroup=7
 +addAccountToAclGroup=7
 +removeAccountFromAclGroup=7
 +grantPermissionToAclGroup=7
 +revokePermissionFromAclGroup=7
 +
- 
+ #### juniper-contrail commands
+ createServiceInstance=1
 +

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce3638bb/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
----------------------------------------------------------------------
diff --cc plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
index 0000000,195e932..29dc50a
mode 000000,100644..100644
--- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
+++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
@@@ -1,0 -1,372 +1,383 @@@
+ // Licensed to the Apache Software Foundation (ASF) under one
+ // or more contributor license agreements.  See the NOTICE file
+ // distributed with this work for additional information
+ // regarding copyright ownership.  The ASF licenses this file
+ // to you under the Apache License, Version 2.0 (the
+ // "License"); you may not use this file except in compliance
+ // with the License.  You may obtain a copy of the License at
+ //
+ //   http://www.apache.org/licenses/LICENSE-2.0
+ //
+ // Unless required by applicable law or agreed to in writing,
+ // software distributed under the License is distributed on an
+ // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ // KIND, either express or implied.  See the License for the
+ // specific language governing permissions and limitations
+ // under the License.
+ 
+ package org.apache.cloudstack.network.contrail.management;
+ 
+ import java.util.List;
+ import java.util.Map;
+ 
+ import javax.inject.Inject;
+ import javax.naming.ConfigurationException;
+ 
++import org.apache.log4j.Logger;
++
+ import org.apache.cloudstack.acl.ControlledEntity;
+ import org.apache.cloudstack.acl.RoleType;
+ import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+ import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd;
+ import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd;
+ import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
+ import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
 -import org.apache.log4j.Logger;
 -
 -import com.cloud.utils.db.Transaction;
 -import com.cloud.utils.db.TransactionCallbackNoReturn;
 -import com.cloud.utils.db.TransactionStatus;
++import org.apache.cloudstack.context.CallContext;
+ 
++import com.cloud.api.query.dao.AccountJoinDao;
+ import com.cloud.api.query.vo.ControlledViewEntity;
++import com.cloud.configuration.ResourceLimit;
++import com.cloud.configuration.dao.ResourceCountDao;
+ import com.cloud.domain.Domain;
++import com.cloud.domain.PartOf;
+ import com.cloud.exception.ConcurrentOperationException;
+ import com.cloud.exception.PermissionDeniedException;
+ import com.cloud.exception.ResourceUnavailableException;
+ import com.cloud.projects.Project.ListProjectResourcesCriteria;
+ import com.cloud.user.Account;
+ import com.cloud.user.AccountManager;
+ import com.cloud.user.AccountVO;
+ import com.cloud.user.User;
+ import com.cloud.user.UserAccount;
 -import org.apache.cloudstack.context.CallContext;
+ import com.cloud.user.UserVO;
+ import com.cloud.user.dao.AccountDao;
 -import com.cloud.api.query.dao.AccountJoinDao;
 -import com.cloud.configuration.dao.ResourceCountDao;
 -import com.cloud.configuration.ResourceLimit;
 -import com.cloud.api.query.vo.AccountJoinVO;
+ import com.cloud.user.dao.UserDao;
+ import com.cloud.utils.Pair;
+ import com.cloud.utils.Ternary;
+ import com.cloud.utils.component.ManagerBase;
+ import com.cloud.utils.db.SearchBuilder;
+ import com.cloud.utils.db.SearchCriteria;
 -
 -import org.mockito.Mockito;
++import com.cloud.utils.db.Transaction;
++import com.cloud.utils.db.TransactionCallbackNoReturn;
++import com.cloud.utils.db.TransactionStatus;
+ 
+ public class MockAccountManager extends ManagerBase implements AccountManager {
+     private static final Logger s_logger =
+             Logger.getLogger(MockAccountManager.class);
+ 
+ 	@Inject AccountDao _accountDao;
+         @Inject ResourceCountDao _resourceCountDao;
+ 
+         @Inject AccountJoinDao _accountJoinDao;
+ 	@Inject UserDao _userDao;
+ 	
+ 	UserVO _systemUser;
+ 	AccountVO _systemAccount;
+ 
+     @Override
+     public boolean configure(final String name, final Map<String, Object> params)
throws ConfigurationException {
+         _systemAccount = _accountDao.findById(AccountVO.ACCOUNT_ID_SYSTEM);
+         if (_systemAccount == null) {
+             throw new ConfigurationException("Unable to find the system account using "
+ Account.ACCOUNT_ID_SYSTEM);
+         }
+ 
+         _systemUser = _userDao.findById(UserVO.UID_SYSTEM);
+         if (_systemUser == null) {
+             throw new ConfigurationException("Unable to find the system user using " + User.UID_SYSTEM);
+         }
+         CallContext.register(_systemUser, _systemAccount);
+         s_logger.info("MockAccountManager initialization successful");
+         return true;
+     }
+ 
+     @Override
+     public void checkAccess(Account arg0, Domain arg1)
+             throws PermissionDeniedException {
+         // TODO Auto-generated method stub
+         
+     }
+ 
+     @Override
+     public void checkAccess(Account arg0, AccessType arg1, boolean arg2,
+             ControlledEntity... arg3) throws PermissionDeniedException {
+         // TODO Auto-generated method stub
+         
+     }
+ 
+     @Override
+     public String[] createApiKeyAndSecretKey(RegisterCmd arg0) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public User createUser(String arg0, String arg1, String arg2, String arg3,
+             String arg4, String arg5, String arg6, Long arg7, String arg8) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public UserAccount createUserAccount(String arg0, String arg1, String arg2,
+             String arg3, String arg4, String arg5, String arg6, short arg7,
+             Long arg8, String arg9, Map<String, String> arg10, String arg11,
+             String arg12) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public Account finalizeOwner(Account arg0, String arg1, Long arg2, Long arg3) {
 -        return _systemAccount; 
++        return _systemAccount;
+     }
+ 
+     @Override
+     public Account getActiveAccountByName(String arg0, Long arg1) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public User getActiveUser(long arg0) {
+         return _systemUser;
+     }
+ 
+     @Override
+     public User getActiveUserByRegistrationToken(String arg0) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public RoleType getRoleType(Account arg0) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public Account getSystemAccount() {
+         return _systemAccount;
+     }
+ 
+     @Override
+     public User getSystemUser() {
+         return _systemUser;
+     }
+ 
+     @Override
+     public UserAccount getUserByApiKey(String arg0) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public User getUserIncludingRemoved(long arg0) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public boolean isAdmin(short arg0) {
+         // TODO Auto-generated method stub
+         return false;
+     }
+ 
+     @Override
 -    public boolean isRootAdmin(short arg0) {
++    public boolean isRootAdmin(long arg0) {
+         // TODO Auto-generated method stub
+         return true;
+     }
+ 
+     @Override
+     public UserAccount lockUser(long arg0) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public void markUserRegistered(long arg0) {
+         // TODO Auto-generated method stub
+         
+     }
+ 
+     @Override
+     public UserAccount authenticateUser(String arg0, String arg1, Long arg2,
+             String arg3, Map<String, Object[]> arg4) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public void buildACLSearchBuilder(
+             SearchBuilder<? extends ControlledEntity> arg0, Long arg1,
+             boolean arg2, List<Long> arg3, ListProjectResourcesCriteria arg4) {
+         // TODO Auto-generated method stub
+         
+     }
+ 
+     @Override
+     public void buildACLSearchCriteria(
+             SearchCriteria<? extends ControlledEntity> arg0, Long arg1,
+             boolean arg2, List<Long> arg3, ListProjectResourcesCriteria arg4) {
+         // TODO Auto-generated method stub
+         
+     }
+ 
+     @Override
+     public void buildACLSearchParameters(Account arg0, Long arg1, String arg2,
+             Long arg3, List<Long> arg4,
+             Ternary<Long, Boolean, ListProjectResourcesCriteria> arg5,
+             boolean arg6, boolean arg7) {
+         // TODO Auto-generated method stub
+         
+     }
+ 
+     @Override
+     public void buildACLViewSearchBuilder(
+             SearchBuilder<? extends ControlledViewEntity> arg0, Long arg1,
+             boolean arg2, List<Long> arg3, ListProjectResourcesCriteria arg4) {
+         // TODO Auto-generated method stub
+         
+     }
+ 
+     @Override
+     public void buildACLViewSearchCriteria(
+             SearchCriteria<? extends ControlledViewEntity> arg0, Long arg1,
+             boolean arg2, List<Long> arg3, ListProjectResourcesCriteria arg4) {
+         // TODO Auto-generated method stub
+         
+     }
+ 
+     @Override
+     public Long checkAccessAndSpecifyAuthority(Account arg0, Long arg1) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public boolean deleteAccount(AccountVO arg0, long arg1, Account arg2) {
+         return true;
+     }
+ 
+     @Override
+     public boolean deleteUser(DeleteUserCmd arg0) {
+         // TODO Auto-generated method stub
+         return false;
+     }
+ 
+     @Override
+     public boolean deleteUserAccount(long arg0) {
+         // TODO Auto-generated method stub
+         return false;
+     }
+ 
+     @Override
+     public boolean disableAccount(long arg0)
+             throws ConcurrentOperationException, ResourceUnavailableException {
+         // TODO Auto-generated method stub
+         return false;
+     }
+ 
+     @Override
+     public Account disableAccount(String arg0, Long arg1, Long arg2)
+             throws ConcurrentOperationException, ResourceUnavailableException {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public UserAccount disableUser(long arg0) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public boolean enableAccount(long arg0) {
+         // TODO Auto-generated method stub
+         return false;
+     }
+ 
+     @Override
+     public Account enableAccount(String arg0, Long arg1, Long arg2) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public UserAccount enableUser(long arg0) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public Pair<User, Account> findUserByApiKey(String arg0) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public Account lockAccount(String arg0, Long arg1, Long arg2) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public Account updateAccount(UpdateAccountCmd arg0) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+     @Override
+     public UserAccount updateUser(UpdateUserCmd arg0) {
+         // TODO Auto-generated method stub
+         return null;
+     }
+ 
+ 	@Override
+ 	public Account getActiveAccountById(long accountId) {
+ 		// TODO Auto-generated method stub
+ 		return null;
+ 	}
+ 
+ 	@Override
+ 	public Account getAccount(long accountId) {
+                return _systemAccount;
+ 	}
+ 
+ 	@Override
+ 	public Account createAccount(String accountName, short accountType,
+ 			Long domainId, String networkDomain, Map<String, String> details,
+ 			String uuid) {
+ 	    final AccountVO account = new AccountVO(accountName, domainId, networkDomain, accountType,
uuid);
+ 	    Transaction.execute(new TransactionCallbackNoReturn() {
+ 	        @Override
+ 		public void doInTransactionWithoutResult(TransactionStatus status) {
+ 
+ 		    _accountDao.persist(account);
+ 		    _resourceCountDao.createResourceCounts(account.getId(), ResourceLimit.ResourceOwnerType.Account);
+ 		}
+ 	    });
+             return account;
+ 	}
+ 
+ 	@Override
+ 	public void logoutUser(long userId) {
+ 		// TODO Auto-generated method stub
+ 		
+ 	}
++
++    @Override
++    public void checkAccess(Account account, AccessType accessType, boolean sameOwner, PartOf...
entities) throws PermissionDeniedException {
++        // TODO Auto-generated method stub
++
++    }
++
++    @Override
++    public void buildACLViewSearchBuilder(SearchBuilder<? extends ControlledViewEntity>
sb, Long domainId, boolean isRecursive, List<Long> permittedAccounts,
++            ListProjectResourcesCriteria listProjectResourcesCriteria, List<Long>
grantedIds, List<Long> revokedIds) {
++        // TODO Auto-generated method stub
++
++    }
+     
+ 
+ }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce3638bb/plugins/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce3638bb/server/src/com/cloud/api/ApiDBUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce3638bb/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce3638bb/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/query/QueryManagerImpl.java
index 7ab2298,735bbc9..1bcf578
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@@ -1734,7 -1735,11 +1736,11 @@@ public class QueryManagerImpl extends M
          if (podId != null) {
              sc.setParameters("podId", podId);
          }
 -        
 +
+         if (storageId != null) {
+             sc.setParameters("storageId", storageId);
+         }
+ 
          if(!isRootAdmin){
              sc.setParameters("displayVolume", 1);
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce3638bb/server/src/com/cloud/api/query/ViewResponseHelper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce3638bb/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce3638bb/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce3638bb/server/src/com/cloud/template/TemplateManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce3638bb/server/src/com/cloud/usage/UsageServiceImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/usage/UsageServiceImpl.java
index f7cfe31,e36ce44..d22319b
--- a/server/src/com/cloud/usage/UsageServiceImpl.java
+++ b/server/src/com/cloud/usage/UsageServiceImpl.java
@@@ -47,9 -48,9 +48,10 @@@ import com.cloud.projects.ProjectManage
  import com.cloud.usage.dao.UsageDao;
  import com.cloud.usage.dao.UsageJobDao;
  import com.cloud.user.Account;
 +import com.cloud.user.AccountService;
  import com.cloud.user.AccountVO;
  import com.cloud.user.dao.AccountDao;
+ import com.cloud.utils.Pair;
  import com.cloud.utils.component.Manager;
  import com.cloud.utils.component.ManagerBase;
  import com.cloud.utils.db.Filter;
@@@ -226,8 -224,8 +227,8 @@@ public class UsageServiceImpl extends M
              TransactionLegacy swap = TransactionLegacy.open(TransactionLegacy.CLOUD_DB);
              swap.close();
          }
 -        
 +
-         return usageRecords;
+         return new Pair<List<? extends Usage>, Integer>(usageRecords.first(),
usageRecords.second());
      }
  
      @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce3638bb/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce3638bb/setup/db/db/schema-421to430.sql
----------------------------------------------------------------------
diff --cc setup/db/db/schema-421to430.sql
index 5d7ba4c,1c99e3f..9c66744
--- a/setup/db/db/schema-421to430.sql
+++ b/setup/db/db/schema-421to430.sql
@@@ -640,10 -460,7 +642,7 @@@ CREATE VIEW `cloud`.`storage_pool_view
          `cloud`.`async_job` ON async_job.instance_id = storage_pool.id
              and async_job.instance_type = 'StoragePool'
              and async_job.job_status = 0;
 -
 +            
-             
-             DROP TABLE IF EXISTS `cloud`.`vm_snapshot_details`;
-             
  CREATE TABLE `cloud`.`firewall_rule_details` (
    `id` bigint unsigned NOT NULL auto_increment,
    `firewall_rule_id` bigint unsigned NOT NULL COMMENT 'Firewall rule id',
@@@ -664,3 -481,9 +663,10 @@@ ALTER TABLE `cloud`.`user_vm_details` C
  ALTER TABLE `cloud`.`service_offering_details` ADD COLUMN `display` tinyint(1) NOT NULL
DEFAULT '0' COMMENT 'True if the detail can be displayed to the end user';
  ALTER TABLE `cloud`.`storage_pool_details` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT
'0' COMMENT 'True if the detail can be displayed to the end user';
  
++
+ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server',
'ldap.group.object', 'groupOfUniqueNames',
+ 'Sets the object type of groups within LDAP','groupOfUniqueNames',NULL,NULL,0);
+ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server',
'ldap.group.user.uniquemember', 'uniquemember',
+ 'Sets the attribute for uniquemembers within a group','uniquemember',NULL,NULL,0);
+ 
+ UPDATE `cloud`.`volumes` SET display_volume=1 where id>0;


Mime
View raw message