Commit graph

985 commits

Author SHA1 Message Date
Blake Harnden
cf77b3c06f updates for coretk to default to assigning global ip6 addresses 2020-01-28 10:46:40 -08:00
Blake Harnden
29b064eaf1 fix to emane bypass model and config group data being supplied to guis 2020-01-28 09:20:43 -08:00
bharnden
c5666f9112
Merge pull request #357 from coreemu/feature/config-service
Feature/config service
2020-01-27 17:31:03 -08:00
Huy Pham
4c0254ec10 reload custom node image when open xml, if the gui doesn't know about the custom image, use a default one 2020-01-27 16:27:21 -08:00
Huy Pham
09cc65646f fix right click service on custom nodes with empty services, load services to custom node when drawn on canvas, show current services for custom node's service dialog 2020-01-27 13:20:31 -08:00
Blake Harnden
45fb32c834 renamed config service dependency finder method to startup_paths, added pydocs to config service related methods 2020-01-27 11:44:00 -08:00
Blake Harnden
09aa882017 fixed config service to leverage validation_timer properly, added unit tests for config service base class 2020-01-27 10:57:16 -08:00
Blake Harnden
80073dd8c8 adding documentation to config service base class 2020-01-24 22:15:21 -08:00
Blake Harnden
22ff48182a added some basic documentation to the config service manager and dependency finder 2020-01-24 17:27:12 -08:00
Blake Harnden
05a60f684e updated config service logging to debug 2020-01-24 16:01:44 -08:00
Blake Harnden
a85cb92196 removed options not needed for config data for GUI support for both old and new GUIs 2020-01-24 13:19:08 -08:00
Blake Harnden
93ad6b588a updates to coretk to fix displaying boolean configs properly and updating config values for config services when changing mode 2020-01-24 12:51:57 -08:00
Blake Harnden
6f2a840710 update simple service to show all config types 2020-01-24 10:59:47 -08:00
Blake Harnden
531b55e1e7 small update to quagga config services, converted frr services to config services 2020-01-23 22:06:30 -08:00
Blake Harnden
b9cbbf5709 finished converting quagga services to config services 2020-01-23 21:08:40 -08:00
Blake Harnden
fcc445bb72 fixed issues in zebra config service, updated config services to start and validate different modes appropriately, added service dependency startup for config services 2020-01-23 13:22:47 -08:00
Blake Harnden
0749dcacb2 updated config services to use getattr instead of hasattr to simplify code 2020-01-23 11:27:05 -08:00
Blake Harnden
852eb60ab9 renamed config service get_text to get_text_template to be more obvious to the purpose 2020-01-23 11:06:09 -08:00
Blake Harnden
422bf9ac15 initial work to add support for quagga services as config services 2020-01-23 11:03:56 -08:00
Blake Harnden
8f03c9c975 finished converting nrl services to config service format 2020-01-23 08:53:20 -08:00
Blake Harnden
062273a99b added several nrl services updated to config service format 2020-01-22 22:10:30 -08:00
Blake Harnden
640b2c7d5b updated config services to account for files that have a path, basename will be used for template rendering, converted all current utility/security services to config service format 2020-01-22 16:54:45 -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
0ea2f73a80 added modes to config services that allows them to decide sets of configurations 2020-01-21 14:00:55 -08:00
Blake Harnden
1ca3b0e3f4 moved config values to simple service from default route, fixed coretk issue with config service config data 2020-01-21 12:04:22 -08:00
Blake Harnden
80a4955bd4 updated coretk to working order for configuring config services from coretk 2020-01-21 11:58:43 -08:00
Blake Harnden
da107cc1d9 updates to config services dialogs in coretk, initial working state for running config services from the coretk gui 2020-01-21 10:35:46 -08:00
bharnden
89af081712
Update frr.py
replace deprecated ifconfig with ip
2020-01-20 22:38:34 -08:00
Blake Harnden
83e7853821 fixed protobuf generation to avoid grpc generation for files with no definitions, added service config tab display to coretk 2020-01-20 16:25:56 -08:00
Huy Pham
b3463f1fb7 set SessionsDialog treeview's current selection again so that deleting multiple sessions is a bit more convenient 2020-01-20 16:17:27 -08:00
Huy Pham
b6f68e0b06 destroy any mobility player dialog before joinning a different session, pass in old_session_id to Menuaction.cleanup_old_session() so that the old session is deleted rather than the new one 2020-01-20 16:01:46 -08:00
Blake Harnden
a4f3abf27c updated config service grpc to return default templates and config, added logic to check for local custom templates 2020-01-20 15:54:47 -08:00
Blake Harnden
7b5df11dc7 added files to config services, added default logic for creating files from templates, added new method to provide extra data to templates, updated gui to display templates raw 2020-01-20 15:02:04 -08:00
Huy Pham
b0087bbde1 add nodeutils function to get node's image, add a function to get edge token 2020-01-20 14:04:31 -08:00
Blake Harnden
9447ddb94f initial changes to add config services to coretk gui 2020-01-20 12:17:11 -08:00
Huy Pham
510252c4a7 change terminal command 2020-01-20 12:04:10 -08:00
Huy Pham
8bcacf0a04 Merge branch 'develop' into coretk-fix 2020-01-20 09:12:17 -08:00
Huy Pham
cded9ef630 canvas wallpaper 2020-01-20 09:11:43 -08:00
Blake Harnden
0d99810491 fixed issue where xml did not read in custom icons 2020-01-20 09:09:42 -08:00
apwiggins
14db4eb383
added reset interfaces at FRR startup
adds an interface down and up for all interfaces except lo; assists babel in particular
2020-01-20 11:17:45 -04:00
Blake Harnden
0e6d1535db added grpc to get current config services for a node 2020-01-19 19:27:57 -08:00
Blake Harnden
0af6a7a620 improved gitignore for generated proto files, added new initial separate config service proto, incorporated into grpc api 2020-01-18 13:52:15 -08:00
Blake Harnden
43fe81a86e Merge branch 'develop' into feature/config-service 2020-01-17 21:13:07 -08:00
Blake Harnden
2ed56fbaa6 fixed doc formatting that was missed 2020-01-17 21:12:14 -08:00
Blake Harnden
dcc683dd38 added config service manager to CoreEmu and made it possible to create a session and nodes with config services from a script 2020-01-17 21:09:51 -08:00
Blake Harnden
191a9e9909 added some code to keep track of config services separately within core nodes, added function for starting config services during session instantiation 2020-01-17 16:57:49 -08:00
Huy Pham
845198efc6 remove print statements 2020-01-17 16:05:34 -08:00
Huy Pham
88625ffad8 fix Ctrl-S issue and node context menu issue 2020-01-17 15:59:12 -08:00
Blake Harnden
dbc77d81f6 updates naming for built in config services, broke out current example script to examples dir, broke out config service manager to separate file 2020-01-17 13:47:55 -08:00
Blake Harnden
433327c0ae added config service manager, added custom loading of subdirs for config based services, added configurations for config services 2020-01-17 11:40:29 -08:00
Blake Harnden
cf7dda816c improvements to config services, start/stop/validate basics, abc levergae to enforce definitions for custom services 2020-01-16 17:14:42 -08:00
Blake Harnden
ff018cfd01 Merge branch 'develop' into feature/config-service 2020-01-16 16:13:22 -08:00
Blake Harnden
b8ded52a66 fixed formatting in docs due 2020-01-16 16:12:01 -08:00
Blake Harnden
988ca76cec initial code towards services that will generate files from templates and provide configuration 2020-01-16 15:48:21 -08:00
Blake Harnden
f24901c4e6 fixed type hinting in config.py 2020-01-16 11:17:08 -08:00
bharnden
ea47217e94
Merge pull request #347 from coreemu/coretk-fix
Coretk fix
2020-01-16 11:08:39 -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
bharnden
4d82d1412c fix check for frr babel wireless config 2020-01-15 21:40:16 -08:00
Blake Harnden
aa96484fb6 updated utils.validate_mac format to use unix expanded to avoid singular values 2020-01-15 17:02:27 -08:00
Blake Harnden
781dc806a8 updates to cases when checking existing bridges using ip -j returns an empty object 2020-01-15 16:20:35 -08:00
Huy Pham
5c087141bd fix merge conflict 2020-01-15 15:27:33 -08:00
Huy Pham
084b25779b differentiate sessions dialog's between start gui vs open from menu, add delete button to sessions dialog, remove fix width in TMenubutton for dark theme 2020-01-15 15:23:49 -08:00
Blake Harnden
d83fd2d035 update to place the terminal command in quotes 2020-01-15 14:02:59 -08:00
Blake Harnden
d1c95a468a updates to log exceptions during threadpool, avoid errors when hwaddr is None during EMANE scenarios 2020-01-15 13:58:48 -08:00
bharnden
7e50dbdc65
Merge pull request #343 from coreemu/coregui-typehint
Coregui typehint
2020-01-15 13:39:03 -08:00
Huy Pham
6ecffc465b wrap up coretk type hinting 2020-01-15 12:59:54 -08:00
Blake Harnden
dcabd8d6f8 updates to add type hinting to uses of Callable 2020-01-15 11:56:23 -08:00
Blake Harnden
b3118513fa added function type hinting for core.plugins 2020-01-15 11:20:31 -08:00
Huy Pham
c1c580cdc4 type hint for new small update 2020-01-15 10:55:29 -08:00
Blake Harnden
dafd5dff9f merged latest from develop 2020-01-14 22:19:49 -08:00
bharnden
41bf279f76
Merge pull request #342 from coreemu/enhancement/disable-grpc-client-proxy
Enhancement/disable grpc client proxy
2020-01-14 22:17:33 -08:00
Blake Harnden
d4bce0d25c updated grpc client to have a proxy flag, updated coretk script to have a flag to enable proxy, disabled by default 2020-01-14 22:15:00 -08:00
Blake Harnden
fa095431fb added type hinting to core.emane functions 2020-01-14 16:27:08 -08:00
Blake Harnden
49f09a25cc added type hinting to core.services, avoiding all the various services for now 2020-01-14 15:26:19 -08:00
Blake Harnden
8cd8b2ae2c added type hinting to core.xml 2020-01-14 14:56:00 -08:00
Huy Pham
948a33f201 edit some parts where pycharm gives warning on type hint 2020-01-14 14:30:08 -08:00
Huy Pham
8a4ad41a47 fix merge conflict 2020-01-14 14:08:41 -08:00
Huy Pham
a0c04c0809 type hinting 2020-01-14 14:02:37 -08:00
Huy Pham
c22f1680f7 more type hinting, remove some Optional type, and fix a small bug at dialogs.nodeconfig.mac_auto() 2020-01-14 11:59:44 -08:00
Huy Pham
6c8a2526d9 -m 2020-01-14 11:06:52 -08:00
Blake Harnden
02156867e2 added type hinting to location module funcs 2020-01-13 22:15:44 -08:00
Blake Harnden
03c4d8768d finished grpc server func type hints 2020-01-13 21:33:15 -08:00
Huy Pham
b9b8e3a5f1 more on python type hint 2020-01-13 15:31:41 -08:00
Blake Harnden
0388140068 fixed WirelessModelType usage to avoid runtime errors 2020-01-13 14:10:00 -08:00
Blake Harnden
c0fcc91d10 added type hinting for core.nodes 2020-01-13 14:08:49 -08:00
Huy Pham
eb5f2c5648 more on type hinting, remove unecessary function comments 2020-01-13 12:03:13 -08:00
Blake Harnden
4e71759ac9 updates for typing functions on top level modules 2020-01-13 10:06:18 -08:00
Blake Harnden
ab3659183e function typing for some of the grpc code 2020-01-11 23:49:51 -08:00
Blake Harnden
39bdd3a1ee finished function typing in core.emulator 2020-01-11 09:37:26 -08:00
Blake Harnden
5583b7edfc added type hints for emulator and session files 2020-01-10 22:37:19 -08:00
Blake Harnden
583a552bdb disable grpc client from using proxy settings 2020-01-10 20:25:34 -08:00
Huy Pham
7bbd6aa353 type hint 2020-01-10 16:22:21 -08:00
Huy Pham
a8a0255624 type hint some files 2020-01-10 15:32:16 -08:00
Huy Pham
b0d580485b Merge branch 'develop' into coredev-serviceconfig 2020-01-10 07:40:41 -08:00
Blake Harnden
4aeb16b866 removed ns3 related code 2020-01-09 16:36:00 -08:00
Blake Harnden
9aafc8e44f updates to zebra service to remove deprecated configurations 2020-01-09 15:34:54 -08:00
Huy Pham
853d2828fe add temp service file path 2020-01-09 15:31:35 -08:00
Huy Pham
e3c8a53838 Merge branch 'develop' into coredev-serviceconfig 2020-01-09 14:50:17 -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
7028d3e78f added unit tests to help check new utils functions and usages within nodes for adding addresses and macs 2020-01-09 14:23:08 -08:00