Merge pull request #507 from coreemu/develop

Develop

CHANGELOG.md

@@ -1,3 +1,30 @@
+## 2020-08-21 CORE 7.1.0
+
+* Installation
+    * added core-python script that gets installed to help globally reference the virtual environment
+* gRPC API
+    * GetSession will now return all configuration information for a session and the file it was opened from, if applicable
+    * node update events will now include icon information
+    * fixed issue with getting session throughputs for sessions with a high id
+* core-daemon
+    * \#503 - EMANE networks will now work with mobility again
+    * \#506 - fixed service dependency resolution issue
+    * fixed issue sending hooks to core-gui when joining session
+* core-pygui
+    * fixed issues editing hooks
+    * fixed issue with cpu usage when joining a session
+    * fixed mac field not being disabled during runtime when configuring a node
+    * removed unlimited button from link config dialog
+    * fixed issue with copy/paste links and their options
+    * fixed issue with adding nodes/links and editing links during runtime
+    * updated open file dialog in config dialogs to open to ~/.coregui home directory
+    * fixed issue double clicking sessions dialog in invalid areas
+    * added display of asymmetric link options on links
+    * fixed emane config dialog display
+    * fixed issue saving backgrounds in xml files
+    * added view toggle for wired/wireless links
+    * node events will now update icons
+
 ## 2020-07-28 CORE 7.0.1
 
 * Bugfixes

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.0.1)
+AC_INIT(core, 7.1.0)
 
 # autoconf and automake initialization
 AC_CONFIG_SRCDIR([netns/version.h.in])

daemon/core/api/grpc/client.py

@@ -552,11 +552,12 @@ def edit_node(
         source: str = None,
     ) -> core_pb2.EditNodeResponse:
         """
-        Edit a node, currently only changes position.
+        Edit a node's icon and/or location, can only use position(x,y) or
+        geo(lon, lat, alt), not both.
 
         :param session_id: session id
         :param node_id: node id
-        :param position: position to set node to
+        :param position: x,y location for node
         :param icon: path to icon for gui to use for node
         :param geo: lon,lat,alt location for node
         :param source: application source

daemon/core/api/grpc/events.py

@@ -32,6 +32,7 @@ def handle_node_event(node_data: NodeData) -> core_pb2.Event:
         id=node.id,
         name=node.name,
         model=node.type,
+        icon=node.icon,
         position=position,
         geo=geo,
         services=services,

daemon/core/api/grpc/grpcutils.py

@@ -8,14 +8,25 @@
 
 from core import utils
 from core.api.grpc import common_pb2, core_pb2
-from core.api.grpc.services_pb2 import NodeServiceData, ServiceConfig
+from core.api.grpc.common_pb2 import MappedConfig
+from core.api.grpc.configservices_pb2 import ConfigServiceConfig
+from core.api.grpc.emane_pb2 import GetEmaneModelConfig
+from core.api.grpc.services_pb2 import (
+    NodeServiceConfig,
+    NodeServiceData,
+    ServiceConfig,
+    ServiceDefaults,
+)
 from core.config import ConfigurableOptions
 from core.emane.nodes import EmaneNet
 from core.emulator.data import InterfaceData, LinkData, LinkOptions, NodeOptions
 from core.emulator.enumerations import LinkTypes, NodeTypes
 from core.emulator.session import Session
-from core.nodes.base import CoreNode, NodeBase
+from core.errors import CoreError
+from core.location.mobility import BasicRangeModel, Ns2ScriptedMobility
+from core.nodes.base import CoreNode, CoreNodeBase, NodeBase
 from core.nodes.interface import CoreInterface
+from core.nodes.network import WlanNode
 from core.services.coreservices import CoreService
 
 WORKERS = 10
@@ -218,7 +229,7 @@ def get_config_options(
     """
     results = {}
     for configuration in configurable_options.configurations():
