rename fault state levels

LKuemmel · LKuemmel · commit f24c4e433384 · 2025-02-04T17:43:27.000+01:00
diff --git a/packages/control/counter_all.py b/packages/control/counter_all.py
@@ -111,8 +111,8 @@ def set_home_consumption(self) -> None:
                 else:
                     hc_counter_source = f"counter{self.data.config.home_consumption_source_id}"
                 hc_counter_data = data.data.counter_data[hc_counter_source].data
-                if hc_counter_data.get.fault_state == FaultStateLevel.NO_ERROR:
-                    hc_counter_data.get.fault_state = FaultStateLevel.WARNING.value
+                if hc_counter_data.get.fault_state == FaultStateLevel.NORMAL_OPERATION:
+                    hc_counter_data.get.fault_state = FaultStateLevel.INFO.value
                     hc_counter_data.get.fault_str = ("Hinweis: Es gibt mehr Stromerzeuger im Haus als in der openWB "
                                                      "eingetragen sind. Der Hausverbrauch kann nicht korrekt berechnet "
                                                      "werden. Dies hat auf die PV-Überschussladung keine negativen "
diff --git a/packages/control/counter_home_consumption_test.py b/packages/control/counter_home_consumption_test.py
@@ -40,7 +40,7 @@ def test_set_home_consumption(home_consumption: int,
                               data_):
     # setup
     c = hierarchy_standard()
-    data.data.counter_data["counter0"].data.get.fault_state = FaultStateLevel.NO_ERROR
+    data.data.counter_data["counter0"].data.get.fault_state = FaultStateLevel.NORMAL_OPERATION
     c.data.set.invalid_home_consumption = invalid_home_consumption
     c.data.set.home_consumption = 200
     calc_home_consumption_mock = Mock(return_value=[home_consumption, []])
diff --git a/packages/control/counter_test.py b/packages/control/counter_test.py
@@ -22,7 +22,7 @@ def general_data_fixture() -> None:
 
 @pytest.mark.parametrize("fault_state, expected_loadmanagement_available",
                          [pytest.param(FaultStateLevel.ERROR, 1652683252),
-                          pytest.param(FaultStateLevel.NO_ERROR, None)])
+                          pytest.param(FaultStateLevel.NORMAL_OPERATION, None)])
 def test_set_loadmanagement_state(fault_state: FaultStateLevel,
                                   expected_loadmanagement_available: bool,
                                   monkeypatch,
diff --git a/packages/control/ocpp.py b/packages/control/ocpp.py
@@ -40,8 +40,8 @@ async def make_call() -> websockets.WebSocketClientProtocol:
                 if self.data.ocpp.active and chargebox_id:
                     return asyncio.run(make_call())
             except websockets.exceptions.InvalidStatusCode:
-                fault_state.warning(f"Chargebox ID {chargebox_id} konnte nicht im OCPP-Backend gefunden werden oder "
-                                    "URL des Backends ist falsch.")
+                fault_state.info(f"Chargebox ID {chargebox_id} konnte nicht im OCPP-Backend gefunden werden oder "
+                                 "URL des Backends ist falsch.")
             return None
 
         def boot_notification(self: OptionalProtocol,
diff --git a/packages/control/process.py b/packages/control/process.py
@@ -55,7 +55,7 @@ def process_algorithm_results(self) -> None:
                             f"openWB/set/chargepoint/{cp.num}/get/state_str",
                             "Ladevorgang wurde gestartet... (bei Problemen: Prüfe bitte zuerst in den Einstellungen"
                             " 'Ladeeinstellungen' und 'Konfiguration'.)")
-                    if cp.chargepoint_module.fault_state.fault_state != FaultStateLevel.NO_ERROR:
+                    if cp.chargepoint_module.fault_state.fault_state != FaultStateLevel.NORMAL_OPERATION:
                         cp.chargepoint_module.fault_state.store_error()
                     modules_threads.append(self._start_charging(cp))
                     cp.remember_previous_values()
diff --git a/packages/modules/chargepoints/openwb_dc_adapter/chargepoint_module.py b/packages/modules/chargepoints/openwb_dc_adapter/chargepoint_module.py
@@ -78,7 +78,7 @@ def get_values(self) -> None:
                 json_rsp = self.__session.get('http://'+ip_address+'/connect.php').json()
 
                 if json_rsp["fault_state"] == 1:
-                    self.fault_state.warning(json_rsp["fault_str"])
+                    self.fault_state.info(json_rsp["fault_str"])
                 elif json_rsp["fault_state"] == 2:
                     raise Exception(json_rsp["fault_str"])
 
diff --git a/packages/modules/chargepoints/openwb_pro/chargepoint_module.py b/packages/modules/chargepoints/openwb_pro/chargepoint_module.py
@@ -83,7 +83,7 @@ def request_values(self) -> None:
             if json_rsp.get("voltages"):
                 meter_msg = check_meter_values(json_rsp["voltages"])
                 if meter_msg:
-                    self.fault_state.warning(meter_msg)
+                    self.fault_state.info(meter_msg)
                 chargepoint_state.voltages = json_rsp["voltages"]
             if json_rsp.get("soc_value"):
                 chargepoint_state.soc = json_rsp["soc_value"]
diff --git a/packages/modules/common/component_context.py b/packages/modules/common/component_context.py
@@ -58,7 +58,7 @@ def __enter__(self):
         log.debug("Update Komponenten " +
                   str([component.fault_state.component_info.name for component in self.__device_components]))
         for component in self.__device_components:
-            component.fault_state.fault_state = FaultStateLevel.NO_ERROR
+            component.fault_state.fault_state = FaultStateLevel.NORMAL_OPERATION
             component.fault_state.fault_str = NO_ERROR
         return None
 
diff --git a/packages/modules/common/configurable_device.py b/packages/modules/common/configurable_device.py
@@ -32,7 +32,7 @@ def __call__(self, components: Iterable[T_COMPONENT]) -> None:
         components_list = list(components)
         with MultiComponentUpdateContext(components_list):
             if not components:
-                raise FaultState.warning("Keine Komponenten konfiguriert")
+                raise FaultState.info("Keine Komponenten konfiguriert")
             self.__updater(components_list)
 
 
diff --git a/packages/modules/common/configurable_tariff.py b/packages/modules/common/configurable_tariff.py
@@ -30,7 +30,7 @@ def update(self):
                 self.store.update()
                 for timestamp in tariff_state.prices.keys():
                     if timestamp < current_hour:
-                        self.fault_state.warning('Die Preisliste startet nicht mit der aktuellen Stunde.')
+                        self.fault_state.info('Die Preisliste startet nicht mit der aktuellen Stunde.')
                 if len(tariff_state.prices) < 24:
                     self.fault_state.no_error(
                         f'Die Preisliste hat nicht 24, sondern {len(tariff_state.prices)} Einträge. '
diff --git a/packages/modules/common/fault_state.py b/packages/modules/common/fault_state.py
@@ -41,11 +41,11 @@ class FaultState(Exception):
     def __init__(self, component_info: ComponentInfo) -> None:
         self.component_info = component_info
         self.fault_str = NO_ERROR
-        self.fault_state = FaultStateLevel.NO_ERROR
+        self.fault_state = FaultStateLevel.NORMAL_OPERATION
 
     def store_error(self) -> None:
         try:
-            if self.fault_state != FaultStateLevel.NO_ERROR:
+            if self.fault_state != FaultStateLevel.NORMAL_OPERATION:
                 log.error(self.component_info.name + ": FaultState " +
                           str(self.fault_state) + ", FaultStr " +
                           self.fault_str + ", Traceback: \n" +
@@ -72,21 +72,21 @@ def error(self, message: str) -> None:
         self.fault_str = message
         self.fault_state = FaultStateLevel.ERROR
 
-    def warning(self, message: str) -> None:
+    def info(self, message: str) -> None:
         self.fault_str = message
-        self.fault_state = FaultStateLevel.WARNING
+        self.fault_state = FaultStateLevel.INFO
 
     def no_error(self, message: Optional[str] = None) -> None:
         if message:
             self.fault_str = message
         else:
             self.fault_str = NO_ERROR
-        self.fault_state = FaultStateLevel.NO_ERROR
+        self.fault_state = FaultStateLevel.NORMAL_OPERATION
 
     def from_exception(self, exception: Optional[Exception] = None) -> None:
         if exception is None:
             self.fault_str = NO_ERROR
-            self.fault_state = FaultStateLevel.NO_ERROR
+            self.fault_state = FaultStateLevel.NORMAL_OPERATION
         elif isinstance(exception, FaultState):
             self.fault_str = exception.fault_str
             self.fault_state = exception.fault_state
diff --git a/packages/modules/common/fault_state_level.py b/packages/modules/common/fault_state_level.py
@@ -2,6 +2,6 @@
 
 
 class FaultStateLevel(IntEnum):
-    NO_ERROR = 0
-    WARNING = 1
+    NORMAL_OPERATION = 0
+    INFO = 1
     ERROR = 2
diff --git a/packages/modules/common/hardware_check.py b/packages/modules/common/hardware_check.py
@@ -83,7 +83,7 @@ def check_hardware(self: ClientHandlerProtocol, fault_state: FaultState):
         elif evse_check_passed and meter_check_passed and meter_error_msg is not None:
             if meter_error_msg != METER_NO_SERIAL_NUMBER:
                 meter_error_msg += OPEN_TICKET
-            fault_state.warning(meter_error_msg)
+            fault_state.info(meter_error_msg)
         if evse_check_passed is False:
             if meter_error_msg is not None:
                 raise Exception(EVSE_BROKEN + " " + meter_error_msg + OPEN_TICKET)
diff --git a/packages/modules/devices/lg/lg/bat.py b/packages/modules/devices/lg/lg/bat.py
@@ -26,7 +26,7 @@ def update(self, response) -> None:
         try:
             soc = float(response["statistics"]["bat_user_soc"])
         except ValueError:
-            self.fault_state.warning('Speicher-SOC ist nicht numerisch und wird auf 0 gesetzt.')
+            self.fault_state.info('Speicher-SOC ist nicht numerisch und wird auf 0 gesetzt.')
             soc = 0
 
         imported, exported = self.sim_counter.sim_count(power)
diff --git a/packages/modules/devices/rct/rct/bat.py b/packages/modules/devices/rct/rct/bat.py
@@ -40,7 +40,7 @@ def update(self, rct_client: RCT) -> None:
         self.store.set(bat_state)
         if (stat1.value + stat2.value + stat3.value) > 0:
             # Werte werden trotz Fehlercode übermittelt.
-            self.fault_state.warning(
+            self.fault_state.info(
                 f"Alarm Status Speicher ist ungleich 0. Status 1: {stat1.value}, Status 2: {stat2.value}, "
                 f"Status 3: {stat3.value}")
 
diff --git a/packages/modules/devices/rct/rct/counter.py b/packages/modules/devices/rct/rct/counter.py
@@ -50,7 +50,7 @@ def update(self, rct_client: RCT):
         self.store.set(counter_state)
         if (stat1.value + stat2.value + stat3.value + stat4.value) > 0:
             # Werte werden trotz Fehlercode übermittelt.
-            self.fault_state.warning(
+            self.fault_state.info(
                 f"Alarm Status Speicher ist ungleich 0. Status 1: {stat1.value}, Status 2: {stat2.value}, "
                 f"Status 3: {stat3.value}, Status 4: {stat4.value},")
 
diff --git a/packages/modules/devices/sungrow/sungrow/counter.py b/packages/modules/devices/sungrow/sungrow/counter.py
@@ -39,7 +39,7 @@ def update(self, pv_power: float):
                                                                 wordorder=Endian.Little, unit=unit)
             except Exception:
                 powers = None
-                self.fault_state.warning(self.fault_text)
+                self.fault_state.info(self.fault_text)
         else:
             if pv_power != 0:
                 power = self.__tcp_client.read_input_registers(5082, ModbusDataType.INT_32,
@@ -52,7 +52,7 @@ def update(self, pv_power: float):
                                                                 wordorder=Endian.Little, unit=unit)
             except Exception:
                 powers = None
-                self.fault_state.warning(self.fault_text)
+                self.fault_state.info(self.fault_text)
 
         frequency = self.__tcp_client.read_input_registers(5035, ModbusDataType.UINT_16, unit=unit) / 10
         if self.device_config.configuration.version == Version.SH_winet_dongle:
