diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2017-09-21 17:09:03 +0800 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2017-09-21 17:09:03 +0800 |
| commit | 2de8e160c31f3ecf951fb4e85a96aa1e814b0a33 (patch) | |
| tree | 61cdb3cb53ceb5372e832d6c3951115fa669ebb5 /windriver | |
| parent | cecc352b211aa4d93751067b063bf9ea90021ca5 (diff) | |
Fix url pattern error
Change-Id: Ic7aa3c1791482be38ee9debcedb52bbf57add96e
Issue-Id: MULTICLOUD-89
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'windriver')
| -rw-r--r-- | windriver/titanium_cloud/proxy/urls.py | 2 | ||||
| -rw-r--r-- | windriver/titanium_cloud/swagger/views.py | 2 | ||||
| -rw-r--r-- | windriver/titanium_cloud/urls.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/windriver/titanium_cloud/proxy/urls.py b/windriver/titanium_cloud/proxy/urls.py index f848e76c..dbad26fa 100644 --- a/windriver/titanium_cloud/proxy/urls.py +++ b/windriver/titanium_cloud/proxy/urls.py @@ -25,7 +25,7 @@ urlpatterns = [ identityV3.Tokens.as_view()), url(r'^identity/(?:v2.0/|)tenants/?$', services.GetTenants.as_view()), - url(r'^(?P<servicetype>[0-9a-zA-Z_-]+)/(?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/swagger/views.py b/windriver/titanium_cloud/swagger/views.py index 01f9374e..8268fa84 100644 --- a/windriver/titanium_cloud/swagger/views.py +++ b/windriver/titanium_cloud/swagger/views.py @@ -37,7 +37,7 @@ class SwaggerJsonView(newton_json_view.SwaggerJsonView): json_data = resp.data if resp else None if json_data: json_data["basePath"] = "/api/multicloud-titanium_cloud/v0/" - json_data["info"]["title"] = "Service NBI of MultiCloud plugin for OpenStack Newton" + json_data["info"]["title"] = "Service NBI of MultiCloud plugin for Titanium Cloud" return Response(data=json_data, status=200) else: return Response(data={'error':'internal error'}, status=500) diff --git a/windriver/titanium_cloud/urls.py b/windriver/titanium_cloud/urls.py index 664d8b3e..adff5524 100644 --- a/windriver/titanium_cloud/urls.py +++ b/windriver/titanium_cloud/urls.py @@ -28,7 +28,7 @@ urlpatterns = [ url(r'^api/multicloud-titanium_cloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/tenants/?$', tenants.Tenants.as_view()), url(r'^api/multicloud-titanium_cloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/' - '(?P<tenantid>[0-9a-zA-Z_-]{8,})/', include('titanium_cloud.requests.urls')), + '(?P<tenantid>[0-9a-zA-Z_-]{20,})/', include('titanium_cloud.requests.urls')), ] |