AttributeError: tenantId in admin_cleanup when the user has no tenant attached

[Liyingjun]

2014-08-08 07:13:33.982 48152 DEBUG rally.benchmark.context.cleanup.admin_cleanup [-] Not all admin resources were cleaned. _cleanup_resources /usr/local/lib/python2.7/dist-packages/rally/benchmark/context/cleanup/admin_cleanup.py:68
2014-08-08 07:13:33.982 48152 TRACE rally.benchmark.context.cleanup.admin_cleanup Traceback (most recent call last):
2014-08-08 07:13:33.982 48152 TRACE rally.benchmark.context.cleanup.admin_cleanup File "/usr/local/lib/python2.7/dist-packages/rally/benchmark/context/cleanup/admin_cleanup.py", line 65, in _cleanup_resources
2014-08-08 07:13:33.982 48152 TRACE rally.benchmark.context.cleanup.admin_cleanup method(client, *cleanup_method[2:])
2014-08-08 07:13:33.982 48152 TRACE rally.benchmark.context.cleanup.admin_cleanup File "/usr/local/lib/python2.7/dist-packages/rally/benchmark/context/cleanup/utils.py", line 50, in delete_keystone_resources
2014-08-08 07:13:33.982 48152 TRACE rally.benchmark.context.cleanup.admin_cleanup _delete_single_keystone_resource_type(keystone, resource)
2014-08-08 07:13:33.982 48152 TRACE rally.benchmark.context.cleanup.admin_cleanup File "/usr/local/lib/python2.7/dist-packages/rally/benchmark/context/cleanup/utils.py", line 54, in _delete_single_keystone_resource_type
2014-08-08 07:13:33.982 48152 TRACE rally.benchmark.context.cleanup.admin_cleanup for resource in getattr(keystone, "list_%ss" % resource_name)():
2014-08-08 07:13:33.982 48152 TRACE rally.benchmark.context.cleanup.admin_cleanup File "/usr/local/lib/python2.7/dist-packages/rally/benchmark/wrappers/keystone.py", line 136, in list_users
2014-08-08 07:13:33.982 48152 TRACE rally.benchmark.context.cleanup.admin_cleanup return map(KeystoneV2Wrapper._wrap_v2_user, self.client.users.list())
2014-08-08 07:13:33.982 48152 TRACE rally.benchmark.context.cleanup.admin_cleanup File "/usr/local/lib/python2.7/dist-packages/rally/benchmark/wrappers/keystone.py", line 115, in _wrap_v2_user
2014-08-08 07:13:33.982 48152 TRACE rally.benchmark.context.cleanup.admin_cleanup return User(id=user.id, name=user.name, project_id=user.tenantId,
2014-08-08 07:13:33.982 48152 TRACE rally.benchmark.context.cleanup.admin_cleanup File "/usr/local/lib/python2.7/dist-packages/python_keystoneclient-0.10.1-py2.7.egg/keystoneclient/openstack/common/apiclient/base.py", line 489, in __getattr__
2014-08-08 07:13:33.982 48152 TRACE rally.benchmark.context.cleanup.admin_cleanup raise AttributeError(k)
2014-08-08 07:13:33.982 48152 TRACE rally.benchmark.context.cleanup.admin_cleanup AttributeError: tenantId
2014-08-08 07:13:33.982 48152 TRACE rally.benchmark.context.cleanup.admin_cleanup
2014-08-08 07:13:33.985 48152 WARNING rally.benchmark.context.cleanup.admin_cleanup [-] Unable to fully cleanup the cloud: tenantId

My keystone user-list:
keystone user-list
WARNING: Bypassing authentication using a token & endpoint (authentication credentials are being ignored).
+----------------------------------+-------------------+---------+------------------------+
| id | name | enabled | email |
+----------------------------------+-------------------+---------+------------------------+
| 9e9ef2cd18c6419cb5ef6a32e40da61d | admin | True | <email address hidden> |
| 101331e833054ed5af8688df631ed0d5 | ceilometer | True | <email address hidden> |
| db141089d9984f4d911ed08fe6f57dd7 | cinder | True | <email address hidden> |
| 3184530f99cf46d4b339c1dc64ee22ec | demo | True | <email address hidden> |
| edc89974d65d4b6985af1db0263f2e6d | glance | True | |
| 9092b685181c42d09cde1468c130e6a1 | heat | True | <email address hidden> |
| 6965c75881f4480ab9515a4384210eb9 | heat_domain_admin | True | |
| 172c73ff65fc40629249150630dbd2d5 | neutron | True | <email address hidden> |
| 5716e77a655c44d3a2e85ff58427bc81 | nova | True | <email address hidden> |
+----------------------------------+-------------------+---------+------------------------+
stacker@stack:/opt/stack/python-keystoneclient$ keystone user-get 6965c75881f4480ab9515a4384210eb9
WARNING: Bypassing authentication using a token & endpoint (authentication credentials are being ignored).
+-------------+--------------------------------------------+
| Property | Value |
+-------------+--------------------------------------------+
| description | Manages users and projects created by heat |
| enabled | True |
| id | 6965c75881f4480ab9515a4384210eb9 |
| name | heat_domain_admin |
| username | heat_domain_admin |
+-------------+--------------------------------------------+

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/118106

[OpenStack Infra (hudson-openstack)]

Change abandoned by Li Yingjun (<email address hidden>) on branch: master
Review: https://review.openstack.org/118106

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/118106
Committed: https://git.openstack.org/cgit/stackforge/rally/commit/?id=e8144a971485248983470781cc649b8630905324
Submitter: Jenkins
Branch: master

commit e8144a971485248983470781cc649b8630905324
Author: liyingjun <email address hidden>
Date: Fri Aug 8 07:22:29 2014 +0800

    Fix AttributeError in admin_cleanup

    There will be an AttributeError in admin_cleanup when the user has no
    tenant attached.

    Change-Id: I1e34378dea3fbdf51c4218134d986bb8abf29d02
    Closes-bug: 1363888