Merge branch 'develop' into grpc

.gitignore

@@ -51,3 +51,8 @@ coverage.xml
 
 # ignore swap files
 *.swp
+
+# ignore built input files
+netns/setup.py
+daemon/setup.py
+ns3/setup.py

Changelog

@@ -1,3 +1,21 @@
+2019-03-25 CORE 5.2.1
+  * Packaging:
+   - documentation no longer builds by default, must use configure flag
+   - added configure flag to allow only building vcmd
+   - sphinx will no long be required when not building documentation
+  * Services:
+   - Added source NAT service
+   - Fixed DHCP service for Ubuntu 18.04
+  * BUGFIXES:
+   - #188 - properly remove session on delete TLV API call
+   - #192 - updated default gnome terminal command for nodes to be Ubuntu 18.04 compatible
+   - #193 - updates to service validation, will retry on failure and better exception logging
+   - #195 - TLV link message data fix
+   - #196 - fix to avoid clearing out default services
+   - #197 - removed wireless_link_all API from EmuSession
+   - #216 - updated default WLAN bandwidth to 54Mbps
+   - #223 - fix to saving RJ45 to session XML files
+
 2018-05-22 CORE 5.1
   * DAEMON:
    - removed and cleared out code that is either legacy or no longer supported (Xen, BSD, Kernel patching, RPM/DEB specific files)
@@ -16,9 +34,9 @@
    - added make target for generating documentation "make doc"
    - Python 2.7+ is now required
    - ns3 is no longer bundled by default, but will be produced as a separate package for installation
-  * GUI
+  * GUI:
    - updated broken help links in GUI Help->About
-  * Packaging
+  * Packaging:
    - fixed PYTHON_PATH to PYTHONPATH in sysv script
    - added make command to leverage FPM as the tool for creating deb/rpm packages going forward, there is documentation within README.md to try it out
   * TEST:

Makefile.am

@@ -165,6 +165,9 @@ change-files:
 	$(call change-files,scripts/core-daemon.service)
 	$(call change-files,scripts/core-daemon)
 	$(call change-files,daemon/core/constants.py)
+	$(call change-files,ns3/setup.py)
+	$(call change-files,netns/setup.py)
+	$(call change-files,daemon/setup.py)
 
 CORE_DOC_SRC = core-python-$(PACKAGE_VERSION)
 .PHONY: doc

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, 5.2, core-dev@nrl.navy.mil)
+AC_INIT(core, 5.2.1, core-dev@nrl.navy.mil)
 
 # autoconf and automake initialization
 AC_CONFIG_SRCDIR([netns/version.h.in])

daemon/setup.py.in

@@ -39,7 +39,7 @@ data_files.extend(recursive_files(_EXAMPLES_DIR, "examples"))
 
 setup(
     name="core",
-    version="5.2",
+    version="@PACKAGE_VERSION@",
     packages=find_packages(),
     install_requires=[
         "enum34",

netns/setup.py.in

@@ -29,7 +29,7 @@ vcmd = Extension(
 
 setup(
     name="core-netns",
-    version="5.2",
+    version="@PACKAGE_VERSION@",
     description="Extension modules to support virtual nodes using Linux network namespaces",
     scripts=["vcmd", "vnoded", "netns"],
     ext_modules=[

ns3/setup.py.in

@@ -6,7 +6,7 @@ _EXAMPLES_DIR = "share/corens3/examples"
 
 setup(
     name="core-ns3",
-    version="5.2",
+    version="@PACKAGE_VERSION@",
     packages=[
         "corens3",
     ],

sonar-project.properties

@@ -1,35 +0,0 @@
-# branch name for the sonar analysis
-sonar.branch.name=rel/5.2
-sonar.branch.target=master
-
-# required metadata
-sonar.projectKey=CORE
-sonar.projectName=CORE
-sonar.projectVersion=5.2
-
-# define modules
-sonar.modules=daemon,ns3,netns
-
-# Encoding of the source files
-sonar.sourceEncoding=UTF-8
-
-# scm provider
-sonar.scm.provider=git
-
-# daemon files
-daemon.sonar.projectBaseDir=daemon
-daemon.sonar.language=py
-daemon.sonar.sources=./core
-daemon.sonar.tests=./tests
-daemon.sonar.python.coverage.reportPath=coverage.xml
-
-# ns3 files
-ns3.sonar.projectBaseDir=ns3
-ns3.sonar.language=py
-ns3.sonar.sources=./corens3
-
-# netns files
-netns.sonar.projectBaseDir=netns
-netns.sonar.language=c
-netns.sonar.sources=./
-netns.sonar.cfamily.build-wrapper-output.bypass=true