diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-02 15:03:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-02 15:03:57 +0000 |
| commit | 6760fef8fd01b34e7586f125254dffd780b2ef4c (patch) | |
| tree | 67a554227704c363de6741aa15f62b7dbedb7543 /cinderclient/tests | |
| parent | 02eb5865a9ef55e1e286cadf7e40208317475905 (diff) | |
| parent | 5e2b7808977264423bbcbf1d0fdfd99238bf7924 (diff) | |
| download | python-cinderclient-6760fef8fd01b34e7586f125254dffd780b2ef4c.tar.gz | |
Merge "Fix "ref[project_name]""
Diffstat (limited to 'cinderclient/tests')
| -rw-r--r-- | cinderclient/tests/unit/fixture_data/keystone_client.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cinderclient/tests/unit/fixture_data/keystone_client.py b/cinderclient/tests/unit/fixture_data/keystone_client.py index c94977e..56387ee 100644 --- a/cinderclient/tests/unit/fixture_data/keystone_client.py +++ b/cinderclient/tests/unit/fixture_data/keystone_client.py @@ -79,7 +79,7 @@ def _get_normalized_token_data(**kwargs): ref['username'] = ref.get('username', uuid.uuid4().hex) ref['project_id'] = ref.get('project_id', ref.get('tenant_id', uuid.uuid4().hex)) - ref['project_name'] = ref.get('tenant_name', + ref['project_name'] = ref.get('project_name', ref.get('tenant_name', uuid.uuid4().hex)) ref['user_domain_id'] = ref.get('user_domain_id', uuid.uuid4().hex) ref['user_domain_name'] = ref.get('user_domain_name', uuid.uuid4().hex) |