Remove Deadline and Logical Supervisions from Launch Manager (#128)

* Remove deadline and logical supervisions from launch manager daemon

* Apply suggestions from review

Author: paulquiring

scripts/config_mapping/lifecycle_config.py

@@ -227,8 +227,6 @@ def get_all_refProcessGroupStates(run_targets):
     hm_config["hmMonitorInterface"] = []
     hm_config["hmSupervisionCheckpoint"] = []
     hm_config["hmAliveSupervision"] = []
-    hm_config["hmDeadlineSupervision"] = []
-    hm_config["hmLogicalSupervision"] = []
     hm_config["hmLocalSupervision"] = []
     hm_config["hmGlobalSupervision"] = []
     hm_config["hmRecoveryNotification"] = []

scripts/config_mapping/tests/basic_test/expected_output/hm_demo.json

@@ -198,8 +198,6 @@
             ]
         }
     ],
-    "hmDeadlineSupervision": [],
-    "hmLogicalSupervision": [],
     "hmLocalSupervision": [
         {
             "ruleContextKey": "someip-daemon_local_supervision",

scripts/config_mapping/tests/empty_health_config_test/expected_output/hm_demo.json

@@ -5,8 +5,6 @@
     "hmMonitorInterface": [],
     "hmSupervisionCheckpoint": [],
     "hmAliveSupervision": [],
-    "hmDeadlineSupervision": [],
-    "hmLogicalSupervision": [],
     "hmLocalSupervision": [],
     "hmGlobalSupervision": [],
     "hmRecoveryNotification": []

scripts/config_mapping/tests/empty_lm_config_test/expected_output/hm_demo.json

@@ -5,8 +5,6 @@
     "hmMonitorInterface": [],
     "hmSupervisionCheckpoint": [],
     "hmAliveSupervision": [],
-    "hmDeadlineSupervision": [],
-    "hmLogicalSupervision": [],
     "hmLocalSupervision": [],
     "hmGlobalSupervision": [],
     "hmRecoveryNotification": []

scripts/config_mapping/tests/health_config_test/expected_output/hm_demo.json

@@ -198,8 +198,6 @@
             ]
         }
     ],
-    "hmDeadlineSupervision": [],
-    "hmLogicalSupervision": [],
     "hmLocalSupervision": [
         {
             "ruleContextKey": "state_manager_local_supervision",

scripts/config_mapping/tests/lm_config_test/expected_output/hm_demo.json

@@ -261,8 +261,6 @@
             ]
         }
     ],
-    "hmDeadlineSupervision": [],
-    "hmLogicalSupervision": [],
     "hmLocalSupervision": [
         {
             "ruleContextKey": "test_app2_local_supervision",

src/launch_manager_daemon/health_monitor_lib/BUILD

@@ -203,12 +203,10 @@ cc_library_with_common_opts(
     name = "supervision",
     srcs = [
         "src/score/lcm/saf/supervision/Alive.cpp",
-        "src/score/lcm/saf/supervision/Deadline.cpp",
         "src/score/lcm/saf/supervision/Global.cpp",
         "src/score/lcm/saf/supervision/ICheckpointSupervision.cpp",
         "src/score/lcm/saf/supervision/ISupervision.cpp",
         "src/score/lcm/saf/supervision/Local.cpp",
-        "src/score/lcm/saf/supervision/Logical.cpp",
         "src/score/lcm/saf/supervision/ProcessStateTracker.cpp",
     ],
     hdrs = glob([

src/launch_manager_daemon/health_monitor_lib/config/hm_flatcfg.fbs

@@ -18,11 +18,9 @@ table HMEcuCfg {
   hmMonitorInterface: [HmMonitorInterface] (id:3);
   hmSupervisionCheckpoint: [HmSupervisionCheckpoint] (id:4);
   hmAliveSupervision: [HmAliveSupervision] (id:5);
-  hmDeadlineSupervision: [HmDeadlineSupervision] (id:6);
-  hmLogicalSupervision: [HmLogicalSupervision] (id:7);
-  hmLocalSupervision: [HmLocalSupervision] (id:8);
-  hmGlobalSupervision: [HmGlobalSupervision] (id:9);
-  hmRecoveryNotification: [RecoveryNotification] (id:10);
+  hmLocalSupervision: [HmLocalSupervision] (id:6);
+  hmGlobalSupervision: [HmGlobalSupervision] (id:7);
+  hmRecoveryNotification: [RecoveryNotification] (id:8);
 }
 
 table Process {
@@ -81,56 +79,17 @@ table HmAliveSupervision {
   refProcessGroupStates: [HmRefProcessGroupStates] (id:9);
 }
 
-table HmDeadlineSupervision {
-  ruleContextKey: string (id:0);
-  maxDeadline: double (id:1);
-  minDeadline: double (id:2);
-  checkpointTransition: HmCheckpointTransition (id:3);
-  refProcessIndices: [uint32] (id:4);
-  refProcessGroupStates: [HmRefProcessGroupStates] (id:5);
-}
-
-table HmLogicalSupervision {
-  ruleContextKey: string (id:0);
-  checkpoints: [HmLogicalCheckpoint] (id:1);
-  transitions: [HmLogicalTransition] (id:2);
-  refProcessIndices: [uint32] (id:3);
-  refProcessGroupStates: [HmRefProcessGroupStates] (id:4);
-}
-
-table HmLogicalCheckpoint {
-  refCheckPointIndex: uint32 (id:0);
-  isInitial: bool (id:1);
-  isFinal: bool (id:2);
-}
-
-table HmLogicalTransition {
-  checkpointSourceIdx: uint32 (id:0);
-  checkpointTargetIdx: uint32 (id:1);
-}
-
 table HmLocalSupervision {
   ruleContextKey: string (id:0);
   infoRefInterfacePath: string (id:1);
   hmRefAliveSupervision: [HmRefAliveSupervision] (id:2);
-  hmRefDeadlineSupervision: [HmRefDeadlineSupervision] (id:3);
-  hmRefLogicalSupervision: [HmRefLogicalSupervision] (id:4);
 }
 
 table HmRefAliveSupervision {
   ruleContextKey: int (id:0);
   refAliveSupervisionIdx: uint32 (id:1);
 }
 
-table HmRefDeadlineSupervision {
-  ruleContextKey: int (id:0);
-  refDeadlineSupervisionIdx: uint32 (id:1);
-}
-
-table HmRefLogicalSupervision {
-  refLogicalSupervisionIdx: uint32 (id:0);
-}
-
 table HmGlobalSupervision {
   ruleContextKey: string (id:0);
   isSeverityCritical: bool (id:1);