API upgrading for forwarder API

[multicloud/framework.git] / multivimbroker / multivimbroker / forwarder / urls.py

diff --git a/multivimbroker/multivimbroker/forwarder/urls.py b/multivimbroker/multivimbroker/forwarder/urls.py
index 5b3fc41..5e1320e 100644 (file)
--- a/multivimbroker/multivimbroker/forwarder/urls.py
+++ b/multivimbroker/multivimbroker/forwarder/urls.py
@@ -1,4 +1,5 @@
 # Copyright 2017 Wind River Systems, Inc.
 # Copyright 2017 Wind River Systems, Inc.

+# Copyright (c) 2017-2018 VMware, Inc.

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -15,16 +16,30 @@
 from django.conf.urls import url
 from rest_framework.urlpatterns import format_suffix_patterns
 
 from django.conf.urls import url
 from rest_framework.urlpatterns import format_suffix_patterns
 

+from multivimbroker.forwarder.views import CheckCapacity

 from multivimbroker.forwarder.views import Extension
 from multivimbroker.forwarder.views import Forward
 from multivimbroker.forwarder.views import Identity
 from multivimbroker.forwarder.views import Registry
 from multivimbroker.forwarder.views import Extension
 from multivimbroker.forwarder.views import Forward
 from multivimbroker.forwarder.views import Identity
 from multivimbroker.forwarder.views import Registry

+from multivimbroker.forwarder.views import UnRegistry

 from multivimbroker.forwarder.views import VIMTypes
 from multivimbroker.forwarder.views import VIMTypes

+from multivimbroker.forwarder.views import MultiPartView

 
 

+# API v1
+from multivimbroker.forwarder.views import APIv1CheckCapacity
+from multivimbroker.forwarder.views import APIv1Extension
+from multivimbroker.forwarder.views import APIv1Forward
+from multivimbroker.forwarder.views import APIv1Identity
+from multivimbroker.forwarder.views import APIv1Registry
+from multivimbroker.forwarder.views import APIv1UnRegistry
+from multivimbroker.forwarder.views import APIv1VIMTypes
+from multivimbroker.forwarder.views import APIv1MultiPartView

 
 urlpatterns = [
     url(r'^api/multicloud/v0/vim_types$',
         VIMTypes.as_view()),
 
 urlpatterns = [
     url(r'^api/multicloud/v0/vim_types$',
         VIMTypes.as_view()),

+    url(r'^api/multicloud/v0/check_vim_capacity$',
+        CheckCapacity.as_view()),

     url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/identity/v3$',
         Identity.as_view()),
     url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/identity/v3'
     url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/identity/v3$',
         Identity.as_view()),
     url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/identity/v3'


@@ -32,11 +47,40 @@ urlpatterns = [
     url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/registry$',
         Registry.as_view()),
     url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)$',
     url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/registry$',
         Registry.as_view()),
     url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)$',

-        Registry.as_view()),
+        UnRegistry.as_view()),

     url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/extensions$',
         Extension.as_view()),
     url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/extensions$',
         Extension.as_view()),

+    url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/multipart',
+        MultiPartView.as_view()),

     url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)',
         Forward.as_view()),
     url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)',
         Forward.as_view()),

+
+    # API v1
+    url(r'^api/multicloud/v1/vim_types$',
+        APIv1VIMTypes.as_view()),
+    url(r'^api/multicloud/v1/check_vim_capacity$',
+        APIv1CheckCapacity.as_view()),
+    url(r'^api/multicloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)'
+        r'/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/identity/v3$',
+        APIv1Identity.as_view()),
+    url(r'^api/multicloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)'
+        r'/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/identity/v3'
+        r'/auth/tokens$', APIv1Identity.as_view()),
+    url(r'^api/multicloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)'
+        r'/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/registry$',
+        APIv1Registry.as_view()),
+    url(r'^api/multicloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)i'
+        r'/(?P<cloud_region_id>[0-9a-zA-Z_-]+)$',
+        APIv1UnRegistry.as_view()),
+    url(r'^api/multicloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)'
+        r'/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/extensions$',
+        APIv1Extension.as_view()),
+    url(r'^api/multicloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)'
+        r'/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/multipart',
+        APIv1MultiPartView.as_view()),
+    url(r'^api/multicloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)'
+        r'/(?P<cloud_region_id>[0-9a-zA-Z_-]+)',
+        APIv1Forward.as_view()),

 ]
 
 urlpatterns = format_suffix_patterns(urlpatterns)
 ]
 
 urlpatterns = format_suffix_patterns(urlpatterns)