From 1294efdeb9ac77bcb5b98c7ee4e1c312b66fb363 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Fri, 23 Oct 2020 11:04:50 -0400
Subject: [PATCH] consolidate a few license code function calls

---
 awx/api/generics.py | 4 ++--
 awx/conf/license.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/awx/api/generics.py b/awx/api/generics.py
index b618a826fb..9a8f561a56 100644
--- a/awx/api/generics.py
+++ b/awx/api/generics.py
@@ -187,7 +187,7 @@ class APIView(views.APIView):
         '''
         Log warning for 400 requests.  Add header with elapsed time.
         '''
-        from awx.main.utils.common import get_licenser
+        from awx.conf.license import get_license
 
         #
         # If the URL was rewritten, and we get a 404, we should entirely
@@ -224,7 +224,7 @@ class APIView(views.APIView):
         response = super(APIView, self).finalize_response(request, response, *args, **kwargs)
         time_started = getattr(self, 'time_started', None)
         response['X-API-Product-Version'] = get_awx_version()
-        response['X-API-Product-Name'] = 'AWX' if get_licenser().validate().get('license_type') == 'open' else 'Red Hat Ansible Tower'
+        response['X-API-Product-Name'] = 'AWX' if get_license().get('license_type') == 'open' else 'Red Hat Ansible Tower'
         
         response['X-API-Node'] = settings.CLUSTER_HOST_ID
         if time_started:
diff --git a/awx/conf/license.py b/awx/conf/license.py
index d92830cd9d..3929c37921 100644
--- a/awx/conf/license.py
+++ b/awx/conf/license.py
@@ -5,8 +5,8 @@ __all__ = ['get_license']
 
 
 def _get_validated_license_data():
-    from awx.main.utils.licensing import Licenser
-    return Licenser().validate()
+    from awx.main.utils import get_licenser
+    return get_licenser().validate()
 
 
 def get_license():