From 2f9748765226bb49a2ce7fee74def75b1a91f0dc Mon Sep 17 00:00:00 2001
From: Mattia Mancini <mancini@astron.nl>
Date: Mon, 7 May 2018 14:55:07 +0000
Subject: [PATCH] Story SW-300: cleaning up
---
.gitattributes | 1 +
.../monitoringdb/models/componenterror.py | 2 +-
.../monitoringdb/models/hbacomponenterror.py | 2 +-
.../serializers/componenterror.py | 45 +------------------
.../serializers/componenterrors_generic.py | 45 +++++++++++++++++++
.../monitoringdb/serializers/stationtest.py | 4 +-
.../serializers/tbberrorserializer.py | 1 -
.../django_postgresql/monitoringdb/views.py | 10 ++---
8 files changed, 56 insertions(+), 54 deletions(-)
create mode 100644 LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/componenterrors_generic.py
diff --git a/.gitattributes b/.gitattributes
index ab28fe4db66..af0141cdbf2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1790,6 +1790,7 @@ LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/models/tbbcomponent
LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/models/tileerror.py -text
LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/__init__.py -text
LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/componenterror.py -text
+LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/componenterrors_generic.py -text
LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/hbaerrorserializers.py -text
LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/lbaerrorserializer.py -text
LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/rcuerrorserializer.py -text
diff --git a/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/models/componenterror.py b/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/models/componenterror.py
index d45720c5c91..940ce0d838b 100644
--- a/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/models/componenterror.py
+++ b/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/models/componenterror.py
@@ -5,7 +5,7 @@ from .stationtest import StationTest
from .fixed_types import COMPONENT_TYPES, ERROR_TYPES
-NOISE_ERROR_TYPE = ('H', 'L')
+NOISE_ERROR_TYPE = (('H', 'HIGH'), ('L', 'LOW'))
class ComponentError(PolymorphicModel):
diff --git a/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/models/hbacomponenterror.py b/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/models/hbacomponenterror.py
index c30b08970af..22c65c98c5c 100644
--- a/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/models/hbacomponenterror.py
+++ b/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/models/hbacomponenterror.py
@@ -9,7 +9,7 @@ class HBAComponentError(ComponentError):
on_delete=models.CASCADE)
-HBA_SUMMATOR_ERROR_TYPE = ('C', 'P')
+HBA_SUMMATOR_ERROR_TYPE = (('C',''), ('P',''))
class HBASummatorError(HBAComponentError):
diff --git a/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/componenterror.py b/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/componenterror.py
index cf54a067de2..31a0be8f0be 100644
--- a/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/componenterror.py
+++ b/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/componenterror.py
@@ -1,14 +1,8 @@
from rest_framework import serializers
from rest_polymorphic.serializers import PolymorphicSerializer
-from .hbaerrorserializers import *
-from .lbaerrorserializer import *
-from .rcuerrorserializer import *
-from .rsperrorserializer import *
-from .tbberrorserializer import *
-from .spuerrorserializer import *
from ..models.fixed_types import COMPONENT_TYPES, ERROR_TYPES
-
+from ..models.stationtest import StationTest
class ComponentErrorSerializer(serializers.Serializer):
@@ -26,40 +20,3 @@ class ComponentErrorSerializer(serializers.Serializer):
return ComponentError.objects.create(**validated_data)
-class ComponentErrorPolimorphicSerializer(PolymorphicSerializer):
- model_serializer_mapping = {
- ComponentError: ComponentErrorSerializer,
- HBAComponentError: HBAComponentErrorSerializer,
- HBASummatorNoise: HBASummatorNoiseSerializer,
- HBASummatorError: HBASummatorErrorSerializer,
- HBAOscillationError: HBAOscillationErrorSerializer,
- HBAModemError: HBAModemErrorSerializer,
- HBANoiseError: HBANoiseSerializer,
- HBAJitterError: HBAJitterSerializer,
- HBASpuriousError: HBASpuriousSerializer,
- HBARFFailError: HBARFFailSerializer,
-
- LBAComponentError: LBAComponentErrorSerializer,
- LBAOscillationError: LBAOscillationSerializer,
- LBANoiseError: LBANoiseSerializer,
- LBAJitterError: LBAJitterSerializer,
- LBASpuriousError: LBASpuriousSerializer,
- LBARFFailError: LBARFFailSerializer,
- LBADownError: LBADownErrorSerializer,
- LBAShortError: LBAShortErrorSerializer,
- LBAFlatError: LBAFlatErrorSerializer,
-
- RCUComponentError: RCUComponentErrorSerializer,
-
- RSPComponentError: RSPComponentErrorSerializer,
- RSPTemperatureError: RSPTemperatureErrorSerializer,
- RSPVoltageError: RSPVoltageErrorSerializer,
- RSPVersionError: RSPVersionErrorSerializer,
-
- TBBComponentError: TBBComponentErrorSerializer,
- TBBMemoryError: TBBMemoryErrorSerializer,
- TBBVoltageError: TBBVoltageErrorSerializer,
- TBBTemperatureError: TBBTemperatureErrorSerializer,
-
- SPUComponentError:SPUComponentErrorSerializer
- }
\ No newline at end of file
diff --git a/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/componenterrors_generic.py b/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/componenterrors_generic.py
new file mode 100644
index 00000000000..06ed5538937
--- /dev/null
+++ b/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/componenterrors_generic.py
@@ -0,0 +1,45 @@
+from .hbaerrorserializers import *
+from .lbaerrorserializer import *
+from .rcuerrorserializer import *
+from .rsperrorserializer import *
+from .tbberrorserializer import *
+from .spuerrorserializer import *
+
+
+class ComponentErrorPolimorphicSerializer(PolymorphicSerializer):
+ model_serializer_mapping = {
+ ComponentError: ComponentErrorSerializer,
+ HBAComponentError: HBAComponentErrorSerializer,
+ HBASummatorNoise: HBASummatorNoiseSerializer,
+ HBASummatorError: HBASummatorErrorSerializer,
+ HBAOscillationError: HBAOscillationErrorSerializer,
+ HBAModemError: HBAModemErrorSerializer,
+ HBANoiseError: HBANoiseSerializer,
+ HBAJitterError: HBAJitterSerializer,
+ HBASpuriousError: HBASpuriousSerializer,
+ HBARFFailError: HBARFFailSerializer,
+
+ LBAComponentError: LBAComponentErrorSerializer,
+ LBAOscillationError: LBAOscillationSerializer,
+ LBANoiseError: LBANoiseSerializer,
+ LBAJitterError: LBAJitterSerializer,
+ LBASpuriousError: LBASpuriousSerializer,
+ LBARFFailError: LBARFFailSerializer,
+ LBADownError: LBADownErrorSerializer,
+ LBAShortError: LBAShortErrorSerializer,
+ LBAFlatError: LBAFlatErrorSerializer,
+
+ RCUComponentError: RCUComponentErrorSerializer,
+
+ RSPComponentError: RSPComponentErrorSerializer,
+ RSPTemperatureError: RSPTemperatureErrorSerializer,
+ RSPVoltageError: RSPVoltageErrorSerializer,
+ RSPVersionError: RSPVersionErrorSerializer,
+
+ TBBComponentError: TBBComponentErrorSerializer,
+ TBBMemoryError: TBBMemoryErrorSerializer,
+ TBBVoltageError: TBBVoltageErrorSerializer,
+ TBBTemperatureError: TBBTemperatureErrorSerializer,
+
+ SPUComponentError: SPUComponentErrorSerializer
+ }
\ No newline at end of file
diff --git a/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/stationtest.py b/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/stationtest.py
index b29634422f1..5964c5e7664 100644
--- a/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/stationtest.py
+++ b/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/stationtest.py
@@ -1,6 +1,6 @@
from ..models.stationtest import *
from rest_framework import serializers
-from .componenterror import ComponentErrorPolimorphicSerializer
+from .componenterrors_generic import ComponentErrorPolimorphicSerializer
class StationTestSerializer(serializers.ModelSerializer):
@@ -12,7 +12,7 @@ class StationTestSerializer(serializers.ModelSerializer):
class Meta:
model = StationTest
- fields = ('__all__',)
+ fields = '__all__'
def create(self, validated_data):
hba_errors_data = validated_data.pop('hba_errors')
diff --git a/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/tbberrorserializer.py b/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/tbberrorserializer.py
index 3beca053ce6..f1e9465b4e3 100644
--- a/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/tbberrorserializer.py
+++ b/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/serializers/tbberrorserializer.py
@@ -1,4 +1,3 @@
-
from ..models.tbbcomponenterror import *
from .componenterror import ComponentErrorSerializer
diff --git a/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/views.py b/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/views.py
index 08b4e9dd1e5..feb1c37d44f 100644
--- a/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/views.py
+++ b/LCU/MaintenanceDB/DBInterface/django_postgresql/monitoringdb/views.py
@@ -1,11 +1,11 @@
from rest_framework import viewsets, status
from rest_framework.response import Response
from rest_framework.decorators import api_view
-from .models import StationTest
-from .models import ComponentError
+from .models.stationtest import StationTest
+from .models.componenterror import ComponentError
from .serializers.stationtest import StationTestSerializer
-from .serializers.componenterror import ComponentErrorPolimorphicSerializer
-from .station_test_raw_parser import parse_from_raw_station_test
+from .serializers.componenterrors_generic import ComponentErrorPolimorphicSerializer
+from .station_test_raw_parser import parse_raw_station_test
import logging
@@ -39,7 +39,7 @@ def insert_raw_station_test(request):
if 'content' in request.data:
try:
- for entry in parse_from_raw_station_test(request.data['content']):
+ for entry in parse_raw_station_test(request.data['content']):
entry.save()
except Exception as e: # TODO this response does not work
logger.exception("exception occurred while parsing raw station info %s: %s", request.data['content'], e)
--
GitLab