Skip to content
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

Jump to bottom

Fix query #68

Merged
merged 6 commits into from
Feb 10, 2022
Merged

Fix query #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a7943e0
fix issues #67
NikolayDachev Feb 8, 2022
193f6d3
fix query id check
NikolayDachev Feb 8, 2022
77f3d0a
add changelog fragment
NikolayDachev Feb 8, 2022
e105c7a
fix changelog fragment new line
NikolayDachev Feb 8, 2022
b4c05fb
fix changelog fragment new line2
NikolayDachev Feb 8, 2022
99724a6
Update changelogs/fragments/68-fix-query-id-check.yml
NikolayDachev Feb 8, 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
2 changes: 2 additions & 0 deletions changelogs/fragments/68-fix-query-id-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- "query - fix query function check for ``.id`` vs. ``id`` arguments to not conflict with routeros arguments like ``identity`` (https://github.com/ansible-collections/community.routeros/pull/68, https://github.com/ansible-collections/community.routeros/issues/67)."
4 changes: 2 additions & 2 deletions plugins/modules/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
type: str
query:
description:
- Query given path for selected query attributes from RouterOS aip and return '.id'.
- Query given path for selected query attributes from RouterOS aip.
- WHERE is key word which extend query. WHERE format is key operator value - with spaces.
- WHERE valid operators are C(==), C(!=), C(>), C(<).
- Example path C(ip address) and query C(.id address) will return only C(.id) and C(address) for all items in C(ip address) path.
Expand Down Expand Up @@ -439,7 +439,7 @@ def api_update(self):
def api_query(self):
keys = {}
for k in self.query:
if 'id' in k and k != ".id":
if k == 'id':
self.errors("'%s' must be '.id'" % k)
keys[k] = Key(k)
try:
Expand Down