external/proxstar
1
0
Fork 0
mirror of https://github.com/ComputerScienceHouse/proxstar.git synced 2025-03-09 15:40:09 +00:00
Code Issues Releases Wiki Activity

moved limits to main page, remove restriction for rtp creation, allow rtp to create vm for another user

Browse source
This commit is contained in:
Jordan Rodgers 2017-12-13 23:08:45 -05:00
parent 2b69443930
commit 125fd58b27
8 changed files with 51 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

31
app.py
View file

@ -244,6 +244,7 @@ def create():
limits = get_user_usage_limits(user)
percents = get_user_usage_percent(proxmox, user, usage, limits)
isos = get_isos(proxmox, app.config['PROXMOX_ISO_STORAGE'])
pools = get_pools(proxmox)
return render_template(
'create.html',
username=user,
@ -251,7 +252,8 @@ def create():
usage=usage,
limits=limits,
percents=percents,
isos=isos)
isos=isos,
pools=pools)
elif request.method == 'POST':
name = request.form['name']
cores = request.form['cores']
@ -260,7 +262,11 @@ def create():
iso = request.form['iso']
if iso != 'none':
iso = "{}:iso/{}".format(app.config['PROXMOX_ISO_STORAGE'], iso)
usage_check = check_user_usage(proxmox, user, 0, 0, disk)
if not rtp:
usage_check = check_user_usage(proxmox, user, 0, 0, disk)
else:
usage_check = None
user = request.form['user']
if usage_check:
return usage_check
else:
@ -298,27 +304,6 @@ def reset_limits(user):
return '', 403
@app.route('/limits')
@auth.oidc_auth
def limits():
if 'rtp' in session['userinfo']['groups']:
user = session['userinfo']['preferred_username']
rtp = 'rtp' in session['userinfo']['groups']
proxmox = connect_proxmox()
pools = get_pools(proxmox)
pools = sorted(pools)
user_limits = []
for pool in pools:
if pool not in app.config['IGNORED_POOLS']:
limits = get_user_usage_limits(pool)
user_limits.append(
[pool, limits['cpu'], limits['mem'], limits['disk']])
return render_template(
'limits.html', username=user, rtp=rtp, user_limits=user_limits)
else:
return '', 403
@app.route('/vm/<string:vmid>/rrd/<path:path>')
@auth.oidc_auth
def send_rrd(vmid, path):