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

meraki_ssid - Modifying SSID won't work when specifying number #51645

Merged
merged 3 commits into from
Feb 19, 2019
Merged

meraki_ssid - Modifying SSID won't work when specifying number #51645

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
0b28876
Fix bug when specifying SSID by number
kbreit Feb 2, 2019
fc37dab
Create changelog file
kbreit Feb 2, 2019
d5db811
Add new line
kbreit Feb 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/meraki_ssid_number_fix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- meraki_ssid - Fix module to actually perform changes when state is present and SSID is referenced by number and not name.
10 changes: 6 additions & 4 deletions lib/ansible/modules/network/meraki/meraki_ssid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,8 @@ def main():
meraki.params['follow_redirects'] = 'all'

query_urls = {'ssid': '/networks/{net_id}/ssids'}
query_url = {'ssid': 'networks/{net_id}/ssids/'}
update_url = {'ssid': 'networks/{net_id}/ssids/'}
query_url = {'ssid': '/networks/{net_id}/ssids/'}
update_url = {'ssid': '/networks/{net_id}/ssids/'}

meraki.url_catalog['get_all'].update(query_urls)
meraki.url_catalog['get_one'].update(query_url)
Expand Down Expand Up @@ -400,8 +400,10 @@ def main():
if meraki.params[v] is not None:
payload[k] = meraki.params[v]
ssids = get_ssids(meraki, net_id)
original = ssids[get_ssid_number(meraki.params['name'], ssids)]
# meraki.fail_json(msg=meraki.is_update_required(original, payload), original=original, payload=payload)
number = meraki.params['number']
if number is None:
number = get_ssid_number(meraki.params['name'], ssids)
original = ssids[number]
if meraki.is_update_required(original, payload):
ssid_id = meraki.params['number']
if ssid_id is None: # Name should be used to lookup number
Expand Down