diff options
Diffstat (limited to 'ansible_collections/cisco/meraki')
9 files changed, 139 insertions, 35 deletions
diff --git a/ansible_collections/cisco/meraki/FILES.json b/ansible_collections/cisco/meraki/FILES.json index b254fc063..e0143a1f1 100644 --- a/ansible_collections/cisco/meraki/FILES.json +++ b/ansible_collections/cisco/meraki/FILES.json @@ -305,7 +305,7 @@ "name": "plugins/action/networks_appliance_vlans.py", "ftype": "file", "chksum_type": "sha256", - "chksum_sha256": "c761dfdb7567afd656b5788e4370d50eb72b6a9e94932379a1042f357ca249d5", + "chksum_sha256": "0d8f2a124c247958c603f6a8f0bde35c5e4047f23c4be0a0931b67e3ffec3949", "format": 1 }, { @@ -641,7 +641,7 @@ "name": "plugins/action/organizations_appliance_vpn_third_party_vpnpeers_info.py", "ftype": "file", "chksum_type": "sha256", - "chksum_sha256": "26a5eaec32372b94e348f2e83550f5456bbe018acd3d5ef53ec7b9277e30cdf5", + "chksum_sha256": "777e5c3045b12fc29d855220bed36084b8a05a6f9fdf843776f82d91ff687d0f", "format": 1 }, { @@ -5170,7 +5170,7 @@ "name": "plugins/modules/networks_syslog_servers.py", "ftype": "file", "chksum_type": "sha256", - "chksum_sha256": "eb9294dd8a2398513d14d99fedbf113df49b86739bd9d93d9b90a7cac30ce370", + "chksum_sha256": "fc6ac1af61bd50fa834a4f99b5a2b49e8bbb58c85f46e1e02bc183b6e4b75f4a", "format": 1 }, { @@ -8268,6 +8268,13 @@ "format": 1 }, { + "name": "tests/sanity/ignore-2.18.txt", + "ftype": "file", + "chksum_type": "sha256", + "chksum_sha256": "8913c618635181041c024588594a4fe41a65b0f2e1bf06f1cb43c160b88a5187", + "format": 1 + }, + { "name": "tests/sanity/ignore-2.17.txt", "ftype": "file", "chksum_type": "sha256", @@ -8488,7 +8495,7 @@ "name": "playbooks/test.yml", "ftype": "file", "chksum_type": "sha256", - "chksum_sha256": "bfd74f470da9b4f7431ca97e36246467d19b4f1b13fcf8b1a12b04efc2d51c7e", + "chksum_sha256": "378a7452fdcf625029889a302a2a5af10836ef09d7174da3e9566aca32b567bd", "format": 1 }, { @@ -8831,14 +8838,14 @@ "name": "changelogs/changelog.yaml", "ftype": "file", "chksum_type": "sha256", - "chksum_sha256": "0edb9769be2615fbd836b0e2163b3f1ac4a6a5a5c1d26e21d073a68e3a3121cb", + "chksum_sha256": "1060f4303d8c5c24a55241cf88e050652c4343127a884d63f451ebe3268a62bb", "format": 1 }, { "name": "README.md", "ftype": "file", "chksum_type": "sha256", - "chksum_sha256": "1783cef0d9bf0bc424d1cb9bf05cc3e6ead14b99c48a5cde79efdf46c11546e3", + "chksum_sha256": "d96640c4c076a573e682d98147f5b7355482761ec5723d5a9f987ee74a96ec25", "format": 1 }, { diff --git a/ansible_collections/cisco/meraki/MANIFEST.json b/ansible_collections/cisco/meraki/MANIFEST.json index 6f671e250..30201ab43 100644 --- a/ansible_collections/cisco/meraki/MANIFEST.json +++ b/ansible_collections/cisco/meraki/MANIFEST.json @@ -2,7 +2,7 @@ "collection_info": { "namespace": "cisco", "name": "meraki", - "version": "2.18.0", + "version": "2.18.1", "authors": [ "Francisco Mu\u00f1oz <fmunoz@cloverhound.com>", "Bryan Vargas <bvargas@cloverhound.com>", @@ -33,7 +33,7 @@ "name": "FILES.json", "ftype": "file", "chksum_type": "sha256", - "chksum_sha256": "4c5636d16b861bfa135c614ab136a32cfe5ca9b0d639f5743d9136b2c3454ca8", + "chksum_sha256": "d71c0f2bceacc791dc8fe1c7b8612d934a800e2a8287300af76e6fa546d42a4b", "format": 1 }, "format": 1 diff --git a/ansible_collections/cisco/meraki/README.md b/ansible_collections/cisco/meraki/README.md index f7dc05f6a..ef5fd1179 100644 --- a/ansible_collections/cisco/meraki/README.md +++ b/ansible_collections/cisco/meraki/README.md @@ -65,7 +65,7 @@ Other versions of this collection have support for previous Cisco Meraki version | Cisco Meraki version | Ansible "cisco.meraki" version | Python "DashboardAPI" version | |--------------------------|------------------------------|-------------------------------| | 1.33.0 | 2.17.0 |1.33.0 | -| 1.44.1 | 2.18.0 |1.44.1 | +| 1.44.1 | 2.18.1 |1.44.1 | *Notes*: diff --git a/ansible_collections/cisco/meraki/changelogs/changelog.yaml b/ansible_collections/cisco/meraki/changelogs/changelog.yaml index 9909009fc..31f7c73bd 100644 --- a/ansible_collections/cisco/meraki/changelogs/changelog.yaml +++ b/ansible_collections/cisco/meraki/changelogs/changelog.yaml @@ -1063,4 +1063,11 @@ releases: - organizations_wireless_devices_channel_utilization_history_by_network_by_interval_info - new plugin. - organizations_wireless_devices_packet_loss_by_client_info - new plugin. - organizations_wireless_devices_packet_loss_by_device_info - new plugin. - - organizations_wireless_devices_packet_loss_by_network_info - new plugin.
\ No newline at end of file + - organizations_wireless_devices_packet_loss_by_network_info - new plugin. + 2.18.1: + changes: + minor_changes: + - The `id` parameter is now required for `networks_appliance_vlans` module. + - The `id` parameter is change type to an `integer` in `networks_appliance_vlans` module. + - Fixing problem of naming in `organizations_appliance_vpn_third_party_vpnpeers_info`. + - Removing `state` from allowed parameters for `networks_syslog_servers` module.
\ No newline at end of file diff --git a/ansible_collections/cisco/meraki/playbooks/test.yml b/ansible_collections/cisco/meraki/playbooks/test.yml index 02e2c7cd9..f2b0a4dcb 100644 --- a/ansible_collections/cisco/meraki/playbooks/test.yml +++ b/ansible_collections/cisco/meraki/playbooks/test.yml @@ -127,9 +127,97 @@ # state: present # meraki_suppress_logging: false - - name: onboard order - cisco.meraki.organizations_inventory_claim: - # meraki_api_key: "{{ meraki_api }}" - # meraki_simulate: "{{ testpolicy }}" - organizationId: "{{ org_id }}" - orders: "1"
\ No newline at end of file + # - name: onboard order + # cisco.meraki.organizations_inventory_claim: + # # meraki_api_key: "{{ meraki_api }}" + # # meraki_simulate: "{{ testpolicy }}" + # organizationId: "{{ org_id }}" + # orders: "1" + + + # - name: Enable Vlans on the MX + # cisco.meraki.networks_appliance_vlans_settings: + # state: present + # networkId: "{{network_id}}" + # vlansEnabled: true + + # - name: Create appliance Vlan 100 + # cisco.meraki.networks_appliance_vlans: + # state: present + # applianceIp: 192.168.1.2 + # cidr: 192.168.1.0/24 + # id: '100' + # name: My VLAN + # networkId: "{{network_id}}" + # subnet: 192.168.1.0/24 + + # - name: Create appliance Vlan 200 + # cisco.meraki.networks_appliance_vlans: + # state: present + # applianceIp: 192.168.2.2 + # cidr: 192.168.2.0/24 + # id: '200' + # name: My VLAN + # networkId: "{{network_id}}" + # subnet: 192.168.2.0/24 + + # - name: Create appliance Vlan 300 + # cisco.meraki.networks_appliance_vlans: + # state: present + # applianceIp: 192.168.3.2 + # cidr: 192.168.3.0/24 + # id: '300' + # name: My VLAN + # networkId: "{{network_id}}" + # subnet: 192.168.3.0/24 + + + # - name: Enable Vlans on the MX + # cisco.meraki.networks_appliance_vlans_settings: + # state: present + # networkId: "{{network_id}}" + # vlansEnabled: true + + # - name: Create appliance Vlan 100 + # cisco.meraki.networks_appliance_vlans: + # state: present + # meraki_suppress_logging: false + # applianceIp: 10.1.0.2 + # cidr: 10.1.0.0/17 + # id: '100' + # name: My VLAN + # networkId: "{{network_id}}" + # subnet: 10.1.0.0/17 + + # - name: Create appliance Vlan 200 + # cisco.meraki.networks_appliance_vlans: + # state: present + # meraki_suppress_logging: false + # applianceIp: 172.200.0.2 + # cidr: 172.200.0.0/20 + # id: '200' + # name: My VLAN + # networkId: "{{network_id}}" + # subnet: 172.200.0.0/20 + + # - name: Create appliance Vlan 300 + # cisco.meraki.networks_appliance_vlans: + # state: present + # meraki_suppress_logging: false + # applianceIp: 172.16.0.2 + # cidr: 172.16.0.0/24 + # id: 300 + # name: My VLAN 2 + # networkId: "{{network_id}}" + # subnet: 172.16.0.0/24 + + + # - name: Get all organizations _appliance _vpn _thirdpartyvpnpeers + # cisco.meraki.organizations_appliance_vpn_third_party_vpnpeers_info: + # meraki_suppress_logging: false + # organizationId: "828099381482762270" + # register: result + + # - name: Show result + # ansible.builtin.debug: + # msg: "{{ result }}"
\ No newline at end of file diff --git a/ansible_collections/cisco/meraki/plugins/action/networks_appliance_vlans.py b/ansible_collections/cisco/meraki/plugins/action/networks_appliance_vlans.py index 48ebdb4ca..2842327c9 100644 --- a/ansible_collections/cisco/meraki/plugins/action/networks_appliance_vlans.py +++ b/ansible_collections/cisco/meraki/plugins/action/networks_appliance_vlans.py @@ -35,7 +35,7 @@ argument_spec.update(dict( applianceIp=dict(type="str"), cidr=dict(type="str"), groupPolicyId=dict(type="str"), - id=dict(type="str"), + id=dict(type="int"), ipv6=dict(type="dict"), mandatoryDhcp=dict(type="dict"), mask=dict(type="int"), @@ -43,7 +43,7 @@ argument_spec.update(dict( subnet=dict(type="str"), templateVlanType=dict(type="str"), networkId=dict(type="str"), - vlanId=dict(type="str"), + # vlanId=dict(type="str"), dhcpBootFilename=dict(type="str"), dhcpBootNextServer=dict(type="str"), dhcpBootOptionsEnabled=dict(type="bool"), @@ -58,8 +58,8 @@ argument_spec.update(dict( )) required_if = [ - ("state", "present", ["name", "networkId", "vlanId"], True), - ("state", "absent", ["name", "networkId", "vlanId"], True), + ("state", "present", ["name", "networkId", "id"], True), + ("state", "absent", ["name", "networkId", "id"], True), ] required_one_of = [] mutually_exclusive = [] @@ -107,9 +107,10 @@ class NetworksApplianceVlans(object): if self.new_object.get('networkId') is not None or self.new_object.get('network_id') is not None: new_object_params['networkId'] = self.new_object.get('networkId') or \ self.new_object.get('network_id') - if self.new_object.get('vlanId') is not None or self.new_object.get('vlan_id') is not None: - new_object_params['vlanId'] = self.new_object.get('vlanId') or \ - self.new_object.get('vlan_id') + if self.new_object.get('vlanId') is not None or self.new_object.get('vlan_id') is not None or \ + self.new_object.get('id') is not None: + new_object_params['vlanId'] = self.new_object.get('id') or \ + self.new_object.get('id') return new_object_params def create_params(self): @@ -154,9 +155,10 @@ class NetworksApplianceVlans(object): if self.new_object.get('networkId') is not None or self.new_object.get('network_id') is not None: new_object_params['networkId'] = self.new_object.get('networkId') or \ self.new_object.get('network_id') - if self.new_object.get('vlanId') is not None or self.new_object.get('vlan_id') is not None: - new_object_params['vlanId'] = self.new_object.get('vlanId') or \ - self.new_object.get('vlan_id') + if self.new_object.get('vlanId') is not None or self.new_object.get('vlan_id') is not None or \ + self.new_object.get('id') is not None: + new_object_params['vlanId'] = self.new_object.get('id') or \ + self.new_object.get('id') return new_object_params def update_by_id_params(self): @@ -174,7 +176,8 @@ class NetworksApplianceVlans(object): new_object_params['dhcpBootNextServer'] = self.new_object.get('dhcpBootNextServer') or \ self.new_object.get('dhcp_boot_next_server') if self.new_object.get('dhcpBootOptionsEnabled') is not None or self.new_object.get('dhcp_boot_options_enabled') is not None: - new_object_params['dhcpBootOptionsEnabled'] = self.new_object.get('dhcpBootOptionsEnabled') + new_object_params['dhcpBootOptionsEnabled'] = self.new_object.get( + 'dhcpBootOptionsEnabled') if self.new_object.get('dhcpHandling') is not None or self.new_object.get('dhcp_handling') is not None: new_object_params['dhcpHandling'] = self.new_object.get('dhcpHandling') or \ self.new_object.get('dhcp_handling') @@ -223,9 +226,10 @@ class NetworksApplianceVlans(object): if self.new_object.get('networkId') is not None or self.new_object.get('network_id') is not None: new_object_params['networkId'] = self.new_object.get('networkId') or \ self.new_object.get('network_id') - if self.new_object.get('vlanId') is not None or self.new_object.get('vlan_id') is not None: - new_object_params['vlanId'] = self.new_object.get('vlanId') or \ - self.new_object.get('vlan_id') + if self.new_object.get('vlanId') is not None or self.new_object.get('vlan_id') is not None or \ + self.new_object.get('id') is not None: + new_object_params['vlanId'] = self.new_object.get('id') or \ + self.new_object.get('id') return new_object_params def get_object_by_name(self, name): @@ -272,7 +276,7 @@ class NetworksApplianceVlans(object): o_id = self.new_object.get("id") o_id = o_id or self.new_object.get( "vlan_id") or self.new_object.get("vlanId") - name = self.new_object.get("name") + name = None if o_id: prev_obj = self.get_object_by_id(o_id) id_exists = prev_obj is not None and isinstance(prev_obj, dict) @@ -298,7 +302,6 @@ class NetworksApplianceVlans(object): obj_params = [ ("applianceIp", "applianceIp"), - ("cidr", "cidr"), ("groupPolicyId", "groupPolicyId"), ("id", "id"), ("ipv6", "ipv6"), @@ -308,7 +311,6 @@ class NetworksApplianceVlans(object): ("subnet", "subnet"), ("templateVlanType", "templateVlanType"), ("networkId", "networkId"), - ("vlanId", "vlanId"), ("dhcpBootFilename", "dhcpBootFilename"), ("dhcpBootNextServer", "dhcpBootNextServer"), ("dhcpBootOptionsEnabled", "dhcpBootOptionsEnabled"), diff --git a/ansible_collections/cisco/meraki/plugins/action/organizations_appliance_vpn_third_party_vpnpeers_info.py b/ansible_collections/cisco/meraki/plugins/action/organizations_appliance_vpn_third_party_vpnpeers_info.py index 69f7bd061..195a9138c 100644 --- a/ansible_collections/cisco/meraki/plugins/action/organizations_appliance_vpn_third_party_vpnpeers_info.py +++ b/ansible_collections/cisco/meraki/plugins/action/organizations_appliance_vpn_third_party_vpnpeers_info.py @@ -82,7 +82,7 @@ class ActionModule(ActionBase): response = meraki.exec_meraki( family="appliance", - function='getOrganizationApplianceVpnThirdPartyVpnpeers', + function='getOrganizationApplianceVpnThirdPartyVPNPeers', params=self.get_all(self._task.args), ) self._result.update(dict(meraki_response=response)) diff --git a/ansible_collections/cisco/meraki/plugins/modules/networks_syslog_servers.py b/ansible_collections/cisco/meraki/plugins/modules/networks_syslog_servers.py index 77cede8de..ebc85c17e 100644 --- a/ansible_collections/cisco/meraki/plugins/modules/networks_syslog_servers.py +++ b/ansible_collections/cisco/meraki/plugins/modules/networks_syslog_servers.py @@ -74,7 +74,6 @@ EXAMPLES = r""" meraki_be_geo_id: "{{meraki_be_geo_id}}" meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}" meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}" - state: present networkId: string servers: - host: 1.2.3.4 diff --git a/ansible_collections/cisco/meraki/tests/sanity/ignore-2.18.txt b/ansible_collections/cisco/meraki/tests/sanity/ignore-2.18.txt new file mode 100644 index 000000000..dce1be5cb --- /dev/null +++ b/ansible_collections/cisco/meraki/tests/sanity/ignore-2.18.txt @@ -0,0 +1 @@ +plugins/modules/meraki_mx_intrusion_prevention.py validate-modules:invalid-argument-name
\ No newline at end of file |