045e03d852
The v3 credentials passes data associated with the credential in a "data" key, but the underlying API expects "blob", which is also what is documented in the API spec. Currently any attempt to create a credential with a type of 'ec2' will fail with 'Invalid blob in credential' So s/data/blob to fix. Change-Id: I0858e8c39653477eb554ee9d15fb4f2dde2b195c Closes-Bug: #1259461
76 lines
2.6 KiB
Python
76 lines
2.6 KiB
Python
# Copyright 2011 OpenStack Foundation
|
|
# Copyright 2011 Nebula, Inc.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from keystoneclient import base
|
|
|
|
|
|
class Credential(base.Resource):
|
|
"""Represents an Identity credential.
|
|
|
|
Attributes:
|
|
* id: a uuid that identifies the credential
|
|
|
|
"""
|
|
pass
|
|
|
|
|
|
class CredentialManager(base.CrudManager):
|
|
"""Manager class for manipulating Identity credentials."""
|
|
resource_class = Credential
|
|
collection_key = 'credentials'
|
|
key = 'credential'
|
|
|
|
def _get_data_blob(self, blob, data):
|
|
# Ref bug #1259461, the <= 0.4.1 keystoneclient calling convention was
|
|
# to pass "data", but the underlying API expects "blob", so
|
|
# support both in the python API for backwards compatibility
|
|
if blob is not None:
|
|
return blob
|
|
elif data is not None:
|
|
# FIXME(shardy): Passing data is deprecated. Provide an
|
|
# appropriate warning.
|
|
return data
|
|
else:
|
|
raise ValueError(
|
|
"Credential requires blob to be specified")
|
|
|
|
def create(self, user, type, blob=None, data=None, project=None):
|
|
return super(CredentialManager, self).create(
|
|
user_id=base.getid(user),
|
|
type=type,
|
|
blob=self._get_data_blob(blob, data),
|
|
project_id=base.getid(project))
|
|
|
|
def get(self, credential):
|
|
return super(CredentialManager, self).get(
|
|
credential_id=base.getid(credential))
|
|
|
|
def list(self):
|
|
return super(CredentialManager, self).list()
|
|
|
|
def update(self, credential, user, type=None, blob=None, data=None,
|
|
project=None):
|
|
return super(CredentialManager, self).update(
|
|
credential_id=base.getid(credential),
|
|
user_id=base.getid(user),
|
|
type=type,
|
|
blob=self._get_data_blob(blob, data),
|
|
project_id=base.getid(project))
|
|
|
|
def delete(self, credential):
|
|
return super(CredentialManager, self).delete(
|
|
credential_id=base.getid(credential))
|