From 768a3f62f13dd077e220c1406be77c6c8196b9d6 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Mon, 13 Nov 2017 15:27:12 -0500 Subject: [PATCH] Fix mgmt cmds, use real types not strings --- .../commands/cleanup_activitystream.py | 2 +- awx/main/management/commands/cleanup_jobs.py | 2 +- awx/main/management/commands/inventory_import.py | 16 ++++++++-------- .../management/commands/replay_job_events.py | 4 ++-- awx/main/management/commands/stats.py | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/awx/main/management/commands/cleanup_activitystream.py b/awx/main/management/commands/cleanup_activitystream.py index 7cb9fdbf2a..622d7ade3f 100644 --- a/awx/main/management/commands/cleanup_activitystream.py +++ b/awx/main/management/commands/cleanup_activitystream.py @@ -21,7 +21,7 @@ class Command(BaseCommand): help = 'Remove old activity stream events from the database' def add_arguments(self, parser): - parser.add_argument('--days', dest='days', type='int', default=90, metavar='N', + parser.add_argument('--days', dest='days', type=int, default=90, metavar='N', help='Remove activity stream events more than N days old') parser.add_argument('--dry-run', dest='dry_run', action='store_true', default=False, help='Dry run mode (show items that would ' diff --git a/awx/main/management/commands/cleanup_jobs.py b/awx/main/management/commands/cleanup_jobs.py index e969b70e5d..60665fd7f2 100644 --- a/awx/main/management/commands/cleanup_jobs.py +++ b/awx/main/management/commands/cleanup_jobs.py @@ -32,7 +32,7 @@ class Command(BaseCommand): help = 'Remove old jobs, project and inventory updates from the database.' def add_arguments(self, parser): - parser.add_argument('--days', dest='days', type='int', default=90, metavar='N', + parser.add_argument('--days', dest='days', type=int, default=90, metavar='N', help='Remove jobs/updates executed more than N days ago. Defaults to 90.') parser.add_argument('--dry-run', dest='dry_run', action='store_true', default=False, help='Dry run mode (show items that would ' diff --git a/awx/main/management/commands/inventory_import.py b/awx/main/management/commands/inventory_import.py index 5cdabbc4ab..08440d1b52 100644 --- a/awx/main/management/commands/inventory_import.py +++ b/awx/main/management/commands/inventory_import.py @@ -260,9 +260,9 @@ class Command(BaseCommand): def add_arguments(self, parser): parser.add_argument('--inventory-name', dest='inventory_name', - type='str', default=None, metavar='n', + type=str, default=None, metavar='n', help='name of inventory to sync') - parser.add_argument('--inventory-id', dest='inventory_id', type='int', + parser.add_argument('--inventory-id', dest='inventory_id', type=int, default=None, metavar='i', help='id of inventory to sync') parser.add_argument('--overwrite', dest='overwrite', action='store_true', @@ -277,27 +277,27 @@ class Command(BaseCommand): parser.add_argument('--custom', dest='custom', action='store_true', metavar="c", default=False, help='this is a custom inventory script') - parser.add_argument('--source', dest='source', type='str', default=None, + parser.add_argument('--source', dest='source', type=str, default=None, metavar='s', help='inventory directory, file, or script to load') - parser.add_argument('--enabled-var', dest='enabled_var', type='str', + parser.add_argument('--enabled-var', dest='enabled_var', type=str, default=None, metavar='v', help='host variable used to ' 'set/clear enabled flag when host is online/offline, may ' 'be specified as "foo.bar" to traverse nested dicts.') - parser.add_argument('--enabled-value', dest='enabled_value', type='str', + parser.add_argument('--enabled-value', dest='enabled_value', type=str, default=None, metavar='v', help='value of host variable ' 'specified by --enabled-var that indicates host is ' 'enabled/online.') - parser.add_argument('--group-filter', dest='group_filter', type='str', + parser.add_argument('--group-filter', dest='group_filter', type=str, default=None, metavar='regex', help='regular expression ' 'to filter group name(s); only matches are imported.') - parser.add_argument('--host-filter', dest='host_filter', type='str', + parser.add_argument('--host-filter', dest='host_filter', type=str, default=None, metavar='regex', help='regular expression ' 'to filter host name(s); only matches are imported.') parser.add_argument('--exclude-empty-groups', dest='exclude_empty_groups', action='store_true', default=False, help='when set, ' 'exclude all groups that have no child groups, hosts, or ' 'variables.') - parser.add_argument('--instance-id-var', dest='instance_id_var', type='str', + parser.add_argument('--instance-id-var', dest='instance_id_var', type=str, default=None, metavar='v', help='host variable that ' 'specifies the unique, immutable instance ID, may be ' 'specified as "foo.bar" to traverse nested dicts.') diff --git a/awx/main/management/commands/replay_job_events.py b/awx/main/management/commands/replay_job_events.py index 879bf6ca82..83b3f1741c 100644 --- a/awx/main/management/commands/replay_job_events.py +++ b/awx/main/management/commands/replay_job_events.py @@ -166,9 +166,9 @@ class Command(BaseCommand): help = 'Replay job events over websockets ordered by created on date.' def add_arguments(self, parser): - parser.add_argument('--job_id', dest='job_id', type='int', metavar='j', + parser.add_argument('--job_id', dest='job_id', type=int, metavar='j', help='Id of the job to replay (job or adhoc)') - parser.add_argument('--speed', dest='speed', type='int', metavar='s', + parser.add_argument('--speed', dest='speed', type=int, metavar='s', help='Speedup factor.') def handle(self, *args, **options): diff --git a/awx/main/management/commands/stats.py b/awx/main/management/commands/stats.py index 6621935278..b588acb558 100644 --- a/awx/main/management/commands/stats.py +++ b/awx/main/management/commands/stats.py @@ -19,7 +19,7 @@ class Command(BaseCommand): parser.add_argument('--stat', action='store', dest='stat', - type="string", + type=str, default="jobs_running", help='Select which stat to get information for')