From 7a31c2e438da2d165f473f7428cee7d2164312df Mon Sep 17 00:00:00 2001
From: Bin Yang <bin.yang@windriver.com>
Date: Tue, 27 Aug 2019 03:52:08 +0000
Subject: Fix py3 related issue

Change-Id: I2b21aaab2cbf0df11b9940bf62585294dd1ce576
Issue-ID: MULTICLOUD-774
Signed-off-by: Bin Yang <bin.yang@windriver.com>
---
 windriver/titanium_cloud/urls.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'windriver/titanium_cloud/urls.py')

diff --git a/windriver/titanium_cloud/urls.py b/windriver/titanium_cloud/urls.py
index a0537ddc..8c88633d 100644
--- a/windriver/titanium_cloud/urls.py
+++ b/windriver/titanium_cloud/urls.py
@@ -54,9 +54,6 @@ urlpatterns = [
     url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/'
         r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/exten',
         include('titanium_cloud.extensions.urlsV1')),
-    url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/'
-        r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/',
-        include('titanium_cloud.proxy.urlsV1')),
     url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/'
         r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/tenants/?$',
         tenants.APIv1Tenants.as_view()),
@@ -70,6 +67,13 @@ urlpatterns = [
     url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/'
         r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/infra_workload/?$',
         infra_workload.APIv1InfraWorkload.as_view()),
+    url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[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-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/'
+        r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/',
+        include('titanium_cloud.proxy.urlsV1')),
 
     # API v0, new namespace due to MULTICLOUD-335
     url(r'^api/multicloud-titaniumcloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/'
-- 
cgit 1.2.3-korg