Bug with network endpoints

playbooks/test.yml

@@ -2,28 +2,70 @@
 
 - hosts: meraki_servers
   vars:
-    org_id: "828099381482762270"
-    corp_name: "TEST 2"
-    network_id: "L_828099381482770865"
+    network_id: "L_828099381482771185" # Branch-1234
   gather_facts: false
   tasks:
 
-    - name: Create corporate SSID
-      cisco.meraki.networks_wireless_ssids:
-        meraki_suppress_logging: false
+    - name: Update appliance Vlans
+      cisco.meraki.networks_appliance_vlans:
         state: present
+        applianceIp: 192.168.1.2
+        cidr: 192.168.1.0/24
+        id: '1234'
+        name: My VLAN
+        networkId: "{{network_id}}"
+        subnet: 192.168.1.0/24
+
+    - name: Get all networks _appliance _ssids
+      cisco.meraki.networks_appliance_ssids_info:
+        networkId: "{{network_id}}"
+      register: result
+
+    - name: Show result
+      ansible.builtin.debug:
+        msg: "{{ result }}"
+
+    - name: Update appliance SSID
+      cisco.meraki.networks_appliance_ssids:
+        state: present
+        authMode: 8021x-radius
+        defaultVlanId: 10
         enabled: true
-        name: "{{corp_name}}"
-        networkId: "{{ network_id }}"
-        number: 0
-        authMode: "8021x-radius"
-        radiusServers: 
-          - one:
-            host: "1.2.3.4"
-            port: 1812
-            secret: SuperSecretPassword
-          - one:
-            host: "1.2.3.5"
-            port: 1818
-            secret: SuperSecretPassword
+        name: My SSID
+        networkId: "{{network_id}}"
+        number: 1
+        radiusServers:
+        - host: 1.2.3.4
+          port: 1000
+          secret: secret
+        visible: true
+        wpaEncryptionMode: WPA2 only 
+
+
+# ################################################################
+
+    - name: Update appliance traffic sharping
+      cisco.meraki.networks_appliance_traffic_shaping:
+        state: present
+        globalBandwidthLimits:
+          limitDown: 5120
+          limitUp: 2048
+        networkId: "{{network_id}}"
+
+    - name: Enable Vlans on the MX
+      cisco.meraki.networks_appliance_vlans_settings:
+        state: present
+        networkId: "{{network_id}}"
+        vlansEnabled: true
+
+    # - name: Update appliance ports
+    #   cisco.meraki.networks_appliance_ports:
+    #     accessPolicy: "open"
+    #     allowedVlans: "all"
+    #     enabled: true
+    #     networkId: "{{network_id}}"
+    #     portId: "2"
+    #     type: "trunk"
+    #     vlan: 10
+    #     state: present
 

plugins/action/networks.py

@@ -169,7 +169,10 @@ def get_object_by_name(self, name):
                 if 'response' in items:
                     items = items.get('response')
             result = get_dict_result(items, 'name', name)
-        except Exception:
+            if result == None:
+                result = items
+        except Exception as e:
+            print("Error: ", e)
             result = None
         return result
 
@@ -185,7 +188,8 @@ def get_object_by_id(self, id):
                 if 'response' in items:
                     items = items.get('response')
             result = get_dict_result(items, 'networkId', id)
-        except Exception:
+        except Exception as e:
+            print("Error: ", e)
             result = None
         return result
 

plugins/action/networks_alerts_settings.py

@@ -87,7 +87,10 @@ def get_object_by_name(self, name):
                 if 'response' in items:
                     items = items.get('response')
             result = get_dict_result(items, 'name', name)
-        except Exception:
+            if result == None:
+                result = items
+        except Exception as e:
+            print("Error: ", e)
             result = None
         return result
 
@@ -100,10 +103,10 @@ def exists(self):
         prev_obj = None
         id_exists = False
         name_exists = False
-        o_id = self.new_object.get("id")
+        o_id = self.new_object.get("networkId") or self.new_object.get("network_id")
         name = self.new_object.get("name")
         if o_id:
-            prev_obj = self.get_object_by_id(o_id)
+            prev_obj = self.get_object_by_name(o_id)
             id_exists = prev_obj is not None and isinstance(prev_obj, dict)
         if not id_exists and name:
             prev_obj = self.get_object_by_name(name)

plugins/action/networks_appliance_connectivity_monitoring_destinations.py

@@ -82,7 +82,10 @@ def get_object_by_name(self, name):
                 if 'response' in items:
                     items = items.get('response')
             result = get_dict_result(items, 'name', name)
