Merge branch 'master' into ui-add-remove-nics
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/18a33727 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/18a33727 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/18a33727 Branch: refs/heads/ui-add-remove-nics Commit: 18a337270d4254746762bf329e7cfac1d57dd673 Parents: 564a850 5ce2890 Author: Brian Federle <brian.fede...@citrix.com> Authored: Thu Apr 25 11:09:51 2013 -0700 Committer: Brian Federle <brian.fede...@citrix.com> Committed: Thu Apr 25 11:09:51 2013 -0700 ---------------------------------------------------------------------- CHANGES | 385 +- DISCLAIMER | 7 - LICENSE | 64 - README.md | 6 +- agent/src/com/cloud/agent/AgentShell.java | 3 +- .../consoleproxy/ConsoleProxyResource.java | 4 +- .../agent/api/DeleteSnapshotBackupCommand.java | 6 +- .../cloud/agent/api/MigrateWithStorageAnswer.java | 39 + .../cloud/agent/api/MigrateWithStorageCommand.java | 45 + .../api/MigrateWithStorageCompleteAnswer.java | 38 + .../api/MigrateWithStorageCompleteCommand.java | 36 + .../agent/api/MigrateWithStorageReceiveAnswer.java | 55 + .../api/MigrateWithStorageReceiveCommand.java | 45 + .../agent/api/MigrateWithStorageSendAnswer.java | 39 + .../agent/api/MigrateWithStorageSendCommand.java | 58 + .../com/cloud/agent/api/UnregisterVMCommand.java | 34 + .../agent/api/storage/MigrateVolumeAnswer.java | 38 + .../agent/api/storage/MigrateVolumeCommand.java | 51 + api/src/com/cloud/agent/api/to/FirewallRuleTO.java | 6 + .../api/commands/CreatePrivateNetworkCmd.java | 197 - .../cloud/api/commands/DestroyConsoleProxyCmd.java | 93 - api/src/com/cloud/async/AsyncJob.java | 3 +- .../cloud/configuration/ConfigurationService.java | 6 + .../cloud/consoleproxy/ConsoleProxyService.java | 23 - api/src/com/cloud/event/EventTypes.java | 15 +- .../cloud/exception/AffinityConflictException.java | 34 + .../cloud/hypervisor/HypervisorCapabilities.java | 2 + api/src/com/cloud/hypervisor/HypervisorGuru.java | 9 + api/src/com/cloud/network/IpAddress.java | 9 - api/src/com/cloud/network/Network.java | 15 +- api/src/com/cloud/network/NetworkModel.java | 4 +- api/src/com/cloud/network/NetworkService.java | 6 +- api/src/com/cloud/network/PhysicalNetwork.java | 5 +- api/src/com/cloud/network/PublicIpAddress.java | 3 - api/src/com/cloud/network/element/IpDeployer.java | 6 +- api/src/com/cloud/offering/NetworkOffering.java | 3 + .../region/ha/GlobalLoadBalancingRulesService.java | 3 + api/src/com/cloud/server/ManagementService.java | 21 +- api/src/com/cloud/user/Account.java | 4 + api/src/com/cloud/user/User.java | 2 + api/src/com/cloud/vm/DiskProfile.java | 2 +- api/src/com/cloud/vm/UserVmService.java | 227 +- .../apache/cloudstack/affinity/AffinityGroup.java | 31 + .../affinity/AffinityGroupProcessor.java | 49 + .../cloudstack/affinity/AffinityGroupResponse.java | 158 + .../cloudstack/affinity/AffinityGroupService.java | 79 + .../affinity/AffinityGroupTypeResponse.java | 48 + .../cloudstack/affinity/AffinityProcessorBase.java | 44 + .../org/apache/cloudstack/api/ApiConstants.java | 11 +- api/src/org/apache/cloudstack/api/BaseCmd.java | 34 +- .../apache/cloudstack/api/ResponseGenerator.java | 28 +- .../command/admin/account/CreateAccountCmd.java | 14 +- .../command/admin/cluster/UpdateClusterCmd.java | 15 +- .../api/command/admin/config/ListCfgsByCmd.java | 24 +- .../api/command/admin/config/UpdateCfgCmd.java | 22 +- .../admin/host/FindHostsForMigrationCmd.java | 107 + .../api/command/admin/host/ListHostsCmd.java | 14 +- .../admin/network/UpdatePhysicalNetworkCmd.java | 8 +- .../admin/offering/CreateServiceOfferingCmd.java | 1 + .../storage/FindStoragePoolsForMigrationCmd.java | 98 + .../command/admin/storage/ListStoragePoolsCmd.java | 7 + .../admin/vlan/DedicatePublicIpRangeCmd.java | 108 + .../admin/vlan/ReleasePublicIpRangeCmd.java | 77 + .../api/command/admin/vm/MigrateVMCmd.java | 2 +- .../vm/MigrateVirtualMachineWithVolumeCmd.java | 160 + .../command/user/address/AssociateIPAddrCmd.java | 31 +- .../user/affinitygroup/CreateAffinityGroupCmd.java | 167 + .../user/affinitygroup/DeleteAffinityGroupCmd.java | 154 + .../affinitygroup/ListAffinityGroupTypesCmd.java | 67 + .../user/affinitygroup/ListAffinityGroupsCmd.java | 90 + .../affinitygroup/UpdateVMAffinityGroupCmd.java | 164 + .../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 3 + .../ha/gslb/ListGlobalLoadBalancerRuleCmd.java | 2 +- .../api/command/user/tag/CreateTagsCmd.java | 2 +- .../api/command/user/tag/DeleteTagsCmd.java | 2 +- .../api/command/user/tag/ListTagsCmd.java | 2 +- .../api/command/user/vm/AddIpToVmNicCmd.java | 9 +- .../api/command/user/vm/DeployVMCmd.java | 48 +- .../cloudstack/api/command/user/vm/ListVMsCmd.java | 21 +- .../api/command/user/vm/UpdateVMCmd.java | 2 +- .../user/vmsnapshot/CreateVMSnapshotCmd.java | 2 +- .../user/vmsnapshot/DeleteVMSnapshotCmd.java | 2 +- .../command/user/vmsnapshot/ListVMSnapshotCmd.java | 2 +- .../user/vmsnapshot/RevertToSnapshotCmd.java | 2 +- .../api/command/user/volume/ListVolumesCmd.java | 7 + .../api/command/user/volume/MigrateVolumeCmd.java | 8 + .../api/command/user/zone/ListZonesByCmd.java | 7 + .../cloudstack/api/response/AccountResponse.java | 7 + .../cloudstack/api/response/ClusterResponse.java | 9 +- .../api/response/ConfigurationResponse.java | 12 + .../api/response/DeploymentPlannersResponse.java | 37 + .../api/response/DomainRouterResponse.java | 11 + .../api/response/FirewallRuleResponse.java | 12 + .../api/response/GlobalLoadBalancerResponse.java | 18 + .../api/response/HostForMigrationResponse.java | 365 + .../cloudstack/api/response/HostResponse.java | 10 +- .../cloudstack/api/response/NetworkResponse.java | 7 + .../cloudstack/api/response/PodResponse.java | 9 +- .../cloudstack/api/response/SnapshotResponse.java | 16 + .../response/StoragePoolForMigrationResponse.java | 248 + .../api/response/StoragePoolResponse.java | 31 +- .../cloudstack/api/response/SystemVmResponse.java | 11 + .../cloudstack/api/response/TemplateResponse.java | 7 + .../cloudstack/api/response/UserResponse.java | 8 + .../cloudstack/api/response/UserVmResponse.java | 21 + .../cloudstack/api/response/VolumeResponse.java | 8 + .../network/ExternalNetworkDeviceManager.java | 1 + .../org/apache/cloudstack/query/QueryService.java | 4 + .../api/command/test/AddIpToVmNicTest.java | 6 +- .../api/command/test/ListCfgCmdTest.java | 89 + .../api/command/test/UpdateCfgCmdTest.java | 116 + .../com/cloud/bridge/service/EC2RestServlet.java | 2 +- .../com/cloud/bridge/service/core/s3/S3Engine.java | 2 +- build/replace.properties | 1 + .../WEB-INF/classes/resources/messages.properties | 1874 ++-- .../classes/resources/messages_ca.properties | 306 + .../classes/resources/messages_de_DE.properties | 747 ++ .../classes/resources/messages_es.properties | 861 ++ .../classes/resources/messages_fr_FR.properties | 216 +- .../classes/resources/messages_it_IT.properties | 618 ++ .../classes/resources/messages_ja.properties | 2909 +++--- .../classes/resources/messages_ko_KR.properties | 2887 +++--- .../classes/resources/messages_nb_NO.properties | 365 + .../classes/resources/messages_pt_BR.properties | 2094 ++-- .../classes/resources/messages_ru_RU.properties | 2892 +++--- .../classes/resources/messages_zh_CN.properties | 2989 +++--- client/pom.xml | 33 +- client/tomcatconf/applicationContext.xml.in | 231 +- client/tomcatconf/commands.properties.in | 23 + client/tomcatconf/componentContext.xml.in | 223 +- client/tomcatconf/db-enc.properties.in | 68 - client/tomcatconf/nonossComponentContext.xml.in | 225 +- client/tomcatconf/server.xml.in | 231 - client/tomcatconf/simulatorComponentContext.xml.in | 219 +- .../cloud/hypervisor/HypervisorCapabilitiesVO.java | 35 +- .../src/com/cloud/resource/ServerResourceBase.java | 2 +- .../resource/CifsSecondaryStorageResource.java | 755 -- .../resource/LocalSecondaryStorageResource.java | 246 - .../resource/NfsSecondaryStorageResource.java | 1842 ---- .../storage/resource/SecondaryStorageResource.java | 28 - .../resource/SecondaryStorageResourceHandler.java | 24 - .../cloud/storage/template/DownloadManager.java | 103 - .../storage/template/DownloadManagerImpl.java | 1049 -- .../com/cloud/storage/template/UploadManager.java | 85 - .../cloud/storage/template/UploadManagerImpl.java | 645 -- core/src/com/cloud/user/AccountVO.java | 7 + core/src/com/cloud/user/UserVO.java | 11 +- core/src/com/cloud/vm/UserVmVO.java | 6 +- core/src/com/cloud/vm/VmDetailConstants.java | 1 + debian/cloudstack-agent.install | 6 +- debian/cloudstack-awsapi.install | 10 +- debian/cloudstack-common.install | 8 +- debian/cloudstack-management.install | 12 +- debian/cloudstack-management.postinst | 11 +- debian/control | 4 +- debian/rules | 51 +- deps/install-non-oss.sh | 13 - docs/en-US/Admin_Guide.xml | 2 +- docs/en-US/Book_Info.xml | 39 +- docs/en-US/Book_Info_Release_Notes_4-0.xml | 7 +- docs/en-US/CloudStack_Nicira_NVP_Guide.xml | 2 +- docs/en-US/Common_Content/feedback.xml | 24 + docs/en-US/Developers_Guide.xml | 2 +- docs/en-US/Installation_Guide.xml | 4 +- docs/en-US/Preface.xml | 2 +- docs/en-US/Release_Notes.xml | 7817 ++++++++++----- docs/en-US/about-working-with-vms.xml | 85 +- docs/en-US/add-clusters-vsphere.xml | 11 +- docs/en-US/added-API-commands-4.2.xml | 43 + docs/en-US/added-API-commands.xml | 2 +- docs/en-US/advanced-zone-configuration.xml | 2 +- docs/en-US/advanced-zone-network-traffic-types.xml | 2 +- docs/en-US/append-displayname-vms.xml | 84 + docs/en-US/aws-ec2-introduction.xml | 2 +- docs/en-US/basic-zone-network-traffic-types.xml | 4 +- docs/en-US/build-nonoss.xml | 49 + docs/en-US/building-documentation.xml | 2 +- docs/en-US/building-marvin.xml | 2 +- docs/en-US/building-translation.xml | 2 +- ...change-console-proxy-ssl-certificate-domain.xml | 2 +- docs/en-US/changed-API-commands-4.2.xml | 123 + docs/en-US/citrix-xenserver-installation.xml | 2 +- docs/en-US/configure-package-repository.xml | 2 +- docs/en-US/configure-vpn.xml | 2 +- docs/en-US/console-proxy.xml | 2 +- docs/en-US/creating-network-offerings.xml | 45 + docs/en-US/delete-event-alerts.xml | 47 + docs/en-US/elastic-ip.xml | 90 + docs/en-US/events.xml | 3 +- docs/en-US/feedback.xml | 24 + docs/en-US/global-config.xml | 79 + docs/en-US/hypervisor-host-install-firewall.xml | 4 +- docs/en-US/hypervisor-host-install-libvirt.xml | 2 +- ...hypervisor-host-install-network-openvswitch.xml | 2 +- docs/en-US/hypervisor-host-install-network.xml | 12 +- docs/en-US/hypervisor-installation.xml | 1 + docs/en-US/hypervisor-kvm-install-flow.xml | 1 + .../hypervisor-support-for-primarystorage.xml | 148 +- docs/en-US/images/VMSnapshotButton.png | Bin 0 -> 967 bytes docs/en-US/images/add-vlan-icon.png | Bin 0 -> 860 bytes docs/en-US/images/revert-vm.png | Bin 0 -> 860 bytes docs/en-US/ipv6-support.xml | 4 +- docs/en-US/limit-accounts-domains.xml | 371 + docs/en-US/lxc-install.xml | 110 + docs/en-US/lxc-topology-req.xml | 24 + .../en-US/management-server-install-prepare-os.xml | 2 +- docs/en-US/management-server-install-systemvm.xml | 4 + docs/en-US/management-server-lb.xml | 2 +- docs/en-US/minimum-system-requirements.xml | 3 +- docs/en-US/multiple-ip-nic.xml | 91 + docs/en-US/network-offerings.xml | 83 +- docs/en-US/networks.xml | 2 + docs/en-US/non-contiguous-vlan.xml | 68 + docs/en-US/prepare-system-vm-template.xml | 4 + docs/en-US/set-up-network-for-users.xml | 13 +- docs/en-US/source-build.xml | 4 +- docs/en-US/source.xml | 1 + docs/en-US/topology-req.xml | 3 +- docs/en-US/translating-documentation.xml | 2 +- .../troubleshooting-working-with-server-logs.xml | 6 +- docs/en-US/using-netscaler-load-balancers.xml | 132 +- docs/en-US/using-sshkeys.xml | 2 +- docs/en-US/virtual-machines.xml | 2 + docs/en-US/vlan-provisioning.xml | 2 + docs/en-US/vm-snapshots.xml | 148 + docs/en-US/vmware-cluster-config-dvswitch.xml | 35 +- docs/en-US/vmware-install.xml | 4 +- docs/en-US/vmware-requirements.xml | 2 +- docs/en-US/whats-new.xml | 6 +- docs/en-US/work-with-usage.xml | 26 +- docs/en-US/writing-new-documentation.xml | 4 +- docs/publican-cloudstack/defaults.cfg | 4 +- docs/publican-cloudstack/en-US/Feedback.xml | 56 +- .../engine/datacenter/entity/api/HostEntity.java | 89 +- .../rest/service/api/ClusterRestService.java | 172 +- .../rest/service/api/NetworkRestService.java | 124 +- .../engine/rest/service/api/PodRestService.java | 158 +- .../service/api/VirtualMachineRestService.java | 112 +- .../engine/rest/service/api/VolumeRestService.java | 152 +- .../engine/rest/service/api/ZoneRestService.java | 174 +- .../subsystem/api/storage/CommandResult.java | 2 +- .../subsystem/api/storage/DataStoreStatus.java | 23 - .../api/storage/ObjectInDataStoreStateMachine.java | 4 +- .../subsystem/api/storage/VolumeService.java | 7 +- .../datastore/db/StoragePoolDetailsDao.java | 1 + .../org/apache/cloudstack/compute/ComputeGuru.java | 68 +- .../engine/cloud/entity/api/VMEntityManager.java | 52 +- .../cloud/entity/api/VMEntityManagerImpl.java | 117 +- .../cloud/entity/api/VirtualMachineEntityImpl.java | 446 +- .../engine/cloud/entity/api/db/VMComputeTagVO.java | 102 +- .../engine/cloud/entity/api/db/VMEntityVO.java | 2 +- .../engine/cloud/entity/api/db/VMNetworkMapVO.java | 110 +- .../cloud/entity/api/db/VMReservationVO.java | 222 +- .../cloud/entity/api/db/VMRootDiskTagVO.java | 102 +- .../cloud/entity/api/db/VolumeReservationVO.java | 168 +- .../cloud/entity/api/db/dao/VMComputeTagDao.java | 30 +- .../entity/api/db/dao/VMComputeTagDaoImpl.java | 146 +- .../cloud/entity/api/db/dao/VMNetworkMapDao.java | 30 +- .../entity/api/db/dao/VMNetworkMapDaoImpl.java | 138 +- .../cloud/entity/api/db/dao/VMReservationDao.java | 36 +- .../entity/api/db/dao/VMReservationDaoImpl.java | 190 +- .../cloud/entity/api/db/dao/VMRootDiskTagDao.java | 30 +- .../entity/api/db/dao/VMRootDiskTagDaoImpl.java | 144 +- .../entity/api/db/dao/VolumeReservationDao.java | 30 +- .../api/db/dao/VolumeReservationDaoImpl.java | 104 +- .../datacenter/entity/api/ClusterEntityImpl.java | 386 +- .../entity/api/DataCenterResourceManager.java | 68 +- .../entity/api/DataCenterResourceManagerImpl.java | 226 +- .../datacenter/entity/api/HostEntityImpl.java | 398 +- .../datacenter/entity/api/PodEntityImpl.java | 422 +- .../datacenter/entity/api/ZoneEntityImpl.java | 402 +- .../datacenter/entity/api/db/EngineCluster.java | 46 +- .../datacenter/entity/api/db/EngineDataCenter.java | 46 +- .../entity/api/db/EngineDataCenterVO.java | 210 +- .../datacenter/entity/api/db/EngineHost.java | 48 +- .../datacenter/entity/api/db/EngineHostPodVO.java | 170 +- .../engine/datacenter/entity/api/db/EnginePod.java | 46 +- .../entity/api/db/dao/EngineHostDao.java | 2 +- .../entity/api/db/dao/EngineHostPodDao.java | 20 +- .../entity/api/db/dao/EngineHostPodDaoImpl.java | 142 +- .../service/api/ProvisioningServiceImpl.java | 340 +- .../platform/orchestration/CloudOrchestrator.java | 63 +- .../engine/provisioning/test/ProvisioningTest.java | 242 +- .../cloudstack/storage/image/ImageServiceImpl.java | 85 +- .../driver/AncientImageDataStoreDriverImpl.java | 10 +- .../image/motion/DefaultImageMotionStrategy.java | 22 +- .../cloudstack/storage/test/DirectAgentTest.java | 4 +- .../test/MockHypervisorHostEndPointRpcServer.java | 72 + .../test/MockHypervsiorHostEndPointRpcServer.java | 72 - .../storage/test/MockStorageMotionStrategy.java | 19 + .../integration-test/test/resource/component.xml | 2 +- .../storage/snapshot/SnapshotObject.java | 2 +- .../storage/HypervisorHostEndPointRpcServer.java | 119 + .../storage/HypervsiorHostEndPointRpcServer.java | 119 - .../allocator/AbstractStoragePoolAllocator.java | 2 +- .../ClusterScopeStoragePoolAllocator.java | 1 + .../GarbageCollectingStoragePoolAllocator.java | 2 +- .../allocator/LocalStoragePoolAllocator.java | 9 +- .../allocator/ZoneWideStoragePoolAllocator.java | 3 +- .../command/CreateVolumeFromBaseImageCommand.java | 6 +- .../storage/datastore/DataObjectManagerImpl.java | 6 +- .../provider/DataStoreProviderManagerImpl.java | 4 +- .../storage/motion/AncientDataMotionStrategy.java | 89 +- .../storage/motion/DataMotionService.java | 9 + .../storage/motion/DataMotionServiceImpl.java | 16 + .../storage/motion/DataMotionStrategy.java | 10 + .../storage/to/ImageOnPrimaryDataStoreTO.java | 44 + .../storage/to/ImageOnPrimayDataStoreTO.java | 44 - .../driver/DefaultPrimaryDataStoreDriverImpl.java | 4 +- .../DefaultPrimaryDatastoreProviderImpl.java | 6 +- .../volume/TemplateInstallStrategyImpl.java | 6 +- .../cloudstack/storage/volume/VolumeObject.java | 2 + .../storage/volume/VolumeServiceImpl.java | 174 +- .../jackson/CSJacksonAnnotationIntrospector.java | 120 +- .../ws/jackson/CSJacksonAnnotationModule.java | 94 +- .../framework/ws/jackson/UriSerializer.java | 116 +- .../framework/ws/jackson/UrisSerializer.java | 142 +- .../cloudstack/framework/ws/jackson/Url.java | 106 +- .../ws/jackson/CSJacksonAnnotationTest.java | 166 +- packaging/centos63/cloud-agent.rc | 3 +- packaging/centos63/cloud-usage.rc | 2 +- packaging/centos63/cloud.spec | 90 +- packaging/centos63/package.sh | 219 +- packaging/centos63/replace.properties | 2 +- packaging/debian/init/cloud-management | 2 +- packaging/debian/replace.properties | 2 +- .../debian/config/etc/init.d/cloud-early-config | 77 +- patches/systemvm/debian/config/root/edithosts.sh | 3 +- .../host-anti-affinity/pom.xml | 33 + .../affinity/HostAntiAffinityProcessor.java | 93 + .../cloudstack/syslog/AlertsSyslogAppender.java | 4 +- .../manager/allocator/impl/RandomAllocator.java | 56 + .../baremetal/manager/AddBaremetalHostCmd.java | 48 +- .../baremetal/manager/BareMetalDiscoverer.java | 2 +- .../cloud/baremetal/manager/BaremetalManager.java | 2 +- .../manager/BaremetalPlannerSelector.java | 78 +- .../AddBaremetalKickStartPxeCmd.java | 28 +- .../networkservice/BareMetalResourceBase.java | 28 +- .../networkservice/BaremetaNetworkGuru.java | 208 +- .../BaremetalKickStartPxeResource.java | 322 +- .../BaremetalKickStartServiceImpl.java | 398 +- .../BaremetalPxeKickStartResponse.java | 32 +- .../networkservice/BaremetalPxeManagerImpl.java | 6 +- .../networkservice/BaremetalUserdataElement.java | 256 +- .../PrepareKickstartPxeServerCommand.java | 92 +- .../networkservice/SecurityGroupHttpClient.java | 76 +- plugins/hypervisors/kvm/pom.xml | 123 +- .../hypervisor/kvm/resource/KVMHAMonitor.java | 54 +- .../kvm/resource/LibvirtComputingResource.java | 28 +- .../hypervisor/kvm/resource/LibvirtConnection.java | 14 +- .../kvm/storage/KVMStoragePoolManager.java | 12 +- plugins/hypervisors/simulator/pom.xml | 5 + .../com/cloud/resource/AgentStorageResource.java | 2 +- .../resource/SimulatorSecondaryDiscoverer.java | 3 +- .../src/com/cloud/ucs/database/UcsBladeDao.java | 16 +- .../com/cloud/ucs/database/UcsBladeDaoImpl.java | 22 +- .../ucs/src/com/cloud/ucs/database/UcsBladeVO.java | 140 +- .../src/com/cloud/ucs/database/UcsManagerDao.java | 32 +- .../com/cloud/ucs/database/UcsManagerDaoImpl.java | 21 +- .../src/com/cloud/ucs/database/UcsManagerVO.java | 140 +- .../com/cloud/ucs/manager/AddUcsManagerCmd.java | 198 +- .../ucs/manager/AssociateUcsProfileToBladeCmd.java | 156 +- .../src/com/cloud/ucs/manager/ListUcsBladeCmd.java | 174 +- .../com/cloud/ucs/manager/ListUcsManagerCmd.java | 114 +- .../com/cloud/ucs/manager/ListUcsProfileCmd.java | 114 +- .../src/com/cloud/ucs/manager/StringTemplate.java | 46 +- .../com/cloud/ucs/manager/UcsBladeResponse.java | 168 +- .../ucs/src/com/cloud/ucs/manager/UcsCommands.java | 168 +- .../src/com/cloud/ucs/manager/UcsHttpClient.java | 68 +- .../ucs/src/com/cloud/ucs/manager/UcsManager.java | 32 +- .../src/com/cloud/ucs/manager/UcsManagerImpl.java | 554 +- .../com/cloud/ucs/manager/UcsManagerResponse.java | 102 +- .../com/cloud/ucs/manager/UcsProfileResponse.java | 38 +- .../src/com/cloud/ucs/structure/ComputeBlade.java | 332 +- .../src/com/cloud/ucs/structure/UcsProfile.java | 76 +- plugins/hypervisors/vmware/pom.xml | 5 + .../src/com/cloud/hypervisor/guru/VMwareGuru.java | 51 +- .../vmware/manager/VmwareManagerImpl.java | 3 +- .../hypervisor/vmware/resource/VmwareResource.java | 75 +- .../resource/PremiumSecondaryStorageResource.java | 2 + .../VmwareSecondaryStorageResourceHandler.java | 1 + .../xen/resource/CitrixResourceBase.java | 6 +- .../xen/resource/XenServer56FP1Resource.java | 1 + .../xen/resource/XenServer610Resource.java | 359 +- .../xen/resource/XenServerStorageResource.java | 4 +- .../motion/XenServerStorageMotionStrategy.java | 239 + plugins/network-elements/cisco-vnmc/pom.xml | 42 + .../scripts/network/cisco/assoc-asa1000v.xml | 34 + .../network/cisco/associate-acl-policy-set.xml | 37 + .../network/cisco/associate-dhcp-policy.xml | 34 + .../network/cisco/associate-dhcp-server.xml | 32 + .../network/cisco/associate-nat-policy-set.xml | 35 + .../network/cisco/associate-route-policy.xml | 33 + .../network/cisco/create-acl-policy-ref.xml | 38 + .../network/cisco/create-acl-policy-set.xml | 36 + .../scripts/network/cisco/create-acl-policy.xml | 35 + .../network/cisco/create-acl-rule-for-dnat.xml | 82 + .../network/cisco/create-acl-rule-for-pf.xml | 156 + .../scripts/network/cisco/create-dhcp-policy.xml | 72 + .../scripts/network/cisco/create-dnat-rule.xml | 91 + .../network/cisco/create-edge-device-profile.xml | 32 + .../cisco/create-edge-device-route-policy.xml | 30 + .../network/cisco/create-edge-device-route.xml | 35 + .../scripts/network/cisco/create-edge-firewall.xml | 89 + .../network/cisco/create-edge-security-profile.xml | 41 + .../network/cisco/create-egress-acl-rule.xml | 201 + .../cisco/create-generic-egress-acl-rule.xml | 122 + .../cisco/create-generic-ingress-acl-rule.xml | 121 + .../network/cisco/create-ingress-acl-rule.xml | 201 + .../scripts/network/cisco/create-ip-pool.xml | 58 + .../network/cisco/create-nat-policy-ref.xml | 38 + .../network/cisco/create-nat-policy-set.xml | 37 + .../scripts/network/cisco/create-nat-policy.xml | 33 + .../scripts/network/cisco/create-pf-rule.xml | 166 + .../scripts/network/cisco/create-port-pool.xml | 72 + .../network/cisco/create-source-nat-pool.xml | 58 + .../network/cisco/create-source-nat-rule.xml | 103 + .../scripts/network/cisco/create-tenant.xml | 29 + .../scripts/network/cisco/create-vdc.xml | 30 + .../network/cisco/delete-acl-policy-set.xml | 30 + .../scripts/network/cisco/delete-acl-policy.xml | 33 + .../scripts/network/cisco/delete-edge-firewall.xml | 30 + .../network/cisco/delete-edge-security-profile.xml | 38 + .../network/cisco/delete-nat-policy-set.xml | 30 + .../scripts/network/cisco/delete-nat-policy.xml | 33 + .../scripts/network/cisco/delete-rule.xml | 31 + .../scripts/network/cisco/delete-tenant.xml | 30 + .../scripts/network/cisco/delete-vdc.xml | 30 + .../scripts/network/cisco/disassoc-asa1000v.xml | 30 + .../scripts/network/cisco/list-acl-policies.xml | 31 + .../scripts/network/cisco/list-children.xml | 27 + .../scripts/network/cisco/list-nat-policies.xml | 31 + .../network/cisco/list-policyrefs-in-policyset.xml | 31 + .../scripts/network/cisco/list-tenants.xml | 26 + .../network/cisco/list-unassigned-asa1000v.xml | 39 + .../cisco-vnmc/scripts/network/cisco/login.xml | 20 + ...AssociateAsaWithLogicalEdgeFirewallCommand.java | 53 + .../api/CleanupLogicalEdgeFirewallCommand.java | 43 + .../agent/api/ConfigureNexusVsmForAsaCommand.java | 95 + .../api/CreateLogicalEdgeFirewallCommand.java | 94 + .../api/commands/AddCiscoAsa1000vResourceCmd.java | 116 + .../api/commands/AddCiscoVnmcResourceCmd.java | 115 + .../commands/DeleteCiscoAsa1000vResourceCmd.java | 93 + .../api/commands/DeleteCiscoVnmcResourceCmd.java | 93 + .../commands/ListCiscoAsa1000vResourcesCmd.java | 110 + .../api/commands/ListCiscoVnmcResourcesCmd.java | 106 + .../response/CiscoAsa1000vResourceResponse.java | 88 + .../api/response/CiscoVnmcResourceResponse.java | 75 + .../cloud/network/cisco/CiscoAsa1000vDevice.java | 39 + .../cloud/network/cisco/CiscoAsa1000vDeviceVO.java | 101 + .../cloud/network/cisco/CiscoVnmcConnection.java | 196 + .../network/cisco/CiscoVnmcConnectionImpl.java | 1415 +++ .../cloud/network/cisco/CiscoVnmcController.java | 40 + .../cloud/network/cisco/CiscoVnmcControllerVO.java | 102 + .../cloud/network/cisco/NetworkAsa1000vMap.java | 31 + .../cloud/network/cisco/NetworkAsa1000vMapVO.java | 73 + .../com/cloud/network/dao/CiscoAsa1000vDao.java | 33 + .../cloud/network/dao/CiscoAsa1000vDaoImpl.java | 63 + .../src/com/cloud/network/dao/CiscoVnmcDao.java | 32 + .../com/cloud/network/dao/CiscoVnmcDaoImpl.java | 51 + .../cloud/network/dao/NetworkAsa1000vMapDao.java | 28 + .../network/dao/NetworkAsa1000vMapDaoImpl.java | 61 + .../network/element/CiscoAsa1000vService.java | 43 + .../cloud/network/element/CiscoVnmcElement.java | 928 ++ .../network/element/CiscoVnmcElementService.java | 42 + .../cloud/network/resource/CiscoVnmcResource.java | 780 ++ .../contrib/ssl/EasySSLProtocolSocketFactory.java | 232 + .../contrib/ssl/EasyX509TrustManager.java | 114 + .../network/cisco/CiscoVnmcConnectionTest.java | 248 + .../network/element/CiscoVnmcElementTest.java | 401 + .../network/resource/CiscoVnmcResourceTest.java | 285 + .../dns-notifier/resources/components-example.xml | 2 +- .../cloudstack/network/element/DnsNotifier.java | 244 +- .../element/F5ExternalLoadBalancerElement.java | 15 +- .../element/JuniperSRXExternalFirewallElement.java | 60 +- .../cloud/network/resource/JuniperSrxResource.java | 322 +- .../cloud/network/element/SimpleFirewallRule.java | 18 + .../network/guru/MidoNetPublicNetworkGuru.java | 18 + plugins/network-elements/netscaler/pom.xml | 6 +- .../cloud/network/element/NetscalerElement.java | 3 +- .../cloud/network/element/NiciraNvpElement.java | 5 + .../network/element/NiciraNvpElementTest.java | 238 +- plugins/pom.xml | 2 + .../CloudStackPrimaryDataStoreLifeCycleImpl.java | 5 +- .../CloudStackPrimaryDataStoreProviderImpl.java | 6 +- pom.xml | 20 + scripts/network/juniper/application-add.xml | 2 +- scripts/network/juniper/security-policy-add.xml | 4 +- scripts/vm/hypervisor/kvm/patchviasocket.pl | 2 +- scripts/vm/network/security_group.py | 2 +- scripts/vm/systemvm/injectkeys.sh | 26 +- server/pom.xml | 4 +- .../com/cloud/agent/manager/AgentManagerImpl.java | 2 +- .../src/com/cloud/agent/manager/AgentMonitor.java | 35 +- .../cloud/agent/manager/AgentMonitorService.java | 2 +- .../agent/manager/allocator/HostAllocator.java | 23 +- .../manager/allocator/impl/FirstFitAllocator.java | 47 + .../manager/allocator/impl/TestingAllocator.java | 7 + server/src/com/cloud/api/ApiDBUtils.java | 56 +- server/src/com/cloud/api/ApiDispatcher.java | 9 - server/src/com/cloud/api/ApiResponseHelper.java | 163 +- server/src/com/cloud/api/ApiServer.java | 155 +- server/src/com/cloud/api/ApiServerService.java | 1 + server/src/com/cloud/api/ApiServlet.java | 6 +- .../src/com/cloud/api/query/QueryManagerImpl.java | 223 +- .../com/cloud/api/query/ViewResponseHelper.java | 57 +- .../cloud/api/query/dao/AccountJoinDaoImpl.java | 8 +- .../cloud/api/query/dao/AffinityGroupJoinDao.java | 37 + .../api/query/dao/AffinityGroupJoinDaoImpl.java | 143 + .../api/query/dao/DomainRouterJoinDaoImpl.java | 1 + .../src/com/cloud/api/query/dao/HostJoinDao.java | 5 + .../com/cloud/api/query/dao/HostJoinDaoImpl.java | 136 +- .../cloud/api/query/dao/StoragePoolJoinDao.java | 6 + .../api/query/dao/StoragePoolJoinDaoImpl.java | 61 +- .../api/query/dao/UserAccountJoinDaoImpl.java | 1 + .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 28 + .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 3 +- .../src/com/cloud/api/query/vo/AccountJoinVO.java | 10 + .../cloud/api/query/vo/AffinityGroupJoinVO.java | 259 + .../com/cloud/api/query/vo/DomainRouterJoinVO.java | 12 + server/src/com/cloud/api/query/vo/HostJoinVO.java | 11 + .../com/cloud/api/query/vo/StoragePoolJoinVO.java | 30 + .../com/cloud/api/query/vo/UserAccountJoinVO.java | 16 +- .../src/com/cloud/api/query/vo/UserVmJoinVO.java | 50 + .../src/com/cloud/api/query/vo/VolumeJoinVO.java | 15 + .../src/com/cloud/async/AsyncJobManagerImpl.java | 494 +- server/src/com/cloud/async/SyncQueueManager.java | 16 +- .../src/com/cloud/async/SyncQueueManagerImpl.java | 22 +- server/src/com/cloud/async/dao/SyncQueueDao.java | 2 +- .../src/com/cloud/async/dao/SyncQueueItemDao.java | 4 +- server/src/com/cloud/configuration/Config.java | 72 +- .../cloud/configuration/ConfigurationManager.java | 7 +- .../configuration/ConfigurationManagerImpl.java | 286 +- .../cloud/configuration/dao/ConfigurationDao.java | 1 + .../AgentBasedConsoleProxyManager.java | 188 +- .../src/com/cloud/consoleproxy/AgentHookBase.java | 288 + .../cloud/consoleproxy/ConsoleProxyManager.java | 17 +- .../consoleproxy/ConsoleProxyManagerImpl.java | 395 +- .../cloud/consoleproxy/ConsoleProxyService.java | 25 + .../consoleproxy/StaticConsoleProxyManager.java | 84 +- server/src/com/cloud/dc/dao/DataCenterDao.java | 2 + server/src/com/cloud/dc/dao/DataCenterDaoImpl.java | 8 + server/src/com/cloud/dc/dao/DataCenterVnetDao.java | 6 + .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 50 +- server/src/com/cloud/dc/dao/VlanDao.java | 2 + server/src/com/cloud/dc/dao/VlanDaoImpl.java | 19 + .../deploy/AbstractDeployPlannerSelector.java | 168 +- .../com/cloud/deploy/DeployPlannerSelector.java | 48 +- .../cloud/deploy/DeploymentPlanningManager.java | 45 + .../deploy/DeploymentPlanningManagerImpl.java | 106 + server/src/com/cloud/deploy/FirstFitPlanner.java | 93 +- .../cloud/deploy/HypervisorVmPlannerSelector.java | 108 +- server/src/com/cloud/domain/dao/DomainDaoImpl.java | 11 +- .../src/com/cloud/ha/UserVmDomRInvestigator.java | 6 +- server/src/com/cloud/host/dao/HostDao.java | 4 +- .../com/cloud/hypervisor/HypervisorGuruBase.java | 5 + .../hypervisor/dao/HypervisorCapabilitiesDao.java | 2 + .../dao/HypervisorCapabilitiesDaoImpl.java | 7 + .../cloud/network/ExteralIpAddressAllocator.java | 165 - .../network/ExternalFirewallDeviceManagerImpl.java | 30 +- .../cloud/network/ExternalIpAddressAllocator.java | 165 + .../ExternalLoadBalancerDeviceManagerImpl.java | 36 +- server/src/com/cloud/network/IpAddrAllocator.java | 2 +- server/src/com/cloud/network/NetworkManager.java | 3 +- .../src/com/cloud/network/NetworkManagerImpl.java | 349 +- server/src/com/cloud/network/NetworkModelImpl.java | 35 +- .../src/com/cloud/network/NetworkServiceImpl.java | 424 +- server/src/com/cloud/network/addr/PublicIp.java | 18 +- .../src/com/cloud/network/as/AutoScaleManager.java | 32 +- .../as/dao/AutoScalePolicyConditionMapDao.java | 32 +- .../as/dao/AutoScalePolicyConditionMapDaoImpl.java | 38 +- .../cloud/network/as/dao/AutoScalePolicyDao.java | 32 +- .../network/as/dao/AutoScalePolicyDaoImpl.java | 38 +- .../cloud/network/as/dao/AutoScaleVmGroupDao.java | 32 +- .../network/as/dao/AutoScaleVmGroupDaoImpl.java | 38 +- .../as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java | 38 +- .../network/as/dao/AutoScaleVmProfileDao.java | 32 +- .../network/as/dao/AutoScaleVmProfileDaoImpl.java | 38 +- server/src/com/cloud/network/dao/IPAddressVO.java | 2 - .../com/cloud/network/dao/PhysicalNetworkVO.java | 20 +- .../network/element/VirtualRouterElement.java | 2 +- .../com/cloud/network/guru/DirectNetworkGuru.java | 6 +- .../network/guru/DirectPodBasedNetworkGuru.java | 9 +- .../com/cloud/network/guru/GuestNetworkGuru.java | 14 +- .../router/VirtualNetworkApplianceManagerImpl.java | 15 +- .../com/cloud/network/rules/RulesManagerImpl.java | 16 +- .../network/security/dao/SecurityGroupDaoImpl.java | 22 +- .../src/com/cloud/network/vpc/VpcManagerImpl.java | 38 +- .../src/com/cloud/offerings/NetworkOfferingVO.java | 12 +- .../com/cloud/resource/ResourceManagerImpl.java | 22 +- .../PremiumSecondaryStorageManagerImpl.java | 6 +- .../src/com/cloud/server/ConfigurationServer.java | 5 + .../com/cloud/server/ConfigurationServerImpl.java | 130 +- server/src/com/cloud/server/Criteria.java | 12 +- server/src/com/cloud/server/ManagementServer.java | 3 + .../src/com/cloud/server/ManagementServerImpl.java | 490 +- .../src/com/cloud/service/ServiceOfferingVO.java | 58 +- .../ConsoleProxyPasswordBasedEncryptor.java | 99 +- .../src/com/cloud/servlet/ConsoleProxyServlet.java | 16 +- server/src/com/cloud/storage/StorageManager.java | 2 +- .../src/com/cloud/storage/StorageManagerImpl.java | 31 +- server/src/com/cloud/storage/VolumeManager.java | 8 + .../src/com/cloud/storage/VolumeManagerImpl.java | 112 +- .../storage/dao/StoragePoolDetailsDaoImpl.java | 9 + .../src/com/cloud/storage/dao/VMTemplateDao.java | 10 +- .../com/cloud/storage/dao/VMTemplateDaoImpl.java | 20 +- .../storage/download/DownloadMonitorImpl.java | 28 +- .../secondary/SecondaryStorageDiscoverer.java | 322 - .../secondary/SecondaryStorageManagerImpl.java | 13 +- .../storage/snapshot/SnapshotManagerImpl.java | 11 +- .../com/cloud/template/TemplateManagerImpl.java | 19 +- .../upgrade/PremiumDatabaseUpgradeChecker.java | 75 +- .../src/com/cloud/upgrade/dao/Upgrade30xBase.java | 622 +- .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 149 +- .../com/cloud/usage/UsageNetworkOfferingVO.java | 14 +- .../usage/dao/UsageNetworkOfferingDaoImpl.java | 9 +- server/src/com/cloud/user/AccountManagerImpl.java | 37 +- server/src/com/cloud/vm/NicVO.java | 6 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 308 +- server/src/com/cloud/vm/UserVmStateListener.java | 21 +- server/src/com/cloud/vm/VirtualMachineManager.java | 4 + .../com/cloud/vm/VirtualMachineManagerImpl.java | 407 +- server/src/com/cloud/vm/dao/NicDao.java | 1 + server/src/com/cloud/vm/dao/NicDaoImpl.java | 9 + server/src/com/cloud/vm/dao/UserVmDaoImpl.java | 824 +- .../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 13 +- server/src/com/cloud/vm/snapshot/VMSnapshotVO.java | 224 - .../affinity/AffinityGroupServiceImpl.java | 346 + .../cloudstack/affinity/AffinityGroupVMMapVO.java | 66 + .../cloudstack/affinity/AffinityGroupVO.java | 114 + .../cloudstack/affinity/dao/AffinityGroupDao.java | 30 + .../affinity/dao/AffinityGroupDaoImpl.java | 102 + .../affinity/dao/AffinityGroupVMMapDao.java | 47 + .../affinity/dao/AffinityGroupVMMapDaoImpl.java | 167 + .../gslb/GlobalLoadBalancingRulesServiceImpl.java | 25 + .../test/com/cloud/async/TestSyncQueueManager.java | 306 +- .../configuration/ConfigurationManagerTest.java | 413 + .../com/cloud/network/MockNetworkManagerImpl.java | 45 +- .../com/cloud/network/MockNetworkModelImpl.java | 8 +- .../cloud/network/UpdatePhysicalNetworkTest.java | 68 + .../SecurityGroupManagerTestConfiguration.java | 316 +- .../network/security/SecurityGroupQueueTest.java | 2 +- .../snapshot/SnapshotDaoTestConfiguration.java | 144 +- .../dao/StoragePoolDaoTestConfiguration.java | 106 +- .../test/com/cloud/vm/MockUserVmManagerImpl.java | 54 +- .../cloud/vm/MockVirtualMachineManagerImpl.java | 10 + server/test/com/cloud/vm/UserVmManagerTest.java | 45 +- .../cloud/vm/VirtualMachineManagerImplTest.java | 231 +- .../test/com/cloud/vm/dao/UserVmDaoImplTest.java | 43 +- .../cloud/vm/dao/UserVmDaoTestConfiguration.java | 50 + .../cloud/vm/snapshot/VMSnapshotManagerTest.java | 388 +- .../cloud/vpc/MockConfigurationManagerImpl.java | 28 +- .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 61 +- .../test/com/cloud/vpc/MockNetworkModelImpl.java | 8 +- server/test/com/cloud/vpc/Site2SiteVpnTest.java | 2 +- server/test/com/cloud/vpc/VpcApiUnitTest.java | 167 +- .../test/com/cloud/vpc/VpcTestConfiguration.java | 473 +- .../affinity/AffinityApiTestConfiguration.java | 344 + .../cloudstack/affinity/AffinityApiUnitTest.java | 187 + .../networkoffering/ChildTestConfiguration.java | 7 +- .../networkoffering/CreateNetworkOfferingTest.java | 1 - server/test/resources/UserVMDaoTestContext.xml | 44 + server/test/resources/affinityContext.xml | 47 + server/test/resources/network-mgr-component.xml | 2 +- .../console-proxy/server/conf/agent.properties | 17 - .../server/conf/environment.properties | 2 + services/console-proxy/server/conf/log4j-cloud.xml | 2 +- services/console-proxy/server/pom.xml | 41 + services/console-proxy/server/scripts/_run.sh | 3 +- .../console-proxy/server/scripts/consoleproxy.sh | 33 + .../console-proxy/server/scripts/secstorage.sh | 33 + .../src/com/cloud/consoleproxy/ConsoleProxy.java | 16 +- .../ConsoleProxyPasswordBasedEncryptor.java | 253 +- services/pom.xml | 1 + services/secondary-storage/conf/agent.properties | 2 + .../secondary-storage/conf/environment.properties | 2 + services/secondary-storage/conf/log4j-cloud.xml | 102 + services/secondary-storage/pom.xml | 103 + services/secondary-storage/scripts/_run.sh | 64 + services/secondary-storage/scripts/config_auth.sh | 69 + services/secondary-storage/scripts/config_ssl.sh | 174 + services/secondary-storage/scripts/ipfirewall.sh | 50 + services/secondary-storage/scripts/run-proxy.sh | 48 + services/secondary-storage/scripts/run.bat | 18 + services/secondary-storage/scripts/run.sh | 45 + services/secondary-storage/scripts/ssvm-check.sh | 136 + .../resource/CifsSecondaryStorageResource.java | 755 ++ .../resource/LocalSecondaryStorageResource.java | 246 + .../resource/NfsSecondaryStorageResource.java | 1904 ++++ .../resource/SecondaryStorageDiscoverer.java | 320 + .../storage/resource/SecondaryStorageResource.java | 28 + .../resource/SecondaryStorageResourceHandler.java | 24 + .../storage/template/DownloadManager.java | 105 + .../storage/template/DownloadManagerImpl.java | 1074 ++ .../cloudstack/storage/template/UploadManager.java | 87 + .../storage/template/UploadManagerImpl.java | 648 ++ setup/bindir/cloud-setup-databases.in | 2 +- setup/bindir/cloud-setup-encryption.in | 2 +- setup/db/db/schema-40to410.sql | 40 +- setup/db/db/schema-410to420.sql | 737 ++- setup/dev/basic.cfg | 6 +- setup/dev/local.cfg | 44 + test/integration/component/test_accounts.py | 10 +- .../component/test_allocation_states.py | 2 +- test/integration/component/test_asa1000v_fw.py | 134 + test/integration/component/test_blocker_bugs.py | 8 +- test/integration/component/test_egress_rules.py | 13 +- test/integration/component/test_eip_elb.py | 3 +- .../integration/component/test_network_offering.py | 5 +- test/integration/component/test_project_configs.py | 6 +- test/integration/component/test_project_limits.py | 4 +- .../component/test_project_resources.py | 7 +- test/integration/component/test_project_usage.py | 10 +- test/integration/component/test_projects.py | 8 +- test/integration/component/test_resource_limits.py | 4 +- test/integration/component/test_routers.py | 5 +- test/integration/component/test_security_groups.py | 9 +- test/integration/component/test_snapshots.py | 8 +- test/integration/component/test_storage_motion.py | 298 + test/integration/component/test_templates.py | 3 +- test/integration/component/test_usage.py | 10 +- .../integration/component/test_vm_passwdenabled.py | 1 + test/integration/component/test_volumes.py | 6 +- test/integration/smoke/test_ScaleVm.py | 221 - test/integration/smoke/test_affinity_groups.py | 194 + .../smoke/test_deploy_vm_with_userdata.py | 144 + test/integration/smoke/test_global_settings.py | 72 + test/integration/smoke/test_iso.py | 3 +- test/integration/smoke/test_network.py | 4 +- test/integration/smoke/test_non_contigiousvlan.py | 86 + test/integration/smoke/test_public_ip_range.py | 173 + test/integration/smoke/test_routers.py | 2 +- test/integration/smoke/test_scale_vm.py | 221 + test/integration/smoke/test_templates.py | 3 +- test/integration/smoke/test_vm_life_cycle.py | 30 +- test/integration/smoke/test_volumes.py | 55 +- tools/apidoc/build-apidoc.sh | 2 +- tools/apidoc/gen_toc.py | 5 +- tools/apidoc/pom.xml | 3 +- tools/appliance/build.sh | 5 +- .../definitions/systemvmtemplate/cleanup.sh | 1 - .../definitions/systemvmtemplate/postinstall.sh | 20 +- .../definitions/systemvmtemplate/preseed.cfg | 14 +- .../definitions/systemvmtemplate64/cleanup.sh | 1 - .../definitions/systemvmtemplate64/postinstall.sh | 20 +- .../definitions/systemvmtemplate64/preseed.cfg | 14 +- tools/build/build_asf.sh | 91 +- tools/build/build_docs.sh | 19 +- tools/build/setnextversion.sh | 75 + tools/cli/cloudmonkey/cloudmonkey.py | 45 +- tools/cli/cloudmonkey/config.py | 2 +- tools/cli/cloudmonkey/requester.py | 67 +- tools/devcloud/devcloud.cfg | 1 + tools/devcloud/pom.xml | 33 + tools/devcloud/quickcloud.cfg | 121 + tools/marvin/marvin/asyncJobMgr.py | 2 +- tools/marvin/marvin/cloudstackConnection.py | 272 +- tools/marvin/marvin/cloudstackTestClient.py | 3 +- tools/marvin/marvin/codegenerator.py | 4 +- tools/marvin/marvin/deployDataCenter.py | 20 +- tools/marvin/marvin/integration/lib/base.py | 155 +- tools/marvin/marvin/integration/lib/common.py | 4 +- tools/marvin/marvin/jsonHelper.py | 7 +- tools/marvin/pom.xml | 18 +- tools/marvin/setup.py | 1 + tools/waf/javadir.py | 38 - tools/waf/mkisofs.py | 84 - tools/waf/tar.py | 79 - tools/waf/tomcat.py | 57 - tools/waf/usermgmt.py | 140 - tools/whisker/LICENSE | 64 - tools/whisker/descriptor-for-packaging.xml | 24 - tools/whisker/descriptor.xml | 24 - ui/css/cloudstack3.css | 162 +- ui/dictionary.jsp | 10 + ui/images/sprites.png | Bin 188552 -> 192407 bytes ui/index.jsp | 37 +- ui/modules/modules.js | 20 + ui/scripts/accounts.js | 7 + ui/scripts/affinity.js | 183 + ui/scripts/cloud.core.callbacks.js | 41 +- ui/scripts/cloudStack.js | 33 +- ui/scripts/dashboard.js | 2 +- ui/scripts/events.js | 8 +- ui/scripts/instanceWizard.js | 924 +- ui/scripts/instances.js | 308 +- ui/scripts/network.js | 465 +- ui/scripts/plugins.js | 95 +- ui/scripts/regions.js | 410 +- ui/scripts/sharedFunctions.js | 30 +- ui/scripts/storage.js | 127 +- ui/scripts/system.js | 366 +- ui/scripts/templates.js | 134 +- ui/scripts/ui-custom/affinity.js | 173 + ui/scripts/ui-custom/healthCheck.js | 10 +- ui/scripts/ui-custom/instanceWizard.js | 19 + ui/scripts/ui-custom/pluginListing.js | 109 + ui/scripts/ui-custom/plugins.js | 109 - ui/scripts/ui-custom/projectSelect.js | 66 + ui/scripts/ui-custom/projects.js | 6 +- ui/scripts/ui-custom/regions.js | 4 +- ui/scripts/ui-custom/zoneFilter.js | 39 + ui/scripts/ui/widgets/detailView.js | 29 +- ui/scripts/ui/widgets/listView.js | 16 +- ui/scripts/ui/widgets/multiEdit.js | 16 +- ui/scripts/zoneWizard.js | 55 +- usage/pom.xml | 5 + usage/src/com/cloud/usage/UsageManagerImpl.java | 10 +- usage/src/com/cloud/usage/UsageServer.java | 16 +- utils/src/com/cloud/utils/SerialVersionUID.java | 1 + .../cloud/utils/cisco/n1kv/vsm/NetconfHelper.java | 22 + .../com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java | 213 + .../src/com/cloud/utils/component/AdapterList.java | 34 + .../cloud/utils/component/ComponentContext.java | 4 +- .../utils/component/SpringComponentScanUtils.java | 82 +- utils/src/com/cloud/utils/nio/NioClient.java | 3 +- utils/src/com/cloud/utils/nio/NioConnection.java | 2 +- utils/src/com/cloud/utils/xmlobject/XmlObject.java | 354 +- .../com/cloud/utils/xmlobject/XmlObjectParser.java | 214 +- .../com/cloud/utils/xmlobject/TestXmlObject.java | 66 +- .../com/cloud/utils/xmlobject/TestXmlObject2.java | 74 +- .../hypervisor/vmware/mo/HypervisorHostHelper.java | 45 +- .../vmware/util/VmwareGuestOsMapper.java | 5 + 823 files changed, 63258 insertions(+), 30968 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/18a33727/ui/css/cloudstack3.css ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/18a33727/ui/scripts/instances.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/18a33727/ui/scripts/ui/widgets/detailView.js ----------------------------------------------------------------------
