1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-27 01:08:33 +00:00
Commit Graph

2777 Commits

Author SHA1 Message Date
Julien Duponchelle
253e113168
Raise an error if the licence check setting is not a boolean
Fix #1099
2017-07-20 16:19:20 +02:00
Julien Duponchelle
87838cb574
Handle when pid file is corrupt
Fix #1090
2017-07-20 16:17:07 +02:00
Bernhard Ehlers
ec4e69b0d8
Ensure, that the docker mount directory exists
Fix #1097

Signed-off-by: Julien Duponchelle <julien@gns3.net>
2017-07-20 16:12:20 +02:00
Julien Duponchelle
c96694105c
Handle broken appliance files
Fix #1135
2017-07-20 16:10:56 +02:00
Julien Duponchelle
46e5e8ac68
Log error if you invalid character in auth login
Fix #1088
2017-07-20 15:42:07 +02:00
Julien Duponchelle
b33ba5f8ea
Don't allow user to overwrite GNS3 docker environment variables
Fix #1098
2017-07-20 15:37:56 +02:00
Julien Duponchelle
8354beaa86
Return computer symbol if an appliance don't have symbol
Fix #1087
2017-07-20 15:13:58 +02:00
Jeremy Grossmann
27f733736e Merge pull request #1133 from GNS3/appliances_dir
Add an appliance templates directory
2017-07-19 22:10:13 -07:00
grossmj
ca3f6fb4b8 Update some sentences related to suspending a link. 2017-07-20 11:11:44 +07:00
Julien Duponchelle
5fd842e54d
Suspend link 2017-07-19 17:30:25 +02:00
Julien Duponchelle
f5e023222e
Fix symbols permissions
Fix #1132
2017-07-19 13:57:19 +02:00
grossmj
a7d2391608 Use the libpcap on Linux when blocking host originating packets on vmnet interfaces. Ref #1131. 2017-07-19 16:56:24 +07:00
Julien Duponchelle
7d123f334f
Add an appliance templates directory
Fix https://github.com/GNS3/gns3-gui/issues/2133
2017-07-19 11:44:05 +02:00
Jeremy Grossmann
c2fbe4f313 Merge pull request #1130 from GNS3/vmware_filters
Filters support for VMware
2017-07-19 14:59:25 +07:00
Julien Duponchelle
fa211a82eb
Filters support for VMware
Fix #1108
2017-07-18 18:04:03 +02:00
Julien Duponchelle
54faaf5f6f
Packet filters support for VirtualBox
Fix #1107
2017-07-18 14:59:47 +02:00
Julien Duponchelle
873418dbbe
Fix a merge error 2017-07-18 09:24:36 +02:00
Julien Duponchelle
08d4c1a000
Merge branch '2.1' into filters_iou 2017-07-17 17:51:17 +02:00
Julien Duponchelle
536c708c16
Filter implementation for cloud & Nat
Fix #1111
2017-07-17 17:27:07 +02:00
Julien Duponchelle
03af9bd621
Sync appliances 2017-07-17 11:43:49 +02:00
Julien Duponchelle
5b839c22e9
Filters support for IOU
Fix #1113
2017-07-17 11:21:54 +02: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
9e2759a3f2 Merge branch '2.1' into remove_use_ubrige 2017-07-12 12:46:10 +02: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
grossmj
5747aba83c Update error message to require aiohttp 2.2 2017-07-12 13:34:18 +07: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
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
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
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
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
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
Jeremy Grossmann
3132dbd9eb Merge pull request #1096 from GNS3/bugfix-725
Enable binding server to an IPv6 host
2017-06-30 17:28:40 +08:00
ziajka
b33a1f5214 Enable binding server to an IPv6 host 2017-06-30 10:21:15 +02:00
grossmj
63e9558b10 New VPCS base config. Fixes #786. 2017-06-28 17:40:54 +08:00
grossmj
5b19ef4862 Remove forgotten debug message. 2017-06-28 16:11:46 +08:00
Jeremy Grossmann
799a2d376e Merge pull request #1092 from GNS3/fix_vpcs_name
Fix the initial startup for VPCS is not used
2017-06-28 16:09:54 +08:00
Julien Duponchelle
0a6dc55645
Fix appliance properties lost when you create two node from template 2017-06-28 09:37:19 +02:00
Julien Duponchelle
617868402f
Fix the initial startup for VPCS is not used
The default VPCS template didn't provide the base
startup config setting. This prevent the replacement
of the hostname in the configuration file.

