From aa0c16d72667712d16a6b5796ed36c82fd4ffffb Mon Sep 17 00:00:00 2001
From: Chris Church <chris@ninemoreminutes.com>
Date: Thu, 9 Apr 2015 18:55:42 -0400
Subject: [PATCH] Add choices for job and ad hoc command verbosity.

---
 awx/main/models/ad_hoc_commands.py |  1 +
 awx/main/models/base.py            | 12 +++++++++++-
 awx/main/models/jobs.py            |  1 +
 awx/main/tasks.py                  |  4 ++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/awx/main/models/ad_hoc_commands.py b/awx/main/models/ad_hoc_commands.py
index 07b9b89a7c..d3dce392d2 100644
--- a/awx/main/models/ad_hoc_commands.py
+++ b/awx/main/models/ad_hoc_commands.py
@@ -72,6 +72,7 @@ class AdHocCommand(UnifiedJob):
         default=0,
     )
     verbosity = models.PositiveIntegerField(
+        choices=VERBOSITY_CHOICES,
         blank=True,
         default=0,
     )
diff --git a/awx/main/models/base.py b/awx/main/models/base.py
index 891c5292cf..d523c599db 100644
--- a/awx/main/models/base.py
+++ b/awx/main/models/base.py
@@ -29,7 +29,8 @@ __all__ = ['VarsDictProperty', 'BaseModel', 'CreatedModifiedModel',
            'PERM_INVENTORY_ADMIN', 'PERM_INVENTORY_READ',
            'PERM_INVENTORY_WRITE', 'PERM_INVENTORY_DEPLOY', 'PERM_INVENTORY_SCAN',
            'PERM_INVENTORY_CHECK', 'PERM_JOBTEMPLATE_CREATE', 'JOB_TYPE_CHOICES',
-           'PERMISSION_TYPE_CHOICES', 'CLOUD_INVENTORY_SOURCES']
+           'PERMISSION_TYPE_CHOICES', 'CLOUD_INVENTORY_SOURCES',
+           'VERBOSITY_CHOICES']
 
 PERM_INVENTORY_ADMIN  = 'admin'
 PERM_INVENTORY_READ   = 'read'
@@ -57,6 +58,15 @@ PERMISSION_TYPE_CHOICES = [
 
 CLOUD_INVENTORY_SOURCES = ['ec2', 'rax', 'vmware', 'gce', 'azure', 'custom']
 
+VERBOSITY_CHOICES = [
+    (0, '0 (Normal)'),
+    (1, '1 (Verbose)'),
+    (2, '2 (More Verbose)'),
+    (3, '3 (Debug)'),
+    (4, '4 (Connection Debug)'),
+    (5, '5 (WinRM Debug)'),
+]
+
 
 class VarsDictProperty(object):
     '''
diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py
index 300709a34a..af73f2038c 100644
--- a/awx/main/models/jobs.py
+++ b/awx/main/models/jobs.py
@@ -87,6 +87,7 @@ class JobOptions(BaseModel):
         default='',
     )
     verbosity = models.PositiveIntegerField(
+        choices=VERBOSITY_CHOICES,
         blank=True,
         default=0,
     )
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 197bbb8a59..2f6f92b4fb 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -658,7 +658,7 @@ class RunJob(BaseTask):
         if job.limit:
             args.extend(['-l', job.limit])
         if job.verbosity:
-            args.append('-%s' % ('v' * min(3, job.verbosity)))
+            args.append('-%s' % ('v' * min(5, job.verbosity)))
         if job.job_tags:
             args.extend(['-t', job.job_tags])
         if job.skip_tags:
@@ -1269,7 +1269,7 @@ class RunAdHocCommand(BaseTask):
         if ad_hoc_command.forks:  # FIXME: Max limit?
             args.append('--forks=%d' % ad_hoc_command.forks)
         if ad_hoc_command.verbosity:
-            args.append('-%s' % ('v' * min(3, ad_hoc_command.verbosity)))
+            args.append('-%s' % ('v' * min(5, ad_hoc_command.verbosity)))
 
         args.extend(['-m', ad_hoc_command.module_name])
         args.extend(['-a', ad_hoc_command.module_args])