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
Blake Harnden
7574765305
updates to Pipfiles and requirements.txt for pyproj dependency
2020-02-26 12:18:55 -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
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
