moved netns code from daemon/src to netns at the top level, updated files to account for location change

Makefile.am

@@ -16,9 +16,12 @@ endif
 if WANT_DAEMON
   DAEMON		= scripts daemon
 endif
+if WANT_NETNS
+  NETNS 		= netns
+endif
 
 # keep docs last due to dependencies on binaries
-SUBDIRS			= ${GUI} ${DAEMON} ${DOCS}
+SUBDIRS			= ${GUI} ${DAEMON} ${DOCS} ${NETNS}
 
 ACLOCAL_AMFLAGS 	= -I config
 
@@ -113,7 +116,7 @@ fpm: clean-local-fpm
 		-d "libev" \
 		-d "net-tools" \
 		-d "python >= 2.7, python < 3.0" \
-		daemon/src/setup.py daemon/setup.py
+		netns/setup.py daemon/setup.py
 	fpm -s python -t deb \
 		-m "$(CORE_MAINTAINERS)" \
 		--vendor "$(CORE_VENDOR)" \
@@ -126,7 +129,7 @@ fpm: clean-local-fpm
 		-d "libev4" \
 		-d "python (>= 2.7), python (<< 3.0)" \
 		--deb-recommends quagga \
-		daemon/src/setup.py daemon/setup.py
+		netns/setup.py daemon/setup.py
 
 .PHONY: clean-local-fpm
 clean-local-fpm:

configure.ac

@@ -23,7 +23,7 @@ CORE_VENDOR="CORE Developers"
 #
 # autoconf and automake initialization
 #
-AC_CONFIG_SRCDIR([daemon/src/version.h.in])
+AC_CONFIG_SRCDIR([netns/version.h.in])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(config)
 AC_CONFIG_HEADERS([config.h])
@@ -331,8 +331,8 @@ AC_CONFIG_FILES([Makefile
 		doc/man/Makefile
 		doc/figures/Makefile
 		daemon/Makefile
-		daemon/src/Makefile
-		daemon/src/version.h
+		netns/Makefile
+		netns/version.h
 		daemon/core/constants.py
 		daemon/ns3/Makefile
 		daemon/ns3/corens3/constants.py

daemon/Makefile.am

@@ -11,7 +11,7 @@ SETUPPY		= setup.py
 SETUPPYFLAGS	= -v
 
 if WANT_NETNS
-  SUBDIRS 	= src ns3
+  SUBDIRS 	= ns3
 endif
 
 SBIN_FILES		=			\

daemon/requirements.txt

@@ -1,7 +1,4 @@
 enum34==1.1.6
-logzero==1.3.0
-grpcio==1.0.0
-grpcio-tools==1.0.0
 mock==1.3.0
 pycco==0.5.1
 pytest==3.0.7

doc/devguide.rst

@@ -34,7 +34,7 @@ These are being actively developed as of CORE |version|:
   project.
 * *daemon* - Python modules are found in the :file:`daemon/core` directory, the
   daemon under :file:`daemon/sbin/core-daemon`, and Python extension modules for
-  Linux Network Namespace support are in :file:`daemon/src`.
+  Linux Network Namespace support are in :file:`netns`.
 * *doc* - Documentation for the manual lives here in reStructuredText format.
 * *packaging* - Control files and script for building CORE packages are here.
 

doc/man/Makefile.am

@@ -19,9 +19,9 @@ man_MANS	= $(GUI_MANS) $(DAEMON_MANS)
 .PHONY: generate-mans
 generate-mans:
 	$(HELP2MAN) --source CORE 'sh $(top_srcdir)/gui/core-gui' -o core-gui.1.new
-	$(HELP2MAN) --no-info --source CORE $(top_srcdir)/daemon/src/vnoded -o vnoded.1.new
-	$(HELP2MAN) --no-info --source CORE $(top_srcdir)/daemon/src/vcmd -o vcmd.1.new
-	$(HELP2MAN) --no-info --source CORE $(top_srcdir)/daemon/src/netns -o netns.1.new
+	$(HELP2MAN) --no-info --source CORE $(top_srcdir)/netns/vnoded -o vnoded.1.new
+	$(HELP2MAN) --no-info --source CORE $(top_srcdir)/netns/vcmd -o vcmd.1.new
+	$(HELP2MAN) --no-info --source CORE $(top_srcdir)/netns/netns -o netns.1.new
 	$(HELP2MAN) --version-string=$(CORE_VERSION) --no-info --source CORE $(top_srcdir)/daemon/sbin/core-daemon -o core-daemon.1.new
 	$(HELP2MAN) --version-string=$(CORE_VERSION) --no-info --source CORE $(top_srcdir)/daemon/sbin/coresendmsg -o coresendmsg.1.new
 	$(HELP2MAN) --version-string=$(CORE_VERSION) --no-info --source CORE $(top_srcdir)/daemon/sbin/core-cleanup -o core-cleanup.1.new