Merge "Fix ignored --user-domain in role assignment list"

Author: Zuul

openstackclient/identity/common.py

@@ -184,62 +184,50 @@ def _get_token_resource(client, resource, parsed_name, parsed_domain=None):
         return parsed_name
 
 
-def _get_domain_id_if_requested(identity_client, domain_name_or_id):
-    if not domain_name_or_id:
-        return None
-    domain = find_domain(identity_client, domain_name_or_id)
-    return domain.id
-
-
 def find_domain(identity_client, name_or_id):
     return _find_identity_resource(
         identity_client.domains, name_or_id, domains.Domain
     )
 
 
 def find_group(identity_client, name_or_id, domain_name_or_id=None):
-    domain_id = _get_domain_id_if_requested(identity_client, domain_name_or_id)
-    if not domain_id:
+    if domain_name_or_id is None:
         return _find_identity_resource(
             identity_client.groups, name_or_id, groups.Group
         )
-    else:
-        domain_id = find_domain(identity_client, domain_id).id
-        return _find_identity_resource(
-            identity_client.groups,
-            name_or_id,
-            groups.Group,
-            domain_id=domain_id,
-        )
+
+    domain_id = find_domain(identity_client, domain_name_or_id).id
+    return _find_identity_resource(
+        identity_client.groups,
+        name_or_id,
+        groups.Group,
+        domain_id=domain_id,
+    )
 
 
 def find_project(identity_client, name_or_id, domain_name_or_id=None):
-    domain_id = _get_domain_id_if_requested(identity_client, domain_name_or_id)
-    if not domain_id:
+    if domain_name_or_id is None:
         return _find_identity_resource(
             identity_client.projects, name_or_id, projects.Project
         )
-    else:
-        domain_id = find_domain(identity_client, domain_id).id
-        return _find_identity_resource(
-            identity_client.projects,
-            name_or_id,
-            projects.Project,
-            domain_id=domain_id,
-        )
+    domain_id = find_domain(identity_client, domain_name_or_id).id
+    return _find_identity_resource(
+        identity_client.projects,
+        name_or_id,
+        projects.Project,
+        domain_id=domain_id,
+    )
 
 
 def find_user(identity_client, name_or_id, domain_name_or_id=None):
-    domain_id = _get_domain_id_if_requested(identity_client, domain_name_or_id)
-    if not domain_id:
+    if domain_name_or_id is None:
         return _find_identity_resource(
             identity_client.users, name_or_id, users.User
         )
-    else:
-        domain_id = find_domain(identity_client, domain_id).id
-        return _find_identity_resource(
-            identity_client.users, name_or_id, users.User, domain_id=domain_id
-        )
+    domain_id = find_domain(identity_client, domain_name_or_id).id
+    return _find_identity_resource(
+        identity_client.users, name_or_id, users.User, domain_id=domain_id
+    )
 
 
 def _find_identity_resource(

openstackclient/identity/v3/role_assignment.py

@@ -148,7 +148,7 @@ def take_action(self, parsed_args):
 
         user_domain_id = None
         if parsed_args.user_domain:
-            project_domain_id = _find_sdk_id(
+            user_domain_id = _find_sdk_id(
                 identity_client.find_domain,
                 name_or_id=parsed_args.user_domain,
             )