mirror of
https://github.com/GAM-team/GAM.git
synced 2026-06-03 22:01:39 +00:00
Add new <CrOSFieldName>
This commit is contained in:
@@ -24649,7 +24649,7 @@ def _getFilterDateTime():
|
|||||||
return (filterDate, filterDate.replace(tzinfo='UTC'))
|
return (filterDate, filterDate.replace(tzinfo='UTC'))
|
||||||
|
|
||||||
CROS_FIELDS_CHOICE_MAP = {
|
CROS_FIELDS_CHOICE_MAP = {
|
||||||
'activetimeranges': ['activeTimeRanges.activeTime', 'activeTimeRanges.date'],
|
'activetimeranges': 'activeTimeRanges',
|
||||||
'annotatedassetid': 'annotatedAssetId',
|
'annotatedassetid': 'annotatedAssetId',
|
||||||
'annotatedlocation': 'annotatedLocation',
|
'annotatedlocation': 'annotatedLocation',
|
||||||
'annotateduser': 'annotatedUser',
|
'annotateduser': 'annotatedUser',
|
||||||
@@ -24664,7 +24664,7 @@ CROS_FIELDS_CHOICE_MAP = {
|
|||||||
'cpuinfo': 'cpuInfo',
|
'cpuinfo': 'cpuInfo',
|
||||||
'cpustatusreports': 'cpuStatusReports',
|
'cpustatusreports': 'cpuStatusReports',
|
||||||
'deprovisionreason': 'deprovisionReason',
|
'deprovisionreason': 'deprovisionReason',
|
||||||
'devicefiles': ['deviceFiles.type', 'deviceFiles.createTime'],
|
'devicefiles': 'deviceFiles',
|
||||||
'deviceid': 'deviceId',
|
'deviceid': 'deviceId',
|
||||||
'devicelicensetype': 'deviceLicenseType',
|
'devicelicensetype': 'deviceLicenseType',
|
||||||
'diskspaceusage': 'diskSpaceUsage',
|
'diskspaceusage': 'diskSpaceUsage',
|
||||||
@@ -24697,7 +24697,7 @@ CROS_FIELDS_CHOICE_MAP = {
|
|||||||
'osversioncompliance': 'osVersionCompliance',
|
'osversioncompliance': 'osVersionCompliance',
|
||||||
'ou': 'orgUnitPath',
|
'ou': 'orgUnitPath',
|
||||||
'platformversion': 'platformVersion',
|
'platformversion': 'platformVersion',
|
||||||
'recentusers': ['recentUsers.email', 'recentUsers.type'],
|
'recentusers': 'recentUsers',
|
||||||
'screenshotfiles': 'screenshotFiles',
|
'screenshotfiles': 'screenshotFiles',
|
||||||
'serialnumber': 'serialNumber',
|
'serialnumber': 'serialNumber',
|
||||||
'status': 'status',
|
'status': 'status',
|
||||||
@@ -24705,11 +24705,11 @@ CROS_FIELDS_CHOICE_MAP = {
|
|||||||
'systemramfreereports': 'systemRamFreeReports',
|
'systemramfreereports': 'systemRamFreeReports',
|
||||||
'systemramtotal': 'systemRamTotal',
|
'systemramtotal': 'systemRamTotal',
|
||||||
'tag': 'annotatedAssetId',
|
'tag': 'annotatedAssetId',
|
||||||
'timeranges': ['activeTimeRanges.activeTime', 'activeTimeRanges.date'],
|
'timeranges': 'activeTimeRanges',
|
||||||
'times': ['activeTimeRanges.activeTime', 'activeTimeRanges.date'],
|
'times': 'activeTimeRanges',
|
||||||
'tpmversioninfo': 'tpmVersionInfo',
|
'tpmversioninfo': 'tpmVersionInfo',
|
||||||
'user': 'annotatedUser',
|
'user': 'annotatedUser',
|
||||||
'users': ['recentUsers.email', 'recentUsers.type'],
|
'users': 'recentUsers',
|
||||||
'willautorenew': 'willAutoRenew',
|
'willautorenew': 'willAutoRenew',
|
||||||
}
|
}
|
||||||
CROS_BASIC_FIELDS_LIST = ['deviceId', 'annotatedAssetId', 'annotatedLocation', 'annotatedUser', 'lastSync', 'notes', 'serialNumber', 'status']
|
CROS_BASIC_FIELDS_LIST = ['deviceId', 'annotatedAssetId', 'annotatedLocation', 'annotatedUser', 'lastSync', 'notes', 'serialNumber', 'status']
|
||||||
@@ -25318,7 +25318,7 @@ def doPrintCrOSDevices(entityList=None):
|
|||||||
for key in ['email', 'type']:
|
for key in ['email', 'type']:
|
||||||
new_row[f'recentUsers{GC.Values[GC.CSV_OUTPUT_SUBFIELD_DELIMITER]}{key}'] = recentUsers[i][key]
|
new_row[f'recentUsers{GC.Values[GC.CSV_OUTPUT_SUBFIELD_DELIMITER]}{key}'] = recentUsers[i][key]
|
||||||
if i < lenDF:
|
if i < lenDF:
|
||||||
for key in ['type', 'createTime']:
|
for key in ['name', 'type', 'downloadUrl', 'createTime']:
|
||||||
new_row[f'deviceFiles{GC.Values[GC.CSV_OUTPUT_SUBFIELD_DELIMITER]}{key}'] = deviceFiles[i][key]
|
new_row[f'deviceFiles{GC.Values[GC.CSV_OUTPUT_SUBFIELD_DELIMITER]}{key}'] = deviceFiles[i][key]
|
||||||
if i < lenCSR:
|
if i < lenCSR:
|
||||||
new_row[f'cpuStatusReports{GC.Values[GC.CSV_OUTPUT_SUBFIELD_DELIMITER]}reportTime'] = cpuStatusReports[i]['reportTime']
|
new_row[f'cpuStatusReports{GC.Values[GC.CSV_OUTPUT_SUBFIELD_DELIMITER]}reportTime'] = cpuStatusReports[i]['reportTime']
|
||||||
|
|||||||
Reference in New Issue
Block a user