afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #332 from coreemu/coredev-serviceconfig

Browse source 
Coredev serviceconfig
This commit is contained in:
bharnden 2020-01-08 11:13:52 -08:00 committed by GitHub
commit c46085e716
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 105 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
daemon/core/gui/dialogs/nodeservice.py
View file

@ -68,22 +68,26 @@ class NodeServiceDialog(Dialog):
self.current.grid(sticky="nsew") self.current.grid(sticky="nsew")
for service in sorted(self.current_services): for service in sorted(self.current_services):
self.current.listbox.insert(tk.END, service) self.current.listbox.insert(tk.END, service)
if self.is_custom_service(service):
self.current.listbox.itemconfig(tk.END, bg="green")
frame = ttk.Frame(self.top) frame = ttk.Frame(self.top)
frame.grid(stick="ew") frame.grid(stick="ew")
for i in range(3): for i in range(4):
frame.columnconfigure(i, weight=1) frame.columnconfigure(i, weight=1)
button = ttk.Button(frame, text="Configure", command=self.click_configure) button = ttk.Button(frame, text="Configure", command=self.click_configure)
button.grid(row=0, column=0, sticky="ew", padx=PADX) button.grid(row=0, column=0, sticky="ew", padx=PADX)
button = ttk.Button(frame, text="Save", command=self.click_save) button = ttk.Button(frame, text="Save", command=self.click_save)
button.grid(row=0, column=1, sticky="ew", padx=PADX) button.grid(row=0, column=1, sticky="ew", padx=PADX)
button = ttk.Button(frame, text="Remove", command=self.click_remove)
button.grid(row=0, column=2, sticky="ew", padx=PADX)
button = ttk.Button(frame, text="Cancel", command=self.click_cancel) button = ttk.Button(frame, text="Cancel", command=self.click_cancel)
button.grid(row=0, column=2, sticky="ew") button.grid(row=0, column=3, sticky="ew")
# trigger group change # trigger group change
self.groups.listbox.event_generate("<<ListboxSelect>>") self.groups.listbox.event_generate("<<ListboxSelect>>")
def handle_group_change(self, event): def handle_group_change(self, event=None):
selection = self.groups.listbox.curselection() selection = self.groups.listbox.curselection()
if selection: if selection:
index = selection[0] index = selection[0]
@ -101,6 +105,8 @@ class NodeServiceDialog(Dialog):
self.current.listbox.delete(0, tk.END) self.current.listbox.delete(0, tk.END)
for name in sorted(self.current_services): for name in sorted(self.current_services):
self.current.listbox.insert(tk.END, name) self.current.listbox.insert(tk.END, name)
if self.is_custom_service(name):
self.current.listbox.itemconfig(tk.END, bg="green")
self.canvas_node.core_node.services[:] = self.current_services self.canvas_node.core_node.services[:] = self.current_services
def click_configure(self): def click_configure(self):
@ -132,3 +138,27 @@ class NodeServiceDialog(Dialog):
def click_cancel(self): def click_cancel(self):
self.current_services = None self.current_services = None
self.destroy() self.destroy()
def click_remove(self):
cur = self.current.listbox.curselection()
if cur:
service = self.current.listbox.get(cur[0])
self.current.listbox.delete(cur[0])
self.current_services.remove(service)
for checkbutton in self.services.frame.winfo_children():
if checkbutton["text"] == service:
checkbutton.invoke()
return
def is_custom_service(self, service):
service_configs = self.app.core.service_configs
file_configs = self.app.core.file_configs
if self.node_id in service_configs and service in service_configs[self.node_id]:
return True
if (
self.node_id in file_configs
and service in file_configs[self.node_id]
and file_configs[self.node_id][service]
):
return True
return False

113
daemon/core/gui/dialogs/serviceconfig.py
View file

