Merge branch 'master' into ui-restyle
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c64bfa5d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c64bfa5d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c64bfa5d Branch: refs/heads/ui-restyle Commit: c64bfa5d855a8e9be44081c6368379033a5a7c5a Parents: 849d601 19b15a1 Author: Brian Federle <[email protected]> Authored: Thu Feb 20 11:15:26 2014 -0800 Committer: Brian Federle <[email protected]> Committed: Thu Feb 20 11:15:26 2014 -0800 ---------------------------------------------------------------------- .../SYSCONFDIR/rc.d/init.d/cloud-agent.in | 8 +- .../SYSCONFDIR/rc.d/init.d/cloud-agent.in | 8 +- .../sles/SYSCONFDIR/init.d/cloud-agent.in | 8 +- .../rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in | 8 +- .../sles/SYSCONFDIR/init.d/cloud-agent.in | 8 +- api/src/com/cloud/event/EventTypes.java | 6 + .../com/cloud/network/MonitoringService.java | 2 +- api/src/com/cloud/network/Network.java | 1 + api/src/com/cloud/network/NetworkService.java | 4 +- .../cloud/network/firewall/FirewallService.java | 2 + .../com/cloud/network/rules/RulesService.java | 2 + .../cloud/network/vpc/NetworkACLService.java | 5 +- api/src/com/cloud/network/vpc/VpcService.java | 3 +- .../network/vpn/RemoteAccessVpnService.java | 5 + .../cloud/network/vpn/Site2SiteVpnService.java | 4 + .../cloud/server/ResourceMetaDataService.java | 3 +- api/src/com/cloud/server/ResourceTag.java | 3 +- api/src/com/cloud/storage/Storage.java | 6 +- api/src/com/cloud/storage/Volume.java | 2 +- api/src/com/cloud/storage/VolumeApiService.java | 2 +- .../org/apache/cloudstack/api/ApiConstants.java | 2 + .../cloudstack/api/BaseAsyncCustomIdCmd.java | 7 +- api/src/org/apache/cloudstack/api/BaseCmd.java | 6 +- .../apache/cloudstack/api/BaseCustomIdCmd.java | 7 +- .../command/admin/alert/GenerateAlertCmd.java | 2 +- .../command/user/address/UpdateIPAddrCmd.java | 122 + .../autoscale/ListAutoScaleVmProfilesCmd.java | 8 + .../autoscale/UpdateAutoScaleVmGroupCmd.java | 14 +- .../autoscale/UpdateAutoScaleVmProfileCmd.java | 14 +- .../firewall/CreatePortForwardingRuleCmd.java | 3 +- .../firewall/UpdateEgressFirewallRuleCmd.java | 113 + .../user/firewall/UpdateFirewallRuleCmd.java | 114 + .../firewall/UpdatePortForwardingRuleCmd.java | 32 +- .../UpdateApplicationLoadBalancerCmd.java | 96 + .../loadbalancer/UpdateLoadBalancerRuleCmd.java | 14 +- .../user/network/UpdateNetworkACLItemCmd.java | 16 +- .../user/network/UpdateNetworkACLListCmd.java | 91 + .../command/user/network/UpdateNetworkCmd.java | 15 +- .../api/command/user/vm/UpdateVMCmd.java | 11 +- .../user/volume/AddResourceDetailCmd.java | 13 +- .../user/volume/ListResourceDetailsCmd.java | 2 +- .../command/user/volume/UpdateVolumeCmd.java | 22 +- .../api/command/user/vpc/UpdateVPCCmd.java | 17 +- .../user/vpn/UpdateRemoteAccessVpnCmd.java | 102 + .../user/vpn/UpdateVpnConnectionCmd.java | 90 + .../command/user/vpn/UpdateVpnGatewayCmd.java | 89 + .../api/response/ResourceTagResponse.java | 31 + .../Site2SiteVpnConnectionResponse.java | 5 +- .../cloudstack/api/response/VolumeResponse.java | 24 +- .../lb/ApplicationLoadBalancerService.java | 2 + .../bridge/io/DimeDelimitedInputStream.java | 12 +- .../com/cloud/bridge/model/SObjectItemVO.java | 2 +- .../bridge/service/EC2SoapServiceImpl.java | 1 + .../classes/resources/messages.properties | 91 + .../classes/resources/messages_ja_JP.properties | 133 +- .../classes/resources/messages_zh_CN.properties | 127 +- client/pom.xml | 36 +- client/tomcatconf/commands.properties.in | 14 + .../com/cloud/agent/api/CheckRouterCommand.java | 5 + .../api/CheckS2SVpnConnectionsCommand.java | 9 +- .../com/cloud/agent/api/GetDomRVersionCmd.java | 5 + .../agent/api/SetupGuestNetworkAnswer.java | 26 - .../cloud/agent/api/routing/GroupAnswer.java | 40 + .../cloud/agent/api/routing/IpAssocCommand.java | 4 + .../agent/api/routing/IpAssocVpcCommand.java | 6 + .../api/routing/NetworkElementCommand.java | 9 + .../api/routing/SetFirewallRulesCommand.java | 9 +- .../agent/api/routing/SetNetworkACLCommand.java | 11 +- .../routing/SetPortForwardingRulesCommand.java | 10 +- .../SetPortForwardingRulesVpcCommand.java | 4 +- .../api/routing/SetStaticNatRulesCommand.java | 9 +- .../agent/api/routing/SetStaticRouteAnswer.java | 13 +- .../api/routing/SetStaticRouteCommand.java | 13 +- .../virtualnetwork/VirtualRoutingResource.java | 797 +++--- .../VirtualRoutingResourceTest.java | 783 ++++++ .../api/storage/StorageCacheManager.java | 2 + .../api/storage/type/VolumeTypeBase.java | 39 +- .../api/storage/type/VolumeTypeHelper.java | 25 +- .../api/storage/type/VolumeTypeHelperTest.java | 101 + .../cloud/network/vpc/NetworkACLManager.java | 3 +- .../src/com/cloud/template/TemplateManager.java | 9 + .../com/cloud/agent/manager/AgentAttache.java | 2 +- .../cloud/agent/manager/AgentManagerImpl.java | 53 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 357 +-- .../orchestration/NetworkOrchestrator.java | 35 +- .../orchestration/VolumeOrchestrator.java | 17 +- .../cloud/vm/VirtualMachineManagerImplTest.java | 71 +- .../orchestration/NetworkOrchestratorTest.java | 164 ++ engine/pom.xml | 13 + .../spring-engine-schema-core-daos-context.xml | 1 + .../src/com/cloud/dc/DataCenterDetailVO.java | 3 +- .../src/com/cloud/dc/dao/DataCenterDaoImpl.java | 2 +- .../cloud/dc/dao/DataCenterDetailsDaoImpl.java | 4 +- .../cloud/network/as/AutoScaleVmGroupVO.java | 4 + .../cloud/network/as/AutoScaleVmProfileVO.java | 4 + .../network/dao/FirewallRulesCidrsDaoImpl.java | 1 - .../network/dao/MonitoringServiceDaoImpl.java | 4 +- .../cloud/network/dao/MonitoringServiceVO.java | 28 +- .../com/cloud/network/dao/NetworkDetailVO.java | 3 +- .../network/dao/NetworkDetailsDaoImpl.java | 4 +- .../cloud/network/dao/RemoteAccessVpnVO.java | 4 + .../network/dao/Site2SiteVpnConnectionVO.java | 4 + .../network/dao/Site2SiteVpnGatewayVO.java | 4 + .../com/cloud/network/vpc/NetworkACLItemVO.java | 4 + .../src/com/cloud/network/vpc/NetworkACLVO.java | 3 + .../schema/src/com/cloud/network/vpc/VpcVO.java | 5 + .../cloud/service/ServiceOfferingDetailsVO.java | 3 +- .../service/dao/ServiceOfferingDaoImpl.java | 2 +- .../dao/ServiceOfferingDetailsDaoImpl.java | 4 +- .../com/cloud/storage/VMTemplateDetailVO.java | 3 +- .../src/com/cloud/storage/VolumeDetailVO.java | 3 +- .../storage/dao/SnapshotDetailsDaoImpl.java | 4 +- .../cloud/storage/dao/SnapshotDetailsVO.java | 9 +- .../storage/dao/StoragePoolDetailsDaoImpl.java | 4 +- .../cloud/storage/dao/VMTemplateDaoImpl.java | 40 +- .../storage/dao/VMTemplateDetailsDaoImpl.java | 4 +- .../cloud/storage/dao/VolumeDetailsDaoImpl.java | 4 +- engine/schema/src/com/cloud/vm/NicDetailVO.java | 3 +- .../schema/src/com/cloud/vm/UserVmDetailVO.java | 3 +- .../src/com/cloud/vm/dao/NicDetailsDaoImpl.java | 4 +- .../src/com/cloud/vm/dao/UserVmDaoImpl.java | 2 +- .../com/cloud/vm/dao/UserVmDetailsDaoImpl.java | 4 +- .../cloud/vm/snapshot/VMSnapshotDetailsVO.java | 9 +- .../snapshot/dao/VMSnapshotDetailsDaoImpl.java | 4 +- .../AutoScaleVmGroupDetailVO.java | 82 + .../AutoScaleVmProfileDetailVO.java | 3 +- .../resourcedetail/DiskOfferingDetailVO.java | 3 +- .../resourcedetail/FirewallRuleDetailVO.java | 3 +- .../resourcedetail/NetworkACLItemDetailVO.java | 3 +- .../resourcedetail/NetworkACLListDetailVO.java | 3 +- .../resourcedetail/RemoteAccessVpnDetailVO.java | 3 +- .../resourcedetail/ResourceDetailsDao.java | 2 +- .../resourcedetail/ResourceDetailsDaoBase.java | 5 +- .../Site2SiteCustomerGatewayDetailVO.java | 3 +- .../Site2SiteVpnConnectionDetailVO.java | 3 +- .../Site2SiteVpnGatewayDetailVO.java | 3 +- .../resourcedetail/UserIpAddressDetailVO.java | 3 +- .../cloudstack/resourcedetail/VpcDetailVO.java | 3 +- .../resourcedetail/VpcGatewayDetailVO.java | 3 +- .../dao/AutoScaleVmGroupDetailsDao.java | 26 + .../dao/AutoScaleVmGroupDetailsDaoImpl.java | 33 + .../dao/AutoScaleVmProfileDetailsDaoImpl.java | 4 +- .../dao/DiskOfferingDetailsDaoImpl.java | 4 +- .../dao/FirewallRuleDetailsDaoImpl.java | 4 +- .../dao/NetworkACLItemDetailsDaoImpl.java | 4 +- .../dao/NetworkACLListDetailsDaoImpl.java | 4 +- .../dao/RemoteAccessVpnDetailsDaoImpl.java | 4 +- .../Site2SiteCustomerGatewayDetailsDaoImpl.java | 4 +- .../Site2SiteVpnConnectionDetailsDaoImpl.java | 4 +- .../dao/Site2SiteVpnGatewayDetailsDaoImpl.java | 4 +- .../resourcedetail/dao/UserDetailsDaoImpl.java | 2 +- .../dao/UserIpAddressDetailsDaoImpl.java | 4 +- .../resourcedetail/dao/VpcDetailsDaoImpl.java | 4 +- .../dao/VpcGatewayDetailsDaoImpl.java | 4 +- .../storage/datastore/db/ImageStoreVO.java | 7 +- .../datastore/db/PrimaryDataStoreDaoImpl.java | 4 +- .../datastore/db/PrimaryDataStoreDetailVO.java | 3 +- .../datastore/db/StoragePoolDetailVO.java | 3 +- .../storage/datastore/db/StoragePoolVO.java | 12 +- .../cache/allocator/StorageCacheAllocator.java | 3 + .../allocator/StorageCacheRandomAllocator.java | 38 + .../cache/manager/StorageCacheManagerImpl.java | 13 + .../motion/AncientDataMotionStrategy.java | 4 +- .../vm/snapshot/dao/VmSnapshotDaoTest.java | 2 +- .../storage/allocator/StorageAllocatorTest.java | 4 +- .../storage/test/ChildTestConfiguration.java | 6 - .../storage/snapshot/SnapshotObject.java | 5 +- .../storage/snapshot/SnapshotServiceImpl.java | 8 +- .../snapshot/XenserverSnapshotStrategy.java | 5 + .../endpoint/DefaultEndPointSelector.java | 3 +- .../image/datastore/ImageStoreHelper.java | 26 + .../storage/image/format/ImageFormatHelper.java | 2 +- .../datastore/PrimaryDataStoreHelper.java | 30 +- .../db/PrimaryDataStoreDetailsDaoImpl.java | 4 +- .../storage/datastore/PrimaryDataStoreImpl.java | 5 +- .../storage/volume/VolumeServiceImpl.java | 42 +- .../db/src/com/cloud/dao/EntityManagerImpl.java | 1 + framework/db/src/com/cloud/utils/db/Filter.java | 2 +- .../src/com/cloud/utils/db/GenericDaoBase.java | 59 +- .../db/src/com/cloud/utils/db/GroupBy.java | 31 +- .../db/src/com/cloud/utils/db/SearchBase.java | 87 +- .../db/test/com/cloud/utils/db/GroupByTest.java | 81 + framework/pom.xml | 13 + packaging/centos63/cloud-agent.rc | 8 +- packaging/centos63/cloud-ipallocator.rc | 8 +- packaging/centos63/package.sh | 170 +- .../dedicated/DedicatedResourceManagerImpl.java | 38 +- .../mom/inmemory/InMemoryEventBus.java | 53 +- .../mom/inmemory/InMemoryEventBusTest.java | 162 ++ .../HypervResource/CloudStackTypes.cs | 9 +- .../HypervResource/HypervResourceController.cs | 84 +- .../HypervResource/IWmiCallsV2.cs | 1 + .../ServerResource/HypervResource/WmiCallsV2.cs | 33 +- .../resource/HypervDirectConnectResource.java | 51 +- .../kvm/resource/LibvirtComputingResource.java | 130 +- .../kvm/resource/LibvirtDomainXMLParser.java | 7 +- .../kvm/resource/LibvirtStoragePoolDef.java | 29 +- .../resource/LibvirtStoragePoolXMLParser.java | 18 + .../hypervisor/kvm/resource/LibvirtVMDef.java | 26 +- .../kvm/storage/KVMStorageProcessor.java | 13 +- .../kvm/storage/LibvirtStorageAdaptor.java | 39 +- .../apache/cloudstack/utils/qemu/QemuImg.java | 6 +- .../cloudstack/utils/qemu/QemuImgFile.java | 1 - .../resource/LibvirtComputingResourceTest.java | 7 + .../resource/LibvirtDomainXMLParserTest.java | 194 ++ .../cloud/agent/manager/MockNetworkManager.java | 3 +- .../agent/manager/MockNetworkManagerImpl.java | 9 +- .../com/cloud/hypervisor/guru/VMwareGuru.java | 61 +- .../vmware/VmwareServerDiscoverer.java | 6 - .../vmware/manager/VmwareManagerImpl.java | 100 +- .../vmware/resource/VmwareResource.java | 85 +- .../resource/VmwareStorageProcessor.java | 78 +- .../VmwareStorageSubsystemCommandHandler.java | 51 +- .../vmware/VmwareDatacenterApiUnitTest.java | 6 - .../xen/src/com/cloud/ha/XenServerFencer.java | 1 - .../xen/discoverer/XcpServerDiscoverer.java | 35 +- .../xen/resource/CitrixResourceBase.java | 36 +- .../test/com/cloud/ha/XenServerFencerTest.java | 39 + .../xen/resource/CitrixResourceBaseTest.java | 16 + .../network/cisco/CiscoVnmcConnectionTest.java | 209 +- .../lb/ElasticLoadBalancerManagerImpl.java | 486 +--- .../network/lb/LoadBalanceRuleHandler.java | 466 ++++ .../lb/ElasticLoadBalancerManagerImplTest.java | 101 + .../network/lb/LoadBalanceRuleHandlerTest.java | 215 ++ .../contrail/spring-contrail-context.xml | 4 + ...ring-contrail-system-context-inheritable.xml | 41 + .../contrail/management/ContrailGuru.java | 62 +- .../contrail/management/ContrailManager.java | 11 + .../management/ContrailManagerImpl.java | 177 +- .../management/ContrailVpcElementImpl.java | 199 ++ .../network/contrail/management/EventUtils.java | 56 +- .../contrail/management/ServerDBSyncImpl.java | 18 +- .../network/contrail/model/ModelObject.java | 10 +- .../contrail/model/NetworkPolicyModel.java | 2 +- .../contrail/model/ServiceInstanceModel.java | 21 +- .../contrail/model/VirtualMachineModel.java | 78 +- .../contrail/model/VirtualNetworkModel.java | 171 +- .../IntegrationTestConfiguration.java | 6 - .../contrail/model/VirtualMachineModelTest.java | 9 +- .../contrail/model/VirtualNetworkModelTest.java | 143 +- plugins/network-elements/netscaler/pom.xml | 8 +- .../network/resource/NetscalerResource.java | 149 +- .../network/nicira/AccessConfiguration.java | 90 +- .../src/com/cloud/network/nicira/Acl.java | 1 - .../cloud/network/nicira/BaseNiciraEntity.java | 85 + .../network/nicira/BaseNiciraNamedEntity.java | 44 + .../com/cloud/network/nicira/LogicalRouter.java | 71 + .../network/nicira/LogicalRouterConfig.java | 65 - .../cloud/network/nicira/LogicalRouterPort.java | 41 +- .../com/cloud/network/nicira/LogicalSwitch.java | 68 +- .../cloud/network/nicira/LogicalSwitchPort.java | 50 +- .../com/cloud/network/nicira/NiciraNvpApi.java | 750 ++--- .../nicira/RoutingTableRoutingConfig.java | 30 + ...SingleDefaultRouteImplicitRoutingConfig.java | 40 + .../SingleDefaultRouteImplictRoutingConfig.java | 40 - .../com/cloud/network/nicira/VifAttachment.java | 35 +- .../network/resource/NiciraNvpResource.java | 20 +- .../network/element/NiciraNvpElementTest.java | 42 +- .../guru/NiciraNvpGuestNetworkGuruTest.java | 154 +- .../com/cloud/network/nicira/NatRuleTest.java | 12 +- .../cloud/network/nicira/NiciraNvpApiIT.java | 200 +- .../cloud/network/nicira/NiciraNvpApiTest.java | 367 +-- .../com/cloud/network/nicira/NiciraTagTest.java | 8 +- .../network/resource/NiciraNvpResourceTest.java | 258 +- .../com/cloud/network/element/OvsElement.java | 283 +- .../cloud/network/guru/OvsGuestNetworkGuru.java | 4 - .../com/cloud/network/ovs/OvsTunnelManager.java | 4 +- .../cloud/network/ovs/OvsTunnelManagerImpl.java | 148 +- .../cloudstack/network/element/SspClient.java | 244 +- .../cloudstack/network/element/SspElement.java | 21 +- .../stratosphere-ssp/sspmock/sspmock.py | 58 +- .../network/element/SspClientTest.java | 55 +- plugins/pom.xml | 25 +- ...CloudStackPrimaryDataStoreLifeCycleImpl.java | 36 +- .../CloudStackPrimaryDataStoreProviderImpl.java | 9 +- pom.xml | 33 +- .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 8 +- .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 8 +- .../SYSCONFDIR/init.d/cloud-ipallocator.in | 8 +- .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 8 +- .../sles/SYSCONFDIR/init.d/cloud-ipallocator.in | 8 +- .../SYSCONFDIR/init.d/cloud-ipallocator.in | 8 +- .../spring-server-core-managers-context.xml | 6 - server/src/com/cloud/api/ApiDispatcher.java | 12 +- server/src/com/cloud/api/ApiResponseHelper.java | 5 +- .../com/cloud/api/query/QueryManagerImpl.java | 5 +- .../api/query/dao/ImageStoreJoinDaoImpl.java | 4 +- .../cloud/api/query/dao/VolumeJoinDaoImpl.java | 3 +- .../com/cloud/api/query/vo/UserVmJoinVO.java | 23 +- .../com/cloud/api/query/vo/VolumeJoinVO.java | 6 + server/src/com/cloud/configuration/Config.java | 6 + .../configuration/ConfigurationManagerImpl.java | 76 +- .../com/cloud/consoleproxy/AgentHookBase.java | 5 +- .../ConsoleProxyBalanceAllocator.java | 3 - .../consoleproxy/StaticConsoleProxyManager.java | 18 - .../src/com/cloud/dc/DedicatedResourceVO.java | 10 +- .../deploy/DeploymentPlanningManagerImpl.java | 97 +- .../src/com/cloud/event/ActionEventUtils.java | 9 + .../metadata/ResourceMetaDataManagerImpl.java | 12 +- .../com/cloud/network/IpAddressManagerImpl.java | 57 +- .../src/com/cloud/network/NetworkModelImpl.java | 9 +- .../com/cloud/network/NetworkServiceImpl.java | 35 +- .../cloud/network/as/AutoScaleManagerImpl.java | 26 +- .../network/firewall/FirewallManagerImpl.java | 31 +- .../lb/LoadBalancingRulesManagerImpl.java | 15 +- .../router/VirtualNetworkApplianceManager.java | 4 + .../VirtualNetworkApplianceManagerImpl.java | 1605 +++++------ .../VpcVirtualNetworkApplianceManagerImpl.java | 33 +- .../cloud/network/rules/RulesManagerImpl.java | 20 +- .../network/vpc/NetworkACLManagerImpl.java | 9 +- .../network/vpc/NetworkACLServiceImpl.java | 33 +- .../com/cloud/network/vpc/VpcManagerImpl.java | 22 +- .../network/vpn/RemoteAccessVpnManagerImpl.java | 26 +- .../network/vpn/Site2SiteVpnManagerImpl.java | 42 +- .../com/cloud/resource/ResourceManagerImpl.java | 66 +- .../PremiumSecondaryStorageManagerImpl.java | 185 -- .../cloud/server/ConfigurationServerImpl.java | 413 +-- .../com/cloud/server/ManagementServerImpl.java | 55 +- .../com/cloud/storage/VolumeApiServiceImpl.java | 194 +- .../storage/download/DownloadMonitorImpl.java | 29 +- .../secondary/SecondaryStorageListener.java | 5 +- .../secondary/SecondaryStorageManagerImpl.java | 1389 ---------- .../storage/snapshot/SnapshotManagerImpl.java | 66 +- .../cloud/storage/upload/UploadMonitorImpl.java | 27 +- .../cloud/tags/TaggedResourceManagerImpl.java | 2 + .../template/HypervisorTemplateAdapter.java | 18 +- .../com/cloud/template/TemplateManagerImpl.java | 191 +- .../src/com/cloud/uuididentity/UUIDManager.java | 37 - .../com/cloud/uuididentity/UUIDManagerImpl.java | 1 + server/src/com/cloud/vm/UserVmManagerImpl.java | 73 +- .../lb/ApplicationLoadBalancerManagerImpl.java | 23 +- .../cloudstack/network/lb/CertServiceImpl.java | 14 +- .../metadata/ResourceMetaDataManagerTest.java | 2 +- .../cloud/network/MockFirewallManagerImpl.java | 6 + .../cloud/template/TemplateManagerImplTest.java | 37 + .../com/cloud/vpc/MockNetworkManagerImpl.java | 13 +- .../cloud/vpc/MockSite2SiteVpnManagerImpl.java | 15 +- .../com/cloud/vpc/NetworkACLManagerTest.java | 9 +- .../affinity/AffinityApiUnitTest.java | 9 + .../networkoffering/ChildTestConfiguration.java | 6 - services/console-proxy-rdp/rdpconsole/pom.xml | 2 +- .../rdpconsole/src/main/java/common/Client.java | 92 +- .../src/main/java/streamer/ByteBuffer.java | 122 +- .../src/test/java/common/ClientTest.java | 43 + .../src/test/java/rdpclient/MockServerTest.java | 9 +- .../src/test/java/streamer/ByteBufferTest.java | 152 ++ .../consoleproxy/ConsoleProxyRdpClient.java | 159 +- .../ConsoleProxyThumbnailHandler.java | 1 + .../consoleproxy/ConsoleProxyRdpClientTest.java | 62 + services/pom.xml | 13 + services/secondary-storage/controller/pom.xml | 50 + ...econdary-storage-controller-core-context.xml | 33 + .../PremiumSecondaryStorageManagerImpl.java | 186 ++ .../SecondaryStorageManagerImpl.java | 1386 ++++++++++ services/secondary-storage/pom.xml | 85 +- .../module.properties | 18 - ...ing-secondary-storage-discoverer-context.xml | 36 - services/secondary-storage/server/pom.xml | 105 + .../module.properties | 18 + ...ing-secondary-storage-discoverer-context.xml | 36 + .../LocalNfsSecondaryStorageResource.java | 95 + .../resource/LocalSecondaryStorageResource.java | 240 ++ .../resource/NfsSecondaryStorageResource.java | 2430 +++++++++++++++++ .../resource/SecondaryStorageDiscoverer.java | 312 +++ .../resource/SecondaryStorageResource.java | 29 + .../SecondaryStorageResourceHandler.java | 24 + .../storage/template/DownloadManager.java | 108 + .../storage/template/DownloadManagerImpl.java | 1080 ++++++++ .../storage/template/UploadManager.java | 82 + .../storage/template/UploadManagerImpl.java | 550 ++++ .../LocalNfsSecondaryStorageResourceTest.java | 143 + .../NfsSecondaryStorageResourceTest.java | 110 + .../LocalNfsSecondaryStorageResource.java | 95 - .../resource/LocalSecondaryStorageResource.java | 240 -- .../resource/NfsSecondaryStorageResource.java | 2553 ------------------ .../resource/SecondaryStorageDiscoverer.java | 319 --- .../resource/SecondaryStorageResource.java | 29 - .../SecondaryStorageResourceHandler.java | 24 - .../storage/template/DownloadManager.java | 108 - .../storage/template/DownloadManagerImpl.java | 1149 -------- .../storage/template/UploadManager.java | 82 - .../storage/template/UploadManagerImpl.java | 646 ----- .../LocalNfsSecondaryStorageResourceTest.java | 143 - .../NfsSecondaryStorageResourceTest.java | 110 - setup/db/create-schema.sql | 2 +- setup/db/db/schema-421to430.sql | 2 +- setup/db/db/schema-430to440.sql | 79 +- .../rc.d/init.d/cloud-console-proxy.in | 8 +- .../rc.d/init.d/cloud-console-proxy.in | 8 +- .../rc.d/init.d/cloud-console-proxy.in | 8 +- .../SYSCONFDIR/init.d/cloud-console-proxy.in | 8 +- .../patches/debian/config/etc/dnsmasq.conf.tmpl | 2 +- .../debian/config/etc/init.d/cloud-early-config | 10 + .../patches/debian/config/etc/vpcdnsmasq.conf | 2 +- .../debian/config/opt/cloud/bin/edithosts.sh | 53 +- .../config/opt/cloud/bin/monitor_service.sh | 27 +- .../debian/config/opt/cloud/bin/vpc_acl.sh | 19 +- .../debian/config/opt/cloud/bin/vpc_guestnw.sh | 44 +- systemvm/scripts/_run.sh | 7 + .../component/test_multiple_ips_per_nic.py | 452 ++++ test/integration/component/test_portable_ip.py | 132 +- test/integration/smoke/test_vm_life_cycle.py | 84 +- tools/apidoc/gen_toc.py | 17 +- tools/appliance/build.sh | 48 +- .../definitions/systemvm64template/base.sh | 6 +- .../systemvm64template/definition.rb | 6 +- .../systemvm64template/postinstall.sh | 17 +- .../definitions/systemvmtemplate/base.sh | 4 +- .../definitions/systemvmtemplate/definition.rb | 6 +- .../definitions/systemvmtemplate/postinstall.sh | 13 +- .../devcloud-kvm-advanced-fusion.cfg | 139 + tools/devcloud-kvm/devcloud-kvm-advanced.cfg | 4 +- tools/marvin/marvin/codes.py | 4 + tools/marvin/marvin/integration/lib/base.py | 29 + tools/marvin/marvin/integration/lib/common.py | 96 +- ui/dictionary.jsp | 87 +- ui/lib/jquery.validate.js | 34 +- ui/scripts/accounts.js | 2 +- ui/scripts/autoscaler.js | 26 +- ui/scripts/cloudStack.js | 4 +- ui/scripts/configuration.js | 12 +- ui/scripts/domains.js | 2 +- ui/scripts/installWizard.js | 4 +- ui/scripts/instanceWizard.js | 6 +- ui/scripts/instances.js | 73 +- ui/scripts/regions.js | 78 +- ui/scripts/sharedFunctions.js | 2 +- ui/scripts/system.js | 174 +- ui/scripts/templates.js | 91 +- ui/scripts/ui/dialog.js | 5 + ui/scripts/ui/widgets/detailView.js | 3 +- ui/scripts/ui/widgets/listView.js | 27 +- ui/scripts/zoneWizard.js | 15 +- utils/conf/db.properties | 6 +- utils/conf/log4j-vmops.xml | 34 +- utils/pom.xml | 70 +- utils/src/com/cloud/maint/Version.java | 3 + utils/src/com/cloud/utils/ActionDelegate.java | 7 +- .../com/cloud/utils/CloudResourceBundle.java | 7 +- utils/src/com/cloud/utils/DateUtil.java | 7 +- utils/src/com/cloud/utils/EnumUtils.java | 7 +- utils/src/com/cloud/utils/ExecutionResult.java | 2 + utils/src/com/cloud/utils/FileUtil.java | 7 +- utils/src/com/cloud/utils/IteratorUtil.java | 7 +- utils/src/com/cloud/utils/Journal.java | 7 +- utils/src/com/cloud/utils/LogUtils.java | 7 +- utils/src/com/cloud/utils/MethodCapturer.java | 7 +- utils/src/com/cloud/utils/NumbersUtil.java | 7 +- utils/src/com/cloud/utils/Pair.java | 7 +- .../src/com/cloud/utils/PasswordGenerator.java | 7 +- utils/src/com/cloud/utils/Predicate.java | 7 +- utils/src/com/cloud/utils/ProcessUtil.java | 7 +- utils/src/com/cloud/utils/Profiler.java | 7 +- utils/src/com/cloud/utils/PropertiesUtil.java | 7 +- utils/src/com/cloud/utils/ReflectUtil.java | 7 +- utils/src/com/cloud/utils/S3Utils.java | 37 +- utils/src/com/cloud/utils/SerialVersionUID.java | 7 +- utils/src/com/cloud/utils/StringUtils.java | 15 +- utils/src/com/cloud/utils/SwiftUtil.java | 41 +- utils/src/com/cloud/utils/Ternary.java | 7 +- utils/src/com/cloud/utils/UriUtils.java | 92 +- .../cloud/utils/UsernamePasswordValidator.java | 7 +- utils/src/com/cloud/utils/UuidUtils.java | 13 +- .../cloud/utils/backoff/BackoffAlgorithm.java | 7 +- .../utils/backoff/impl/ConstantTimeBackoff.java | 7 +- .../backoff/impl/ConstantTimeBackoffMBean.java | 7 +- .../utils/cisco/n1kv/vsm/NetconfHelper.java | 7 +- .../cloud/utils/cisco/n1kv/vsm/PolicyMap.java | 7 +- .../cloud/utils/cisco/n1kv/vsm/PortProfile.java | 7 +- .../cloud/utils/cisco/n1kv/vsm/VsmCommand.java | 7 +- .../utils/cisco/n1kv/vsm/VsmOkResponse.java | 7 +- .../cisco/n1kv/vsm/VsmPolicyMapResponse.java | 7 +- .../cisco/n1kv/vsm/VsmPortProfileResponse.java | 7 +- .../cloud/utils/cisco/n1kv/vsm/VsmResponse.java | 7 +- .../src/com/cloud/utils/component/Adapter.java | 7 +- .../com/cloud/utils/component/AdapterBase.java | 7 +- .../com/cloud/utils/component/AdapterList.java | 7 +- .../cloud/utils/component/ComponentContext.java | 6 +- .../ComponentInstantiationPostProcessor.java | 7 +- .../utils/component/ComponentLifecycle.java | 7 +- .../utils/component/ComponentLifecycleBase.java | 7 +- .../component/ComponentMethodInterceptable.java | 7 +- .../component/ComponentMethodInterceptor.java | 7 +- .../utils/component/ComponentNamingPolicy.java | 7 +- .../src/com/cloud/utils/component/Manager.java | 7 +- .../com/cloud/utils/component/ManagerBase.java | 7 +- utils/src/com/cloud/utils/component/Named.java | 37 +- .../cloud/utils/component/PluggableService.java | 7 +- .../src/com/cloud/utils/component/Registry.java | 37 +- .../utils/component/SystemIntegrityChecker.java | 7 +- .../utils/concurrency/NamedThreadFactory.java | 7 +- .../com/cloud/utils/concurrency/Scheduler.java | 7 +- .../utils/concurrency/SynchronizationEvent.java | 7 +- .../com/cloud/utils/concurrency/TestClock.java | 7 +- .../com/cloud/utils/crypt/DBEncryptionUtil.java | 9 +- .../utils/crypt/EncryptionSecretKeyChecker.java | 7 +- .../utils/crypt/EncryptionSecretKeySender.java | 7 +- utils/src/com/cloud/utils/crypt/RSAHelper.java | 7 +- utils/src/com/cloud/utils/db/DbProperties.java | 37 +- utils/src/com/cloud/utils/db/EntityManager.java | 5 + utils/src/com/cloud/utils/db/UUIDManager.java | 40 + .../com/cloud/utils/encoding/URLEncoder.java | 33 +- utils/src/com/cloud/utils/events/EventArgs.java | 7 +- .../com/cloud/utils/events/SubscriptionMgr.java | 7 +- .../utils/exception/CSExceptionErrorCode.java | 6 +- .../utils/exception/CloudRuntimeException.java | 7 +- .../com/cloud/utils/exception/ErrorContext.java | 3 + .../utils/exception/ExceptionProxyObject.java | 7 +- .../cloud/utils/exception/ExceptionUtil.java | 7 +- .../utils/exception/ExecutionException.java | 7 +- .../HypervisorVersionChangedException.java | 7 +- utils/src/com/cloud/utils/fsm/ChangeEvent.java | 37 +- utils/src/com/cloud/utils/fsm/FiniteState.java | 7 +- utils/src/com/cloud/utils/fsm/FiniteState2.java | 37 +- .../com/cloud/utils/fsm/FiniteStateObject.java | 7 +- .../cloud/utils/fsm/NoTransitionException.java | 7 +- utils/src/com/cloud/utils/fsm/State.java | 37 +- utils/src/com/cloud/utils/fsm/StateDao.java | 7 +- .../src/com/cloud/utils/fsm/StateListener.java | 7 +- utils/src/com/cloud/utils/fsm/StateMachine.java | 7 +- .../src/com/cloud/utils/fsm/StateMachine2.java | 7 +- utils/src/com/cloud/utils/fsm/StateObject.java | 7 +- .../cloud/utils/log/CglibThrowableRenderer.java | 7 +- utils/src/com/cloud/utils/mgmt/JmxUtil.java | 7 +- .../com/cloud/utils/mgmt/ManagementBean.java | 7 +- .../utils/mgmt/PropertyMapDynamicBean.java | 7 +- utils/src/com/cloud/utils/net/Ip.java | 9 +- utils/src/com/cloud/utils/net/Ip4Address.java | 7 +- utils/src/com/cloud/utils/net/MacAddress.java | 7 +- utils/src/com/cloud/utils/net/NetUtils.java | 7 +- utils/src/com/cloud/utils/net/NfsUtils.java | 7 +- utils/src/com/cloud/utils/net/UrlUtil.java | 7 +- .../src/com/cloud/utils/nio/HandlerFactory.java | 7 +- utils/src/com/cloud/utils/nio/Link.java | 7 +- utils/src/com/cloud/utils/nio/NioClient.java | 7 +- .../src/com/cloud/utils/nio/NioConnection.java | 7 +- utils/src/com/cloud/utils/nio/NioServer.java | 7 +- utils/src/com/cloud/utils/nio/Task.java | 7 +- .../com/cloud/utils/nio/TrustAllManager.java | 7 +- .../BasicEncodedRESTValidationStrategy.java | 66 + .../utils/rest/CloudstackRESTException.java | 39 + .../cloud/utils/rest/RESTServiceConnector.java | 377 +++ .../utils/rest/RESTValidationStrategy.java | 165 ++ .../cloud/utils/script/OutputInterpreter.java | 7 +- utils/src/com/cloud/utils/script/Script.java | 7 +- utils/src/com/cloud/utils/script/Script2.java | 7 +- .../cloud/utils/security/CertificateHelper.java | 7 +- utils/src/com/cloud/utils/ssh/SSHCmdHelper.java | 7 +- .../src/com/cloud/utils/ssh/SSHKeysHelper.java | 7 +- utils/src/com/cloud/utils/ssh/SshException.java | 7 +- utils/src/com/cloud/utils/ssh/SshHelper.java | 2 + .../storage/encoding/DecodedDataObject.java | 47 +- .../storage/encoding/DecodedDataStore.java | 51 +- .../cloud/utils/storage/encoding/Decoder.java | 37 +- .../utils/storage/encoding/EncodingType.java | 37 +- .../com/cloud/utils/time/InaccurateClock.java | 7 +- .../cloud/utils/time/InaccurateClockMBean.java | 7 +- .../com/cloud/utils/xmlobject/XmlObject.java | 3 + .../cloud/utils/xmlobject/XmlObjectParser.java | 3 + .../utils/identity/ManagementServerNode.java | 3 + .../ssl/EasySSLProtocolSocketFactory.java | 53 +- .../contrib/ssl/EasyX509TrustManager.java | 43 +- utils/test/com/cloud/utils/DummyImpl.java | 7 +- utils/test/com/cloud/utils/DummyInterface.java | 7 +- .../test/com/cloud/utils/DummyPremiumImpl.java | 7 +- utils/test/com/cloud/utils/NumbersUtilTest.java | 10 +- .../com/cloud/utils/PasswordGeneratorTest.java | 7 +- utils/test/com/cloud/utils/ProcessUtilTest.java | 33 +- .../com/cloud/utils/PropertiesUtilsTest.java | 3 + utils/test/com/cloud/utils/ReflectUtilTest.java | 9 +- utils/test/com/cloud/utils/ScriptTest.java | 7 +- utils/test/com/cloud/utils/StringUtilsTest.java | 18 +- utils/test/com/cloud/utils/TernaryTest.java | 6 +- utils/test/com/cloud/utils/TestProfiler.java | 7 +- utils/test/com/cloud/utils/UriUtilsTest.java | 60 + utils/test/com/cloud/utils/UuidUtilsTest.java | 42 + .../backoff/impl/ConstantTimeBackoffTest.java | 7 +- .../com/cloud/utils/crypto/RSAHelperTest.java | 3 + .../cloud/utils/encoding/UrlEncoderTest.java | 37 +- .../utils/exception/ExceptionUtilTest.java | 37 +- utils/test/com/cloud/utils/net/IpTest.java | 46 + .../test/com/cloud/utils/net/NetUtilsTest.java | 7 +- .../utils/rest/RESTServiceConnectorTest.java | 395 +++ .../com/cloud/utils/ssh/SSHKeysHelperTest.java | 3 + .../utils/testcase/Log4jEnabledTestCase.java | 7 +- .../test/com/cloud/utils/testcase/NioTest.java | 7 +- .../cloud/utils/xmlobject/TestXmlObject.java | 3 + .../cloud/utils/xmlobject/TestXmlObject2.java | 3 + .../com/cloud/utils/QualifierTestContext.xml | 30 +- .../utils/db/transactionContextBuilderTest.xml | 30 +- utils/test/resources/log4j.xml | 30 +- utils/test/resources/testContext.xml | 34 +- .../hypervisor/vmware/mo/VirtualMachineMO.java | 76 +- 593 files changed, 22050 insertions(+), 14435 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c64bfa5d/client/WEB-INF/classes/resources/messages.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c64bfa5d/ui/dictionary.jsp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c64bfa5d/ui/scripts/sharedFunctions.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c64bfa5d/ui/scripts/ui/dialog.js ---------------------------------------------------------------------- diff --cc ui/scripts/ui/dialog.js index 6d6bb0a,fd81e25..9653337 --- a/ui/scripts/ui/dialog.js +++ b/ui/scripts/ui/dialog.js @@@ -122,9 -114,13 +123,13 @@@ $(this).dialog('destroy'); $('.hovered-elem').hide(); + + if (cancel) { + cancel(); + } } }] - }).closest('.ui-dialog').overlay(); + }); }; var isLastAsync = function(idx) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c64bfa5d/ui/scripts/ui/widgets/detailView.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c64bfa5d/ui/scripts/ui/widgets/listView.js ---------------------------------------------------------------------- diff --cc ui/scripts/ui/widgets/listView.js index 2ee3f1a,9e399e1..b028bad --- a/ui/scripts/ui/widgets/listView.js +++ b/ui/scripts/ui/widgets/listView.js @@@ -1175,9 -1180,19 +1175,18 @@@ if (actionName == 'moveDrag') return false; rowActions[actionName]($tr); + var map1 = {}; $tr.closest('tbody').find('tr').each(function() { + /* + * fire only one sorting API call(updateXXXXXXX&sortKey=n&id=UUID) for items who have the same UUID. + * e.g. An Template/ISO of multiple zones have the same UUID. + */ + var objId = $(this).data('json-obj').id; + if(!(objId in map1)) { sort($(this), action); + map1[objId] = 1; + } }); - $tr.closest('.data-table').dataTable('selectRow', $tr.index()); return false; });
