Merge pull request #534 from coreemu/develop

merge for 7.3.0

Author: bharnden

CHANGELOG.md

@@ -1,3 +1,24 @@
+## 2020-12-02 CORE 7.3.0
+
+* core-daemon
+    * fixed issue where emane global configuration was not being sent to core-gui
+    * updated controlnet names on host to be prefixed with ctrl
+    * fixed RJ45 link shutdown from core-gui causing an error
+    * fixed emane external transport xml generation
+    * \#517 - update to account for radvd required directory
+    * \#514 - support added for session specific environment files
+    * \#529 - updated to configure netem limit based on delay or user specified, requires kernel 3.3+
+* core-pygui
+    * fixed issue drawing wlan/emane link options when it should not have
+    * edge labels are now placed a set distance from nodes like original gui
+    * link color/width are now saved to xml files
+    * added support to configure buffer size for links
+    * \#525 - added support for multiple wired links between the same nodes
+    * \#526 - added option to hide/show links with 100% loss
+* Documentation
+    * \#527 - typo in service documentation
+    * \#515 - added examples to docs for using EMANE features within a CORE context
+
 ## 2020-09-29 CORE 7.2.1
 
 * core-daemon

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

daemon/core/api/grpc/grpcutils.py

@@ -128,6 +128,7 @@ def add_link_data(
         options.mer = options_proto.mer
         options.burst = options_proto.burst
         options.mburst = options_proto.mburst
+        options.buffer = options_proto.buffer
         options.unidirectional = options_proto.unidirectional
         options.key = options_proto.key
     return iface1_data, iface2_data, options, link_type
@@ -329,6 +330,7 @@ def convert_link_options(options_data: LinkOptions) -> core_pb2.LinkOptions:
         burst=options_data.burst,
         delay=options_data.delay,
         dup=options_data.dup,
+        buffer=options_data.buffer,
         unidirectional=options_data.unidirectional,
     )
 

daemon/core/api/grpc/server.py

@@ -972,6 +972,7 @@ def EditLink(
             mburst=options_proto.mburst,
             unidirectional=options_proto.unidirectional,
             key=options_proto.key,
+            buffer=options_proto.buffer,
         )
         session.update_link(node1_id, node2_id, iface1_id, iface2_id, options)
         iface1 = InterfaceData(id=iface1_id)

daemon/core/api/grpc/wrappers.py

@@ -457,6 +457,7 @@ class LinkOptions:
     delay: int = 0
     dup: int = 0
     unidirectional: bool = False
+    buffer: int = 0
 
     @classmethod
     def from_proto(cls, proto: core_pb2.LinkOptions) -> "LinkOptions":
@@ -471,6 +472,7 @@ def from_proto(cls, proto: core_pb2.LinkOptions) -> "LinkOptions":
             delay=proto.delay,
             dup=proto.dup,
             unidirectional=proto.unidirectional,
+            buffer=proto.buffer,
         )
 
     def to_proto(self) -> core_pb2.LinkOptions:
@@ -485,6 +487,7 @@ def to_proto(self) -> core_pb2.LinkOptions:
             delay=self.delay,
             dup=self.dup,
             unidirectional=self.unidirectional,
+            buffer=self.buffer,
         )
 
 

daemon/core/api/tlv/corehandlers.py

@@ -52,6 +52,7 @@
 from core.location.mobility import BasicRangeModel
 from core.nodes.base import CoreNode, CoreNodeBase, NodeBase
 from core.nodes.network import WlanNode
+from core.nodes.physical import Rj45Node
 from core.services.coreservices import ServiceManager, ServiceShim
 
 
@@ -787,20 +788,30 @@ def handle_link_message(self, message):
         options = LinkOptions()
         options.delay = message.get_tlv(LinkTlvs.DELAY.value)
         options.bandwidth = message.get_tlv(LinkTlvs.BANDWIDTH.value)
