Expose internal mock_client to users of MockMicrogrid

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

Author: shsms

tests/timeseries/mock_microgrid.py

@@ -48,7 +48,7 @@ class MockMicrogrid:  # pylint: disable=too-many-instance-attributes
     inverter_id_suffix = 8
     battery_id_suffix = 9
 
-    _microgrid: MockMicrogridClient
+    mock_client: MockMicrogridClient
     mock_resampler: MockResampler
 
     def __init__(  # pylint: disable=too-many-arguments
@@ -123,8 +123,8 @@ def init_mock_client(
         self, initialize_cb: Callable[[MockMicrogridClient], None]
     ) -> None:
         """Set up the mock client. Does not start the streaming tasks."""
-        self._microgrid = MockMicrogridClient(self._components, self._connections)
-        initialize_cb(self._microgrid)
+        self.mock_client = MockMicrogridClient(self._components, self._connections)
+        initialize_cb(self.mock_client)
 
     def start_mock_client(
         self, initialize_cb: Callable[[MockMicrogridClient], None]
@@ -146,7 +146,7 @@ def start_mock_client(
         self._streaming_tasks = [
             asyncio.create_task(coro) for coro in self._streaming_coros
         ]
-        return self._microgrid
+        return self.mock_client
 
     async def _comp_data_send_task(
         self, comp_id: int, make_comp_data: Callable[[int, datetime], ComponentData]
@@ -157,12 +157,12 @@ async def _comp_data_send_task(
             # for inverters with component_id > 100, send only half the messages.
             if comp_id % 10 == self.inverter_id_suffix:
                 if comp_id < 100 or value <= 5:
-                    await self._microgrid.send(make_comp_data(val_to_send, timestamp))
+                    await self.mock_client.send(make_comp_data(val_to_send, timestamp))
             else:
-                await self._microgrid.send(make_comp_data(val_to_send, timestamp))
+                await self.mock_client.send(make_comp_data(val_to_send, timestamp))
             await asyncio.sleep(self._sample_rate_s)
 
-        await self._microgrid.close_channel(comp_id)
+        await self.mock_client.close_channel(comp_id)
 
     def _start_meter_streaming(self, meter_id: int) -> None:
         if not self._api_client_streaming:
@@ -359,7 +359,7 @@ async def send_meter_data(self, values: list[float]) -> None:
         assert len(values) == len(self.meter_ids)
         timestamp = datetime.now(tz=timezone.utc)
         for comp_id, value in zip(self.meter_ids, values):
-            await self._microgrid.send(
+            await self.mock_client.send(
                 MeterDataWrapper(
                     component_id=comp_id,
                     timestamp=timestamp,
@@ -381,7 +381,7 @@ async def send_battery_data(self, socs: list[float]) -> None:
         assert len(socs) == len(self.battery_ids)
         timestamp = datetime.now(tz=timezone.utc)
         for comp_id, value in zip(self.battery_ids, socs):
-            await self._microgrid.send(
+            await self.mock_client.send(
                 BatteryDataWrapper(component_id=comp_id, timestamp=timestamp, soc=value)
             )
 
@@ -394,7 +394,7 @@ async def send_battery_inverter_data(self, values: list[float]) -> None:
         assert len(values) == len(self.battery_inverter_ids)
         timestamp = datetime.now(tz=timezone.utc)
         for comp_id, value in zip(self.battery_inverter_ids, values):
-            await self._microgrid.send(
+            await self.mock_client.send(
                 InverterDataWrapper(
                     component_id=comp_id, timestamp=timestamp, active_power=value
                 )
@@ -409,7 +409,7 @@ async def send_pv_inverter_data(self, values: list[float]) -> None:
         assert len(values) == len(self.pv_inverter_ids)
         timestamp = datetime.now(tz=timezone.utc)
         for comp_id, value in zip(self.pv_inverter_ids, values):
-            await self._microgrid.send(
+            await self.mock_client.send(
                 InverterDataWrapper(
                     component_id=comp_id, timestamp=timestamp, active_power=value
                 )
@@ -424,7 +424,7 @@ async def send_ev_charger_data(self, values: list[float]) -> None:
         assert len(values) == len(self.evc_ids)
         timestamp = datetime.now(tz=timezone.utc)
         for comp_id, value in zip(self.evc_ids, values):
-            await self._microgrid.send(
+            await self.mock_client.send(
                 EvChargerDataWrapper(
                     component_id=comp_id,
                     timestamp=timestamp,