From 71ea16995ae536b7073fe4c3ab2e8f3a126ebc28 Mon Sep 17 00:00:00 2001 From: borborpa <53184393+borborpa@users.noreply.github.com> Date: Wed, 18 Dec 2019 12:10:16 -0500 Subject: [PATCH] =?UTF-8?q?Meraki:=20Fixed=20line=20174=20changed=20from?= =?UTF-8?q?=20None=20to=20the=20actual=20net=5Fid=E2=80=A6=20(#59395)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixed line 174 changed from None to the actual net_id variable * Update meraki_content_filtering.py * Create 59395_meraki_content_filtering.yaml --- changelogs/fragments/59395_meraki_content_filtering.yaml | 2 ++ lib/ansible/modules/network/meraki/meraki_content_filtering.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/59395_meraki_content_filtering.yaml diff --git a/changelogs/fragments/59395_meraki_content_filtering.yaml b/changelogs/fragments/59395_meraki_content_filtering.yaml new file mode 100644 index 00000000000..00c28e3488e --- /dev/null +++ b/changelogs/fragments/59395_meraki_content_filtering.yaml @@ -0,0 +1,2 @@ +minor_changes: + - meraki_content_filtering.py - Fixed to use net_id veraible instead static value of None. diff --git a/lib/ansible/modules/network/meraki/meraki_content_filtering.py b/lib/ansible/modules/network/meraki/meraki_content_filtering.py index 0917cc3007f..498bf43ab06 100644 --- a/lib/ansible/modules/network/meraki/meraki_content_filtering.py +++ b/lib/ansible/modules/network/meraki/meraki_content_filtering.py @@ -171,7 +171,7 @@ def main(): org_id = meraki.params['org_id'] if not org_id: org_id = meraki.get_org_id(meraki.params['org_name']) - net_id = None + net_id = meraki.params['net_id'] if net_id is None: nets = meraki.get_nets(org_id=org_id) net_id = meraki.get_net_id(org_id, meraki.params['net_name'], data=nets)