diff --git a/src/gam/__init__.py b/src/gam/__init__.py index a96ef7fb..b30589e0 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -8415,12 +8415,12 @@ def _getResoldSubscriptionAttr(arg, customerId): elif myarg in ['purchaseorderid', 'po']: body['purchaseOrderId'] = arg[i + 1] elif myarg in ['seats']: - body['seats']['numberOfSeats'] = getInteger(sys.argv[i + 1], + body['seats']['numberOfSeats'] = getInteger(arg[i + 1], 'numberOfSeats', minVal=0) if len(arg) > i + 2 and arg[i + 2].isdigit(): body['seats']['maximumNumberOfSeats'] = getInteger( - sys.argv[i + 2], 'maximumNumberOfSeats', minVal=0) + arg[i + 2], 'maximumNumberOfSeats', minVal=0) i += 1 elif myarg in ['sku', 'skuid']: _, body['skuId'] = getProductAndSKU(arg[i + 1]) diff --git a/src/gam/gapi/cloudidentity/groups.py b/src/gam/gapi/cloudidentity/groups.py index 09b0af77..d0cf5c97 100644 --- a/src/gam/gapi/cloudidentity/groups.py +++ b/src/gam/gapi/cloudidentity/groups.py @@ -233,7 +233,7 @@ def print_(): page_message=page_message, message_attribute=['groupKey', 'id'], parent=parent, - srcview='FULL', + view='FULL', pageSize=500) i = 0 count = len(entityList) @@ -251,14 +251,14 @@ def print_(): ) page_message = gapi.got_total_items_first_last_msg('Members') validRoles, _, _ = gam._getRoleVerification( - roles, 'nextPageToken,members(email,id,role)') + '.'.join(roles), 'nextPageToken,members(email,id,role)') groupMembers = gapi.get_all_pages(ci.groups().memberships(), 'list', 'memberships', page_message=page_message, - message_attribute='email', + message_attribute=['memberKey', 'id'], soft_errors=True, - groupKey_id=groupKey_id, + parent=groupKey_id, view='BASIC') if members: membersList = []