deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-09 14:13:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Filter Chrome devices by OU

Browse Source
This commit is contained in:
Jay Lee
2017-06-19 15:00:11 -04:00
parent b83967809d
commit 720bd46683
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gam.py
View File

@ -9624,12 +9624,16 @@ def doPrintCrosActivity():
listLimit = 0 listLimit = 0
delimiter = u',' delimiter = u','
query = None query = None
orgUnitPath = None
i = 3 i = 3
while i < len(sys.argv): while i < len(sys.argv):
myarg = sys.argv[i].lower().replace(u'_', u'') myarg = sys.argv[i].lower().replace(u'_', u'')
if myarg == u'query': if myarg == u'query':
query = sys.argv[i+1] query = sys.argv[i+1]
i += 2 i += 2
if myarg == u'limittoou':
orgUnitPath = sys.argv[i+1]
i += 2
elif myarg == u'todrive': elif myarg == u'todrive':
todrive = True todrive = True
i += 1 i += 1
@ -9668,7 +9672,7 @@ def doPrintCrosActivity():
page_message = u'Got %%num_items%% Chrome devices...\n' page_message = u'Got %%num_items%% Chrome devices...\n'
all_cros = callGAPIpages(cd.chromeosdevices(), u'list', u'chromeosdevices', page_message=page_message, all_cros = callGAPIpages(cd.chromeosdevices(), u'list', u'chromeosdevices', page_message=page_message,
query=query, customerId=GC_Values[GC_CUSTOMER_ID], projection=u'FULL', query=query, customerId=GC_Values[GC_CUSTOMER_ID], projection=u'FULL',
fields=fields, maxResults=GC_Values[GC_DEVICE_MAX_RESULTS]) fields=fields, maxResults=GC_Values[GC_DEVICE_MAX_RESULTS], orgUnitPath=orgUnitPath)
for cros in all_cros: for cros in all_cros:
row = {} row = {}
for attrib in cros: for attrib in cros:
@ -9706,7 +9710,7 @@ def doPrintCrosDevices():
csvRows = [] csvRows = []
addFieldToCSVfile(u'deviceid', CROS_ARGUMENT_TO_PROPERTY_MAP, fieldsList, fieldsTitles, titles) addFieldToCSVfile(u'deviceid', CROS_ARGUMENT_TO_PROPERTY_MAP, fieldsList, fieldsTitles, titles)
sortHeaders = False sortHeaders = False
query = projection = orderBy = sortOrder = None query = projection = orderBy = sortOrder = orgUnitPath = None
noLists = False noLists = False
selectActiveTimeRanges = selectRecentUsers = False selectActiveTimeRanges = selectRecentUsers = False
startDate = endDate = None startDate = endDate = None
@ -9717,6 +9721,9 @@ def doPrintCrosDevices():
if myarg == u'query': if myarg == u'query':
query = sys.argv[i+1] query = sys.argv[i+1]
i += 2 i += 2
elif myarg == u'limittoou':
orgUnitPath = sys.argv[i+1]
i += 2
elif myarg == u'todrive': elif myarg == u'todrive':
todrive = True todrive = True
i += 1 i += 1
@ -9814,7 +9821,7 @@ def doPrintCrosDevices():
sys.stderr.write(u'Retrieving All Chrome OS Devices for organization (may take some time for large accounts)...\n') sys.stderr.write(u'Retrieving All Chrome OS Devices for organization (may take some time for large accounts)...\n')
page_message = u'Got %%num_items%% Chrome devices...\n' page_message = u'Got %%num_items%% Chrome devices...\n'
all_cros = callGAPIpages(cd.chromeosdevices(), u'list', u'chromeosdevices', page_message=page_message, all_cros = callGAPIpages(cd.chromeosdevices(), u'list', u'chromeosdevices', page_message=page_message,
query=query, customerId=GC_Values[GC_CUSTOMER_ID], projection=projection, query=query, customerId=GC_Values[GC_CUSTOMER_ID], projection=projection, orgUnitPath=orgUnitPath,
orderBy=orderBy, sortOrder=sortOrder, fields=fields, maxResults=GC_Values[GC_DEVICE_MAX_RESULTS]) orderBy=orderBy, sortOrder=sortOrder, fields=fields, maxResults=GC_Values[GC_DEVICE_MAX_RESULTS])
if (not noLists) and (not selectActiveTimeRanges) and (not selectRecentUsers): if (not noLists) and (not selectActiveTimeRanges) and (not selectRecentUsers):
for cros in all_cros: for cros in all_cros: