Browse Source

Properly check for ints in port changes.

Also, correct an SSID typo.
Joe Clarke 2 years ago
parent
commit
0ca43a136d
2 changed files with 4 additions and 4 deletions
  1. 1 1
      meraki_api/meraki_api.py
  2. 3 3
      setup-meraki-nets.py

+ 1 - 1
meraki_api/meraki_api.py

@@ -464,7 +464,7 @@ class SSID(Meraki):
             "destPort": "Any",
             "destCidr": "Local LAN",
         }
-        url = self.SSID_API + self._id + "/firewall/l3FirewallRules"
+        url = self.SSID_API + "/" + self._id + "/firewall/l3FirewallRules"
         try:
             response = requests.request("PUT", url, json=payload, headers=self._headers)
             response.raise_for_status()

+ 3 - 3
setup-meraki-nets.py

@@ -297,14 +297,14 @@ def main():
 
                 for port_range, switchport in switch.items():
                     ports = []
-                    if isinstance(port_range, int):
+                    if isinstance(port_range, int) or port_range.isnumeric():
                         port_obj = SwitchPort(key=config["api_key"], id=port_range, dev=dev_obj)
                         ports.append(port_obj)
                     else:
                         prs = port_range.split(",")
                         for pr in prs:
                             pr = pr.strip()
-                            if isinstance(pr, int):
+                            if pr.isnumeric():
                                 port_obj = SwitchPort(key=config["api_key"], id=pr, dev=dev_obj)
                                 ports.append(pr)
                             else:
@@ -316,7 +316,7 @@ def main():
                                 (start, end) = pr.split("-")
                                 start = start.strip()
                                 end = end.strip()
-                                if not isinstance(start, int) or not isinstance(end, int):
+                                if not start.isnumeric() or not end.isnumeric():
                                     print(
                                         "{}Error with port range '{}', {} and {} must be integers{}".format(
                                             Fore.RED, pr, start, end, Style.RESET_ALL