-        options.loss = message.get_tlv(LinkTlvs.LOSS.value)
-        options.dup = message.get_tlv(LinkTlvs.DUP.value)
         options.jitter = message.get_tlv(LinkTlvs.JITTER.value)
         options.mer = message.get_tlv(LinkTlvs.MER.value)
         options.burst = message.get_tlv(LinkTlvs.BURST.value)
         options.mburst = message.get_tlv(LinkTlvs.MBURST.value)
         options.unidirectional = message.get_tlv(LinkTlvs.UNIDIRECTIONAL.value)
         options.key = message.get_tlv(LinkTlvs.KEY.value)
+        loss = message.get_tlv(LinkTlvs.LOSS.value)
+        dup = message.get_tlv(LinkTlvs.DUP.value)
+        if loss is not None:
+            options.loss = float(loss)
+        if dup is not None:
+            options.dup = int(dup)
 
         if message.flags & MessageFlags.ADD.value:
             self.session.add_link(
                 node1_id, node2_id, iface1_data, iface2_data, options, link_type
             )
         elif message.flags & MessageFlags.DELETE.value:
+            node1 = self.session.get_node(node1_id, NodeBase)
+            node2 = self.session.get_node(node2_id, NodeBase)
+            if isinstance(node1, Rj45Node):
+                iface1_data.id = node1.iface_id
+            if isinstance(node2, Rj45Node):
+                iface2_data.id = node2.iface_id
             self.session.delete_link(
                 node1_id, node2_id, iface1_data.id, iface2_data.id, link_type
             )
@@ -1851,7 +1862,15 @@ def send_objects(self):
                 )
                 self.session.broadcast_config(config_data)
 
-        # send emane model info
+        # send global emane config
+        config = self.session.emane.get_configs()
+        logging.debug("global emane config: values(%s)", config)
+        config_data = ConfigShim.config_data(
+            0, None, ConfigFlags.UPDATE.value, self.session.emane.emane_config, config
+        )
+        self.session.broadcast_config(config_data)
+
+        # send emane model configs
         for node_id in self.session.emane.nodes():
             emane_configs = self.session.emane.get_all_configs(node_id)
             for model_name in emane_configs:

daemon/core/configservices/frrservices/services.py

@@ -5,7 +5,7 @@
 from core.configservice.base import ConfigService, ConfigServiceMode
 from core.emane.nodes import EmaneNet
 from core.nodes.base import CoreNodeBase
-from core.nodes.interface import CoreInterface
+from core.nodes.interface import DEFAULT_MTU, CoreInterface
 from core.nodes.network import WlanNode
 
 GROUP: str = "FRR"
@@ -18,7 +18,7 @@ def has_mtu_mismatch(iface: CoreInterface) -> bool:
     mtu-ignore command. This is needed when e.g. a node is linked via a
     GreTap device.
     """
-    if iface.mtu != 1500:
+    if iface.mtu != DEFAULT_MTU:
         return True
     if not iface.net:
         return False

daemon/core/configservices/quaggaservices/services.py

@@ -6,7 +6,7 @@
 from core.configservice.base import ConfigService, ConfigServiceMode
 from core.emane.nodes import EmaneNet
 from core.nodes.base import CoreNodeBase
-from core.nodes.interface import CoreInterface
+from core.nodes.interface import DEFAULT_MTU, CoreInterface
 from core.nodes.network import WlanNode
 
 GROUP: str = "Quagga"
@@ -19,7 +19,7 @@ def has_mtu_mismatch(iface: CoreInterface) -> bool:
     mtu-ignore command. This is needed when e.g. a node is linked via a
     GreTap device.
     """
-    if iface.mtu != 1500:
+    if iface.mtu != DEFAULT_MTU:
         return True
     if not iface.net:
         return False

daemon/core/configservices/utilservices/services.py

@@ -217,7 +217,7 @@ def data(self) -> Dict[str, Any]:
 class RadvdService(ConfigService):
     name: str = "radvd"
     group: str = GROUP_NAME
-    directories: List[str] = ["/etc/radvd"]
+    directories: List[str] = ["/etc/radvd", "/var/run/radvd"]
     files: List[str] = ["/etc/radvd/radvd.conf"]
     executables: List[str] = ["radvd"]
     dependencies: List[str] = []

daemon/core/emulator/data.py

@@ -172,6 +172,7 @@ class LinkOptions:
     mburst: int = None
     unidirectional: int = None
     key: int = None
+    buffer: int = None
 
 
 @dataclass