Merge pull request #879 from coreemu/develop

CORE 9.1.0

.gitignore

@@ -44,6 +44,7 @@ coverage.xml
 # python files
 *.egg-info
 *.pyc
+*.pyi
 
 # ignore package files
 *.rpm

CHANGELOG.md

@@ -1,3 +1,31 @@
+## 2024-07-04 CORE 9.1.0
+
+* Installation
+    * most install files are now consolidated under /opt/core
+    * \#830 / \#831 - fixed issues with systemd service support
+* Documentation
+    * added notes about MaxSession configuration for SSH when running distributed
+    * \#826 - updated tutorial 3 documentation
+* core-daemon
+    * updated Docker nodes to use docker exec by default for commands
+    * added Podman nodes
+    * Docker/Podman compose support for nodes to allow greater configuration
+    * Docker/Podman node images no longer require network tools for orchestration
+    * EMANE configuration parsing updated to treat regexes as provided
+    * executables are now symlinks under $prefix/bin to avoid PATH issues
+    * new flag added to quickly enable debug logging
+    * code refactoring for handling internal nodes like control nets and ptp
+    * \#789 - wlan nodes can now configure the subnet for connected nodes
+    * \#801 - fixed issue running EMANE within Docker/Podman
+    * \#816 - fixed split link configuration saving to XML
+    * \#823 - config services are now the default and only services available
+    * \#842 - gRPC WLAN add node during runtime fixed
+    * \#875 - fix dataclass creation for python 3.11+
+* core-gui
+    * fixed copy/paste nodes to include image name
+    * adds root to xhost by default when running
+    * \#811 - added convenience shortcut to run arbitrary commands from nodes, like wireshark
+
 ## 2023-08-01 CORE 9.0.3
 
 * Installation

Makefile.am

@@ -94,9 +94,8 @@ fpm -s dir -t rpm -n core \
 	--vendor "$(PACKAGE_VENDOR)" \
 	-p core_VERSION_ARCH.rpm \
 	-v $(PACKAGE_VERSION) \
-	--rpm-init package/core-daemon \
-	--after-install package/after-install.sh \
-	--after-remove package/after-remove.sh \
+	--after-install package/after-install-rpm.sh \
+	--after-remove package/after-remove-rpm.sh \
 	-d "ethtool" \
 	-d "tk" \
 	-d "procps-ng" \
@@ -108,9 +107,10 @@ fpm -s dir -t rpm -n core \
 	-d "nftables" \
 	netns/vnoded=/usr/bin/ \
 	netns/vcmd=/usr/bin/ \
-	package/etc/core.conf=/etc/core/ \
-	package/etc/logging.conf=/etc/core/ \
-	package/examples=/opt/core/ \
+	package/core-daemon.service=/usr/lib/systemd/system/ \
+	package/etc/core.conf=/opt/core/etc/ \
+	package/etc/logging.conf=/opt/core/etc/ \
+	package/share=/opt/core/ \
 	daemon/dist/core-$(PACKAGE_VERSION)-py3-none-any.whl=/opt/core/
 endef
 
@@ -125,8 +125,8 @@ fpm -s dir -t deb -n core \
 	-v $(PACKAGE_VERSION) \
 	--deb-systemd package/core-daemon.service \
 	--deb-no-default-config-files \
-	--after-install package/after-install.sh \
-	--after-remove package/after-remove.sh \
+	--after-install package/after-install-deb.sh \
+	--after-remove package/after-remove-deb.sh \
 	-d "ethtool" \
 	-d "tk" \
 	-d "libtk-img" \
@@ -139,9 +139,9 @@ fpm -s dir -t deb -n core \
 	-d "nftables" \
 	netns/vnoded=/usr/bin/ \
 	netns/vcmd=/usr/bin/ \
-	package/etc/core.conf=/etc/core/ \
-	package/etc/logging.conf=/etc/core/ \
-	package/examples=/opt/core/ \
+	package/etc/core.conf=/opt/core/etc/ \
+	package/etc/logging.conf=/opt/core/etc/ \
+	package/share=/opt/core/ \
 	daemon/dist/core-$(PACKAGE_VERSION)-py3-none-any.whl=/opt/core/
 endef
 
