From ada1aff137c2ca80552408a9787c510194dfc8ea Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Fri, 10 Sep 2021 11:02:38 +0200
Subject: [PATCH] update project

---
 agent_based/checkpoint_asg_chassis.py |  27 +++++++++++++-------------
 checkpoint_asg_chassis.mkp            | Bin 2924 -> 2967 bytes
 packages/checkpoint_asg_chassis       |   2 +-
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/agent_based/checkpoint_asg_chassis.py b/agent_based/checkpoint_asg_chassis.py
index f25c4a3..3295b0f 100644
--- a/agent_based/checkpoint_asg_chassis.py
+++ b/agent_based/checkpoint_asg_chassis.py
@@ -11,6 +11,7 @@
 #
 # 2021-02-25: rewrite for CMK 2.x
 #             added warning/critical is chassis grade not equeal maxGrade
+# 2021-09-10: rewrite parse function
 #
 # ToDo: add warning if SGM/Chassis is missing compared to inventory time
 #
@@ -65,15 +66,15 @@
 #
 from pprint import pprint
 
-from typing import Mapping, Dict, List, Tuple, NamedTuple
+from typing import Mapping, Dict, List, Tuple, NamedTuple, Optional
 
-from .agent_based_api.v1.type_defs import (
+from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import (
     DiscoveryResult,
     CheckResult,
     StringTable,
 )
 
-from .agent_based_api.v1 import (
+from cmk.base.plugins.agent_based.agent_based_api.v1 import (
     register,
     Service,
     equals,
@@ -112,17 +113,15 @@ class CheckPointASGChassis(NamedTuple):
     sgms: List
 
 
-def parse_checkpoint_asg_chassis(string_table: List[StringTable]) -> CheckPointASGChassis:
-    chassis = CheckPointASGChassis
+def parse_checkpoint_asg_chassis(string_table: List[StringTable]) -> Optional[CheckPointASGChassis]:
     try:
-        chassis.info = CheckPointASGChassisInfo(*string_table[0][0])
-    except TypeError:
-        return None
-    chassis.chassis = string_table[1]
-    chassis.sgms = string_table[2]
-
-    parsed = chassis
-    return parsed
+        return CheckPointASGChassis(
+            info=CheckPointASGChassisInfo(*string_table[0][0]),
+            chassis=string_table[1],
+            sgms=string_table[2]
+        )
+    except (TypeError, IndexError):
+        pass
 
 
 def discovery_checkpoint_asg_chassis(section: CheckPointASGChassis) -> DiscoveryResult:
@@ -152,7 +151,7 @@ def check_checkpoint_asg_chassis(params, section: CheckPointASGChassis) -> Check
                 if not chassis.status.lower() in ['active', 'standby'] or chassis.grade != chassis.maxgrade:
                     yield Result(state=State.CRIT, summary=yield_text)
                 elif (chassis.status != inv_chassis.status) or (chassis.grade != inv_chassis.grade) or (chassis.maxgrade != inv_chassis.maxgrade):
-                    yield Result(State.WARN, notice=yield_text + ' (expected: %s, grade: %s/%s)' % (inv_chassis.status, inv_chassis.grade, inv_chassis.maxgrade))
+                    yield Result(state=State.WARN, notice=yield_text + ' (expected: %s, grade: %s/%s)' % (inv_chassis.status, inv_chassis.grade, inv_chassis.maxgrade))
                 else:
                     yield Result(state=State.OK, summary=yield_text)
 
diff --git a/checkpoint_asg_chassis.mkp b/checkpoint_asg_chassis.mkp
index f8766dd0c4278ff0608e44ff729186046bf56684..a2106c38776678c9d46049dedfdde96fa06e9c70 100644
GIT binary patch
delta 2951
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

delta 2908
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

diff --git a/packages/checkpoint_asg_chassis b/packages/checkpoint_asg_chassis
index f59b1c1..1fde3a6 100644
--- a/packages/checkpoint_asg_chassis
+++ b/packages/checkpoint_asg_chassis
@@ -9,5 +9,5 @@
  'title': 'Check Point Maestro SMO ASG Chassis',
  'version': '20210225.v0.2',
  'version.min_required': '2.0.0b8',
- 'version.packaged': '2.0.0p1',
+ 'version.packaged': '2021.07.14',
  'version.usable_until': None}
\ No newline at end of file
-- 
GitLab