-        except Exception:
+            if result == None:
+                result = items
+        except Exception as e:
+            print("Error: ", e)
             result = None
         return result
 
@@ -95,10 +98,10 @@ def exists(self):
         prev_obj = None
         id_exists = False
         name_exists = False
-        o_id = self.new_object.get("id")
+        o_id = self.new_object.get("networkId") or self.new_object.get("network_id")
         name = self.new_object.get("name")
         if o_id:
-            prev_obj = self.get_object_by_id(o_id)
+            prev_obj = self.get_object_by_name(o_id)
             id_exists = prev_obj is not None and isinstance(prev_obj, dict)
         if not id_exists and name:
             prev_obj = self.get_object_by_name(name)

plugins/action/networks_appliance_content_filtering.py

@@ -97,7 +97,10 @@ def get_object_by_name(self, name):
                 if 'response' in items:
                     items = items.get('response')
             result = get_dict_result(items, 'name', name)
-        except Exception:
+            if result == None:
+                result = items
+        except Exception as e:
+            print("Error: ", e)
             result = None
         return result
 
@@ -110,10 +113,10 @@ def exists(self):
         prev_obj = None
         id_exists = False
         name_exists = False
-        o_id = self.new_object.get("id")
+        o_id = self.new_object.get("networkId") or self.new_object.get("network_id")
         name = self.new_object.get("name")
         if o_id:
-            prev_obj = self.get_object_by_id(o_id)
+            prev_obj = self.get_object_by_name(o_id)
             id_exists = prev_obj is not None and isinstance(prev_obj, dict)
         if not id_exists and name:
             prev_obj = self.get_object_by_name(name)

plugins/action/networks_appliance_firewall_cellular_firewall_rules.py

@@ -82,7 +82,10 @@ def get_object_by_name(self, name):
                 if 'response' in items:
                     items = items.get('response')
             result = get_dict_result(items, 'name', name)
-        except Exception:
+            if result == None:
+                result = items
+        except Exception as e:
+            print("Error: ", e)
             result = None
         return result
 
@@ -95,10 +98,10 @@ def exists(self):
         prev_obj = None
         id_exists = False
         name_exists = False
-        o_id = self.new_object.get("id")
+        o_id = self.new_object.get("networkId") or self.new_object.get("network_id")
         name = self.new_object.get("name")
         if o_id:
-            prev_obj = self.get_object_by_id(o_id)
+            prev_obj = self.get_object_by_name(o_id)
             id_exists = prev_obj is not None and isinstance(prev_obj, dict)
         if not id_exists and name:
             prev_obj = self.get_object_by_name(name)

plugins/action/networks_appliance_firewall_firewalled_services.py

@@ -97,16 +97,17 @@ def get_object_by_id(self, id):
             if isinstance(items, dict):
                 if 'response' in items:
                     items = items.get('response')
-            result = get_dict_result(items, 'service', id)
-        except Exception:
+            result = items
+        except Exception as e:
+            print("Error: ", e)
             result = None
         return result
 
     def exists(self):
         prev_obj = None
         id_exists = False
         name_exists = False
-        o_id = self.new_object.get("id")
+        o_id = self.new_object.get("networkId") or self.new_object.get("network_id")
         o_id = o_id or self.new_object.get(
             "service") or self.new_object.get("service")
         name = self.new_object.get("name")

plugins/action/networks_appliance_firewall_inbound_firewall_rules.py

@@ -87,7 +87,10 @@ def get_object_by_name(self, name):
                 if 'response' in items:
                     items = items.get('response')
             result = get_dict_result(items, 'name', name)
-        except Exception:
+            if result == None:
+                result = items
+        except Exception as e:
+            print("Error: ", e)
             result = None
         return result
 
@@ -100,10 +103,10 @@ def exists(self):
         prev_obj = None
         id_exists = False
         name_exists = False
-        o_id = self.new_object.get("id")
+        o_id = self.new_object.get("networkId") or self.new_object.get("network_id")
         name = self.new_object.get("name")
         if o_id:
-            prev_obj = self.get_object_by_id(o_id)
+            prev_obj = self.get_object_by_name(o_id)
             id_exists = prev_obj is not None and isinstance(prev_obj, dict)
         if not id_exists and name:
             prev_obj = self.get_object_by_name(name)

plugins/action/networks_appliance_firewall_l3_firewall_rules.py

@@ -87,7 +87,10 @@ def get_object_by_name(self, name):
                 if 'response' in items:
                     items = items.get('response')
             result = get_dict_result(items, 'name', name)
