Commit graph

1453 commits

Author SHA1 Message Date
Huy Pham
04d7bb6265 Merge branch 'develop' into coretk-enhance/add-more-error-dialog 2020-02-24 10:33:37 -08:00
bharnden
8b544d98d8
Merge pull request #374 from coreemu/coretk-enhance/wlanlink-runtime-deletion
Coretk enhance/wlanlink runtime deletion
2020-02-24 10:30:30 -08:00
Blake Harnden
795e5a0c2c Merge branch 'develop' into enhancement/xy-to-lonlat 2020-02-21 17:17:39 -08:00
Blake Harnden
afb0fe8b46 avoid sending sdt 2 updates for emane location event, avoid not using lon,lat,alt if any value is 0 2020-02-21 17:17:09 -08:00
Blake Harnden
f1a7c10e91 Merge branch 'develop' into enhancement/xy-to-lonlat 2020-02-21 16:43:18 -08:00
Blake Harnden
a3c7ed8012 update emaneevent logging to debug, fixed emaneevent thread stop logic, fixed node data conversion for lon,lat,alt values 2020-02-21 16:42:23 -08:00
Blake Harnden
95c32ddd28 initial geo location conversion using pyproj 2020-02-21 15:54:55 -08:00
Huy Pham
3a2da0282f display error dialog when start session fails 2020-02-20 15:46:18 -08:00
Huy Pham
2a8f689ad5 remove extra code 2020-02-20 11:26:48 -08:00
Huy Pham
e90eff578e reset variable 2020-02-20 11:16:26 -08:00
Huy Pham
08d4bf98c7 fix merge conflict, add a logging error to temporarily solve issue removing a wireless link when multiple wireless links exist 2020-02-20 10:47:59 -08:00
Huy Pham
83842fe9be Merge branch 'develop' into coretk-enhance/scaling 2020-02-20 10:03:19 -08:00
Huy Pham
20be527add remove extra code 2020-02-20 10:02:13 -08:00
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
bharnden
540e1b46d8
Merge pull request #365 from coreemu/coretk-enhance/gui-logging
Coretk enhance/gui logging
2020-02-04 09:52:55 -08:00
Blake Harnden
bc79d31d40 Merge branch 'develop' of https://github.com/coreemu/core into develop 2020-02-04 09:48:54 -08:00
Blake Harnden
866e13e0ef removed usage of iperf in examples, to remove need of another dependency, renamed parser module examples used to avoid conflict with std library module 2020-02-04 09:48:37 -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
8c4931819b added service update script to help transition older services for use in core 2020-01-31 10:13:24 -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
bc2fb628cc updates to Pipefiles, requirements.txt, and setup.py to account for addition of mako dependency 2020-01-24 17:12:14 -08:00
Blake Harnden
b02f2251cd added config service template files to MANIFEST file for core daemon 2020-01-24 16:32:36 -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
54994f4c96 change back to INFO mode 2020-01-08 16:59:04 -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
c7c3b1e3be updated requirements.txt 2019-12-29 23:01:29 -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
9dd42e0359 changes to daemon setup.py to support including gui data files 2019-12-19 21:29:10 -08:00
Blake Harnden
a7e243ae53 update coretk-gui to use configured terminal when double clicking nodes 2019-12-19 21:28:48 -08:00
Blake Harnden
eb7d81614e set pillow logging to ERROR for coretk-gui 2019-12-19 21:28:17 -08:00
Blake Harnden
a674f5bf78 update python install makefiles to avoid forcing site-packages 2019-12-19 17:27:57 -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
298cd2c9d3 small update to devguide, updates to READMEs for LXD and Docker 2019-12-19 12:32:30 -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
f5ce7b1d31 updated requirements.txt with gui packages 2019-12-19 09:37:49 -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
47e087b365 fixed unit tests for grpc get emane model configs 2019-12-13 15:28:22 -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