Merge branch 'master' into ui-cisco-asa1000v-support
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2cd70d06 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2cd70d06 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2cd70d06 Branch: refs/heads/ui-vpc-redesign Commit: 2cd70d06b3c227f84b94443fbcce6528f347d24f Parents: ad8f106 4c0eecc Author: Brian Federle <brian.fede...@citrix.com> Authored: Mon May 6 10:40:08 2013 -0700 Committer: Brian Federle <brian.fede...@citrix.com> Committed: Mon May 6 10:40:08 2013 -0700 ---------------------------------------------------------------------- api/src/com/cloud/async/AsyncJob.java | 3 +- api/src/com/cloud/event/EventTypes.java | 7 + api/src/com/cloud/network/GuestVlan.java | 31 + api/src/com/cloud/network/NetworkService.java | 9 + api/src/com/cloud/network/rules/RulesService.java | 2 +- api/src/com/cloud/vm/UserVmService.java | 2 +- .../org/apache/cloudstack/api/ApiConstants.java | 2 + .../apache/cloudstack/api/ResponseGenerator.java | 2 + .../admin/network/DedicateGuestVlanRangeCmd.java | 118 +++ .../network/ListDedicatedGuestVlanRangesCmd.java | 129 +++ .../network/ReleaseDedicatedGuestVlanRangeCmd.java | 94 +++ .../api/command/user/nat/EnableStaticNatCmd.java | 2 +- .../cloudstack/api/command/user/vm/ScaleVMCmd.java | 10 +- .../user/vmsnapshot/RevertToSnapshotCmd.java | 92 --- .../user/vmsnapshot/RevertToVMSnapshotCmd.java | 92 +++ .../api/response/GuestVlanRangeResponse.java | 94 +++ .../api/command/test/ScaleVMCmdTest.java | 35 +- client/tomcatconf/applicationContext.xml.in | 1 + client/tomcatconf/commands.properties.in | 2 +- docs/en-US/libcloud-examples.xml | 75 ++ docs/en-US/signing-api-calls-python.xml | 101 +++ docs/en-US/signing-api-requests.xml | 3 + docs/en-US/tools.xml | 1 + patches/systemvm/debian/config/etc/dnsmasq.conf | 634 --------------- .../systemvm/debian/config/etc/dnsmasq.conf.tmpl | 634 +++++++++++++++ .../debian/config/etc/init.d/cloud-early-config | 3 + patches/systemvm/debian/config/root/edithosts.sh | 28 +- .../cloud/network/element/BigSwitchVnsElement.java | 4 +- .../cloud/network/resource/NetscalerResource.java | 45 + .../src/com/cloud/network/nicira/NiciraNvpTag.java | 17 +- .../com/cloud/network/nicira/NiciraTagTest.java | 54 ++ pom.xml | 2 +- scripts/network/exdhcp/dnsmasq_edithosts.sh | 19 +- server/src/com/cloud/api/ApiDBUtils.java | 14 + server/src/com/cloud/api/ApiResponseHelper.java | 21 + server/src/com/cloud/dc/DataCenterVnetVO.java | 11 + server/src/com/cloud/dc/dao/DataCenterDaoImpl.java | 17 +- server/src/com/cloud/dc/dao/DataCenterVnetDao.java | 7 +- .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 92 ++- .../ExternalLoadBalancerDeviceManagerImpl.java | 2 +- .../src/com/cloud/network/NetworkManagerImpl.java | 35 +- server/src/com/cloud/network/NetworkModelImpl.java | 4 +- .../src/com/cloud/network/NetworkServiceImpl.java | 294 +++++++- .../cloud/network/dao/AccountGuestVlanMapDao.java | 34 + .../network/dao/AccountGuestVlanMapDaoImpl.java | 83 ++ .../cloud/network/dao/AccountGuestVlanMapVO.java | 94 +++ .../com/cloud/network/rules/RulesManagerImpl.java | 13 +- .../src/com/cloud/server/ManagementServerImpl.java | 7 +- .../storage/download/DownloadMonitorImpl.java | 4 +- .../src/com/cloud/upgrade/dao/Upgrade2214to30.java | 6 +- server/src/com/cloud/user/AccountManagerImpl.java | 15 + server/src/com/cloud/vm/UserVmManagerImpl.java | 10 +- .../cloud/network/DedicateGuestVlanRangesTest.java | 378 +++++++++ .../com/cloud/network/MockNetworkManagerImpl.java | 21 + .../com/cloud/network/MockRulesManagerImpl.java | 3 +- .../test/com/cloud/vm/MockUserVmManagerImpl.java | 4 +- .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 18 + .../affinity/AffinityApiTestConfiguration.java | 3 +- .../networkoffering/ChildTestConfiguration.java | 4 +- setup/db/db/schema-410to420.sql | 17 + setup/dev/advanced.cfg | 6 +- test/integration/component/test_accounts.py | 94 ++-- test/integration/component/test_blocker_bugs.py | 88 +- test/integration/component/test_egress_rules.py | 198 +++--- test/integration/component/test_eip_elb.py | 122 ++-- .../component/test_multiple_ip_ranges.py | 172 ++++- .../integration/component/test_network_offering.py | 218 +++--- test/integration/component/test_project_configs.py | 36 +- test/integration/component/test_project_limits.py | 18 +- .../component/test_project_resources.py | 58 +- test/integration/component/test_project_usage.py | 58 +- test/integration/component/test_projects.py | 34 +- test/integration/component/test_resource_limits.py | 96 ++-- test/integration/component/test_routers.py | 118 ++-- test/integration/component/test_security_groups.py | 206 +++--- test/integration/component/test_snapshots.py | 92 +- test/integration/component/test_storage_motion.py | 4 +- test/integration/component/test_templates.py | 44 +- test/integration/component/test_usage.py | 104 ++-- .../integration/component/test_vm_passwdenabled.py | 12 +- test/integration/component/test_volumes.py | 72 +- test/integration/component/test_vpn_users.py | 48 +- test/integration/smoke/test_affinity_groups.py | 2 +- test/integration/smoke/test_guest_vlan_range.py | 157 ++++ test/integration/smoke/test_iso.py | 18 +- test/integration/smoke/test_network.py | 156 ++-- test/integration/smoke/test_nic.py | 8 +- test/integration/smoke/test_non_contigiousvlan.py | 2 +- test/integration/smoke/test_routers.py | 60 +- test/integration/smoke/test_scale_vm.py | 4 +- test/integration/smoke/test_templates.py | 36 +- test/integration/smoke/test_vm_snapshots.py | 308 +++++++ test/integration/smoke/test_volumes.py | 24 +- .../definitions/systemvmtemplate/definition.rb | 6 +- .../definitions/systemvmtemplate/postinstall.sh | 2 +- .../definitions/systemvmtemplate64/definition.rb | 6 +- .../definitions/systemvmtemplate64/postinstall.sh | 2 +- tools/marvin/marvin/integration/lib/base.py | 69 ++- ui/scripts/instances.js | 36 +- ui/scripts/storage.js | 2 +- ui/scripts/system.js | 73 ++- ui/scripts/ui/widgets/listView.js | 6 +- ui/scripts/vm_snapshots.js | 2 +- .../cloud/hypervisor/vmware/util/VmwareClient.java | 2 +- 104 files changed, 4532 insertions(+), 1905 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2cd70d06/ui/scripts/system.js ----------------------------------------------------------------------
