Updated Branches:
refs/heads/4.2 950672ef8 -> 707d6993b
Revert "fix CLOUDSTACK-2989, do not list network offering with specifyvlan=true
for non-root-admin user"
This reverts commit 94254e3c2bd38573adac22d0c66817db3cfa1873.
Conflicts:
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
Regular user should be able to list the network offering with specifyVlan=true.
He just can't use when create the network as he is unaware of the physical
network topology. But as the admin can create the network on the user's behalf
using this kind of offering, so the user should be able to see the offering's
details
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/707d6993
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/707d6993
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/707d6993
Branch: refs/heads/4.2
Commit: 707d6993bfef4ecf86f3475cbc4746099b9efaf4
Parents: 950672e
Author: Alena Prokharchyk <[email protected]>
Authored: Wed Aug 14 15:10:28 2013 -0700
Committer: Alena Prokharchyk <[email protected]>
Committed: Wed Aug 14 15:21:17 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/configuration/ConfigurationManagerImpl.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/707d6993/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 5261462..c692e70 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -4508,9 +4508,6 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
}
// only root admin can list network offering with specifyVlan = true
- if(caller.getType() != Account.ACCOUNT_TYPE_ADMIN){
- specifyVlan = false;
- }
if (specifyVlan != null) {
sc.addAnd("specifyVlan", SearchCriteria.Op.EQ, specifyVlan);
}
