diff --git a/.github/workflows/sanity_tests.yml b/.github/workflows/sanity_tests.yml index 5283c0dfa..d89d509e1 100644 --- a/.github/workflows/sanity_tests.yml +++ b/.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 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9c76824c0..1e79a2e67 100644 --- a/CHANGELOG.rst +++ b/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 ======= diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index ff34c4f2d..4c4f0bf9e 100644 --- a/changelogs/changelog.yaml +++ b/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" diff --git a/galaxy.yml b/galaxy.yml index ba7a00c3a..7f28dfcef 100644 --- a/galaxy.yml +++ b/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 diff --git a/playbooks/devices_appliance_uplinks_settings.yaml b/playbooks/devices_appliance_uplinks_settings.yaml new file mode 100644 index 000000000..49342420d --- /dev/null +++ b/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 diff --git a/plugins/action/devices_appliance_uplinks_settings.py b/plugins/action/devices_appliance_uplinks_settings.py index 7f05bc570..8103d1e74 100644 --- a/plugins/action/devices_appliance_uplinks_settings.py +++ b/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: diff --git a/workflows/docs.yml b/workflows/docs.yml index 1f69ba0d6..c7a31742b 100644 --- a/workflows/docs.yml +++ b/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 diff --git a/workflows/sanity_tests.yml b/workflows/sanity_tests.yml index baec49bab..d03c8294a 100644 --- a/workflows/sanity_tests.yml +++ b/workflows/sanity_tests.yml @@ -13,12 +13,12 @@ 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 @@ -26,9 +26,9 @@ jobs: - 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