diff options
| author |   Haibin Huang <haibin.huang@intel.com> | 2019-02-18 20:47:29 +0800 |
|---|---|---|
| committer | Haibin Huang <haibin.huang@intel.com> | 2019-02-18 20:47:29 +0800 |
| commit | 9dfd43101054c096e258dec68fa546ed0b54b986 (patch) | |
| tree | 0bbea46afba33529854f45f7802e97f83e37c018 /starlingx | |
| parent | 6598c5d4717476792f71192a95a2704e08f1cbc2 (diff) | |
Fix URL definitions interfere with each other
Change-Id: I2f0bc1ca7e6d4e6337cc504c51e9ead06bd5be4e
Issue-ID: MULTICLOUD-477
Signed-off-by: Haibin Huang <haibin.huang@intel.com>
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')), ] |