incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [3/30] git commit: VPC: CS-15812 - fixed listVPCs by projectId
Date Fri, 03 Aug 2012 21:33:31 GMT
VPC: CS-15812 - fixed listVPCs by projectId


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3496a738
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3496a738
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3496a738

Branch: refs/heads/vpc
Commit: 3496a73878782e235074a42781c5686edbb499da
Parents: e7a1862
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Fri Aug 3 14:07:18 2012 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Fri Aug 3 14:23:56 2012 -0700

----------------------------------------------------------------------
 api/src/com/cloud/api/commands/ListVPCsCmd.java    |    2 +-
 api/src/com/cloud/network/vpc/VpcService.java      |    3 ++-
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3496a738/api/src/com/cloud/api/commands/ListVPCsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/ListVPCsCmd.java b/api/src/com/cloud/api/commands/ListVPCsCmd.java
index 2b9ae87..6f9acc1 100644
--- a/api/src/com/cloud/api/commands/ListVPCsCmd.java
+++ b/api/src/com/cloud/api/commands/ListVPCsCmd.java
@@ -138,7 +138,7 @@ public class ListVPCsCmd extends BaseListTaggedResourcesCmd{
         List<? extends Vpc> vpcs = _vpcService.listVpcs(getId(), getVpcName(), getDisplayText(),
                 getSupportedServices(), getCidr(), getVpcOffId(), getState(), getAccountName(),
getDomainId(), 
                 this.getKeyword(), this.getStartIndex(), this.getPageSizeVal(), getZoneId(),
this.isRecursive(), 
-                this.listAll(), getRestartRequired(), getTags());
+                this.listAll(), getRestartRequired(), getTags(), getProjectId());
         ListResponse<VpcResponse> response = new ListResponse<VpcResponse>();
         List<VpcResponse> offeringResponses = new ArrayList<VpcResponse>();
         for (Vpc vpc : vpcs) {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3496a738/api/src/com/cloud/network/vpc/VpcService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/VpcService.java b/api/src/com/cloud/network/vpc/VpcService.java
index 7a104dc..8457f46 100644
--- a/api/src/com/cloud/network/vpc/VpcService.java
+++ b/api/src/com/cloud/network/vpc/VpcService.java
@@ -114,13 +114,14 @@ public interface VpcService {
      * @param listAll TODO
      * @param restartRequired TODO
      * @param tags TODO
+     * @param projectId TODO
      * @param vpc
      * @return
      */
     public List<? extends Vpc> listVpcs(Long id, String vpcName, String displayText,

             List<String> supportedServicesStr, String cidr, Long vpcOffId, String state,
String accountName, Long domainId,
             String keyword, Long startIndex, Long pageSizeVal, Long zoneId, Boolean isRecursive,
Boolean listAll, 
-            Boolean restartRequired, Map<String, String> tags);
+            Boolean restartRequired, Map<String, String> tags, Long projectId);
 
     /**
      * @param vpcId

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3496a738/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 5d81da1..66d18aa 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -715,13 +715,13 @@ public class VpcManagerImpl implements VpcManager, Manager{
     @Override
     public List<? extends Vpc> listVpcs(Long id, String vpcName, String displayText,
List<String> supportedServicesStr, 
             String cidr, Long vpcOffId, String state, String accountName, Long domainId,
String keyword,
-            Long startIndex, Long pageSizeVal, Long zoneId, Boolean isRecursive, Boolean
listAll, Boolean restartRequired, Map<String, String> tags) {
+            Long startIndex, Long pageSizeVal, Long zoneId, Boolean isRecursive, Boolean
listAll, Boolean restartRequired, Map<String, String> tags, Long projectId) {
         Account caller = UserContext.current().getCaller();
         List<Long> permittedAccounts = new ArrayList<Long>();
         
         Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject
= new Ternary<Long, Boolean, 
                 ListProjectResourcesCriteria>(domainId, isRecursive, null);
-        _accountMgr.buildACLSearchParameters(caller, id, accountName, null, permittedAccounts,
domainIdRecursiveListProject,
+        _accountMgr.buildACLSearchParameters(caller, id, accountName, projectId, permittedAccounts,
domainIdRecursiveListProject,
                 listAll, false);
         domainId = domainIdRecursiveListProject.first();
         isRecursive = domainIdRecursiveListProject.second();


Mime
View raw message