Change credentials.create argument

Keystoneclient has removed the deprecated `data` argument[1].

[1] https://review.openstack.org/#/c/352567/

Change-Id: I7a59f4e179a8250e900f77247492389e80356bd2
Closes-bug: 1632901
(cherry picked from commit e099af693c)
This commit is contained in:
gong yong sheng 2016-10-13 09:47:24 +05:30 committed by Rabi Mishra
parent b3ed1afd7f
commit 54aa019720
2 changed files with 5 additions and 5 deletions

View File

@ -480,7 +480,7 @@ class KsClientWrapper(object):
data_blob = {'access': uuid.uuid4().hex,
'secret': uuid.uuid4().hex}
ec2_creds = self.client.credentials.create(
user=user_id, type='ec2', data=jsonutils.dumps(data_blob),
user=user_id, type='ec2', blob=jsonutils.dumps(data_blob),
project=project_id)
# Return a AccessKey namedtuple for easier access to the blob contents
@ -499,7 +499,7 @@ class KsClientWrapper(object):
data_blob = {'access': uuid.uuid4().hex,
'secret': uuid.uuid4().hex}
creds = self.domain_admin_client.credentials.create(
user=user_id, type='ec2', data=jsonutils.dumps(data_blob),
user=user_id, type='ec2', blob=jsonutils.dumps(data_blob),
project=project_id)
return AccessKey(id=creds.id,
access=data_blob['access'],

View File

@ -1030,7 +1030,7 @@ class KeystoneClientTest(common.HeatTestCase):
# mock keystone client create function
self.mock_ks_v3_client.credentials.create(
user='atestuser', type='ec2', data=ex_data_json,
user='atestuser', type='ec2', blob=ex_data_json,
project=ctx.tenant_id).AndReturn(mock_credential)
self.m.ReplayAll()
heat_ks_client = heat_keystoneclient.KeystoneClient(ctx)
@ -1066,7 +1066,7 @@ class KeystoneClientTest(common.HeatTestCase):
# mock keystone client create function
self.mock_admin_client.credentials.create(
user='atestuser2', type='ec2', data=ex_data_json,
user='atestuser2', type='ec2', blob=ex_data_json,
project='aproject').AndReturn(mock_credential)
self.m.ReplayAll()
heat_ks_client = heat_keystoneclient.KeystoneClient(ctx)
@ -1103,7 +1103,7 @@ class KeystoneClientTest(common.HeatTestCase):
# mock keystone client create function
self.mock_ks_v3_client.credentials.create(
user='atestuser2', type='ec2', data=ex_data_json,
user='atestuser2', type='ec2', blob=ex_data_json,
project=ctx.tenant_id).AndReturn(mock_credential)
self.m.ReplayAll()
heat_ks_client = heat_keystoneclient.KeystoneClient(ctx)