From 2587fe9f18056e8fb30dde15f5b71480bdd43cfe Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Thu, 3 Apr 2014 15:48:48 -0400 Subject: [PATCH] Obfuscate the license engine... implements AC-1069 --- awx/main/access.py | 4 ++-- awx/main/tests/licenses.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/awx/main/access.py b/awx/main/access.py index 85ff2380ea..f409d24f20 100644 --- a/awx/main/access.py +++ b/awx/main/access.py @@ -15,7 +15,7 @@ from rest_framework.exceptions import ParseError, PermissionDenied # AWX from awx.main.utils import * from awx.main.models import * -from awx.main.licenses import LicenseReader +from awx.main.task_engine import TaskSerializer __all__ = ['get_user_queryset', 'check_user_access'] @@ -351,7 +351,7 @@ class HostAccess(BaseAccess): return False # Check to see if we have enough licenses - reader = LicenseReader() + reader = TaskSerializer() validation_info = reader.from_file() if 'test' in sys.argv: diff --git a/awx/main/tests/licenses.py b/awx/main/tests/licenses.py index f33d442dcc..f800f2379e 100644 --- a/awx/main/tests/licenses.py +++ b/awx/main/tests/licenses.py @@ -11,7 +11,7 @@ from django.test.client import Client from django.core.urlresolvers import reverse from awx.main.models import Host, Inventory, Organization from awx.main.tests.base import BaseTest -from awx.main.licenses import * +from awx.main.task_engine import * class LicenseTests(BaseTest): @@ -36,7 +36,7 @@ class LicenseTests(BaseTest): def test_license_writer(self): - writer = LicenseWriter( + writer = TaskEngager( company_name='acmecorp', contact_name='Michael DeHaan', contact_email='michael@ansibleworks.com', @@ -56,7 +56,7 @@ class LicenseTests(BaseTest): strdata_loaded = json.loads(strdata) assert strdata_loaded == data - reader = LicenseReader() + reader = TaskSerializer() vdata = reader.from_string(strdata)