diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2019-02-19 02:15:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-02-19 02:15:11 +0000 |
| commit | c9e581fbe532e10a7c1169819da3e2bd428fcb2f (patch) | |
| tree | c747906481369a8491d449e1898bf50b033a667a /starlingx | |
| parent | ed3137ada09e2ff3aa5005a8e003b48d1d01b2bb (diff) | |
| parent | 9dfd43101054c096e258dec68fa546ed0b54b986 (diff) | |
Merge "Fix URL definitions interfere with each other"
Diffstat (limited to 'starlingx')
| -rw-r--r-- | starlingx/starlingx/urls.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/starlingx/starlingx/urls.py b/starlingx/starlingx/urls.py index 5d597e46..b64946ce 100644 --- a/starlingx/starlingx/urls.py +++ b/starlingx/starlingx/urls.py @@ -27,14 +27,18 @@ urlpatterns = [ registration.Registry.as_view()), url(r'^api/multicloud-starlingx/v0/(?P<vimid>[0-9a-zA-Z_-]+)/?$', registration.Registry.as_view()), - url(r'^api/multicloud-starlingx/v0/(?P<vimid>[0-9a-zA-Z_-]+)/', - include('starlingx.proxy.urls')), url(r'^api/multicloud-starlingx/v0/(?P<vimid>[0-9a-zA-Z_-]+)/tenants/?$', tenants.Tenants.as_view()), url(r'^api/multicloud-starlingx/v0/(?P<vimid>[0-9a-zA-Z_-]+)/' '(?P<tenantid>[0-9a-zA-Z_-]{20,})/', include('starlingx.requests.urls')), url(r'^api/multicloud-starlingx/v0/(?P<vimid>[0-9a-zA-Z_-]+)/capacity_check/?$', capacity.CapacityCheck.as_view()), + url(r'^api/multicloud-starlingx/v0/(?P<vimid>[0-9a-zA-Z_-]+)/infra_workload/?$', + infra_workload.InfraWorkload.as_view()), + url(r'^api/multicloud-starlingx/v0/(?P<vimid>[0-9a-zA-Z_-]+)/infra_workload/(?P<requri>[0-9a-zA-Z_-]*)/?$', + infra_workload.InfraWorkload.as_view()), + url(r'^api/multicloud-starlingx/v0/(?P<vimid>[0-9a-zA-Z_-]+)/', + include('starlingx.proxy.urls')), # API v1, depreciated due to MULTICLOUD-335 url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/registry/?$', @@ -51,4 +55,6 @@ urlpatterns = [ capacity.APIv1CapacityCheck.as_view()), url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/infra_workload/?$', infra_workload.APIv1InfraWorkload.as_view()), + url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/', + include('starlingx.proxy.urlsV1')), ] |