mirror of
https://github.com/GAM-team/GAM.git
synced 2026-06-03 22:01:39 +00:00
Add new <CrOSFieldName>s
This commit is contained in:
@@ -2511,6 +2511,7 @@ gam <CrOSTypeEntity> update <CrOSAttribute>+ [quickcrosmove [<Boolean>]] [nobatc
|
|||||||
autoupdateexpiration|
|
autoupdateexpiration|
|
||||||
autoupdatethrough|
|
autoupdatethrough|
|
||||||
backlightinfo|
|
backlightinfo|
|
||||||
|
bluetoothadapterinfo|
|
||||||
bootmode|
|
bootmode|
|
||||||
chromeostype|
|
chromeostype|
|
||||||
cpuinfo|
|
cpuinfo|
|
||||||
@@ -2544,6 +2545,7 @@ gam <CrOSTypeEntity> update <CrOSAttribute>+ [quickcrosmove [<Boolean>]] [nobatc
|
|||||||
orgunitpath|org|ou|
|
orgunitpath|org|ou|
|
||||||
osupdatestatus|
|
osupdatestatus|
|
||||||
osversion|
|
osversion|
|
||||||
|
osversioncompliance|
|
||||||
platformversion|
|
platformversion|
|
||||||
recentusers|
|
recentusers|
|
||||||
screenshotfiles|
|
screenshotfiles|
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
7.44.02
|
||||||
|
|
||||||
|
Added fields `bluetoothadapterinfo` and `osversioncompliance` to `<CrOSFieldName>` for use
|
||||||
|
in `gam info|print cros`.
|
||||||
|
|
||||||
7.44.01
|
7.44.01
|
||||||
|
|
||||||
Added option `oneitemperrow` to `gam print crostelemetry` to have each of a device's
|
Added option `oneitemperrow` to `gam print crostelemetry` to have each of a device's
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
__author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
|
__author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
|
||||||
__version__ = '7.44.01'
|
__version__ = '7.44.02'
|
||||||
__license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
|
__license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
|
||||||
|
|
||||||
# pylint: disable=wrong-import-position
|
# pylint: disable=wrong-import-position
|
||||||
@@ -24658,6 +24658,7 @@ CROS_FIELDS_CHOICE_MAP = {
|
|||||||
'autoupdateexpiration': 'autoUpdateExpiration',
|
'autoupdateexpiration': 'autoUpdateExpiration',
|
||||||
'autoupdatethrough': 'autoUpdateThrough',
|
'autoupdatethrough': 'autoUpdateThrough',
|
||||||
'backlightinfo': 'backlightInfo',
|
'backlightinfo': 'backlightInfo',
|
||||||
|
'bluetoothadapterinfo': 'bluetoothAdapterInfo',
|
||||||
'bootmode': 'bootMode',
|
'bootmode': 'bootMode',
|
||||||
'chromeostype': 'chromeOsType',
|
'chromeostype': 'chromeOsType',
|
||||||
'cpuinfo': 'cpuInfo',
|
'cpuinfo': 'cpuInfo',
|
||||||
@@ -24693,6 +24694,7 @@ CROS_FIELDS_CHOICE_MAP = {
|
|||||||
'orgunitpath': 'orgUnitPath',
|
'orgunitpath': 'orgUnitPath',
|
||||||
'osupdatestatus': 'osUpdateStatus',
|
'osupdatestatus': 'osUpdateStatus',
|
||||||
'osversion': 'osVersion',
|
'osversion': 'osVersion',
|
||||||
|
'osversioncompliance': 'osVersionCompliance',
|
||||||
'ou': 'orgUnitPath',
|
'ou': 'orgUnitPath',
|
||||||
'platformversion': 'platformVersion',
|
'platformversion': 'platformVersion',
|
||||||
'recentusers': ['recentUsers.email', 'recentUsers.type'],
|
'recentusers': ['recentUsers.email', 'recentUsers.type'],
|
||||||
@@ -24728,6 +24730,7 @@ CROS_SCALAR_PROPERTY_PRINT_ORDER = [
|
|||||||
'firmwareVersion',
|
'firmwareVersion',
|
||||||
'platformVersion',
|
'platformVersion',
|
||||||
'osVersion',
|
'osVersion',
|
||||||
|
'osVersionCompliance',
|
||||||
'bootMode',
|
'bootMode',
|
||||||
'meid',
|
'meid',
|
||||||
'dockMacAddress',
|
'dockMacAddress',
|
||||||
@@ -24976,6 +24979,9 @@ def infoCrOSDevices(entityList):
|
|||||||
backlightInfo = _filterBasicList(cros, 'backLightInfo', True, listLimit)
|
backlightInfo = _filterBasicList(cros, 'backLightInfo', True, listLimit)
|
||||||
if backlightInfo:
|
if backlightInfo:
|
||||||
showJSON('backlightInfo', backlightInfo, dictObjectsKey={'backlightInfo': 'path'})
|
showJSON('backlightInfo', backlightInfo, dictObjectsKey={'backlightInfo': 'path'})
|
||||||
|
bluetoothAdapterInfo = _filterBasicList(cros, 'bluetoothAdapterInfo', True, listLimit)
|
||||||
|
if bluetoothAdapterInfo:
|
||||||
|
showJSON('bluetoothAdapterInfo', bluetoothAdapterInfo, dictObjectsKey={'bluetoothAdapterInfo': 'address'})
|
||||||
fanInfo = _filterBasicList(cros, 'fanInfo', True, listLimit)
|
fanInfo = _filterBasicList(cros, 'fanInfo', True, listLimit)
|
||||||
if fanInfo:
|
if fanInfo:
|
||||||
showJSON('fanInfo', fanInfo)
|
showJSON('fanInfo', fanInfo)
|
||||||
@@ -25205,7 +25211,8 @@ CROS_ENTITIES_MAP = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
CROS_INDEXED_TITLES = ['activeTimeRanges', 'recentUsers', 'deviceFiles',
|
CROS_INDEXED_TITLES = ['activeTimeRanges', 'recentUsers', 'deviceFiles',
|
||||||
'cpuStatusReports', 'cpuInfo', 'backlightInfo', 'fanInfo', 'diskVolumeReports', 'lastKnownNetwork', 'screenshotFiles', 'systemRamFreeReports']
|
'cpuStatusReports', 'cpuInfo', 'backlightInfo', 'bluetoothAdapterInfo', 'fanInfo',
|
||||||
|
'diskVolumeReports', 'lastKnownNetwork', 'screenshotFiles', 'systemRamFreeReports']
|
||||||
|
|
||||||
# gam print cros [todrive <ToDriveAttribute>*]
|
# gam print cros [todrive <ToDriveAttribute>*]
|
||||||
# [(query <QueryCrOS>)|(queries <QueryCrOSList>) [querytime<String> <Time>]
|
# [(query <QueryCrOS>)|(queries <QueryCrOSList>) [querytime<String> <Time>]
|
||||||
@@ -25279,7 +25286,7 @@ def doPrintCrOSDevices(entityList=None):
|
|||||||
return
|
return
|
||||||
row = {}
|
row = {}
|
||||||
for attrib in cros:
|
for attrib in cros:
|
||||||
if attrib in {'cpuInfo', 'backlightInfo', 'fanInfo'}:
|
if attrib in {'cpuInfo', 'backlightInfo', 'bluetoothAdapterInfo', 'fanInfo'}:
|
||||||
flattenJSON({attrib: cros[attrib]}, flattened=row)
|
flattenJSON({attrib: cros[attrib]}, flattened=row)
|
||||||
elif attrib not in {'kind', 'etag', 'diskSpaceUsage', 'osUpdateStatus', 'tpmVersionInfo', 'activeTimeRanges', 'recentUsers',
|
elif attrib not in {'kind', 'etag', 'diskSpaceUsage', 'osUpdateStatus', 'tpmVersionInfo', 'activeTimeRanges', 'recentUsers',
|
||||||
'deviceFiles', 'cpuStatusReports', 'diskVolumeReports', 'lastKnownNetwork', 'screenshotFiles', 'systemRamFreeReports'}:
|
'deviceFiles', 'cpuStatusReports', 'diskVolumeReports', 'lastKnownNetwork', 'screenshotFiles', 'systemRamFreeReports'}:
|
||||||
|
|||||||
Reference in New Issue
Block a user