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

1158 commits

Author SHA1 Message Date
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
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
Blake Harnden
d5b2edb6ab fixed unit tests for broadcasted exceptions to use proper values 2019-12-12 21:10:30 -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
Huy Pham
a789498f5c updates 2019-11-07 08:30:49 -08:00
bharnden
5d6d22c6eb updated config frame widget to draw tabs for each config group 2019-11-06 22:41:05 -08:00
Huy Pham
20637da140 change to appropriate toolbar when join session, emane config, emane model config 2019-11-05 14:25:25 -08:00
Huy Pham
bdf13ca037 Merge branch 'develop' into coretk-config 2019-11-01 08:49:33 -07: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
Huy Pham
ef213dc66f Merge branch 'develop' into coretk-config 2019-10-30 13:34:56 -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
Blake Harnden
77c7bf798e changes to tests to fix session fixture not being master and updated emane xml config test to use a valid value 2019-10-25 15:32:12 -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
dc27fadb10 added distributed tests based on new distributed, removed old distributed tests and fixture to support it 2019-10-24 11:52:25 -07:00
bharnden
c255625d2f removed skipping TestCore:test_mobility 2019-10-24 11:20:38 -07:00
bharnden
6045908a14 cleanup for test fixtures to help simplify test_gui fixture setup 2019-10-24 10:58:26 -07:00
bharnden
27be86f175 fixed unwanted patcher in test fixture 2019-10-24 09:26:28 -07:00
bharnden
4a6a87b931 updates to how test fixtures are created 2019-10-24 09:06:14 -07:00
bharnden
ade1d980a8 updates to speed up tests 2019-10-23 23:15:19 -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
Huy Pham
b097028a4a Merge branch 'develop' into coretk-create-node 2019-10-22 13:20:34 -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
Huy Pham
0e036ddca9 Merge branch 'develop' into coretk-create-node 2019-10-21 16:56:59 -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
630b44627c updated distributed python examples a bit to clean things up 2019-10-21 11:36:59 -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
2012105df0 updated core.conf to contain distributed address and grpc configurations 2019-10-18 14:43:36 -07:00
Blake Harnden
e298a2a5c1 grpc will now always be ran, but can be configured through command line or core.conf 2019-10-18 14:28:50 -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