Update fan event YAML to new syntax

1 files changed, 225 insertions, 193 deletions

diff --git a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
index 6801abe9a..37fbe6dbd 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
@@ -271,130 +271,166 @@ actions:
           - delta
 
 events:
+    - name: default_fan_floor_on_service_fail
+      # No global zone conditions defined == all unless defined on group
+      groups:
+          - name: zone2_ambient
+            interface: xyz.openbmc_project.Sensor.Value
+            property:
+                name: Value
+                type: int64_t
+      matches:
+          - name: nameOwnerChanged
+      actions:
+          - name: call_actions_based_on_timer
+            timer:
+                delay: 5
+                type: oneshot
+            actions:
+                - name: default_floor_on_missing_owner
     - name: missing_before_high_speed_air_zone0
-      zone_conditions:
-          - name: air_cooled_chassis
-            zones:
-                - 0
-      group: air_cooled_zone0_fans
-      interface: xyz.openbmc_project.Inventory.Item
-      property:
-          name: Present
-          type: bool
+      groups:
+          - name: air_cooled_zone0_fans
+            zone_conditions:
+                - name: air_cooled_chassis
+                  zones:
+                      - 0
+            interface: xyz.openbmc_project.Inventory.Item
+            property:
+                name: Present
+                type: bool
       matches:
           - name: propertiesChanged
       actions:
           - name: count_state_before_speed
             count: 1
-            property: false
+            property:
+                value: false
+                type: bool
             speed:
                 value: 1000
                 type: uint64_t
     - name: missing_before_high_speed_air_zone1
-      zone_conditions:
-          - name: air_cooled_chassis
-            zones:
-                - 1
-      group: air_cooled_zone1_fans
-      interface: xyz.openbmc_project.Inventory.Item
-      property:
-          name: Present
-          type: bool
+      groups:
+          - name: air_cooled_zone1_fans
+            zone_conditions:
+                - name: air_cooled_chassis
+                  zones:
+                      - 1
+            interface: xyz.openbmc_project.Inventory.Item
+            property:
+                name: Present
+                type: bool
       matches:
           - name: propertiesChanged
       actions:
           - name: count_state_before_speed
             count: 1
-            property: false
+            property:
+                value: false
+                type: bool
             speed:
                 value: 1000
                 type: uint64_t
     - name: fails_before_high_speed_air_zone0
-      zone_conditions:
-          - name: air_cooled_chassis
-            zones:
-                - 0
-      group: air_cooled_zone0_fans
-      interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-      property:
-          name: Functional
-          type: bool
+      groups:
+          - name: air_cooled_zone0_fans
+            zone_conditions:
+                - name: air_cooled_chassis
+                  zones:
+                      - 0
+            interface: xyz.openbmc_project.State.Decorator.OperationalStatus
+            property:
+                name: Functional
+                type: bool
       matches:
           - name: propertiesChanged
       actions:
           - name: count_state_before_speed
             count: 1
-            property: false
+            property:
+                value: false
+                type: bool
             speed:
                 value: 1000
                 type: uint64_t
     - name: fails_before_high_speed_air_zone1
-      zone_conditions:
-          - name: air_cooled_chassis
-            zones:
-                - 1
-      group: air_cooled_zone1_fans
-      interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-      property:
-          name: Functional
-          type: bool
+      groups:
+          - name: air_cooled_zone1_fans
+            zone_conditions:
+                - name: air_cooled_chassis
+                  zones:
+                      - 1
+            interface: xyz.openbmc_project.State.Decorator.OperationalStatus
+            property:
+                name: Functional
+                type: bool
       matches:
           - name: propertiesChanged
       actions:
           - name: count_state_before_speed
             count: 1
-            property: false
+            property:
+                value: false
+                type: bool
             speed:
                 value: 1000
                 type: uint64_t
     - name: missing_before_high_speed_water_and_air_zone0
