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

Fix instance current status update after action. Fix log related error.Some pep8 compatibility fix.

Browse source
This commit is contained in:
catborise 2019-01-17 10:38:53 +03:00
parent 198c100524
commit 276097a44e
3 changed files with 21 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
computes/views.py
View file

@ -177,7 +177,7 @@ def compute_graph(request, compute_id):
datasets = {} datasets = {}
cookies = {} cookies = {}
compute = get_object_or_404(Compute, pk=compute_id) compute = get_object_or_404(Compute, pk=compute_id)
curent_time = time.strftime("%H:%M:%S") current_time = time.strftime("%H:%M:%S")
try: try:
conn = wvmHostDetails(compute.hostname, conn = wvmHostDetails(compute.hostname,
@ -208,7 +208,7 @@ def compute_graph(request, compute_id):
datasets['mem'] = eval(cookies['mem']) datasets['mem'] = eval(cookies['mem'])
datasets['timer'] = eval(cookies['timer']) datasets['timer'] = eval(cookies['timer'])
datasets['timer'].append(curent_time) datasets['timer'].append(current_time)
datasets['cpu'].append(int(cpu_usage['usage'])) datasets['cpu'].append(int(cpu_usage['usage']))
datasets['mem'].append(int(mem_usage['usage']) / 1048576) datasets['mem'].append(int(mem_usage['usage']) / 1048576)

6
instances/templates/instance.html
View file

@ -691,12 +691,12 @@
<div class="col-sm-2"> <div class="col-sm-2">
{% if media_iso and allow_admin_or_not_template %} {% if media_iso and allow_admin_or_not_template %}
<button type="submit" class="btn btn-sm btn-success pull-left" name="mount_iso" value="{{ cd.dev }}" style="margin-top: 2px;">{% trans "Mount" %}</button> <button type="submit" class="btn btn-sm btn-success pull-left" name="mount_iso" value="{{ cd.dev }}" style="margin-top: 2px;">{% trans "Mount" %}</button>
{% if status == 5 %}
<button type="submit" class="btn btn-sm btn-danger pull-left" title="Detach CD-Rom (remove device)" name="detach_cdrom" value="{{ cd.dev }}" style="margin-top: 2px;"><i class="glyphicon glyphicon-remove-circle"></i></button>
{% endif %}
{% else %} {% else %}
<button class="btn btn-sm btn-success pull-left disabled" style="margin-top: 2px;">{% trans "Mount" %}</button> <button class="btn btn-sm btn-success pull-left disabled" style="margin-top: 2px;">{% trans "Mount" %}</button>
{% endif %} {% endif %}
{% if status == 5 and allow_admin_or_not_template %}
<button type="submit" class="btn btn-sm btn-danger pull-left" title="Detach CD-Rom (remove device)" name="detach_cdrom" value="{{ cd.dev }}" style="margin-top: 2px;"><i class="glyphicon glyphicon-remove-circle"></i></button>
{% endif %}
</div> </div>
{% else %} {% else %}
<div class="col-sm-6"> <div class="col-sm-6">

39
instances/views.py
View file

@ -52,16 +52,16 @@ def allinstances(request):
else: else:
for comp in computes: for comp in computes:
try: try:
all_host_vms.update(get_host_instances(request,comp)) all_host_vms.update(get_host_instances(request, comp))
except libvirtError as lib_err: except libvirtError as lib_err:
error_messages.append(lib_err) error_messages.append(lib_err)
if request.method == 'POST': if request.method == 'POST':
try: try:
instances_actions(request) return instances_actions(request)
except libvirtError as lib_err: except libvirtError as lib_err:
error_messages.append(lib_err) error_messages.append(lib_err)
addlogmsg(request.user.username, instance.name, lib_err.message) addlogmsg(request.user.username, request.POST.get("name", "instance"), lib_err.message)
view_style = settings.VIEW_INSTANCES_LIST_STYLE view_style = settings.VIEW_INSTANCES_LIST_STYLE
@ -88,10 +88,10 @@ def instances(request, compute_id):
if request.method == 'POST': if request.method == 'POST':
try: try:
instances_actions(request) return instances_actions(request)
except libvirtError as lib_err: except libvirtError as lib_err:
error_messages.append(lib_err) error_messages.append(lib_err)
addlogmsg(request.user.username, instance.name, lib_err.message) addlogmsg(request.user.username, request.POST.get("name", "instance"), lib_err.message)
return render(request, 'instances.html', locals()) return render(request, 'instances.html', locals())
@ -828,7 +828,6 @@ def instance(request, compute_id, vname):
msg = _("Edit options") msg = _("Edit options")
addlogmsg(request.user.username, instance.name, msg) addlogmsg(request.user.username, instance.name, msg)
return HttpResponseRedirect(request.get_full_path() + '#options') return HttpResponseRedirect(request.get_full_path() + '#options')
conn.close() conn.close()
except libvirtError as lib_err: except libvirtError as lib_err:
@ -863,7 +862,7 @@ def inst_status(request, compute_id, vname):
return response return response
def get_host_instances(request,comp): def get_host_instances(request, comp):
def refresh_instance_database(comp, inst_name, info): def refresh_instance_database(comp, inst_name, info):
def get_userinstances_info(instance): def get_userinstances_info(instance):
@ -909,7 +908,6 @@ def get_host_instances(request,comp):
status = connection_manager.host_is_up(comp.type, comp.hostname) status = connection_manager.host_is_up(comp.type, comp.hostname)
if status: if status:
conn = wvmHostDetails(comp, comp.login, comp.password, comp.type) conn = wvmHostDetails(comp, comp.login, comp.password, comp.type)
comp_node_info = conn.get_node_info() comp_node_info = conn.get_node_info()
comp_mem = conn.get_memory_usage() comp_mem = conn.get_memory_usage()
@ -933,6 +931,7 @@ def get_host_instances(request,comp):
return all_host_vms return all_host_vms
def get_user_instances(request): def get_user_instances(request):
all_user_vms = {} all_user_vms = {}
user_instances = UserInstance.objects.filter(user_id=request.user.id) user_instances = UserInstance.objects.filter(user_id=request.user.id)
@ -1001,7 +1000,6 @@ def instances_actions(request):
return response return response
if request.user.is_superuser: if request.user.is_superuser:
if 'suspend' in request.POST: if 'suspend' in request.POST:
msg = _("Suspend") msg = _("Suspend")
addlogmsg(request.user.username, instance.name, msg) addlogmsg(request.user.username, instance.name, msg)
@ -1029,7 +1027,7 @@ def inst_graph(request, compute_id, vname):
datasets_net = {} datasets_net = {}
cookies = {} cookies = {}
points = 5 points = 5
curent_time = time.strftime("%H:%M:%S") current_time = time.strftime("%H:%M:%S")
compute = get_object_or_404(Compute, pk=compute_id) compute = get_object_or_404(Compute, pk=compute_id)
response = HttpResponse() response = HttpResponse()
response['Content-Type'] = "text/javascript" response['Content-Type'] = "text/javascript"
@ -1056,18 +1054,15 @@ def inst_graph(request, compute_id, vname):
cookies['net'] = request.COOKIES['net'] cookies['net'] = request.COOKIES['net']
cookies['timer'] = request.COOKIES['timer'] cookies['timer'] = request.COOKIES['timer']
except KeyError: except KeyError:
cookies['cpu'] = None cookies['cpu'] = cookies['blk'] = cookies['net'] = None
cookies['blk'] = None
cookies['net'] = None
if not cookies['cpu']: if not cookies['cpu']:
datasets['cpu'] = [0] * points datasets['timer'] = datasets['cpu'] = [0] * points
datasets['timer'] = [0] * points
else: else:
datasets['cpu'] = eval(cookies['cpu']) datasets['cpu'] = eval(cookies['cpu'])
datasets['timer'] = eval(cookies['timer']) datasets['timer'] = eval(cookies['timer'])
datasets['timer'].append(curent_time) datasets['timer'].append(current_time)
datasets['cpu'].append(int(cpu_usage['cpu'])) datasets['cpu'].append(int(cpu_usage['cpu']))
datasets['timer'] = check_points(datasets['timer']) datasets['timer'] = check_points(datasets['timer'])
@ -1075,8 +1070,7 @@ def inst_graph(request, compute_id, vname):
for blk in blk_usage: for blk in blk_usage:
if not cookies['blk']: if not cookies['blk']:
datasets_wr = [0] * points datasets_rd = datasets_wr = [0] * points
datasets_rd = [0] * points
else: else:
datasets['blk'] = eval(cookies['blk']) datasets['blk'] = eval(cookies['blk'])
datasets_rd = datasets['blk'][blk['dev']][0] datasets_rd = datasets['blk'][blk['dev']][0]
@ -1093,8 +1087,7 @@ def inst_graph(request, compute_id, vname):
for net in net_usage: for net in net_usage:
if not cookies['net']: if not cookies['net']:
datasets_rx = [0] * points datasets_tx = datasets_rx = [0] * points
datasets_tx = [0] * points
else: else:
datasets['net'] = eval(cookies['net']) datasets['net'] = eval(cookies['net'])
datasets_rx = datasets['net'][net['dev']][0] datasets_rx = datasets['net'][net['dev']][0]
@ -1159,7 +1152,7 @@ def _get_random_mac_address():
@login_required @login_required
def random_mac_address(request): def random_mac_address(request):
data = {} data = dict()
data['mac'] = _get_random_mac_address() data['mac'] = _get_random_mac_address()
return HttpResponse(json.dumps(data)) return HttpResponse(json.dumps(data))
@ -1183,9 +1176,9 @@ def guess_clone_name(request):
@login_required @login_required
def check_instance(request, vname): def check_instance(request, vname):
check_instance = Instance.objects.filter(name=vname) instance = Instance.objects.filter(name=vname)
data = {'vname': vname, 'exists': False} data = {'vname': vname, 'exists': False}
if check_instance: if instance:
data['exists'] = True data['exists'] = True
return HttpResponse(json.dumps(data)) return HttpResponse(json.dumps(data))