Skip to content

Commit c486fe3

Browse files
committed
fix(adv tags): fixed path split input implementation. Updated Tests
1 parent dfe4dd5 commit c486fe3

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

kepconfig/adv_tags/adv_tag_group.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,15 @@ def get_all_tag_groups(server: server, adv_tag_group_path: str, *, options: dict
154154
:param server: instance of the `server` class
155155
:param adv_tag_group_path: path identifying the advanced tag group collection to retrieve. Standard Kepware address decimal
156156
notation string such as "_advancedtags.AdvTagGroup1" or "_advancedtags.AdvTagGroup1.AdvTagGroupChild"
157+
:param options: *(optional)* Dict of parameters to filter, sort or pagenate the list of tags and tag groups.
158+
Options are 'filter', 'sortOrder', and 'sortProperty' only.
157159
158160
:return: List of data for all tag groups within the tag group
159161
160162
:raises KepHTTPError: If urllib provides an HTTPError
161163
:raises KepURLError: If urllib provides an URLError
162164
'''
163-
path_obj = adv_tags._adv_tag_path_split(adv_tag_group_path, isItem=True)
165+
path_obj = adv_tags._adv_tag_path_split(adv_tag_group_path, isItem=False)
164166
url = adv_tags._create_adv_tags_base_url(server.url, path_obj) + _create_url()
165167
r = server._config_get(url, params=options)
166168
return r.payload

tests/adv_tags_test.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,12 @@ def test_adv_tag_group_get(server):
225225
assert type(adv_tags.adv_tag_group.get_all_tag_groups(server, '')) == list
226226

227227
# Get all advanced tag groups under a parent
228-
assert type(adv_tags.adv_tag_group.get_all_tag_groups(server, f'_advancedtags.{adv_tag_group_name}')) == list
228+
result = adv_tags.adv_tag_group.get_all_tag_groups(server, f'_advancedtags.{adv_tag_group_name}')
229+
assert type(result) == list
230+
assert any(group["common.ALLTYPES_NAME"] == adv_tag_group_child for group in result)
231+
result = adv_tags.adv_tag_group.get_all_tag_groups(server, adv_tag_child_group_path)
232+
assert type(result) == list
233+
assert len(result) == 0
229234

230235
def test_adv_tag_group_modify(server):
231236
# Modify advanced tag group

0 commit comments

Comments
 (0)