Fix https://github.com/GNS3/gns3-gui/issues/2123
2017-06-27 18:44:31 +02:00
ziajka
c1a4bba101 Merge pull request #1091 from GNS3/bugfix-557
Bugfix 557
2017-06-27 11:17:12 +02:00
ziajka
3c18150cdb Adjustment of IOU_OBJECT_SCHEMA 2017-06-27 11:14:34 +02:00
ziajka
931018b877 Fix passing tests 2017-06-27 11:11:07 +02:00
ziajka
6aa2afcf54 Fix #557 - mac addess collision when running IOU on multiple GNS3 servers 2017-06-27 10:09:21 +02:00
Julien Duponchelle
a7170da93f
Update bundled appliances 2017-06-26 11:00:55 +02:00
ziajka
1d09f423e5 Disable checking if IOU is on the same server 2017-06-23 12:20:49 +02:00
grossmj
1e37101641 Allow IOU 64-bit images. 2017-06-23 12:00:33 +02:00
Julien Duponchelle
bcdac6c969
Fix test for ethernet switch show arp 2017-06-23 10:54:05 +02:00
ziajka
7447b3190d spice - added qxl vga support 2017-06-22 12:56:28 +02:00
Jeremy Grossmann
1b6cefd82b Merge pull request #1055 from GNS3/embed_shell
Fake console for simple Ethernet switch
2017-06-22 00:24:14 +02:00
grossmj
ad850f3857 Add port number in arp command output for Ethernet switch. 2017-06-22 00:23:33 +02:00
ziajka
bc5ec98cd5
Spice support
* QEMU VNC options tests
* QEMU - SPICE support at build options and schemas
* SPICE console_type for nodes
2017-06-21 15:14:41 +02:00
Julien Duponchelle
a8e8eac0b4
Merge remote-tracking branch 'origin/master' into 2.1 2017-06-21 15:13:04 +02:00
Julien Duponchelle
5a1d313fca Merge pull request #1080 from GNS3/spice-feature
Spice feature
2017-06-21 10:37:04 +02:00
Julien Duponchelle
36dc264a6c Revert "Spice feature" 2017-06-21 10:32:28 +02:00
Julien Duponchelle
efd5d82c88 Merge pull request #1076 from GNS3/spice-feature
Spice feature
2017-06-21 10:28:43 +02:00
ziajka
ea9f0e52c8 Fixes #2108 (gns3-gui): getting project file with leading slashes issue (#1078) 2017-06-21 10:26:36 +02:00
Julien Duponchelle
e5bc7c7a66
Merge branch '2.1' into embed_shell 2017-06-19 11:10:24 +02:00
Julien Duponchelle
734ca7d2f9
Fix linked base & linked clone settings in appliance 2017-06-19 10:49:23 +02:00
Julien Duponchelle
bb8097a052
Merge remote-tracking branch 'origin/master' into 2.1 2017-06-19 10:44:52 +02:00
Julien Duponchelle
8973cc6fee
Merge branch '2.1' into embed_shell 2017-06-19 09:11:08 +02:00
Julien Duponchelle
c8c991af78 Fix the error about appliance ID not found (#1075)
* Fix the error about appliance ID not found

* Copy appliance data before editing it
2017-06-19 08:47:50 +02:00
ziajka
61fda93611 SPICE console_type for nodes 2017-06-16 14:41:05 +02:00
ziajka
88c2353e2e QEMU - SPICE support at build options and schemas 2017-06-16 10:17:26 +02:00
Julien Duponchelle
b8a4785633
2.0.4dev1 2017-06-13 10:37:41 +02:00
Julien Duponchelle
41af46cdc5
2.0.3 release 2017-06-13 10:35:50 +02:00
ziajka
64a852f38f Fixes #1068 - handle zipfile encoding issues at project duplication 2017-06-09 15:32:25 +02:00
ziajka
5c0d955156 Fix: #1066 - Catching parsing errors at linked vbox file 2017-06-09 10:41:34 +02:00
ziajka
7235a312ab Escaping VPCS name in regex #1067 2017-06-09 09:14:25 +02:00
Julien Duponchelle
ae328e5c50
Merge branch '2.1' into embed_shell 2017-06-07 18:21:41 +02:00
Julien Duponchelle
40cc5d76b3
Fix racecondition when listing interface
Fix #1060
2017-06-07 15:57:05 +02:00
ziajka
eb6068c3d3 Fix Qemu disk creation with unicode characters not supported by local filesystem #1058 (#1063) 2017-06-07 12:35:41 +02:00
ziajka
e0b519eced Fix when config file doesn't have computes section (#1062) 2017-06-07 10:50:40 +02:00
Julien Duponchelle
ca3f8d0b43
Provide easy to test a shell by using stdin as an input 2017-06-02 14:50:34 +02:00
Julien Duponchelle
6a0345897d
Connector is no longer supported in ws_connect by aiohttp 2.0 2017-06-02 10:42:40 +02:00
Julien Duponchelle
7dfb634376
Fix for websocket usage with aiohttp 2.0
Fix #1050
2017-06-01 18:39:55 +02:00
Julien Duponchelle
823288dd0b
Fix a crash in some cases 2017-06-01 18:35:03 +02:00
Julien Duponchelle
e74e66b203
Typo in error message 2017-05-31 17:04:14 +02:00
Julien Duponchelle
93adef91d8
Merge branch '2.0' into 2.1 2017-05-31 16:58:31 +02:00
Julien Duponchelle
6fa27c6885
Check aiohttp version 2017-05-31 16:56:46 +02:00
Julien Duponchelle
5616ab0e9a
Fake console for simple Ethernet switch
Fix #454
2017-05-31 15:13:29 +02:00
Julien Duponchelle
4f6cca0019
Fix errors when enabling chunking 2017-05-31 11:17:28 +02:00
Julien Duponchelle
7044c8c9ff
Fix the GUI disconnect from the server
Fix https://github.com/GNS3/gns3-gui/issues/2084
2017-05-31 11:03:44 +02:00
Julien Duponchelle
7913646ce3
2.0.3dev1 2017-05-30 08:58:05 +02:00
Julien Duponchelle
78e1321bae
2.0.2 2017-05-30 08:57:07 +02:00
Julien Duponchelle
b8ee8d69c8
Fix unexpected keyword argument 'conn_timeout'
Fix #1047
2017-05-26 15:42:46 +02:00
Julien Duponchelle
39879ca92b
Duplicate project on remote server use UUID
Ref https://github.com/GNS3/gns3-server/issues/1040
2017-05-23 17:20:51 +02:00
Julien Duponchelle
b87692acce
Fix import of some old topologies from 1.3 2017-05-23 14:05:47 +02:00
Julien Duponchelle
d765d02f06
Fix error in logging of error during starting GNS3 VM 2017-05-23 13:39:41 +02:00
Julien Duponchelle
5bb6c51698
Fix an error when logging Docker container fail to start 2017-05-23 13:31:04 +02:00
Julien Duponchelle
59488e8064 Fix tests on python 3.4 (#1046) 2017-05-23 12:15:04 +02:00
Julien Duponchelle
2a8911d19e
Keep DOCKER_MINIMUM_API_VERSION and DOCKER_MINIMUM_VERSION consistent 2017-05-23 11:00:15 +02:00
Bernhard Ehlers
8b7209ea78
Use docker version in error message of outdated docker installation 2017-05-23 10:41:42 +02:00
Bernhard Ehlers
7d48eba01b
Use versioned docker API
Since docker v1.13 the unversioned docker API is deprecated.
Backport of gns3-server 2.0, commit effbe59
2017-05-23 10:37:47 +02:00
Bernhard Ehlers
2191c487b6
Support images created by "docker commit". Fixes #1039 2017-05-23 10:23:11 +02:00
Jeremy Grossmann
82f1ab2be2 Merge pull request #1036 from GNS3/aiohttp_2.0
Aiohttp 2.0
2017-05-22 22:41:01 +02:00
Julien Duponchelle
7d30da5d4e
Do not wait auto start to finish in order to complete project opening
Fix https://github.com/GNS3/gns3-gui/issues/2074
2017-05-22 20:18:07 +02:00
Julien Duponchelle
4dc55a5af4
Improve logging for remote server connection lost
Ref https://github.com/GNS3/gns3-gui/issues/2074
2017-05-22 13:57:32 +02:00
Julien Duponchelle
bdd980d6a2
Ignore console_hsot when loading topologie 2017-05-22 11:42:50 +02:00
Julien Duponchelle
51d6152a5c
Fix support for some old topologies
Fix #1042
2017-05-19 18:27:20 +02:00
Julien Duponchelle
bdcadcc335
Fix support from some old topologies
Fix #1038
2017-05-19 17:49:39 +02:00
Julien Duponchelle
624a2c02c5
FIX iou creation
Fix https://github.com/GNS3/gns3-gui/issues/2065
2017-05-18 17:13:40 +02:00
Julien Duponchelle
189ad994c8
Symbols are returned with a content length 2017-05-18 16:37:44 +02:00
Julien Duponchelle
a4245fcf44
Aiohttp 2.0
Ref #1000
2017-05-17 18:42:17 +02:00
grossmj
f338158654 Use 127.0.0.1 for local UDP tunnels to uBridge for Qemu. Ref #664. 2017-05-16 20:51:14 +02:00
Julien Duponchelle
e9fef928b0
Fix dynamips node creation error 2017-05-16 10:49:45 +02:00
Julien Duponchelle
5c5caf8418
Add comment about why we change linked_base to linked_clone 2017-05-16 10:38:58 +02:00
Julien Duponchelle
aff5554528
Rename old properties from gui linked_base to linked_clone
Fix #1034
2017-05-16 10:33:37 +02:00
Julien Duponchelle
2a159c06c5
Fix forwarding properties
Fix #2005, #2002
2017-05-16 10:22:55 +02:00
Julien Duponchelle
c231e2bbf1
Merge branch '2.0' into 2.1 2017-05-16 09:30:07 +02:00
Julien Duponchelle
e24bfd5913
2.0.2dev1 2017-05-16 09:16:35 +02:00
Julien Duponchelle
f2d5eb0b27
2.0.1 2017-05-16 08:47:35 +02:00
Julien Duponchelle
bef1b2e8f1
Merge branch '2.0' into 2.1 2017-05-16 08:38:13 +02:00
Julien Duponchelle
39419462db
Handle HTTP 504 errors from compute node
Fix #1032
2017-05-16 08:37:54 +02:00
Julien Duponchelle
cd17ef6b12
Merge branch '2.0' into 2.1 2017-05-15 15:46:50 +02:00
Julien Duponchelle
3dc478385b
When connecting to a compute node ask for qemu images list
The server start to compute qemu image list in background
because first time discovery could be slow due to the compute
time of md5sum.

Fix #996
2017-05-15 15:35:48 +02:00
Julien Duponchelle
851d6e1db8
When importing portable project NAT node is loaded on GNS3 VM
Fix #1030
2017-05-15 10:21:37 +02:00
grossmj
70d34befb9 Merge remote-tracking branch 'origin/2.0' into 2.0 2017-05-12 21:04:39 +08:00
Jeremy Grossmann
8696a464ab Merge pull request #1027 from GNS3/fix_wic_numbering
Fix wic numbering
2017-05-12 21:03:05 +08:00
Julien Duponchelle
5721dd3f30
Fix port numbering for Wic slot 1 & 2 2017-05-12 14:12:24 +02:00
grossmj
bf38a8515e Fix typo. 2017-05-12 18:54:54 +08:00
grossmj
942cc09eda Fixes issue with connections when loading an ATM switch. 2017-05-12 18:00:58 +08:00
Julien Duponchelle
961dbb5162
Filter /settings from log
Fix #1026
2017-05-12 10:48:43 +02:00
Julien Duponchelle
19a6157f64
Fix wic numbering
Fix #1011
2017-05-12 09:48:05 +02:00
grossmj
18cfcaa081 Fixes ATM mapping. 2017-05-12 13:09:26 +08:00