rename to slicing and schema tweaks

awx/api/serializers.py

@@ -3008,7 +3008,7 @@ class JobTemplateSerializer(JobTemplateMixin, UnifiedJobTemplateSerializer, JobO
         fields = ('*', 'host_config_key', 'ask_diff_mode_on_launch', 'ask_variables_on_launch', 'ask_limit_on_launch', 'ask_tags_on_launch',
                   'ask_skip_tags_on_launch', 'ask_job_type_on_launch', 'ask_verbosity_on_launch', 'ask_inventory_on_launch',
                   'ask_credential_on_launch', 'survey_enabled', 'become_enabled', 'diff_mode',
-                  'allow_simultaneous', 'custom_virtualenv', 'job_split_count')
+                  'allow_simultaneous', 'custom_virtualenv', 'job_slice_count')
 
     def get_related(self, obj):
         res = super(JobTemplateSerializer, self).get_related(obj)
@@ -3025,7 +3025,7 @@ class JobTemplateSerializer(JobTemplateMixin, UnifiedJobTemplateSerializer, JobO
             labels = self.reverse('api:job_template_label_list', kwargs={'pk': obj.pk}),
             object_roles = self.reverse('api:job_template_object_roles_list', kwargs={'pk': obj.pk}),
             instance_groups = self.reverse('api:job_template_instance_groups_list', kwargs={'pk': obj.pk}),
-            split_jobs = self.reverse('api:job_template_split_jobs_list', kwargs={'pk': obj.pk}),
+            slice_workflow_jobs = self.reverse('api:job_template_slice_workflow_jobs_list', kwargs={'pk': obj.pk}),
         ))
         if self.version > 1:
             res['copy'] = self.reverse('api:job_template_copy', kwargs={'pk': obj.pk})
@@ -3121,7 +3121,7 @@ class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):
                   'ask_variables_on_launch', 'ask_limit_on_launch', 'ask_tags_on_launch', 'ask_skip_tags_on_launch',
                   'ask_job_type_on_launch', 'ask_verbosity_on_launch', 'ask_inventory_on_launch',
                   'ask_credential_on_launch', 'allow_simultaneous', 'artifacts', 'scm_revision',
-                  'instance_group', 'diff_mode')
+                  'instance_group', 'diff_mode', 'job_slice_number', 'job_slice_count')
 
     def get_related(self, obj):
         res = super(JobSerializer, self).get_related(obj)
@@ -3199,13 +3199,6 @@ class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):
 
     def get_summary_fields(self, obj):
         summary_fields = super(JobSerializer, self).get_summary_fields(obj)
-        if obj.internal_limit:
-            summary_fields['internal_limit'] = {}
-            if obj.internal_limit.startswith('split'):
-                offset, step = Inventory.parse_split_params(obj.internal_limit)
-                summary_fields['internal_limit']['split'] = {'offset': offset, 'step': step}
-            else:
-                summary_fields['internal_limit']['unknown'] = self.internal_limit
         all_creds = []
         # Organize credential data into multitude of deprecated fields
         # TODO: remove most of this as v1 is removed

awx/api/templates/api/inventory_script_view.md

@@ -26,8 +26,8 @@ string of `?all=1` to return all hosts, including disabled ones.
 Specify a query string of `?towervars=1` to add variables
 to the hostvars of each host that specifies its enabled state and database ID.
 
-Specify a query string of `?subset=split2of5` to produce an inventory that
-has a restricted number of hosts according to the rules of job splitting.
+Specify a query string of `?subset=slice2of5` to produce an inventory that
+has a restricted number of hosts according to the rules of job slicing.
 
 To apply multiple query strings, join them with the `&` character, like `?hostvars=1&all=1`.
 

awx/api/urls/job_template.py

