Commit graph

274 commits

Author SHA1 Message Date
Blake J. Harnden
08b27ad0d7 fixed issue with emane location events and publishing node data 2018-08-07 10:51:33 -07:00
Blake J. Harnden
f1863a874d removed unwanted logging 2018-07-25 15:24:54 -07:00
Blake J. Harnden
087a0f011b added back in core emane address creation, only when not external 2018-07-24 13:34:33 -07:00
Blake J. Harnden
3d59a68299 refactored how getters for configurations worked, to avoid setting defaults and causing undesireable states 2018-07-11 21:34:21 -07:00
Blake J. Harnden
b03662dbeb removed emane nodes netif install and setaddrs, install was always skipped and setaddrs is done by zebra/quagga 2018-07-11 09:24:44 -07:00
Blake J. Harnden
bfbee35a53 updates to support external transport configuration and an emane transport service to generate and run emanetransport for a configured external transport model 2018-07-11 09:19:06 -07:00
Blake J. Harnden
d988ff86d1 added documentation to emanexml 2018-07-06 11:56:09 -07:00
Blake J. Harnden
875a880250 refactored emane xml configurations into an isolated file, using lxml 2018-07-06 11:41:32 -07:00
Blake J. Harnden
f115b1a847 emane xml fully generated from lxml apis, removed xml functions embedded within emane nodes, emane manager, and emane models. Started consolidating emanexml logic into its own module, when it makes sense 2018-07-03 18:49:36 -07:00
Blake J. Harnden
ae94c78fbb updated emane model xml to leverage lxml 2018-07-03 12:48:54 -07:00
Blake J. Harnden
d05bc9240a initial code to leverage lxml to create xml for saving and loading core sessions 2018-06-28 16:30:55 -07:00
Blake J. Harnden
82c3d57dd3 setup a simple default way for dealing with configurable options and added conifg group opbjects as a better way to access the same information formatted within a string 2018-06-14 08:41:48 -07:00
Blake J. Harnden
25cfb21586 added modelmanager for both mobility and emane to leverage and reduce duplicate logic 2018-06-13 16:17:47 -07:00
Blake J. Harnden
3a39432fc7 refactored configs back to be able to provide instance conifgurations for sessions 2018-06-13 11:59:50 -07:00
Blake J. Harnden
eb415aa4d4 merged session config/options together 2018-06-12 08:37:39 -07:00
Blake J. Harnden
981e48ed30 removed the emane manager from post_startup on emane models, it was not needed, since we can access it from our local session object, if needed 2018-06-11 12:26:51 -07:00
Blake J. Harnden
52230bc026 refactored configuration managers and options into a single class, now the models that can be configured will deal with and handle configurations for nodes themselves 2018-06-11 12:26:12 -07:00
Blake J. Harnden
1b843e2868 updated logic so emane will always use the last model configured for a node, fixes issue when using gui and configuring multiple models 2018-06-08 14:21:41 -07:00
Blake J. Harnden
52bfd1edf4 refactored get_config_types to get_all_configs and NewConfigurableManager back to ConfigurableManager 2018-06-08 10:30:41 -07:00
Blake J. Harnden
4b9cf996d1 updates to account for config messages in core handlers that dont contain all configuration options 2018-06-07 15:32:16 -07:00
Blake J. Harnden
7abf4bca16 updates to get all tests working with config changes 2018-06-07 12:57:32 -07:00
Blake J. Harnden
2ede43e3ae initial commit with things working for the most part 2018-06-06 14:51:45 -07:00
Blake J. Harnden
44781d0aec set default logging to INFO, cleaned up logging to help isolate debug type messages to DEBUG level, fixed issue with shutdown 2018-04-27 12:09:31 -07:00
Blake J. Harnden
ac2b64aaaf updates to remove restriction for emane in general and emane 1.2.1, should support at leat 1.0.1 possibly further back and can run without emane again, updated gui to ask users to install emane when not preset on the emane models panel 2018-04-20 21:22:08 -07:00
Blake J. Harnden
b6d891f124 updated emane manager to parse config options from manifest, updates to denote core specific configurations within emane models, update to account for manifest parsing of INETADDR 2018-04-02 14:00:28 -07:00
Blake J. Harnden
4d01a49ec2 updated emane model phy/mac parsing to account for values that support multiple values into a param list 2018-03-30 14:53:02 -07:00
Blake J. Harnden
405614bbd8 added metaclass to reduce emane model code, fixed broken emaneuniversal references 2018-03-30 12:52:10 -07:00
Blake J. Harnden
fd32e1cf78 added support for emane manifest parsing into core compatible information, refactoring of emane code to align with its usage 2018-03-30 12:08:33 -07:00
Blake J. Harnden
8963ef51e3 fixed bypass unique phy doc under refactored code 2018-03-29 15:13:16 -07:00
Blake J. Harnden
beb5be2ee9 reverted to using class variables for emane models due to inheritence from config class 2018-03-29 14:38:32 -07:00
Blake J. Harnden
19ccd6a63b testing hack for class propery 2018-03-29 14:14:59 -07:00
Blake J. Harnden
4f978f5b96 fixed some emane naming issues 2018-03-29 14:04:15 -07:00
Blake J. Harnden
4df0d78cae resolved circular import withthe universal model 2018-03-29 13:48:40 -07:00
Blake J. Harnden
9ce8233bc3 effort to consolidate logic for emane models, to avoid redundancy for defining a new model 2018-03-29 13:32:06 -07:00
Blake J. Harnden
2b2548a927 fixed typo during cleanup pass 2018-03-27 23:14:04 -07:00
Blake J. Harnden
b7327a5798 pass over emane code to cleanup methods and some documentation 2018-03-28 13:58:49 -07:00
Blake J. Harnden
ef48052d41 fixed bad logging and updated commeffect to default to connectivity being on, same as emane default 2018-03-27 08:24:28 -07:00
Blake J. Harnden
79e1726433 removed swap file and added to gitignore 2018-03-25 22:18:37 -07:00
Blake J. Harnden
2ede524ec3 updated tdma schedule file option to leverage gui file widget 2018-03-25 22:16:52 -07:00
Blake J. Harnden
1f2c78d54a got tdma working, leveraging an example tdma schedule that will be included with packaging 2018-03-25 22:08:22 -07:00
Blake J. Harnden
162cb20e14 Merge branch 'emane-cleanup' of git-ssh.web.boeing.com:Boeing-CORE/CORE into emane-cleanup 2018-03-26 10:33:22 -07:00
Blake J. Harnden
45f041604a adding support to start the tdma schedule after emane startup 2018-03-26 10:27:39 -07:00
Blake J. Harnden
e4652f6879 tweaks to support latest 80211 config values 2018-03-23 13:00:46 -07:00
Blake J. Harnden
68f6b6af9b fixed new 80211 config 2018-03-22 22:18:27 -07:00
Blake J. Harnden
7ae3385ff0 alphabetizing emane options 2018-03-22 09:58:23 -07:00
Blake J. Harnden
86afded824 updated emane options to contain all nakagami settings for display within ui, sorted options 2018-03-21 14:24:33 -07:00
Blake J. Harnden
b6cfc2085c attempt to update physical configuration 2018-03-21 12:54:13 -07:00
Blake J. Harnden
802393725e added new emane platform options from older versions and latest 1.2.1 2018-03-21 11:58:01 -07:00
Blake J. Harnden
ba8b73af41 added some more logging to emane setup/startup 2018-03-21 09:57:08 -07:00
Blake J. Harnden
79b2fa8468 forgot to remove a line of old emane code in rfpipe 2018-03-20 14:35:00 -07:00
Blake J. Harnden
2142586112 initial pass to remove support for legacy emane code and focus on newer releases 2018-03-19 16:33:36 -07:00
Blake J. Harnden
e0bbeaf79c update to logging in relation to core 2018-03-16 09:39:44 -07:00
Blake J. Harnden
cd7fd43978 updates to support emane 1.2.1 2018-03-16 09:33:43 -07:00
Blake J. Harnden
974559843a defined custom core command error that defaults to printing command output as well 2018-03-02 16:22:20 -08:00
Blake J. Harnden
29a3496eda expose command exceptions within emane and mobility 2018-03-02 15:54:27 -08:00
Blake J. Harnden
a8ee7f35d6 updates to check_cmd to just return output, as status is pointless 2018-03-02 13:57:50 -08:00
Blake J. Harnden
43554cbb62 initial effort to remove swallowing exceptions within internal code 2018-03-02 13:39:44 -08:00
Blake J. Harnden
00b3c97448 further removal and refactoring of methods used within misc/utils.py 2018-03-02 09:15:52 -08:00
Blake J. Harnden
6211b09585 further cleanup in regards the commands that are being used within core 2018-03-01 16:23:58 -08:00
Blake J. Harnden
d3bd61ddcf updates to consolidate commands that need to be defined by a new node type 2018-03-01 13:21:25 -08:00
Blake J. Harnden
6b8ee13f5d initial changes to try and cleanup shell commands used within core 2018-02-27 10:48:01 -08:00
Blake J. Harnden
c4a61b269b updates to support dynamic loading of emane models from a custom emane directory 2018-02-05 11:22:01 -08:00
Blake J. Harnden
45e82f05b2 attempt to better support dynamic emane models 2018-02-05 09:01:49 -08:00
Blake J. Harnden
abc9e06fe1 small doc cleanup, updated python specific docs to leverage the sphix rtd theme as well 2017-08-18 11:34:25 -07:00
Blake J. Harnden
67d451c3e9 fixed old log imports and dont bail out on tdma model exception 2017-08-08 09:17:09 -07:00
Blake J. Harnden
73eea80f51 attempt to fix missing updates for sdt, moved broker specific code to broker 2017-08-07 15:37:41 -07:00
Blake J. Harnden
e4b280196b switched to making use of logzero for logging, provides nicer color output, and an easier path to switch to rotating log files 2017-08-07 11:58:51 -07:00
Blake J. Harnden
2281051edf making usage of double quotes standard for emane files 2017-08-04 14:34:44 -07:00
Blake J. Harnden
14a5d11c4e parameterized emane tests, added tdma test, although it is currently failing 2017-07-27 14:59:40 -07:00
Blake J. Harnden
673fdc94b5 removed unused imports in emane files, refactored emane testing to simplify test cases and reduce repeated code 2017-07-10 10:44:10 -07:00
Blake J. Harnden
dced47b588 fixed emane version checks, fixed emane config message handling, added initial emane test cases 2017-07-10 09:25:33 -07:00
Blake J. Harnden
613e550e8a merged latest code from rodolfos merge from the latest github pull 2017-07-06 15:10:50 -07:00
Rod A Santiago
55a6e2dcef merged cleanup branch with master 2017-06-19 18:09:28 -07:00
Rod A Santiago
0a91fe7a3e merged cleanup branch with master 2017-06-19 18:03:39 -07:00
Blake J. Harnden
14cb7dc251 caught up with latest gitlab commits, added a new tests directory leveraging pytest based tests for testing core functionality 2017-04-27 13:34:23 -07:00
Blake J. Harnden
2fc6345138 catching up with commits: daemon: Add an instantiation-complete CORE API event type 2017-04-25 11:38:53 -07:00
Blake J. Harnden
00f4ebf5a9 initial commit after bringing over cleaned up code and testing some examples 2017-04-25 08:45:34 -07:00
adamson
56896bddd1 fixed issue with indexing EMANE RJ45 objects 2017-02-23 18:40:54 -05:00
Rod A Santiago
d17ed889d2 remerged with git pending fix to distributed configuration problem 2016-10-19 16:21:06 -07:00
Rod A Santiago
5d0aa4ac1a Reverted changes due to merge with github commits made on Oct 12. An issue with distributed deployment seem to have been introduced in those commits. 2016-10-19 13:09:21 -07:00
Tom Goff
5ec7e39a28 daemon: Sort EMANE servers so NEM ids are deterministic. 2016-10-12 17:37:40 +00:00
Tom Goff
b1beff1eba daemon: Wait longer for EMANE network interfaces to exist.
When EMANE is still running.
2016-10-12 17:37:27 +00:00
Tom Goff
42b1771dcb daemon: Create a CoreServer class to represent CORE servers.
Includes related changes and refactoring.
2016-10-12 17:36:42 +00:00
Tom Goff
31a9f6fb34 daemon: Use a set to store broker handlers. 2016-10-12 15:55:30 +00:00
Tom Goff
c0a9c6c9af daemon: Remove unused variable. 2016-09-06 10:38:38 -04:00
adamson
f8da9334d8 fix to EMANE TDMA XML generation 2016-09-06 10:16:31 -04:00
adamson
d270da8f41 added daemon/core/emane/tdma.py module to support EMANE 1.0.1 TDMA model 2016-09-05 17:06:31 -04:00
Tom Goff
f03311b50a daemon: Add support for EMANE 1.0.1. 2016-09-05 17:02:59 -04:00
Rod A Santiago
b91b5125f2 daemon: changes to support optional retainment of per-interface parameters for EMANE models when multiple EMANE models of the same type are used as interfaces for a node 2016-04-20 08:36:58 -07:00
Tom Goff
76bf200f41 daemon: Explicitly close EMANE event service files. 2016-03-04 16:57:56 -05:00
Tom Goff
d681534b17 daemon: Minor code reorganization. 2016-03-04 16:57:46 -05:00
Tom Goff
d21de76dfa daemon: Save NEM information in the session directory during EMANE startup.
Write NEM information formatted as:
    <node hostname> <network interface name> <NEM ID>
