From 29c5cb22d31cb433f1f7d488814a609aeeb9a153 Mon Sep 17 00:00:00 2001 From: Ethan Lynn Date: Tue, 19 Sep 2017 17:41:51 +0800 Subject: Fix url regex match Change-Id: I9ac0983fb05e41e19b7361ff5b11109c036da404 issue-id: MULTICLOUD-96 Signed-off-by: Ethan Lynn --- vio/vio/swagger/urls.py | 56 ++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/vio/vio/swagger/urls.py b/vio/vio/swagger/urls.py index 3448424..fbecbd0 100644 --- a/vio/vio/swagger/urls.py +++ b/vio/vio/swagger/urls.py @@ -78,25 +78,25 @@ urlpatterns = [ url(r'^api/multicloud-vio/v0/(?P[0-9a-zA-Z_-]+)/' r'(?P[0-9a-zA-Z]+)/hosts/(?P[0-9a-zA-Z_-]+)$', HostView.as_view()), - url(r'^api/multicloud-vio/v0/(?P[0-9a-zA-Z\-\_]+)\ - /(?P[0-9a-zA-Z\-\_]+)/networks$', + url(r'^api/multicloud-vio/v0/(?P[0-9a-zA-Z\-\_]+)/' + r'(?P[0-9a-zA-Z\-\_]+)/networks$', CreateNetworkView.as_view()), - url(r'^api/multicloud-vio/v0/(?P[0-9a-zA-Z\-\_]+)\ - /(?P[0-9a-zA-Z\-\_]+)/networks/' + url(r'^api/multicloud-vio/v0/(?P[0-9a-zA-Z\-\_]+)/' + r'(?P[0-9a-zA-Z\-\_]+)/networks/' r'(?P[0-9a-zA-Z\-\_]+)$', DeleteNetworkView.as_view()), - url(r'^api/multicloud-vio/v0/(?P[0-9a-zA-Z\-\_]+)\ - /(?P[0-9a-zA-Z\-\_]+)/subnets$', + url(r'^api/multicloud-vio/v0/(?P[0-9a-zA-Z\-\_]+)/' + r'(?P[0-9a-zA-Z\-\_]+)/subnets$', CreateSubnetView.as_view()), - url(r'^api/multicloud-vio/v0/(?P[0-9a-zA-Z\-\_]+)\ - /(?P[0-9a-zA-Z\-\_]+)/subnets/' + url(r'^api/multicloud-vio/v0/(?P[0-9a-zA-Z\-\_]+)/' + r'(?P[0-9a-zA-Z\-\_]+)/subnets/' r'(?P[0-9a-zA-Z\-\_]+)$', DeleteSubnetView.as_view()), - url(r'^api/multicloud-vio/v0/(?P[0-9a-zA-Z\-\_]+)\ - /(?P[0-9a-zA-Z\-\_]+)/ports$', + url(r'^api/multicloud-vio/v0/(?P[0-9a-zA-Z\-\_]+)/' + r'(?P[0-9a-zA-Z\-\_]+)/ports$', CreatePortView.as_view()), - url(r'^api/multicloud-vio/v0/(?P[0-9a-zA-Z\-\_]+)\ - /(?P[0-9a-zA-Z\-\_]+)/ports/' + url(r'^api/multicloud-vio/v0/(?P[0-9a-zA-Z\-\_]+)/' + r'(?P[0-9a-zA-Z\-\_]+)/ports/' r'(?P[0-9a-zA-Z\-\_]+)$', DeletePortView.as_view()), @@ -112,44 +112,44 @@ urlpatterns = [ url(r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)/identity$', IdentityServer.as_view()), - url(r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)\ - /identity/(?P(.*))$', + url(r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)/' + r'identity/(?P(.*))$', IdentityServer.as_view()), - url(r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)\ - /glance/(?P(.*))$', + url(r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)/' + r'glance/(?P(.*))$', ImageServer.as_view()), url( - r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)\ - /cinder/(?P[0-9a-z-A-Z\-\_]+)/(?P(.*))$', + r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)/' + r'cinder/(?P[0-9a-z-A-Z\-\_]+)/(?P(.*))$', VolumeServer.as_view()), url( - r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)\ - /cinderv2/(?P[0-9a-z-A-Z\-\_]+)/(?P(.*))$', + r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)/' + r'cinderv2/(?P[0-9a-z-A-Z\-\_]+)/(?P(.*))$', VolumeServer.as_view()), url( - r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)\ - /cinderv3/(?P[0-9a-z-A-Z\-\_]+)/(?P(.*))$', + r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)/' + r'cinderv3/(?P[0-9a-z-A-Z\-\_]+)/(?P(.*))$', VolumeServer.as_view()), url(r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)/neutron$', NetWorkServer.as_view()), - url(r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)\ - /neutron/(?P(.*))$', + url(r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)/' + r'neutron/(?P(.*))$', NetWorkServer.as_view()), url( - r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)\ - /heat/(?P[0-9a-z-A-Z\-\_]+)/(?P(.*))$', + r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)/' + r'heat/(?P[0-9a-z-A-Z\-\_]+)/(?P(.*))$', HeatServer.as_view()), url( - r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)\ - /nova/(?P[0-9a-z-A-Z\-\_]+)/(?P(.*))$', + r'^api/multicloud-vio/v0/(?P[0-9a-z-A-Z\-\_]+)/' + r'nova/(?P[0-9a-z-A-Z\-\_]+)/(?P(.*))$', ComputeServer.as_view()), ] -- cgit 1.2.3-korg