diff --git a/LCU/Maintenance/DBInterface/monitoringdb/models/wincc.py b/LCU/Maintenance/DBInterface/monitoringdb/models/wincc.py index a8d28b4ebdb395f1396270c6b301a3d17cfbcb9a..82a090b1f91df8fe69fa3bda2d8befe129ec8d15 100644 --- a/LCU/Maintenance/DBInterface/monitoringdb/models/wincc.py +++ b/LCU/Maintenance/DBInterface/monitoringdb/models/wincc.py @@ -21,7 +21,7 @@ def to_status(status_code): return STATUS_CODE_TO_STATUS.get(status_code, 'UNKNOWN') -class WinCCAntannaStatusManager(models.Manager): +class WinCCAntennaStatusManager(models.Manager): def latest_status_per_station_and_component_type(self, station, component_type, to_date): @@ -38,6 +38,7 @@ class WinCCAntannaStatusManager(models.Manager): for row in raw_query_result: status_description = OrderedDict() results[str(row.antenna_id)] = status_description + status_description['inserted_at'] = row.last_entry_timestamp status_description['status'] = to_status(row.status_code) status_description['status_code'] = row.status_code status_description['reason'] = row.status_code_reason @@ -72,7 +73,7 @@ class WinCCAntannaStatusManager(models.Manager): WHERE master.station=%s AND master.antenna_type=%s ''', [to_date, station.rstrip('C'), antenna_type]) - return WinCCAntannaStatusManager.format_result(raw_results, antenna_type) + return WinCCAntennaStatusManager.format_result(raw_results, antenna_type) def latest_status_per_station_and_component_type_antenna_id(self, station, component_type, @@ -101,7 +102,7 @@ class WinCCAntannaStatusManager(models.Manager): ) slave ON master.station=slave.station AND master.antenna_type=slave.antenna_type AND master.antenna_id = slave.antenna_id AND last_entry_timestamp=master.timestamp WHERE master.station=%s AND master.antenna_type=%s AND master.antenna_id=%s ''', [to_date, station.rstrip('C'), antenna_type, antenna_id]) - return WinCCAntannaStatusManager.format_result(raw_results, antenna_type) + return WinCCAntennaStatusManager.format_result(raw_results, antenna_type) class WinCCAntennaStatus(models.Model): @@ -111,11 +112,11 @@ class WinCCAntennaStatus(models.Model): indexes = [ models.Index(fields=['station', 'antenna_type', 'antenna_id', 'timestamp']) ] - objects = WinCCAntannaStatusManager() + objects = WinCCAntennaStatusManager() timestamp = models.DateTimeField(auto_now_add=True) - station = models.CharField(max_length=10) - antenna_type = models.CharField(max_length=4) + station = models.CharField(max_length=10, default=None) + antenna_type = models.CharField(max_length=4, default=None) antenna_id = models.IntegerField() status_code = models.IntegerField()