Merge pull request #3667 from chrismeyersfsu/delete-system-tracking

remove system tracking

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

awx/api/serializers.py

@@ -6,7 +6,6 @@ import copy
 import json
 import logging
 import re
-import urllib.parse
 from collections import OrderedDict
 from datetime import timedelta
 
@@ -48,7 +47,7 @@ from awx.main.constants import (
 )
 from awx.main.models import (
     ActivityStream, AdHocCommand, AdHocCommandEvent, Credential, CredentialInputSource,
-    CredentialType, CustomInventoryScript, Fact, Group, Host, Instance,
+    CredentialType, CustomInventoryScript, Group, Host, Instance,
     InstanceGroup, Inventory, InventorySource, InventoryUpdate,
     InventoryUpdateEvent, Job, JobEvent, JobHostSummary, JobLaunchConfig,
     JobTemplate, Label, Notification, NotificationTemplate,
@@ -64,7 +63,7 @@ from awx.main.models.rbac import (
 )
 from awx.main.fields import ImplicitRoleField, JSONBField
 from awx.main.utils import (
-    get_type_for_model, get_model_for_type, timestamp_apiformat,
+    get_type_for_model, get_model_for_type,
     camelcase_to_underscore, getattrd, parse_yaml_or_json,
     has_model_field_prefetched, extract_ansible_vars, encrypt_dict,
     prefetch_page_capabilities, get_external_account)
@@ -643,18 +642,6 @@ class EmptySerializer(serializers.Serializer):
     pass
 
 
-class BaseFactSerializer(BaseSerializer, metaclass=BaseSerializerMetaclass):
-
-    def get_fields(self):
-        ret = super(BaseFactSerializer, self).get_fields()
-        if 'module' in ret:
-            # TODO: the values_list may pull in a LOT of entries before the distinct is called
-            modules = Fact.objects.all().values_list('module', flat=True).distinct()
-            choices = [(o, o.title()) for o in modules]
-            ret['module'] = serializers.ChoiceField(choices=choices, read_only=True, required=False)
-        return ret
-
-
 class UnifiedJobTemplateSerializer(BaseSerializer):
     # As a base serializer, the capabilities prefetch is not used directly
     _capabilities_prefetch = [
@@ -1665,7 +1652,6 @@ class HostSerializer(BaseSerializerWithVariables):
             smart_inventories = self.reverse('api:host_smart_inventories_list', kwargs={'pk': obj.pk}),
             ad_hoc_commands = self.reverse('api:host_ad_hoc_commands_list', kwargs={'pk': obj.pk}),
             ad_hoc_command_events = self.reverse('api:host_ad_hoc_command_events_list', kwargs={'pk': obj.pk}),
-            fact_versions = self.reverse('api:host_fact_versions_list', kwargs={'pk': obj.pk}),
         ))
         if self.version > 1:
             res['insights'] = self.reverse('api:host_insights', kwargs={'pk': obj.pk})
@@ -5136,44 +5122,3 @@ class ActivityStreamSerializer(BaseSerializer):
             summary_fields['setting'] = [obj.setting]
         return summary_fields
 
-
-class FactVersionSerializer(BaseFactSerializer):
-
-    class Meta:
-        model = Fact
-        fields = ('related', 'module', 'timestamp')
-        read_only_fields = ('*',)
-
-    def get_related(self, obj):
-        res = super(FactVersionSerializer, self).get_related(obj)
-        params = {
-            'datetime': timestamp_apiformat(obj.timestamp),
-            'module': obj.module,
-        }
-        res['fact_view'] = '%s?%s' % (
-            reverse('api:host_fact_compare_view', kwargs={'pk': obj.host.pk}, request=self.context.get('request')),
-            urllib.parse.urlencode(params)
-        )
-        return res
-
-
-class FactSerializer(BaseFactSerializer):
-
-    class Meta:
-        model = Fact
-        # TODO: Consider adding in host to the fields list ?
-        fields = ('related', 'timestamp', 'module', 'facts', 'id', 'summary_fields', 'host')
-        read_only_fields = ('*',)
-
-    def get_related(self, obj):
-        res = super(FactSerializer, self).get_related(obj)
-        res['host'] = obj.host.get_absolute_url(self.context.get('request'))
-        return res
-
-    def to_representation(self, obj):
-        ret = super(FactSerializer, self).to_representation(obj)
-        if obj is None:
-            return ret
-        if 'facts' in ret and isinstance(ret['facts'], str):
-            ret['facts'] = json.loads(ret['facts'])
-        return ret

