X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=multivimbroker%2Fmultivimbroker%2Fforwarder%2Furls.py;h=75dde71f8c1d98e5ea9ceb902ab4aac4df193731;hb=9d536985089479573d5d292e20fc18a9adfd72f4;hp=5e1320e8581545f6ea419f949d7924c4c2575ba2;hpb=11c98c9db093827f651935c38c1549fc215a9b72;p=multicloud%2Fframework.git diff --git a/multivimbroker/multivimbroker/forwarder/urls.py b/multivimbroker/multivimbroker/forwarder/urls.py index 5e1320e..75dde71 100644 --- a/multivimbroker/multivimbroker/forwarder/urls.py +++ b/multivimbroker/multivimbroker/forwarder/urls.py @@ -16,6 +16,7 @@ from django.conf.urls import url from rest_framework.urlpatterns import format_suffix_patterns +# API v0 from multivimbroker.forwarder.views import CheckCapacity from multivimbroker.forwarder.views import Extension from multivimbroker.forwarder.views import Forward @@ -23,7 +24,6 @@ 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 MultiPartView # API v1 from multivimbroker.forwarder.views import APIv1CheckCapacity @@ -33,9 +33,10 @@ 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 +from multivimbroker.forwarder.views import APIv1InfraWorkload urlpatterns = [ + # API v0 url(r'^api/multicloud/v0/vim_types$', VIMTypes.as_view()), url(r'^api/multicloud/v0/check_vim_capacity$', @@ -50,8 +51,6 @@ urlpatterns = [ UnRegistry.as_view()), url(r'^api/multicloud/v0/(?P[0-9a-zA-Z_-]+)/extensions$', Extension.as_view()), - url(r'^api/multicloud/v0/(?P[0-9a-zA-Z_-]+)/multipart', - MultiPartView.as_view()), url(r'^api/multicloud/v0/(?P[0-9a-zA-Z_-]+)', Forward.as_view()), @@ -69,15 +68,15 @@ urlpatterns = [ url(r'^api/multicloud/v1/(?P[0-9a-zA-Z_-]+)' r'/(?P[0-9a-zA-Z_-]+)/registry$', APIv1Registry.as_view()), - url(r'^api/multicloud/v1/(?P[0-9a-zA-Z_-]+)i' + url(r'^api/multicloud/v1/(?P[0-9a-zA-Z_-]+)' r'/(?P[0-9a-zA-Z_-]+)$', APIv1UnRegistry.as_view()), url(r'^api/multicloud/v1/(?P[0-9a-zA-Z_-]+)' r'/(?P[0-9a-zA-Z_-]+)/extensions$', APIv1Extension.as_view()), url(r'^api/multicloud/v1/(?P[0-9a-zA-Z_-]+)' - r'/(?P[0-9a-zA-Z_-]+)/multipart', - APIv1MultiPartView.as_view()), + r'/(?P[0-9a-zA-Z_-]+)/infra_workload', + APIv1InfraWorkload.as_view()), url(r'^api/multicloud/v1/(?P[0-9a-zA-Z_-]+)' r'/(?P[0-9a-zA-Z_-]+)', APIv1Forward.as_view()),