{enb,epc,ms}_srs: refactor start/stop and KPI helpers
refactor some of the functionality to srslte_common
Change-Id: I2ff36df6f1a07ed8ddac39d296d62fe44a215283
diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py
index 1c0f728..b5f5d70 100644
--- a/src/osmo_gsm_tester/obj/ms_srs.py
+++ b/src/osmo_gsm_tester/obj/ms_srs.py
@@ -24,7 +24,6 @@
from ..core import log, util, config, template, process, remote
from ..core import schema
from .run_node import RunNode
-from ..core.event_loop import MainLoop
from .ms import MS
from .srslte_common import srslte_common
@@ -77,6 +76,7 @@
def __init__(self, testenv, conf):
self._run_node = RunNode.from_conf(conf.get('run_node', {}))
super().__init__('srsue_%s' % self.addr(), conf)
+ srslte_common.__init__(self)
self.enb = None
self.run_dir = None
self.config_file = None
@@ -92,9 +92,9 @@
self.remote_log_file = None
self.remote_pcap_file = None
self.remote_metrics_file = None
- self.stop_sleep_time = 6 # We require at most 5s to stop
self.enable_pcap = False
self.num_carriers = 1
+ self.kpis = None
self.testenv = testenv
self._additional_args = []
if not rf_type_valid(conf.get('rf_dev_type', None)):
@@ -150,16 +150,6 @@
def netns(self):
return "srsue1"
- def sleep_after_stop(self):
- # Only sleep once
- if self.stop_sleep_time > 0:
- MainLoop.sleep(self.stop_sleep_time)
- self.stop_sleep_time = 0
-
- def stop(self):
- self.testenv.stop_process(self.process)
- self.sleep_after_stop()
-
def connect(self, enb):
self.log('Starting srsue')
self.enb = enb