-      zone_conditions:
-          - name: water_and_air_cooled_chassis
-            zones:
-                - 0
-      group: water_and_air_cooled_zone0_fans
-      interface: xyz.openbmc_project.Inventory.Item
-      property:
-          name: Present
-          type: bool
+      groups:
+          - name: water_and_air_cooled_zone0_fans
+            zone_conditions:
+                - name: water_and_air_cooled_chassis
+                  zones:
+                      - 0
+            interface: xyz.openbmc_project.Inventory.Item
+            property:
+                name: Present
+                type: bool
       matches:
           - name: propertiesChanged
       actions:
           - name: count_state_before_speed
             count: 1
-            property: false
+            property:
+                value: false
+                type: bool
             speed:
                 value: 1000
                 type: uint64_t
     - name: fails_before_high_speed_water_and_air_zone0
-      zone_conditions:
-          - name: water_and_air_cooled_chassis
-            zones:
-                - 0
-      group: water_and_air_cooled_zone0_fans
-      interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-      property:
-          name: Functional
-          type: bool
+      groups:
+          - name: water_and_air_cooled_zone0_fans
+            zone_conditions:
+                - name: water_and_air_cooled_chassis
+                  zones:
+                      - 0
+            interface: xyz.openbmc_project.State.Decorator.OperationalStatus
+            property:
+                name: Functional
+                type: bool
       matches:
           - name: propertiesChanged
       actions:
           - name: count_state_before_speed
             count: 1
-            property: false
+            property:
+                value: false
+                type: bool
             speed:
                 value: 1000
                 type: uint64_t
     - name: set_air_cooled_speed_boundaries_based_on_ambient
-      zone_conditions:
-          - name: air_cooled_chassis
-            zones:
-                - 2
-      group: zone2_ambient
-      interface: xyz.openbmc_project.Sensor.Value
-      property:
-          name: Value
-          type: int64_t
+      groups:
+          - name: zone2_ambient
+            zone_conditions:
+                - name: air_cooled_chassis
+                  zones:
+                      - 2
+            interface: xyz.openbmc_project.Sensor.Value
+            property:
+                name: Value
+                type: int64_t
       matches:
           - name: propertiesChanged
       actions:
@@ -416,15 +452,16 @@ events:
                     - 27000: 1000
                 type: std::map<int64_t, uint64_t>
     - name: set_water_cooled_speed_boundaries_based_on_ambient
-      zone_conditions:
-          - name: water_and_air_cooled_chassis
-            zones:
-                - 2
-      group: zone2_ambient
-      interface: xyz.openbmc_project.Sensor.Value
-      property:
-          name: Value
-          type: int64_t
+      groups:
+          - name: zone2_ambient
+            zone_conditions:
+                - name: water_and_air_cooled_chassis
+                  zones:
+                      - 2
+            interface: xyz.openbmc_project.Sensor.Value
+            property:
+                name: Value
+                type: int64_t
       matches:
           - name: propertiesChanged
       actions:
@@ -437,7 +474,7 @@ events:
                     - 37000: 400
                     - 42000: 450
                     - 47000: 500
-                    - 50000: 550
+                    - 63000: 550
                 type: std::map<int64_t, uint64_t>
           - name: set_ceiling_from_average_sensor_value
             map:
@@ -446,59 +483,27 @@ events:
                     - 27000: 1000
                 type: std::map<int64_t, uint64_t>
     - name: speed_changes_based_on_regulator_temps
-      zone_conditions:
-          - name: air_cooled_chassis
-            zones:
-                - 0
-          - name: water_and_air_cooled_chassis
-            zones:
-                - 0
-      group: zone0_regulators
-      interface: xyz.openbmc_project.Sensor.Value
-      property:
-          name: Value
-          type: int64_t
-      matches:
-          - name: interfacesAdded
-          - name: propertiesChanged
-      actions:
-          - name: set_net_increase_speed
-            property: 85000
-            factor:
-                value: 1000
+      groups:
+          - name: zone0_regulators
+            zone_conditions:
+                - name: air_cooled_chassis
+                  zones:
+                      - 0
+                - name: water_and_air_cooled_chassis
+                  zones:
+                      - 0
+            interface: xyz.openbmc_project.Sensor.Value
+            property:
+                name: Value
                 type: int64_t
