You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/29 09:39:53 UTC
[3/3] git commit: updated refs/heads/master to a1d2c53
Merge pull request #1007 from ustcweizhou/dedicated-ip-for-domain
[4.7] CLOUDSTACK-8958: add dedicated ips to domain (account for now)For now, we dedicate ip pool to account, however, other accounts in the same domain cannot fetch the ip from this ip pool.
By dedicating ip pool to domain, accounts in the domain can fetch the public ip from same ip pool.
* pr/1007:
CLOUDSTACK-8958: throw an exception if project account cannot be found
CLOUDSTACK-8958: add dedicated ips to domain (account for now)
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a1d2c531
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a1d2c531
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a1d2c531
Branch: refs/heads/master
Commit: a1d2c531f65271f0301a26b4bd4ddb76f2f85ee5
Parents: 9710046 89ce8bd
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sun Nov 29 09:39:24 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sun Nov 29 09:39:25 2015 +0100
----------------------------------------------------------------------
.../configuration/ConfigurationService.java | 3 +
.../admin/vlan/DedicatePublicIpRangeCmd.java | 2 +-
.../configuration/ConfigurationManager.java | 3 +-
.../spring-engine-schema-core-daos-context.xml | 1 +
.../src/com/cloud/dc/DomainVlanMapVO.java | 63 +++++++++
.../src/com/cloud/dc/dao/DomainVlanMapDao.java | 28 ++++
.../com/cloud/dc/dao/DomainVlanMapDaoImpl.java | 74 ++++++++++
.../src/com/cloud/dc/dao/VlanDaoImpl.java | 8 ++
server/src/com/cloud/api/ApiDBUtils.java | 5 +
server/src/com/cloud/api/ApiResponseHelper.java | 15 ++
.../configuration/ConfigurationManagerImpl.java | 139 +++++++++++++++----
.../com/cloud/network/IpAddressManagerImpl.java | 9 ++
.../com/cloud/network/NetworkServiceImpl.java | 2 +-
.../configuration/ConfigurationManagerTest.java | 18 +--
.../cloud/vpc/MockConfigurationManagerImpl.java | 11 +-
.../com/cloud/vpc/VpcTestConfiguration.java | 3 +-
.../networkoffering/ChildTestConfiguration.java | 3 +-
setup/db/db/schema-460to470.sql | 12 ++
setup/db/db/schema-461to470.sql | 12 ++
ui/scripts/system.js | 24 +++-
20 files changed, 380 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1d2c531/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1d2c531/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1d2c531/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1d2c531/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1d2c531/ui/scripts/system.js
----------------------------------------------------------------------