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

1162 commits

Author SHA1 Message Date
Blake Harnden
5cdfd8d8b9 updated NodeTypes to be used directly 2020-03-10 23:11:37 -07:00
Blake Harnden
f277e96c9a revert logging back to info, removed Rj45Models enum as it was not being used, updated linktypes enum to be used directly 2020-03-10 22:48:05 -07:00
Blake Harnden
1e8d1ecd9f changes for sessions to use EventTypes for state/hooks directly 2020-03-06 22:35:23 -08:00
Blake Harnden
0e299d5af4 update to make use of shutil.which for executable searching 2020-03-06 16:41:26 -08:00
Blake Harnden
6b5cd95ac2 small updates to new gui exception dialog, fixed error checking and setting interface mac addresses 2020-03-05 21:38:52 -08:00
Blake Harnden
f826a4c5e8 new gui fixed error display when daemon is not running 2020-03-04 20:42:40 -08:00
Blake Harnden
c4234d33f0 updates to allow new gui to recreate session to continue where it left off 2020-03-04 20:09:56 -08:00
bharnden
f2da8dc2c9
Merge pull request #403 from coreemu/coretk-enhance/fix-bugs 
Coretk enhance/fix bugs
 2020-03-04 14:55:10 -08:00
Blake Harnden
be37f0f279 updates in new gui to allow empty ip4/ip6 addresses, fixed display issues related to empty addresses 2020-03-04 14:39:28 -08:00
Huy Pham
95d36a1792 fix merge conflict 2020-03-04 14:27:29 -08:00
Huy Pham
f50c1e4db4 keep track of opened, saved file to appropriately prompt save xml when needed, add Save As menu option 2020-03-04 14:15:02 -08:00
bharnden
d076229973
Merge pull request #399 from coreemu/coretk-enhance/execute-xml-script 
Coretk enhance/execute xml script
 2020-03-04 13:59:32 -08:00
Blake Harnden
34895c1f9c changes for initial gui setup and discovery of the terminal program to use, avoid using TERM env variable 2020-03-04 13:30:01 -08:00
Huy Pham
7dee59e86e New Session command deletes the current session if it is not in runtime else prompt save running session, and then creates the new session 2020-03-04 13:25:22 -08:00
bharnden
fd2a5ec290
Merge pull request #398 from coreemu/bugfix/fix-terms-list-typo 
fix typo in DEFAULT_TERMS make gnome-terminal work
 2020-03-04 12:12:37 -08:00
Huy Pham
b72ce6a66c allow editable Edit - Preferences - Terminal 2020-03-04 11:49:09 -08:00
Blake Harnden
0d4a86f10e updated new gui to properly update modified addresses for nodes, added validation for ip4/ip6, fixed redrawing edge labels when node addresses change 2020-03-04 11:38:24 -08:00
Jeff Ahrenholz
52689bd210 fix typo in DEFAULT_TERMS make gnome-terminal work 2020-03-04 11:23:21 -08:00
Huy Pham
6ce29bea75 fix merge conflict 2020-03-04 11:14:20 -08:00
Blake Harnden
4093b2244a fixed new gui removing marker annotations when creating new sessions 2020-03-03 22:38:03 -08:00
Blake Harnden
539ca5d22c added docker/lxc to xml read/write, fixed icon retrieval for docker/lxc in new gui 2020-03-03 22:27:02 -08:00
bharnden
7c8e115bc7
Merge pull request #383 from coreemu/coretk-enhance/disable-runtime-editing-custom-service-config 
Coretk enhance/disable runtime editing custom service config
 2020-03-03 12:54:47 -08:00
bharnden
020a13bde6
Merge pull request #386 from coreemu/coretk-enhance/scaling 
Coretk enhance/scaling
 2020-03-03 12:49:16 -08:00
