From ce49ea8a03318404820a331bfd8f2d140fcee545 Mon Sep 17 00:00:00 2001 From: Andy Ning Date: Tue, 15 Oct 2019 11:13:00 -0400 Subject: [PATCH] Remove client checking on project_id and project name In remote cli both OS_PROJECT_ID and OS_PROJECT_NAME are set. dcmanager complains that 'Only project name or project id should be set'. This checking is unneccessary so this update removed this checking. Change-Id: I7a538d9e1c604e2e6582e441421d8498e3530cc6 Story: 2004766 Task: 37127 Signed-off-by: Andy Ning --- dcmanagerclient/api/v1/client.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dcmanagerclient/api/v1/client.py b/dcmanagerclient/api/v1/client.py index d789a77..a29855e 100644 --- a/dcmanagerclient/api/v1/client.py +++ b/dcmanagerclient/api/v1/client.py @@ -109,15 +109,6 @@ def authenticate(dcmanager_url=None, username=None, service_type='dcmanager', auth_token=None, user_id=None, session=None, cacert=None, insecure=False, **kwargs): """Get token, project_id, user_id and Endpoint.""" - if project_name and project_id: - raise RuntimeError( - 'Only project name or project id should be set' - ) - - if username and user_id: - raise RuntimeError( - 'Only user name or user id should be set' - ) user_domain_name = kwargs.get('user_domain_name') user_domain_id = kwargs.get('user_domain_id') project_domain_name = kwargs.get('project_domain_name')