From 4097ec1d24f2735f9f2e2d084979d68261beb366 Mon Sep 17 00:00:00 2001
From: Samuel de Medeiros Queiroz <samuel@lsd.ufcg.edu.br>
Date: Thu, 6 Aug 2015 12:03:02 -0300
Subject: [PATCH] Fixes inherited role assignments CRUD calls

The paremeter to Keystone Client was passed as
'inherited', when it should be
'os_inherit_extension_inherited'.

Closes-Bug: #1482254

Change-Id: I1cb46add532223ef0b9620763b1047cc80e19ec0
---
 openstackclient/identity/v3/role.py            |  2 +-
 openstackclient/tests/identity/v3/test_role.py | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py
index 199b7dcaa1..2ca58a2734 100644
--- a/openstackclient/identity/v3/role.py
+++ b/openstackclient/identity/v3/role.py
@@ -103,7 +103,7 @@ def _process_identity_and_resource_options(parsed_args,
             parsed_args.project,
             parsed_args.group_domain,
         ).id
-    kwargs['inherited'] = parsed_args.inherited
+    kwargs['os_inherit_extension_inherited'] = parsed_args.inherited
     return kwargs
 
 
diff --git a/openstackclient/tests/identity/v3/test_role.py b/openstackclient/tests/identity/v3/test_role.py
index 4ff3b95f63..4a0ba0664e 100644
--- a/openstackclient/tests/identity/v3/test_role.py
+++ b/openstackclient/tests/identity/v3/test_role.py
@@ -123,7 +123,7 @@ class TestRoleAdd(TestRole):
         kwargs = {
             'user': identity_fakes.user_id,
             'domain': identity_fakes.domain_id,
-            'inherited': self._is_inheritance_testcase(),
+            'os_inherit_extension_inherited': self._is_inheritance_testcase(),
         }
         # RoleManager.grant(role, user=, group=, domain=, project=)
         self.roles_mock.grant.assert_called_with(
@@ -156,7 +156,7 @@ class TestRoleAdd(TestRole):
         kwargs = {
             'user': identity_fakes.user_id,
             'project': identity_fakes.project_id,
-            'inherited': self._is_inheritance_testcase(),
+            'os_inherit_extension_inherited': self._is_inheritance_testcase(),
         }
         # RoleManager.grant(role, user=, group=, domain=, project=)
         self.roles_mock.grant.assert_called_with(
@@ -189,7 +189,7 @@ class TestRoleAdd(TestRole):
         kwargs = {
             'group': identity_fakes.group_id,
             'domain': identity_fakes.domain_id,
-            'inherited': self._is_inheritance_testcase(),
+            'os_inherit_extension_inherited': self._is_inheritance_testcase(),
         }
         # RoleManager.grant(role, user=, group=, domain=, project=)
         self.roles_mock.grant.assert_called_with(
@@ -222,7 +222,7 @@ class TestRoleAdd(TestRole):
         kwargs = {
             'group': identity_fakes.group_id,
             'project': identity_fakes.project_id,
-            'inherited': self._is_inheritance_testcase(),
+            'os_inherit_extension_inherited': self._is_inheritance_testcase(),
         }
         # RoleManager.grant(role, user=, group=, domain=, project=)
         self.roles_mock.grant.assert_called_with(
@@ -598,7 +598,7 @@ class TestRoleRemove(TestRole):
         kwargs = {
             'user': identity_fakes.user_id,
             'domain': identity_fakes.domain_id,
-            'inherited': self._is_inheritance_testcase(),
+            'os_inherit_extension_inherited': self._is_inheritance_testcase(),
         }
         # RoleManager.revoke(role, user=, group=, domain=, project=)
         self.roles_mock.revoke.assert_called_with(
@@ -631,7 +631,7 @@ class TestRoleRemove(TestRole):
         kwargs = {
             'user': identity_fakes.user_id,
             'project': identity_fakes.project_id,
-            'inherited': self._is_inheritance_testcase(),
+            'os_inherit_extension_inherited': self._is_inheritance_testcase(),
         }
         # RoleManager.revoke(role, user=, group=, domain=, project=)
         self.roles_mock.revoke.assert_called_with(
@@ -665,7 +665,7 @@ class TestRoleRemove(TestRole):
         kwargs = {
             'group': identity_fakes.group_id,
             'domain': identity_fakes.domain_id,
-            'inherited': self._is_inheritance_testcase(),
+            'os_inherit_extension_inherited': self._is_inheritance_testcase(),
         }
         # RoleManager.revoke(role, user=, group=, domain=, project=)
         self.roles_mock.revoke.assert_called_with(
@@ -698,7 +698,7 @@ class TestRoleRemove(TestRole):
         kwargs = {
             'group': identity_fakes.group_id,
             'project': identity_fakes.project_id,
-            'inherited': self._is_inheritance_testcase(),
+            'os_inherit_extension_inherited': self._is_inheritance_testcase(),
         }
         # RoleManager.revoke(role, user=, group=, domain=, project=)
         self.roles_mock.revoke.assert_called_with(