Merge pull request #124 from meraki/develop

Update to version 2.21.5

Author: fmunozmiranda

.github/workflows/sanity_tests.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v3
         with:
-          python-version: '3.11'
+          python-version: '3.12'
       - name: Install ansible-base (${{ matrix.ansible }})
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
       - name: Run sanity tests

CHANGELOG.rst

@@ -4,6 +4,14 @@ Cisco.Meraki Release Notes
 
 .. contents:: Topics
 
+v2.21.5
+=======
+
+Bugfixes
+--------
+
+- cisco.meraki.devices_appliance_uplinks_settings - fix idempotency error.
+
 v2.21.4
 =======
 

changelogs/changelog.yaml

@@ -1267,3 +1267,8 @@ releases:
       bugfixes:
         - cisco.meraki.networks_appliance_traffic_shaping_uplink_bandwidth - fix idempotency error.
     release_date: "2025-06-10"
+  2.21.5:
+    changes:
+      bugfixes:
+        - cisco.meraki.devices_appliance_uplinks_settings - fix idempotency error.
+    release_date: "2025-09-11"

galaxy.yml

@@ -1,7 +1,7 @@
 ---
 namespace: cisco
 name: meraki
-version: 2.21.4
+version: 2.21.5
 readme: README.md
 authors:
   - Francisco Muñoz <[email protected]>

playbooks/devices_appliance_uplinks_settings.yaml

@@ -0,0 +1,26 @@
+- name: Devices Appliance Uplinks Settings
+  hosts: localhost
+  gather_facts: false
+  tasks:
+
+    - name: Set MX WAN 1 IP
+      cisco.meraki.devices_appliance_uplinks_settings:
+        state: present
+        meraki_suppress_logging: false
+        interfaces:
+          wan1:
+            enabled: false
+            pppoe:
+              enabled: false
+            svis:
+              ipv4:
+                address: 3.2.3.4/28
+                assignmentMode: static
+                gateway: 3.2.3.1
+                nameservers:
+                  addresses:
+                    - 8.8.8.8
+                    - 1.1.1.1
+            vlanTagging:
+              enabled: false
+        serial: QBSA-D8CD-5LR6

plugins/action/devices_appliance_uplinks_settings.py

@@ -21,7 +21,6 @@
     MERAKI,
     meraki_argument_spec,
     meraki_compare_equality2,
-    get_dict_result,
 )
 from ansible_collections.cisco.meraki.plugins.plugin_utils.exceptions import (
     InconsistentParameters,
@@ -77,10 +76,6 @@ def get_object_by_name(self, name):
                 function="getDeviceApplianceUplinksSettings",
                 params=self.get_all_params(name=name),
             )
-            if isinstance(items, dict):
-                if 'interfaces' in items:
-                    items = items.get('interfaces')
-            result = get_dict_result(items, 'name', name)
             if result is None:
                 result = items
         except Exception as e:

workflows/docs.yml

@@ -11,16 +11,16 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: configure git
         run: |
           git config user.name "${GITHUB_ACTOR}"
           git config user.email "${GITHUB_ACTOR}@bots.github.com"
           git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: "3.7"
+          python-version: "3.12"
       - name: Install dependencies
         run: make doc-setup
       - name: Build docs

workflows/sanity_tests.yml

@@ -13,22 +13,22 @@ jobs:
     strategy:
       matrix:
         ansible:
-          - stable-2.10
-          - stable-2.11
+          - stable-2.15
+          - stable-2.16
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: meraki/meraki-ansible
       - name: Create directory
         run: mkdir -p ./ansible_collections/${{env.NAMESPACE}}
       - name: Move repository
         run: mv ./meraki/meraki-ansible ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: 3.12
       - name: Install ansible-base (${{ matrix.ansible }})
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
       - name: Run sanity tests