...
 
Commits (4)
...@@ -27,7 +27,7 @@ class Script(BaseScript): ...@@ -27,7 +27,7 @@ class Script(BaseScript):
r"Partner's information:(?P<part_info>.+)\n", r"Partner's information:(?P<part_info>.+)\n",
re.IGNORECASE | re.DOTALL, re.IGNORECASE | re.DOTALL,
) )
rx_sys_id = re.compile(r",(?P<sys_id>\w{4}\.\w{4}\.\w{4})") rx_sys_id = re.compile(r",\s*(?P<sys_id>\w{4}\.\w{4}\.\w{4})")
def execute(self): def execute(self):
r = [] r = []
...@@ -74,7 +74,6 @@ class Script(BaseScript): ...@@ -74,7 +74,6 @@ class Script(BaseScript):
} }
] ]
pass
""" """
for port in self.split_port_re.split(block): for port in self.split_port_re.split(block):
port_info = self.split_info_re.match(port) port_info = self.split_info_re.match(port)
......
...@@ -206,7 +206,7 @@ def escalate(alarm_id, escalation_id, escalation_delay, login="correlator", *arg ...@@ -206,7 +206,7 @@ def escalate(alarm_id, escalation_id, escalation_delay, login="correlator", *arg
log("Promoting to group tt") log("Promoting to group tt")
gtt = tts.create_group_tt(tt_id, alarm.timestamp) gtt = tts.create_group_tt(tt_id, alarm.timestamp)
# Append affected objects # Append affected objects
if tts.promote_affected_tt: if a.promote_affected_tt:
for ao in alarm.iter_affected(): for ao in alarm.iter_affected():
if ao.can_escalate(True): if ao.can_escalate(True):
if ao.tt_system == mo.tt_system: if ao.tt_system == mo.tt_system:
......