diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2018-11-22 08:01:08 +0000 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2018-11-27 12:40:33 +0000 |
| commit | 5480b9ae42f30085e7374b54177cb6a5ea391669 (patch) | |
| tree | 3b64dd4ab9ef7c000607d0372079d10f3c3cc137 | |
| parent | 69c7fffdcc22bc47a84775a7214b0495efa04baf (diff) | |
Fix ocata and piki rest API url error
Change-Id: I5cbb06db2a613548d0a9606f3b7c404dfb0a49f0
Issue-ID: MULTICLOUD-415
Signed-off-by: Bin Yang <bin.yang@windriver.com>
(cherry picked from commit 48159a5d813f93103e6cc1459a31e61010dd3ee1)
| -rw-r--r-- | ocata/ocata/urls.py | 6 | ||||
| -rw-r--r-- | pike/pike/urls.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ocata/ocata/urls.py b/ocata/ocata/urls.py index d1601d6c..a055af4a 100644 --- a/ocata/ocata/urls.py +++ b/ocata/ocata/urls.py @@ -46,11 +46,11 @@ urlpatterns = [ vesagent_ctrl.VesAgentCtrl.as_view()), # API upgrading - url(r'^api/multicloud-ocata/v1/(?P<vimid>[0-9a-zA-Z_-]+)/registry$', + url(r'^api/multicloud-ocata/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/registry$', registration.RegistryV1.as_view()), - url(r'^api/multicloud-ocata/v1/(?P<vimid>[0-9a-zA-Z_-]+)$', + url(r'^api/multicloud-ocata/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)$', registration.RegistryV1.as_view()), - url(r'^api/multicloud-ocata/v1/(?P<vimid>[0-9a-zA-Z_-]+)/exten', + url(r'^api/multicloud-ocata/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/exten', include('ocata.extensions.urlsV1')), url(r'^api/multicloud-ocata/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/', include('ocata.proxy.urlsV1')), diff --git a/pike/pike/urls.py b/pike/pike/urls.py index 264b4a77..8b8eb3be 100644 --- a/pike/pike/urls.py +++ b/pike/pike/urls.py @@ -39,11 +39,11 @@ urlpatterns = [ url(r'^api/multicloud-pike/v0/(?P<vimid>[0-9a-zA-Z_-]+)/infra_workload/(?P<requri>[0-9a-zA-Z_-]*)/?$', infra_workload.InfraWorkload.as_view()), # API upgrading - url(r'^api/multicloud-pike/v1/(?P<vimid>[0-9a-zA-Z_-]+)/registry$', + url(r'^api/multicloud-pike/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/registry$', registration.RegistryV1.as_view()), - url(r'^api/multicloud-pike/v1/(?P<vimid>[0-9a-zA-Z_-]+)$', + url(r'^api/multicloud-pike/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)$', registration.RegistryV1.as_view()), - url(r'^api/multicloud-pike/v1/(?P<vimid>[0-9a-zA-Z_-]+)/exten', + url(r'^api/multicloud-pike/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/exten', include('pike.extensions.urlsV1')), url(r'^api/multicloud-pike/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/', include('pike.proxy.urlsV1')), |