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

Removed print, fixed so inventory tests will still work without a valid license file.

Browse Source
This commit is contained in:
Chris Church
2013-06-30 12:53:25 -04:00
parent 6f0d644f5f
commit adcc402910
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/main/access.py
View File

@@ -1,13 +1,16 @@
# Copyright (c) 2013 AnsibleWorks, Inc. # Copyright (c) 2013 AnsibleWorks, Inc.
# All Rights Reserved. # All Rights Reserved.
import sys
import logging import logging
from django.db.models import Q from django.db.models import Q
from django.contrib.auth.models import User from django.contrib.auth.models import User
from rest_framework.exceptions import PermissionDenied
from awx.main.models import * from awx.main.models import *
from awx.main.licenses import LicenseReader from awx.main.licenses import LicenseReader
from django.core.exceptions import PermissionDenied
import sys
__all__ = ['get_user_queryset', 'check_user_access'] __all__ = ['get_user_queryset', 'check_user_access']
@@ -261,15 +264,15 @@ class HostAccess(BaseAccess):
reader = LicenseReader() reader = LicenseReader()
validation_info = reader.from_file() validation_info = reader.from_file()
if 'test' in sys.argv and 'free_instances' in validation_info: if 'test' in sys.argv:# and 'free_instances' in validation_info:
# this hack is in here so the test code can function # this hack is in here so the test code can function
# but still go down *most* of the license code path. # but still go down *most* of the license code path.
validation_info['free_instances'] = 99999999 validation_info['free_instances'] = 99999999
if validation_info['free_instances'] > 0: if validation_info.get('free_instances', 0) > 0:
# BOOKMARK # BOOKMARK
return True return True
instances = validation_info['available_instances'] instances = validation_info.get('available_instances', 0)
raise PermissionDenied("license range of %s instances has been exceed" % instances) raise PermissionDenied("license range of %s instances has been exceed" % instances)
def can_change(self, obj, data): def can_change(self, obj, data):

1
awx/main/tests/licenses.py
View File

@@ -54,7 +54,6 @@ class LicenseTests(BaseTest):
vdata = reader.from_string(strdata) vdata = reader.from_string(strdata)
print vdata
assert vdata['available_instances'] == 500 assert vdata['available_instances'] == 500
assert vdata['current_instances'] == 6 assert vdata['current_instances'] == 6
assert vdata['free_instances'] == 494 assert vdata['free_instances'] == 494