Merge branch 'rel/5.1'

daemon/data/core.conf

@@ -1,6 +1,4 @@
 # Configuration file for CORE (core-gui, core-daemon)
-#
-
 
 ### GUI configuration options ###
 [core-gui]
@@ -8,14 +6,10 @@
 
 ### core-daemon configuration options ###
 [core-daemon]
-pidfile = /var/run/core-daemon.pid
-logfile = /var/log/core-daemon.log
 xmlfilever = 1.0
-# you may want to change the listenaddr below to 0.0.0.0
 listenaddr = localhost
 port = 4038
 numthreads = 1
-verbose = False
 quagga_bin_search = "/usr/local/bin /usr/bin /usr/lib/quagga"
 quagga_sbin_search = "/usr/local/sbin /usr/sbin /usr/lib/quagga"
 # uncomment the following line to load custom services from the specified dir
@@ -57,9 +51,7 @@ emane_platform_port = 8101
 emane_transform_port = 8201
 emane_event_generate = True
 emane_event_monitor = False
-emane_models = RfPipe, Ieee80211abg, CommEffect, Bypass, Tdma
+#emane_models_dir = /home/username/.core/myemane
 # EMANE log level range [0,4] default: 2
 #emane_log_level = 2
 emane_realtime = True
-
-#aux_request_handler = core.addons.api2handler.CoreApi2RequestHandler:12222

daemon/data/logging.conf

@@ -0,0 +1,20 @@
+{
+	"version": 1,
+	"handlers": {
+		"console": {
+			"class": "logging.StreamHandler",
+			"formatter": "default",
+			"level": "DEBUG",
+			"stream": "ext://sys.stdout"
+		}
+	},
+	"formatters": {
+		"default": {
+			"format": "%(asctime)s - %(levelname)s - %(module)s:%(funcName)s - %(message)s"
+		}
+	},
+	"root": {
+		"level": "INFO",
+		"handlers": ["console"]
+	}
+}

daemon/data/xen.conf

@@ -1,35 +0,0 @@
-# Configuration file for CORE Xen support 
-### Xen configuration options ###
-[xen]
-
-### The following three configuration options *must* be specified in this
-### system-wide configuration file.
-# LVM volume group name for creating new volumes
-vg_name = domU
-# directory containing an RSA SSH host key and authorized_keys file to use
-# within the VM
-ssh_key_path = /opt/core-xen/ssh
-# extra arguments to pass via 'extra=' option to 'xm create'
-xm_create_extra = console=hvc0 rtr_boot=/dev/xvda rtr_boot_fstype=iso9660 rtr_root=/boot/root.img rtr_persist=LABEL=persist rtr_swap=LABEL=swap rtr_overlay_limit=500
-
-### The remaining configuration options *may* be specified here.
-### If not specified here, they *must* be specified in the user (or scenario's)
-### nodes.conf file as profile-specific configuration options.
-# domU RAM memory size in MB
-ram_size = 256
-# domU disk size in MB
-disk_size = 256M
-# ISO filesystem to mount as read-only
-iso_file = /opt/core-xen/iso-files/rtr.iso
-# directory used temporarily as moint point for persistent area, under
-#  /tmp/pycore.nnnnn/nX.conf/
-mount_path = /rtr/persist
-# mount_path + this directory where configuration files are located on the VM
-etc_path = config/etc
-# name of tar file within the iso_file to unpack to mount_path
-persist_tar_iso = persist-template.tar
-# name of tar file in dom0 that will be unpacked to mount_path prior to boot
-# the string '%h' will be replaced with the hostname (e.g. 'n3' for node 3)
-persist_tar = /opt/core-xen/rtr-configs/custom-%%h.tar
-# root password to set
-root_password = password