@@ -172,8 +172,6 @@ $(info creating file $1 from $1.in)
 	-e 's,[@]bindir[@],$(bindir),g' \
 	-e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \
 	-e 's,[@]PACKAGE_DATE[@],$(PACKAGE_DATE),g' \
-	-e 's,[@]CORE_LIB_DIR[@],$(CORE_LIB_DIR),g' \
-	-e 's,[@]CORE_STATE_DIR[@],$(CORE_STATE_DIR),g' \
 	-e 's,[@]CORE_DATA_DIR[@],$(CORE_DATA_DIR),g' \
 	-e 's,[@]CORE_CONF_DIR[@],$(CORE_CONF_DIR),g' \
 	< $1.in > $1

README.md

@@ -1,31 +1,46 @@
 # CORE
+
 CORE: Common Open Research Emulator
 
-Copyright (c)2005-2022 the Boeing Company.
+Copyright (c)2005-2023 the Boeing Company.
 
 See the LICENSE file included in this distribution.
 
 ## About
+
 The Common Open Research Emulator (CORE) is a tool for emulating
 networks on one or more machines. You can connect these emulated
 networks to live networks. CORE consists of a GUI for drawing
 topologies of lightweight virtual machines, and Python modules for
 scripting network emulation.
 
+## Documentation & Support
+
+We are leveraging GitHub hosted documentation and Discord for persistent
+chat rooms. This allows for more dynamic conversations and the
+capability to respond faster. Feel free to join us at the link below.
+
+* [Documentation](https://coreemu.github.io/core/)
+* [Discord Channel](https://discord.gg/AKd7kmP)
+
 ## Quick Start
+
 Requires Python 3.9+. More detailed instructions and install options can be found
 [here](https://coreemu.github.io/core/install.html).
 
 ### Package Install
+
 Grab the latest deb/rpm from [releases](https://github.com/coreemu/core/releases).
 
 This will install vnoded/vcmd, system dependencies, and CORE within a python
 virtual environment at `/opt/core/venv`.
+
 ```shell
 sudo <yum/apt> install -y ./<package>
 ```
 
 Then install OSPF MDR from source:
+
 ```shell
 git clone https://github.com/USNavalResearchLaboratory/ospf-mdr.git
 cd ospf-mdr
@@ -38,6 +53,7 @@ sudo make install
 ```
 
 ### Script Install
+
 The following should get you up and running on Ubuntu 22.04. This would
 install CORE into a python3 virtual environment and install
 [OSPF MDR](https://github.com/USNavalResearchLaboratory/ospf-mdr) from source.
@@ -54,11 +70,3 @@ inv install
 # CentOS
 inv install -p /usr
 ```
-
-## Documentation & Support
-We are leveraging GitHub hosted documentation and Discord for persistent
-chat rooms. This allows for more dynamic conversations and the
-capability to respond faster. Feel free to join us at the link below.
-
-* [Documentation](https://coreemu.github.io/core/)
-* [Discord Channel](https://discord.gg/AKd7kmP)

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, 9.0.3)
+AC_INIT(core, 9.1.0)
 
 # autoconf and automake initialization
 AC_CONFIG_SRCDIR([netns/version.h.in])
@@ -17,18 +17,14 @@ PACKAGE_VENDOR="CORE Developers"
 PACKAGE_MAINTAINERS="$PACKAGE_VENDOR"
 
 # core specific variables
-CORE_LIB_DIR="\${prefix}/lib/core"
-CORE_CONF_DIR="/etc/core"
-CORE_DATA_DIR="\${datadir}/core"
-CORE_STATE_DIR="/var"
+CORE_CONF_DIR="/opt/core/etc"
+CORE_DATA_DIR="/opt/core/share"
 
 AC_SUBST(PACKAGE_DATE)
 AC_SUBST(PACKAGE_MAINTAINERS)
 AC_SUBST(PACKAGE_VENDOR)
-AC_SUBST(CORE_LIB_DIR)
 AC_SUBST(CORE_CONF_DIR)
 AC_SUBST(CORE_DATA_DIR)
-AC_SUBST(CORE_STATE_DIR)
 
 # documentation option
 AC_ARG_ENABLE([docs],