From ae617b6a351f0f160276c105d5a8222639620e7d Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 14 Aug 2013 15:10:28 -0700 Subject: [PATCH] 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 --- .../src/com/cloud/configuration/ConfigurationManagerImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 3d640b36c93..62699d6a86b 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -4414,9 +4414,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); }