Merge branch 'add_metrics_Alcatel.7302' into 'master'

add metrics Alcatel.7302

See merge request noc/noc!5879

sa/profiles/Alcatel/7302/oidrules/slot.py

 # ---------------------------------------------------------------------
 # Alcatel.7302.SlotRule
 # ---------------------------------------------------------------------
-# Copyright (C) 2007-2019 The NOC Project
+# Copyright (C) 2007-2021 The NOC Project
 # See LICENSE for details
 # ---------------------------------------------------------------------
 
@@ -11,53 +11,70 @@ from noc.core.mib import mib
 
 
 class SlotRule(OIDRule):
-
     name = "slot"
 
     def iter_oids(self, script, metric):
         i = 4353
         # 4353 - nt-a slot num
+        # >4355 - lt-s slot
         # chassis, slot, module, name
         r = {}
-        if script.has_capability("Stack | Member Ids"):
+        if script.has_capability("Slot | Member Ids"):
             sys_slot_index = [0] + [
-                int(index) for index in script.capabilities["Stack | Member Ids"].split(" | ")
+                int(index) for index in script.capabilities["Slot | Member Ids"].split(" | ")
             ]
-        elif script.has_capability("Stack | Members"):
-            sys_slot_index = list(range(0, script.capabilities["Stack | Members"] + 1))
+        elif script.has_capability("Slot | Members"):
+            sys_slot_index = list(range(0, script.capabilities["Slot | Members"] + 1))
         else:
             sys_slot_index = [0]
 
         for ms in sys_slot_index:
             if ms in [0]:
                 # nt-a card - 3 sensors
-                for s_i in range(1, 5):
-                    # r["nt-a_s%d" % s_i] = "%d.%d" % (ms, s_i)
+                if "Temperature" in metric.metric:
+                    for s_i in range(1, 5):
+                        # r["nt-a_s%d" % s_i] = "%d.%d" % (ms, s_i)
+                        r[
+                            (
+                                "noc::chassis::1",
+                                "noc::slot::0",
+                                f"noc::module::{s_i}",
+                                f"noc::sensor::Temperature_nt-a_s{s_i}",
+                            )
+                        ] = "%d.%d" % (i, s_i)
+                else:
                     r[
                         (
                             "noc::chassis::1",
-                            "noc::slot::1",
-                            "noc::module::0",
-                            f"noc::sensor::Temperature_nt-a_s{s_i}",
+                            "noc::slot::0",
+                            "noc::sensor::State_nt-a_s",
                         )
-                    ] = "%d.%d" % (ms, s_i)
+                    ] = str(i)
                 continue
             # r[str(i)] = {"healthModuleSlot": ms}
-            for s_i in range(1, 3):
-                # Two sensors on cards
-                # r["lt:1/1/%d_s%d" % (ms, s_i)] = "%d.%d" % (i + ms - 2 if ms not in [2, 3] else i + 8 + ms, s_i)
+            if "Temperature" in metric.metric:
+                for s_i in range(1, 3):
+                    # Two sensors on cards
+                    # r["lt:1/1/%d_s%d" % (ms, s_i)] = "%d.%d" % (i + ms - 2 if ms not in [2, 3] else i + 8 + ms, s_i)
+                    r[
+                        (
+                            "noc::chassis::1",
+                            f"noc::slot::{ms}",
+                            f"noc::module::{s_i}",
+                            f"noc::sensor::Temperature_lt_s{ms, s_i}",
+                        )
+                    ] = "%d.%d" % (
+                        i + ms + 1,
+                        s_i,
+                    )
+            else:
                 r[
                     (
                         "noc::chassis::1",
-                        "noc::slot::1",
-                        f"noc::module::{str(ms)}",
-                        f"noc::sensor::Temperature_lt_s{s_i,}",
+                        f"noc::slot::{ms}",
+                        f"noc::sensor::State_lt_s{ms}",
                     )
-                ] = "%d.%d" % (
-                    i + ms - 2 if ms not in [2, 3] else i + 8 + ms,
-                    s_i,
-                )
-
+                ] = str(i + ms + 1)
         for i in r:
             if self.is_complex:
                 gen = [mib[self.expand(o, {"hwSlotIndex": r[i]})] for o in self.oid]

sa/profiles/Alcatel/7302/snmp_metrics/environment_restart.json

+{
+  "$metric": "Environment | Board | Restart",
+  "$type": "slot",
+  "oid": "1.3.6.1.4.1.637.61.1.23.3.1.26.{{ hwSlotIndex }}"
+}

sa/profiles/Alcatel/7302/snmp_metrics/environment_status.json

+{
+  "$metric": "Environment | Sensor Status",
+  "$type": "slot",
+  "oid": "1.3.6.1.4.1.637.61.1.23.3.1.6.{{ hwSlotIndex }}"
+}