Commit graph

163 commits

Author SHA1 Message Date
Tom Goff
15adf81954 daemon: Use a master script to start node services.
This helps starting services with dependencies by running service
start commands serially.
2015-08-31 11:31:57 -04:00
tgoff0
b1322df827 use the modified tun_flowctl driver if it exists
From: weston
2015-06-01 17:52:49 +00:00
tgoff0
d92f1ff89d fixed issue with assigning the 'lo' device for eventservice when using emane 0.9.1
From: santiago
2015-06-01 17:52:43 +00:00
tgoff0
5838814f07 daemon: Improve running session state change hooks. 2015-05-22 00:56:24 +00:00
tgoff0
ad60004fad daemon: Improve launching xterm from a sudo environment. 2015-05-22 00:55:48 +00:00
tgoff0
e905648d68 change the default pipe name of olsrv2 2015-05-22 00:54:49 +00:00
tgoff0
f675b0a16d added check for all blank option values 2015-05-22 00:54:44 +00:00
tgoff0
b82c94efd8 prevent unintended session options alteration from the gui 2015-05-22 00:54:39 +00:00
tgoff0
0018be074f daemon: Only automatically save a XML representation of the current
running session when NMF version 1.0 is used.
2015-05-22 00:54:34 +00:00
tgoff0
ea4f6ba518 fixed issues with shutting down a distributed batch mode 2015-05-22 00:54:28 +00:00
tgoff0
5b36181956 Raise fatal exception if control nets from earlier sessions are detected 2015-05-22 00:54:23 +00:00
tgoff0
591ec20937 daemon: Automatically save a XML representation of the current session
after starting, including the deployed network plan when the new NMF
format is used.
2015-05-22 00:54:04 +00:00
tgoff0
baec96fac1 Undo check for configured controlnet, which is optional. 2015-05-22 00:53:59 +00:00
tgoff0
f6049614ab Undo check for configured controlnet, which is optional. 2015-05-22 00:53:54 +00:00
tgoff0
06fe91ea86 Added support for auxiliary control networks. Some refactoring. 2015-05-22 00:53:43 +00:00
tgoff0
cd479193fc checked for the attachment of a server interface to a control net before establishing a GRE tunnel with peers. 2015-05-22 00:53:38 +00:00
tgoff0
ab4819ac93 allow attachment of a server interface to a control net. added support for multiple control networks. 2015-05-22 00:53:33 +00:00
tgoff0
13fbea9153 Allow separation of OTA traffic from event traffic and from control backplane traffic. Some refactoring. 2015-05-22 00:53:28 +00:00
tgoff0
0fde50992d daemon: Initial support to include a deployed network plan in the NMF
XML scenario representation.
2015-05-22 00:53:22 +00:00
tgoff0
1112da1417 daemon: Initial support for importing a scenario using the new NRL
Network Modeling Framework (NMF) XML representation.
2015-05-22 00:53:15 +00:00
tgoff0
08c9fd8bf5 daemon: Initial support for exporting a scenario using the new NRL
Network Modeling Framework (NMF) XML representation.
2015-05-22 00:53:01 +00:00
tgoff0
692afe7f81 services: Improve the mgen actor service.
Fix shutdown and add a validation command.
2015-04-10 00:55:15 +00:00
tgoff0
4957b73e44 added shutdown to mgen actor
From: macker
2015-04-03 01:49:15 +00:00
tgoff0
ed14bb60e5 added missing 80211abg mac params when running with EMACS 0.9.x
From: santiago
2015-04-03 01:49:09 +00:00
tgoff0
5d08aa21bf daemon: Set session configuration before setting the initial session state. 2015-03-24 23:30:04 +00:00
tgoff0
61d0f34982 added a default olsrd config file to the olsrorg service template
From: dean
2015-03-09 15:21:22 +00:00
tgoff0
e9a4a52755 daemon: Make Configurable.valueof() a class method. 2015-03-09 15:21:16 +00:00
tgoff0
8248a292d0 daemon: Use a consistent interface naming convention when creating
links between layer-2 devices.
2015-03-09 15:20:59 +00:00
tgoff0
61f1a6e72e daemon: Represent object ids in hex when used to generate interface
names (to reduce length if possible).
2015-03-09 15:20:54 +00:00
tgoff0
db15bee60c daemon: Include MAC addresses in CORE API link messages. 2015-03-09 15:20:42 +00:00
tgoff0
db03927892 daemon: Fix encoding MAC addresses for CORE API messages. 2015-03-09 15:20:33 +00:00
tgoff0
750b6c507d daemon: Minor XML-related cleanup. 2015-02-27 00:06:47 +00:00
tgoff0
ca8856d6c8 daemon: Initial support for writing different versions of XML scenario files. 2015-02-05 00:16:14 +00:00
tgoff0
899b5ae5be daemon: Renumber XML versioning.
Consider the current XML representation version 0.0.
2015-02-05 00:15:59 +00:00
tgoff0
bc3ba68b28 daemon/services: Update NRL services. 2015-02-05 00:15:54 +00:00
tgoff0
5bb00646d7 daemon: Call the EMANE post-startup function when entering the session
runtime state.

