summaryrefslogtreecommitdiffstats
path: root/ocata
diff options
context:
space:
mode:
Diffstat (limited to 'ocata')
-rw-r--r--ocata/ocata/requests/urlsV1.py2
-rw-r--r--ocata/ocata/urls.py6
2 files changed, 5 insertions, 3 deletions
diff --git a/ocata/ocata/requests/urlsV1.py b/ocata/ocata/requests/urlsV1.py
index 4a8134aa..80b0a7e9 100644
--- a/ocata/ocata/requests/urlsV1.py
+++ b/ocata/ocata/requests/urlsV1.py
@@ -34,6 +34,8 @@ urlpatterns = [
image.APIv1Images.as_view()),
url(r'^volumes(/(?P<volumeid>[0-9a-zA-Z_-]+))?',
volume.APIv1Volumes.as_view()),
+ url(r'^servers(/(?P<serverid>[0-9a-zA-Z_-]+))/action/?$',
+ server.APIv1ServerAction.as_view()),
url(r'^servers(/(?P<serverid>[0-9a-zA-Z_-]+))?',
server.APIv1Servers.as_view()),
url(r'^ports(/(?P<portid>[0-9a-zA-Z_-]+))?',
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')),