Rename _battery_status.py → _battery_status_tracker.py

Also rename `BatteryStatusTracker`'s argument `battery_id` → `component_id`.

Signed-off-by: Sahas Subramanian <[email protected]>

Author: shsms

…or/power_distributing/_battery_status.py …_distributing/_battery_status_tracker.pysrc/frequenz/sdk/actor/power_distributing/_battery_status.py renamed to src/frequenz/sdk/actor/power_distributing/_battery_status_tracker.py src/frequenz/sdk/actor/power_distributing/_battery_status.py renamed to src/frequenz/sdk/actor/power_distributing/_battery_status_tracker.py

@@ -170,7 +170,7 @@ class BatteryStatusTracker:
 
     def __init__(  # pylint: disable=too-many-arguments
         self,
-        battery_id: int,
+        component_id: int,
         max_data_age_sec: float,
         max_blocking_duration_sec: float,
         status_sender: Sender[ComponentStatus],
@@ -179,7 +179,7 @@ def __init__(  # pylint: disable=too-many-arguments
         """Create class instance.
 
         Args:
-            battery_id: Id of this battery
+            component_id: Id of this battery
             max_data_age_sec: If component stopped sending data, then
                 this is the maximum time when its last message should be considered as
                 valid. After that time, component won't be used until it starts sending
@@ -201,12 +201,14 @@ def __init__(  # pylint: disable=too-many-arguments
             1.0, max_blocking_duration_sec
         )
 
-        inverter_id = self._find_adjacent_inverter_id(battery_id)
+        inverter_id = self._find_adjacent_inverter_id(component_id)
         if inverter_id is None:
-            raise RuntimeError(f"Can't find inverter adjacent to battery: {battery_id}")
+            raise RuntimeError(
+                f"Can't find inverter adjacent to battery: {component_id}"
+            )
 
         self._battery: _ComponentStreamStatus = _ComponentStreamStatus(
-            battery_id,
+            component_id,
             data_recv_timer=Timer.timeout(timedelta(seconds=max_data_age_sec)),
         )
         self._inverter: _ComponentStreamStatus = _ComponentStreamStatus(

src/frequenz/sdk/actor/power_distributing/_component_pool_status_tracker.py

@@ -12,7 +12,7 @@
 from frequenz.channels.util import Merge
 
 from ..._internal._asyncio import cancel_and_await
-from ._battery_status import BatteryStatusTracker, SetPowerResult
+from ._battery_status_tracker import BatteryStatusTracker, SetPowerResult
 from ._component_status import ComponentPoolStatus, ComponentStatus, ComponentStatusEnum
 
 _logger = logging.getLogger(__name__)
@@ -93,7 +93,7 @@ def _make_merged_status_receiver(
                 f"component_{component_id}_status"
             )
             tracker = BatteryStatusTracker(
-                battery_id=component_id,
+                component_id=component_id,
                 max_data_age_sec=self._max_data_age_sec,
                 max_blocking_duration_sec=self._max_blocking_duration_sec,
                 status_sender=channel.new_sender(),

tests/actor/test_battery_status.py

@@ -28,7 +28,7 @@
 from frequenz.channels import Broadcast, Receiver
 from pytest_mock import MockerFixture
 
-from frequenz.sdk.actor.power_distributing._battery_status import (
+from frequenz.sdk.actor.power_distributing._battery_status_tracker import (
     BatteryStatusTracker,
     SetPowerResult,
 )