summaryrefslogtreecommitdiffstats
path: root/vio
diff options
context:
space:
mode:
authorEthan Lynn <ethanlynnl@vmware.com>2017-09-19 17:41:51 +0800
committerEthan Lynn <ethanlynnl@vmware.com>2017-09-19 17:45:21 +0800
commit29c5cb22d31cb433f1f7d488814a609aeeb9a153 (patch)
tree25f491fd1aad04d4f3ffc1b757f8f2e6cb897efe /vio
parente1fe7f3dbbb8e02c5942674e9ec6ccfaf2870124 (diff)
Fix url regex match
Change-Id: I9ac0983fb05e41e19b7361ff5b11109c036da404 issue-id: MULTICLOUD-96 Signed-off-by: Ethan Lynn <ethanlynnl@vmware.com>
Diffstat (limited to 'vio')
-rw-r--r--vio/vio/swagger/urls.py56
1 files 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<vimid>[0-9a-zA-Z_-]+)/'
r'(?P<tenantid>[0-9a-zA-Z]+)/hosts/(?P<hostname>[0-9a-zA-Z_-]+)$',
HostView.as_view()),
- url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)\
- /(?P<tenantid>[0-9a-zA-Z\-\_]+)/networks$',
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)/'
+ r'(?P<tenantid>[0-9a-zA-Z\-\_]+)/networks$',
CreateNetworkView.as_view()),
- url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)\
- /(?P<tenantid>[0-9a-zA-Z\-\_]+)/networks/'
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)/'
+ r'(?P<tenantid>[0-9a-zA-Z\-\_]+)/networks/'
r'(?P<networkid>[0-9a-zA-Z\-\_]+)$',
DeleteNetworkView.as_view()),
- url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)\
- /(?P<tenantid>[0-9a-zA-Z\-\_]+)/subnets$',
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)/'
+ r'(?P<tenantid>[0-9a-zA-Z\-\_]+)/subnets$',
CreateSubnetView.as_view()),
- url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)\
- /(?P<tenantid>[0-9a-zA-Z\-\_]+)/subnets/'
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)/'
+ r'(?P<tenantid>[0-9a-zA-Z\-\_]+)/subnets/'
r'(?P<subnetid>[0-9a-zA-Z\-\_]+)$',
DeleteSubnetView.as_view()),
- url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)\
- /(?P<tenantid>[0-9a-zA-Z\-\_]+)/ports$',
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)/'
+ r'(?P<tenantid>[0-9a-zA-Z\-\_]+)/ports$',
CreatePortView.as_view()),
- url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)\
- /(?P<tenantid>[0-9a-zA-Z\-\_]+)/ports/'
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)/'
+ r'(?P<tenantid>[0-9a-zA-Z\-\_]+)/ports/'
r'(?P<portid>[0-9a-zA-Z\-\_]+)$',
DeletePortView.as_view()),
@@ -112,44 +112,44 @@ urlpatterns = [
url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/identity$',
IdentityServer.as_view()),
- url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)\
- /identity/(?P<other>(.*))$',
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/'
+ r'identity/(?P<other>(.*))$',
IdentityServer.as_view()),
- url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)\
- /glance/(?P<other>(.*))$',
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/'
+ r'glance/(?P<other>(.*))$',
ImageServer.as_view()),
url(
- r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)\
- /cinder/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
+ r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/'
+ r'cinder/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
VolumeServer.as_view()),
url(
- r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)\
- /cinderv2/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
+ r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/'
+ r'cinderv2/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
VolumeServer.as_view()),
url(
- r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)\
- /cinderv3/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
+ r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/'
+ r'cinderv3/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
VolumeServer.as_view()),
url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/neutron$',
NetWorkServer.as_view()),
- url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)\
- /neutron/(?P<other>(.*))$',
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/'
+ r'neutron/(?P<other>(.*))$',
NetWorkServer.as_view()),
url(
- r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)\
- /heat/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
+ r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/'
+ r'heat/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
HeatServer.as_view()),
url(
- r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)\
- /nova/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
+ r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/'
+ r'nova/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
ComputeServer.as_view()),
]