diff options
| -rw-r--r-- | barbicanclient/barbican_cli/acls.py | 4 | ||||
| -rw-r--r-- | functionaltests/client/v1/functional/test_acl.py | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/barbicanclient/barbican_cli/acls.py b/barbicanclient/barbican_cli/acls.py index 938ba09..5a1272a 100644 --- a/barbicanclient/barbican_cli/acls.py +++ b/barbicanclient/barbican_cli/acls.py @@ -253,7 +253,9 @@ class RemoveACLUsers(lister.Lister, ArgMixin): acl_users = server_acl.users acl_users = set(acl_users).difference(input_acl.users) del server_acl.users[:] - server_acl.users = acl_users + # Python sets are not JSON serializable. + # Cast acl_users to a list. + server_acl.users = list(acl_users) server_entity.submit() # apply changes to server server_entity.load_acls_data() diff --git a/functionaltests/client/v1/functional/test_acl.py b/functionaltests/client/v1/functional/test_acl.py index cdfcd0e..548929e 100644 --- a/functionaltests/client/v1/functional/test_acl.py +++ b/functionaltests/client/v1/functional/test_acl.py @@ -503,7 +503,8 @@ class ACLsTestCase(BaseACLsTestCase): acl_users = server_acl.read.users if acl_users and remove_users: acl_users = set(acl_users).difference(remove_users) - server_acl.read.users = acl_users + # Python sets are not JSON serializable. Cast acl_users to a list. + server_acl.read.users = list(acl_users) if kwargs.get('remove_project_access') is not None: server_acl.read.project_access = \ @@ -554,7 +555,8 @@ class ACLsTestCase(BaseACLsTestCase): acl_users = server_acl.read.users if acl_users and remove_users: acl_users = set(acl_users).difference(remove_users) - server_acl.read.users = acl_users + # Python sets are not JSON serializable. Cast acl_users to a list. + server_acl.read.users = list(acl_users) if kwargs.get('remove_project_access') is not None: server_acl.read.project_access = \ |