-        except Exception:
+            if result == None:
+                result = items
+        except Exception as e:
+            print("Error: ", e)
             result = None
         return result
 
@@ -100,10 +103,10 @@ def exists(self):
         prev_obj = None
         id_exists = False
         name_exists = False
-        o_id = self.new_object.get("id")
+        o_id = self.new_object.get("networkId") or self.new_object.get("network_id")
         name = self.new_object.get("name")
         if o_id:
-            prev_obj = self.get_object_by_id(o_id)
+            prev_obj = self.get_object_by_name(o_id)
             id_exists = prev_obj is not None and isinstance(prev_obj, dict)
         if not id_exists and name:
             prev_obj = self.get_object_by_name(name)

plugins/action/networks_appliance_firewall_l7_firewall_rules.py

@@ -82,7 +82,10 @@ def get_object_by_name(self, name):
                 if 'response' in items:
                     items = items.get('response')
             result = get_dict_result(items, 'name', name)
-        except Exception:
+            if result == None:
+                result = items
+        except Exception as e:
+            print("Error: ", e)
             result = None
         return result
 
@@ -95,10 +98,10 @@ def exists(self):
         prev_obj = None
         id_exists = False
         name_exists = False
-        o_id = self.new_object.get("id")
+        o_id = self.new_object.get("networkId") or self.new_object.get("network_id")
         name = self.new_object.get("name")
         if o_id:
-            prev_obj = self.get_object_by_id(o_id)
+            prev_obj = self.get_object_by_name(o_id)
             id_exists = prev_obj is not None and isinstance(prev_obj, dict)
         if not id_exists and name:
             prev_obj = self.get_object_by_name(name)

plugins/action/networks_appliance_firewall_one_to_many_nat_rules.py

@@ -82,7 +82,10 @@ def get_object_by_name(self, name):
                 if 'response' in items:
                     items = items.get('response')
             result = get_dict_result(items, 'name', name)
-        except Exception:
+            if result == None:
+                result = items
+        except Exception as e:
+            print("Error: ", e)
             result = None
         return result
 
@@ -95,10 +98,10 @@ def exists(self):
         prev_obj = None
         id_exists = False
         name_exists = False
-        o_id = self.new_object.get("id")
+        o_id = self.new_object.get("networkId") or self.new_object.get("network_id")
         name = self.new_object.get("name")
         if o_id:
-            prev_obj = self.get_object_by_id(o_id)
+            prev_obj = self.get_object_by_name(o_id)
             id_exists = prev_obj is not None and isinstance(prev_obj, dict)
         if not id_exists and name:
             prev_obj = self.get_object_by_name(name)

plugins/action/networks_appliance_firewall_one_to_one_nat_rules.py

@@ -82,7 +82,10 @@ def get_object_by_name(self, name):
                 if 'response' in items:
                     items = items.get('response')
             result = get_dict_result(items, 'name', name)
-        except Exception:
+            if result == None:
+                result = items
+        except Exception as e:
+            print("Error: ", e)
             result = None
         return result
 
@@ -95,10 +98,10 @@ def exists(self):
         prev_obj = None
         id_exists = False
         name_exists = False
-        o_id = self.new_object.get("id")
+        o_id = self.new_object.get("networkId") or self.new_object.get("network_id")
         name = self.new_object.get("name")
         if o_id:
-            prev_obj = self.get_object_by_id(o_id)
+            prev_obj = self.get_object_by_name(o_id)
             id_exists = prev_obj is not None and isinstance(prev_obj, dict)
         if not id_exists and name:
             prev_obj = self.get_object_by_name(name)

plugins/action/networks_appliance_firewall_port_forwarding_rules.py

@@ -82,7 +82,10 @@ def get_object_by_name(self, name):
                 if 'response' in items:
                     items = items.get('response')
             result = get_dict_result(items, 'name', name)
-        except Exception:
+            if result == None:
+                result = items
+        except Exception as e:
+            print("Error: ", e)
             result = None
         return result
 
@@ -95,10 +98,10 @@ def exists(self):
         prev_obj = None
         id_exists = False
         name_exists = False
-        o_id = self.new_object.get("id")
+        o_id = self.new_object.get("networkId") or self.new_object.get("network_id")
         name = self.new_object.get("name")
         if o_id:
-            prev_obj = self.get_object_by_id(o_id)
+            prev_obj = self.get_object_by_name(o_id)
             id_exists = prev_obj is not None and isinstance(prev_obj, dict)
         if not id_exists and name:
             prev_obj = self.get_object_by_name(name)