WIP
This commit is contained in:
parent
ce995adeab
commit
e0f1eac159
@ -163,7 +163,7 @@ class ValhallaServer:
|
|||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def get_vms_data_from_server(self):
|
def get_vms_data_from_server(self) ->dict():
|
||||||
try:
|
try:
|
||||||
vms_data = {}
|
vms_data = {}
|
||||||
for image_id in self.vm_ids_list_from_server:
|
for image_id in self.vm_ids_list_from_server:
|
||||||
@ -175,6 +175,7 @@ class ValhallaServer:
|
|||||||
data = response.json()
|
data = response.json()
|
||||||
vms_data[f"{image_id}"] = data
|
vms_data[f"{image_id}"] = data
|
||||||
self.vms_metadata = vms_data
|
self.vms_metadata = vms_data
|
||||||
|
return vms_data
|
||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
print(str(ex))
|
print(str(ex))
|
||||||
|
|
||||||
|
Binary file not shown.
@ -3,6 +3,7 @@ import socket
|
|||||||
import yaml
|
import yaml
|
||||||
import os
|
import os
|
||||||
import psutil
|
import psutil
|
||||||
|
from string import Template
|
||||||
|
|
||||||
class MachineData():
|
class MachineData():
|
||||||
|
|
||||||
@ -67,6 +68,21 @@ class MachineData():
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(str(e))
|
print(str(e))
|
||||||
exit(-1)
|
exit(-1)
|
||||||
|
|
||||||
class VirtualmachineConfig():
|
def generate_runner_script(self, file_path: str):
|
||||||
def __init__(cpu_count: int, memory_size: int, ):
|
substitution_mapper = {
|
||||||
|
"CPU_CORES_COUNT": (self.cpu_count/2),
|
||||||
|
"MEMORY_ALLOCATION_SIZE": f"{(self.ram_size/2)}M",
|
||||||
|
"IMAGE_PATH": "image.qcow2"
|
||||||
|
}
|
||||||
|
try:
|
||||||
|
with open("vm_run_script.template", "r") as file:
|
||||||
|
src = file.read()
|
||||||
|
temp_src = Template(src)
|
||||||
|
result = temp_src.substitute(substitution_mapper)
|
||||||
|
result_file = open(f"{file_path}/run.sh", "w")
|
||||||
|
result_file.write(result)
|
||||||
|
result_file.flush()
|
||||||
|
result_file.close()
|
||||||
|
except Exception as ex:
|
||||||
|
print(str(ex))
|
||||||
|
156
valhalla-client
156
valhalla-client
@ -1,28 +1,150 @@
|
|||||||
from network.ValhallaServer import ValhallaServer
|
from network.ValhallaServer import ValhallaServer
|
||||||
from utils.MachineData import MachineData
|
from utils.MachineData import MachineData
|
||||||
|
import argparse
|
||||||
|
from picotui.widgets import *
|
||||||
|
from picotui.menu import *
|
||||||
|
from picotui.context import Context
|
||||||
|
import os
|
||||||
|
import json
|
||||||
|
|
||||||
machine_data = MachineData()
|
machine_data = MachineData()
|
||||||
|
|
||||||
server = ValhallaServer(
|
def synchronize():
|
||||||
server_address=machine_data.server_url,
|
server = ValhallaServer(
|
||||||
server_port=machine_data.server_port,
|
server_address=machine_data.server_url,
|
||||||
server_user=machine_data.server_access_username,
|
server_port=machine_data.server_port,
|
||||||
server_access_password=machine_data.server_password,
|
server_user=machine_data.server_access_username,
|
||||||
logging_level=machine_data.client_loglevel,
|
server_access_password=machine_data.server_password,
|
||||||
|
logging_level=machine_data.client_loglevel,
|
||||||
|
)
|
||||||
|
server.authenticate()
|
||||||
|
server.get_server_data()
|
||||||
|
server.update_machine_data_on_server(machine_data=machine_data)
|
||||||
|
vm_list = server.get_vm_list_from_server(machine_data=machine_data)
|
||||||
|
print(vm_list)
|
||||||
|
vm_data = server.get_vms_data_from_server()
|
||||||
|
with open("vms_data.json", "w") as vm_data_file:
|
||||||
|
vm_data_file.write(json.dumps(vm_data))
|
||||||
|
vm_data_file.flush()
|
||||||
|
server.update_vms_images_from_server()
|
||||||
|
for image_id in vm_data:
|
||||||
|
run_script_path = f"images/valhalla/{vm_data[image_id]['image_name']}/{vm_data[image_id]['image_version']}"
|
||||||
|
print(run_script_path)
|
||||||
|
machine_data.generate_runner_script(run_script_path)
|
||||||
|
|
||||||
|
def runner():
|
||||||
|
d = None
|
||||||
|
image_choice_vm_id = None
|
||||||
|
vm_data = {}
|
||||||
|
with open("vms_data.json", "r") as vm_data_file:
|
||||||
|
try:
|
||||||
|
vm_data = json.loads(vm_data_file.read())
|
||||||
|
except Exception as ex:
|
||||||
|
print(f"ERROR: {str(ex)}")
|
||||||
|
# This routine is called to redraw screen "in menu's background"
|
||||||
|
def screen_redraw(s, allow_cursor=False):
|
||||||
|
with open("vms_data.json", "r") as vm_data_file:
|
||||||
|
try:
|
||||||
|
vm_data = json.loads(vm_data_file.read())
|
||||||
|
except Exception as ex:
|
||||||
|
print(f"ERROR: {str(ex)}")
|
||||||
|
s.attr_color(C_WHITE, C_BLUE)
|
||||||
|
s.cls()
|
||||||
|
s.attr_reset()
|
||||||
|
d.redraw()
|
||||||
|
def main_loop():
|
||||||
|
while 1:
|
||||||
|
key = m.get_input()
|
||||||
|
|
||||||
|
if isinstance(key, list):
|
||||||
|
# Mouse click
|
||||||
|
x, y = key
|
||||||
|
if m.inside(x, y):
|
||||||
|
m.focus = True
|
||||||
|
|
||||||
|
if m.focus:
|
||||||
|
# If menu is focused, it gets events. If menu is cancelled,
|
||||||
|
# it loses focus. Otherwise, if menu selection is made, we
|
||||||
|
# quit with with menu result.
|
||||||
|
res = m.handle_input(key)
|
||||||
|
if res == ACTION_CANCEL:
|
||||||
|
m.focus = False
|
||||||
|
elif res is not None and res is not True:
|
||||||
|
return res
|
||||||
|
else:
|
||||||
|
# If menu isn't focused, it can be focused by pressing F9.
|
||||||
|
if key == KEY_F9:
|
||||||
|
m.focus = True
|
||||||
|
m.redraw()
|
||||||
|
continue
|
||||||
|
# Otherwise, dialog gets input
|
||||||
|
res = d.handle_input(key)
|
||||||
|
if res is not None and res is not True:
|
||||||
|
return res
|
||||||
|
with Context():
|
||||||
|
|
||||||
|
d = Dialog(10, 5, 80, 24)
|
||||||
|
d.add(12, 1, WLabel("Virtual Machine selection screen"))
|
||||||
|
d.add(1, 2, WLabel("VMs:"))
|
||||||
|
vm_names_table = []
|
||||||
|
for vm_id in vm_data:
|
||||||
|
vm_names_table.append(f"{vm_id}: {vm_data[vm_id]['image_name']} - ver. {vm_data[vm_id]['image_version']}")
|
||||||
|
w_listbox = WListBox(64, 4, vm_names_table)
|
||||||
|
d.add(1,3, w_listbox)
|
||||||
|
|
||||||
|
d.add(1, 6, "Selected listbox value:")
|
||||||
|
w_listbox_val = WLabel("", w=64)
|
||||||
|
d.add(1, 7, w_listbox_val)
|
||||||
|
|
||||||
|
def listbox_changed(w):
|
||||||
|
val = w.items[w.choice]
|
||||||
|
w_listbox_val.t = val
|
||||||
|
w_listbox_val.redraw()
|
||||||
|
|
||||||
|
w_listbox.on("changed", listbox_changed)
|
||||||
|
|
||||||
|
b = WButton(8, "OK")
|
||||||
|
d.add(10, 11, b)
|
||||||
|
b.finish_dialog = ACTION_OK
|
||||||
|
|
||||||
|
b = WButton(8, "Cancel")
|
||||||
|
d.add(23, 11, b)
|
||||||
|
b.finish_dialog = ACTION_CANCEL
|
||||||
|
|
||||||
|
screen_redraw(Screen)
|
||||||
|
Screen.set_screen_redraw(screen_redraw)
|
||||||
|
|
||||||
|
menu_file = WMenuBox([("Exit", "ex")])
|
||||||
|
m = WMenuBar([("File", menu_file), ("About", "About")])
|
||||||
|
m.permanent = True
|
||||||
|
m.redraw()
|
||||||
|
|
||||||
|
res = main_loop()
|
||||||
|
image_choice_vm_id = int(str(vm_names_table[int(w_listbox.choice)]).split(":")[0])
|
||||||
|
print(image_choice_vm_id)
|
||||||
|
try:
|
||||||
|
print(f"Running VM: {vm_data[f'{image_choice_vm_id}']['image_name']}:{vm_data[f'{image_choice_vm_id}']['image_version']}")
|
||||||
|
os.execvp(f"images/valhalla/{vm_data[f'{image_choice_vm_id}']['image_name']}/{vm_data[f'{image_choice_vm_id}']['image_version']}/run.sh")
|
||||||
|
except Exception as ex:
|
||||||
|
print(str(ex))
|
||||||
|
|
||||||
|
parser = argparse.ArgumentParser(
|
||||||
|
prog="valhalla-client",
|
||||||
|
description="Client for running VM machines",
|
||||||
)
|
)
|
||||||
|
|
||||||
server.authenticate()
|
function_mapper = {
|
||||||
|
"runner": runner,
|
||||||
|
"synchronize": synchronize,
|
||||||
|
}
|
||||||
|
|
||||||
server.get_server_data()
|
parser.add_argument("command", choices=function_mapper)
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
server.update_machine_data_on_server(machine_data=machine_data)
|
fun = function_mapper[args.command]
|
||||||
|
try:
|
||||||
vm_list = server.get_vm_list_from_server(machine_data=machine_data)
|
fun()
|
||||||
|
except Exception as ex:
|
||||||
print(vm_list)
|
print(f"Invalid command: {str(ex)}")
|
||||||
|
|
||||||
server.get_vms_data_from_server()
|
|
||||||
|
|
||||||
server.update_vms_images_from_server()
|
|
||||||
|
|
||||||
# vim:ft=py
|
# vim:ft=py
|
7
vm_run_script.template
Normal file
7
vm_run_script.template
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
## QEMU (VM) command
|
||||||
|
qemu-system-x86_64 -enable-kvm -m $MEMORY_ALLOCATION_SIZE \
|
||||||
|
-cpu host,kvm=off,hv_relaxed,hv_spinlocks=0x1fff,hv_time,hv_vapic,hv_vendor_id=0xDEADBEEFFF \
|
||||||
|
-rtc clock=host,base=localtime -smp 4,sockets=1,cores=$CPU_CORES_COUNT,threads=2 \
|
||||||
|
-device virtio-net-pci,netdev=n1 -netdev user,id=n1 \
|
||||||
|
-hda $IMAGE_PATH &
|
1
vms_data.json
Normal file
1
vms_data.json
Normal file
@ -0,0 +1 @@
|
|||||||
|
{"4": {"image_file": "temp_file.qcow2", "image_hash": "d41d8cd98f00b204e9800998ecf8427e", "image_id": "4", "image_name": "cool-image-name", "image_name_version_combo": "cool-image-name@v0.0.2alpha", "image_version": "v0.0.2alpha"}, "3": {"image_file": "temp_file.qcow2", "image_hash": "d41d8cd98f00b204e9800998ecf8427e", "image_id": "3", "image_name": "cool-image-name", "image_name_version_combo": "cool-image-name@v0.0.1alpha", "image_version": "v0.0.1alpha"}}
|
Loading…
Reference in New Issue
Block a user