From cee9c3c83e0a94d9065792753941f99efd145bc8 Mon Sep 17 00:00:00 2001
From: stedif <stefano.difrischia@inaf.it>
Date: Tue, 12 Oct 2021 18:20:15 +0200
Subject: [PATCH] L2SS-375: bug fixing and add parsing methods
---
devices/toolkit/archiver.py | 64 +-
jupyter-notebooks/Archiving_load_test.ipynb | 793 ++++++++++++++------
2 files changed, 611 insertions(+), 246 deletions(-)
diff --git a/devices/toolkit/archiver.py b/devices/toolkit/archiver.py
index 7d8634987..35012767a 100644
--- a/devices/toolkit/archiver.py
+++ b/devices/toolkit/archiver.py
@@ -16,6 +16,29 @@ from .archiver_base import *
logger = logging.getLogger()
+def parse_attribute_name(attribute_name:str):
+ """
+ Parse the attribute names since most of the archiving operations require only
+ Tango full-qualified names.
+ """
+ chunk_num = len(attribute_name.split('/'))
+ if (chunk_num!=4):
+ raise AttributeFormatException
+
+def reduce_attribute_name(attribute_name:str):
+ """
+ For some operations Tango attribute must be transformed from the form 'tango://db:port/domain/family/name/attribute'
+ to canonical 'domain/family/name/attribute'
+ """
+ chunk_num = len(attribute_name.split('/'))
+ if (chunk_num==7 and attribute_name.split('/')[0]=='tango:'):
+ return '/'.join(attribute_name.split('/')[3:])
+ else:
+ if (chunk_num!=4):
+ raise AttributeFormatException
+ else:
+ return attribute_name
+
class Archiver():
"""
The Archiver class implements the basic operations to perform attributes archiving
@@ -91,8 +114,7 @@ class Archiver():
The ConfigurationManager and EventSubscriber devices must be already up and running.
The archiving-DBMS must be already properly configured.
"""
- if (len(attribute_name.split('/'))!=4):
- raise AttributeFormatException
+ parse_attribute_name(attribute_name)
try:
self.cm.write_attribute('SetAttributeName', attribute_name)
self.cm.write_attribute('SetArchiver', self.es_name)
@@ -137,8 +159,7 @@ class Archiver():
"""
Stops the data archiving of the attribute passed as input, and remove it from the subscriber's list.
"""
- if (len(attribute_name.split('/'))!=4):
- raise AttributeFormatException
+ parse_attribute_name(attribute_name)
try:
self.cm.AttributeStop(attribute_name)
self.cm.AttributeRemove(attribute_name)
@@ -164,14 +185,28 @@ class Archiver():
self.remove_attribute_from_archiver(attr_fullname)
except Exception as e:
raise Exception from e
+
+ def remove_attributes_in_error(self,exclude:list=[],es_name:str=None):
+ """
+ Remove from the subscriber's list all the attributes currently in error (not being archived)
+ """
+ if es_name is not None:
+ es = DeviceProxy(es_name)
+ else:
+ es = self.es
+ attributes_nok = es.AttributeNokList or []
+ exclude_list = [a.lower() for a in exclude]
+ attrs_list = [a.lower() for a in list(attributes_nok) if a.lower() not in exclude_list]
+ for a in attrs_list:
+ attr_fullname = reduce_attribute_name(a)
+ self.remove_attribute_from_archiver(attr_fullname)
def start_archiving_attribute(self, attribute_name:str):
"""
Starts the archiving of the attribute passed as input.
The attribute must be already present in the subscriber's list
"""
- if (len(attribute_name.split('/'))!=4):
- raise AttributeFormatException
+ parse_attribute_name(attribute_name)
try:
self.cm.AttributeStart(attribute_name)
except Exception as e:
@@ -185,8 +220,7 @@ class Archiver():
Stops the archiving of the attribute passed as input.
The attribute must be already present in the subscriber's list
"""
- if (len(attribute_name.split('/'))!=4):
- raise AttributeFormatException
+ parse_attribute_name(attribute_name)
try:
self.cm.AttributeStop(attribute_name)
except Exception as e:
@@ -199,8 +233,7 @@ class Archiver():
"""
Check if an attribute is in the archiving list
"""
- if (len(attribute_name.split('/'))!=4):
- raise AttributeFormatException
+ parse_attribute_name(attribute_name)
attributes = self.cm.AttributeSearch(attribute_name.lower())
if len(attributes)>