Huy Pham
ea341cbe45 set the initial directory of executing python scripts to HOME_PATH/scripts 2020-03-02 14:08:11 -08:00
Huy Pham
9cd6166b9b use varaibles that represent smallest and largest allowed scale value to replace float numbers 2020-03-02 11:20:00 -08:00
Huy Pham
58cb5a1a1d add a scrollbar next to scale entry to allow scale adjustment in increments of a specific value (since the Scale Slider widget does not support this) 2020-03-02 11:02:54 -08:00
Huy Pham
933f409498 adjust node text and edge text to scale not as fast as other components 2020-03-02 10:18:37 -08:00
Blake Harnden
ff3b20a962 modifications to support optional geo position edits for nodes and to account for geo updates to sdt 2020-03-02 10:01:36 -08:00
Huy Pham
b0a3c85f0e allow editable scale field for manually setting the app scale value 2020-03-02 09:56:57 -08:00
Huy Pham
a7fa0bf6d3 use a bigger size font for alert button text to see the scaling effect more easily 2020-03-02 09:17:35 -08:00
Huy Pham
dfc24e107f use grpc method to execute python script, redraw canvas and reset session data 2020-03-02 09:01:03 -08:00
Huy Pham
c1f0e385b4 Merge branch 'develop' into coretk-enhance/execute-xml-script 2020-02-28 12:52:29 -08:00
Blake Harnden
9535d40b70 added grpc call to execute python script, to replicate prior gui functionality 2020-02-28 12:28:41 -08:00
Blake Harnden
67da3e5c22 changes to move sdt calls internal to core interactions, which allows it to work with both guis 2020-02-27 21:39:18 -08:00
Huy Pham
848cda03f7 design execute python file dialog 2020-02-27 15:24:36 -08:00
Huy Pham
f8a3f0a2d4 Merge branch 'develop' into coretk-enhance/disable-runtime-editing-custom-service-config 2020-02-27 11:00:09 -08:00
Huy Pham
1cba11d9e0 clean up more code, click defaults in service configuration correctly reset files tab as well as directories tab 2020-02-27 10:57:22 -08:00
Huy Pham
c36f060d44 fixed wrong variable used for configuring service in grpcutils, add/delete directories for node's service configuration, clean up some old code 2020-02-26 15:43:31 -08:00
Blake Harnden
20e3fbc7d9 modify execute python script handling for old gui to wait for script to complete before looking for new session to avoid possible race conditions 2020-02-26 15:39:37 -08:00
Blake Harnden
e1c9155ba7 simplify thread daemon usage 2020-02-26 15:29:19 -08:00
Blake Harnden
21dfaf7d66 avoid initializing emane event service twice 2020-02-26 14:34:35 -08:00
Huy Pham
764a61e89e create layout for service config - directory tab 2020-02-26 10:43:01 -08:00
Huy Pham
696fda00ea add/delete custom service file to node 2020-02-26 08:31:28 -08:00
Blake Harnden
b5b51794d8 update pyproj logic to use formal transformers, added altitude to conversion debug logging 2020-02-25 21:26:41 -08:00
Blake Harnden
32efc75c64 removed legacy location translation 2020-02-25 20:40:51 -08:00
Blake Harnden
909f231c13 Merge branch 'develop' into enhancement/xy-to-lonlat 2020-02-25 13:14:34 -08:00
Huy Pham
41bb951531 Merge branch 'develop' into coretk-enhance/disable-editing-during-runtime 2020-02-25 11:39:50 -08:00
Huy Pham
014707580f allow custom service file to be created 2020-02-25 11:38:58 -08:00
Blake Harnden
177f27372e fixed wrong variable used for configuring service in grpcutils 2020-02-25 11:30:26 -08:00
Blake Harnden
db0f984401 Merge branch 'develop' into enhancement/xy-to-lonlat 2020-02-24 14:00:43 -08:00
Huy Pham
8a0257d130 disable copy/paste/delete shortcuts as well as commands during runtime state 2020-02-24 12:51:47 -08:00
Huy Pham
7a50f6ac25 replace hasattr with getattr for cleaner code 2020-02-24 11:24:59 -08:00
Huy Pham
1dca477e6d disable delete, copy, paste during runtime 2020-02-24 11:17:06 -08:00
Huy Pham
ddaba7c477 remove code for deleting wireless links and nodes during runtime 2020-02-24 10:58:01 -08:00
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
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