Merge pull request #428 from coreemu/develop

Develop

.github/workflows/daemon-checks.yml

@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
-      - name: Set up Python 3.7
+      - name: Set up Python 3.6
         uses: actions/setup-python@v1
         with:
-          python-version: 3.7
+          python-version: 3.6
       - name: Install pipenv
         run: |
           python -m pip install --upgrade pip
@@ -19,11 +19,11 @@ jobs:
           cp setup.py.in setup.py
           cp core/constants.py.in core/constants.py
           sed -i 's/True/False/g' core/constants.py
-          pipenv install --dev
+          pipenv sync --dev
       - name: isort
         run: |
           cd daemon
-          pipenv run isort -c
+          pipenv run isort -c -df
       - name: black
         run: |
           cd daemon

CHANGELOG.md

@@ -1,3 +1,46 @@
+## 2020-04-13 CORE 6.3.0
+* Features
+    * \#424 - added FRR IS-IS service
+* Enhancements
+    * \#414 - update GUI OSPFv2 adjacency widget to work with FRR
+    * \#416 - EMANE links can now be drawn for 80211 and RF Pipe models
+    * \#418 #409 - code cleanup
+    * \#425 - added route monitor script for SDT3D integration
+    * a formal error will now be thrown when EMANE binding are not installed, but attempted to be used
+    * node positions will now default to 0,0 to avoid GUI errors, when one is not provided
+    * improved SDT3D integration, multiple link support and usage of custom layers
+* Python GUI Enhancements
+    * enabled edit menu delete
+    * cleaned up node context menu and enabled delete
+* Bugfixes
+    * \#427 - fixed issue in default route service
+    * \#426 - fixed issue reading ipsec template file
+    * \#420 - fixed issue with TLV API udp handler
+    * \#411 - allow wlan to be configured with 0 values
+    * \#415 - general EMANE configuration was not being saved/loaded from XML
+
+## 2020-03-16 CORE 6.2.0
+* gRPC API
+    * Added call to execute python script
+* Enhancements
+    * \#371 - improved coretk gui scaling
+    * \#374 - display range visually for wlan in coretk gui, when configuring
+    * \#377 - improved coretk error dialogs
+    * \#379 - fixed issues with core converting between x,y and lon,lat for values that would cross utm zones
+    * \#384 - sdt integration moved internally to core code allowing it to work for coretk gui as well
+    * \#387 - coretk gui will now auto detect potential valid terminal and command to use for interacting with nodes during runtime
+    * \#389 - coretk gui will now attempt to reconnect to daemon without need to restart
+    * \#395 - coretk gui now has "save" and "save as" menu options
+    * \#402 - coretk will now allow terminal preference to be directly edited
+* Bugfixes
+    * \#375 - fixed issues with emane event monitor handling data
+    * \#381 - executing a python script will now wait until completion before looking to join a new session
+    * \#391 - fixed configuring node ip addresses in coretk gui
+    * \#392 - fixed coretk link display when addresses are cleared out
+    * \#393 - coretk gui will properly clear marker annotations when switching sessions
+    * \#396 - Docker and LXC nodes will now properly save to XML
+    * \#406- WLAN bridge initialization was not ran when all nodes are disconnected
+
 ## 2020-02-20 CORE 6.1.0
 * New
     * config services - these services leverage a proper template engine and have configurable parameters, given enough time may replace existing services

README.md

@@ -2,7 +2,7 @@
 
 CORE: Common Open Research Emulator
 
-Copyright (c)2005-2019 the Boeing Company.
+Copyright (c)2005-2020 the Boeing Company.
 
 See the LICENSE file included in this distribution.
 
@@ -14,28 +14,11 @@ networks to live networks. CORE consists of a GUI for drawing
 topologies of lightweight virtual machines, and Python modules for
 scripting network emulation.
 
-## Documentation and Examples
+## Documentation & Support
 
-* Documentation hosted on GitHub
-    * <http://coreemu.github.io/core/>
-* Basic Script Examples
-    * [Examples](daemon/examples/python)
-* Custom Service Example
-    * [sample.py](daemon/examples/myservices/sample.py)
-* Custom Emane Model Example
-    * [examplemodel.py](daemon/examples/myemane/examplemodel.py)
-
-## Support
-
-We are leveraging Discord for persistent chat rooms, voice chat, and
-GitHub integration. This allows for more dynamic conversations and the
+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.
-<https://discord.gg/AKd7kmP>
-
-## Building CORE
-
-See [CORE Installation](http://coreemu.github.io/core/install.html) for detailed build instructions.
-
-### Running CORE
 
-See [Using the CORE GUI](http://coreemu.github.io/core/usage.html) for more details on running CORE.
+* [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, 6.2.0)
+AC_INIT(core, 6.3.0)
 
 # autoconf and automake initialization
 AC_CONFIG_SRCDIR([netns/version.h.in])