Skip to content

Commit 70d9d43

Browse files
Rename microgrid.Microgrid to microgrid.ConnectionManager and its Insecure-companion (#208)
Closes #90 Mind, I did not rename from `microgrid.Microgrid` to `microgrid.MicrogridConnectionManager` but to `microgrid.ConnectionManager` as this reads way less repeatitive. Also, this "type is not meant to be used by users directly". :)
2 parents 2000da0 + 3a73cdf commit 70d9d43

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/frequenz/sdk/microgrid/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
from . import client, component
1111
from ._graph import ComponentGraph
12-
from ._microgrid import Microgrid, get, initialize
12+
from ._microgrid import ConnectionManager, get, initialize
1313

1414
__all__ = [
1515
"ComponentGraph",
16-
"Microgrid",
16+
"ConnectionManager",
1717
"get",
1818
"initialize",
1919
"client",

src/frequenz/sdk/microgrid/_microgrid.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# License: MIT
22
# Copyright © 2022 Frequenz Energy-as-a-Service GmbH
33

4-
"""Microgrid singleton abstraction.
4+
"""Microgrid Connection Manager singleton abstraction.
55
66
This module provides a singleton abstraction over the microgrid. The main
77
purpose is to provide the connection the microgrid API client and the microgrid
@@ -22,7 +22,7 @@
2222
_DEFAULT_MICROGRID_PORT = 443
2323

2424

25-
class Microgrid(ABC):
25+
class ConnectionManager(ABC):
2626
"""Creates and stores core features."""
2727

2828
def __init__(self, host: str, port: int) -> None:
@@ -81,7 +81,7 @@ async def _initialize(self) -> None:
8181
"""Initialize the object. This function should be called only once."""
8282

8383

84-
class _MicrogridInsecure(Microgrid):
84+
class _InsecureConnectionManager(ConnectionManager):
8585
"""Microgrid Api with insecure channel implementation."""
8686

8787
def __init__(
@@ -137,7 +137,7 @@ async def _initialize(self) -> None:
137137
await self._graph.refresh_from_api(self._api)
138138

139139

140-
_MICROGRID: Optional[Microgrid] = None
140+
_MICROGRID: Optional[ConnectionManager] = None
141141

142142

143143
async def initialize(host: str, port: int) -> None:
@@ -157,7 +157,7 @@ async def initialize(host: str, port: int) -> None:
157157
if _MICROGRID is not None:
158158
raise AssertionError("MicrogridApi was already initialized.")
159159

160-
microgrid_api = _MicrogridInsecure(host, port)
160+
microgrid_api = _InsecureConnectionManager(host, port)
161161
await microgrid_api._initialize() # pylint: disable=protected-access
162162

163163
# Check again that _MICROGRID_API is None in case somebody had the great idea of
@@ -168,7 +168,7 @@ async def initialize(host: str, port: int) -> None:
168168
_MICROGRID = microgrid_api
169169

170170

171-
def get() -> Microgrid:
171+
def get() -> ConnectionManager:
172172
"""Get the MicrogridApi instance created by initialize().
173173
174174
This function should be only called after initialize().

tests/utils/mock_microgrid.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from google.protobuf.empty_pb2 import Empty # pylint: disable=no-name-in-module
1111
from pytest_mock import MockerFixture
1212

13-
from frequenz.sdk.microgrid import Microgrid
13+
from frequenz.sdk.microgrid import ConnectionManager
1414
from frequenz.sdk.microgrid._graph import ComponentGraph, _MicrogridComponentGraph
1515
from frequenz.sdk.microgrid.client import Connection
1616
from frequenz.sdk.microgrid.component import (
@@ -57,7 +57,7 @@ def __init__(self, components: Set[Component], connections: Set[Connection]):
5757
"component_graph": self._component_graph,
5858
}
5959

60-
self._mock_microgrid = MagicMock(spec=Microgrid, **kwargs)
60+
self._mock_microgrid = MagicMock(spec=ConnectionManager, **kwargs)
6161
self._battery_data_senders = {
6262
id: channel.new_sender() for id, channel in bat_channels.items()
6363
}
@@ -83,7 +83,7 @@ def initialize(self, mocker: MockerFixture) -> None:
8383
)
8484

8585
@property
86-
def mock_microgrid(self) -> Microgrid:
86+
def mock_microgrid(self) -> ConnectionManager:
8787
"""Return mock microgrid.
8888
8989
This is needed to patch existing microgrid.get() method.

0 commit comments

Comments
 (0)