awx/api/urls/host.py

@@ -16,8 +16,6 @@ from awx.api.views import (
     HostSmartInventoriesList,
     HostAdHocCommandsList,
     HostAdHocCommandEventsList,
-    HostFactVersionsList,
-    HostFactCompareView,
     HostInsights,
 )
 
@@ -35,8 +33,6 @@ urls = [
     url(r'^(?P<pk>[0-9]+)/smart_inventories/$', HostSmartInventoriesList.as_view(), name='host_smart_inventories_list'),
     url(r'^(?P<pk>[0-9]+)/ad_hoc_commands/$', HostAdHocCommandsList.as_view(), name='host_ad_hoc_commands_list'),
     url(r'^(?P<pk>[0-9]+)/ad_hoc_command_events/$', HostAdHocCommandEventsList.as_view(), name='host_ad_hoc_command_events_list'),
-    url(r'^(?P<pk>[0-9]+)/fact_versions/$', HostFactVersionsList.as_view(), name='host_fact_versions_list'),
-    url(r'^(?P<pk>[0-9]+)/fact_view/$', HostFactCompareView.as_view(), name='host_fact_compare_view'),
     url(r'^(?P<pk>[0-9]+)/insights/$', HostInsights.as_view(), name='host_insights'),
 ]
 

awx/api/views/__init__.py

@@ -65,7 +65,7 @@ from awx.main.access import get_user_queryset
 from awx.api.filters import V1CredentialFilterBackend
 from awx.api.generics import (
     APIView, BaseUsersList, CopyAPIView, DeleteLastUnattachLabelMixin,
-    GenericAPIView, ListAPIView, ListCreateAPIView, ParentMixin,
+    GenericAPIView, ListAPIView, ListCreateAPIView,
     ResourceAccessList, RetrieveAPIView, RetrieveDestroyAPIView,
     RetrieveUpdateAPIView, RetrieveUpdateDestroyAPIView, SimpleListAPIView,
     SubDetailAPIView, SubListAPIView, SubListAttachDetachAPIView,
@@ -1626,53 +1626,6 @@ class HostActivityStreamList(SubListAPIView):
         return qs.filter(Q(host=parent) | Q(inventory=parent.inventory))
 
 
-class HostFactVersionsList(ParentMixin, ListAPIView):
-
-    model = models.Fact
-    serializer_class = serializers.FactVersionSerializer
-    parent_model = models.Host
-    search_fields = ('facts',)
-    deprecated = True
-
-    def get_queryset(self):
-        from_spec = self.request.query_params.get('from', None)
-        to_spec = self.request.query_params.get('to', None)
-        module_spec = self.request.query_params.get('module', None)
-
-        if from_spec:
-            from_spec = dateutil.parser.parse(from_spec)
-        if to_spec:
-            to_spec = dateutil.parser.parse(to_spec)
-
-        host_obj = self.get_parent_object()
-
-        return models.Fact.get_timeline(host_obj.id, module=module_spec, ts_from=from_spec, ts_to=to_spec)
-
-    def list(self, *args, **kwargs):
-        queryset = self.get_queryset() or []
-        return Response(dict(results=self.serializer_class(queryset, many=True).data))
-
-
-class HostFactCompareView(SubDetailAPIView):
-
-    model = models.Fact
-    parent_model = models.Host
-    serializer_class = serializers.FactSerializer
-    deprecated = True
-
-    def retrieve(self, request, *args, **kwargs):
-        datetime_spec = request.query_params.get('datetime', None)
-        module_spec = request.query_params.get('module', "ansible")
-        datetime_actual = dateutil.parser.parse(datetime_spec) if datetime_spec is not None else now()
-
-        host_obj = self.get_parent_object()
-
-        fact_entry = models.Fact.get_host_fact(host_obj.id, module_spec, datetime_actual)
-        if not fact_entry:
-            return Response({'detail': _('Fact not found.')}, status=status.HTTP_404_NOT_FOUND)
-        return Response(self.serializer_class(instance=fact_entry).data)
-
-
 class HostInsights(GenericAPIView):
 
     model = models.Host