-            delta:
-                value: 40
-                type: uint64_t
-          - name: set_net_decrease_speed
-            property: 82000
-            factor:
-                value: 1000
-                type: int64_t
-            delta:
-                value: 40
-                type: uint64_t
-      timer:
-          interval: 5
-    - name: speed_changes_based_on_pcie_temps
-      zone_conditions:
-          - name: air_cooled_chassis
-            zones:
-                - 0
-          - name: water_and_air_cooled_chassis
-            zones:
-                - 0
-      group: zone0_pcie
-      interface: xyz.openbmc_project.Sensor.Value
-      property:
-          name: Value
-          type: int64_t
       matches:
           - name: interfacesAdded
           - name: propertiesChanged
       actions:
           - name: set_net_increase_speed
-            property: 55000
+            property:
+                value: 85000
+                type: int64_t
             factor:
                 value: 1000
                 type: int64_t
@@ -506,7 +511,9 @@ events:
                 value: 40
                 type: uint64_t
           - name: set_net_decrease_speed
-            property: 52000
+            property:
+                value: 82000
+                type: int64_t
             factor:
                 value: 1000
                 type: int64_t
@@ -530,21 +537,24 @@ events:
               - name: propertiesChanged
           events:
               - name: speed_changes_based_on_core_temps_zone0
-                zone_conditions:
-                    - name: air_cooled_chassis
-                      zones:
-                          - 0
-                group: zone0_cores
-                interface: xyz.openbmc_project.Sensor.Value
-                property:
-                    name: Value
-                    type: int64_t
+                groups:
+                    - name: zone0_cores
+                      zone_conditions:
+                          - name: air_cooled_chassis
+                            zones:
+                                - 0
+                      interface: xyz.openbmc_project.Sensor.Value
+                      property:
+                          name: Value
+                          type: int64_t
                 matches:
                     - name: interfacesAdded
                     - name: propertiesChanged
                 actions:
                     - name: set_net_increase_speed
-                      property: 67000
+                      property:
+                          value: 67000
+                          type: int64_t
                       factor:
                           value: 1000
                           type: int64_t
@@ -552,7 +562,9 @@ events:
                           value: 40
                           type: uint64_t
                     - name: set_net_decrease_speed
-                      property: 63000
+                      property:
+                          value: 63000
+                          type: int64_t
                       factor:
                           value: 1000
                           type: int64_t
@@ -562,37 +574,42 @@ events:
                 timer:
                     interval: 5
               - name: speed_changes_based_on_dimm_temps_zone0
-                zone_conditions:
-                    - name: air_cooled_chassis
-                      zones:
-                          - 0
-                    - name: water_and_air_cooled_chassis
-                      zones:
-                          - 0
-                group: zone0_dimms
-                interface: xyz.openbmc_project.Sensor.Value
-                property:
-                    name: Value
-                    type: int64_t
+                groups:
+                    - name: zone0_dimms
+                      zone_conditions:
+                          - name: air_cooled_chassis
+                            zones:
+                                - 0
+                          - name: water_and_air_cooled_chassis
+                            zones:
+                                - 0
+                      interface: xyz.openbmc_project.Sensor.Value
+                      property:
+                          name: Value
+                          type: int64_t
                 matches:
                     - name: interfacesAdded
                     - name: propertiesChanged
                 actions:
                     - name: set_net_increase_speed
-                      property: 64000
+                      property:
+                          value: 64000
+                          type: int64_t
                       factor:
                           value: 1000
                           type: int64_t
                       delta:
-                          value: 40
+                          value: 4
                           type: uint64_t
                     - name: set_net_decrease_speed
-                      property: 61000
+                      property:
+                          value: 61000
+                          type: int64_t
                       factor:
                           value: 1000
                           type: int64_t
                       delta:
-                          value: 40
+                          value: 1
                           type: uint64_t
                 timer:
                     interval: 5
