openstack/python-openstackclient
Code Issues Proposed changes

Merge "Fix security group list for non-admin"

Browse Source
This commit is contained in:
Jenkins 2014-09-06 17:02:42 +00:00 committed by Gerrit Code Review
commit 34c8bdaf35
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openstackclient/compute/v2/security_group.py
View File

@ -23,6 +23,7 @@ from cliff import command
from cliff import lister from cliff import lister
from cliff import show from cliff import show
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
from novaclient.v1_1 import security_group_rules from novaclient.v1_1 import security_group_rules
from openstackclient.common import parseractions from openstackclient.common import parseractions
from openstackclient.common import utils from openstackclient.common import utils
@ -150,10 +151,15 @@ class ListSecurityGroup(lister.Lister):
search = {'all_tenants': parsed_args.all_projects} search = {'all_tenants': parsed_args.all_projects}
data = compute_client.security_groups.list(search_opts=search) data = compute_client.security_groups.list(search_opts=search)
projects = self.app.client_manager.identity.projects.list()
project_hash = {} project_hash = {}
for project in projects: try:
project_hash[project.id] = project projects = self.app.client_manager.identity.projects.list()
except ksc_exc.Forbidden:
# This fails when the user is not an admin, just move along
pass
else:
for project in projects:
project_hash[project.id] = project
return (column_headers, return (column_headers,
(utils.get_item_properties( (utils.get_item_properties(