Changes required to merge to master: - Replace UserContext by CallContext
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f31c3181 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f31c3181 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f31c3181 Branch: refs/heads/master Commit: f31c3181585a3ac6c6a5c07c0403cd56c4fab6d4 Parents: 0115db0 Author: Prachi Damle <[email protected]> Authored: Tue Sep 3 19:43:34 2013 -0700 Committer: Prachi Damle <[email protected]> Committed: Tue Sep 3 20:03:11 2013 -0700 ---------------------------------------------------------------------- .../cloudstack/affinity/ExplicitDedicationProcessor.java | 7 ------- server/src/com/cloud/api/query/QueryManagerImpl.java | 1 - .../src/com/cloud/configuration/ConfigurationManagerImpl.java | 1 - .../apache/cloudstack/affinity/AffinityGroupServiceImpl.java | 7 +++---- .../org/apache/cloudstack/affinity/AffinityApiUnitTest.java | 1 - 5 files changed, 3 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f31c3181/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java ---------------------------------------------------------------------- diff --git a/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java b/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java index 9b7671b..da23172 100644 --- a/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java +++ b/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java @@ -105,13 +105,6 @@ public class ExplicitDedicationProcessor extends AffinityProcessorBase implement long affinityGroupId = vmGroupMapping.getAffinityGroupId(); - // List<DedicatedResourceVO> dr = - // _dedicatedDao.listByAccountId(accountId); - // List<DedicatedResourceVO> drOfDomain = - // searchInDomainResources(domainId); - // List<DedicatedResourceVO> drOfParentDomain = - // searchInParentDomainResources(domainId); - List<DedicatedResourceVO> dr = _dedicatedDao.listByAffinityGroupId(affinityGroupId); resourceList.addAll(dr); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f31c3181/server/src/com/cloud/api/query/QueryManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index a2a57fa..0d6faef 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -173,7 +173,6 @@ import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.user.AccountVO; import com.cloud.user.DomainManager; -import com.cloud.user.UserContext; import com.cloud.user.dao.AccountDao; import com.cloud.utils.DateUtil; import com.cloud.utils.Pair; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f31c3181/server/src/com/cloud/configuration/ConfigurationManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index f9b1e8d..34858c0 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -44,7 +44,6 @@ import org.apache.cloudstack.acl.SecurityChecker; import org.apache.cloudstack.affinity.AffinityGroup; import org.apache.cloudstack.affinity.AffinityGroupService; import org.apache.cloudstack.affinity.dao.AffinityGroupDao; -import org.apache.cloudstack.api.ApiConstants.LDAPParams; import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd; import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd; import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f31c3181/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java b/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java index 96da87b..8f2caad 100644 --- a/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java +++ b/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java @@ -54,7 +54,6 @@ import com.cloud.network.security.SecurityGroup; import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.user.DomainManager; -import com.cloud.user.UserContext; import com.cloud.uservm.UserVm; import com.cloud.utils.Pair; import com.cloud.utils.component.ComponentContext; @@ -118,7 +117,7 @@ public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGro public AffinityGroup createAffinityGroup(String account, Long domainId, String affinityGroupName, String affinityGroupType, String description) { - Account caller = UserContext.current().getCaller(); + Account caller = CallContext.current().getCallingAccount(); //validate the affinityGroupType Map<String, AffinityGroupProcessor> typeProcessorMap = getAffinityTypeToProcessorMap(); @@ -146,7 +145,7 @@ public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGro public AffinityGroup createAffinityGroupInternal(String account, Long domainId, String affinityGroupName, String affinityGroupType, String description) { - Account caller = UserContext.current().getCaller(); + Account caller = CallContext.current().getCallingAccount(); // validate the affinityGroupType Map<String, AffinityGroupProcessor> typeProcessorMap = getAffinityTypeToProcessorMap(); @@ -358,7 +357,7 @@ public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGro @Override public List<String> listAffinityGroupTypes() { - Account caller = UserContext.current().getCaller(); + Account caller = CallContext.current().getCallingAccount(); List<String> types = new ArrayList<String>(); Map<String, AffinityGroupProcessor> componentMap = ComponentContext.getComponentsOfType(AffinityGroupProcessor.class); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f31c3181/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java ---------------------------------------------------------------------- diff --git a/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java b/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java index fa1ee60..97e093f 100644 --- a/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java +++ b/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java @@ -76,7 +76,6 @@ import com.cloud.user.AccountService; import com.cloud.user.AccountVO; import com.cloud.user.UserVO; import com.cloud.user.DomainManager; -import com.cloud.user.UserContext; import com.cloud.user.dao.AccountDao; import com.cloud.user.dao.UserDao; import com.cloud.utils.component.ComponentContext;
