Merge pull request #562 from coreemu/develop

7.5.0 merge

Author: bharnden

CHANGELOG.md

@@ -1,3 +1,22 @@
+## 2021-03-11 CORE 7.5.0
+
+* core-daemon
+    * fixed issue setting mobility loop value properly
+    * fixed issue that some states would not properly remove session directories
+    * \#560 - fixed issues with sdt integration for mobility movement and layer creation
+* core-pygui
+    * added multiple canvas support
+    * added support to hide nodes and restore them visually
+    * update to assign full netmasks to wireless connected nodes by default
+    * update to display services and action controls for nodes during runtime
+    * fixed issues with custom nodes
+    * fixed issue auto assigning macs, avoiding duplication
+    * fixed issue joining session with different netmasks
+    * fixed issues when deleting a session from the sessions dialog
+    * \#550 - fixed issue not sending all service customization data
+* core-cli
+    * added delete session command
+
 ## 2021-01-11 CORE 7.4.0
 
 * Installation

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 # this defines the CORE version number, must be static for AC_INIT
-AC_INIT(core, 7.4.0)
+AC_INIT(core, 7.5.0)
 
 # autoconf and automake initialization
 AC_CONFIG_SRCDIR([netns/version.h.in])

daemon/core/api/grpc/grpcutils.py

@@ -25,7 +25,9 @@
 from core.errors import CoreError
 from core.location.mobility import BasicRangeModel, Ns2ScriptedMobility
 from core.nodes.base import CoreNode, CoreNodeBase, NodeBase
+from core.nodes.docker import DockerNode
 from core.nodes.interface import CoreInterface
+from core.nodes.lxd import LxcNode
 from core.nodes.network import WlanNode
 from core.services.coreservices import CoreService
 
@@ -67,6 +69,7 @@ def add_node_data(node_proto: core_pb2.Node) -> Tuple[NodeTypes, int, NodeOption
         image=node_proto.image,
         services=node_proto.services,
         config_services=node_proto.config_services,
+        canvas=node_proto.canvas,
     )
     if node_proto.emane:
         options.emane = node_proto.emane
@@ -263,19 +266,22 @@ def get_node_proto(session: Session, node: NodeBase) -> core_pb2.Node:
     geo = core_pb2.Geo(
         lat=node.position.lat, lon=node.position.lon, alt=node.position.alt
     )
-    services = getattr(node, "services", [])
-    if services is None:
-        services = []
-    services = [x.name for x in services]
-    config_services = getattr(node, "config_services", {})
-    config_services = [x for x in config_services]
+    services = [x.name for x in node.services]
+    model = node.type
+    node_dir = None
+    config_services = []
+    if isinstance(node, CoreNodeBase):
+        node_dir = node.nodedir
+        config_services = [x for x in node.config_services]
+    channel = None
+    if isinstance(node, CoreNode):
+        channel = node.ctrlchnlname
     emane_model = None
     if isinstance(node, EmaneNet):
         emane_model = node.model.name
-    model = getattr(node, "type", None)
-    node_dir = getattr(node, "nodedir", None)
-    channel = getattr(node, "ctrlchnlname", None)
-    image = getattr(node, "image", None)
+    image = None
+    if isinstance(node, (DockerNode, LxcNode)):
+        image = node.image
     return core_pb2.Node(
         id=node.id,
         name=node.name,
@@ -290,6 +296,7 @@ def get_node_proto(session: Session, node: NodeBase) -> core_pb2.Node:
         config_services=config_services,
         dir=node_dir,
         channel=channel,
+        canvas=node.canvas,
     )
 
 

daemon/core/api/grpc/wrappers.py

@@ -649,6 +649,7 @@ class Node:
     geo: Geo = None
     dir: str = None
     channel: str = None
+    canvas: int = None
 
     # configurations
     emane_model_configs: Dict[
@@ -683,6 +684,7 @@ def from_proto(cls, proto: core_pb2.Node) -> "Node":
             geo=Geo.from_proto(proto.geo),
             dir=proto.dir,
             channel=proto.channel,
+            canvas=proto.canvas,
         )
 
     def to_proto(self) -> core_pb2.Node:
