Skip to content

Commit

Permalink
Revert "Add vnc_api method set_user_roles"
Browse files Browse the repository at this point in the history
The method set_auth_token has been unfortunately cherry-picked and this
introduces a regression since RBAC is not supported by the vnc_api
R2.20.

This reverts commit 77d2feb.

Change-Id: Ifdf28ce18de55b3bed3e59de56de415da1839c2e
Partial-Bug: 1546057
  • Loading branch information
Antoine Eiche committed Feb 18, 2016
1 parent 3ffd703 commit 26a7e03
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions src/api-lib/vnc_api.py
Expand Up @@ -281,7 +281,7 @@ def __init__(self, username=None, password=None, tenant_name=None,
if 'user' in self._user_info:
self._headers['X-API-USER'] = self._user_info['user']
if 'role' in self._user_info:
self.set_user_roles([self._user_info['role']])
self._headers['X-API-ROLE'] = self._user_info['role']

#self._http = HTTPClient(self._web_host, self._web_port,
# network_timeout = 300)
Expand Down Expand Up @@ -814,17 +814,4 @@ def resource_list(self, obj_type, parent_id=None, parent_fq_name=None,
return resource_objs
#end resource_list

def set_auth_token(self, token):
"""Park user token for forwarding to API server for RBAC."""
self._headers['X-AUTH-TOKEN'] = token
#end set_auth_token

def set_user_roles(self, roles):
"""Park user roles for forwarding to API server for RBAC.
:param roles: list of roles
"""
self._headers['X-API-ROLE'] = (',').join(roles)
#end set_user_roles

#end class VncApi

0 comments on commit 26a7e03

Please sign in to comment.