Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack into vmware-datamodel
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/776b043e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/776b043e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/776b043e Branch: refs/heads/vmware-datamodel Commit: 776b043eab3359db6a5cd0f80e4c30d1c2b004ab Parents: 3201dbf 90cd64c Author: Sateesh Chodapuneedi <[email protected]> Authored: Mon May 6 15:57:01 2013 +0530 Committer: Sateesh Chodapuneedi <[email protected]> Committed: Mon May 6 15:57:01 2013 +0530 ---------------------------------------------------------------------- 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 + .../org/apache/cloudstack/api/ApiConstants.java | 2 + .../apache/cloudstack/api/ResponseGenerator.java | 2 + .../admin/network/DedicateGuestVlanRangeCmd.java | 108 ++++ .../network/ListDedicatedGuestVlanRangesCmd.java | 129 +++++ .../network/ReleaseDedicatedGuestVlanRangeCmd.java | 94 ++++ .../api/response/GuestVlanRangeResponse.java | 94 ++++ client/tomcatconf/applicationContext.xml.in | 1 + 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 + .../cloud/network/element/BigSwitchVnsElement.java | 4 +- .../src/com/cloud/network/nicira/NiciraNvpTag.java | 17 +- .../com/cloud/network/nicira/NiciraTagTest.java | 54 ++ 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 ++++- .../src/com/cloud/network/NetworkManagerImpl.java | 35 ++- .../src/com/cloud/network/NetworkServiceImpl.java | 272 +++++++++++ .../cloud/network/dao/AccountGuestVlanMapDao.java | 34 ++ .../network/dao/AccountGuestVlanMapDaoImpl.java | 83 ++++ .../cloud/network/dao/AccountGuestVlanMapVO.java | 94 ++++ .../src/com/cloud/server/ManagementServerImpl.java | 3 + .../storage/download/DownloadMonitorImpl.java | 4 +- server/src/com/cloud/user/AccountManagerImpl.java | 15 + .../cloud/network/DedicateGuestVlanRangesTest.java | 378 +++++++++++++++ .../com/cloud/network/MockNetworkManagerImpl.java | 21 + .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 18 + .../affinity/AffinityApiTestConfiguration.java | 3 +- .../networkoffering/ChildTestConfiguration.java | 4 +- setup/db/db/schema-410to420.sql | 17 + 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_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_routers.py | 60 ++-- test/integration/smoke/test_scale_vm.py | 4 +- test/integration/smoke/test_templates.py | 36 +- test/integration/smoke/test_volumes.py | 24 +- .../definitions/systemvmtemplate/definition.rb | 6 +- .../definitions/systemvmtemplate64/definition.rb | 6 +- tools/marvin/marvin/integration/lib/base.py | 27 + ui/scripts/instances.js | 10 +- ui/scripts/storage.js | 2 +- ui/scripts/system.js | 27 +- ui/scripts/ui/widgets/listView.js | 6 +- 74 files changed, 3241 insertions(+), 1076 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/776b043e/setup/db/db/schema-410to420.sql ----------------------------------------------------------------------
