1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-18 22:38:07 +00:00
Commit Graph

3229 Commits

Author SHA1 Message Date
Julien Duponchelle
03af9bd621
Sync appliances 2017-07-17 11:43:49 +02:00
Jeremy Grossmann
3487b657a7 Merge pull request #1125 from GNS3/docker_filters
Filter support for Docker
2017-07-13 13:22:22 +07:00
Julien Duponchelle
23c3d32e06
Filter support for Docker
Fix #1110
2017-07-12 19:44:15 +02:00
Julien Duponchelle
f557ec4bda
Fix regression in docker introduce by 2.0 merge 2017-07-12 17:59:29 +02:00
Jeremy Grossmann
cf3b668cf1 Merge pull request #1124 from GNS3/filters_qemu
Qemu support for packet filtering
2017-07-12 21:57:15 +07:00
Julien Duponchelle
e8a35ac41f
Interface ending with -nic are special ethernet interface
It's libvirt internal stuff

Fix #1114
2017-07-12 16:13:46 +02:00
Julien Duponchelle
03f8c747cc
Qemu support for packet filtering
Fix #1112
2017-07-12 14:50:33 +02:00
Julien Duponchelle
53c4cba1f6 Merge pull request #1117 from GNS3/remove_use_ubrige
Remove use_ubridge flag
2017-07-12 12:46:24 +02:00
Julien Duponchelle
9e2759a3f2 Merge branch '2.1' into remove_use_ubrige 2017-07-12 12:46:10 +02:00
Jeremy Grossmann
9d8a8c95f6 Merge pull request #1123 from GNS3/filters_dynamips
Support packet filtering for Dynamips
2017-07-12 17:23:34 +07:00
Julien Duponchelle
86f1201276
Support packet filtering for dynamips
Fix #1109
2017-07-12 12:08:02 +02:00
Julien Duponchelle
4a55a367e3
Missing file in previous commit 2017-07-12 11:42:37 +02:00
Julien Duponchelle
cf17176bfc
Fix recreate a link with dynamips
Fix #1122
2017-07-12 11:34:44 +02:00
Jeremy Grossmann
2e592d3199 Merge pull request #1121 from GNS3/bfp_filter
BPF filter support
2017-07-12 16:22:01 +07:00
grossmj
b37f9eb4f0 Update schema for BPF filter. 2017-07-12 16:21:11 +07:00
Julien Duponchelle
7c6ffb3f49
Update error message when invalid aiohttp 2017-07-12 10:57:03 +02:00
Julien Duponchelle
4a05a4f7c5
Fix virtualbox links 2017-07-12 10:32:02 +02:00
Jeremy Grossmann
114b137b02 Merge pull request #1120 from GNS3/aiohttp_2.2
Upgrade to last aiohttp version
2017-07-12 15:20:02 +07:00
Julien Duponchelle
66d5d34877
Fix qemu hotlink 2017-07-12 10:07:21 +02:00
Julien Duponchelle
04303ca00c
Fix VPCS ubridge usage 2017-07-12 09:55:23 +02:00
Julien Duponchelle
fd0770158c
Fix tests with Yarl 0.11 2017-07-12 09:34:40 +02:00
grossmj
5747aba83c Update error message to require aiohttp 2.2 2017-07-12 13:34:18 +07:00
Julien Duponchelle
c8155aa14f
Upgrade Yarl 2017-07-12 08:27:49 +02:00
Julien Duponchelle
5f874cca2c
Merge branch 'master' into 2.1 2017-07-11 19:02:35 +02:00
Julien Duponchelle
fc87871d46
Fix a bug in docker binary message handling 2017-07-11 19:00:29 +02:00
Julien Duponchelle
699ecb7c89
Merge branch 'master' into 2.1 2017-07-11 18:59:50 +02:00
Julien Duponchelle
8a8de1e2df
BPF filter support
Fix https://github.com/GNS3/gns3-gui/issues/765
2017-07-11 17:30:29 +02:00
Jeremy Grossmann
d525f721a6 Merge pull request #1119 from GNS3/fix_random_snap_failure
Test if a snapshot name already exists
2017-07-11 21:28:15 +07:00
Julien Duponchelle
357de50a1b
Upgrade to last aiohttp version 2017-07-11 15:59:09 +02:00
Julien Duponchelle
450c089b6d
Test if a snapshot name already exists
This fix random test failure when testing snapshots. It
seem under high load sometimes the previous snapshot folder
was not visible on disk. Perhaps a test isolation issue but
I don't see how.

But in any case it's better to test if the name is not already
use.

Fix #1118
2017-07-11 15:28:01 +02:00
grossmj
8eb060304a Correct typos in schemas. 2017-07-11 20:03:24 +07:00
Julien Duponchelle
d112da400e
Remove use_ubridge flag
Ref #1115
2017-07-11 13:58:59 +02:00
Jeremy Grossmann
fcd7dfbde6 Merge pull request #1116 from GNS3/dynamips_ubridge
Use ubridge for dynamips routers
2017-07-11 12:37:20 +07:00
grossmj
5112f6fe56 Small changes for Dynamips NIO UDP. 2017-07-11 12:36:43 +07:00
Julien Duponchelle
557924e91a
Use ubridge for dynamips routers
Ref #1109
2017-07-10 20:38:28 +02:00
Julien Duponchelle
c6f28afb7c
Fix a broken test 2017-07-10 20:35:02 +02:00
Julien Duponchelle
7f4eeb56fa
Remove unusued code 2017-07-10 13:50:57 +02:00
Jeremy Grossmann
339ed8ab57 Merge pull request #1106 from GNS3/idlepc_apicall
Implement an api call for computing the IDLE PC
2017-07-10 11:33:16 +07:00
Jeremy Grossmann
5bdc239064 Merge pull request #1104 from GNS3/filters_api
Support packet filtering for VPCS
2017-07-08 18:50:00 +07:00
Julien Duponchelle
3eadbb9adb
Implement an api call for computing the IDLE PC
Fix https://github.com/GNS3/gns3-gui/pull/2153
2017-07-07 17:50:40 +02:00
Julien Duponchelle
d17b4eb053 Merge pull request #1105 from GNS3/bugfix-2136
Bugfix 2136 (gui) issue with UTF-8 characters and Docker
2017-07-07 09:04:47 +02:00
grossmj
8f260e0a83 Update field names for filters. 2017-07-06 16:53:05 +07:00
ziajka
e0f0adf3c8 Added preferred Docker API version. Fixes #2136 2017-07-06 11:24:55 +02:00
ziajka
8e8b8bc5a5 WebSocket binary mode support for docker 2017-07-06 10:13:00 +02:00
Julien Duponchelle
4097bab565
Apply feedback from @grossmj 2017-07-05 16:36:39 +02:00
ziajka
c6f9ec3758 More information on Docker WebSocket error 2017-07-05 10:36:58 +02:00
Julien Duponchelle
dc7a9ffc51 Merge pull request #1103 from GNS3/graphics-settings
Graphics settings
2017-07-04 15:15:36 +02:00
Julien Duponchelle
08423eff96
Support packet filtering for VPCS
https://github.com/GNS3/gns3-gui/issues/765
2017-07-04 15:12:26 +02:00
ziajka
dadbb0ab09 More options for drawing area 2017-07-03 10:01:22 +02:00
ziajka
cc34f45677 Additional drawing options for Project 2017-06-30 14:31:25 +02:00