deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 12:21:35 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

minor fixes to devices, more travis testing

Browse Source
This commit is contained in:
Jay Lee
2020-09-17 07:55:07 -04:00
parent 7d84da1520
commit cda626b01c
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -215,6 +215,9 @@ script:
- if [ "$e2e" = true ]; then $gam print users query "travis.jid=$jid" | $gam csv - gam delete user ~primaryEmail; fi - if [ "$e2e" = true ]; then $gam print users query "travis.jid=$jid" | $gam csv - gam delete user ~primaryEmail; fi
- if [ "$e2e" = true ]; then $gam print mobile; fi - if [ "$e2e" = true ]; then $gam print mobile; fi
- if [ "$e2e" = true ]; then $gam print devices; fi - if [ "$e2e" = true ]; then $gam print devices; fi
- if [ "$e2e" = true ]; then export sn="$jid$jid$jid$jid$jid-$(openssl rand -base64 32 | sed 's/[^a-zA-Z0-9]//g')"; fi
- if [ "$e2e" = true ]; then $gam create device serialnumber $sn devicetype android; fi
- if [ "$e2e" = true ]; then $gam print devices filter "serialnumber:$jid$jid$jid$jid$jid-" | $gam csv - gam delete device ~name; fi
- if [ "$e2e" = true ]; then $gam print cros allfields nolists; fi - if [ "$e2e" = true ]; then $gam print cros allfields nolists; fi
- if [ "$e2e" = true ]; then $gam report usageparameters customer; fi - if [ "$e2e" = true ]; then $gam report usageparameters customer; fi
- if [ "$e2e" = true ]; then $gam report usage customer parameters gmail:num_emails_sent,accounts:num_1day_logins; fi - if [ "$e2e" = true ]; then $gam report usage customer parameters gmail:num_emails_sent,accounts:num_1day_logins; fi

11
src/gam/gapi/cloudidentity/devices.py
View File

@@ -47,11 +47,14 @@ def info():
ci = gapi_cloudidentity.build_dwd() ci = gapi_cloudidentity.build_dwd()
customer = f'customers/{GC_Values[GC_CUSTOMER_ID]}' customer = f'customers/{GC_Values[GC_CUSTOMER_ID]}'
name = sys.argv[3] name = sys.argv[3]
if not name.startswith('devices/'):
name = f'devices/{name}'
device = gapi.call(ci.devices(), 'get', name=name, customer=customer) device = gapi.call(ci.devices(), 'get', name=name, customer=customer)
device_users = gapi.get_all_pages(ci.devices().deviceUsers(), 'list', device_users = gapi.get_all_pages(ci.devices().deviceUsers(), 'list',
'deviceUsers', parent=name, customer=customer) 'deviceUsers', parent=name, customer=customer)
print(device) display.print_json(device)
print(device_users) print('Device Users:')
display.print_json(device_users)
def _generic_action(action, device_user=False): def _generic_action(action, device_user=False):
ci = gapi_cloudidentity.build_dwd() ci = gapi_cloudidentity.build_dwd()
@@ -169,9 +172,7 @@ def print_():
titles.append(a_key) titles.append(a_key)
csvRows.append(device) csvRows.append(device)
if sortHeaders: if sortHeaders:
display.sort_csv_titles([ display.sort_csv_titles(['name',], titles)
'name',
], titles)
display.write_csv_file(csvRows, titles, 'Devices', todrive) display.write_csv_file(csvRows, titles, 'Devices', todrive)