This should help synchronization startup for distributed emulations.
2015-02-05 00:15:48 +00:00
tgoff0
978f9946f1 daemon: Add initial support for invoking python callbacks when session
state changes occur.
2015-02-05 00:15:43 +00:00
tgoff0
fb662d06b7 daemon: Ignore redundant session state changes. 2015-02-05 00:15:38 +00:00
tgoff0
4599520518 Add some gitignore files. 2015-01-28 02:15:45 +00:00
tgoff0
458d1d64e6 added olsr.org service template 2015-01-21 21:38:15 +00:00
tgoff0
6159d31f66 daemon: Refactor waiting for a TunTap device to exist.
This should also fix an issue that caused excessive startup delay.
2015-01-21 21:38:10 +00:00
tgoff0
d40b0dd89c Adjust file mode bits. 2015-01-21 21:38:02 +00:00
tgoff0
d56f26b5d6 Some trivial code cleanup. 2015-01-21 21:37:31 +00:00
tgoff0
a0d4ac4ec4 daemon: Wait for a TunTap device to exist before trying to configure
addresses.
2014-12-15 22:24:17 +00:00
tgoff0
104e68a712 daemon: Initial support to allow multiple versions of XML scenario files. 2014-12-15 18:22:53 +00:00
tgoff0
3ffdf7c420 daemon: Some code reorganization to make XML support more modular. 2014-12-15 18:22:46 +00:00
ahrenholz
c5f1fa7d13 added docker service file from r603 2014-10-31 18:47:57 +00:00
ahrenholz
f5e3461903 make calcdistance a staticmethod
(Boeing r1897)
2014-10-31 16:46:43 +00:00
ahrenholz
267c49dfab added Docker service contributed by Stuart Marsden, with some mods
fixes bug #264
(Boeing r1896)
2014-10-31 16:45:03 +00:00
ahrenholz
f61522207d update HTTP service to support apache 2.4 on Ubuntu 14.04 (fixes bug #261)
(Boeing r1895)
2014-10-30 18:13:43 +00:00
ahrenholz
503713f0bc use hex value for short session ID used in naming interfaces
use interface names "vethOOOOO.ii.ss" and "vethOOOOO.iipss" for veth pairs

(where OOOOO = object id, ii = interface index, ss = hex short session ID)

fixes bug #260 virtual interface names too long
(Boeing r1894)
2014-10-28 21:18:16 +00:00
ahrenholz
5c9c8bfff7 set IP addresses on TAP devices used with EMANE 0.9.2 (fixes bug #268)
(Boeing r1892)
2014-10-28 17:24:31 +00:00
ahrenholz
be4f431ab6 revise EMANE 0.9.2 detection due to protobuf file under Ubuntu 12.04
make Emane.detectversionfromcmd() a classmethod
(Boeing r1890,1891)
2014-10-27 20:52:01 +00:00
ahrenholz
2df3e6cd77 update labels, EMANE 0.9.x RF-PIPE jitter/delay is in seconds, not microseconds
(Boeing r1886)
2014-10-02 15:00:19 +00:00
ahrenholz
7f05bcd94a fix improper EMANE version detection when stopping/starting sessions
(Boeing r1885)
2014-09-30 14:52:13 +00:00
ahrenholz
5359ff4fd4 added support for distributed EMANE 0.9.2
(Boeing r1884)
2014-09-29 19:07:25 +00:00
ahrenholz
f081985433 use default log level of 3 ("INFO" level) with EMANE if unspecified in core.conf
(Boeing r1883)
2014-09-23 21:37:18 +00:00
ahrenholz
4ee92d1711 support linking RJ45 with EMANE 0.9.2 using Raw transport;
build extra XML and launch emane process on host for the raw devices
(Boeing r1882)
2014-09-23 20:24:19 +00:00
ahrenholz
e825b94e13 support for EMANE 0.9.2 by running emane process in each container
use control network for data and events
use internal transport instead of emanetransportd for 0.9.2
(Boeing r1881)
2014-09-23 16:26:22 +00:00
ahrenholz
24263d77bd initial XML changes for EMANE 0.9.2
for version detection, use 'emane --version' output instead of other tricks
(Boeing r1880)
2014-09-18 15:50:09 +00:00
ahrenholz
3ca4cecd0b whitespace only changes made by Ninja-IDE
(Boeing r1879)
2014-09-17 22:00:11 +00:00
ahrenholz
66ebcb5cf4 fix bug #253 "NetworkManager runs DHCP..." for Ubuntu (but not Fedora/CentOS)
use "vethA.B.SS" name for veth devices (A = node number, B = index, SS = short session ID)
use "tapA.B.SS" name for tap devices; use "b.A.SS" name for bridge devices
added a SESSION_SHORT environment variable to the default CORE environment
(Boeing r1867)
2014-08-04 17:28:35 +00:00
ahrenholz
f3b86f6dbd fix bug #231 exception with mobility script and two wlans
(Boeing r1859)
2014-07-29 14:52:08 +00:00
ahrenholz
42f176e1ec write local address, port for slave servers in /tmp/pycore.nnnnn/servers file
fixes bug #248
(Boeing r1856)
2014-07-28 17:49:42 +00:00
ahrenholz
3bcbc0ffac make daemon shutdown more robust to Python errors
(Boeing r1855)
2014-07-22 17:17:42 +00:00
ahrenholz
e6ff3b4cce support multiple frequencies of interest with the EMANE 0.9.1 Universal Phy
(Boeing r1850)
2014-07-11 17:44:41 +00:00
ahrenholz
7905a26e4d (from veytser@ll) include antenna profile manifest parameter in platform.xml
(Boeing r1849)
2014-07-10 22:00:58 +00:00
ahrenholz
52bcf71e12 minor cleanup of SDT helper
(Boeing r1846)
2014-06-13 18:41:46 +00:00
ahrenholz
33ea3e95ec added support for subscribing to EMANE 0.9.1 location events
(Boeing r1845)
2014-06-13 17:06:41 +00:00
ahrenholz
1f5397c558 tomh: s._starttime may not be a string
(Boeing r1843)
2014-06-02 19:38:02 +00:00
ahrenholz
9ba3d29768 initial EMANE 0.9.1 support
does not support event monitor or generating CommEffect events
2014-05-25 20:08:41 +00:00
ahrenholz
1ab6be9625 fix bug #244 by printing an error when some non-unique directory names are
used in the custom_services_dir setting
(Boeing r1841)
2014-04-30 21:27:41 +00:00
ahrenholz
422ecab341 use default SDT URL as default session option
(Boeing r1840)
2014-04-22 15:49:12 +00:00
ahrenholz
7bc3fa99a0 added stdurl session option
(Boeing r1839)
2014-04-22 15:23:59 +00:00
ahrenholz
57022b7ca6 save and parse canvas origin (reference point) and scale in the Motion Plan XML
(Boeing r1838)
2014-04-08 16:18:11 +00:00
ahrenholz
81a22a7192 NRL SVN r954 / dean:
added nrl services for an mgen sink and nrlolsrv2
(Boeing r1831)
2014-04-03 14:43:23 +00:00
ahrenholz
e610a8d726 fix hash calculation used to determine GRE tunnel keys
for fixing tunnels between distributed controlnets
(Boeing r1830)
2014-04-02 21:19:41 +00:00
ahrenholz
f717fcc0dd (commit by Kelly Bunn)
session.py:  Created method (sendnodeemuid) to send node status response
             message, so all nodes can call it. Added per session updown
             script option.
service.py:  Added test for _starttime before calling float() in
             bootnodeservices().
             Changed servicesfromopaque code to collect unknown
             services and return with valid services.
             Changed handleevent to send a message with posible failed
             and unknown services.
coreobj.py:  Added code to put nodes actual configured services in
             tonodemsg.
core-daemon: Added call to self.session.sendnodeemuid if in running
             state in handlenodemsg

(Boeing r1824,1825)
2014-03-05 16:28:32 +00:00
ahrenholz
3b01f99e2c use a shell script to start SMF and detach stdin/stdout/stderr
(Boeing r1822)
2014-01-22 17:31:40 +00:00
ahrenholz
47433fc231 log exception messages generated by Session.exception()
(Boeing r1819)
2014-01-10 16:56:14 +00:00
ahrenholz
ee8023a64a fix bug #150 where the EMANE event service address and port were not used
added buildeventservicexml() helper to write /tmp/pycore.xxxxx/libemane...xml
dynamically set LIBEMANEEVENTSERVICECONFIG environment variable when needed
 to load the event service library XML
(Boeing r1818)
2013-12-19 22:27:10 +00:00
ahrenholz
bbbf775766 improved imports, added addtextelementsfromtuples() helper,
added sample XML in comments
(Boeing r1817)
2013-12-19 21:34:58 +00:00
ahrenholz
96f346804b allow default node class to be specified when initalizing an XML parser
write and parse default services and node types to/from XML ServicePlan
(Boeing r1814)
2013-12-16 23:57:42 +00:00
ahrenholz
c635c54a3a fix two exceptions when using ns2 scripted mobility along with SDT3D
(Boeing r1813)
2013-12-16 23:29:27 +00:00
ahrenholz
9e955d22f0 update MDR service to use broadcast interfaces for links to non-WLAN nets
(Boeing r1812)
2013-12-16 18:52:41 +00:00
ahrenholz
ddfc6f5de7 unbreak the ability to create a WLAN network during runtime
(Boeing r1810)
2013-12-09 23:43:46 +00:00
ahrenholz
fce1cf18ee allow run-time model changes when pressing "Apply" in WLAN config dialog
(Boeing r1808)
2013-12-09 17:56:06 +00:00
ahrenholz
a9ea208a08 added reconfigure event type, for re-generating service config files
added new Event Message handling for starting mobility model or reconfiguring
  a service during runtime
(Boeing r1806)
2013-12-05 23:44:25 +00:00
ahrenholz
d281682772 globally replace old NRL URL with new
http://www.nrl.navy.mil/itd/ncs/products/core
(Boeing r1803)
2013-12-04 21:45:42 +00:00
ahrenholz
3e99c9d12f added extra logic to EMANE node to enable flow control in the virtual transport
if it is enabled in the MAC model
(Boeing r1801)
2013-12-03 23:10:21 +00:00
ahrenholz
6babc9895e fix error with EMANE CommEffect model with loss/duplicate % string values
(Boeing r1800)
2013-12-03 19:48:06 +00:00
ahrenholz
5390f280e3 update daemon to generate extra Link Messages for bidirectional link effects
support bidirectional links with session reconnect and XML save/load
(Boeing r1799)
2013-12-03 18:14:39 +00:00
ahrenholz
6547b898c3 daemon support for unidirectional link effects
also enable link effects between hub/switch and hub/switch connections
(Boeing r1798)
2013-12-02 21:20:52 +00:00
ahrenholz
536ff20fff change API version to 1.23
change jitter to 64-bit value to align with delay in Link Message
added unidirectional link flag TLV to Link Message
(Boeing r1795)
2013-12-02 21:08:00 +00:00
ahrenholz
1e8abc4c1e allow executing XML files from daemon from Register Message
(like a Python script)
added start flag to xmlutils.opensessionxml(), 
XML file will be parsed into a live running session
(Boeing r1792)
2013-11-25 19:54:02 +00:00
ahrenholz
102dd2aa3b set NODE_NAME and NODE_NUMBER in default vnoded environment for SimpleLxcNodes
(Boeing r1788)
2013-10-28 14:33:31 +00:00
ahrenholz
d00a49d682 added mkdir flag to Session.__init__() to allow adopting existing sessions
(Boeing r1786)
2013-10-25 15:21:08 +00:00
ahrenholz
0fc51e38bf (Boeing r1784,1785)
implement local flag when receiving Execute Message, for running host commands
added checkforkernelmodule helper
2013-10-22 14:32:42 +00:00
ahrenholz
d676a9fd59 (Boeing r1783)
fix HTTP service running under Ubuntu by setting up /var/lock/apache2 dir
2013-10-22 14:23:57 +00:00
ahrenholz
f9e7c36204 (Boeing r1776)
bump CORE API version number to 1.22
2013-09-25 17:35:56 +00:00