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.

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

Develop v2.20.5 #87

Merged
merged 10 commits into from
Jan 27, 2025
7 changes: 7 additions & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# exclude_paths included in this file are parsed relative to this file's location
# and not relative to the CWD of execution. CLI arguments passed to the --exclude
# option are parsed relative to the CWD of execution.
exclude_paths:
- workflows/
- .github/
- .ansible-lint
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Other versions of this collection have support for previous Cisco Meraki version
|--------------------------|------------------------------|-------------------------------|
| 1.33.0 | 2.17.0 |1.33.0 |
| 1.44.1 | 2.18.3 |1.44.1 |
| 1.53.0 | 2.20.4 |1.53.0 |
| 1.53.0 | 2.20.5 |1.53.0 |

*Notes*:

Expand Down
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
namespace: cisco
name: meraki
version: 2.20.4
version: 2.20.5
readme: README.md
authors:
- Francisco Muñoz <[email protected]>
Expand Down
33 changes: 33 additions & 0 deletions playbooks/networks_appliance_traffic_shaping_rules.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
- name: Update all
hosts: localhost
vars:
network_id: L_828099381482770866
serial_number: QBSB-D5ZD-9CXT
gather_facts: false
tasks:
- name: Networks_appliance_traffic_shaping_rules
cisco.meraki.networks_appliance_traffic_shaping_rules:
state: present
defaultRulesEnabled: true
networkId: L_828099381482775374
rules:
- definitions:
- type: host
value: google.com
- type: port
value: '9090'
- type: ipRange
value: 192.1.0.0
- type: ipRange
value: 192.1.0.0/16
- type: ipRange
value: 10.1.0.0/16:80
- type: localNet
value: 192.168.0.0/16
dscpTagValue: 0
perClientBandwidthLimits:
bandwidthLimits:
limitDown: 2048
limitUp: 2048
settings: custom
priority: normal
13 changes: 13 additions & 0 deletions playbooks/networks_devices_claim_2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- name: Play Name
hosts: localhost
vars:
network_id: L_828099381482771185
serial_number: QBSB-D5ZD-9CXT
gather_facts: false
tasks:
- name: Create
cisco.meraki.networks_devices_claim:
addAtomically: true
networkId: L_828099381482771185
serials:
- Q2FV-VYGH-ZVB3
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,6 @@ def get_object_by_name(self, name):
function="getNetworkApplianceFirewallL3FirewallRules",
params=self.get_all_params(name=name),
)
if isinstance(items, dict):
if 'rules' in items:
items = items.get('rules')
result = get_dict_result(items, 'name', name)
if result is None:
result = items
Expand Down
3 changes: 0 additions & 3 deletions plugins/action/networks_appliance_vlans_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,6 @@ def get_object_by_name(self, name):
function="getNetworkApplianceVlansSettings",
params=self.get_all_params(name=name),
)
if isinstance(items, dict):
if 'vlansEnabled' in items:
items = items.get('vlansEnabled')
result = get_dict_result(items, 'name', name)
if result is None:
result = items
Expand Down
2 changes: 1 addition & 1 deletion plugins/action/networks_devices_claim.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def get_object(self, params):
new_object = dict(
serials=params.get("serials"),
networkId=params.get("networkId"),
add_atomically=params.get("addAtomically"),
addAtomically=params.get("addAtomically"),
)
return new_object

Expand Down
2 changes: 1 addition & 1 deletion plugins/plugin_utils/meraki.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def __init__(self, params):
suppress_logging=params.get("meraki_suppress_logging"),
simulate=params.get("meraki_simulate"),
be_geo_id=params.get("meraki_be_geo_id"),
caller="MerakiAnsibleCollection/2.20.4 Cisco",
caller="MerakiAnsibleCollection/2.20.5 Cisco",
use_iterator_for_get_pages=params.get(
"meraki_use_iterator_for_get_pages"),
inherit_logging_config=params.get(
Expand Down