External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-26 23:46:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8790 from rooftopcellist/quantity_not_exported

Browse Source 
Aggregate quantity per sub allocation, not exported

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-12-08 21:52:49 +00:00
committed by GitHub
parent 5e51dd2ff7 b81f082a18
commit 8e46166313
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/utils/licensing.py
View File

@@ -183,10 +183,7 @@ class Licenser(object):
currentEndDate = datetime.fromtimestamp(int(currentEndDateStr), timezone.utc) currentEndDate = datetime.fromtimestamp(int(currentEndDateStr), timezone.utc)
if endDate < currentEndDate: if endDate < currentEndDate:
license['license_date'] = endDate.strftime('%s') license['license_date'] = endDate.strftime('%s')
try: instances = sub['quantity']
instances = sub['pool']['exported']
except KeyError:
instances = sub['pool']['quantity']
license['instance_count'] = license.get('instance_count', 0) + instances license['instance_count'] = license.get('instance_count', 0) + instances
license['subscription_name'] = re.sub(r'[\d]* Managed Nodes', '%d Managed Nodes' % license['instance_count'], license['subscription_name']) license['subscription_name'] = re.sub(r'[\d]* Managed Nodes', '%d Managed Nodes' % license['instance_count'], license['subscription_name'])