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/12/03 20:43:40 UTC
[11/11] git commit: updated refs/heads/master to 7e902cd
Merge release branch 4.6 to master
* 4.6:
CLOUDSTACK-9075 - Uses the same vlan since it should have been already released
CLOUDSTACK-9075 - Adds VPC static routes test
CLOUDSTACK-9075 - Covers Private GW ACL with Redundant VPCs
CLOUDSTACK-9075 - Add method to get list of Physical Networks per zone
CLOUDSTACK-6276 Removing unused parameter in integration test for projects
CLOUDSTACK-6276 Removing unused parameter in integration test
CLOUDSTACK-6276 Fixing affinity groups for projects
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7e902cd5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7e902cd5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7e902cd5
Branch: refs/heads/master
Commit: 7e902cd505fab24a245ef5d2e0e7f68fe1affa8c
Parents: 3b511a1 9a21873
Author: Remi Bergsma <gi...@remi.nl>
Authored: Thu Dec 3 20:42:41 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Thu Dec 3 20:42:41 2015 +0100
----------------------------------------------------------------------
.../affinity/AffinityGroupResponse.java | 16 +-
.../affinity/AffinityGroupService.java | 32 +-
.../affinitygroup/CreateAffinityGroupCmd.java | 38 +-
.../affinitygroup/DeleteAffinityGroupCmd.java | 52 +-
.../affinitygroup/ListAffinityGroupsCmd.java | 14 +-
.../apache/cloudstack/query/QueryService.java | 6 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 2 +-
.../affinity/dao/AffinityGroupDao.java | 7 +-
.../affinity/dao/AffinityGroupDaoImpl.java | 7 +-
.../dedicated/DedicatedResourceManagerImpl.java | 4 +-
.../IntegrationTestConfiguration.java | 2 +-
.../cloud/acl/AffinityGroupAccessChecker.java | 22 +-
.../com/cloud/api/query/QueryManagerImpl.java | 111 +-
.../cloud/api/query/vo/AffinityGroupJoinVO.java | 35 +-
.../configuration/ConfigurationManagerImpl.java | 6 +-
.../src/com/cloud/user/AccountManagerImpl.java | 92 +-
.../affinity/AffinityGroupServiceImpl.java | 258 ++---
.../affinity/AffinityApiUnitTest.java | 13 +-
.../affinity/AffinityGroupServiceImplTest.java | 358 ++++++
setup/db/db/schema-460to461.sql | 32 +
.../debian/config/opt/cloud/bin/configure.py | 29 +-
.../config/opt/cloud/bin/cs_staticroutes.py | 30 +
.../debian/config/opt/cloud/bin/merge.py | 6 +
.../component/test_affinity_groups.py | 2 +-
.../component/test_affinity_groups_projects.py | 1082 ++++++++++++++++++
.../smoke/test_affinity_groups_projects.py | 188 +++
test/integration/smoke/test_privategw_acl.py | 382 ++++++-
tools/marvin/marvin/lib/base.py | 4 +-
tools/marvin/marvin/lib/common.py | 11 +
29 files changed, 2349 insertions(+), 492 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e902cd5/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e902cd5/server/src/com/cloud/acl/AffinityGroupAccessChecker.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/acl/AffinityGroupAccessChecker.java
index 6e5e55b,c836aea..1e90973
--- a/server/src/com/cloud/acl/AffinityGroupAccessChecker.java
+++ b/server/src/com/cloud/acl/AffinityGroupAccessChecker.java
@@@ -16,12 -16,12 +16,10 @@@
// under the License.
package com.cloud.acl;
-import javax.ejb.Local;
import javax.inject.Inject;
- import org.springframework.stereotype.Component;
-
import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
-import org.apache.cloudstack.acl.SecurityChecker;
import org.apache.cloudstack.affinity.AffinityGroup;
import org.apache.cloudstack.affinity.AffinityGroupService;
import org.apache.cloudstack.affinity.dao.AffinityGroupDomainMapDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e902cd5/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/query/QueryManagerImpl.java
index 0095181,d64b2ac..0c72710
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@@ -23,11 -23,9 +23,8 @@@ import java.util.List
import java.util.Map;
import java.util.Set;
-import javax.ejb.Local;
import javax.inject.Inject;
- import com.cloud.utils.StringUtils;
- import com.cloud.vm.VMInstanceVO;
- import com.cloud.vm.dao.VMInstanceDao;
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.affinity.AffinityGroupDomainMapVO;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
@@@ -216,13 -215,15 +214,14 @@@ import com.cloud.utils.db.SearchCriteri
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.vm.DomainRouterVO;
import com.cloud.vm.UserVmVO;
+ import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.dao.DomainRouterDao;
- import com.cloud.vm.dao.NicDetailsDao;
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.UserVmDetailsDao;
+ import com.cloud.vm.dao.VMInstanceDao;
@Component
-@Local(value = {QueryService.class})
public class QueryManagerImpl extends ManagerBase implements QueryService, Configurable {
public static final Logger s_logger = Logger.getLogger(QueryManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e902cd5/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e902cd5/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e902cd5/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
----------------------------------------------------------------------