Commit graph

845 commits

Author SHA1 Message Date
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
c262778209 just use setuptools in setup.py 2019-06-04 21:49:44 -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
86ada3da0b updated requirements.txt to latest tested 2/3 environment and updated setup.py to reflect current dependencies 2019-06-04 15:41:15 -07:00
bharnden
f78736ebfd updated coresendmsg and core-manage to be 2/3 compliant 2019-06-04 14:42:40 -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
40176e861d fixed unit test for vnode client, due to changes using python directly 2019-06-02 22:31:23 -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
b3aaa870eb Merge branch 'develop' of https://github.com/coreemu/core into develop 2019-05-28 14:33:10 -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
f1d440488c
Merge pull request #249 from coreemu/corefx-grpc
Adding corefx using grpc client
2019-05-28 13:07:00 -07:00
Kevin Larson
83e883ee13 Removed instances of old nrl mailing list 2019-05-28 10:59:34 -07:00
bharnden
a593289f1b initial commit supporting converting corefx to using grpc from previous rest client 2019-05-25 10:16:50 -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
5b7453b906 updated caught exceptions to be 2/3 compliant 2019-05-05 16:58:08 -07:00
bharnden
b42b5b1a5a fixed updated raised exceptions to be 2/3 compatible 2019-05-05 16:56:18 -07:00
bharnden
feebd8704f updated all print calls to use print() method for 2/3 2019-05-05 16:52:55 -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
apwiggins
54f1d9aefd
Add FRR search paths 2019-04-09 17:50:16 -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
b518105e5f updated link test due to change on what get_node_count returns 2019-04-06 23:06:35 -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
34678ff48f updated requirements.txt to add grpcio library 2019-04-04 20:25:23 -07:00
bharnden
315e9b9cd3 updated core url to reference github 2019-03-30 21:19:00 -07:00
bharnden
1bf53cfd03 small cleanup to grpc switch example 2019-03-30 21:05:50 -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
0677a5c718 updated makefiles to build/clean protobuf files 2019-03-26 08:58:29 -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
03c221efa9 grpc added all emane rpc tests 2019-03-25 11:52:16 -07:00
bharnden
bfd5f5b5ac Merge branch 'develop' into grpc 2019-03-25 11:11:48 -07:00
bharnden
51217e509b updated version to 5.2.1, updates to make version bumps easier, and updated changelog 2019-03-25 10:44:47 -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
6d79014aad grpc added wlan rpc tests 2019-03-24 13:48:27 -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
782b9d5ce6 grpc added hook and xml rpc tests 2019-03-22 21:44:16 -07:00
bharnden
01979d53ec grpc added node rpc tests 2019-03-22 21:20:37 -07:00
bharnden
9b237a2413 grpc made common method for node links 2019-03-22 21:06:10 -07:00
bharnden
cb62750b60 grpc further cleanup of server code 2019-03-22 17:07:54 -07:00
bharnden
1c00834f23 grpc cleared out usage of update_proto in server code 2019-03-22 16:16:30 -07:00
bharnden
4a6a462d48 grpc updated client to leverage constructors throughout and remove update_proto 2019-03-22 15:11:40 -07:00
bharnden
5c2521bc12 grpc cleaned up session rpc calls to leverage proto constructors 2019-03-22 14:32:39 -07:00
bharnden
c6cfe1a8f4 grpc update to get session and get sessions 2019-03-22 14:02:18 -07:00
bharnden
1f3e72e014 grpc create session can now specify id, updated all session proto to use SessionState for state, added suite for session testing for grpc 2019-03-22 13:45:53 -07:00
bharnden
3498a59ed5 grpc added initial tests and fixture to support them 2019-03-21 23:29:26 -07:00
bharnden
0c0ff95fb6 grpc added listen to server class and updated server/client to specify grpc in their names 2019-03-21 22:56:33 -07:00
bharnden
16d9009c3f grpc added convenience methods for starting streams, updated logic for bailing out on streams and allow handling them better 2019-03-20 22:11:09 -07:00
bharnden
8009a18a1c grpc added debug logs for all requests 2019-03-19 21:43:11 -07:00
bharnden
6b8857328e grpc updated and dixed exception events to working order 2019-03-19 21:26:06 -07:00
bharnden
84ff1f4275 grpc added client disconnect detection for streams 2019-03-18 22:32:01 -07:00
bharnden
e282b3b8f8 grpc added link events 2019-03-18 21:46:27 -07:00
bharnden
8ee1db5dc8 grpc added config, exception, and file event streams 2019-03-17 23:29:38 -07:00
bharnden
f60a6720f0 grpc added specific grpc aborts for node/session not being found 2019-03-17 15:53:29 -07:00
bharnden
a07b0c8919 grpc added mobility get configs, get config, set config, and action 2019-03-17 15:28:51 -07:00
bharnden
9185c6b8eb grpc added set node service, set node service file, set session options 2019-03-16 21:40:15 -07:00
bharnden
a62a03e6b9 grpc added node service file and service action 2019-03-16 20:53:26 -07:00
bharnden
f24376d66c grpc added node/session event streaming requests 2019-03-16 13:48:25 -07:00
bharnden
d9ae7d5c34 grpc added standard connect/close along with context connect 2019-03-16 12:57:59 -07:00
bharnden
9c973249e8 grpc added get wlan and set wlan config 2019-03-16 12:48:37 -07:00
bharnden
5d72b6af26 grpc added get hooks and add hook 2019-03-16 12:33:24 -07:00
bharnden
8559b425ee grpc added set emane and emane model configs 2019-03-15 22:03:37 -07:00
bharnden
641427671c grpc added get emane models, model config, and model configs 2019-03-15 21:38:29 -07:00
bharnden
5753c91906 grpc added get/set service defaults and get node service data 2019-03-14 22:33:10 -07:00
bharnden
0c20e76630 grpc added save/open xml, fixed session.get_node_count(), fixed issue with grpc get session options 2019-03-02 13:44:27 -08:00
bharnden
0ccf5a7456 updated core-daemon to use argparse and formally added ovs and grpc flags 2019-03-02 13:04:55 -08:00
bharnden
44f70d0c2e grpc added get node links, get services, get emane config 2019-03-01 22:14:16 -08:00
bharnden
460e5c04d0 grpc added get/delete node, create/edit/delete link apis 2019-02-26 14:34:52 -08:00
bharnden
6016152490 added grpc create/edit node calls 2019-02-25 22:45:57 -08:00
bharnden
ad7522b5bc grpc added delete session and set session state apis 2019-02-24 08:15:33 -08:00
bharnden
fcff9e4551 grpc added create session and set session location 2019-02-24 07:44:41 -08:00
bharnden
e819b706bc grpc support for get session options and location 2019-02-20 21:19:35 -08:00
bharnden
b573eb641e grpc updates to provide link data within a session query 2019-02-19 23:32:04 -08:00
bharnden
7aed803aae added grpc api to core-daemon, added get sessions and get session rpc calls 2019-02-18 22:54:14 -08:00
bharnden
e72f133488 added proto makefile to repo 2019-02-17 23:42:57 -08:00
bharnden
0a445f2706 initial files to support grpc server/client 2019-02-17 23:41:30 -08:00
bharnden
9b1141a135 fixes issue saving/loading rj45 nodes to xml 2019-02-17 10:18:23 -08:00
bharnden
7aee2b2ba7 updated logging usage, to use the library directly and avoid imposing a core config by default, allowing users of the core library to configure logging as desired 2019-02-16 09:50:19 -08:00
bharnden
37f747c212
Update coreapi.py
fixed get_tlv using enumerated type instead of value
2019-02-12 20:38:00 -08:00
bharnden
b8441bdd2b
Update mobility.py to set default wlan bandwidth to 54,000,000 2018-11-20 13:54:31 -08:00
bharnden
03d0e90db5
Merge pull request #198 from coreemu/bugfix/reduce-default-core-daemon-logging
quiet core-daemon by replacing warn messages with debug
2018-11-14 15:26:50 -08:00
bharnden
a7bc7500fb
Merge branch 'master' into cleanup/codacy-cleanup 2018-10-18 16:21:05 -07:00
bharnden
419b90bad6 removed unused import in corexml.py 2018-10-18 16:18:27 -07:00
bharnden
1aa0e78cdf Merge branch 'master' of https://github.com/coreemu/core 2018-10-18 16:10:28 -07:00
bharnden
91fc852db1 removed unwanted logging in xml generation 2018-10-18 16:08:04 -07:00
bharnden
6dbce144f9 fixed issue with node positions being set to none, when a position is not provided in an update message 2018-10-18 16:01:42 -07:00
bharnden
f5da989eca
Merge pull request #203 from coreemu/bugfix/fix-dhcp-service-under-ubuntu1804
fix DHCP server service to work under Ubuntu 18.04
2018-10-16 11:26:31 -07:00
Jeff Ahrenholz
8f8ca04562 codacy: fix trailing whitespace 2018-10-16 10:15:04 -07:00
bharnden
934d7a0764 couple changes for cleanup in perflogserver.py and daemon/setup.py 2018-10-15 08:33:06 -07:00
bharnden
b37eb2fe74 updated xml tests and removed unused xml code 2018-10-11 21:22:57 -07:00
bharnden
01004d5ab9 cleanup on broker.py and README.md 2018-10-11 21:03:46 -07:00
bharnden
12cc40d3d3 cleaned up core.emane, core.services, core.xml, fixed bug introduced in coreobj.py 2018-10-11 17:26:34 -07:00
bharnden
eb04e0a79f cleanup for core.misc and core.netns 2018-10-11 16:01:17 -07:00
bharnden
05a5574155 cleanup of core.api, core.emulator, core.pnodes 2018-10-11 14:49:22 -07:00
bharnden
aa91bb67a1 cleanup of files in root core module 2018-10-11 13:28:02 -07:00
bharnden
e43d42f16b
Merge pull request #201 from coreemu/bugfix/handle-node-privatedir-exceptions-gracefully
log warning when node.privatedir() raises an exception
2018-10-10 15:26:47 -07:00
bharnden
2e1bd23cce #201 small changes to adapt to new error style and catch specific exceptions that may arise 2018-10-10 15:21:26 -07:00
bharnden
eafaa100c3
Merge pull request #200 from coreemu/bugfix/fix-core-cleanup-killall
fix core-cleanup script to invoke killall correctly
2018-10-10 15:04:26 -07:00
bharnden
7232ac5a5d
Merge pull request #199 from coreemu/feature/nat-service
add a source NAT service using iptables masquerade
2018-10-10 14:55:08 -07:00
bharnden
ca107a3207 #199 small tweaks to be consistent with rest of code 2018-10-10 14:49:51 -07:00
Jeff Ahrenholz
2e507d7d41 clean up daemons/src/Makefile.am left over from move to netns dir 2018-10-10 11:48:29 -07:00
Jeff Ahrenholz
853ae94d52 fix DHCP server service to work under Ubuntu 18.04 2018-10-10 10:11:32 -07:00