@ -17,10 +17,14 @@ class ServiceConfigDialog(Dialog):
def __init__(self, master, app, service_name, node_id): def __init__(self, master, app, service_name, node_id):
title = f"{service_name} Service" title = f"{service_name} Service"
super().__init__(master, app, title, modal=True) super().__init__(master, app, title, modal=True)
self.master = master
self.app = app self.app = app
self.core = app.core self.core = app.core
self.node_id = node_id self.node_id = node_id
self.service_name = service_name self.service_name = service_name
self.service_configs = app.core.service_configs
self.file_configs = app.core.file_configs
self.radiovar = tk.IntVar() self.radiovar = tk.IntVar()
self.radiovar.set(2) self.radiovar.set(2)
self.metadata = "" self.metadata = ""
@ -30,6 +34,9 @@ class ServiceConfigDialog(Dialog):
self.startup_commands = [] self.startup_commands = []
self.validation_commands = [] self.validation_commands = []
self.shutdown_commands = [] self.shutdown_commands = []
self.default_startup = []
self.default_validate = []
self.default_shutdown = []
self.validation_mode = None self.validation_mode = None
self.validation_time = None self.validation_time = None
self.validation_period = None self.validation_period = None
@ -55,25 +62,28 @@ class ServiceConfigDialog(Dialog):
def load(self): def load(self):
try: try:
self.app.core.create_nodes_and_links() self.app.core.create_nodes_and_links()
service_configs = self.app.core.service_configs default_config = self.app.core.get_node_service(
if (
self.node_id in service_configs
and self.service_name in service_configs[self.node_id]
):
service_config = self.app.core.service_configs[self.node_id][
self.service_name
]
else:
service_config = self.app.core.get_node_service(
self.node_id, self.service_name self.node_id, self.service_name
) )
self.dependencies = [x for x in service_config.dependencies] self.default_startup = default_config.startup[:]
self.executables = [x for x in service_config.executables] self.default_validate = default_config.validate[:]
self.default_shutdown = default_config.shutdown[:]
custom_configs = self.service_configs
if (
self.node_id in custom_configs
and self.service_name in custom_configs[self.node_id]
):
service_config = custom_configs[self.node_id][self.service_name]
else:
service_config = default_config
self.dependencies = service_config.dependencies[:]
self.executables = service_config.executables[:]
self.metadata = service_config.meta self.metadata = service_config.meta
self.filenames = [x for x in service_config.configs] self.filenames = service_config.configs[:]
self.startup_commands = [x for x in service_config.startup] self.startup_commands = service_config.startup[:]
self.validation_commands = [x for x in service_config.validate] self.validation_commands = service_config.validate[:]
self.shutdown_commands = [x for x in service_config.shutdown] self.shutdown_commands = service_config.shutdown[:]
self.validation_mode = service_config.validation_mode self.validation_mode = service_config.validation_mode
self.validation_time = service_config.validation_timer self.validation_time = service_config.validation_timer
self.original_service_files = { self.original_service_files = {
@ -82,10 +92,8 @@ class ServiceConfigDialog(Dialog):
) )
for x in self.filenames for x in self.filenames
} }
self.temp_service_files = { self.temp_service_files = dict(self.original_service_files)
x: self.original_service_files[x] for x in self.original_service_files file_configs = self.file_configs
}
file_configs = self.app.core.file_configs
if ( if (
self.node_id in file_configs self.node_id in file_configs
and self.service_name in file_configs[self.node_id] and self.service_name in file_configs[self.node_id]
@ -116,8 +124,6 @@ class ServiceConfigDialog(Dialog):
self.draw_tab_startstop() self.draw_tab_startstop()
self.draw_tab_configuration() self.draw_tab_configuration()
button = ttk.Button(self.top, text="Only Save Changes")
button.grid(sticky="ew", pady=PADY)
self.draw_buttons() self.draw_buttons()
def draw_tab_files(self): def draw_tab_files(self):
@ -332,9 +338,7 @@ class ServiceConfigDialog(Dialog):
frame.columnconfigure(i, weight=1) frame.columnconfigure(i, weight=1)
button = ttk.Button(frame, text="Apply", command=self.click_apply) button = ttk.Button(frame, text="Apply", command=self.click_apply)
button.grid(row=0, column=0, sticky="ew", padx=PADX) button.grid(row=0, column=0, sticky="ew", padx=PADX)
button = ttk.Button( button = ttk.Button(frame, text="Defaults", command=self.click_defaults)
frame, text="Defaults", command=self.click_defaults, state="disabled"
)
button.grid(row=0, column=1, sticky="ew", padx=PADX) button.grid(row=0, column=1, sticky="ew", padx=PADX)
button = ttk.Button( button = ttk.Button(
frame, text="Copy...", command=self.click_copy, state="disabled" frame, text="Copy...", command=self.click_copy, state="disabled"
@ -395,7 +399,13 @@ class ServiceConfigDialog(Dialog):
entry.delete(0, tk.END) entry.delete(0, tk.END)
def click_apply(self): def click_apply(self):
service_configs = self.app.core.service_configs current_listbox = self.master.current.listbox
if not self.is_custom_service():
if self.node_id in self.service_configs:
self.service_configs[self.node_id].pop(self.service_name, None)
current_listbox.itemconfig(current_listbox.curselection()[0], bg="")
self.destroy()
return
startup_commands = self.startup_commands_listbox.get(0, "end") startup_commands = self.startup_commands_listbox.get(0, "end")
shutdown_commands = self.shutdown_commands_listbox.get(0, "end") shutdown_commands = self.shutdown_commands_listbox.get(0, "end")
validate_commands = self.validate_commands_listbox.get(0, "end") validate_commands = self.validate_commands_listbox.get(0, "end")
@ -407,23 +417,22 @@ class ServiceConfigDialog(Dialog):
validate_commands, validate_commands,
shutdown_commands, shutdown_commands,
) )
if self.node_id not in service_configs: if self.node_id not in self.service_configs:
service_configs[self.node_id] = {} self.service_configs[self.node_id] = {}
if self.service_name not in service_configs[self.node_id]: self.service_configs[self.node_id][self.service_name] = config
self.app.core.service_configs[self.node_id][self.service_name] = config
for file in self.modified_files: for file in self.modified_files:
file_configs = self.app.core.file_configs if self.node_id not in self.file_configs:
if self.node_id not in file_configs: self.file_configs[self.node_id] = {}
file_configs[self.node_id] = {} if self.service_name not in self.file_configs[self.node_id]:
if self.service_name not in file_configs[self.node_id]: self.file_configs[self.node_id][self.service_name] = {}
file_configs[self.node_id][self.service_name] = {} self.file_configs[self.node_id][self.service_name][
file_configs[self.node_id][self.service_name][
file file
] = self.temp_service_files[file] ] = self.temp_service_files[file]
self.app.core.set_node_service_file( self.app.core.set_node_service_file(
self.node_id, self.service_name, file, self.temp_service_files[file] self.node_id, self.service_name, file, self.temp_service_files[file]
) )
current_listbox.itemconfig(current_listbox.curselection()[0], bg="green")
except grpc.RpcError as e: except grpc.RpcError as e:
show_grpc_error(e) show_grpc_error(e)
self.destroy() self.destroy()
@ -443,11 +452,35 @@ class ServiceConfigDialog(Dialog):
else: else:
self.modified_files.discard(filename) self.modified_files.discard(filename)
def is_custom_service(self):
startup_commands = self.startup_commands_listbox.get(0, "end")
shutdown_commands = self.shutdown_commands_listbox.get(0, "end")
validate_commands = self.validate_commands_listbox.get(0, "end")
return (
set(self.default_startup) != set(startup_commands)
or set(self.default_validate) != set(validate_commands)
or set(self.default_shutdown) != set(shutdown_commands)
or len(self.modified_files) > 0
)
def click_defaults(self): def click_defaults(self):
logging.info("not implemented") if self.node_id in self.service_configs:
self.service_configs[self.node_id].pop(self.service_name, None)
if self.node_id in self.file_configs:
self.file_configs[self.node_id].pop(self.service_name, None)
self.temp_service_files = dict(self.original_service_files)
filename = self.filename_combobox.get()
self.service_file_data.text.delete(1.0, "end")
self.service_file_data.text.insert("end", self.temp_service_files[filename])
self.startup_commands_listbox.delete(0, tk.END)
self.validate_commands_listbox.delete(0, tk.END)
self.shutdown_commands_listbox.delete(0, tk.END)
for cmd in self.default_startup:
self.startup_commands_listbox.insert(tk.END, cmd)
for cmd in self.default_validate:
self.validate_commands_listbox.insert(tk.END, cmd)
for cmd in self.default_shutdown:
self.shutdown_commands_listbox.insert(tk.END, cmd)
def click_copy(self): def click_copy(self):
logging.info("not implemented") logging.info("not implemented")
def click_cancel(self):
logging.info("not implemented")