Core: Fix backwards compatibility for account usage and limits; Fix r…

…ucio#3165
bari12 · Dec 3, 2019 · f9674e9 · f9674e9
1 parent 1b7e15f
commit f9674e9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/rucio/web/rest/webpy/v1/account.py b/lib/rucio/web/rest/webpy/v1/account.py
@@ -69,7 +69,7 @@
     '/(.+)/usage/local/(.+)', 'LocalUsage',
     '/(.+)/usage/global', 'GlobalUsage',
     '/(.+)/usage/global/(.+)', 'GlobalUsage',
-    '/(.+)/usage', 'LocalUsage',
+    '/(.+)/usage/', 'LocalUsage',
     '/(.+)/usage/(.+)', 'LocalUsage',
     '/(.+)', 'AccountParameter',
     '/?$', 'Account',

diff --git a/lib/rucio/web/rest/webpy/v1/account_limit.py b/lib/rucio/web/rest/webpy/v1/account_limit.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 # Authors:
-# - Martin Barisits <martin.barisits@cern.ch>, 2014
+# - Martin Barisits <martin.barisits@cern.ch>, 2014-2019
 # - Vincent Garonne <vincent.garonne@cern.ch>, 2017
 # - Mario Lassnig <mario.lassnig@cern.ch>, 2018
 # - Hannes Hansen <hannes.jakob.hansen@cern.ch>, 2018-2019
@@ -41,6 +41,7 @@
 URLS = (
     '/local/(.+)/(.+)', 'LocalAccountLimit',
     '/global/(.+)/(.+)', 'GlobalAccountLimit',
+    '/(.+)/(.+)', 'LocalAccountLimit',
 )