X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=doctor_tests%2Fidentity_auth.py;h=0d4295971073de8c063b966a6191db9e856b4d38;hb=refs%2Fchanges%2F45%2F49445%2F5;hp=2586720c7802c48b3c60e7eb411378b6f15896a9;hpb=079ac9a481fcc1baa53cb5ab2896bbe037585f3b;p=doctor.git diff --git a/doctor_tests/identity_auth.py b/doctor_tests/identity_auth.py index 2586720c..0d429597 100644 --- a/doctor_tests/identity_auth.py +++ b/doctor_tests/identity_auth.py @@ -16,11 +16,11 @@ def get_identity_auth(username=None, password=None, project=None): auth_url = os.environ['OS_AUTH_URL'] username = username or os.environ['OS_USERNAME'] password = password or os.environ['OS_PASSWORD'] - user_domain_name = os.environ.get('OS_USER_DOMAIN_NAME') or 'default' + user_domain_name = os.environ.get('OS_USER_DOMAIN_NAME') or 'Default' user_domain_id = os.environ.get('OS_USER_DOMAIN_ID') or 'default' - project_name = project or os.environ.get('OS_PROJECT_NAME') \ - or os.environ.get('OS_TENANT_NAME') - project_domain_name = os.environ.get('OS_PROJECT_DOMAIN_NAME') or 'default' + project_name = (project or os.environ.get('OS_PROJECT_NAME') or + os.environ.get('OS_TENANT_NAME')) + project_domain_name = os.environ.get('OS_PROJECT_DOMAIN_NAME') or 'Default' project_domain_id = os.environ.get('OS_PROJECT_DOMAIN_ID') or 'default' loader = loading.get_plugin_loader('password')