diff --git a/dcorch/api/proxy/apps/acceptor.py b/dcorch/api/proxy/apps/acceptor.py index df485b2b3..66fa8a391 100644 --- a/dcorch/api/proxy/apps/acceptor.py +++ b/dcorch/api/proxy/apps/acceptor.py @@ -131,4 +131,4 @@ class VersionAcceptor(Router): api_controller = VersionController(app, conf) mapper.connect(proxy_consts.VERSION_ROOT, controller=api_controller, conditions=dict(method=['GET'])) - super(VersionAcceptor, self).__init__(app, conf, mapper, None) + super(VersionAcceptor, self).__init__(app, conf, mapper, app) diff --git a/dcorch/api/proxy/common/constants.py b/dcorch/api/proxy/common/constants.py index d5074fad2..1249f3d0b 100755 --- a/dcorch/api/proxy/common/constants.py +++ b/dcorch/api/proxy/common/constants.py @@ -15,7 +15,9 @@ from dcorch.common import consts -VERSION_ROOT = '/{version:.*?}' +# Version could be any of the following: /, /v1, /v1/ +# but must deny regular paths such as /v1/isystems +VERSION_ROOT = '/{version:[^/]*?(\/$)?}' # Compute FLAVOR_RESOURCE_TAG = 'flavors'