summaryrefslogtreecommitdiffstats
path: root/windriver/titanium_cloud/urls.py
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2018-09-17 01:27:34 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-17 01:27:34 +0000
commitd07b4081cd7e1771e99ea4b4012852fb296a057e (patch)
treeace7f8627b4eb51089451bdf9ee28d4fb6d3c6d2 /windriver/titanium_cloud/urls.py
parent1f1588b0fe00d4c9dc6c5bf5ad2105f00eec42d0 (diff)
parentfb6c49e4131e44e145ab60fce7dc355d69763158 (diff)
Merge "Add heatbridge handler"
Diffstat (limited to 'windriver/titanium_cloud/urls.py')
-rw-r--r--windriver/titanium_cloud/urls.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/windriver/titanium_cloud/urls.py b/windriver/titanium_cloud/urls.py
index bd5af421..1d54325b 100644
--- a/windriver/titanium_cloud/urls.py
+++ b/windriver/titanium_cloud/urls.py
@@ -90,8 +90,6 @@ urlpatterns = [
registration.APIv1Registry.as_view()),
url(r'^api/multicloud-titaniumcloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/exten',
include('titanium_cloud.extensions.urlsV1')),
- url(r'^api/multicloud-titaniumcloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/',
- include('titanium_cloud.proxy.urlsV1')),
url(r'^api/multicloud-titaniumcloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/tenants/?$',
tenants.APIv1Tenants.as_view()),
url(r'^api/multicloud-titaniumcloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/'
@@ -103,4 +101,8 @@ urlpatterns = [
vesagent_ctrl.APIv1VesAgentCtrl.as_view()),
url(r'^api/multicloud-titaniumcloud/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-titaniumcloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/infra_workload/(?P<requri>[0-9a-zA-Z_-]*)/?$',
+ infra_workload.APIv1InfraWorkload.as_view()),
+ url(r'^api/multicloud-titaniumcloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/',
+ include('titanium_cloud.proxy.urlsV1')),
]