diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index bec9d27..164ca76 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -5,7 +5,7 @@ ## Upgrading - +* Microgrid_config is updated from AC_ACTIVE_POWER to AC_POWER_ACTIVE in accordance with the update in client-reporting - v0.20.0 ## New Features diff --git a/src/frequenz/gridpool/_microgrid_config.py b/src/frequenz/gridpool/_microgrid_config.py index f18144f..45f2060 100644 --- a/src/frequenz/gridpool/_microgrid_config.py +++ b/src/frequenz/gridpool/_microgrid_config.py @@ -41,8 +41,8 @@ class ComponentTypeConfig: def __post_init__(self) -> None: """Set the default formula if none is provided.""" self.formula = self.formula or {} - if "AC_ACTIVE_POWER" not in self.formula: - self.formula["AC_ACTIVE_POWER"] = "+".join( + if "AC_POWER_ACTIVE" not in self.formula: + self.formula["AC_POWER_ACTIVE"] = "+".join( [f"#{cid}" for cid in self._default_cids()] ) diff --git a/tests/test_config.py b/tests/test_config.py index fa12e7e..8cc23dc 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -16,7 +16,7 @@ "1": { "meta": {"name": "Test Grid", "gid": 1, "microgrid_id": 1}, "ctype": { - "pv": {"meter": [101, 102], "formula": {"AC_ACTIVE_POWER": "#12+#23"}}, + "pv": {"meter": [101, 102], "formula": {"AC_POWER_ACTIVE": "#12+#23"}}, "battery": { "inverter": [201, 202, 203], "component": [301, 302, 303, 304, 305, 306], @@ -104,7 +104,7 @@ def test_microgrid_config_component_type_ids( def test_microgrid_config_formula(valid_microgrid_config: MicrogridConfig) -> None: """Test retrieval of formula for a given component type and metric.""" - assert valid_microgrid_config.formula("pv", "AC_ACTIVE_POWER") == "#12+#23" + assert valid_microgrid_config.formula("pv", "AC_POWER_ACTIVE") == "#12+#23" with pytest.raises(ValueError): valid_microgrid_config.formula("pv", "INVALID_METRIC")