From b763f757c96af0b7fe37b44d4f8f7d021e5468ce Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Wed, 13 Jul 2022 08:30:45 +0000
Subject: [PATCH] L2SS-868: Combine L2SS-864, L2SS-865, L2SS-867
---
.../tangostationcontrol/clients/statistics/consumer.py | 2 +-
tangostationcontrol/tangostationcontrol/devices/sdp/bst.py | 3 ++-
tangostationcontrol/tangostationcontrol/devices/sdp/sst.py | 2 +-
.../integration_test/default/statistics/test_writer_sst.py | 2 +-
.../statistics/{statistics_collector.py => collector.py} | 0
.../tangostationcontrol/statistics_writer/hdf5_writer.py | 2 +-
.../{test_statistics_collector.py => test_collector.py} | 2 +-
7 files changed, 7 insertions(+), 6 deletions(-)
rename tangostationcontrol/tangostationcontrol/statistics/{statistics_collector.py => collector.py} (100%)
rename tangostationcontrol/tangostationcontrol/test/statistics/{test_statistics_collector.py => test_collector.py} (99%)
diff --git a/tangostationcontrol/tangostationcontrol/clients/statistics/consumer.py b/tangostationcontrol/tangostationcontrol/clients/statistics/consumer.py
index e80942310..d5a16bbe7 100644
--- a/tangostationcontrol/tangostationcontrol/clients/statistics/consumer.py
+++ b/tangostationcontrol/tangostationcontrol/clients/statistics/consumer.py
@@ -12,7 +12,7 @@ from threading import Thread
from queue import Queue
from tangostationcontrol.clients.statistics.client_thread import StatisticsClientThread
-from tangostationcontrol.devices.sdp.statistics_collector import StatisticsCollector
+from tangostationcontrol.statistics.collector import StatisticsCollector
logger = logging.getLogger()
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/bst.py b/tangostationcontrol/tangostationcontrol/devices/sdp/bst.py
index 10ebe6e92..09622f1f6 100644
--- a/tangostationcontrol/tangostationcontrol/devices/sdp/bst.py
+++ b/tangostationcontrol/tangostationcontrol/devices/sdp/bst.py
@@ -13,13 +13,14 @@
from tango.server import device_property, attribute
from tango import AttrWriteType
+
# Own imports
from tangostationcontrol.common.entrypoint import entry
from tangostationcontrol.clients.attribute_wrapper import attribute_wrapper
from tangostationcontrol.clients.opcua_client import OPCUAConnection
from tangostationcontrol.clients.statistics.client import StatisticsClient
from tangostationcontrol.devices.sdp.statistics import Statistics
-from tangostationcontrol.statistics.statistics_collector import BSTCollector
+from tangostationcontrol.statistics.collector import BSTCollector
import numpy
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/sst.py b/tangostationcontrol/tangostationcontrol/devices/sdp/sst.py
index a7747918d..ceeffdd35 100644
--- a/tangostationcontrol/tangostationcontrol/devices/sdp/sst.py
+++ b/tangostationcontrol/tangostationcontrol/devices/sdp/sst.py
@@ -21,7 +21,7 @@ from tangostationcontrol.clients.attribute_wrapper import attribute_wrapper
from tangostationcontrol.clients.opcua_client import OPCUAConnection
from tangostationcontrol.clients.statistics.client import StatisticsClient
from tangostationcontrol.devices.sdp.statistics import Statistics
-from tangostationcontrol.statistics.statistics_collector import SSTCollector
+from tangostationcontrol.statistics.collector import SSTCollector
import numpy
diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/statistics/test_writer_sst.py b/tangostationcontrol/tangostationcontrol/integration_test/default/statistics/test_writer_sst.py
index e2907240e..39325dc19 100644
--- a/tangostationcontrol/tangostationcontrol/integration_test/default/statistics/test_writer_sst.py
+++ b/tangostationcontrol/tangostationcontrol/integration_test/default/statistics/test_writer_sst.py
@@ -9,7 +9,7 @@
from tangostationcontrol.integration_test.base import BaseIntegrationTestCase
from tangostationcontrol.integration_test.device_proxy import TestDeviceProxy
-from tangostationcontrol.statistics.statistics_collector import SSTCollector
+from tangostationcontrol.statistics.collector import SSTCollector
from tangostationcontrol.statistics_writer import statistics_reader
from tangostationcontrol.statistics import writer
diff --git a/tangostationcontrol/tangostationcontrol/statistics/statistics_collector.py b/tangostationcontrol/tangostationcontrol/statistics/collector.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/statistics/statistics_collector.py
rename to tangostationcontrol/tangostationcontrol/statistics/collector.py
diff --git a/tangostationcontrol/tangostationcontrol/statistics_writer/hdf5_writer.py b/tangostationcontrol/tangostationcontrol/statistics_writer/hdf5_writer.py
index b58ccd39b..af617b7d6 100644
--- a/tangostationcontrol/tangostationcontrol/statistics_writer/hdf5_writer.py
+++ b/tangostationcontrol/tangostationcontrol/statistics_writer/hdf5_writer.py
@@ -13,7 +13,7 @@ from abc import ABC, abstractmethod
import sys
sys.path.append("..")
from tangostationcontrol.statistics.packets import SSTPacket, XSTPacket, BSTPacket
-import tangostationcontrol.statistics.statistics_collector as statistics_collector
+import tangostationcontrol.statistics.collector as statistics_collector
logger = logging.getLogger("statistics_writer")
diff --git a/tangostationcontrol/tangostationcontrol/test/statistics/test_statistics_collector.py b/tangostationcontrol/tangostationcontrol/test/statistics/test_collector.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/test/statistics/test_statistics_collector.py
rename to tangostationcontrol/tangostationcontrol/test/statistics/test_collector.py
index c53a96712..aaf39ba86 100644
--- a/tangostationcontrol/tangostationcontrol/test/statistics/test_statistics_collector.py
+++ b/tangostationcontrol/tangostationcontrol/test/statistics/test_collector.py
@@ -7,7 +7,7 @@
# Distributed under the terms of the APACHE license.
# See LICENSE.txt for more info.
-from tangostationcontrol.statistics.statistics_collector import XSTCollector, BSTCollector
+from tangostationcontrol.statistics.collector import XSTCollector, BSTCollector
from tangostationcontrol.statistics.packets import XSTPacket, BSTPacket
from tangostationcontrol.test import base
--
GitLab