External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-28 00:08:44 -03:30
Code Issues Packages Projects Releases Wiki Activity

Valid key always set correctly, compliant field set correctly

Browse Source
This commit is contained in:
Christian M. Adams
2020-10-26 16:25:25 -04:00
parent 44633c2ba7
commit 1f5df7e39c
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -340,6 +340,7 @@ class Licenser(object):
) )
license._attrs['subscription_name'] = subscription_name license._attrs['subscription_name'] = subscription_name
license._attrs['satellite'] = satellite license._attrs['satellite'] = satellite
license._attrs['valid_key'] = True
license.update( license.update(
license_date=int(sub.end_date.strftime('%s')) license_date=int(sub.end_date.strftime('%s'))
) )
@@ -371,7 +372,8 @@ class Licenser(object):
available_instances = int(attrs.get('instance_count', None) or 0) available_instances = int(attrs.get('instance_count', None) or 0)
attrs['current_instances'] = current_instances attrs['current_instances'] = current_instances
attrs['available_instances'] = available_instances attrs['available_instances'] = available_instances
attrs['free_instances'] = max(0, available_instances - current_instances) free_instances = (available_instances - current_instances)
attrs['free_instances'] = max(0, free_instances)
license_date = int(attrs.get('license_date', 0) or 0) license_date = int(attrs.get('license_date', 0) or 0)
current_date = int(time.time()) current_date = int(time.time())
@@ -381,7 +383,7 @@ class Licenser(object):
attrs['grace_period_remaining'] = time_remaining attrs['grace_period_remaining'] = time_remaining
else: else:
attrs['grace_period_remaining'] = (license_date + 2592000) - current_date attrs['grace_period_remaining'] = (license_date + 2592000) - current_date
attrs['compliant'] = bool(time_remaining > 0 and attrs['free_instances'] >= 0) attrs['compliant'] = bool(time_remaining > 0 and free_instances >= 0)
attrs['date_warning'] = bool(time_remaining < self.LICENSE_TIMEOUT) attrs['date_warning'] = bool(time_remaining < self.LICENSE_TIMEOUT)
attrs['date_expired'] = bool(time_remaining <= 0) attrs['date_expired'] = bool(time_remaining <= 0)
return attrs return attrs

8
awx/ui/client/src/license/license.partial.html
View File

@@ -58,7 +58,13 @@
{{license.license_info.current_instances}} {{license.license_info.current_instances}}
</div> </div>
</div> </div>
<div class="License-field License-greenText" ng-show='license.license_info.available_instances < 9999999'> <div class="License-field License-greenText" ng-show='license.license_info.available_instances < 9999999 && compliant'>
<div class="License-field--label" translate>Hosts Remaining</div>
<div class="License-field--content">
{{license.license_info.free_instances}}
</div>
</div>
<div class="License-field License-redText" ng-show='license.license_info.free_instances < 1 && !compliant'>
<div class="License-field--label" translate>Hosts Remaining</div> <div class="License-field--label" translate>Hosts Remaining</div>
<div class="License-field--content"> <div class="License-field--content">
{{license.license_info.free_instances}} {{license.license_info.free_instances}}