Remove deprecated api-mp.meraki.com

Batch 2 of 2

Author: mpapazog

addroutes/addroutes.py

@@ -150,7 +150,7 @@ def getNetId(p_apiKey, p_orgId, p_shard, p_netName):
 
 def getShardHost(p_apiKey, p_orgId):
     #patch
-    return("api-mp.meraki.com")
+    return("api.meraki.com")
 
 
 def addRoute(p_apiKey, p_shard, p_netId, p_routeData):

auto-cycle-port/auto-cycle-port.py

@@ -40,8 +40,7 @@ def rebuild_auth(self, prepared_request, response):
 #Set to True or False to enable/disable console logging of sent API requests
 FLAG_REQUEST_VERBOSE    = True
 
-#change this to "https://api.meraki.com/api/v1" to disable mega proxy
-API_BASE_URL            = "https://api-mp.meraki.com/api/v1"
+API_BASE_URL            = "https://api.meraki.com/api/v1"
 
 
 def merakiRequest(p_apiKey, p_httpVerb, p_endpoint, p_additionalHeaders=None, p_queryItems=None, 

cloneprovision/cloneprovision.py

@@ -187,7 +187,7 @@ def getOrgId(p_apiKey, p_orgName):
 
 def getShardHost(p_apiKey, p_orgId):
     #patch
-    return("api-mp.meraki.com")
+    return("api.meraki.com")
 
 
 def getNetId(p_apiKey, p_orgId, p_shard, p_netName):

migrate_cat3k/migrate_cat3k.py

@@ -1,7 +1,7 @@
 read_me = '''This is a Python 3 script to migrate configuration from Catalyst 3750-X to Meraki MS-series switches.
 
 Usage syntax:
-  python migrate_cat3k.py -k <API key> -o <org name> -i <init file> [-u <default user> -p <default pass> -x <proxy>]
+  python migrate_cat3k.py -k <API key> -o <org name> -i <init file> [-u <default user> -p <default pass>]
 
 Mandatory parameters:
   -k <API key>              : Your Meraki Dashboard API key
@@ -11,9 +11,6 @@
 Optional parameters:
   -u <default user>         : Catalyst switch SSH username, if none is defined in init config    
   -p <default pass>         : Catalyst switch SSH password, if none is defined in init config  
-  -x <proxy>                : Whether to use the new Dashboard API mega proxy or not. Valid forms:
-                                -x use_mega_proxy           Sends API requests to "api-mp.meraki.com" (default)
-                                -x do_not_use_mega_proxy    Sends API requests to "api.meraki.com"
 
 Usage example:
   python migrate_cat3k.py -k 1234 -o "My Meraki Account" -i init_config.txt
@@ -64,8 +61,10 @@
 #SECTION: GLOBAL VARIABLES AND CLASSES: DO NOT MODIFY
 
 LAST_MERAKI_REQUEST         = datetime.datetime.now()   #used by merakiRequestThrottler()
-API_BASE_URL                = 'https://api-mp.meraki.com/api/v0'
-API_BASE_URL_MEGA_PROXY     = 'https://api-mp.meraki.com/api/v0'
+
+#PATCH: MEGA PROXY IS DEPRECATED
+API_BASE_URL                = 'https://api.meraki.com/api/v0'
+API_BASE_URL_MEGA_PROXY     = 'https://api.meraki.com/api/v0'
 API_BASE_URL_NO_MEGA        = 'https://api.meraki.com/api/v0'
 ACTION_BATCH_QUEUE          = []
 

offline_logging/offline_logging.py

@@ -45,8 +45,7 @@ def rebuild_auth(self, prepared_request, response):
 #Set to True or False to enable/disable console logging of sent API requests
 FLAG_REQUEST_VERBOSE    = True
 
-#change this to "https://api.meraki.com/api/v1" to disable mega proxy
-API_BASE_URL            = "https://api-mp.meraki.com/api/v1"
+API_BASE_URL            = "https://api.meraki.com/api/v1"
 
 
 def merakiRequest(p_apiKey, p_httpVerb, p_endpoint, p_additionalHeaders=None, p_queryItems=None, 

provision_sites/provision_sites.py

@@ -2,7 +2,7 @@
  to Meraki dashboard.
  
 Syntax:
-  python provision_sites.py -k <api key> -o <org name> -i <input file> [-n <net type> -u <update mode> -x <proxy mode>]
+  python provision_sites.py -k <api key> -o <org name> -i <input file> [-n <net type> -u <update mode>]
   
 Mandatory parameters:
   -k <api key>          : Your Meraki Dashboard API key
@@ -19,9 +19,6 @@
                            with names that match the ones in the input file. Valid forms:
                             -u fail                       Interrupts script if network is not new (default)
                             -u update                     Attempts to update existing networks to match input file
-  -x <proxy mode>       : Whether to use the new Dashboard API mega proxy or not. Valid forms:
-                            -x use-mega-proxy             Sends API requests to "api-mp.meraki.com" (default)
-                            -x do-not-use-mega-proxy      Sends API requests to "api.meraki.com"
   
 Usage example:
   python provision_sites.py -k 1234 -o "Big Industries Inc" -i site_info.csv
@@ -69,8 +66,10 @@
 
 
 LAST_MERAKI_REQUEST         = datetime.datetime.now()   #used by merakiRequestThrottler()
-API_BASE_URL                = 'https://api-mp.meraki.com/api/v0'
-API_BASE_URL_MEGA_PROXY     = 'https://api-mp.meraki.com/api/v0'
+
+# PATCH: MEGA PROXY FQDN IS DEPRECATED
+API_BASE_URL                = 'https://api.meraki.com/api/v0'
+API_BASE_URL_MEGA_PROXY     = 'https://api.meraki.com/api/v0'
 API_BASE_URL_NO_MEGA        = 'https://api.meraki.com/api/v0'
 ACTION_BATCH_QUEUE          = []
 
@@ -569,9 +568,7 @@ def main(argv):
     if (not arg_updateExisting is None) and arg_updateExisting == 'update':
         flag_doNotUpdateExisting = False
 
-    API_BASE_URL = API_BASE_URL_MEGA_PROXY
-    if (not arg_proxy is None) and arg_proxy == 'do-not-use-mega-proxy':
-        API_BASE_URL = API_BASE_URL_NO_MEGA
+    API_BASE_URL = API_BASE_URL_NO_MEGA
 
 
     print('Reading input file...')

setSwitchPortOnMacOui/setSwitchPortOnMacOui.py

@@ -229,7 +229,7 @@ def getOrgs():
 
 def getShardHost(p_org):
     #patch
-    return("api-mp.meraki.com")
+    return("api.meraki.com")
 
 
 def getNetworkClients(p_org, p_net):

topusers/topusers.py

@@ -201,7 +201,7 @@ def getOrgs():
 
 def getShardHost(p_org):
     #patch
-    return("api-mp.meraki.com")
+    return("api.meraki.com")
 
 
 def refreshOrgList2():