From: Bin Yang <Bin.Yang@windriver.com>
Date: Thu, 17 Oct 2019 03:17:19 +0000 (+0000)
Subject: Fix url pattern for proxied openstack api
X-Git-Tag: 1.4.2^0
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F30%2F97230%2F1;p=multicloud%2Fopenstack.git

Fix url pattern for proxied openstack api

servicetype pattern includes only alphebatics

Issue-ID: MULTICLOUD-866
Signed-off-by: Bin Yang <Bin.Yang@windriver.com>
Change-Id: I581a8b3bcb6cead9c11917ad1ffd1b7eb09a152c
---

diff --git a/pike/pike/proxy/urls.py b/pike/pike/proxy/urls.py
index b92b5354..a1020215 100644
--- a/pike/pike/proxy/urls.py
+++ b/pike/pike/proxy/urls.py
@@ -32,7 +32,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/pike/pike/proxy/urls_v1.py b/pike/pike/proxy/urls_v1.py
index 4ab75947..8d2fa66e 100644
--- a/pike/pike/proxy/urls_v1.py
+++ b/pike/pike/proxy/urls_v1.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()),
 ]
 
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()),
 ]
 
diff --git a/windriver/titanium_cloud/proxy/urls.py b/windriver/titanium_cloud/proxy/urls.py
index 7b33801d..dd5d4f1c 100644
--- a/windriver/titanium_cloud/proxy/urls.py
+++ b/windriver/titanium_cloud/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/windriver/titanium_cloud/proxy/urlsV1.py b/windriver/titanium_cloud/proxy/urlsV1.py
index 88a8638a..c3599b57 100644
--- a/windriver/titanium_cloud/proxy/urlsV1.py
+++ b/windriver/titanium_cloud/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()),
 ]