aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-enrollment' into 'master' Sander Vrijders2017-04-244-32/+47
|\
| * model, prototypes: enrollment lists contain IPCP objects rather than Node onesVincenzo Maffione2017-04-214-32/+47
|/
* model: compute IPCPs before the list enrollmentVincenzo Maffione2017-04-211-1/+1
* setup.py: add #! headerVincenzo Maffione2017-04-211-0/+2
* prototypes: irati: use python built-in sleep function for sleepingVincenzo Maffione2017-04-211-1/+2
* testbeds: qemu: minor rearrangements on log printsVincenzo Maffione2017-04-211-9/+9
* testbeds: qemu: remove -nographic optionVincenzo Maffione2017-04-211-2/+1
* irati, rlite, qemu: remove unnecessary banners in log outputVincenzo Maffione2017-04-213-16/+16
* Merge branch 'logging' into 'master' vmaffione2017-04-2111-186/+262
|\
| * rumba: log: Reformatting logs in order to 'save screen real estate'Marco Capitani2017-04-211-2/+8
| * rumba: log: Simplified configuration, small fixesMarco Capitani2017-04-214-42/+22
| * Merge branch 'master' into logging (split merged)Marco Capitani2017-04-217-56/+90
| |\ | |/ |/|
* | prototypes: rlite: minor naming changeVincenzo Maffione2017-04-211-17/+14
* | Merge branch 'split' into 'master' vmaffione2017-04-217-46/+87
|\ \
| * | model: Split experiment run()Sander Vrijders2017-04-217-46/+87
| | * rumba: log: Added logging support, migrated from print to logging.Marco Capitani2017-04-2111-166/+260
| |/ |/|
* | Merge branch 'jfed-image' into 'master' vmaffione2017-04-201-1/+12
|\ \ | |/ |/|
| * testbeds: jfed: Add support for custom imageSander Vrijders2017-04-201-1/+12
|/
* build: Fix setup.pySander Vrijders2017-04-201-1/+1
* Fix README.md listsSander Vrijders2017-04-201-16/+15
* Fix gitlab specific rendering of markdownSander Vrijders2017-04-201-11/+11
* Update README.mdSander Vrijders2017-04-201-18/+19
* Merge branch 'readme' into 'master' vmaffione2017-04-202-28/+97
|\
| * Update READMESander Vrijders2017-04-202-28/+97
|/
* prototypes: irati: more readable output on enroll messagesVincenzo Maffione2017-04-191-2/+2
* irati: remove input() callVincenzo Maffione2017-04-191-1/+0
* Merge branch 'irati-issues' into 'master' vmaffione2017-04-193-35/+57
|\
| * Fixes for issues #4 and #5 (irati plugin and vlans)Marco Capitani2017-04-193-35/+57
* | Merge branch 'wget-jfed' into 'master' vmaffione2017-04-192-3/+18
|\ \ | |/ |/|
| * testbeds: jfed: Download jFed CLI if not foundSander Vrijders2017-04-142-3/+18
* | qemu: minor fixes to print() statementsVincenzo Maffione2017-04-151-16/+14
* | prototypes: irati: remove run_experiment methodVincenzo Maffione2017-04-151-7/+4
* | Merge branch 'master-marco' into 'master' vmaffione2017-04-1519-93/+1570
|\ \
| * | Implemented several comments on MR 22:Marco Capitani2017-04-144-85/+107
| * | Tester: moving example .conf filesMarco Capitani2017-04-1412-0/+0
| * | IRATI: moved generated conf files in IRATI_conf folderMarco Capitani2017-04-141-7/+21
| * | Bugfixing for IRATI prototype and QEMU testbedMarco Capitani2017-04-1418-163/+863
| * | Realign with master (MR 29-30)Marco Capitani2017-04-143-6/+13
| |\ \
| * \ \ QEMU: ifname compilation and vm port activationMarco Capitani2017-04-145-206/+400
| |\ \ \
| * | | | IRATI prototype: bootstrap_network method. Now complete & to be tested.Marco Capitani2017-04-132-20/+132
| * | | | Merge branch 'master' into master-marcoMarco Capitani2017-04-1210-57/+172
| |\ \ \ \
| * | | | | Resolving node_id issue and general cleanupMarco Capitani2017-04-114-108/+157
| * | | | | Testing method fixMarco Capitani2017-04-112-8/+6
| * | | | | IRATI config file generationMarco Capitani2017-04-114-13/+535
* | | | | | Merge branch 'proxycmd' into 'master' vmaffione2017-04-143-3/+21
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'master' into proxycmdSander Vrijders2017-04-132-8/+11
| |\ \ \ \ \
| * | | | | | rumba: Add ProxyCommand for jFedSander Vrijders2017-04-133-3/+21
* | | | | | | Merge branch 'rlite' into 'master' Sander Vrijders2017-04-141-11/+76
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge branch 'master' into rliteVincenzo Maffione2017-04-131-1/+1
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | model: avoid printing policies in __repr__Vincenzo Maffione2017-04-131-1/+1
| |_|/ / / / |/| | | | |