afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2749 commits 17 branches 33 tags 20 MiB
Commit graph

1445 commits

Author SHA1 Message Date
Blake Harnden
44bf4e020c updated config services frr to match standard frr service 2020-02-20 09:46:25 -08:00
Blake Harnden
8572e153f4 fixed comparison logic for waypoints and added tests to help catch issue in the future 2020-02-19 21:21:21 -08:00
Huy Pham
23aeb40f54 display the range while configuring wlan node 2020-02-19 13:22:52 -08:00
Huy Pham
d8f586bd2b add wireless network variable to CanvasGraph that maps a wireless/EMANE node to all MDRs connected to it 2020-02-18 15:58:18 -08:00
Huy Pham
08e652633f support wireless link deletion during runtime 2020-02-18 13:59:23 -08:00
Huy Pham
471f40a0bd change wlan configuration's label name from error rate (%) to loss (%) to match the old gui 2020-02-18 10:37:37 -08:00
Huy Pham
b3dabbfe05 delete wireless links on canvas during runtime 2020-02-18 10:33:49 -08:00
Huy Pham
87c9492d32 scale antenna and mobility player buttons 2020-02-17 15:14:52 -08:00
Huy Pham
1d911a763f scale custom node icon and custom node drawn on canvas 2020-02-17 12:56:19 -08:00
Huy Pham
4fd1338cf1 save application scale to gui configuration, and draw everything to the correct saved scale when starting the application 2020-02-17 11:10:13 -08:00
Huy Pham
b7116c52ff Merge branch 'develop' into coretk-enhance/scaling 2020-02-17 09:27:37 -08:00
Blake Harnden
e8f6ccaa4e fixed typing used for session.instantiate 2020-02-14 16:25:05 -08:00
Blake Harnden
1375af51cb added grpc to get emane event channel being used 2020-02-14 16:22:28 -08:00
Blake Harnden
ebafa228ff added files/directories to grpc set_node_service 2020-02-14 13:40:10 -08:00
Huy Pham
0ea99ca809 scale edge text font (ipv4 and ipv6 address, scale edge, scale node when first drawn on canvas and when joining session 2020-02-14 13:34:00 -08:00
Blake Harnden
71aeb98bb9 updates to grpc add_link to return created interface data 2020-02-14 13:18:05 -08:00
Huy Pham
55b6cbbd90 sacle toolbar button after choosing a node from node picker, scale canvas nodes and canvas node text 2020-02-13 12:15:56 -08:00
bharnden
0d3460e2ec
Merge pull request #370 from devdkerr/patch-1 
Update utility.py
 2020-02-12 21:46:37 -08:00
Daniel R. Kerr
83e6bbee45
Update utility.py 
fix on radvd config file generation to support python3
 2020-02-13 00:38:45 -05:00
Huy Pham
9cd756f2dc fix merge conflict 2020-02-12 14:16:17 -08:00
Huy Pham
3a466fd463 remove custom size for custom style so that text can scale, scale the remaining node icons from the node picker, scale node's name 2020-02-12 14:13:28 -08:00
bharnden
c4f0f62206
Merge pull request #368 from gsomlo/gls-frr-staticd 
services/frr.py: frrboot.sh: start 'staticd' to support static routes
 2020-02-12 09:02:57 -08:00
bharnden
13275c59df
Merge pull request #367 from coreemu/coretk-enhance/error-dialog 
Coretk enhance/error dialog
 2020-02-12 09:01:25 -08:00
Huy Pham
b4bf3ee391 remove unecessary print statement and remove commented code 2020-02-12 08:39:10 -08:00
Huy Pham
7fbbfa8c63 scale font 2020-02-12 08:35:14 -08:00
Huy Pham
8734b9f22f attempt adding scaling function to the gui 2020-02-10 15:20:07 -08:00
Gabriel Somlo
d2fe352797 services/frr.py: frrboot.sh: start 'staticd' to support static routes 
Unlike Quagga, FRR requires 'staticd' to be running in order
to support provisioning and use of static routes in the running
configuration (e.g., 'ip route a.b.c.d/p nexthop').

Signed-off-by: Gabriel Somlo <glsomlo@cert.org>
 2020-02-09 08:45:48 -05:00
Blake Harnden
3d1692fbb3 quick fix to coreservices type hinting 2020-02-07 08:58:38 -08:00
Huy Pham
80f47a5d4c Merge branch 'develop' into coretk-enhance/error-dialog 2020-02-05 15:56:15 -08:00
Huy Pham
ee0c63e4a1 change some variable names to be more informative, add an image to error dialog 2020-02-05 15:53:14 -08:00
Huy Pham
0407645061 replace tkinter errormessage with custom create error dialog 2020-02-05 15:09:33 -08:00
Blake Harnden
6020496b6f fixed sdt issue core gui, fixed sdt message sending for python3 2020-02-05 14:40:37 -08:00
bharnden
19680bd452
Merge pull request #366 from coreemu/coretk-enhance/fix-bug 
Coretk enhance/fix bug
 2020-02-05 10:32:22 -08:00
Blake Harnden
461a27989c initial config changes for config services for openvpn 2020-02-04 17:28:58 -08:00
Blake Harnden
3b0a8ebc37 small tweak to make openvpn example server config valid 2020-02-04 17:09:54 -08:00
Huy Pham
6bb1d5cba2 add a new data to track the most recently opened/saved files, and update recent files menu as the recent files change 2020-02-04 13:49:46 -08:00
Huy Pham
e2fba18ba5 fix merge conflict 2020-02-04 13:05:08 -08:00
bharnden
9216683902
Merge pull request #354 from apwiggins/frr-service-reset-interfaces 
added reset interfaces at FRR startup
 2020-02-04 13:02:43 -08:00
Huy Pham
bdbf5fac61 add recent files to gui.yaml for keeping track of recent files 2020-02-04 13:00:00 -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
Blake Harnden
3846f2b5bd removed hard coded example recent files 2020-02-04 10:03:10 -08:00
bharnden
26a03cc758
Merge pull request #364 from coreemu/coretk-enhance/fix-bug 
Coretk enhance/fix bug
 2020-02-04 09:53:48 -08:00
Huy Pham
6140ebfb59 remove unnecessary loggings 2020-02-03 12:18:29 -08:00
Huy Pham
b7206fe7b9 Merge branch 'develop' into coretk-enhance/gui-logging 2020-02-03 12:01:58 -08:00
Huy Pham
60dd7691bf remove unecessary loggings, change less important loggings to logging.debug 2020-02-03 12:01:10 -08:00
Huy Pham
034d126a2a remove unnecessary comment 2020-02-03 10:53:24 -08:00
Huy Pham
875739e748 track nodes whose services have been modified by the user to differentiate between newly created nodes and default type nodes with empty services 2020-02-03 10:35:25 -08:00
Huy Pham
ede9e93b52 add a menu option for opening recent files, hard code some example xml files for testing 2020-02-03 09:10:46 -08:00
Huy Pham
2c6307603a Merge branch 'coretk-enhance/gui-logging' into develop 2020-02-03 07:56:10 -08:00
Huy Pham
09397925e8 remove unnecessary loggings 2020-02-03 07:54:28 -08:00
Huy Pham
5dd379a2ee replace logging.info with logging.debug for unimportant loggings, change the functions inside type checking class into classmethods 2020-02-03 07:30:25 -08:00
Blake Harnden
356bfd16b4 forward all 802.1D MAC bridge filtered MAC group addresses, except restricted types 2020-01-31 17:05:13 -08:00
Blake Harnden
a8a1643ee0 added configuration for loading custom config services 2020-01-29 17:08:36 -08:00
Huy Pham
6c89ba1abb logging.info for more important loggings and logging.debug for less important loggings that user might not care about 2020-01-29 16:08:36 -08:00
bharnden
53dd1de090
Update frr.py 
updates to generate interface up/down commands for node interfaces
 2020-01-28 13:33:34 -08:00
Blake Harnden
6aa7d2175d added file logging for coretk, using a time rotating logger, added command line arg to choose coretk log level 2020-01-28 12:30:12 -08:00
bharnden
7cc52f13d6
Merge pull request #360 from coreemu/enhancement/coretk-global-ip6 
updates for coretk to default to assigning global ip6 addresses
 2020-01-28 11:30:33 -08:00
bharnden
c911ff4c0b
Merge pull request #359 from coreemu/coretk-fix 
Coretk fix
 2020-01-28 11:21:56 -08:00
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
Blake Harnden
834ceea55d updates to sdn ovs service to use ip instead of deprecated ifconfig 2020-01-09 13:52:36 -08:00
Huy Pham
2a7a22c2ee change logging.warn to logging.warning 2020-01-09 13:10:45 -08:00
Huy Pham
3ef87a97d5 remove extra function 2020-01-09 10:12:00 -08:00
Huy Pham
41ae67b559 copy service config from other node 2020-01-09 08:54:15 -08:00
Blake Harnden
6042c6fed9 added validation checks/conversion for valid values of mac addresses and ip addresses to addaddr and sethwaddr functions 2020-01-08 20:44:15 -08:00
Blake Harnden
de493c810a changes to replace MacAddress usage and remove ipaddress module altogether 2020-01-08 17:33:49 -08:00
Huy Pham
77c59aa38f Merge branch 'develop' into coredev-serviceconfig 2020-01-08 16:55:23 -08:00
Huy Pham
55adce231e copy other nodes' custom service configuration 2020-01-08 16:48:04 -08:00
Blake Harnden
4db7f845a5 removed commented out ipaddress code 2020-01-08 14:31:57 -08:00
Blake Harnden
fd10663323 changes to replaces known usages of ipaddress, leaving only ipaddress.MacAddress 2020-01-08 13:25:00 -08:00
bharnden
c46085e716
Merge pull request #332 from coreemu/coredev-serviceconfig 
Coredev serviceconfig
 2020-01-08 11:13:52 -08:00
Huy Pham
c402ce5284 allow choosing local host machine interface for rj45 node 2020-01-08 09:32:39 -08:00
Huy Pham
615b989102 Merge branch 'develop' into coredev-serviceconfig 2020-01-07 15:36:01 -08:00
Huy Pham
1e6e3f0958 some clean up 2020-01-07 15:30:19 -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
Huy Pham
be0f170f89 add a button to more conveniently remove a node's service 2020-01-07 15:05:05 -08:00
Blake Harnden
f431254e15 initial changes towards removing ipaddress and using netaddr 2020-01-07 14:08:29 -08:00
Huy Pham
6105439ae4 color custom services green 2020-01-07 13:36:04 -08:00
Huy Pham
3ad1af8d1d enable default button in service configuration 2020-01-07 12:32:45 -08:00
bharnden
607e88585c
Merge pull request #330 from coreemu/feature/grpc-interfaces 
added get_interfaces to grpc client
 2020-01-07 12:11:43 -08:00
Blake Harnden
769572de02 added get_interfaces to grpc client 2020-01-07 12:03:51 -08:00
Huy Pham
db4d517ea8 Merge branch 'develop' into coredev-copypaste 2020-01-06 14:34:11 -08:00
Huy Pham
9369bd27b4 copy link config 2020-01-06 14:20:20 -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
3e87737ee6 updates to use tk after for backgrounded tasks, also added background task convenience class for running something in the background and running a callback using tk.after when done 2019-12-30 16:34:44 -08:00
Blake Harnden
dd43fae62a updated icons and added icon attribution to about dialog 2019-12-30 00:00:36 -08:00
Blake Harnden
ff7909e97a removed old icons 2019-12-29 23:23:35 -08:00
Blake Harnden
2be0713ed1 updated so that throughputs will update link color/width based on threshold 2019-12-27 00:32:10 -08:00
Blake Harnden
5dd08c283a updated throughput dialog to load and set values from graph class 2019-12-26 21:32:30 -08:00
Blake Harnden
3512eedc60 small tweaks to throughput config dialog 2019-12-26 14:00:22 -08:00
Blake Harnden
fe8bc6f10e removed usage of brctl and dependency on bridge-utils library as it is deprecated, replaced with using iproute instead 2019-12-23 14:48:56 -08:00
Blake Harnden
6d68034177 updated start proto to return exception strings, updated grpc start session to exist early when a failure is found, updated coretk ui to not switch ui to running when start fails and display error dialog 2019-12-20 15:11:34 -08:00
Blake Harnden
5639aeab75 Merge branch 'develop' of https://github.com/coreemu/core into develop 2019-12-20 13:31:32 -08:00
Blake Harnden
d4fae0d89e changes to fix emane config data leveraging emane prefix to work as intended 2019-12-20 13:30:55 -08:00
Huy Pham
684cb26c5c Merge branch 'develop' of https://github.com/coreemu/core into develop 2019-12-20 11:57:04 -08:00
Huy Pham
e4b44d08c1 create a rough layout for throughput config dialog 2019-12-20 11:56:51 -08:00
Blake Harnden
9f3a3cef28 update coretk gui to allow proper cancel when there is an attempt to exit a running session 2019-12-20 11:56:48 -08:00
Blake Harnden
396a948bb9 small tweak to make new has_ebtables_chain variable created in __init__ 2019-12-20 11:50:43 -08:00
bharnden
ea6ecc751d
Merge pull request #311 from coreemu/feature/init-ebtables-for-wlan-only 
feature/init-ebtables-for-wlan-only,
 2019-12-20 11:41:40 -08:00
Blake Harnden
513eaf2b76 improved coretk gui alerts to display alert text when selected, fixed merged code for adding a check to cleanup interfaces, updated session.exceptions to use enums directly 2019-12-20 10:51:52 -08:00
Blake Harnden
c0c23190d1 Merge branch 'develop' of https://github.com/coreemu/core into develop 2019-12-20 09:58:25 -08:00
bharnden
6fa67f8844
Merge pull request #313 from coreemu/feature/check-ifc-before-flush 
Feature/check ifc before flush
 2019-12-20 09:58:13 -08:00
Blake Harnden
95c57bbad6 changes to allow node container commands to leverage shell parameter when needed 2019-12-20 09:57:34 -08:00
Huy Pham
086e3316eb copy over wlan config, emane, mobility config, service config, service file config 2019-12-20 09:55:30 -08:00
Blake Harnden
a7e243ae53 update coretk-gui to use configured terminal when double clicking nodes 2019-12-19 21:28:48 -08:00
Huy Pham
9a506fc35f Merge branch 'develop' into coredev-painttool 2019-12-19 16:16:18 -08:00
Huy Pham
c1755afb2f copy node and links 2019-12-19 16:15:29 -08:00
Blake Harnden
793d340668 removed mock from setup.py.in as its not needed in python3, added formal script to run coretk gui and remove main line from core/gui/app.py 2019-12-19 11:32:59 -08:00
Huy Pham
395f8134dc adjust alert table size 2019-12-19 11:30:27 -08:00
Huy Pham
5f9a227fac Merge branch 'develop' into coredev-painttool 2019-12-19 11:14:44 -08:00
Huy Pham
f6c02973c1 fix merge conflict 2019-12-19 11:12:45 -08:00
Blake Harnden
105825808d fixed edge refactoring issue when finding next subnet 2019-12-19 11:10:08 -08:00
Huy Pham
5a81adc653 some fix one paint tool 2019-12-19 10:58:22 -08:00
Blake Harnden
05d3b58c5f updating dialog based classes to have dialog in name 2019-12-19 09:50:58 -08:00
Blake Harnden
0b5c94778c moved coretk under daemon/core/gui 2019-12-19 09:30:21 -08:00
Blake Harnden
8eb4df7b1d updated linkconfig to support asymmetric links, updated grpc start session to provide asymmetric links, since they currently depend on being processed as a link edit 2019-12-18 22:09:00 -08:00
Blake Harnden
69494b600f fixes for parsing grpc throughputs 2019-12-16 13:26:55 -08:00
Blake Harnden
44df926fb9 updated events streamed from sessions to include session id for easy identification 2019-12-16 12:21:03 -08:00
Blake Harnden
424f69bb15 updated grpc throughputs to only check a specific session and verify the data being collected and sent is for that session, fixed data from throughputs being in hex getting converted to int, updated coretk to only run throughputs when enabled, updated grpc streams to return the stream to allow it being canceled 2019-12-16 11:14:05 -08:00
Blake Harnden
85521e8c8f added grpc to get current service configurations, fixed bug for core daemon not using custom service configs 2019-12-13 18:17:42 -08:00
Blake Harnden
47cc20b567 updates to grpc event streaming, client can now listen to a subset of desired events 2019-12-13 16:11:58 -08:00
Blake Harnden
9d988a4b13 fixed issue in grpc get emane model configs that would allow key collision 2019-12-13 14:18:13 -08:00
Blake Harnden
9ada94107e changes to grpc get emane model configs to return the interface value and actual node id, instead of coded value that would need to be parsed 2019-12-13 14:03:41 -08:00
Blake Harnden
9b16f272b8 added get wlan configs, made use of it in coretk, updated node context to allow wlan config during runtime 2019-12-13 11:48:36 -08:00
Blake Harnden
b993fadedb removed grpc check for getting a node service file, it will return the default value when not currently set 2019-12-13 11:24:35 -08:00
Blake Harnden
358985d129 update to avoid not reusing session ids 2019-12-13 10:54:42 -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
d343bd0655 updated gui to display custom icons if set, updated grpc to send custon icon and image data when present 2019-12-13 08:48:40 -08:00
Huy Pham
2344e026ff check emulation light, fix one line of backend code 2019-12-12 16:17:33 -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
45a23a6c14 updated usage of time.time to time.monotonic or time.perf_counter due to time.time possibly rolling backwards 2019-12-06 09:42:41 -08:00
Blake Harnden
d1db5e4b4e added some data for node events to have a source field to help distinguish what originates from the gui or not 2019-11-27 12:55:39 -08:00
Blake Harnden
da203d578e fixed issue with node event tests when position is None 2019-11-27 09:15:19 -08:00
Blake Harnden
8b7d651d06 fixed issue with nod emobility location calculations being forced to use ints 2019-11-27 09:05:37 -08:00
Blake Harnden
ad4ee58ddd properly adding change for emane node links being wireless, fixed issue when sending emane model configs when there is no interface set 2019-11-25 15:46:32 -08:00
bharnden
52c6f2f31c fixed issue with services identifying ip4/ip6 addresses 2019-11-22 14:52:46 -08:00
Blake Harnden
df9c7308db update to avoid issue when old gui creates emane nodes without emane models 2019-11-21 17:03:18 -08:00
Blake Harnden
97cb1444f3 updates to emane model config storage, fixes to reconnecting to a wlan session 2019-11-21 16:41:38 -08:00
Blake Harnden
059b0cc316 changes to fix session adding default emane configuration 2019-11-21 12:44:50 -08:00
Blake Harnden
9445b63bd2 removed saving default configurations for wlan and mobility by default, updated session.add_node to set default configurations for wlan and emane 2019-11-21 12:29:33 -08:00
Blake Harnden
aa718817d0 updates to implement working observer widgets 2019-11-11 13:23:02 -08:00
Blake Harnden
18c9904d58 modified grpc set node service and node service file to use messages for their config, updated start session to leverage these messages to set them when starting a session 2019-11-11 10:19:30 -08:00
Jeff Ahrenholz
2d9cf81d0b remove shell=True from run command 2019-11-07 11:38:31 -08:00
Jeff Ahrenholz
ddcce82af4 address PR comments and fix pre-commit 2019-11-07 09:01:01 -08:00
Jeff Ahrenholz
5db05aad13 fix black pre-commit errors (formatting) 2019-11-07 08:57:46 -08:00
Jeff Ahrenholz
6be1e19d98 don't flush IPv6 address if interface is absent 2019-10-31 13:20:28 -07:00
Jeff Ahrenholz
85c926ff47 create ebtables chains as needed 
* otherwise every switch gets a chain, causing problems with simultaneous running Python scripts
 2019-10-31 13:00:46 -07:00
Blake Harnden
ea39f8fc6f updated corehandlers.py to no longer use threading.isAlive, which is pending deprecation 2019-10-30 15:49:08 -07: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
Blake Harnden
fe95f246d4 added grpc get/set session metadata 2019-10-30 12:01:01 -07:00
bharnden
c0516255f2 added emane model configs and mobility configs to grpc.StartSession 2019-10-29 14:40:37 -07:00
bharnden
adbab066c9 added wlan configs to grpc.StartSession 2019-10-29 13:37:37 -07:00
bharnden
de936ea315 added hook creation and set location to grpc.StartSession 2019-10-29 12:35:07 -07:00
bharnden
4e03dc6888 updates to grpc StartSession, added utility threadpool function to help improve speed when running certain tasks, made use of utility threadpool function where needed 2019-10-29 10:25:39 -07:00
bharnden
236ac7919a moved grpc utility functions into grpcutils, updated StartSession to threadpool node and link creation 2019-10-28 23:11:15 -07:00
Blake Harnden
934ea96558 changes to support a simpler start/stop session API 2019-10-28 15:18:57 -07:00
bharnden
fff281a452 removed master from corehandlers and session, since it will not be needed any more 2019-10-25 22:06:30 -07:00
bharnden
8e67294a8a changes to fix lock issues with multiple threads when stopping from gui 2019-10-24 21:17:15 -07:00
bharnden
5c12651e4e updates to session.clear to clear out all configuration data as well, updated session.shutdown to use clear, updated tests to account for this 2019-10-24 13:05:02 -07:00
bharnden
6045908a14 cleanup for test fixtures to help simplify test_gui fixture setup 2019-10-24 10:58:26 -07:00
bharnden
d28a64b53c removed todo for wireless links, since they may be used by an API, until know for sure, leaving in 2019-10-23 12:31:13 -07:00
bharnden
7366738023 updated network to network link to not look for Rj45, since that wont happen, removed unwanted grpc client function 2019-10-23 11:24:50 -07:00
bharnden
053d2a0b10 removed unused utils.hex_dump 2019-10-23 11:01:25 -07:00
bharnden
711104df64 update to move mac learning disable into wlan and hub node startup 2019-10-23 10:56:01 -07:00
bharnden
440c8ed565 updated interface.py to use python3 super() 2019-10-23 10:40:40 -07:00
bharnden
b185c3c679 updated network.py to leverage super() 2019-10-23 10:16:35 -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
bharnden
39c40d2a8c updated netif function to remove net parameter, since it was not used 2019-10-23 09:15:27 -07:00
bharnden
3dccd073f2 updated newveth and newtuntap function to remove the net parameter, since it was not being used 2019-10-23 09:02:24 -07:00
bharnden
28d1803af6 added netifi to CoreInterface, so it is defined up front 2019-10-22 23:03:03 -07:00
bharnden
945f3cce5b removed session.create_emane_network, removed unused node types 2019-10-22 21:27:31 -07:00
bharnden
14d759667c refactored session.update_node to session.edit_node to match grpc call 2019-10-22 20:55:06 -07:00
bharnden
cb81095b64 refactored NodeData and NodeOptions to use server instead of emulation_server 2019-10-22 20:50:01 -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
ce411a07d7 removed session.create_wireless_node, can be achieved simply without needing this function 2019-10-22 15:13:28 -07:00
Blake Harnden
c1bb9ed5d8 added optional custom class param for session.add_node 2019-10-22 13:15:12 -07:00
Blake Harnden
9e7b5abeb9 updated fabric commands to be hide output 2019-10-22 12:36:47 -07:00
Blake Harnden
b703ad11c6 updating command logging back to debug 2019-10-22 12:19:37 -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
0a689a3e96 updates to grpc to provide a consistent config response, mapping config ids to ConfigOptions 2019-10-22 09:57:41 -07:00
Blake Harnden
233ca92fd2 update grpc to allow for configuring and created distributed nodes 2019-10-21 12:51:38 -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
3fc0ca5cec fix to get_node over grpc to avoid issues with nodes that dont have services 2019-10-21 09:51:52 -07:00
Blake Harnden
104ac4cdc7 Merge branch 'develop' of https://github.com/coreemu/core into develop 2019-10-21 09:37:26 -07:00
Blake Harnden
d056578e9d modified ctrlnets to use an id starting at 9001, to avoid string based ids 2019-10-21 09:36:07 -07:00
bharnden
6006710c32 changed net_cmd to host_cmd and node_net_cmd to cmd, for simpler more logical naming 2019-10-18 23:28:09 -07:00
Blake Harnden
18e5598203 fixed node data reporting emulation server host instead of name 2019-10-18 16:28:13 -07:00
Blake Harnden
73b2eff312 fix for corehandlers.py session_clients access 2019-10-18 16:25:38 -07:00
Blake Harnden
83c408359a set flow id logging to debug 2019-10-18 14:56:21 -07:00
Blake Harnden
c5ce85b235 added net client get ifindex and mac functions 2019-10-18 14:22:37 -07:00
Blake Harnden
bab5c75cb9 removed unwanted logging of container env 2019-10-18 13:20:05 -07:00
Blake Harnden
5633d4d18b converted format strings to f strings 2019-10-18 12:55:35 -07:00
Blake Harnden
07b4408076 f string updates to all but services complete 2019-10-18 12:44:13 -07:00
Blake Harnden
7d2a615716 more updates to using f string 2019-10-18 10:33:31 -07:00
Blake Harnden
79cde8cd59 further f string updates 2019-10-17 19:25:52 -07:00
Blake Harnden
c9326b6a97 initial changes to use f strings 2019-10-17 18:59:50 -07:00
Blake Harnden
da946f1f56 removing builtins imports 2019-10-17 15:02:24 -07:00
Blake Harnden
6edd6a7fdb first pass at removing all python2 specific dependencies, updating python requirements.txt/setup.py/Pipfiles/Makefiles, and removing python2 compat imports 2019-10-17 14:52:31 -07:00
Blake Harnden
5d5ffb70c2 update to grpc edit_node to allow editing icon and broadcasting a node update for all to listen to a change 2019-10-17 13:00:20 -07:00
Blake Harnden
fb28741393 Merge branch 'enhancement/distributed-flask' of https://github.com/coreemu/core into enhancement/distributed-flask 2019-10-17 12:13:45 -07:00
bharnden
8a3183c8b3 Merge branch 'enhancement/distributed-flask' of https://github.com/coreemu/core into enhancement/distributed-flask 2019-10-17 12:13:26 -07:00
Blake Harnden
4746fe67ef added docs for distributed.py 2019-10-17 11:35:48 -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
0ef06a0167 added docs for session distributed commands 2019-10-17 09:32:32 -07:00
Blake Harnden
b7dd8ddb66 fix for docker/lxd based nodes to use remote servers and example for lxd 2019-10-17 09:09:03 -07:00
Blake Harnden
774dd8330c removed broker.py 2019-10-16 20:26:14 -07:00
Blake Harnden
009ce8143e removed lock for distributed commands and limited usage to uploads 2019-10-16 20:19:51 -07:00
Blake Harnden
8aef9f273f updates to clear broker from physical node 2019-10-16 17:11:21 -07:00
Blake Harnden
61a4e228a1 updated ctrlnets to assign unique addresses per server, fixed ovs command issue for interface specific commands 2019-10-16 10:14:36 -07:00
Blake Harnden
0b8bc7bd13 updated corehandlers to allow sdt snooping to help mimic previous behavior 2019-10-15 15:02:38 -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
5f282bb695 updates to lxd/docker to work with net_cmd/node_net_cmd 2019-10-14 14:28:18 -07:00
Blake Harnden
82bdbd776b removed parameter conversion for creating GreTap commands 2019-10-14 12:31:41 -07:00
bharnden
1b428c120b merged latest from develop 2019-10-12 14:39:29 -07:00
bharnden
4e4fcddd00 added grpc api for creating emane link/unlink messages, which will be sent to the gui for being added/removed 2019-10-12 08:56:39 -07:00
bharnden
eb248291a5 fix for gretap interfaces giving bad values to netclient 2019-10-12 08:10:30 -07:00
bharnden
fee56302a1 fix for wlan configuration issues 2019-10-12 08:03:20 -07:00
bharnden
2bfd050880 updated missed commands to be string based 2019-10-11 22:37:33 -07:00
bharnden
5b3308a231 updated linkconfig to use string commands, fixed issues for wlan configuration 2019-10-11 22:27:04 -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
69772f993c removed VnodeClient.icmd and VnodeClient.term 2019-10-11 13:55:06 -07:00
Blake Harnden
b5d71bab82 removed VnodeClient.popen 2019-10-11 13:36:00 -07:00
Blake Harnden
fc7a161221 updated utils.check_cmd to accept the same parameters as other commands and be leveraged for node cmds 2019-10-11 13:15:57 -07:00
Blake Harnden
d326f246a7 removed node based check_cmd, updated to use appropriate function 2019-10-11 12:57:37 -07:00
Blake Harnden
4a6d69bb09 removing cmd_output function from utils and nodes 2019-10-11 09:34:49 -07:00
Blake Harnden
c3d27eb8a5 removed utils.cmd and related node functions 2019-10-10 23:01:16 -07:00
Blake Harnden
f6cdeb23de changes to update commands to leverage either node_net_cmd/net_cmd 2019-10-10 15:25:12 -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
Blake Harnden
a4b6b8be51 updated link config to work distributed, added crude locking for fabric 2019-10-09 15:44:45 -07:00
Blake Harnden
859f473ba9 updated ebtables to use net_cmd 2019-10-09 12:13:26 -07:00
Blake Harnden
7e45168e77 distributed example for ptp 2019-10-08 21:17:15 -07:00
Blake Harnden
c8d68c332a updates for testing using examples 2019-10-08 21:06:22 -07:00
Blake Harnden
b7b0e4222c updates for basic working distrbuted network using fabric 2019-10-08 15:09:26 -07:00
Jeff Ahrenholz
0bbb686bda fix exception when trying to run Python script from GUI 2019-10-08 13:05:37 -07:00
Blake Harnden
212fec916b updated how distributed servers are added and connections are created to reduce duplicate connections 2019-10-07 11:58:27 -07:00
bharnden
4eacd815d1 updated to use fabric scp for copying files to remote nodes 2019-10-06 00:06:29 -07:00
bharnden
cca57bba47 updated other node system commands to be ran in such a way that should work if local or remote using shell commands 2019-10-05 16:10:01 -07:00
bharnden
95296988c5 updates to Pipefile.lock and for nodes to add server to constructor 2019-10-05 11:16:57 -07:00
bharnden
931ee65235 added remote_cmd func for nodes to avoid duplication 2019-10-05 09:48:30 -07:00
Blake Harnden
f83f98262f some initial remote node commands using fabric 2019-10-04 17:33:44 -07:00
Blake Harnden
cc9c0eec96 Merge branch 'develop' into enhancement/distributed-flask 2019-10-04 13:31:13 -07:00
Blake Harnden
bb98a4a77f removed circular dependency causing issues in python2 2019-10-04 12:36:15 -07:00
Blake Harnden
031517ba56 fixed base.py imports with isort 2019-10-04 09:29:10 -07:00
bharnden
7aa013d351 start to wrapping commands to support remote ssh 2019-10-03 20:38:32 -07:00
bharnden
70bb1598e1 fixed some nrl services for python3, using len(filter) 2019-10-03 13:49:26 -07:00
bharnden
478eb84786
Merge pull request #298 from coreemu/cleanup/node-client 
Cleanup/node client
 2019-10-03 12:02:24 -07:00
bharnden
6d0d183788 fixed returning output from NodeBase.net_cmd 2019-10-03 11:59:45 -07:00
Jeff Ahrenholz
6c3066e752 cherry-pick commit e56c001 for Session() instead of EmuSession() class 2019-10-02 07:55:51 -07:00
bharnden
0fe8bea25b added net_cmd to NodeBase for encapsulating network configuration commands 2019-10-01 21:06:11 -07:00
bharnden
4079df9739 added pydocs for netclient 2019-10-01 15:38:23 -07:00
bharnden
af7faa85df removed redircmd, shcmd, shcmd_result, getaddr, netifstats from VnodeClient 2019-10-01 14:40:24 -07:00
bharnden
223590c8fb removed vnode client netif stats, since was not being used 2019-10-01 12:52:25 -07:00
bharnden
d3d70ecc54 removed getaddr from node clients, since it was not being used 2019-10-01 12:30:32 -07:00
bharnden
e4bb315c14 updates to netclient, providing commonly used network commands in more convenient functions 2019-10-01 12:14:37 -07:00
Blake Harnden
a798774f18 updates to tone down warning logs to debug in broker.py and session.py 2019-09-30 12:58:13 -07:00
Blake Harnden
6b43c00031 removed xmlfilever from config, since not used 2019-09-30 10:36:27 -07:00
Blake Harnden
1fb99e8690 converted info to debug for some corehandlers logging 2019-09-30 10:06:10 -07:00
Blake Harnden
d6cf09e4b8 updated service loading to catch on_load exceptions and ignore service 2019-09-30 09:33:17 -07:00
bharnden
503fa754a9 updates to fail early for required executables that are not in PATH 2019-09-27 23:29:15 -07:00
bharnden
050297587d consolidated EmaneNode and EmaneNet, renaming EmaneNode to EmaneNet 2019-09-27 22:31:56 -07:00
Blake Harnden
b961a8a959 updated broker.py logging to not be as noisy by default 2019-09-27 15:31:19 -07:00
Blake Harnden
1277ae4686 fleshed out documentation for netclient.py and removed openvswitch.py 2019-09-27 10:48:24 -07:00
bharnden
0c002bb491 implemented net client for linux and ovs 2019-09-26 22:04:29 -07:00
bharnden
b449729a31 added net client to consolidate bridge and interface creation 2019-09-26 15:20:32 -07:00
bharnden
bdf288ff1d removed is_net_node utility to leverage isinstance as other places are consistently 2019-09-26 13:15:46 -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
939203aa46
Merge pull request #280 from coreemu/pydocupdates 
Pydocupdates
 2019-09-17 11:56:04 -07:00
bharnden
976f06dc10 removed unwanted logging line from corexml.py 2019-09-17 10:13:51 -07:00
Huy Pham
22189122e6 add text to markdown table headers, fix some return types, fix emane link 2019-09-17 09:33:55 -07:00
bharnden
b6d5f23201
Merge pull request #275 from NvanAdrichem/master 
Disable MAC learning on Wlan networks
 2019-09-16 21:55:34 -07:00
Huy Pham
b333859d86 finish up server.py and fix 2 broken links 2019-09-16 12:55:00 -07:00
Huy Pham
edcb3d3472 updates on python comments 4:20pm friday 2019-09-13 16:21:07 -07:00
Blake Harnden
c0ce07404f moved service validation to debug, to limit error messages causing confusion about failures 2019-09-13 13:26:30 -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
Huy Pham
813ddc10c6 Merge branch 'develop' into pydocupdates 2019-09-13 11:07:43 -07:00
Huy Pham
1843b5f709 further updates to python docs and docs files 2019-09-13 11:07:04 -07:00
Blake Harnden
32bfa4b2f9 fixed exception catches for get_node expecting KeyError to expect CoreError 2019-09-12 15:48:09 -07:00
Huy Pham
2bfcc9ef24 Merge branch 'develop' into pydocupdates 2019-09-12 10:24:23 -07:00
Huy Pham
b43a686d6b initial documentation improvements 2019-09-12 10:23:46 -07:00
bharnden
89fe61f312 fix for wlan configuration not getting set by default 2019-09-11 21:54:07 -07:00
bharnden
935a7da0e9 added node delete info logging 2019-09-11 15:44:15 -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
3776e1dda7 moved emane dependent tests into subdir, moved pytest config into setup.cfg, added CoreError and made use of in session.py 2019-09-11 13:12:42 -07:00
bharnden
58471b168b fixed logging changes to be python2 compatible, small change to Pipfile to support possibility of installing to python2, but python3 required for dev 2019-09-11 10:59:06 -07:00
Niels van Adrichem
09896b008e Disable MAC learning on Wlan networks 2019-09-11 15:27:55 +02:00
bharnden
dee91e97bf changes to fix flake8 issues 2019-09-10 21:01:51 -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
6d8099e8c6 added pipenv as a recommend use case for development, updated core-daemon script to allow a parameter to pass in the logging configuration 2019-09-10 13:39:36 -07:00
bharnden
527a44748d avoid bad check that prevents reverting link configuration to 0 2019-07-05 19:06:27 -07:00
Blake Harnden
2cd0f381ea updated ovs service to use fail mode secure 2019-07-19 11:35:01 -07:00
Blake Harnden
554f4a570d added check when deleting links to avoid exceptions from gui driven deletions 2019-07-19 07:46:17 -07:00
Blake Harnden
ccf5a5de60 updates to ryu service to run in a more general way avoiding the need for specific pathing and local installs 2019-07-18 08:19:51 -07:00
Blake Harnden
bcd2584eb8 grpc - add rpc to get local non-core interfaces 2019-07-12 13:02:15 -07:00
Blake Harnden
02668c9c3c grpc - initial support for container node types 2019-07-11 13:09:04 -07:00
Blake Harnden
0d24ca3387 grpc support for docker/lxc 2019-07-10 13:58:27 -07:00
bharnden
802379d763
Merge pull request #267 from coreemu/feature/new-nodes 
Adds Docker/LXD support
 2019-07-05 16:36:16 -07:00
bharnden
836133c97d reverting a change that caused switching sessions within gui to break 2019-07-05 09:00:14 -07:00
bharnden
ae5d718737 revert loss pack to using floats in all related places 2019-07-03 23:09:55 -07:00
Blake Harnden
913ca51b1c cleanup for docker/lxd code being used, tweaks to running container commands 2019-07-02 16:05:45 -07:00
Blake Harnden
9e273c2d8f small tweaks to cleanup lxd from commented out code 2019-07-02 09:51:56 -07:00
Blake Harnden
e83b38d96a initial lxd based node working from simple scripts 2019-07-02 07:48:43 -07:00
Blake Harnden
2397cd58ee integrated creation into the standard session.add_node call, currently requires an extra check due to the need for being able to specify an image 2019-06-28 15:41:55 -07:00
Blake Harnden
0e7464d419 fixed cmd to leverage wait similar to standard nodes and avoid throwing its own exceptions 2019-06-28 14:24:36 -07:00
Blake Harnden
6ab8368f1c updates to attempt to support trying to run traditional services in some manner within the context of a docker node 2019-06-28 12:58:08 -07:00
Blake Harnden
5971950523 changes to have DockerNode based off a CoreNode instead, elminating the need for a lot of boiler plate 2019-06-28 08:17:11 -07:00
Blake Harnden
9825706e03 initial commit with some docker nodes integrating with core at a basic level 2019-06-27 15:45:35 -07:00
Blake Harnden
ca10ef4e9e finished initial pass on adding tests to help run through and validate tlv message handling 2019-06-25 12:29:46 -07:00
Blake Harnden
4f4605163f fixed issues executing xml from gui, added more tests for testing message handling 2019-06-24 15:49:12 -07:00
bharnden
588a0932d3 beginning to add some tests to help verify handling different tlv messages, added delete link logic for net to node and node to net 2019-06-21 23:12:18 -07:00
Blake Harnden
05c6233908 added utility method to replace execfile for python2/3 support 2019-06-21 09:29:19 -07:00
Blake Harnden
c57089284f updates to rename utils.hash to utils.hashkey to avoid builtin conflict 2019-06-21 08:51:56 -07:00
Blake Harnden
a5f26e664a updated logic for creating tunnel keys to use a consistent hashing method, since the builtin hash is not guaranteed in python3 as it was before in python2 2019-06-20 13:22:20 -07:00
Blake Harnden
338c3a1fa1 fix to avoid sorting issue for comparinga str to an int in python3 2019-06-20 10:49:07 -07:00
Blake Harnden
b5acdf0c3d updated tests for running distributed to working order and adding simple emane case 2019-06-19 17:34:33 -07:00
Blake Harnden
407cfa5fe1 updated emanemanager to add server prefixes to control nets, when control nets are not configured 2019-06-19 13:52:51 -07:00
Blake Harnden
6270fcbc75 shifted session startup order to help ensure broker tunnels get setup before emane starts 2019-06-19 10:58:49 -07:00
Blake Harnden
14fc16832d updated long to use lon in emane code to avoid name conflicts in 2.7 2019-06-19 08:22:28 -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
0af3629ac6 corefx - fixed some issues loading xml due to grpc change, updated subnet logic to help handle loaded scenarios. grpc - fixed issue when loading network links 2019-06-15 10:42:55 -07:00
Blake Harnden
6288e11bcc grpc - fixed issue when handling wlan configurations 2019-06-14 14:14:00 -07:00
Blake Harnden
d724ee289b added dependency and usage of ethtool to disable rx/tx checksums, since they will never be valid from a veth. also lowered some noisy logging and removed other logging 2019-06-12 12:41:01 -07:00
Blake Harnden
fca79fcf94 small change for possibility of runtime mobility configuration 2019-06-11 15:55:11 -07:00
Blake Harnden
a9e622c32f fixed issue when getting wlan config range value from gui as a float string, cannot be parsed to int by python3 2019-06-11 15:27:50 -07:00
Blake Harnden
e7d12b9746 fixing mobility working in python2/3 due to using __cmp__ and node updates not being ints 2019-06-11 15:07:36 -07:00
Blake Harnden
e0dcb194cc removed duplicate code updating basic range model updates 2019-06-11 13:23:19 -07:00
Blake Harnden
38c58d9603 fixed tlv api changing wlan config during runtime, fixed for grpc as well and added grpc test 2019-06-11 13:11:36 -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
Blake Harnden
e62ae42bdc merged latest from master 2019-06-07 10:05:40 -07:00
Blake Harnden
db7bfe12bd pass on updated pydocs to reflect path changes 2019-06-07 08:59:16 -07:00
Blake Harnden
89877ffe6f updated docs for python files 2019-06-06 16:34:26 -07:00
Blake Harnden
994fe042e1 updates to just leverage broker clients instead of repeating logic for now, until broker is refactored 2019-06-06 13:02:20 -07:00
Blake Harnden
e59a8bf66d changes to add back in coresendmsg udp support 2019-06-06 11:33:22 -07:00
Blake Harnden
4381615f1d fixed issue for link data not including per/loss when it is a ptp node, for host to host links 2019-06-05 09:54:11 -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
bharnden
d1114bd804 fixed byte/str issue in coreapi tlv mac addr 2019-06-04 10:55:08 -07:00
bharnden
675dd0614d fixed bad variable name in session.py 2019-06-04 10:54:09 -07:00
bharnden
f5efecabf0 byte string fix in coreapi, different approach to urlparse compatibility to avoid other issues 2019-06-03 21:22:11 -07:00
Kevin Larson
c4c1a10f05 Added compatible idioms for configparser and queue to support both python2 and python3 2019-06-03 18:22:25 -07:00
Kevin Larson
823fda9c97 Switched write to writebytes for python3 support 2019-06-03 18:22:06 -07:00
Blake Harnden
c9baf66f3d fixed utils.cmd_output to utf-8 2019-06-03 16:49:55 -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
Blake Harnden
69b1297002 updated protobuf to use string instead of bytes for 2/3 compatibility for now, updated default service in grpc tests, fixed byte string issues for python3 in coreapi 2019-06-03 13:34:54 -07:00
Blake Harnden
7efec88e79 merged latest from develop 2019-06-03 13:06:11 -07:00
Blake Harnden
bb5e68ad8b 2/3 fixes for ip address and mac byte handling 2019-06-03 11:49:43 -07:00
bharnden
db9d13aff8 update to setparams check to avoid python3 errors, and fix to ipprefix 2019-06-02 22:53:39 -07:00
bharnden
7a0edd5927 fixed bad logic introduced into interface setparams, fixed grpc edit link test 2019-06-02 22:20:00 -07:00
bharnden
3de37f0f5e fixed basestring check for 2/3 compatibility 2019-06-02 19:23:49 -07:00
bharnden
ecc63f4abb updates to support 2/3 along with not using vcmd c extension 2019-06-02 19:06:25 -07:00
bharnden
a8061b811d grpc added get node terminal, updated corefx to leverage get node terminal to launch local terminals on double click 2019-05-31 22:20:19 -07:00
Blake Harnden
4c1d7bfb22 grpc added simple throughputs stream events 2019-05-31 14:19:23 -07:00
Blake Harnden
1890db5991 added grpc for a node command and fixed grpc unit tests 2019-05-31 11:46:47 -07:00
Blake Harnden
e063fcd4fe core-daemon now allows configuration for grpc address and port, defaults to localhost, also fixed grpc example due to enum and event changes 2019-05-30 16:31:48 -07:00
Blake Harnden
df3a8980ed grpc merged multiple event request/handlers into a singular event request for a session, which will return all events 2019-05-30 13:07:45 -07:00
Blake Harnden
2ed2b4a879 encapsulated grpc enums within messages to help provide better namespace separation due to python/c code generation 2019-05-30 08:57:24 -07:00
Blake Harnden
3e194af5ee updated all grpc variables to use more explicit naming for session/node/interface ids 2019-05-28 14:31:34 -07:00
bharnden
864c7b69a1 updated Queue and ConfigParser to use 2/3 compatible imports 2019-05-05 21:49:42 -07:00
bharnden
b58d32c156 updated socketserver to 2/3 compliant 2019-05-05 21:37:45 -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
8d6bf54a16 removed usage of longs, updated int instance checking and octal constants to be 2/3 compliant 2019-05-05 17:11:07 -07:00
bharnden
b42b5b1a5a fixed updated raised exceptions to be 2/3 compatible 2019-05-05 16:56:18 -07:00
bharnden
e58cbe9421 added future library to support python2/3, updated xrange calls to leverage builtins range 2019-05-05 16:19:12 -07:00
bharnden
e79fd6c7ce merged EmuSession and Session, small cleanup 2019-05-01 23:17:46 -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
d584bbbcb1
Merge branch 'develop' into FRR-patch-1 2019-04-24 22:56:24 -07:00
bharnden
f04d7a7185
Merge pull request #240 from apwiggins/patch-2 
Add FRR service file
 2019-04-24 22:50:29 -07:00
bharnden
6240927caa
Merge pull request #239 from apwiggins/patch-1 
Add FRR STATE DIR constant to FRR daemon
 2019-04-24 22:46:23 -07:00
apwiggins
46e58ff187
Update frr.py 2019-04-10 16:17:44 -03:00
apwiggins
840a27632d
Update frr.py to use pimd 2019-04-10 09:23:11 -03:00
apwiggins
a3c3d0c18d
Add FRR service file 2019-04-09 18:07:00 -03:00
apwiggins
49cdf80523
Add FRR constant for state directory 2019-04-09 18:05:51 -03:00
apwiggins
a6874daba8
Add FRR service file 2019-04-09 17:55:10 -03:00
apwiggins
2b82c2022c
Add FRR STATE DIR constant to FRR daemon 2019-04-09 17:53:32 -03:00
bharnden
73bc56e4c3 renamed session.session_id to session.id 2019-04-08 10:39:36 -07:00
bharnden
6672fd0f7a updates to allow configuration of installed emane_prefix for default models, requires small tweaks to custom models 2019-04-08 09:49:37 -07:00
bharnden
2825ce423b removed pydoc line, no longer needed 2019-04-07 13:08:49 -07:00
bharnden
4ade93a5a6 fixed spacing in input file for core lib 2019-04-05 22:35:38 -07:00
bharnden
747c2792a1 fixed issue with grpc server saving mac addresses on links 2019-04-05 21:25:46 -07:00
bharnden
3c8b4ab0a5 #236 fix for missing loss/per values in xml and other cases 2019-04-04 21:32:50 -07:00
bharnden
51634318a3 small codacy cleanup 2019-04-04 20:52:20 -07:00
bharnden
27ea317a57 create initial example client script for grpc and separated from within the client library 2019-03-30 19:01:11 -07:00
bharnden
2b14865473 grpc finished client doc 2019-03-30 18:51:01 -07:00
bharnden
69a4ea420c grpc futher documentation for client code 2019-03-29 23:47:20 -07:00
bharnden
5c47b0cc43 grpc updated client methods to use proto objects directly, added more docs 2019-03-29 22:12:34 -07:00
bharnden
ec1b82238e grpc fixed add node doc 2019-03-28 21:48:22 -07:00
bharnden
5161e4812a grpc updates to use proto values from client, rather than trying to squeeze in existing data types 2019-03-28 21:47:30 -07:00
bharnden
cb8630bb03 updated grpc client documentation 2019-03-26 21:41:34 -07:00
bharnden
088230515e grpc initial documentation for grpc client 2019-03-25 22:14:56 -07:00
bharnden
51d93db586 grpc updated get_node method for server and added some more test cases 2019-03-25 22:00:08 -07:00
bharnden
fdc0362ba5 updated proto enums to be prefixed with a contextual name, since they all derive from the module directly 2019-03-25 17:16:54 -07:00
bharnden
7299abd64d grpc added service/events rpc tests 2019-03-25 14:03:04 -07:00
bharnden
b15e525cc1 grpc added mobility tests 2019-03-25 12:59:07 -07:00
bharnden
d880960cf7 grpc added get/set emane config test, fixed logic for setting emane/session configs in grpc server 2019-03-24 14:13:04 -07:00
bharnden
96d38e0b40 grpc updated create link/node to use the verbage add, to align with the actual python EmuSession class 2019-03-24 13:14:39 -07:00
bharnden
6f428bd68a grpc added link tests, fixed client mac conversion 2019-03-24 13:04:18 -07:00
bharnden
01979d53ec grpc added node rpc tests 2019-03-22 21:20:37 -07:00