From 8cfd22df9d2a5b80feb3d651481136e0a1bf2720 Mon Sep 17 00:00:00 2001 From: Bin Sun Date: Thu, 30 Aug 2018 10:57:18 +0800 Subject: update fakecloud API to v1 Change-Id: I4741a2f5578970e26bce27c804d5ae9d0ec61e6a Issue-ID: MULTICLOUD-340 Signed-off-by: Bin Sun --- vio/vio/swagger/urls.py | 73 +++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 39 deletions(-) diff --git a/vio/vio/swagger/urls.py b/vio/vio/swagger/urls.py index c909067..b7bdbcf 100644 --- a/vio/vio/swagger/urls.py +++ b/vio/vio/swagger/urls.py @@ -106,16 +106,6 @@ urlpatterns = [ # swagger url(r'^api/multicloud-vio/v0/swagger.json$', SwaggerJsonView.as_view()), - # fake urls - url(r'^api/multicloud-vio/v0/vmware_fake/neutron/networks$', - FakeNeutronNetwork.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/neutron/networks/' - r'(?P[0-9a-z-A-Z]+)$', - FakeNeutronDetail.as_view()), - - url(r'^api/multicloud-vio/v0/vmware_fake/capacity_check$', - FakeCapacity.as_view()), - # vio url(r'^api/multicloud-vio/v0/(?P[0-9a-zA-Z_-]+)/' r'tenants$', ListTenantsView.as_view()), @@ -261,86 +251,91 @@ urlpatterns = [ DeletePortViewV1.as_view()), # fake urls - url(r'^api/multicloud-vio/v0/vmware_fake/identity/v3', + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/neutron/networks$', + FakeNeutronNetwork.as_view()), + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/neutron/networks/' + r'(?P[0-9a-z-A-Z]+)$', + FakeNeutronDetail.as_view()), + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/capacity_check$', + FakeCapacity.as_view()), + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/identity/v3', FakeToken.as_view()), - url(r'api/multicloud-vio/v0/vmware_fake/identity/v2.0', + url(r'api/multicloud-vio/v[01]/vmware[_/]fake/identity/v2.0', FakeTokenV2.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/identity/projects$', + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/identity/projects$', FakeProjects.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/identity/projects/' + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/identity/projects/' r'(?P[0-9a-z-A-Z]+)$', FakeProjects.as_view()), - url(r'api/multicloud-vio/v0/vmware_fake/identity/tenants', + url(r'api/multicloud-vio/v[01]/vmware[_/]fake/identity/tenants', FakeTenants.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/nova/' + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/nova/' r'(?P[0-9a-z-A-Z\-\_]+)' r'/os-hypervisors/detail$', FakeNovaHypervisors.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/nova/' + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/nova/' r'(?P[0-9a-z-A-Z\-\_]+)/os-hypervisors/' r'(?P[0-9a-z-A-Z]+)$', FakeNovaHypervisors.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/nova/' + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/nova/' r'(?P[0-9a-z-A-Z\-\_]+)/os-hypervisors/' r'(?P[0-9a-z-A-Z]+)/uptime$', FakeNovaHypervisorsUptime.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/nova/' + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/nova/' r'(?P[0-9a-z-A-Z\-\_]+)/os-aggregates$', FakeNovaAggregate.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/nova/' + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/nova/' r'(?P[0-9a-z-A-Z\-\_]+)/servers$', FakeNovaServer.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/nova/' + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/nova/' r'(?P[0-9a-z-A-Z\-\_]+)/servers/detail$', FakeNovaServerDetail.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/nova/' + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/nova/' r'(?P[0-9a-z-A-Z\-\_]+)/servers/' r'(?P[0-9a-z-A-Z]+)$', FakeNovaServer.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/nova/' + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/nova/' r'(?P[0-9a-z-A-Z\-\_]+)/servers/' r'(?P[0-9a-z-A-Z]+)/action$', FakeNovaServer.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/nova/' + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/nova/' r'(?P[0-9a-z-A-Z\-\_]+)/flavors$', FakeFlavorList.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/nova/' + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/nova/' r'(?P[0-9a-z-A-Z\-\_]+)/flavors/' r'(?P[0-9a-z-A-Z]+)$', FakeFlavorDetail.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/glance/v2/schemas/image$', + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/glance/v2/schemas/image$', FakeImageSchema.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/glance/v2/images/' + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/glance/v2/images/' r'(?P[0-9a-z-A-Z\-\_]+)$', FakeImageDetail.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/glance/v2/images', + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/glance/v2/images', FakeImage.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/glance/v2/image/file/' + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/glance/v2/image/file/' r'(?P[0-9a-z-A-Z\-\_]+)$', FakeImageDownload.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/glance/v2/image/file$', + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/glance/v2/image/file$', FakeImageUpload.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/glance/version', + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/glance/version', FakeImageVersion.as_view()), - url(r'^api/multicloud-vio/v0/vmware_fake/neutron$', + url(r'^api/multicloud-vio/v[01]/vmware[_/]fake/neutron$', FakeNeutron.as_view()), - url(r'api/multicloud-vio/v0/vmware_fake/heat/' + url(r'api/multicloud-vio/v[01]/vmware[_/]fake/heat/' r'(?P[0-9a-z-A-Z\-\_]+)' r'/stacks/(?P[0-9a-z-A-Z\-\_]+)/resources$', FakeHeatResources.as_view()), - url(r'api/multicloud-vio/v0/vmware_fake/heat/' + url(r'api/multicloud-vio/v[01]/vmware[_/]fake/heat/' r'(?P[0-9a-z-A-Z\-\_]+)' r'/stacks$', FakeHeatService.as_view()), - url(r'api/multicloud-vio/v0/vmware_fake/heat/' + url(r'api/multicloud-vio/v[01]/vmware[_/]fake/heat/' r'(?P[0-9a-z-A-Z\-\_]+)' r'/stacks/preview$', FakeHeatServicePreview.as_view()), - - url(r'api/multicloud-vio/v0/vmware_fake/heat/' + url(r'api/multicloud-vio/v[01]/vmware[_/]fake/heat/' r'(?P[0-9a-z-A-Z\-\_]+)' r'/stacks/(?P[0-9a-z-A-Z\-\_]+)', FakeHeatService.as_view()), - - url(r'api/multicloud-vio/v0/vmware_fake/heat/' + url(r'api/multicloud-vio/v[01]/vmware[_/]fake/heat/' r'(?P[0-9a-z-A-Z\-\_]+)' r'/stacks/(?P[0-9a-z-A-Z\-\_]+)' r'/(?P[0-9a-z-A-Z\-\_]+)$', FakeHeatService.as_view()), -- cgit 1.2.3-korg