@@ -8,7 +8,7 @@ from awx.api.views import (
     JobTemplateDetail,
     JobTemplateLaunch,
     JobTemplateJobsList,
-    JobTemplateSplitJobsList,
+    JobTemplateSliceWorkflowJobsList,
     JobTemplateCallback,
     JobTemplateSchedulesList,
     JobTemplateSurveySpec,
@@ -29,7 +29,7 @@ urls = [
     url(r'^(?P<pk>[0-9]+)/$', JobTemplateDetail.as_view(), name='job_template_detail'),
     url(r'^(?P<pk>[0-9]+)/launch/$', JobTemplateLaunch.as_view(), name='job_template_launch'),
     url(r'^(?P<pk>[0-9]+)/jobs/$', JobTemplateJobsList.as_view(), name='job_template_jobs_list'),
-    url(r'^(?P<pk>[0-9]+)/split_jobs/$', JobTemplateSplitJobsList.as_view(), name='job_template_split_jobs_list'),
+    url(r'^(?P<pk>[0-9]+)/slice_workflow_jobs/$', JobTemplateSliceWorkflowJobsList.as_view(), name='job_template_slice_workflow_jobs_list'),
     url(r'^(?P<pk>[0-9]+)/callback/$', JobTemplateCallback.as_view(), name='job_template_callback'),
     url(r'^(?P<pk>[0-9]+)/schedules/$', JobTemplateSchedulesList.as_view(), name='job_template_schedules_list'),
     url(r'^(?P<pk>[0-9]+)/survey_spec/$', JobTemplateSurveySpec.as_view(), name='job_template_survey_spec'),

awx/api/views/__init__.py

@@ -2453,6 +2453,15 @@ class InventoryScriptView(RetrieveAPIView):
         towervars = bool(request.query_params.get('towervars', ''))
         show_all = bool(request.query_params.get('all', ''))
         subset = request.query_params.get('subset', '')
+        if subset:
+            if not isinstance(subset, six.string_types):
+                raise ParseError(_('Inventory subset argument must be a string.'))
+            if subset.startswith('slice'):
+                slice_number, slice_count = Inventory.parse_slice_params(subset)
+            else:
+                raise ParseError(_('Subset does not use any supported syntax.'))
+        else:
+            slice_number, slice_count = 1, 1
         if hostname:
             hosts_q = dict(name=hostname)
             if not show_all:
@@ -2463,7 +2472,7 @@ class InventoryScriptView(RetrieveAPIView):
             hostvars=hostvars,
             towervars=towervars,
             show_all=show_all,
-            subset=subset
+            slice_number=slice_number, slice_count=slice_count
         ))
 
 
@@ -3369,7 +3378,7 @@ class JobTemplateCallback(GenericAPIView):
         if extra_vars is not None and job_template.ask_variables_on_launch:
             extra_vars_redacted, removed = extract_ansible_vars(extra_vars)
             kv['extra_vars'] = extra_vars_redacted
-        kv['_prevent_splitting'] = True  # will only run against 1 host, so no point
+        kv['_prevent_slicing'] = True  # will only run against 1 host, so no point
         with transaction.atomic():
             job = job_template.create_job(**kv)
 
@@ -3401,12 +3410,12 @@ class JobTemplateJobsList(SubListCreateAPIView):
         return methods
 
 
-class JobTemplateSplitJobsList(SubListCreateAPIView):
+class JobTemplateSliceWorkflowJobsList(SubListCreateAPIView):
 
     model = WorkflowJob
     serializer_class = WorkflowJobListSerializer
     parent_model = JobTemplate
-    relationship = 'split_jobs'
+    relationship = 'slice_workflow_jobs'
     parent_key = 'job_template'
 
 
@@ -3702,6 +3711,8 @@ class WorkflowJobRelaunch(WorkflowsEnforcementMixin, GenericAPIView):
 
     def post(self, request, *args, **kwargs):
         obj = self.get_object()
+        if obj.is_sliced_job and not obj.job_template_id:
+            raise ParseError(_('Cannot relaunch slice workflow job orphaned from job template.'))
         new_workflow_job = obj.create_relaunch_workflow_job()
         new_workflow_job.signal_start()