From 68fb4182f42857745ce14968c4966f1e3acf0e1c Mon Sep 17 00:00:00 2001 From: Sam Powell Date: Wed, 7 Mar 2018 15:24:27 -0700 Subject: [PATCH 01/13] Create __init__.py --- __init__.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 __init__.py diff --git a/__init__.py b/__init__.py new file mode 100644 index 00000000..10cf75e0 --- /dev/null +++ b/__init__.py @@ -0,0 +1 @@ +### Placeholder From ca0ee9ff4106e718ffb02f1b13332c8cd45df241 Mon Sep 17 00:00:00 2001 From: Sam Powell Date: Wed, 7 Mar 2018 15:42:59 -0700 Subject: [PATCH 02/13] Update meraki.py --- meraki.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meraki.py b/meraki.py index 0c7a84e7..09c32a48 100644 --- a/meraki.py +++ b/meraki.py @@ -3266,8 +3266,8 @@ def updatessid(apikey, networkid, ssidnum, name, enabled, authmode, encryptionmo # Update the attributes of an SSID # https://api.meraki.com/api_docs#update-the-attributes-of-an-ssid +""" def updatessidobject(apikey, networkid, newssid: SSID, suppressprint=False): - ''' Args: apikey: User's Meraki API Key @@ -3278,7 +3278,6 @@ def updatessidobject(apikey, networkid, newssid: SSID, suppressprint=False): Returns: result: Error message or details of newly created SSID - ''' # puturl = '{0}/networks/{1}/ssids/{2}'.format(str(base_url), str(networkid), newelement.ssidnum) headers = { 'x-cisco-meraki-api-key': format(str(apikey)), @@ -3297,7 +3296,7 @@ def updatessidobject(apikey, networkid, newssid: SSID, suppressprint=False): # result = __returnhandler(dashboard.status_code, dashboard.text, str(newssid.type).upper(), suppressprint) return result - +""" ### STATIC ROUTES ### From fb6cee0f268c02216dba6820830f7d2001e45f3f Mon Sep 17 00:00:00 2001 From: Sam Powell Date: Wed, 7 Mar 2018 15:51:23 -0700 Subject: [PATCH 03/13] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7f1ec2e3..ee7d2880 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ Also available via [PIP](https://pypi.python.org/pypi/meraki/). * Use pip (or alternative such as easy_install) to install required packages: * pip install requests * pip install meraki + * pip install ipaddress * You are now ready to create your first script: * create a new file and name it with python extension, e.g., meraki_hello_world.py * import the meraki api into your script, e.g., from meraki import meraki From efc96010b8907c54e6e32fcab2957781e9780532 Mon Sep 17 00:00:00 2001 From: Sam Powell Date: Wed, 7 Mar 2018 16:00:28 -0700 Subject: [PATCH 04/13] Create setup.cfg --- setup.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 setup.cfg diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000..b88034e4 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[metadata] +description-file = README.md From 45472af485c5aea5fdf0a3fb7f9977fde66a367b Mon Sep 17 00:00:00 2001 From: Sam Powell Date: Wed, 7 Mar 2018 16:00:59 -0700 Subject: [PATCH 05/13] Create setup.py --- setup.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 setup.py diff --git a/setup.py b/setup.py new file mode 100644 index 00000000..0adee9d9 --- /dev/null +++ b/setup.py @@ -0,0 +1,13 @@ +from distutils.core import setup +setup( + name = 'meraki', + packages = ['meraki'], + version = '0.29', + description = 'Cisco Meraki Dashboard API Python 3.6 Module', + author = 'Shiyue Cheng', + author_email = 'shiychen@cisco.com', + url = 'https://github.com/meraki/dashboard-api-python', + download_url = 'https://github.com/meraki/dashboard-api-python/', + keywords = ['meraki', 'dashboard', 'cisco'], + classifiers = [], +) From 69dc362d78d618d70f2a994a66fa1487f743d6ce Mon Sep 17 00:00:00 2001 From: Sam Powell Date: Wed, 7 Mar 2018 16:03:08 -0700 Subject: [PATCH 06/13] Update setup.py --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 0adee9d9..bc34a142 100644 --- a/setup.py +++ b/setup.py @@ -6,8 +6,8 @@ description = 'Cisco Meraki Dashboard API Python 3.6 Module', author = 'Shiyue Cheng', author_email = 'shiychen@cisco.com', - url = 'https://github.com/meraki/dashboard-api-python', - download_url = 'https://github.com/meraki/dashboard-api-python/', + url = 'https://github.com/batmunkey/dashboard-api-python', + download_url = 'https://github.com/batmunkey/dashboard-api-python/', keywords = ['meraki', 'dashboard', 'cisco'], classifiers = [], ) From 44dcdf794fd8a7560db8b943053f8d617c9e1a45 Mon Sep 17 00:00:00 2001 From: Sam Powell Date: Wed, 7 Mar 2018 16:24:49 -0700 Subject: [PATCH 07/13] Rename meraki.py to meraki/meraki.py --- meraki.py => meraki/meraki.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename meraki.py => meraki/meraki.py (100%) diff --git a/meraki.py b/meraki/meraki.py similarity index 100% rename from meraki.py rename to meraki/meraki.py From 537d4c78b615ac6d0421425a1c8842bf093ae111 Mon Sep 17 00:00:00 2001 From: Sam Powell Date: Wed, 7 Mar 2018 16:25:07 -0700 Subject: [PATCH 08/13] Rename __init__.py to meraki/__init__.py --- __init__.py => meraki/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename __init__.py => meraki/__init__.py (100%) diff --git a/__init__.py b/meraki/__init__.py similarity index 100% rename from __init__.py rename to meraki/__init__.py From 9f2e55fb6480e89087055a8cfd41680aff88696b Mon Sep 17 00:00:00 2001 From: Sam Powell Date: Wed, 7 Mar 2018 16:26:10 -0700 Subject: [PATCH 09/13] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ee7d2880..c585be61 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Python 3.6 module providing all current Meraki [Dashboard API](https://dashboard.meraki.com/api_docs) calls to interface with the Cisco Meraki cloud-managed IT solutions. Also available via [PIP](https://pypi.python.org/pypi/meraki/). +Install via pip install https://github.com/batmunkey/dashboard-api-python/zipball/master + ## Initial Setup * Enable APIs in your Meraki dashboard and obtain an APIKey: [Instructions](https://documentation.meraki.com/zGeneral_Administration/Other_Topics/The_Cisco_Meraki_Dashboard_API) From 4ffc812f7140d044a26fdb7d15f3bdf707ccbeb2 Mon Sep 17 00:00:00 2001 From: Sam Powell Date: Fri, 9 Mar 2018 15:12:09 -0700 Subject: [PATCH 10/13] Update meraki.py --- meraki/meraki.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meraki/meraki.py b/meraki/meraki.py index 09c32a48..da056548 100644 --- a/meraki/meraki.py +++ b/meraki/meraki.py @@ -21,7 +21,7 @@ import warnings -base_url = 'https://api.meraki.com/api/v0' +base_url = 'https://dashboard.meraki.com' tzlist = ['Africa/Abidjan', 'Africa/Accra', From 91def8047e00b71eda5b767cb5c97daa27834571 Mon Sep 17 00:00:00 2001 From: Sam Powell Date: Fri, 9 Mar 2018 16:46:09 -0700 Subject: [PATCH 11/13] Update meraki.py --- meraki/meraki.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meraki/meraki.py b/meraki/meraki.py index da056548..127e8167 100644 --- a/meraki/meraki.py +++ b/meraki/meraki.py @@ -21,7 +21,7 @@ import warnings -base_url = 'https://dashboard.meraki.com' +base_url = 'https://api.meraki.com/api/v0/' tzlist = ['Africa/Abidjan', 'Africa/Accra', From dee7af253ff3f1b7c9376146416b74fc115b780e Mon Sep 17 00:00:00 2001 From: Sam Powell Date: Fri, 9 Mar 2018 16:52:43 -0700 Subject: [PATCH 12/13] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c585be61..f327978d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +Edited to allow limited support for Python 2.7. + Python 3.6 module providing all current Meraki [Dashboard API](https://dashboard.meraki.com/api_docs) calls to interface with the Cisco Meraki cloud-managed IT solutions. Also available via [PIP](https://pypi.python.org/pypi/meraki/). From fa6659df8629d40374eec1f4e5e8f1bd78932ff8 Mon Sep 17 00:00:00 2001 From: Sam Powell Date: Fri, 9 Mar 2018 17:13:59 -0700 Subject: [PATCH 13/13] Update meraki.py --- meraki/meraki.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meraki/meraki.py b/meraki/meraki.py index 127e8167..faff172e 100644 --- a/meraki/meraki.py +++ b/meraki/meraki.py @@ -21,7 +21,7 @@ import warnings -base_url = 'https://api.meraki.com/api/v0/' +base_url = 'https://dashboard.meraki.com/api/v0/' tzlist = ['Africa/Abidjan', 'Africa/Accra',