wendelin_telecom_base: Improve KPI calculation error handling

bt5/wendelin_telecom_base/ExtensionTemplateItem/portal_components/extension.erp5.OrsKpiUtils.py

@@ -7,24 +7,32 @@ def load_measurements(alogm):
   try:
     measurement = alogm.read()
     while measurement is not None:
-      mlog.append(measurement)
+      try:
+        mlog.append(measurement)
+      except AssertionError:
+        # Invalid measurement: simply skip it
+        pass
       measurement = alogm.read()
   finally:
     alogm.close()
   return mlog
 
 def calc_periods(mlog, tperiod):
-  t = mlog.data()[0]['X.Tstart']
-  for measurement in mlog.data()[1:]:
-    t_ = measurement['X.Tstart']
-    if (t_ - t) >= tperiod:
-      calc = kpi.Calc(mlog, t, t + tperiod)
-      t = calc.tau_hi
-      yield calc
+  try:
+    t = mlog.data()[0]['X.Tstart']
+    for measurement in mlog.data()[1:]:
+      t_ = measurement['X.Tstart']
+      if (t_ - t) >= tperiod:
+        calc = kpi.Calc(mlog, t, t + tperiod)
+        t = calc.tau_hi
+        yield calc
+  except IndexError:
+    # No data to read: exit
+    return
 
 def getOrsKpiValues(data):
   fxlog = io.StringIO(data)
-  alogm = amari_kpi.LogMeasure(fxlog,  open('/dev/null', 'r'))
+  alogm = amari_kpi.LogMeasure(fxlog, open('/dev/null', 'r'))
   mlog = load_measurements(alogm)
 
   vt = []

bt5/wendelin_telecom_base/PathTemplateItem/portal_callables/DataAnalysisLine_calculateOrsKpi.py

@@ -37,12 +37,7 @@ for array in out_array:
   if array['variation'] == 'e_utran':
     e_utran_data_array = array['Data Array']
 
-try:
-  vt, v_initial_epsb_estab_sr, v_added_epsb_estab_sr, evt, v_ip_throughput_qci = context.Base_getOrsKpiValues(log_data)
-except AssertionError:
-  # If some data is invalid: ignore data chunk and move on rather than crashing
-  progress_indicator.setIntOffsetIndex(end)
-  return
+vt, v_initial_epsb_estab_sr, v_added_epsb_estab_sr, evt, v_ip_throughput_qci = context.Base_getOrsKpiValues(log_data)
 
 e_rab_dtype = np.dtype([
   ('vt', 'float'),