Skip to content

Rename Association to AssociationAddress #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 15, 2022
Merged

Rename Association to AssociationAddress #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6197d2
Rename Association to AssociationAddress
raman325 Apr 11, 2022
804cea9
clean up variable names
raman325 Apr 11, 2022
2762896
fix test
raman325 Apr 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions test/model/test_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@ async def test_get_association_groups(controller, uuid4, mock_command):
},
)

association_address = association_pkg.Association(node_id=52)
association_address = association_pkg.AssociationAddress(node_id=52)
result = await controller.async_get_association_groups(association_address)

assert result[1].max_nodes == 10
Expand Down Expand Up @@ -950,7 +950,7 @@ async def test_get_associations(controller, uuid4, mock_command):
},
)

association_address = association_pkg.Association(node_id=52)
association_address = association_pkg.AssociationAddress(node_id=52)
result = await controller.async_get_associations(association_address)

assert result[1][0].node_id == 10
Expand Down Expand Up @@ -984,9 +984,9 @@ async def test_is_association_allowed(controller, uuid4, mock_command):
{"allowed": True},
)

association_address = association_pkg.Association(node_id=52)
association_address = association_pkg.AssociationAddress(node_id=52)
group = 0
association = association_pkg.Association(node_id=5, endpoint=0)
association = association_pkg.AssociationAddress(node_id=5, endpoint=0)

assert await controller.async_is_association_allowed(
association_address, group, association
Expand All @@ -1010,11 +1010,11 @@ async def test_add_associations(controller, uuid4, mock_command):
{},
)

association_address = association_pkg.Association(node_id=52)
association_address = association_pkg.AssociationAddress(node_id=52)
group = 0
associations = [
association_pkg.Association(node_id=5, endpoint=0),
association_pkg.Association(node_id=10),
association_pkg.AssociationAddress(node_id=5, endpoint=0),
association_pkg.AssociationAddress(node_id=10),
]

await controller.async_add_associations(association_address, group, associations)
Expand All @@ -1031,11 +1031,11 @@ async def test_add_associations(controller, uuid4, mock_command):
],
}

association_address = association_pkg.Association(node_id=52, endpoint=111)
association_address = association_pkg.AssociationAddress(node_id=52, endpoint=111)
group = 1
associations = [
association_pkg.Association(node_id=11),
association_pkg.Association(node_id=6, endpoint=1),
association_pkg.AssociationAddress(node_id=11),
association_pkg.AssociationAddress(node_id=6, endpoint=1),
]

await controller.async_add_associations(
Expand Down Expand Up @@ -1064,11 +1064,11 @@ async def test_remove_associations(controller, uuid4, mock_command):
{},
)

association_address = association_pkg.Association(node_id=52)
association_address = association_pkg.AssociationAddress(node_id=52)
group = 0
associations = [
association_pkg.Association(node_id=5, endpoint=0),
association_pkg.Association(node_id=10),
association_pkg.AssociationAddress(node_id=5, endpoint=0),
association_pkg.AssociationAddress(node_id=10),
]

await controller.async_remove_associations(association_address, group, associations)
Expand All @@ -1085,11 +1085,11 @@ async def test_remove_associations(controller, uuid4, mock_command):
],
}

association_address = association_pkg.Association(node_id=53, endpoint=112)
association_address = association_pkg.AssociationAddress(node_id=53, endpoint=112)
group = 1
associations = [
association_pkg.Association(node_id=11),
association_pkg.Association(node_id=6, endpoint=1),
association_pkg.AssociationAddress(node_id=11),
association_pkg.AssociationAddress(node_id=6, endpoint=1),
]

await controller.async_remove_associations(
Expand Down
2 changes: 1 addition & 1 deletion zwave_js_server/model/association.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class AssociationGroup:


@dataclass
class Association:
class AssociationAddress:
"""Represent a association dict type."""

node_id: int
Expand Down
33 changes: 17 additions & 16 deletions zwave_js_server/model/controller/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
)
from ...event import Event, EventBase
from ...util.helpers import convert_base64_to_bytes, convert_bytes_to_base64
from ..association import Association, AssociationGroup
from ..association import AssociationAddress, AssociationGroup
from ..node import Node
from .data_model import ControllerDataType
from .event_model import CONTROLLER_EVENT_MODEL_MAP
Expand Down Expand Up @@ -420,7 +420,7 @@ async def async_is_failed_node(self, node_id: int) -> bool:
return cast(bool, data["failed"])

async def async_get_association_groups(
self, source: Association
self, source: AssociationAddress
) -> Dict[int, AssociationGroup]:
"""Send getAssociationGroups command to Controller."""
source_data = {"nodeId": source.node_id}
Expand All @@ -445,8 +445,8 @@ async def async_get_association_groups(
return groups

async def async_get_associations(
self, source: Association
) -> Dict[int, List[Association]]:
self, source: AssociationAddress
) -> Dict[int, List[AssociationAddress]]:
"""Send getAssociations command to Controller."""
source_data = {"nodeId": source.node_id}
if source.endpoint is not None:
Expand All @@ -457,18 +457,19 @@ async def async_get_associations(
**source_data,
}
)
associations_map = {}
for key, associations in data["associations"].items():
associations_map[int(key)] = [
Association(
node_id=association["nodeId"], endpoint=association.get("endpoint")
associations = {}
for key, association_addresses in data["associations"].items():
associations[int(key)] = [
AssociationAddress(
node_id=association_address["nodeId"],
endpoint=association_address.get("endpoint"),
)
for association in associations
for association_address in association_addresses
]
return associations_map
return associations

async def async_is_association_allowed(
self, source: Association, group: int, association: Association
self, source: AssociationAddress, group: int, association: AssociationAddress
) -> bool:
"""Send isAssociationAllowed command to Controller."""
source_data = {"nodeId": source.node_id}
Expand All @@ -490,9 +491,9 @@ async def async_is_association_allowed(

async def async_add_associations(
self,
source: Association,
source: AssociationAddress,
group: int,
associations: List[Association],
associations: List[AssociationAddress],
wait_for_result: bool = False,
) -> None:
"""Send addAssociations command to Controller."""
Expand Down Expand Up @@ -520,9 +521,9 @@ async def async_add_associations(

async def async_remove_associations(
self,
source: Association,
source: AssociationAddress,
group: int,
associations: List[Association],
associations: List[AssociationAddress],
wait_for_result: bool = False,
) -> None:
"""Send removeAssociations command to Controller."""
Expand Down