Commit graph

171 commits

Author SHA1 Message Date
Blake Harnden
76305f7257 converted usages of per to loss 2020-06-12 12:49:53 -07:00
Blake Harnden
ef3cf5697d daemon: added class variable type hinting for core.xml 2020-06-12 08:54:06 -07:00
Blake Harnden
3691c6029f updated corexml InterfaceData instantiation to use named params 2020-06-09 10:48:50 -07:00
Blake Harnden
7d2034df71 daemon: updated NodeOptions to leverage dataclass 2020-06-09 10:45:18 -07:00
Blake Harnden
b034ba6cc3 turned transport type usages of raw and virtual across the board to an enumerated type 2020-05-29 22:48:00 -07:00
Blake Harnden
bcd9e4ceb1 fixed session.add_hook to not require a source, since it was not typically used an None was being passed, cleaned up some bad type hinting in related to session.py 2020-05-21 00:20:05 -07:00
Blake Harnden
c07766e1eb updated session.add_node to use better type hinting and force usage of classes directly, instead of indirectly through NodeTypes 2020-05-20 22:14:03 -07:00
Blake Harnden
d5254e6a91 changes to support better type checking for retrieving an arbitrary node from a session, get_node now requires an expected class that the node would be an instance of, if the returned node is not an instance a CoreError is thrown, this also helps editors pick up expected types to account for variable/function usage better as well 2020-05-20 14:44:34 -07:00
Blake Harnden
124d655dc6 fixed issue when sorting hook when saving to xml, due to enum refactoring, updated test case to hit this potential issue in the future 2020-05-11 12:41:57 -07:00
Blake Harnden
47ef5ec14d avoid writing link options to xml for emane/wlan links 2020-04-30 11:19:23 -07:00
Blake Harnden
3394f0240a update reading session xml options to updating these values instead of clearing out existing settings, avoids issue wiping ovs settings etc 2020-04-22 12:07:42 -07:00
Blake Harnden
78d442b574 add service file content to xml as cdata to avoid escaping 2020-04-16 10:44:33 -07:00
Blake Harnden
86b0c07764 fixed issue when reading xml file and not associating node with emane model, causing error for grpc 2020-04-15 11:44:14 -07:00
Blake Harnden
13ef701b6e ignore reading emane global config from xml when not present 2020-03-31 10:08:08 -07:00
Blake Harnden
1efa1284bb merged latest from develop 2020-03-28 13:18:25 -07:00
Blake Harnden
6c5c2c5674 fixed core xml to properly write and read emane global configurations 2020-03-28 13:06:46 -07:00
Blake Harnden
3d59cd0ad8 initial logic for working emane links based on emane stats 2020-03-27 17:22:44 -07:00
Blake Harnden
a7790185d4 updates to use message flags enum directly 2020-03-12 23:12:17 -07:00
Blake Harnden
5cdfd8d8b9 updated NodeTypes to be used directly 2020-03-10 23:11:37 -07:00
Blake Harnden
1e8d1ecd9f changes for sessions to use EventTypes for state/hooks directly 2020-03-06 22:35:23 -08:00
Blake Harnden
539ca5d22c added docker/lxc to xml read/write, fixed icon retrieval for docker/lxc in new gui 2020-03-03 22:27:02 -08:00
Blake Harnden
c66ee04db5 avoid attempting to stop services for nodes that are not considered up 2020-02-04 10:13:37 -08:00
bharnden
c5666f9112
Merge pull request #357 from coreemu/feature/config-service
Feature/config service
2020-01-27 17:31:03 -08:00
Blake Harnden
d7d0a55fd2 updates to support saving config services to xml, loading config services from xml, retrieving config services from coretk when joining a session 2020-01-21 17:32:12 -08:00
Blake Harnden
0d99810491 fixed issue where xml did not read in custom icons 2020-01-20 09:09:42 -08:00
Blake Harnden
b8ded52a66 fixed formatting in docs due 2020-01-16 16:12:01 -08:00
Blake Harnden
f4ddf310a8 removed rtype and param typing from doc strings to help avoid maintaining duplicate information provided by type hints 2020-01-16 11:00:57 -08:00
Blake Harnden
8cd8b2ae2c added type hinting to core.xml 2020-01-14 14:56:00 -08:00
bharnden
67c1dae357
Merge pull request #336 from coreemu/refactoring/remove-ipaddress
Refactoring/remove ipaddress
2020-01-09 14:31:33 -08:00
Blake Harnden
de493c810a changes to replace MacAddress usage and remove ipaddress module altogether 2020-01-08 17:33:49 -08:00
Blake Harnden
848d4acb8f added imn-to-xml script, fixed bug introduced when reading xml files with custom service files 2020-01-07 15:29:36 -08:00
Blake Harnden
f431254e15 initial changes towards removing ipaddress and using netaddr 2020-01-07 14:08:29 -08:00
Blake Harnden
c1a0f4e83d fix for custom services not setting service.configs when reading xml 2020-01-06 11:54:51 -08:00
Blake Harnden
819954a695 updated grpc node positions to use floats, avoids needing to deal with int conversions 2019-12-13 10:47:23 -08:00
Blake Harnden
0308a4c8d7 fixed temp issue for dealing with xml and node positions as floats, updated shape metadata to save bold/italic/underline options and read them back from xml 2019-12-06 22:33:21 -08:00
Blake Harnden
71df2a3b7f updated annotation text to be selectable/moveable, save annotation text with other shapes and reload from xml 2019-12-06 22:10:27 -08:00
Blake Harnden
79dfbaa3ec switched session.metadata to just be a standard dict, fixed shutdown service issue during session.data_collect 2019-10-30 13:27:12 -07:00
bharnden
68be311c7a updated usages of super to use python3 variation 2019-10-23 09:51:52 -07:00
bharnden
6a0a9e7698 updated all classes to be created without using (object), in python3 all classes are new style classes 2019-10-23 09:31:34 -07:00
Blake Harnden
ab0abd65aa modified session.add_node parameter node_options, to just be options 2019-10-22 15:31:50 -07:00
Blake Harnden
f39b7e9f96 updated open_xml functionality, grpc open_xml can optionally start now, added opened files to grpc get_sessions 2019-10-22 12:08:55 -07:00
Blake Harnden
78f981463d renamed utils.check_cmd to utils.cmd, updated host_cmd to allow for shell commands for output redirection 2019-10-21 10:32:42 -07:00
Blake Harnden
7d2a615716 more updates to using f string 2019-10-18 10:33:31 -07:00
Blake Harnden
e94a6d1afa separated distributed session logic into its own class to help reduce session.py size as it is already too big 2019-10-17 11:10:59 -07:00
Blake Harnden
b2d2705849 removed broker from session, updated most places using broker to use alternative logic to compensate where needed 2019-10-15 14:13:42 -07:00
Blake Harnden
6570f22ccf refactor fabric distributed to use a class and update sessions to create and provide these to nodes 2019-10-14 15:43:57 -07:00
Blake Harnden
02ef91242e initial changes to convert all commands to be string based for consistency 2019-10-11 16:36:57 -07:00
Blake Harnden
bc58693339 updated emane config files to be generated for remote servers, fixed services not using node remote server compatible commands 2019-10-10 11:53:52 -07:00
bharnden
050297587d consolidated EmaneNode and EmaneNet, renaming EmaneNode to EmaneNet 2019-09-27 22:31:56 -07:00
bharnden
b14012e5e9 removed node map file and utilities, added formal class methods to session objects and added checks for specific classes where needed 2019-09-26 13:00:12 -07:00
bharnden
976f06dc10 removed unwanted logging line from corexml.py 2019-09-17 10:13:51 -07:00
Blake Harnden
fcee44775a changes to logging, moving logs to debug and removing setnemposition logging that could spam output 2019-09-13 13:13:59 -07:00
bharnden
0d5692e7e8 updates to try and clean up info logging, moved some statements to debug 2019-09-11 15:05:05 -07:00
bharnden
1fc8d647c3 added flake8/black, pre-commit integration for flake8/black, and black formatting changes 2019-09-10 15:10:24 -07:00
bharnden
d5055f85d3 pass over files using isort 2019-09-10 14:20:51 -07:00
bharnden
ae5d718737 revert loss pack to using floats in all related places 2019-07-03 23:09:55 -07:00
Blake Harnden
948b1126ba changes to support not modifying controlnet configuration messages and avoid issues with setting the master meane config when dealing with distributed emane 2019-06-18 10:33:16 -07:00
bharnden
10df7d35ee fixed saving bidirectional params for ptp networks, storing to xml and loading back into running environment 2019-06-08 21:46:07 -07:00
bharnden
191d392c46 updated grpc node x,y types, added new grpc session position type, grpc updated link options to use int, fixed corehandlers handling of dup, fixed corexml type handling for link options, updated mobility config types to correlate with link options 2019-06-08 16:56:39 -07:00
bharnden
996a7715be fixed ignoring adding nodes to xml and xml links from network to network 2019-06-04 16:03:07 -07:00
bharnden
6c861a6ff8 fixed issues related to writing xml with tunnel nodes using othernet, fixed reading x,y as int instead of float due to packing issues for tlv 2019-06-04 10:59:02 -07:00
Kevin Larson
823fda9c97 Switched write to writebytes for python3 support 2019-06-03 18:22:06 -07:00
Blake Harnden
597bd21994 updated logging.warn to logging.warning due to deprecation in python3, fixed python 2/3 filter issue in tests, fixed utf decoding for some missed popen commands 2019-06-03 14:36:21 -07:00
bharnden
1e98175e35 refactored usages of iteritems, itervalues, and iterkeys to be 2/3 compliant 2019-05-05 21:23:43 -07:00
bharnden
66e603906a updates to layout core module packages in a more logical way, including renaming methods from objects to nodes and nodes.objid to nodes.id 2019-04-29 23:31:47 -07:00
bharnden
9517740704 initial refactor for all variables named objid 2019-04-26 22:07:51 -07:00
bharnden
9b1141a135 fixes issue saving/loading rj45 nodes to xml 2019-02-17 10:18:23 -08:00
bharnden
7aee2b2ba7 updated logging usage, to use the library directly and avoid imposing a core config by default, allowing users of the core library to configure logging as desired 2019-02-16 09:50:19 -08:00
bharnden
a7bc7500fb
Merge branch 'master' into cleanup/codacy-cleanup 2018-10-18 16:21:05 -07:00
bharnden
419b90bad6 removed unused import in corexml.py 2018-10-18 16:18:27 -07:00
bharnden
91fc852db1 removed unwanted logging in xml generation 2018-10-18 16:08:04 -07:00
bharnden
b37eb2fe74 updated xml tests and removed unused xml code 2018-10-11 21:22:57 -07:00
bharnden
12cc40d3d3 cleaned up core.emane, core.services, core.xml, fixed bug introduced in coreobj.py 2018-10-11 17:26:34 -07:00
Blake J. Harnden
36f80e1a48 updates to session-deployed container element, emanePlatform elements now include transport and associated addresses 2018-08-28 10:24:56 -07:00
Blake J. Harnden
4649563664 added deployment information back into session-deployed.xml 2018-08-21 14:26:59 -07:00
Blake J. Harnden
ae2c0aa697 fixed issue with loading custom service directories from xml, fixed issue with parsing an empty tuple string in utility method 2018-08-16 12:20:56 -07:00
Blake J. Harnden
cf6f8391b0 added interface name and nemid for emane connected interfaces to generated xml 2018-08-14 12:31:44 -07:00
Blake J. Harnden
4f592d0651 fixed issue with viewkeys behaving different between versions of python 2.7 2018-08-01 18:22:41 -07:00
Blake J. Harnden
8009572fc0 fixed issue with corexml and loading hooks 2018-07-27 16:10:47 -07:00
Blake J. Harnden
a6f2b9d7c1 removed emane transport definitions from external configurations 2018-07-12 15:28:26 -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
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
aed3126a6a changed corexml log statement 2018-07-06 14:51:28 -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
4ccb1ed9f3 working lxml based save/load 2018-07-03 09:50:14 -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
bb533406a6 refactored service methods to be shorter, updated some logging to debug, added some more service tests 2018-06-22 15:47:02 -07:00
Blake J. Harnden
8186f3716c refactored service function names 2018-06-22 14:41:06 -07:00
Blake J. Harnden
37517c45f4 changed some logging from info to debug, removed startindex and depends from services 2018-06-22 08:16:59 -07:00
Blake J. Harnden
e80736061f refactored service interaction use names with a _, and cleanup up some of the CoreServices methods 2018-06-15 14:03:27 -07:00
Blake J. Harnden
8e3cd0e013 refactored modelmanager getmodels to get_models 2018-06-13 16:23:51 -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
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
e4aaebfefb fixed xml 0.0 failing 2018-06-07 09:09:56 -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
181a47b8ca updates to some log statements and fix to avoid an exception for finding enpoints in xml 2018-05-01 12:28:20 -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