From 373bb443aacb7a2c8b0abe44ea51417afcc1206b Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Wed, 13 Jan 2021 19:39:56 -0500
Subject: [PATCH] UnifiedJob#is_containerized ->
 UnifiedJob#is_container_group_task

---
 awx/main/isolated/manager.py                                | 2 +-
 awx/main/managers.py                                        | 2 +-
 awx/main/models/unified_jobs.py                             | 2 +-
 awx/main/scheduler/task_manager.py                          | 2 +-
 awx/main/tasks.py                                           | 6 +++---
 .../functional/task_management/test_container_groups.py     | 2 +-
 awx/main/tests/unit/test_capacity.py                        | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/awx/main/isolated/manager.py b/awx/main/isolated/manager.py
index de4783e277..ffeb6af908 100644
--- a/awx/main/isolated/manager.py
+++ b/awx/main/isolated/manager.py
@@ -48,7 +48,7 @@ class IsolatedManager(object):
         self.pod_manager = pod_manager
 
     def build_inventory(self, hosts):
-        if self.instance and self.instance.is_containerized:
+        if self.instance and self.instance.is_container_group_task:
             inventory = {'all': {'hosts': {}}}
             fd, path = tempfile.mkstemp(
                 prefix='.kubeconfig', dir=self.private_data_dir
diff --git a/awx/main/managers.py b/awx/main/managers.py
index ae93a552a0..1af57a9423 100644
--- a/awx/main/managers.py
+++ b/awx/main/managers.py
@@ -237,7 +237,7 @@ class InstanceGroupManager(models.Manager):
             elif t.status == 'running':
                 # Subtract capacity from all groups that contain the instance
                 if t.execution_node not in instance_ig_mapping:
-                    if not t.is_containerized:
+                    if not t.is_container_group_task:
                         logger.warning('Detected %s running inside lost instance, '
                                        'may still be waiting for reaper.', t.log_format)
                     if t.instance_group:
diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py
index 7970de1b22..cf22430f7b 100644
--- a/awx/main/models/unified_jobs.py
+++ b/awx/main/models/unified_jobs.py
@@ -1490,7 +1490,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
         return bool(self.controller_node)
 
     @property
-    def is_containerized(self):
+    def is_container_group_task(self):
         return False
 
     def log_lifecycle(self, state, blocked_by=None):
diff --git a/awx/main/scheduler/task_manager.py b/awx/main/scheduler/task_manager.py
index 8731ca3109..50345e5bb7 100644
--- a/awx/main/scheduler/task_manager.py
+++ b/awx/main/scheduler/task_manager.py
@@ -594,7 +594,7 @@ class TaskManager():
         ).exclude(
             execution_node__in=Instance.objects.values_list('hostname', flat=True)
         ):
-            if j.execution_node and not j.is_containerized:
+            if j.execution_node and not j.is_container_group_task:
                 logger.error(f'{j.execution_node} is not a registered instance; reaping {j.log_format}')
                 reap_job(j, 'failed')
 
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index efc4f4594f..5dd6b0fd5c 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -1867,7 +1867,7 @@ class RunJob(BaseTask):
         '''
         Return whether this task should use proot.
         '''
-        if job.is_containerized:
+        if job.is_container_group_task:
             return False
         return getattr(settings, 'AWX_PROOT_ENABLED', False)
 
@@ -1997,7 +1997,7 @@ class RunJob(BaseTask):
                 os.path.join(private_data_dir, 'artifacts', 'fact_cache'),
                 fact_modification_times,
             )
-        if isolated_manager_instance and not job.is_containerized:
+        if isolated_manager_instance and not job.is_container_group_task:
             isolated_manager_instance.cleanup()
 
         try:
@@ -2994,7 +2994,7 @@ class RunAdHocCommand(BaseTask):
         '''
         Return whether this task should use proot.
         '''
-        if ad_hoc_command.is_containerized:
+        if ad_hoc_command.is_container_group_task:
             return False
         return getattr(settings, 'AWX_PROOT_ENABLED', False)
 
diff --git a/awx/main/tests/functional/task_management/test_container_groups.py b/awx/main/tests/functional/task_management/test_container_groups.py
index c9028efacb..84dcaf12d7 100644
--- a/awx/main/tests/functional/task_management/test_container_groups.py
+++ b/awx/main/tests/functional/task_management/test_container_groups.py
@@ -29,7 +29,7 @@ def containerized_job(default_instance_group, kube_credential, job_template_fact
 
 @pytest.mark.django_db
 def test_containerized_job(containerized_job):
-    assert containerized_job.is_containerized
+    assert containerized_job.is_container_group_task
     assert containerized_job.instance_group.is_container_group
     assert containerized_job.instance_group.credential.kubernetes
 
diff --git a/awx/main/tests/unit/test_capacity.py b/awx/main/tests/unit/test_capacity.py
index 16fe81053c..1da05ec1f3 100644
--- a/awx/main/tests/unit/test_capacity.py
+++ b/awx/main/tests/unit/test_capacity.py
@@ -11,7 +11,7 @@ class FakeObject(object):
 
 class Job(FakeObject):
     task_impact = 43
-    is_containerized = False
+    is_container_group_task = False
 
     def log_format(self):
         return 'job 382 (fake)'