Add common code for determining active (licensed) hosts with unique names, update licensing code and inventory import to use it. Implements https://trello.com/c/2Q9Mosks

This commit is contained in:
Chris Church
2014-12-03 19:41:01 -05:00
parent 6b91f46082
commit fcf7398ec6
3 changed files with 12 additions and 1 deletions

View File

@@ -1125,7 +1125,7 @@ class Command(NoArgsCommand):
available_instances = license_info.get('available_instances', 0)
free_instances = license_info.get('free_instances', 0)
time_remaining = license_info.get('time_remaining', 0)
new_count = Host.objects.filter(active=True).count()
new_count = Host.objects.active_count()
if time_remaining <= 0 and not license_info.get('demo', False):
self.logger.error('License has expired')
raise CommandError("License has expired!")