mirror of
https://github.com/GAM-team/GAM.git
synced 2025-07-09 14:13:35 +00:00
Remove Drive-storage and Coordinate SKUs (faster) and add Apps-Lite.
This commit is contained in:
11
src/gam.py
11
src/gam.py
@ -4103,6 +4103,8 @@ def getProductAndSKU(sku):
|
|||||||
sku = u'Google-Apps-For-Postini'
|
sku = u'Google-Apps-For-Postini'
|
||||||
elif sku.lower() in [u'gau', u'unlimited', u'd4w', u'dfw']:
|
elif sku.lower() in [u'gau', u'unlimited', u'd4w', u'dfw']:
|
||||||
sku = u'Google-Apps-Unlimited'
|
sku = u'Google-Apps-Unlimited'
|
||||||
|
elif sku.lower() in [u'lite']:
|
||||||
|
sku = u'Google-Apps-Lite'
|
||||||
elif sku.lower() == u'coordinate':
|
elif sku.lower() == u'coordinate':
|
||||||
sku = u'Google-Coordinate'
|
sku = u'Google-Coordinate'
|
||||||
elif sku.lower() == u'vault':
|
elif sku.lower() == u'vault':
|
||||||
@ -6558,11 +6560,8 @@ def doGetUserInfo(user_email=None):
|
|||||||
if getLicenses:
|
if getLicenses:
|
||||||
print u'Licenses:'
|
print u'Licenses:'
|
||||||
lic = buildGAPIObject(api='licensing')
|
lic = buildGAPIObject(api='licensing')
|
||||||
for sku in [u'Google-Apps', u'Google-Apps-For-Business', u'Google-Apps-Unlimited', u'Google-Apps-For-Postini',
|
for sku in [u'Google-Apps-For-Business', u'Google-Apps-Unlimited', u'Google-Apps-For-Postini',
|
||||||
u'Google-Coordinate', u'Google-Drive-storage-20GB', u'Google-Drive-storage-50GB', u'Google-Drive-storage-200GB',
|
u'Google-Apps-Lite', u'Google-Vault', u'Google-Vault-Former-Employee']:
|
||||||
u'Google-Drive-storage-400GB', u'Google-Drive-storage-1TB', u'Google-Drive-storage-2TB',
|
|
||||||
u'Google-Drive-storage-4TB', u'Google-Drive-storage-8TB', u'Google-Drive-storage-16TB', u'Google-Vault',
|
|
||||||
u'Google-Vault-Former-Employee']:
|
|
||||||
productId, skuId = getProductAndSKU(sku)
|
productId, skuId = getProductAndSKU(sku)
|
||||||
try:
|
try:
|
||||||
result = callGAPI(service=lic.licenseAssignments(), function=u'get', throw_reasons=['notFound'], userId=user_email, productId=productId, skuId=skuId)
|
result = callGAPI(service=lic.licenseAssignments(), function=u'get', throw_reasons=['notFound'], userId=user_email, productId=productId, skuId=skuId)
|
||||||
@ -8190,7 +8189,7 @@ def doPrintCrosDevices():
|
|||||||
|
|
||||||
def doPrintLicenses(return_list=False, skus=None):
|
def doPrintLicenses(return_list=False, skus=None):
|
||||||
lic = buildGAPIObject(u'licensing')
|
lic = buildGAPIObject(u'licensing')
|
||||||
products = [u'Google-Apps', u'Google-Drive-storage', u'Google-Coordinate', u'Google-Vault']
|
products = [u'Google-Apps', u'Google-Vault']
|
||||||
licenses = []
|
licenses = []
|
||||||
lic_attributes = [{}]
|
lic_attributes = [{}]
|
||||||
todrive = False
|
todrive = False
|
||||||
|
Reference in New Issue
Block a user