@@ -700,6 +702,7 @@ def to_proto(self) -> core_pb2.Node:
             server=self.server,
             dir=self.dir,
             channel=self.channel,
+            canvas=self.canvas,
         )
 
 

daemon/core/configservices/frrservices/services.py

@@ -103,8 +103,7 @@ def data(self) -> Dict[str, Any]:
                 ip4s.append(str(ip4.ip))
             for ip6 in iface.ip6s:
                 ip6s.append(str(ip6.ip))
-            is_control = getattr(iface, "control", False)
-            ifaces.append((iface, ip4s, ip6s, is_control))
+            ifaces.append((iface, ip4s, ip6s, iface.control))
 
         return dict(
             frr_conf=frr_conf,

daemon/core/configservices/quaggaservices/services.py

@@ -104,8 +104,7 @@ def data(self) -> Dict[str, Any]:
                 ip4s.append(str(ip4.ip))
             for ip6 in iface.ip6s:
                 ip6s.append(str(ip6.ip))
-            is_control = getattr(iface, "control", False)
-            ifaces.append((iface, ip4s, ip6s, is_control))
+            ifaces.append((iface, ip4s, ip6s, iface.control))
 
         return dict(
             quagga_bin_search=quagga_bin_search,

daemon/core/emulator/session.py

@@ -134,7 +134,6 @@ def __init__(
         self.link_handlers: List[Callable[[LinkData], None]] = []
         self.file_handlers: List[Callable[[FileData], None]] = []
         self.config_handlers: List[Callable[[ConfigData], None]] = []
-        self.shutdown_handlers: List[Callable[[Session], None]] = []
 
         # session options/metadata
         self.options: SessionConfig = SessionConfig()
@@ -591,7 +590,6 @@ def edit_node(self, node_id: int, options: NodeOptions) -> None:
         :raises core.CoreError: when node to update does not exist
         """
         node = self.get_node(node_id, NodeBase)
-        node.canvas = options.canvas
         node.icon = options.icon
         self.set_node_position(node, options)
         self.sdt.edit_node(node, options.lon, options.lat, options.alt)
@@ -772,20 +770,17 @@ def shutdown(self) -> None:
         """
         if self.state == EventTypes.SHUTDOWN_STATE:
             logging.info("session(%s) state(%s) already shutdown", self.id, self.state)
-            return
-        logging.info("session(%s) state(%s) shutting down", self.id, self.state)
-        self.set_state(EventTypes.SHUTDOWN_STATE, send_event=True)
-        # clear out current core session
-        self.clear()
-        # shutdown sdt
-        self.sdt.shutdown()
+        else:
+            logging.info("session(%s) state(%s) shutting down", self.id, self.state)
+            self.set_state(EventTypes.SHUTDOWN_STATE, send_event=True)
+            # clear out current core session
+            self.clear()
+            # shutdown sdt
+            self.sdt.shutdown()
         # remove this sessions working directory
         preserve = self.options.get_config("preservedir") == "1"
         if not preserve:
             shutil.rmtree(self.session_dir, ignore_errors=True)
-        # call session shutdown handlers
-        for handler in self.shutdown_handlers:
-            handler(self)
 
     def broadcast_event(self, event_data: EventData) -> None:
         """

daemon/core/gui/app.py

@@ -1,22 +1,23 @@
 import logging
 import math
 import tkinter as tk
-from tkinter import PhotoImage, font, ttk
+from tkinter import PhotoImage, font, messagebox, ttk
 from tkinter.ttk import Progressbar
 from typing import Any, Dict, Optional, Type
 
 import grpc
 
-from core.gui import appconfig, themes
+from core.gui import appconfig, images
+from core.gui import nodeutils as nutils
+from core.gui import themes
 from core.gui.appconfig import GuiConfig
 from core.gui.coreclient import CoreClient
 from core.gui.dialogs.error import ErrorDialog
 from core.gui.frames.base import InfoFrameBase
 from core.gui.frames.default import DefaultInfoFrame
-from core.gui.graph.graph import CanvasGraph
-from core.gui.images import ImageEnum, Images
+from core.gui.graph.manager import CanvasManager
+from core.gui.images import ImageEnum
 from core.gui.menubar import Menubar
-from core.gui.nodeutils import NodeUtils
 from core.gui.statusbar import StatusBar
 from core.gui.themes import PADY
 from core.gui.toolbar import Toolbar
@@ -29,13 +30,13 @@ class Application(ttk.Frame):
     def __init__(self, proxy: bool, session_id: int = None) -> None:
         super().__init__()
         # load node icons
-        NodeUtils.setup()
+        nutils.setup()
 
         # widgets
         self.menubar: Optional[Menubar] = None
         self.toolbar: Optional[Toolbar] = None
         self.right_frame: Optional[ttk.Frame] = None
-        self.canvas: Optional[CanvasGraph] = None
+        self.manager: Optional[CanvasManager] = None
         self.statusbar: Optional[StatusBar] = None
         self.progress: Optional[Progressbar] = None
         self.infobar: Optional[ttk.Frame] = None
@@ -77,7 +78,7 @@ def setup_app(self) -> None:
         self.master.title("CORE")
         self.center()
         self.master.protocol("WM_DELETE_WINDOW", self.on_closing)
-        image = Images.get(ImageEnum.CORE, 16)
+        image = images.from_enum(ImageEnum.CORE, width=images.DIALOG_SIZE)
         self.master.tk.call("wm", "iconphoto", self.master._w, image)
         self.master.option_add("*tearOff", tk.FALSE)
         self.setup_file_dialogs()
@@ -136,20 +137,8 @@ def draw_infobar(self) -> None:
         label.grid(sticky=tk.EW, pady=PADY)
 
     def draw_canvas(self) -> None:
-        canvas_frame = ttk.Frame(self.right_frame)
-        canvas_frame.rowconfigure(0, weight=1)
-        canvas_frame.columnconfigure(0, weight=1)
-        canvas_frame.grid(row=0, column=0, sticky=tk.NSEW, pady=1)
-        self.canvas = CanvasGraph(canvas_frame, self, self.core)
-        self.canvas.grid(sticky=tk.NSEW)
-        scroll_y = ttk.Scrollbar(canvas_frame, command=self.canvas.yview)
-        scroll_y.grid(row=0, column=1, sticky=tk.NS)
-        scroll_x = ttk.Scrollbar(
-            canvas_frame, orient=tk.HORIZONTAL, command=self.canvas.xview
-        )
-        scroll_x.grid(row=1, column=0, sticky=tk.EW)
-        self.canvas.configure(xscrollcommand=scroll_x.set)
-        self.canvas.configure(yscrollcommand=scroll_y.set)
+        self.manager = CanvasManager(self.right_frame, self, self.core)
+        self.manager.notebook.grid(sticky=tk.NSEW)
 
     def draw_status(self) -> None:
         self.statusbar = StatusBar(self.right_frame, self)
@@ -179,17 +168,30 @@ def show_info(self) -> None:
     def hide_info(self) -> None:
         self.infobar.grid_forget()
 
-    def show_grpc_exception(self, title: str, e: grpc.RpcError) -> None:
+    def show_grpc_exception(
+        self, message: str, e: grpc.RpcError, blocking: bool = False
+    ) -> None:
         logging.exception("app grpc exception", exc_info=e)
-        message = e.details()
-        self.show_error(title, message)
+        dialog = ErrorDialog(self, "GRPC Exception", message, e.details())
+        if blocking:
+            dialog.show()
+        else:
+            self.after(0, lambda: dialog.show())
 
-    def show_exception(self, title: str, e: Exception) -> None:
+    def show_exception(self, message: str, e: Exception) -> None:
         logging.exception("app exception", exc_info=e)
-        self.show_error(title, str(e))
+        self.after(
+            0, lambda: ErrorDialog(self, "App Exception", message, str(e)).show()
+        )
 
-    def show_error(self, title: str, message: str) -> None:
-        self.after(0, lambda: ErrorDialog(self, title, message).show())
+    def show_exception_data(self, title: str, message: str, details: str) -> None:
+        self.after(0, lambda: ErrorDialog(self, title, message, details).show())
+
+    def show_error(self, title: str, message: str, blocking: bool = False) -> None:
+        if blocking:
+            messagebox.showerror(title, message, parent=self)
+        else:
+            self.after(0, lambda: messagebox.showerror(title, message, parent=self))
 
     def on_closing(self) -> None:
         if self.toolbar.picker:
@@ -201,15 +203,17 @@ def save_config(self) -> None:
 
     def joined_session_update(self) -> None:
         if self.core.is_runtime():
+            self.menubar.set_state(is_runtime=True)
             self.toolbar.set_runtime()
         else:
+            self.menubar.set_state(is_runtime=False)
             self.toolbar.set_design()
 
-    def get_icon(self, image_enum: ImageEnum, width: int) -> PhotoImage:
-        return Images.get(image_enum, int(width * self.app_scale))
+    def get_enum_icon(self, image_enum: ImageEnum, *, width: int) -> PhotoImage:
+        return images.from_enum(image_enum, width=width, scale=self.app_scale)
 
-    def get_custom_icon(self, image_file: str, width: int) -> PhotoImage:
-        return Images.get_custom(image_file, int(width * self.app_scale))
+    def get_file_icon(self, file_path: str, *, width: int) -> PhotoImage:
+        return images.from_file(file_path, width=width, scale=self.app_scale)
 
     def close(self) -> None:
         self.master.destroy()

daemon/core/gui/appconfig.py

@@ -185,7 +185,8 @@ def __init__(
 def copy_files(current_path: Path, new_path: Path) -> None:
     for current_file in current_path.glob("*"):
         new_file = new_path.joinpath(current_file.name)
-        shutil.copy(current_file, new_file)
+        if not new_file.exists():
+            shutil.copy(current_file, new_file)
 
 
 def find_terminal() -> Optional[str]:
@@ -197,30 +198,27 @@ def find_terminal() -> Optional[str]:
 
 
 def check_directory() -> None:
-    if HOME_PATH.exists():
-        return
-    HOME_PATH.mkdir()
-    BACKGROUNDS_PATH.mkdir()
-    CUSTOM_EMANE_PATH.mkdir()
-    CUSTOM_SERVICE_PATH.mkdir()
-    ICONS_PATH.mkdir()
-    MOBILITY_PATH.mkdir()
-    XMLS_PATH.mkdir()
-    SCRIPT_PATH.mkdir()
-
+    HOME_PATH.mkdir(exist_ok=True)
+    BACKGROUNDS_PATH.mkdir(exist_ok=True)
+    CUSTOM_EMANE_PATH.mkdir(exist_ok=True)
+    CUSTOM_SERVICE_PATH.mkdir(exist_ok=True)
+    ICONS_PATH.mkdir(exist_ok=True)
+    MOBILITY_PATH.mkdir(exist_ok=True)
+    XMLS_PATH.mkdir(exist_ok=True)
+    SCRIPT_PATH.mkdir(exist_ok=True)
     copy_files(LOCAL_ICONS_PATH, ICONS_PATH)
     copy_files(LOCAL_BACKGROUND_PATH, BACKGROUNDS_PATH)
     copy_files(LOCAL_XMLS_PATH, XMLS_PATH)
     copy_files(LOCAL_MOBILITY_PATH, MOBILITY_PATH)
-
-    terminal = find_terminal()
-    if "EDITOR" in os.environ:
-        editor = EDITORS[0]
-    else:
-        editor = EDITORS[1]
-    preferences = PreferencesConfig(editor, terminal)
-    config = GuiConfig(preferences=preferences)
-    save(config)
+    if not CONFIG_PATH.exists():
+        terminal = find_terminal()
+        if "EDITOR" in os.environ:
+            editor = EDITORS[0]
+        else:
+            editor = EDITORS[1]
+        preferences = PreferencesConfig(editor, terminal)
+        config = GuiConfig(preferences=preferences)
+        save(config)
 
 
 def read() -> GuiConfig: