summaryrefslogtreecommitdiffstats
path: root/starlingx
diff options
context:
space:
mode:
authorBin Yang <Bin.Yang@windriver.com>2019-10-17 03:17:19 +0000
committerBin Yang <Bin.Yang@windriver.com>2019-10-17 03:17:19 +0000
commita1825ada72191444dd750f18e90df52351f9ea9f (patch)
treef0a0927d531dfb3e1842afca5295f8f2eeefb60a /starlingx
parent44f6e268787be81960f9088d32865b323c75c57c (diff)
Fix url pattern for proxied openstack api1.4.2
servicetype pattern includes only alphebatics Issue-ID: MULTICLOUD-866 Signed-off-by: Bin Yang <Bin.Yang@windriver.com> Change-Id: I581a8b3bcb6cead9c11917ad1ffd1b7eb09a152c
Diffstat (limited to 'starlingx')
-rw-r--r--starlingx/starlingx/proxy/urls.py2
-rw-r--r--starlingx/starlingx/proxy/urlsV1.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/starlingx/starlingx/proxy/urls.py b/starlingx/starlingx/proxy/urls.py
index cde9e2b2..453bf521 100644
--- a/starlingx/starlingx/proxy/urls.py
+++ b/starlingx/starlingx/proxy/urls.py
@@ -34,7 +34,7 @@ URLPATTERNS = [
services.GetTenants.as_view()),
url(r'dns-delegate/(?P<requri>[0-9a-zA-Z./_-]*)$',
dnsaasdelegate.DnsaasDelegate.as_view()),
- url(r'^(?P<servicetype>[0-9a-zA-Z_-]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
+ url(r'^(?P<servicetype>[0-9a-zA-Z]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
services.Services.as_view()),
]
diff --git a/starlingx/starlingx/proxy/urlsV1.py b/starlingx/starlingx/proxy/urlsV1.py
index 7fca18e1..d774b483 100644
--- a/starlingx/starlingx/proxy/urlsV1.py
+++ b/starlingx/starlingx/proxy/urlsV1.py
@@ -32,7 +32,7 @@ URLPATTERNS = [
services.APIv1GetTenants.as_view()),
url(r'dns-delegate/(?P<requri>[0-9a-zA-Z./_-]*)$',
dnsaasdelegate.APIv1DnsaasDelegate.as_view()),
- url(r'^(?P<servicetype>[0-9a-zA-Z_-]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
+ url(r'^(?P<servicetype>[0-9a-zA-Z]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
services.APIv1Services.as_view()),
]