-        value = config[configuration.id]
+        value = config.get(configuration.id, configuration.default)
         config_option = common_pb2.ConfigOption(
             label=configuration.label,
             name=configuration.id,
@@ -536,3 +547,131 @@ def get_nem_id(
         message = f"{node.name} interface {iface_id} nem id does not exist"
         context.abort(grpc.StatusCode.INVALID_ARGUMENT, message)
     return nem_id
+
+
+def get_emane_model_configs(session: Session) -> List[GetEmaneModelConfig]:
+    configs = []
+    for _id in session.emane.node_configurations:
+        if _id == -1:
+            continue
+        model_configs = session.emane.node_configurations[_id]
+        for model_name in model_configs:
+            model = session.emane.models[model_name]
+            current_config = session.emane.get_model_config(_id, model_name)
+            config = get_config_options(current_config, model)
+            node_id, iface_id = parse_emane_model_id(_id)
+            model_config = GetEmaneModelConfig(
+                node_id=node_id, model=model_name, iface_id=iface_id, config=config
+            )
+            configs.append(model_config)
+    return configs
+
+
+def get_wlan_configs(session: Session) -> Dict[int, MappedConfig]:
+    configs = {}
+    for node_id in session.mobility.node_configurations:
+        model_config = session.mobility.node_configurations[node_id]
+        if node_id == -1:
+            continue
+        for model_name in model_config:
+            if model_name != BasicRangeModel.name:
+                continue
+            current_config = session.mobility.get_model_config(node_id, model_name)
+            config = get_config_options(current_config, BasicRangeModel)
+            mapped_config = MappedConfig(config=config)
+            configs[node_id] = mapped_config
+    return configs
+
+
+def get_mobility_configs(session: Session) -> Dict[int, MappedConfig]:
+    configs = {}
+    for node_id in session.mobility.node_configurations:
+        model_config = session.mobility.node_configurations[node_id]
+        if node_id == -1:
+            continue
+        for model_name in model_config:
+            if model_name != Ns2ScriptedMobility.name:
+                continue
+            current_config = session.mobility.get_model_config(node_id, model_name)
+            config = get_config_options(current_config, Ns2ScriptedMobility)
+            mapped_config = MappedConfig(config=config)
+            configs[node_id] = mapped_config
+    return configs
+
+
+def get_hooks(session: Session) -> List[core_pb2.Hook]:
+    hooks = []
+    for state in session.hooks:
+        state_hooks = session.hooks[state]
+        for file_name, file_data in state_hooks:
+            hook = core_pb2.Hook(state=state.value, file=file_name, data=file_data)
+            hooks.append(hook)
+    return hooks
+
+
+def get_emane_models(session: Session) -> List[str]:
+    emane_models = []
+    for model in session.emane.models.keys():
+        if len(model.split("_")) != 2:
+            continue
+        emane_models.append(model)
+    return emane_models
+
+
+def get_default_services(session: Session) -> List[ServiceDefaults]:
+    default_services = []
+    for name, services in session.services.default_services.items():
+        default_service = ServiceDefaults(node_type=name, services=services)
+        default_services.append(default_service)
+    return default_services
+
+
+def get_node_service_configs(session: Session) -> List[NodeServiceConfig]:
+    configs = []
+    for node_id, service_configs in session.services.custom_services.items():
+        for name in service_configs:
+            service = session.services.get_service(node_id, name)
+            service_proto = get_service_configuration(service)
+            config = NodeServiceConfig(
+                node_id=node_id,
+                service=name,
+                data=service_proto,
+                files=service.config_data,
+            )
+            configs.append(config)
+    return configs
+
+
+def get_node_config_service_configs(session: Session) -> List[ConfigServiceConfig]:
+    configs = []
+    for node in session.nodes.values():
+        if not isinstance(node, CoreNodeBase):
+            continue
+        for name, service in node.config_services.items():
+            if not service.custom_templates and not service.custom_config:
+                continue
+            config_proto = ConfigServiceConfig(
+                node_id=node.id,
+                name=name,
+                templates=service.custom_templates,
+                config=service.custom_config,
+            )
+            configs.append(config_proto)
+    return configs
+
+
+def get_emane_config(session: Session) -> Dict[str, common_pb2.ConfigOption]:
+    current_config = session.emane.get_configs()
+    return get_config_options(current_config, session.emane.emane_config)
+
+
+def get_mobility_node(
+    session: Session, node_id: int, context: ServicerContext
+) -> Union[WlanNode, EmaneNet]:
+    try:
+        return session.get_node(node_id, WlanNode)
+    except CoreError:
+        try:
+            return session.get_node(node_id, EmaneNet)
+        except CoreError:
+            context.abort(grpc.StatusCode.NOT_FOUND, "node id is not for wlan or emane")