Merge branch 'master' into ui-vpc-redesign
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f3cc57f8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f3cc57f8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f3cc57f8 Branch: refs/heads/master Commit: f3cc57f82edfc7b90dcc9ee449c8215a872082d1 Parents: f52a833 3d16e82 Author: Brian Federle <brian.fede...@citrix.com> Authored: Fri May 24 11:09:27 2013 -0700 Committer: Brian Federle <brian.fede...@citrix.com> Committed: Fri May 24 11:09:27 2013 -0700 ---------------------------------------------------------------------- api/src/com/cloud/event/EventTypes.java | 2 +- .../command/user/address/AssociateIPAddrCmd.java | 6 +- .../user/address/DisassociateIPAddrCmd.java | 8 +- .../loadbalancer/ListLoadBalancerRulesCmd.java | 9 + .../api/command/user/vm/RestoreVMCmd.java | 5 +- .../api/response/LoadBalancerResponse.java | 11 +- .../com/cloud/upgrade/DatabaseUpgradeChecker.java | 5 +- .../src/com/cloud/upgrade/dao/Upgrade302to40.java | 41 ++ .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 42 ++- .../allocator/AbstractStoragePoolAllocator.java | 6 - .../debian/config/etc/init.d/cloud-early-config | 3 + patches/systemvm/debian/config/etc/rc.local | 3 + .../config/opt/cloud/bin/get_template_version.sh | 26 + plugins/hypervisors/kvm/pom.xml | 9 + .../kvm/resource/LibvirtComputingResource.java | 7 + .../kvm/storage/LibvirtStorageAdaptor.java | 248 +++++++++- .../hypervisor/vmware/resource/VmwareResource.java | 2 +- .../element/JuniperSRXExternalFirewallElement.java | 1 + .../cloud/network/resource/JuniperSrxResource.java | 35 +- pom.xml | 1 + server/src/com/cloud/api/ApiResponseHelper.java | 348 +++++++------- .../configuration/ConfigurationManagerImpl.java | 9 +- .../network/ExternalFirewallDeviceManagerImpl.java | 4 +- server/src/com/cloud/network/NetworkModelImpl.java | 12 +- .../network/lb/LoadBalancingRulesManagerImpl.java | 8 +- .../com/cloud/template/TemplateManagerImpl.java | 7 + server/src/com/cloud/vm/UserVmManagerImpl.java | 93 +++- .../com/cloud/vm/VirtualMachineManagerImpl.java | 2 +- server/test/com/cloud/vm/UserVmManagerTest.java | 42 ++- setup/db/db/schema-302to40.sql | 3 - setup/db/db/schema-40to410.sql | 6 + setup/db/db/schema-410to420.sql | 6 +- test/integration/smoke/test_network.py | 238 +++++----- test/integration/smoke/test_nicdetail.py | 224 --------- test/integration/smoke/test_service_offerings.py | 366 +++++++++++---- test/integration/smoke/test_vm_life_cycle.py | 239 ---------- test/integration/smoke/test_volumedetail.py | 239 ---------- test/integration/smoke/test_volumes.py | 26 +- tools/marvin/marvin/cloudstackConnection.py | 5 +- ui/scripts/configuration.js | 26 +- ui/scripts/network.js | 8 +- ui/scripts/regions.js | 41 ++- ui/scripts/ui-custom/installWizard.js | 13 +- utils/src/com/cloud/utils/net/NetUtils.java | 2 + 44 files changed, 1234 insertions(+), 1203 deletions(-) ----------------------------------------------------------------------