@@ -611,21 +628,24 @@ events:
               - name: propertiesChanged
           events:
               - name: speed_changes_based_on_core_temps_zone1
-                zone_conditions:
-                    - name: air_cooled_chassis
-                      zones:
-                          - 1
-                group: zone1_cores
-                interface: xyz.openbmc_project.Sensor.Value
-                property:
-                    name: Value
-                    type: int64_t
+                groups:
+                    - name: zone1_cores
+                      zone_conditions:
+                          - name: air_cooled_chassis
+                            zones:
+                                - 1
+                      interface: xyz.openbmc_project.Sensor.Value
+                      property:
+                          name: Value
+                          type: int64_t
                 matches:
                     - name: interfacesAdded
                     - name: propertiesChanged
                 actions:
                     - name: set_net_increase_speed
-                      property: 67000
+                      property:
+                          value: 67000
+                          type: int64_t
                       factor:
                           value: 1000
                           type: int64_t
@@ -633,7 +653,9 @@ events:
                           value: 40
                           type: uint64_t
                     - name: set_net_decrease_speed
-                      property: 63000
+                      property:
+                          value: 63000
+                          type: int64_t
                       factor:
                           value: 1000
                           type: int64_t
@@ -643,24 +665,27 @@ events:
                 timer:
                     interval: 5
               - name: speed_changes_based_on_dimm_temps_zone1
-                zone_conditions:
-                    - name: air_cooled_chassis
-                      zones:
-                          - 1
-                    - name: water_and_air_cooled_chassis
-                      zones:
-                          - 2
-                group: zone1_dimms
-                interface: xyz.openbmc_project.Sensor.Value
-                property:
-                    name: Value
-                    type: int64_t
+                groups:
+                    - name: zone1_dimms
+                      zone_conditions:
+                          - name: air_cooled_chassis
+                            zones:
+                                - 1
+                          - name: water_and_air_cooled_chassis
+                            zones:
+                                - 2
+                      interface: xyz.openbmc_project.Sensor.Value
+                      property:
+                          name: Value
+                          type: int64_t
                 matches:
                     - name: interfacesAdded
                     - name: propertiesChanged
                 actions:
                     - name: set_net_increase_speed
-                      property: 64000
+                      property:
+                          value: 64000
+                          type: int64_t
                       factor:
                           value: 1000
                           type: int64_t
@@ -668,7 +693,9 @@ events:
                           value: 40
                           type: uint64_t
                     - name: set_net_decrease_speed
-                      property: 61000
+                      property:
+                          value: 61000
+                          type: int64_t
                       factor:
                           value: 1000
                           type: int64_t
@@ -692,24 +719,27 @@ events:
               - name: propertiesChanged
           events:
               - name: speed_changes_based_on_ambient_temp
-                zone_conditions:
-                    - name: air_cooled_chassis
-                      zones:
-                          - 2
-                    - name: water_and_air_cooled_chassis
-                      zones:
-                          - 2
-                group: zone2_ambient
-                interface: xyz.openbmc_project.Sensor.Value
-                property:
-                    name: Value
-                    type: int64_t
+                groups:
+                    - name: zone2_ambient
+                      zone_conditions:
+                          - name: air_cooled_chassis
+                            zones:
+                                - 2
+                          - name: water_and_air_cooled_chassis
+                            zones:
+                                - 2
+                      interface: xyz.openbmc_project.Sensor.Value
+                      property:
+                          name: Value
+                          type: int64_t
                 matches:
                     - name: interfacesAdded
                     - name: propertiesChanged
                 actions:
                     - name: set_net_increase_speed
-                      property: 45000
+                      property:
+                          value: 45000
+                          type: int64_t
                       factor:
                           value: 1000
                           type: int64_t
@@ -717,7 +747,9 @@ events:
                           value: 10
                           type: uint64_t
                     - name: set_net_decrease_speed
-                      property: 35000
+                      property:
+                          value: 35000
+                          type: int64_t
                       factor:
                           value: 1000
                           type: int64_t