From 9be1c913c508c9c81a93b879e08263e450690680 Mon Sep 17 00:00:00 2001 From: Kevan Holdaway <32331547+kholdaway@users.noreply.github.com> Date: Wed, 14 Feb 2018 12:19:28 -0500 Subject: [PATCH] Rename ConnectionResult(s) and InspectionResult(s) (#736) --- quipucords/api/admin.py | 13 +++++++--- quipucords/api/connresults/model.py | 6 ++--- quipucords/api/connresults/serializer.py | 14 +++++----- quipucords/api/inspectresults/model.py | 6 ++--- quipucords/api/inspectresults/serializer.py | 14 +++++----- quipucords/api/models.py | 4 +-- quipucords/api/scanjob/model.py | 12 ++++----- quipucords/api/scanjob/tests_scanjob.py | 26 +++++++++---------- quipucords/api/scanjob/view.py | 8 +++--- quipucords/api/serializers.py | 8 +++--- quipucords/scanner/network/connect.py | 6 ++--- .../scanner/network/inspect_callback.py | 4 +-- .../scanner/network/tests_network_connect.py | 4 +-- .../scanner/network/tests_network_inspect.py | 12 ++++----- quipucords/scanner/satellite/connect.py | 4 +-- quipucords/scanner/satellite/inspect.py | 4 +-- .../scanner/satellite/tests_sat_connect.py | 4 +-- .../scanner/satellite/tests_sat_factory.py | 6 ++--- .../scanner/satellite/tests_sat_inspect.py | 10 +++---- quipucords/scanner/satellite/tests_sat_six.py | 20 +++++++------- .../scanner/satellite/tests_sat_utils.py | 4 +-- quipucords/scanner/task.py | 10 +++---- quipucords/scanner/vcenter/connect.py | 6 ++--- quipucords/scanner/vcenter/inspect.py | 4 +-- .../scanner/vcenter/tests_vc_connect.py | 8 +++--- .../scanner/vcenter/tests_vc_inspect.py | 14 +++++----- quipucords/scanner/vcenter/tests_vc_utils.py | 4 +-- 27 files changed, 120 insertions(+), 115 deletions(-) diff --git a/quipucords/api/admin.py b/quipucords/api/admin.py index d68833d97..72ce236dc 100644 --- a/quipucords/api/admin.py +++ b/quipucords/api/admin.py @@ -11,13 +11,18 @@ """Admin module for Django server application.""" from django.contrib import admin -from api.models import (FactCollection, SystemFingerprint, Credential, - Source, ScanJob, ConnectionResults, InspectionResults) +from api.models import (FactCollection, + SystemFingerprint, + Credential, + Source, + ScanJob, + JobConnectionResult, + JobInspectionResult) admin.site.register(FactCollection) admin.site.register(Credential) admin.site.register(Source) admin.site.register(SystemFingerprint) admin.site.register(ScanJob) -admin.site.register(ConnectionResults) -admin.site.register(InspectionResults) +admin.site.register(JobConnectionResult) +admin.site.register(JobInspectionResult) diff --git a/quipucords/api/connresults/model.py b/quipucords/api/connresults/model.py index 1d36ea040..ac5dd872c 100644 --- a/quipucords/api/connresults/model.py +++ b/quipucords/api/connresults/model.py @@ -47,7 +47,7 @@ class Meta: verbose_name_plural = _(messages.PLURAL_KEY_VALUES_MSG) -class ConnectionResult(models.Model): +class TaskConnectionResult(models.Model): """The captured connection results from a scan.""" source = models.ForeignKey(Source, on_delete=models.CASCADE) @@ -71,10 +71,10 @@ class Meta: verbose_name_plural = _(messages.PLURAL_RESULTS_MSG) -class ConnectionResults(models.Model): +class JobConnectionResult(models.Model): """The results of a connection scan.""" - results = models.ManyToManyField(ConnectionResult) + results = models.ManyToManyField(TaskConnectionResult) def __str__(self): """Convert to string.""" diff --git a/quipucords/api/connresults/serializer.py b/quipucords/api/connresults/serializer.py index ccdb3a548..3b03e73bf 100644 --- a/quipucords/api/connresults/serializer.py +++ b/quipucords/api/connresults/serializer.py @@ -11,7 +11,7 @@ """Module for serializing all model object for database storage.""" from rest_framework.serializers import CharField, ChoiceField -from api.models import (ConnectionResults, ConnectionResult, +from api.models import (JobConnectionResult, TaskConnectionResult, SystemConnectionResult) from api.common.serializer import NotEmptySerializer @@ -31,23 +31,23 @@ class Meta: qpc_allow_empty_fields = ['value'] -class ConnectionResultSerializer(NotEmptySerializer): - """Serializer for the ConnectionResult model.""" +class TaskConnectionResultSerializer(NotEmptySerializer): + """Serializer for the TaskConnectionResult model.""" class Meta: """Metadata for serialzer.""" - model = ConnectionResult + model = TaskConnectionResult fields = ['source', 'systems'] qpc_allow_empty_fields = ['source', 'systems'] -class ConnectionResultsSerializer(NotEmptySerializer): - """Serializer for the ConnectionResults model.""" +class JobConnectionResultSerializer(NotEmptySerializer): + """Serializer for the JobConnectionResult model.""" class Meta: """Metadata for serialzer.""" - model = ConnectionResults + model = JobConnectionResult fields = ['results'] qpc_allow_empty_fields = ['results'] diff --git a/quipucords/api/inspectresults/model.py b/quipucords/api/inspectresults/model.py index c85bb2394..9b0b8908f 100644 --- a/quipucords/api/inspectresults/model.py +++ b/quipucords/api/inspectresults/model.py @@ -61,7 +61,7 @@ class Meta: verbose_name_plural = _(messages.PLURAL_KEY_VALUES_MSG) -class InspectionResult(models.Model): +class TaskInspectionResult(models.Model): """The captured connection results from a scan.""" source = models.ForeignKey(Source, on_delete=models.CASCADE) @@ -85,10 +85,10 @@ class Meta: verbose_name_plural = _(messages.PLURAL_RESULTS_MSG) -class InspectionResults(models.Model): +class JobInspectionResult(models.Model): """The results of a connection scan.""" - results = models.ManyToManyField(InspectionResult) + results = models.ManyToManyField(TaskInspectionResult) def __str__(self): """Convert to string.""" diff --git a/quipucords/api/inspectresults/serializer.py b/quipucords/api/inspectresults/serializer.py index 9f62825f4..485093168 100644 --- a/quipucords/api/inspectresults/serializer.py +++ b/quipucords/api/inspectresults/serializer.py @@ -11,7 +11,7 @@ """Module for serializing all model object for database storage.""" from rest_framework.serializers import CharField, ChoiceField -from api.models import (InspectionResults, InspectionResult, +from api.models import (JobInspectionResult, TaskInspectionResult, SystemInspectionResult, RawFact) from api.common.serializer import (NotEmptySerializer, CustomJSONField) @@ -46,23 +46,23 @@ class Meta: qpc_allow_empty_fields = ['facts'] -class InspectionResultSerializer(NotEmptySerializer): - """Serializer for the InspectionResult model.""" +class TaskInspectionResultSerializer(NotEmptySerializer): + """Serializer for the TaskInspectionResult model.""" class Meta: """Metadata for serialzer.""" - model = InspectionResult + model = TaskInspectionResult fields = ['source', 'systems'] qpc_allow_empty_fields = ['source', 'systems'] -class InspectionResultsSerializer(NotEmptySerializer): - """Serializer for the InspectionResults model.""" +class JobInspectionResultSerializer(NotEmptySerializer): + """Serializer for the JobInspectionResult model.""" class Meta: """Metadata for serialzer.""" - model = InspectionResults + model = JobInspectionResult fields = ['results'] qpc_allow_empty_fields = ['results'] diff --git a/quipucords/api/models.py b/quipucords/api/models.py index 2197c86d9..d7aae60fa 100644 --- a/quipucords/api/models.py +++ b/quipucords/api/models.py @@ -17,8 +17,8 @@ from api.credential.model import Credential from api.source.model import Source, SourceOptions from api.scanjob.model import ScanJob, ScanOptions -from api.connresults.model import (ConnectionResults, ConnectionResult, +from api.connresults.model import (JobConnectionResult, TaskConnectionResult, SystemConnectionResult) -from api.inspectresults.model import (InspectionResults, InspectionResult, +from api.inspectresults.model import (JobInspectionResult, TaskInspectionResult, SystemInspectionResult, RawFact) from api.scantasks.model import ScanTask diff --git a/quipucords/api/scanjob/model.py b/quipucords/api/scanjob/model.py index b498e48f2..edba17560 100644 --- a/quipucords/api/scanjob/model.py +++ b/quipucords/api/scanjob/model.py @@ -20,8 +20,8 @@ from django.db.models import Q from api.source.model import Source from api.scantasks.model import ScanTask -from api.connresults.model import ConnectionResults -from api.inspectresults.model import InspectionResults +from api.connresults.model import JobConnectionResult +from api.inspectresults.model import JobInspectionResult import api.messages as messages # Get an instance of a logger @@ -74,9 +74,9 @@ class ScanJob(models.Model): start_time = models.DateTimeField(null=True) end_time = models.DateTimeField(null=True) connection_results = models.ForeignKey( - ConnectionResults, null=True, on_delete=models.CASCADE) + JobConnectionResult, null=True, on_delete=models.CASCADE) inspection_results = models.ForeignKey( - InspectionResults, null=True, on_delete=models.CASCADE) + JobInspectionResult, null=True, on_delete=models.CASCADE) def __str__(self): """Convert to string.""" @@ -154,13 +154,13 @@ def queue(self): return if self.connection_results is None: - temp_conn_results = ConnectionResults() + temp_conn_results = JobConnectionResult() temp_conn_results.save() self.connection_results = temp_conn_results self.save() if self.inspection_results is None and \ self.scan_type == ScanTask.SCAN_TYPE_INSPECT: - temp_inspect_results = InspectionResults() + temp_inspect_results = JobInspectionResult() temp_inspect_results.save() self.inspection_results = temp_inspect_results self.save() diff --git a/quipucords/api/scanjob/tests_scanjob.py b/quipucords/api/scanjob/tests_scanjob.py index f035e7a8d..80cb71f1d 100644 --- a/quipucords/api/scanjob/tests_scanjob.py +++ b/quipucords/api/scanjob/tests_scanjob.py @@ -22,11 +22,11 @@ ScanTask, ScanOptions, ScanJob, - ConnectionResults, - ConnectionResult, + JobConnectionResult, + TaskConnectionResult, SystemConnectionResult, - InspectionResults, - InspectionResult, + JobInspectionResult, + TaskInspectionResult, SystemInspectionResult, RawFact) from api.scanjob.view import (expand_scanjob, @@ -457,11 +457,11 @@ def test_details(self, start_scan): conn_task = scan_job.tasks.first() - conn_results = ConnectionResults() + conn_results = JobConnectionResult() conn_results.save() scan_job.connection_results = conn_results - conn_result = ConnectionResult( + conn_result = TaskConnectionResult( source=conn_task.source, scan_task=conn_task) conn_result.save() @@ -478,11 +478,11 @@ def test_details(self, start_scan): inspect_task = scan_job.tasks.all()[1] - inspect_results = InspectionResults() + inspect_results = JobInspectionResult() inspect_results.save() scan_job.inspection_results = inspect_results - inspect_result = InspectionResult( + inspect_result = TaskInspectionResult( source=inspect_task.source, scan_task=inspect_task) inspect_result.save() @@ -727,7 +727,7 @@ def test_expand_sys_conn_result(self): conn_task = scan_job.tasks.first() - conn_result = ConnectionResult( + conn_result = TaskConnectionResult( source=conn_task.source, scan_task=conn_task) conn_result.save() @@ -758,12 +758,12 @@ def test_expand_conn_results(self): conn_task = scan_job.tasks.first() - conn_results = ConnectionResults() + conn_results = JobConnectionResult() conn_results.save() scan_job.connection_results = conn_results scan_job.save() - conn_result = ConnectionResult( + conn_result = TaskConnectionResult( source=conn_task.source, scan_task=conn_task) conn_result.save() @@ -799,13 +799,13 @@ def test_expand_inspect_results(self): inspect_task = scan_job.tasks.all()[1] - inspect_results = InspectionResults() + inspect_results = JobInspectionResult() inspect_results.save() scan_job.inspection_results = inspect_results scan_job.save() - inspect_result = InspectionResult( + inspect_result = TaskInspectionResult( source=inspect_task.source, scan_task=inspect_task) inspect_result.save() diff --git a/quipucords/api/scanjob/view.py b/quipucords/api/scanjob/view.py index ba96feb0f..ebfa4af04 100644 --- a/quipucords/api/scanjob/view.py +++ b/quipucords/api/scanjob/view.py @@ -28,9 +28,9 @@ from api.models import (ScanTask, ScanJob, Source) from api.serializers import (ScanJobSerializer, SourceSerializer, - ConnectionResultsSerializer, + JobConnectionResultSerializer, SystemConnectionResultSerializer, - InspectionResultsSerializer, + JobInspectionResultSerializer, SystemInspectionResultSerializer, RawFactSerializer) from api.signals.scanjob_signal import (start_scan, pause_scan, @@ -258,14 +258,14 @@ def results(self, request, pk=None): job_conn_result = scan_job.connection_results job_scan_result = scan_job.inspection_results if job_conn_result: - serializer = ConnectionResultsSerializer(job_conn_result) + serializer = JobConnectionResultSerializer(job_conn_result) json_job_conn_result = serializer.data expand_conn_results(job_conn_result, json_job_conn_result) if result is None: result = {} result['connection_results'] = json_job_conn_result if job_scan_result: - serializer = InspectionResultsSerializer(job_scan_result) + serializer = JobInspectionResultSerializer(job_scan_result) json_job_scan_result = serializer.data expand_inspect_results(job_scan_result, json_job_scan_result) if result is None: diff --git a/quipucords/api/serializers.py b/quipucords/api/serializers.py index 6b1b14c25..32ed63f0d 100644 --- a/quipucords/api/serializers.py +++ b/quipucords/api/serializers.py @@ -19,10 +19,10 @@ SourceSerializer) from api.scanjob.serializer import SourceField, ScanJobSerializer from api.scantasks.serializer import ScanTaskSerializer -from api.connresults.serializer import (ConnectionResultsSerializer, - ConnectionResultSerializer, +from api.connresults.serializer import (JobConnectionResultSerializer, + TaskConnectionResultSerializer, SystemConnectionResultSerializer) -from api.inspectresults.serializer import(InspectionResultsSerializer, - InspectionResultSerializer, +from api.inspectresults.serializer import(JobInspectionResultSerializer, + TaskInspectionResultSerializer, SystemInspectionResultSerializer, RawFactSerializer) diff --git a/quipucords/scanner/network/connect.py b/quipucords/scanner/network/connect.py index fae75e3e0..638586402 100644 --- a/quipucords/scanner/network/connect.py +++ b/quipucords/scanner/network/connect.py @@ -16,7 +16,7 @@ from ansible.parsing.splitter import parse_kv from api.serializers import SourceSerializer, CredentialSerializer from api.models import (Credential, ScanTask, - ConnectionResult, + TaskConnectionResult, SystemConnectionResult) from django.db import transaction from scanner.task import ScanTaskRunner @@ -39,7 +39,7 @@ class ConnectResultStore(object): """This object knows how to record and retrieve connection results.""" def __init__(self, scan_task, conn_results): - """Get the unique ConnectionResult object for this scan.""" + """Get the unique TaskConnectionResult object for this scan.""" self.scan_task = scan_task self.conn_results = conn_results @@ -49,7 +49,7 @@ def __init__(self, scan_task, conn_results): conn_result = conn_results.results.filter( source__id=source.id).first() if conn_result is None: - conn_result = ConnectionResult( + conn_result = TaskConnectionResult( scan_task=scan_task, source=source) conn_result.save() conn_results.results.add(conn_result) diff --git a/quipucords/scanner/network/inspect_callback.py b/quipucords/scanner/network/inspect_callback.py index cd2d17674..06fe26b2f 100644 --- a/quipucords/scanner/network/inspect_callback.py +++ b/quipucords/scanner/network/inspect_callback.py @@ -14,7 +14,7 @@ import json from django.db import transaction from ansible.plugins.callback import CallbackBase -from api.models import (InspectionResult, +from api.models import (TaskInspectionResult, SystemInspectionResult, RawFact) from scanner.network.processing import process @@ -148,7 +148,7 @@ def _get_inspect_result(self): inspect_result = self.inspect_results.results.filter( source__id=self.source.id).first() if inspect_result is None: - inspect_result = InspectionResult( + inspect_result = TaskInspectionResult( scan_task=self.scan_task, source=self.source) inspect_result.save() diff --git a/quipucords/scanner/network/tests_network_connect.py b/quipucords/scanner/network/tests_network_connect.py index 16215159b..501c51baa 100644 --- a/quipucords/scanner/network/tests_network_connect.py +++ b/quipucords/scanner/network/tests_network_connect.py @@ -18,7 +18,7 @@ from api.connresults.model import SystemConnectionResult from api.models import (Credential, Source, - ConnectionResults, + JobConnectionResult, ScanJob, ScanOptions, ScanTask) @@ -141,7 +141,7 @@ def setUp(self): self.scan_job.options = scan_options self.scan_job.save() - self.conn_results = ConnectionResults() + self.conn_results = JobConnectionResult() self.conn_results.save() self.scan_job.connection_results = self.conn_results self.scan_job.save() diff --git a/quipucords/scanner/network/tests_network_inspect.py b/quipucords/scanner/network/tests_network_inspect.py index 9c9d6b3d4..4b29ae845 100644 --- a/quipucords/scanner/network/tests_network_inspect.py +++ b/quipucords/scanner/network/tests_network_inspect.py @@ -24,10 +24,10 @@ ScanJob, ScanTask, ScanOptions, - ConnectionResults, - ConnectionResult, + JobConnectionResult, + TaskConnectionResult, SystemConnectionResult, - InspectionResults) + JobInspectionResult) from api.serializers import CredentialSerializer, SourceSerializer from scanner.network.inspect import (_construct_scan_inventory) from scanner.network import InspectTaskRunner @@ -183,11 +183,11 @@ def setUp(self): self.fact_endpoint = 'http://testserver' + reverse('facts-list') - self.conn_results = ConnectionResults() + self.conn_results = JobConnectionResult() self.conn_results.save() self.scan_job.connection_results = self.conn_results - self.conn_result = ConnectionResult( + self.conn_result = TaskConnectionResult( scan_task=self.connect_scan_task, source=self.source) self.conn_result.save() @@ -205,7 +205,7 @@ def setUp(self): self.conn_results.save() self.scan_job.connection_results = self.conn_results - self.inspect_results = InspectionResults() + self.inspect_results = JobInspectionResult() self.inspect_results.save() self.scan_job.inspection_results = self.inspect_results diff --git a/quipucords/scanner/satellite/connect.py b/quipucords/scanner/satellite/connect.py index c6f0e63c2..f470c40a5 100644 --- a/quipucords/scanner/satellite/connect.py +++ b/quipucords/scanner/satellite/connect.py @@ -11,7 +11,7 @@ """ScanTask used for satellite connection task.""" from requests import exceptions from django.db import transaction -from api.models import (ScanTask, ConnectionResult, SourceOptions) +from api.models import (ScanTask, TaskConnectionResult, SourceOptions) from scanner.task import ScanTaskRunner from scanner.satellite import utils from scanner.satellite.api import SatelliteException @@ -40,7 +40,7 @@ def __init__(self, scan_job, scan_task): conn_result = conn_results.results.filter( source__id=self.source.id).first() if conn_result is None: - conn_result = ConnectionResult( + conn_result = TaskConnectionResult( scan_task=scan_task, source=self.source) conn_result.save() conn_results.results.add(conn_result) diff --git a/quipucords/scanner/satellite/inspect.py b/quipucords/scanner/satellite/inspect.py index 58541adee..296402ca0 100644 --- a/quipucords/scanner/satellite/inspect.py +++ b/quipucords/scanner/satellite/inspect.py @@ -11,7 +11,7 @@ """ScanTask used for satellite inspection task.""" from requests import exceptions from api.models import (ScanTask, SourceOptions, - InspectionResult) + TaskInspectionResult) from scanner.task import ScanTaskRunner from scanner.satellite import utils from scanner.satellite.api import SatelliteException @@ -71,7 +71,7 @@ def run(self): filter(source__id=self.source.id).first() if inspect_result is None: - inspect_result = InspectionResult( + inspect_result = TaskInspectionResult( source=self.scan_task.source, scan_task=self.scan_task) inspect_result.save() diff --git a/quipucords/scanner/satellite/tests_sat_connect.py b/quipucords/scanner/satellite/tests_sat_connect.py index 65cd1e8cc..97a0abf1b 100644 --- a/quipucords/scanner/satellite/tests_sat_connect.py +++ b/quipucords/scanner/satellite/tests_sat_connect.py @@ -14,7 +14,7 @@ from django.test import TestCase from requests import exceptions from api.models import (Credential, Source, ScanTask, - ScanJob, ConnectionResults, SourceOptions) + ScanJob, JobConnectionResult, SourceOptions) from scanner.satellite.connect import ConnectTaskRunner from scanner.satellite.six import SatelliteSixV2 from scanner.satellite.api import SatelliteException @@ -60,7 +60,7 @@ def setUp(self): self.scan_job = ScanJob(scan_type=ScanTask.SCAN_TYPE_CONNECT) self.scan_job.save() self.scan_job.tasks.add(self.scan_task) - self.conn_results = ConnectionResults() + self.conn_results = JobConnectionResult() self.conn_results.save() self.scan_job.connection_results = self.conn_results self.scan_job.save() diff --git a/quipucords/scanner/satellite/tests_sat_factory.py b/quipucords/scanner/satellite/tests_sat_factory.py index 252f19cfc..ffd733221 100644 --- a/quipucords/scanner/satellite/tests_sat_factory.py +++ b/quipucords/scanner/satellite/tests_sat_factory.py @@ -12,7 +12,7 @@ from django.test import TestCase from api.models import (Credential, Source, ScanTask, - ScanJob, ConnectionResults, ConnectionResult, + ScanJob, JobConnectionResult, TaskConnectionResult, SourceOptions) from scanner.satellite.factory import create from scanner.satellite.six import SatelliteSixV1, SatelliteSixV2 @@ -48,11 +48,11 @@ def setUp(self): self.scan_job = ScanJob(scan_type=ScanTask.SCAN_TYPE_CONNECT) self.scan_job.save() self.scan_job.tasks.add(self.scan_task) - self.conn_results = ConnectionResults() + self.conn_results = JobConnectionResult() self.conn_results.save() self.scan_job.connection_results = self.conn_results self.scan_job.save() - self.conn_result = ConnectionResult( + self.conn_result = TaskConnectionResult( scan_task=self.scan_task, source=self.source) self.conn_result.save() diff --git a/quipucords/scanner/satellite/tests_sat_inspect.py b/quipucords/scanner/satellite/tests_sat_inspect.py index f81a8dd16..ece732970 100644 --- a/quipucords/scanner/satellite/tests_sat_inspect.py +++ b/quipucords/scanner/satellite/tests_sat_inspect.py @@ -15,8 +15,8 @@ from django.test import TestCase from requests import exceptions from api.models import (Credential, Source, ScanTask, - ScanJob, ConnectionResults, ConnectionResult, - InspectionResults, SourceOptions) + ScanJob, JobConnectionResult, TaskConnectionResult, + JobInspectionResult, SourceOptions) from scanner.satellite.inspect import InspectTaskRunner from scanner.satellite.six import SatelliteSixV2 from scanner.satellite.api import SatelliteException @@ -67,11 +67,11 @@ def setUp(self): self.scan_job = ScanJob(scan_type=ScanTask.SCAN_TYPE_CONNECT) self.scan_job.save() self.scan_job.tasks.add(self.scan_task) - self.conn_results = ConnectionResults() + self.conn_results = JobConnectionResult() self.conn_results.save() self.scan_job.connection_results = self.conn_results - self.conn_result = ConnectionResult( + self.conn_result = TaskConnectionResult( scan_task=self.scan_task, source=self.source) self.conn_result.save() @@ -80,7 +80,7 @@ def setUp(self): start_time=datetime.utcnow()) conn_task.complete() self.scan_task.prerequisites.add(conn_task) - self.inspect_results = InspectionResults() + self.inspect_results = JobInspectionResult() self.inspect_results.save() self.scan_job.inspection_results = self.inspect_results diff --git a/quipucords/scanner/satellite/tests_sat_six.py b/quipucords/scanner/satellite/tests_sat_six.py index b3b8666fb..4ee527a3b 100644 --- a/quipucords/scanner/satellite/tests_sat_six.py +++ b/quipucords/scanner/satellite/tests_sat_six.py @@ -15,8 +15,8 @@ import requests_mock from django.test import TestCase from api.models import (Credential, Source, ScanTask, - ScanJob, ConnectionResults, ConnectionResult, - InspectionResult, SystemInspectionResult) + ScanJob, JobConnectionResult, TaskConnectionResult, + TaskInspectionResult, SystemInspectionResult) from scanner.satellite.utils import construct_url from scanner.satellite.api import SatelliteException from scanner.satellite.six import (SatelliteSixV1, SatelliteSixV2, @@ -56,16 +56,16 @@ def setUp(self): self.scan_job = ScanJob(scan_type=ScanTask.SCAN_TYPE_CONNECT) self.scan_job.save() self.scan_job.tasks.add(self.scan_task) - self.conn_results = ConnectionResults() + self.conn_results = JobConnectionResult() self.conn_results.save() self.scan_job.connection_results = self.conn_results self.scan_job.save() - self.conn_result = ConnectionResult( + self.conn_result = TaskConnectionResult( scan_task=self.scan_task, source=self.source) self.conn_result.save() - self.inspect_result = InspectionResult(scan_task=self.scan_task, - source=self.source) + self.inspect_result = TaskInspectionResult(scan_task=self.scan_task, + source=self.source) self.inspect_result.save() self.api = SatelliteSixV1(self.scan_task, self.conn_result, @@ -408,15 +408,15 @@ def setUp(self): self.scan_job = ScanJob(scan_type=ScanTask.SCAN_TYPE_CONNECT) self.scan_job.save() self.scan_job.tasks.add(self.scan_task) - self.conn_results = ConnectionResults() + self.conn_results = JobConnectionResult() self.conn_results.save() self.scan_job.connection_results = self.conn_results self.scan_job.save() - self.conn_result = ConnectionResult( + self.conn_result = TaskConnectionResult( scan_task=self.scan_task, source=self.source) self.conn_result.save() - self.inspect_result = InspectionResult(scan_task=self.scan_task, - source=self.source) + self.inspect_result = TaskInspectionResult(scan_task=self.scan_task, + source=self.source) self.inspect_result.save() self.api = SatelliteSixV2(self.scan_task, self.conn_result, diff --git a/quipucords/scanner/satellite/tests_sat_utils.py b/quipucords/scanner/satellite/tests_sat_utils.py index c2cbf79e8..05e7f3c29 100644 --- a/quipucords/scanner/satellite/tests_sat_utils.py +++ b/quipucords/scanner/satellite/tests_sat_utils.py @@ -13,7 +13,7 @@ import requests_mock from django.test import TestCase from api.models import (Credential, Source, ScanTask, - ScanJob, ConnectionResults) + ScanJob, JobConnectionResult) from scanner.satellite.utils import (get_credential, get_connect_data, construct_url, execute_request, status, data_map) @@ -49,7 +49,7 @@ def setUp(self): self.scan_job = ScanJob(scan_type=ScanTask.SCAN_TYPE_CONNECT) self.scan_job.save() self.scan_job.tasks.add(self.scan_task) - self.conn_results = ConnectionResults() + self.conn_results = JobConnectionResult() self.conn_results.save() self.scan_job.connection_results = self.conn_results self.scan_job.save() diff --git a/quipucords/scanner/task.py b/quipucords/scanner/task.py index 294f3fea1..a54acdd5e 100644 --- a/quipucords/scanner/task.py +++ b/quipucords/scanner/task.py @@ -11,7 +11,7 @@ """ScanTaskRunner is a logical breakdown of work.""" import json -from api.models import ScanTask, ConnectionResult, InspectionResult +from api.models import ScanTask, TaskConnectionResult, TaskInspectionResult class ScanTaskRunner(object): @@ -73,15 +73,15 @@ def get_result(self): understand how to read persisted results into a dictionary using a ScanTask object so others can retrieve them if needed. - :returns: Scan result object for task (either ConnectionResult - or InspectionResult) + :returns: Scan result object for task (either TaskConnectionResult + or TaskInspectionResult) """ if not self.result: if self.scan_task.scan_type == ScanTask.SCAN_TYPE_INSPECT: - self.result = InspectionResult.objects.filter( + self.result = TaskInspectionResult.objects.filter( scan_task=self.scan_task.id).first() elif self.scan_task.scan_type == ScanTask.SCAN_TYPE_CONNECT: - self.result = ConnectionResult.objects.filter( + self.result = TaskConnectionResult.objects.filter( scan_task=self.scan_task.id).first() return self.result diff --git a/quipucords/scanner/vcenter/connect.py b/quipucords/scanner/vcenter/connect.py index 54efdfe20..ab967f213 100644 --- a/quipucords/scanner/vcenter/connect.py +++ b/quipucords/scanner/vcenter/connect.py @@ -12,7 +12,7 @@ import logging from socket import gaierror from pyVmomi import vim # pylint: disable=no-name-in-module -from api.models import (ScanTask, ConnectionResult, SystemConnectionResult) +from api.models import (ScanTask, TaskConnectionResult, SystemConnectionResult) from scanner.task import ScanTaskRunner from scanner.vcenter.utils import vcenter_connect @@ -61,8 +61,8 @@ def _store_connect_data(self, connected, credential): self.scan_task.update_stats( 'INITIAL VCENTER CONNECT STATS.', sys_count=len(connected)) - conn_result = ConnectionResult(source=self.scan_task.source, - scan_task=self.scan_task) + conn_result = TaskConnectionResult(source=self.scan_task.source, + scan_task=self.scan_task) conn_result.save() for system in connected: diff --git a/quipucords/scanner/vcenter/inspect.py b/quipucords/scanner/vcenter/inspect.py index 427c63c43..0a5041187 100644 --- a/quipucords/scanner/vcenter/inspect.py +++ b/quipucords/scanner/vcenter/inspect.py @@ -13,7 +13,7 @@ import json from django.db import transaction from pyVmomi import vim # pylint: disable=no-name-in-module -from api.models import (ScanTask, InspectionResult, +from api.models import (ScanTask, TaskInspectionResult, SystemInspectionResult, RawFact) from scanner.task import ScanTaskRunner from scanner.vcenter.utils import vcenter_connect @@ -68,7 +68,7 @@ def _init_inspect_result(self): inspect_result = self.scan_job.inspection_results.results.filter( source__id=self.source.id).first() if inspect_result is None: - inspect_result = InspectionResult( + inspect_result = TaskInspectionResult( source=self.scan_task.source, scan_task=self.scan_task) inspect_result.save() diff --git a/quipucords/scanner/vcenter/tests_vc_connect.py b/quipucords/scanner/vcenter/tests_vc_connect.py index 07fd4a183..7b7fd28a4 100644 --- a/quipucords/scanner/vcenter/tests_vc_connect.py +++ b/quipucords/scanner/vcenter/tests_vc_connect.py @@ -16,7 +16,7 @@ from django.test import TestCase from pyVmomi import vim # pylint: disable=no-name-in-module from api.models import (Credential, Source, ScanTask, - ScanJob, ConnectionResults, ConnectionResult) + ScanJob, JobConnectionResult, TaskConnectionResult) from scanner.vcenter.connect import (ConnectTaskRunner, get_vm_names, get_vm_container) @@ -62,7 +62,7 @@ def setUp(self): self.scan_job = ScanJob(scan_type=ScanTask.SCAN_TYPE_CONNECT) self.scan_job.save() self.scan_job.tasks.add(self.scan_task) - self.conn_results = ConnectionResults() + self.conn_results = JobConnectionResult() self.conn_results.save() self.scan_job.connection_results = self.conn_results self.scan_job.save() @@ -135,8 +135,8 @@ def test_get_result_none(self): def test_get_result(self): """Test get result method when results exist.""" - conn_result = ConnectionResult(source=self.source, - scan_task=self.scan_task) + conn_result = TaskConnectionResult(source=self.source, + scan_task=self.scan_task) conn_result.save() self.conn_results.results.add(conn_result) self.conn_results.save() diff --git a/quipucords/scanner/vcenter/tests_vc_inspect.py b/quipucords/scanner/vcenter/tests_vc_inspect.py index 58eb48cf1..69f6c26db 100644 --- a/quipucords/scanner/vcenter/tests_vc_inspect.py +++ b/quipucords/scanner/vcenter/tests_vc_inspect.py @@ -16,7 +16,7 @@ from django.test import TestCase from pyVmomi import vim # pylint: disable=no-name-in-module from api.models import (Credential, Source, ScanTask, - ScanJob, InspectionResults, InspectionResult, + ScanJob, JobInspectionResult, TaskInspectionResult, SystemInspectionResult) from scanner.vcenter.inspect import (InspectTaskRunner, get_nics) @@ -67,7 +67,7 @@ def setUp(self): self.scan_job = ScanJob(scan_type=ScanTask.SCAN_TYPE_INSPECT) self.scan_job.save() self.scan_job.tasks.add(self.scan_task) - self.inspect_results = InspectionResults() + self.inspect_results = JobInspectionResult() self.inspect_results.save() self.scan_job.inspection_results = self.inspect_results self.scan_job.save() @@ -106,8 +106,8 @@ def test__none(self): def test_get_result(self): """Test get results method when results exist.""" - inspect_result = InspectionResult(source=self.source, - scan_task=self.scan_task) + inspect_result = TaskInspectionResult(source=self.source, + scan_task=self.scan_task) inspect_result.save() self.inspect_results.results.add(inspect_result) self.inspect_results.save() @@ -149,7 +149,7 @@ def test_get_vm_info(self): self.scan_task.update_stats( 'TEST_VC.', sys_count=5, sys_failed=0, sys_scanned=0) getnics = (['00:50:56:9e:09:8c'], ['1.2.3.4']) - inspect_result = InspectionResult( + inspect_result = TaskInspectionResult( source=self.scan_task.source, scan_task=self.scan_task) inspect_result.save() @@ -161,7 +161,7 @@ def test_get_vm_info(self): self.runner.get_vm_info(data_center, cluster, host, virtual_machine) - inspect_result = InspectionResult.objects.filter( + inspect_result = TaskInspectionResult.objects.filter( scan_task=self.scan_task.id).first() sys_results = inspect_result.systems.all() expected_facts = {'vm.cluster': 'cluster1', @@ -191,7 +191,7 @@ def test_get_vm_info(self): # pylint: disable=too-many-locals def test_recurse_datacenter(self): """Test the recurse_datacenter method.""" - inspect_result = InspectionResult( + inspect_result = TaskInspectionResult( source=self.scan_task.source, scan_task=self.scan_task) inspect_result.save() diff --git a/quipucords/scanner/vcenter/tests_vc_utils.py b/quipucords/scanner/vcenter/tests_vc_utils.py index 09435f0e1..403b0203d 100644 --- a/quipucords/scanner/vcenter/tests_vc_utils.py +++ b/quipucords/scanner/vcenter/tests_vc_utils.py @@ -13,7 +13,7 @@ from unittest.mock import Mock, patch, ANY from django.test import TestCase from api.models import (Credential, Source, SourceOptions, ScanTask, - ScanJob, ConnectionResults) + ScanJob, JobConnectionResult) from scanner.vcenter.utils import vcenter_connect @@ -48,7 +48,7 @@ def setUp(self): self.scan_job = ScanJob(scan_type=ScanTask.SCAN_TYPE_INSPECT) self.scan_job.save() self.scan_job.tasks.add(self.scan_task) - self.conn_results = ConnectionResults() + self.conn_results = JobConnectionResult() self.conn_results.save() self.scan_job.connection_results = self.conn_results self.scan_job.save()