Merge pull request #18 from wwt/certified_update

bugfix to support cisco.meraki version 2.18.1

Author: nsthompson

.gitignore

@@ -162,4 +162,4 @@ scratch/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
-changelogs/.plugin_cache.yaml
+changelogs/.plugin-cache.yaml

CHANGELOG.md

@@ -2,9 +2,11 @@
 
 **Topics**
 
+- <a href="#v1-1-3">v1\.1\.3</a>
+    - <a href="#bugfixes">Bugfixes</a>
 - <a href="#v1-1-2">v1\.1\.2</a>
     - <a href="#breaking-changes--porting-guide">Breaking Changes / Porting Guide</a>
-    - <a href="#bugfixes">Bugfixes</a>
+    - <a href="#bugfixes-1">Bugfixes</a>
 - <a href="#v1-1-1">v1\.1\.1</a>
     - <a href="#minor-changes">Minor Changes</a>
     - <a href="#breaking-changes--porting-guide-1">Breaking Changes / Porting Guide</a>
@@ -13,6 +15,14 @@
     - <a href="#new-plugins">New Plugins</a>
         - <a href="#lookup">Lookup</a>
 
+<a id="v1-1-3"></a>
+## v1\.1\.3
+
+<a id="bugfixes"></a>
+### Bugfixes
+
+* configure\_meraki\_mx \- Fixed VLAN provisioning to match requirements with cisco\.meraki collection version 2\.18\.1
+
 <a id="v1-1-2"></a>
 ## v1\.1\.2
 
@@ -21,7 +31,7 @@
 
 * manage\_meraki\_network \- updated data model so that tags are now a list
 
-<a id="bugfixes"></a>
+<a id="bugfixes-1"></a>
 ### Bugfixes
 
 * configure\_meraki\_mt \- fixed conditional preventing lookup dictionary creation

changelogs/changelog.yaml

@@ -42,3 +42,11 @@ releases:
     - v1.1.2-breaking.yaml
     - v1.1.2-bugfixes.yaml
     release_date: '2024-05-31'
+  1.1.3:
+    changes:
+      bugfixes:
+      - configure_meraki_mx - Fixed VLAN provisioning to match requirements with cisco.meraki
+        collection version 2.18.1
+    fragments:
+    - v1.1.3-bugfixes.yaml
+    release_date: '2024-05-31'

galaxy.yml

@@ -9,7 +9,7 @@ namespace: wwt
 name: meraki
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.1.2
+version: 1.1.3
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
@@ -44,7 +44,7 @@ tags:
 # collection label 'namespace.name'. The value is a version range
 # L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version
 # range specifiers can be set and are separated by ','
-dependencies: { cisco.meraki: ">=2.18.0" }
+dependencies: { cisco.meraki: ">=2.18.1" }
 # The URL of the originating SCM repository
 repository: https://github.com/wwt/meraki_collection
 

roles/configure_meraki_mx/tasks/configure_vlans.yml

@@ -16,11 +16,6 @@
 
 #
 # First pass configuration throws the following errors when run
-# when vlanId parameter is omitted:
-# Error:  Appliance.getNetworkApplianceVlan() missing 1 required positional argument: 'vlanId'
-#
-# When vlanId parameter is present:
-# Error:  An error occured when executing operation.
 # The error was: appliance, getNetworkApplianceVlan - 404 Not Found, please wait a minute if the key or org was just newly created.
 #
 # VLANs are provisioned correctly regardless of error as noted above
@@ -32,7 +27,6 @@
     state: "{{ vlan.state }}"
     networkId: "{{ network_id }}"
     id: "{{ vlan.id }}"
-    vlanId: "{{ vlan.id }}"
     name: "{{ vlan.name | default(omit) }}"
     subnet: "{{ vlan.subnet | default(omit) }}"
     applianceIp: "{{ vlan.appliance_ip | default(omit) }}"
@@ -46,7 +40,7 @@
     meraki_api_key: "{{ auth_key }}"
     state: "{{ vlan.state }}"
     networkId: "{{ network_id }}"
-    vlanId: "{{ vlan.id }}"
+    id: "{{ vlan.id }}"
     name: "{{ vlan.name | default(omit) }}"
     reservedIpRanges: "{{ vlan.reserved_ip_range | default(omit) }}"
     fixedIpAssignments: "{{ vlan.fixed_ip_assignments | default(omit) }}"
@@ -66,7 +60,7 @@
     meraki_api_key: "{{ auth_key }}"
     state: "{{ vlan.state }}"
     networkId: "{{ network_id }}"
-    vlanId: "{{ vlan.id }}"
+    id: "{{ vlan.id }}"
     name: "{{ vlan.name | default(omit) }}"
     subnet: "{{ vlan.subnet | default(omit) }}"
     applianceIp: "{{ vlan.appliance_ip | default(omit) }}"