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

fix merge conflict

Browse source
This commit is contained in:
Huy Pham 2020-01-14 14:08:41 -08:00
commit 8a4ad41a47
2 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
daemon/core/gui/dialogs/copyserviceconfig.py
View file

@ -138,18 +138,28 @@ class CopyServiceConfigDialog(Dialog):
if "file" in item["tags"]: if "file" in item["tags"]:
nid, service = self.get_node_service(selected) nid, service = self.get_node_service(selected)
data = self.file_configs[nid][service][item["text"]] data = self.file_configs[nid][service][item["text"]]
dialog = ViewConfigDialog(self, self.app, self.node_id, data) dialog = ViewConfigDialog(
self, self.app, nid, data, item["text"].split("/")[-1]
)
dialog.show() dialog.show()
if "cmd" in item["tags"]: if "cmd" in item["tags"]:
nid, service = self.get_node_service(selected) nid, service = self.get_node_service(selected)
cmds = self.service_configs[nid][service] cmds = self.service_configs[nid][service]
if "up" in item["tags"]: if "up" in item["tags"]:
data = f"({str(cmds.startup[:])[1:-1]})" data = f"({str(cmds.startup[:])[1:-1]})"
dialog = ViewConfigDialog(
self, self.app, self.node_id, data, "cmdup"
)
elif "down" in item["tags"]: elif "down" in item["tags"]:
data = f"({str(cmds.shutdown[:])[1:-1]})" data = f"({str(cmds.shutdown[:])[1:-1]})"
dialog = ViewConfigDialog(
self, self.app, self.node_id, data, "cmdup"
)
elif "val" in item["tags"]: elif "val" in item["tags"]:
data = f"({str(cmds.validate[:])[1:-1]})" data = f"({str(cmds.validate[:])[1:-1]})"
dialog = ViewConfigDialog(self, self.app, self.node_id, data) dialog = ViewConfigDialog(
self, self.app, self.node_id, data, "cmdup"
)
dialog.show() dialog.show()
def get_node_service(self, selected: Tuple[str]) -> [int, str]: def get_node_service(self, selected: Tuple[str]) -> [int, str]:
@ -161,18 +171,31 @@ class CopyServiceConfigDialog(Dialog):
class ViewConfigDialog(Dialog): class ViewConfigDialog(Dialog):
def __init__(self, master: Any, app: "Application", node_id: int, data: bytes): def __init__(
self,
master: Any,
app: "Application",
node_id: int,
data: bytes,
filename: str = None,
):
super().__init__(master, app, f"n{node_id} config data", modal=True) super().__init__(master, app, f"n{node_id} config data", modal=True)
self.data = data self.data = data
self.service_data = None self.service_data = None
self.filepath = tk.StringVar(value=f"/tmp/services.tmp-n{node_id}-{filename}")
self.draw() self.draw()
def draw(self): def draw(self):
self.top.columnconfigure(0, weight=1) self.top.columnconfigure(0, weight=1)
frame = ttk.Frame(self.top, padding=FRAME_PAD) frame = ttk.Frame(self.top, padding=FRAME_PAD)
frame.grid(row=0, column=0) frame.columnconfigure(0, weight=1)
frame.columnconfigure(1, weight=10)
frame.grid(row=0, column=0, sticky="ew")
label = ttk.Label(frame, text="File: ") label = ttk.Label(frame, text="File: ")
label.grid(row=0, column=0, sticky="ew", padx=PADX) label.grid(row=0, column=0, sticky="ew", padx=PADX)
entry = ttk.Entry(frame, textvariable=self.filepath)
entry.config(state="disabled")
entry.grid(row=0, column=1, sticky="ew")
self.service_data = CodeText(self.top) self.service_data = CodeText(self.top)
self.service_data.grid(row=1, column=0, sticky="nsew") self.service_data.grid(row=1, column=0, sticky="nsew")

2
install.sh
View file

@ -8,7 +8,7 @@ function install_python_depencencies() {
} }
function install_python_dev_dependencies() { function install_python_dev_dependencies() {
sudp pip install pipenv grpcio-tools sudo pip install pipenv grpcio-tools
} }
function install_ospf_mdr() { function install_ospf_mdr() {