diff options
Diffstat (limited to 'lcm')
| -rw-r--r-- | lcm/jobs/urls.py | 8 | ||||
| -rw-r--r-- | lcm/ns/sfcs/urls.py | 18 | ||||
| -rw-r--r-- | lcm/ns/urls.py | 25 | ||||
| -rw-r--r-- | lcm/ns/vls/urls.py | 10 | ||||
| -rw-r--r-- | lcm/ns/vnfs/urls.py | 24 | ||||
| -rw-r--r-- | lcm/swagger/urls.py | 8 |
6 files changed, 43 insertions, 50 deletions
diff --git a/lcm/jobs/urls.py b/lcm/jobs/urls.py index 6919d05f..3ddfc8a9 100644 --- a/lcm/jobs/urls.py +++ b/lcm/jobs/urls.py @@ -11,13 +11,13 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from django.conf.urls import patterns, url +from django.conf.urls import url from rest_framework.urlpatterns import format_suffix_patterns from lcm.jobs.views import JobView -urlpatterns = patterns('', - url(r'^api/nslcm/v1/jobs/(?P<job_id>[0-9a-zA-Z_-]+)$', JobView.as_view()), - ) +urlpatterns = [ + url(r'^api/nslcm/v1/jobs/(?P<job_id>[0-9a-zA-Z_-]+)$', JobView.as_view()), +] urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/lcm/ns/sfcs/urls.py b/lcm/ns/sfcs/urls.py index 6b852567..cfca2c30 100644 --- a/lcm/ns/sfcs/urls.py +++ b/lcm/ns/sfcs/urls.py @@ -11,19 +11,19 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from django.conf.urls import patterns, url +from django.conf.urls import url from rest_framework.urlpatterns import format_suffix_patterns from lcm.ns.sfcs.detail_views import SfcDetailView from lcm.ns.sfcs.views import SfcView, SfcInstanceView, PortPairGpView, FlowClaView, PortChainView -urlpatterns = patterns('', - url(r'^api/nslcm/v1/ns/sfcs$', SfcView.as_view()), - url(r'^api/nslcm/v1/ns/sfcs/(?P<sfc_inst_id>[0-9a-zA-Z_-]+)$', SfcDetailView.as_view()), - url(r'^api/nslcm/v1/ns/sfc_instance$', SfcInstanceView.as_view()), - url(r'^api/nslcm/v1/ns/create_port_pair_group$', PortPairGpView.as_view()), - url(r'^api/nslcm/v1/ns/create_flow_classifier$', FlowClaView.as_view()), - url(r'^api/nslcm/v1/ns/create_port_chain$', PortChainView.as_view()), - ) +urlpatterns = [ + url(r'^api/nslcm/v1/ns/sfcs$', SfcView.as_view()), + url(r'^api/nslcm/v1/ns/sfcs/(?P<sfc_inst_id>[0-9a-zA-Z_-]+)$', SfcDetailView.as_view()), + url(r'^api/nslcm/v1/ns/sfc_instance$', SfcInstanceView.as_view()), + url(r'^api/nslcm/v1/ns/create_port_pair_group$', PortPairGpView.as_view()), + url(r'^api/nslcm/v1/ns/create_flow_classifier$', FlowClaView.as_view()), + url(r'^api/nslcm/v1/ns/create_port_chain$', PortChainView.as_view()), +] urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/lcm/ns/urls.py b/lcm/ns/urls.py index f61b4444..6fa06587 100644 --- a/lcm/ns/urls.py +++ b/lcm/ns/urls.py @@ -11,25 +11,20 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from django.conf.urls import patterns, url +from django.conf.urls import url from rest_framework.urlpatterns import format_suffix_patterns from lcm.ns.views import CreateNSView, NSInstView, TerminateNSView, NSDetailView, NSInstPostDealView, \ NSManualScaleView, NSHealView -urlpatterns = patterns('', - url(r'^api/nslcm/v1/ns$', CreateNSView.as_view()), - url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/instantiate$', - NSInstView.as_view()), - url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/terminate$', - TerminateNSView.as_view()), - url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)$', NSDetailView.as_view()), - url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/postdeal$', - NSInstPostDealView.as_view()), - url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/scale$', - NSManualScaleView.as_view()), - url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/heal$', - NSHealView.as_view()) - ) +urlpatterns = [ + url(r'^api/nslcm/v1/ns$', CreateNSView.as_view()), + url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/instantiate$', NSInstView.as_view()), + url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/terminate$', TerminateNSView.as_view()), + url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)$', NSDetailView.as_view()), + url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/postdeal$', NSInstPostDealView.as_view()), + url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/scale$', NSManualScaleView.as_view()), + url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/heal$', NSHealView.as_view()) +] urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/lcm/ns/vls/urls.py b/lcm/ns/vls/urls.py index a6f6adc5..597404d8 100644 --- a/lcm/ns/vls/urls.py +++ b/lcm/ns/vls/urls.py @@ -12,14 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.conf.urls import patterns, url +from django.conf.urls import url from rest_framework.urlpatterns import format_suffix_patterns from lcm.ns.vls.views import VlView, VlDetailView -urlpatterns = patterns('', - url(r'^api/nslcm/v1/ns/vls$', VlView.as_view()), - url(r'^api/nslcm/v1/ns/vls/(?P<vl_inst_id>[0-9a-zA-Z_-]+)$', VlDetailView.as_view()), - ) +urlpatterns = [ + url(r'^api/nslcm/v1/ns/vls$', VlView.as_view()), + url(r'^api/nslcm/v1/ns/vls/(?P<vl_inst_id>[0-9a-zA-Z_-]+)$', VlDetailView.as_view()), +] urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/lcm/ns/vnfs/urls.py b/lcm/ns/vnfs/urls.py index 6e79c4d9..ca0e8df8 100644 --- a/lcm/ns/vnfs/urls.py +++ b/lcm/ns/vnfs/urls.py @@ -11,23 +11,21 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from django.conf.urls import patterns, url +from django.conf.urls import url from rest_framework.urlpatterns import format_suffix_patterns from lcm.ns.vnfs.views import NfView, NfDetailView, NfGrant, LcmNotify, NfScaleView, NfVerifyView, NfVnfmInfoView, \ NfVimInfoView -urlpatterns = patterns('', - url(r'^api/nslcm/v1/ns/vnfs$', NfView.as_view()), - url(r'^api/nslcm/v1/ns/vnfs/(?P<vnfinstid>[0-9a-zA-Z_-]+)$', NfDetailView.as_view()), - url(r'^api/nslcm/v1/ns/grantvnf$', NfGrant.as_view()), - url(r'^api/nslcm/v1/ns/(?P<vnfmid>[0-9a-zA-Z_-]+)' - r'/vnfs/(?P<vnfInstanceId>[0-9a-zA-Z_-]+)/Notify$', - LcmNotify.as_view()), - url(r'^api/nslcm/v1/ns/vnfs/(?P<vnfinstid>[0-9a-zA-Z_-]+)/scaling$', NfScaleView.as_view()), - url(r'^api/nslcm/v1/vnfonboarding$', NfVerifyView.as_view()), - url(r'^api/nslcm/v1/vnfms/(?P<vnfmid>[0-9a-zA-Z_-]+)', NfVnfmInfoView.as_view()), - url(r'^api/nslcm/v1/vims/(?P<vimid>[0-9a-zA-Z_-]+)', NfVimInfoView.as_view()), - ) +urlpatterns = [ + url(r'^api/nslcm/v1/ns/vnfs$', NfView.as_view()), + url(r'^api/nslcm/v1/ns/vnfs/(?P<vnfinstid>[0-9a-zA-Z_-]+)$', NfDetailView.as_view()), + url(r'^api/nslcm/v1/ns/grantvnf$', NfGrant.as_view()), + url(r'^api/nslcm/v1/ns/(?P<vnfmid>[0-9a-zA-Z_-]+)/vnfs/(?P<vnfInstanceId>[0-9a-zA-Z_-]+)/Notify$', LcmNotify.as_view()), + url(r'^api/nslcm/v1/ns/vnfs/(?P<vnfinstid>[0-9a-zA-Z_-]+)/scaling$', NfScaleView.as_view()), + url(r'^api/nslcm/v1/vnfonboarding$', NfVerifyView.as_view()), + url(r'^api/nslcm/v1/vnfms/(?P<vnfmid>[0-9a-zA-Z_-]+)', NfVnfmInfoView.as_view()), + url(r'^api/nslcm/v1/vims/(?P<vimid>[0-9a-zA-Z_-]+)', NfVimInfoView.as_view()), +] urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/lcm/swagger/urls.py b/lcm/swagger/urls.py index c3b8ad62..0fe8269f 100644 --- a/lcm/swagger/urls.py +++ b/lcm/swagger/urls.py @@ -11,13 +11,13 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from django.conf.urls import patterns, url +from django.conf.urls import url from rest_framework.urlpatterns import format_suffix_patterns from lcm.swagger.views import SwaggerJsonView -urlpatterns = patterns('', - url(r'^api/nslcm/v1/swagger.json$', SwaggerJsonView.as_view()) - ) +urlpatterns = [ + url(r'^api/nslcm/v1/swagger.json$', SwaggerJsonView.as_view()) +] urlpatterns = format_suffix_patterns(urlpatterns) |