From: Bin Yang <bin.yang@windriver.com>
Date: Fri, 13 Dec 2019 11:58:26 +0000 (+0000)
Subject: Fix infra_workload url pattern mismatch
X-Git-Tag: 1.5.2~3
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9abfa61aa4e88e0e708b16f3d0598d75f426e355;p=multicloud%2Fopenstack.git

Fix infra_workload url pattern mismatch

Change-Id: If58f34f1e81454d7323e1c715485665abdf8c933
Issue-ID: MULTICLOUD-965
Signed-off-by: Bin Yang <bin.yang@windriver.com>
---

diff --git a/pike/pike/urls.py b/pike/pike/urls.py
index f07d1861..c6493116 100644
--- a/pike/pike/urls.py
+++ b/pike/pike/urls.py
@@ -29,11 +29,6 @@ urlpatterns = [
         registration.Registry.as_view()),
     url(r'^api/multicloud-pike/v0/(?P<vimid>[0-9a-zA-Z_-]+)/exten',
         include('pike.extensions.urls')),
-    url(r'^api/multicloud-pike/v0/(?P<vimid>[0-9a-zA-Z_-]+)/infra_workload/?$',
-        infra_workload.InfraWorkload.as_view()),
-    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()),
     url(r'^api/multicloud-pike/v0/(?P<vimid>[0-9a-zA-Z_-]+)/',
         include('pike.proxy.urls')),
     url(r'^api/multicloud-pike/v0/(?P<vimid>[0-9a-zA-Z_-]+)/tenants$',
@@ -42,10 +37,11 @@ urlpatterns = [
         '(?P<tenantid>[0-9a-zA-Z_-]{20,})/', include('pike.requests.urls')),
     url(r'^api/multicloud-pike/v0/(?P<vimid>[0-9a-zA-Z_-]+)/capacity_check/?$',
         capacity.CapacityCheck.as_view()),
-    url(r'^api/multicloud-pike/v0/(?P<vimid>[0-9a-zA-Z_-]+)/infra_workload/?$',
+    url(r'^api/multicloud-pike/v0/(?P<vimid>[0-9a-zA-Z_-]+)/'
+        r'infra_workload/?$',
         infra_workload.InfraWorkload.as_view()),
-    url(r'^api/multicloud-pike/v0/(?P<vimid>[0-9a-zA-Z_-]+)/infra_workload/'
-        '(?P<requri>[0-9a-zA-Z_-]*)/?$',
+    url(r'^api/multicloud-pike/v0/(?P<vimid>[0-9a-zA-Z_-]+)/'
+        r'infra_workload/(?P<workloadid>[0-9a-zA-Z_-]+)/?$',
         infra_workload.InfraWorkload.as_view()),
     # API upgrading
     url(r'^api/multicloud-pike/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/'
@@ -67,10 +63,11 @@ urlpatterns = [
         '(?P<cloud_region_id>[0-9a-zA-Z_-]+)/capacity_check/?$',
         capacity.APIv1CapacityCheck.as_view()),
     url(r'^api/multicloud-pike/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/'
-        '(?P<cloud_region_id>[0-9a-zA-Z_-]+)/infra_workload/?$',
+        r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/infra_workload/?$',
         infra_workload.APIv1InfraWorkload.as_view()),
     url(r'^api/multicloud-pike/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/'
-        '(?P<cloud_region_id>[0-9a-zA-Z_-]+)/infra_workload/(?P<requri>[0-9a-zA-Z_-]*)/?$',
+        r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/infra_workload/'
+        r'(?P<workloadid>[0-9a-zA-Z_-]+)/?$',
         infra_workload.APIv1InfraWorkload.as_view()),
     url(r'^api/multicloud-pike/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/'
         '(?P<cloud_region_id>[0-9a-zA-Z_-]+)/',