From 56b4c5cefb65f1cb76445a621087a3f4ab2fc3e9 Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Tue, 2 Apr 2019 10:32:20 +0000 Subject: Integrate heatbridge logic to infra_workload API Offload the heatbridge to thread Change-Id: I66c32e7ee30a40542e6ba75087d7d88caaf0c640 Issue-ID: MULTICLOUD-561 Signed-off-by: Bin Yang --- windriver/titanium_cloud/urls.py | 79 +++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 26 deletions(-) (limited to 'windriver/titanium_cloud/urls.py') diff --git a/windriver/titanium_cloud/urls.py b/windriver/titanium_cloud/urls.py index f910bcc8..8b73662a 100644 --- a/windriver/titanium_cloud/urls.py +++ b/windriver/titanium_cloud/urls.py @@ -24,7 +24,8 @@ urlpatterns = [ url(r'^', include('titanium_cloud.samples.urls')), # API v0, depreciated due to MULTICLOUD-335 - url(r'^api/multicloud-titanium_cloud/v0/(?P[0-9a-zA-Z_-]+)/registry/?$', + url(r'^api/multicloud-titanium_cloud/v0/(?P[0-9a-zA-Z_-]+)/' + r'registry/?$', registration.Registry.as_view()), url(r'^api/multicloud-titanium_cloud/v0/(?P[0-9a-zA-Z_-]+)/?$', registration.Registry.as_view()), @@ -32,72 +33,98 @@ urlpatterns = [ include('titanium_cloud.extensions.urls')), url(r'^api/multicloud-titanium_cloud/v0/(?P[0-9a-zA-Z_-]+)/', include('titanium_cloud.proxy.urls')), - url(r'^api/multicloud-titanium_cloud/v0/(?P[0-9a-zA-Z_-]+)/tenants/?$', + url(r'^api/multicloud-titanium_cloud/v0/(?P[0-9a-zA-Z_-]+)/' + r'tenants/?$', tenants.Tenants.as_view()), url(r'^api/multicloud-titanium_cloud/v0/(?P[0-9a-zA-Z_-]+)/' - '(?P[0-9a-zA-Z_-]{20,})/', include('titanium_cloud.requests.urls')), + '(?P[0-9a-zA-Z_-]{20,})/', + include('titanium_cloud.requests.urls')), # CapacityCheck - url(r'^api/multicloud-titanium_cloud/v0/(?P[0-9a-zA-Z_-]+)/capacity_check/?$', + url(r'^api/multicloud-titanium_cloud/v0/(?P[0-9a-zA-Z_-]+)/' + r'capacity_check/?$', capacity.CapacityCheck.as_view()), # API v1, depreciated due to MULTICLOUD-335 - url(r'^api/multicloud-titanium_cloud/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/registry/?$', + url(r'^api/multicloud-titanium_cloud/v1/(?P[0-9a-zA-Z_-]+)/' + r'(?P[0-9a-zA-Z_-]+)/registry/?$', registration.APIv1Registry.as_view()), - url(r'^api/multicloud-titanium_cloud/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/?$', + url(r'^api/multicloud-titanium_cloud/v1/(?P[0-9a-zA-Z_-]+)/' + r'(?P[0-9a-zA-Z_-]+)/?$', registration.APIv1Registry.as_view()), - url(r'^api/multicloud-titanium_cloud/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/exten', + url(r'^api/multicloud-titanium_cloud/v1/(?P[0-9a-zA-Z_-]+)/' + r'(?P[0-9a-zA-Z_-]+)/exten', include('titanium_cloud.extensions.urlsV1')), - url(r'^api/multicloud-titanium_cloud/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/', + url(r'^api/multicloud-titanium_cloud/v1/(?P[0-9a-zA-Z_-]+)/' + r'(?P[0-9a-zA-Z_-]+)/', include('titanium_cloud.proxy.urlsV1')), - url(r'^api/multicloud-titanium_cloud/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/tenants/?$', + url(r'^api/multicloud-titanium_cloud/v1/(?P[0-9a-zA-Z_-]+)/' + r'(?P[0-9a-zA-Z_-]+)/tenants/?$', tenants.APIv1Tenants.as_view()), - url(r'^api/multicloud-titanium_cloud/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/' + url(r'^api/multicloud-titanium_cloud/v1/(?P[0-9a-zA-Z_-]+)/' + r'(?P[0-9a-zA-Z_-]+)/' '(?P[0-9a-zA-Z_-]{20,})/', include('titanium_cloud.requests.urlsV1')), # CapacityCheck - url(r'^api/multicloud-titanium_cloud/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/capacity_check/?$', + url(r'^api/multicloud-titanium_cloud/v1/(?P[0-9a-zA-Z_-]+)/' + r'(?P[0-9a-zA-Z_-]+)/capacity_check/?$', capacity.APIv1CapacityCheck.as_view()), - url(r'^api/multicloud-titanium_cloud/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/infra_workload/?$', + url(r'^api/multicloud-titanium_cloud/v1/(?P[0-9a-zA-Z_-]+)/' + r'(?P[0-9a-zA-Z_-]+)/infra_workload/?$', infra_workload.APIv1InfraWorkload.as_view()), # API v0, new namespace due to MULTICLOUD-335 - url(r'^api/multicloud-titaniumcloud/v0/(?P[0-9a-zA-Z_-]+)/registry/?$', + url(r'^api/multicloud-titaniumcloud/v0/(?P[0-9a-zA-Z_-]+)/' + r'registry/?$', registration.APIv0Registry.as_view()), url(r'^api/multicloud-titaniumcloud/v0/(?P[0-9a-zA-Z_-]+)/?$', registration.APIv0Registry.as_view()), url(r'^api/multicloud-titaniumcloud/v0/(?P[0-9a-zA-Z_-]+)/exten', include('titanium_cloud.extensions.urls')), - url(r'^api/multicloud-titaniumcloud/v0/(?P[0-9a-zA-Z_-]+)/infra_workload/?$', + url(r'^api/multicloud-titaniumcloud/v0/(?P[0-9a-zA-Z_-]+)/' + r'infra_workload/?$', infra_workload.InfraWorkload.as_view()), - url(r'^api/multicloud-titaniumcloud/v0/(?P[0-9a-zA-Z_-]+)/infra_workload/(?P[0-9a-zA-Z_-]*)/?$', + url(r'^api/multicloud-titaniumcloud/v0/(?P[0-9a-zA-Z_-]+)/' + r'infra_workload/(?P[0-9a-zA-Z_-]*)/?$', infra_workload.InfraWorkload.as_view()), url(r'^api/multicloud-titaniumcloud/v0/(?P[0-9a-zA-Z_-]+)/', include('titanium_cloud.proxy.urls')), - url(r'^api/multicloud-titaniumcloud/v0/(?P[0-9a-zA-Z_-]+)/tenants/?$', + url(r'^api/multicloud-titaniumcloud/v0/(?P[0-9a-zA-Z_-]+)/' + r'tenants/?$', tenants.Tenants.as_view()), url(r'^api/multicloud-titaniumcloud/v0/(?P[0-9a-zA-Z_-]+)/' '(?P[0-9a-zA-Z_-]{20,})/', include('titanium_cloud.requests.urls')), # CapacityCheck - url(r'^api/multicloud-titaniumcloud/v0/(?P[0-9a-zA-Z_-]+)/capacity_check/?$', + url(r'^api/multicloud-titaniumcloud/v0/(?P[0-9a-zA-Z_-]+)/' + r'capacity_check/?$', capacity.CapacityCheck.as_view()), # API v1, new namespace due to MULTICLOUD-335 - url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/registry/?$', + url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/' + r'(?P[0-9a-zA-Z_-]+)/registry/?$', registration.APIv1Registry.as_view()), - url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/?$', + url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/' + r'(?P[0-9a-zA-Z_-]+)/?$', registration.APIv1Registry.as_view()), - url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/exten', + url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/' + r'(?P[0-9a-zA-Z_-]+)/exten', include('titanium_cloud.extensions.urlsV1')), - url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/tenants/?$', + url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/' + r'(?P[0-9a-zA-Z_-]+)/tenants/?$', tenants.APIv1Tenants.as_view()), - url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/' + url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/' + r'(?P[0-9a-zA-Z_-]+)/' '(?P[0-9a-zA-Z_-]{20,})/', include('titanium_cloud.requests.urlsV1')), # CapacityCheck - url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/capacity_check/?$', + url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/' + r'(?P[0-9a-zA-Z_-]+)/capacity_check/?$', capacity.APIv1CapacityCheck.as_view()), - url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/infra_workload/?$', + url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/' + r'(?P[0-9a-zA-Z_-]+)/infra_workload/?$', infra_workload.APIv1InfraWorkload.as_view()), - url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/infra_workload/(?P[0-9a-zA-Z_-]*)/?$', + url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/' + r'(?P[0-9a-zA-Z_-]+)/infra_workload/' + r'(?P[0-9a-zA-Z_-]*)/?$', infra_workload.APIv1InfraWorkload.as_view()), - url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/', + url(r'^api/multicloud-titaniumcloud/v1/(?P[0-9a-zA-Z_-]+)/' + r'(?P[0-9a-zA-Z_-]+)/', include('titanium_cloud.proxy.urlsV1')), ] -- cgit 1.2.3-korg