to /tmp/pycore.XXXXX/emane_nems as part of starting EMANE.

This happens before the runtime state is entered and is then available
to node services.
2016-02-09 16:57:05 -05:00
Tom Goff
23f7995eab daemon: Make EMANE event service file descriptors close-on-exec. 2016-01-29 18:43:54 -05:00
Tom Goff
9440a16ef2 daemon: Add support for EMANE 0.9.3. 2015-12-18 17:12:26 -05:00
Tom Goff
ec5635c4a4 daemon: Add EMANE 0.9.1 R2RI configuration items. 2015-10-09 17:18:18 -04:00
Tom Goff
3a13b8c92d daemon: Use Emane.version directly instead of checking if EventService
exists.
2015-10-09 13:51:04 -04:00
Tom Goff
026f54d658 daemon: Assign version variables to the Emane class instead of
instances.
2015-10-09 13:50:59 -04:00
Tom Goff
1c8c9ce6ea daemon: Make generation of EMANE location events explicitly configurable. 2015-10-09 13:50:50 -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
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
ed14bb60e5 added missing 80211abg mac params when running with EMACS 0.9.x
From: santiago
2015-04-03 01:49:09 +00:00
tgoff0
d40b0dd89c Adjust file mode bits. 2015-01-21 21:38:02 +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
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
33ea3e95ec added support for subscribing to EMANE 0.9.1 location events
(Boeing r1845)
2014-06-13 17:06:41 +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
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
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
f96bbf7a29 (Boeing r1767)
update SDT helper to support 3D display of distributed emulations (fix bug #205)
2013-09-05 17:46:12 +00:00
ahrenholz
aad3f07560 (Boeing r1760)
fix Session.instantiate() for EMANE slave servers, which wait for their 
  platform ID and starting NEM ID from the master server
2013-08-30 18:41:39 +00:00
ahrenholz
898a8c6c76 (Boeing r1757)
fix exception raised when EMANE model is missing config
2013-08-29 20:35:56 +00:00
ahrenholz
f8f46d28be initial import (Boeing r1752, NRL r878) 2013-08-29 14:21:13 +00:00