Rename tower display plugins to awx display

awx/lib/awx_display_callback/__init__.py

@@ -17,9 +17,9 @@
 
 from __future__ import (absolute_import, division, print_function)
 
-# Tower Display Callback
+# AWX Display Callback
 from . import cleanup  # noqa (registers control persistent cleanup)
 from . import display  # noqa (wraps ansible.display.Display methods)
-from .module import TowerDefaultCallbackModule, TowerMinimalCallbackModule
+from .module import AWXDefaultCallbackModule, AWXMinimalCallbackModule
 
-__all__ = ['TowerDefaultCallbackModule', 'TowerMinimalCallbackModule']
+__all__ = ['AWXDefaultCallbackModule', 'AWXMinimalCallbackModule']

awx/lib/awx_display_callback/module.py

@@ -27,7 +27,7 @@ from copy import copy
 from ansible.plugins.callback import CallbackBase
 from ansible.plugins.callback.default import CallbackModule as DefaultCallbackModule
 
-# Tower Display Callback
+# AWX Display Callback
 from .events import event_context
 from .minimal import CallbackModule as MinimalCallbackModule
 
@@ -448,12 +448,12 @@ class BaseCallbackModule(CallbackBase):
             super(BaseCallbackModule, self).v2_runner_retry(result)
 
 
-class TowerDefaultCallbackModule(BaseCallbackModule, DefaultCallbackModule):
+class AWXDefaultCallbackModule(BaseCallbackModule, DefaultCallbackModule):
 
-    CALLBACK_NAME = 'tower_display'
+    CALLBACK_NAME = 'awx_display'
 
 
-class TowerMinimalCallbackModule(BaseCallbackModule, MinimalCallbackModule):
+class AWXMinimalCallbackModule(BaseCallbackModule, MinimalCallbackModule):
 
     CALLBACK_NAME = 'minimal'
 

awx/lib/isolated_callbacks/awx_display.py

@@ -27,4 +27,4 @@ if awx_lib_path not in sys.path:
     sys.path.insert(0, awx_lib_path)
 
 # Tower Display Callback
-from tower_display_callback import TowerDefaultCallbackModule as CallbackModule  # noqa
+from awx_display_callback import AWXDefaultCallbackModule as CallbackModule  # noqa

awx/lib/isolated_callbacks/minimal.py

@@ -27,4 +27,4 @@ if awx_lib_path not in sys.path:
     sys.path.insert(0, awx_lib_path)
 
 # Tower Display Callback
-from tower_display_callback import TowerMinimalCallbackModule as CallbackModule  # noqa
+from awx_display_callback import AWXMinimalCallbackModule as CallbackModule  # noqa

awx/lib/sitecustomize.py

@@ -2,13 +2,13 @@
 import os
 import sys
 
-# Based on http://stackoverflow.com/a/6879344/131141 -- Initialize tower display
+# Based on http://stackoverflow.com/a/6879344/131141 -- Initialize awx display
 # callback as early as possible to wrap ansible.display.Display methods.
 
 
 def argv_ready(argv):
     if argv and os.path.basename(argv[0]) in {'ansible', 'ansible-playbook'}:
-        import tower_display_callback  # noqa
+        import awx_display_callback  # noqa
 
 
 class argv_placeholder(object):

awx/lib/tests/test_display_callback.py

@@ -11,10 +11,10 @@ import pytest
 # search for a plugin implementation (which should be named `CallbackModule`)
 #
 # this code modifies the Python path to make our
-# `awx.lib.tower_display_callback` callback importable (because `awx.lib`
+# `awx.lib.awx_display_callback` callback importable (because `awx.lib`
 # itself is not a package)
 #
-# we use the `tower_display_callback` imports below within this file, but
+# we use the `awx_display_callback` imports below within this file, but
 # Ansible also uses them when it discovers this file in
 # `ANSIBLE_CALLBACK_PLUGINS`
 CALLBACK = os.path.splitext(os.path.basename(__file__))[0]
@@ -32,8 +32,8 @@ with mock.patch.dict(os.environ, {'ANSIBLE_STDOUT_CALLBACK': CALLBACK,
     if path not in sys.path:
         sys.path.insert(0, path)
 
-    from tower_display_callback import TowerDefaultCallbackModule as CallbackModule  # noqa
+    from awx_display_callback import AWXDefaultCallbackModule as CallbackModule  # noqa
-    from tower_display_callback.events import event_context  # noqa
+    from awx_display_callback.events import event_context  # noqa
 
 
 @pytest.fixture()

awx/main/isolated/run.py

@@ -188,7 +188,7 @@ def run_isolated_job(private_data_dir, secrets, logfile=sys.stdout):
     if 'AD_HOC_COMMAND_ID' in env:
         env['ANSIBLE_STDOUT_CALLBACK'] = 'minimal'
     else:
-        env['ANSIBLE_STDOUT_CALLBACK'] = 'tower_display'
+        env['ANSIBLE_STDOUT_CALLBACK'] = 'awx_display'
     env['AWX_ISOLATED_DATA_DIR'] = private_data_dir
     env['PYTHONPATH'] = env.get('PYTHONPATH', '') + callback_dir + ':'
 

awx/main/tasks.py

@@ -949,7 +949,7 @@ class RunJob(BaseTask):
         env['MAX_EVENT_RES'] = str(settings.MAX_EVENT_RES_DATA)
         if not kwargs.get('isolated'):
             env['ANSIBLE_CALLBACK_PLUGINS'] = plugin_path
-            env['ANSIBLE_STDOUT_CALLBACK'] = 'tower_display'
+            env['ANSIBLE_STDOUT_CALLBACK'] = 'awx_display'
             env['REST_API_URL'] = settings.INTERNAL_API_URL
             env['REST_API_TOKEN'] = job.task_auth_token or ''
             env['TOWER_HOST'] = settings.TOWER_URL_BASE

awx/main/tests/unit/isolated/test_expect.py

@@ -193,7 +193,7 @@ def test_run_isolated_job(private_data_dir, rsa_key):
     assert FILENAME in stdout.getvalue()
 
     assert '/path/to/awx/lib' in env['PYTHONPATH']
-    assert env['ANSIBLE_STDOUT_CALLBACK'] == 'tower_display'
+    assert env['ANSIBLE_STDOUT_CALLBACK'] == 'awx_display'
     assert env['ANSIBLE_CALLBACK_PLUGINS'] == '/path/to/awx/lib/isolated_callbacks'
     assert env['AWX_ISOLATED_DATA_DIR'] == private_data_dir
 

awx/plugins/callback/awx_display.py

@@ -27,4 +27,4 @@ if awx_lib_path not in sys.path:
     sys.path.insert(0, awx_lib_path)
 
 # Tower Display Callback
-from tower_display_callback import TowerDefaultCallbackModule as CallbackModule  # noqa
+from awx_display_callback import AWXDefaultCallbackModule as CallbackModule  # noqa

awx/plugins/callback/minimal.py

@@ -27,4 +27,4 @@ if awx_lib_path not in sys.path:
     sys.path.insert(0, awx_lib_path)
 
 # Tower Display Callback
-from tower_display_callback import TowerMinimalCallbackModule as CallbackModule  # noqa
+from awx_display_callback import AWXMinimalCallbackModule as CallbackModule  # noqa