j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2024-12-24 23:25:24 +00:00
Code Issues Projects Releases Wiki Activity

Adde urls for app

Browse source
This commit is contained in:
Retspen 2015-04-02 09:37:46 +03:00
parent e87f202b1f
commit 8b39d4e429
8 changed files with 38 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
accounts/urls.py Normal file
View file

@ -0,0 +1,10 @@
from django.conf.urls import url
from . import views
urlpatterns =[
url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}, name='login'),
url(r'^logout/$', 'django.contrib.auth.views.logout', {'template_name': 'logout.html'}, name='logout'),
url(r'^profile/$', views.profile, name='profile'),
url(r'^$', views.accounts, name='accounts'),
url(r'^profile/(\d+)/$', views.account, name='account'),
]

8
computes/urls.py Normal file
View file

@ -0,0 +1,8 @@
from django.conf.urls import url
from . import views
urlpatterns =[
url(r'^$', views.computes, name='computes'),
url(r'^overview/(\d+)/$', views.overview, name='overview'),
url(r'^statistics/(\d+)/$', views.compute_graph, name='compute_graph'),
]

2
conf/requirements.txt
View file

@ -1,3 +1,3 @@
Django==1.7.7
Django==1.8
websockify==0.6.0
gunicorn==19.3.0

2
dev/requirements.txt
View file

@ -1,4 +1,4 @@
Django==1.7.7
Django==1.8
websockify==0.6.0
pep8==1.6.2
pyflakes==0.8.1

8
instances/urls.py Normal file
View file

@ -0,0 +1,8 @@
from django.conf.urls import url
from . import views
urlpatterns =[
url(r'^(\d+)/([\w\-\.]+)/$', views.instance, name='instance'),
url(r'^statistics/(\d+)/([\w\-\.]+)/$', views.inst_graph, name='inst_graph'),
url(r'^status/(\d+)/([\w\-\.]+)/$', views.inst_status, name='inst_status'),
]

3
vrtManager/instance.py
View file

@ -215,7 +215,8 @@ class wvmInstance(wvmConnect):
pass
finally:
result.append(
{'dev': dev, 'image': volume, 'storage': storage, 'path': src_fl, 'format': disk_format, 'size': disk_size})
{'dev': dev, 'image': volume, 'storage': storage, 'path': src_fl,
'format': disk_format, 'size': disk_size})
return result
return util.get_xml_path(self._XMLDesc(0), func=disks)

2
webvirtcloud/settings-dev.py
View file

@ -3,7 +3,7 @@ Django dev settings for webvirtcloud project.
"""
from settings import *
from webvirtcloud.settings import *
DEBUG = True
TEMPLATE_DEBUG = True

24
webvirtcloud/urls.py
View file

@ -1,22 +1,12 @@
from django.conf.urls import patterns, include, url
from django.contrib import admin
# from django.contrib import admin
urlpatterns = patterns('',
url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}, name='login'),
url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', {'template_name': 'logout.html'}, name='logout'),
url(r'^accounts/profile/$', 'accounts.views.profile', name='profile'),
url(r'^accounts/$', 'accounts.views.accounts', name='accounts'),
url(r'^accounts/profile/(\d+)/$', 'accounts.views.account', name='account'),
url(r'^$', 'instances.views.index', name='index'),
url(r'^instances$', 'instances.views.instances', name='instances'),
url(r'^instance/(\d+)/([\w\-\.]+)/$', 'instances.views.instance', name='instance'),
url(r'^instance/statistics/(\d+)/([\w\-\.]+)/$', 'instances.views.inst_graph', name='inst_graph'),
url(r'^instance/status/(\d+)/([\w\-\.]+)/$', 'instances.views.inst_status', name='inst_status'),
url(r'^computes/$', 'computes.views.computes', name='computes'),
url(r'^compute/overview/(\d+)/$', 'computes.views.overview', name='overview'),
url(r'^instances/$', 'instances.views.instances', name='instances'),
url(r'^instance/', include('instances.urls')),
url(r'^accounts/', include('accounts.urls')),
url(r'^computes/', include('computes.urls')),
url(r'^compute/stgs/(\d+)/$', 'storages.views.storages', name='storages'),
url(r'^compute/stg/(\d+)/([\w\-\.]+)/$', 'storages.views.storage', name='storage'),
@ -29,10 +19,8 @@ urlpatterns = patterns('',
url(r'^compute/secret/(\d+)/$', 'secrets.views.secrets', name='secrets'),
url(r'^compute/statistics/(\d+)/$', 'computes.views.compute_graph', name='compute_graph'),
url(r'^console/$', 'console.views.console', name='console'),
url(r'^create/(\d+)/$', 'create.views.create_instance', name='create_instance'),
url(r'^logs/$', 'logs.views.showlogs', name='showlogs'),
(r'^admin/', include(admin.site.urls)),
# (r'^admin/', include(admin.site.urls)),
)