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

402 Commits

Author SHA1 Message Date
Julien Duponchelle
b8ee8d69c8
Fix unexpected keyword argument 'conn_timeout'
Fix #1047
2017-05-26 15:42:46 +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
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
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
cd17ef6b12
Merge branch '2.0' into 2.1 2017-05-15 15:46:50 +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
grossmj
18cfcaa081 Fixes ATM mapping. 2017-05-12 13:09:26 +08:00
grossmj
87d42f4eb9 Fixes Frame-relay VC mapping. 2017-05-12 12:39:01 +08:00
Julien Duponchelle
f31e46e8ed
Fix a race condition in logging when ubridge exit fast
Fix #1025
2017-05-11 17:26:18 +02:00
Jeremy Grossmann
633cdef0bc Merge pull request #987 from GNS3/nat_vmware
NAT node can use the VMware NAT
2017-05-11 14:03:34 +08:00
grossmj
48dae085aa Catch missing function listxattr on some Linux host. 2017-05-08 21:02:23 +07:00
Julien Duponchelle
3070a68273
Fix unicode error when reading ios configuration
Fix #1013
2017-05-05 19:27:04 +02:00
Julien Duponchelle
bda36081a9
Fix AttributeError: 'NoneType' object has no attribute 'send'
Fix #1014
2017-05-05 17:16:07 +02:00
Julien Duponchelle
04220846b3
Fix an error with ethernetswitch when ethertype is null
Fix #1007
2017-05-04 10:33:02 +02:00
Julien Duponchelle
694a4e8068
Raise an error if we can't create the dynamips configuration directory
Fix #992
2017-05-03 17:55:13 +02:00
Julien Duponchelle
31d1696215
Catch a race condition in VirtualBox when editing and linking
Fix #993
2017-05-03 16:14:42 +02:00
Julien Duponchelle
078a6d8d34
Fix a race condition when editing a qemu vm and connecting it
Fix #997
2017-05-03 16:01:51 +02:00
Bernhard Ehlers
ecba758c58
Docker aux console is a VT100 terminal
Without that program like nano can't work.

Signed-off-by: Julien Duponchelle <julien@gns3.net>
2017-05-03 10:30:43 +02:00
Bernhard Ehlers
56d91b648c
Fix connection to websocket with last docker release
Fix https://github.com/GNS3/gns3-gui/issues/1994

Signed-off-by: Julien Duponchelle <julien@gns3.net>
2017-04-28 16:06:43 +02:00
Bernhard Ehlers
1b0f5c63b8
Fix connection to websocket with last docker release
Fix https://github.com/GNS3/gns3-gui/issues/1994

Signed-off-by: Julien Duponchelle <julien@gns3.net>
2017-04-28 16:03:26 +02:00
Julien Duponchelle
b0f45035a9
NAT node can use the VMware NAT
On Windows and Mac OS this allow the NAT node to use the
VMware nat (it's always vmnet8). On Linux we still use the
libvirt NAT
2017-04-27 15:26:58 +02:00
Julien Duponchelle
273a711459
Merge branch '2.0' into 2.1 2017-04-26 17:22:14 +02:00
Julien Duponchelle
1a90305baa
Docker minimum api is 1.25 2017-04-24 18:43:12 +02:00
Julien Duponchelle
effbe59414
Lock docker API to 1.27
Fix https://github.com/GNS3/gns3-gui/issues/1994
2017-04-24 17:51:55 +02:00
Julien Duponchelle
8b9f22c30c
Handling server disconnect error when docker daemon die
Fix #985
2017-04-24 17:37:41 +02:00
Julien Duponchelle
7302f65ffe
Catch timeout error on docker
Fix #981
2017-04-18 11:44:20 +02:00
Julien Duponchelle
62cd5e4aa3
Fix ghost vmware vms
Fix #975
2017-04-11 15:05:31 +02:00
Julien Duponchelle
fdd1084714
Fix bridge 'bridge0' already exist when we have trouble with a container
Fix #973
2017-04-10 16:58:00 +02:00
grossmj
5edb631b00 Fixes Qemu sata option. Ref #875. 2017-04-07 17:25:14 +08:00
Julien Duponchelle
4f1b738ef5
Merge branch '2.0' into 2.1 2017-03-30 10:16:16 +02:00
Julien Duponchelle
935ca17d7a
Allow to change some properties of an already connected ethernet switch
Fix https://github.com/GNS3/gns3-gui/issues/1970
2017-03-29 13:22:24 +02:00
Julien Duponchelle
644616b69c
Ensure we start only one ubridge
Fix https://github.com/GNS3/gns3-gui/issues/1964
2017-03-28 16:27:09 +02:00
Julien Duponchelle
84da9b4c23
Remove unused module import 2017-03-28 14:51:55 +02:00
Julien Duponchelle
2564740665
Fix limit of 20 docker containers
Fix #963
2017-03-28 11:54:16 +02:00
Julien Duponchelle
42f409d5f9
Fix race conditions in creation of Frame Relay Switch 2017-03-28 11:25:26 +02:00
Julien Duponchelle
132bc87081
Dissallow parallel pull of docker images
Fix #962
2017-03-27 20:46:25 +02:00
Julien Duponchelle
80e361ff2e
Improve vmrun timeout message
Ref https://github.com/GNS3/gns3-gui/issues/1967
2017-03-27 09:00:58 +02:00
Julien Duponchelle
cb78eb4ee3
Fix Bug when delete fake-running VMBox
Fix https://github.com/GNS3/gns3-gui/issues/1933
2017-03-22 11:08:16 +01:00
Julien Duponchelle
34f5a6f82c
Fix Session is closed when listing docker images
Fix #955
2017-03-20 23:50:31 +01:00
Julien Duponchelle
78c154e376
Cleanup docker source code 2017-03-20 20:30:59 +01:00
Julien Duponchelle
a571b1a2f8
Use aiohttp session for docker queries 2017-03-20 19:46:50 +01:00
Julien Duponchelle
a62b791c68
Fix TypeError: http_query() got an unexpected keyword argument 'timeout'
Fix #947
2017-03-20 17:06:00 +01:00
Julien Duponchelle
c8b46bdcab
Fix return code check for SIGSEGV of IOU images
Fix #948
2017-03-20 09:46:07 +01:00
Julien Duponchelle
08bafc2dcc
Catch a timeout error in docker
Fix #936
2017-03-16 10:39:08 +01:00
Julien Duponchelle
9ef334331e
Fix crash when handling an error in project creation
Fix #928
2017-03-13 16:55:35 +01:00
Julien Duponchelle
6017ebbd97
Merge branch '2.0' into 2.1 2017-03-07 11:16:05 +01:00
Julien Duponchelle
8b7035b185
Enable show in file manager for cloud
Fix https://github.com/GNS3/gns3-gui/issues/1900
2017-03-06 14:25:53 +01:00
Julien Duponchelle
5e7f97b175
Fix when qemu exit by itself clean other processes
Fix https://github.com/GNS3/gns3-gui/issues/1898
2017-03-03 18:40:26 +01:00
Julien Duponchelle
1ab9ca2333
Merge branch '2.0' into 2.1 2017-02-28 14:25:38 +01:00
Julien Duponchelle
70e2b87ff0
Patch hostname in configuration file even if name is unsync
Ref https://github.com/GNS3/gns3-gui/issues/1889
2017-02-27 12:48:05 +01:00
Julien Duponchelle
2e0f012952
Improve ACPI shutdown for virtualbox 2017-02-24 13:58:03 +01:00
Julien Duponchelle
65b75a9212
Fix an issue with serial capture for IOU
Fix https://github.com/GNS3/gns3-gui/issues/1886
2017-02-24 11:55:41 +01:00
Julien Duponchelle
366c567864
Fix restoration of private config when using dynamips
Fix #906
2017-02-23 18:21:00 +01:00
Julien Duponchelle
2884a40769
Fix error when the startup config file is missing
Fix https://github.com/GNS3/gns3-gui/issues/1877
2017-02-22 09:28:34 +01:00
Julien Duponchelle
132a7bfeb7
Catch an error in etherswitch when ubridge die
Fix #907
2017-02-20 12:19:38 +01:00
Julien Duponchelle
7407ab88b3
Fix a failing test on Python 3.6 2017-02-20 10:56:48 +01:00
Jeremy Grossmann
5672b4b748 Merge pull request #890 from GNS3/base_config_server_side
Manage base configuration on server
2017-02-19 22:59:06 -08:00
Jeremy Grossmann
aee7208f7b Merge pull request #895 from GNS3/qemu_more_adapters
Allow up to 275 adapters for qemu
2017-02-17 01:40:41 -08:00
Jeremy Grossmann
635e163954 Update qemu_vm.py 2017-02-17 17:37:06 +08:00
Julien Duponchelle
99f817392d
Raise an error if you use Qemu < 2.4 and try to use large number of adapters 2017-02-17 09:55:50 +01:00
Julien Duponchelle
0dbd92db11
Fix disk lost when save as a project using linked clone VirtualBox
Fix https://github.com/GNS3/gns3-gui/issues/1824
2017-02-13 19:11:29 +01:00
Julien Duponchelle
b0567772f7
Allow up to 275 adapters for qemu
See #889 for more details
2017-02-07 17:04:29 +01:00
Julien Duponchelle
e892e5dfab
Manage base configuration on server
Fix #786
2017-02-03 13:19:14 +01:00
Julien Duponchelle
f0ff035c0b
Prevent corruption of VM in VirtualBox when using linked clone
Fix https://github.com/GNS3/gns3-gui/issues/1821
2017-01-31 18:58:43 +01:00
Julien Duponchelle
580693b1ec
Prevent renaming of a running VirtualBox linked VM
Fix https://github.com/GNS3/gns3-gui/issues/1816
2017-01-30 15:19:46 +01:00
Julien Duponchelle
1ed88eda85
Fix version check for VPCS 2017-01-23 21:11:52 +01:00
Julien Duponchelle
a24490930f
Fix pcap for PPP link with IOU
Fix https://github.com/GNS3/gns3-gui/issues/1799
2017-01-23 18:28:06 +01:00
Julien Duponchelle
e5dba5e66a
Fix bug with other directory of Qemu images
Fix https://github.com/GNS3/gns3-gui/issues/1790
2017-01-18 12:39:10 +01:00
Julien Duponchelle
c9f3ea4489
Fix some race condition in project deletion
Fix #866
2017-01-17 19:37:38 +01:00
Julien Duponchelle
82da073dd7
If qemu status change internally we mirror it 2017-01-17 16:03:12 +01:00
Julien Duponchelle
2de284ea30
Fix some tests on travis 2017-01-16 10:13:13 +01:00
Julien Duponchelle
7a0783d050
Drop a useless debug information
Fix https://github.com/GNS3/gns3-gui/issues/1778
2017-01-16 09:17:08 +01:00
Julien Duponchelle
7241063ddf
Fix sometimes VirtualBox VM are not loading
Fix  https://github.com/GNS3/gns3-server/issues/865
2017-01-16 08:57:50 +01:00
Julien Duponchelle
1527a1a4e1 Fix cloud on Linux
Fix  https://github.com/GNS3/gns3-server/issues/865
2017-01-13 17:08:40 +01:00
Jeremy Grossmann
ec0181a5ad Merge pull request #856 from GNS3/dynamips_directory_layout
Change directory layout for dynamips.
2017-01-12 20:30:10 -08:00
Julien Duponchelle
82c99418b4
Fix If cloud interface is down the project doesn't open
Fix https://github.com/GNS3/gns3-gui/issues/1751
2017-01-11 17:23:36 +01:00
Julien Duponchelle
df694ca9eb
Fix export of IOU configuration
Fix https://github.com/GNS3/gns3-gui/issues/1745
2017-01-10 15:50:35 +01:00
Julien Duponchelle
720adb7721
Fix a crash with VirtualBox in some conditions
Fix #863
2017-01-10 14:23:12 +01:00
Julien Duponchelle
9480065b28 Sata disk interface support for Qemu VMs. (#862) 2017-01-10 14:11:40 +01:00
Julien Duponchelle
6150929a5b
Support conversion to dynamips new directory layout on remote
Ref https://github.com/GNS3/gns3-gui/issues/1761
2017-01-10 12:15:31 +01:00
Julien Duponchelle
666461277d
Fix a crash with some docker images
Fix #861
2017-01-10 10:09:34 +01:00
Julien Duponchelle
f7d87f09f1
Fix VPCS configuration is overwritten on project load
Fix https://github.com/GNS3/gns3-gui/issues/1766
2017-01-09 17:07:42 +01:00
Julien Duponchelle
2de60ba257
Drop a useless line of code in port_manager 2017-01-09 16:11:34 +01:00
Julien Duponchelle
035cbac28e
Fix binding console host for VMware and VirtualBox
Ref https://github.com/GNS3/gns3-gui/issues/1757
2017-01-09 16:05:29 +01:00
Julien Duponchelle
b63273ec97
Fix resume of dynamips routers
Fix #1754
2017-01-09 13:24:23 +01:00
Julien Duponchelle
a2fdc92fcb
Change directory layout for dynamips.
This create a directory by node to allow feature like save as
to work when running on multiple compute. Benefits now dynamips work
like other nodes. Old topologies are migrated.

Ref https://github.com/GNS3/gns3-gui/issues/1761
2017-01-06 17:43:47 +01:00
Julien Duponchelle
6778b29fc0
Prevent a crash when you close a dynamips node and create a link at the same time
Fix #853
2017-01-06 09:33:10 +01:00
Julien Duponchelle
12f09829e7
Improve error message about the netmask
Ref #1751
2017-01-05 14:51:43 +01:00
grossmj
c9fc0a0d6d Do not mark VirtualBox adapter as connected when not connected to another node in GNS3. 2017-01-05 14:30:23 +08:00
Julien Duponchelle
9a7a9f41aa
Catch an error when we can't create the IOU directory
Fix #846
2016-12-21 09:33:44 +01:00
Julien Duponchelle
52adf45740
Fix an error when docker hub failed to anwser
Fix #843
2016-12-20 09:15:28 +01:00
Julien Duponchelle
f86358ad71
Relax permission check on OSX, it seem returning wrong info for setuid 2016-12-19 09:28:27 +01:00
Julien Duponchelle
8f6d25cc2b
Fix start all create error if a docker container is already running
Fix #839
2016-12-16 16:19:23 +01:00
Julien Duponchelle
46b6e7c5ee
Fix hot link issues in Docker
Fix #817
2016-12-14 16:53:20 +01:00
Julien Duponchelle
d0f65aebff
Fix Can't delete link between docker VM after they were in use
Fix #818
2016-12-14 12:01:34 +01:00
Julien Duponchelle
30f29d00c4
Fix hardware virtualization detection when an ethernet switch is running
Fix https://github.com/GNS3/gns3-gui/issues/1722
2016-12-14 11:04:13 +01:00
Bernhard Ehlers
a3495304ad
Code cleanup for docker interface creation
Fix #819

Signed-off-by: Julien Duponchelle <julien@gns3.net>
2016-12-13 16:07:59 +01:00
Julien Duponchelle
8f42122702
Fix 'EthernetSwitch' object has no attribute 'hw_virtualization'
Fix #828
2016-12-13 09:21:06 +01:00
Julien Duponchelle
d2f0cddbd7
Fix trouble with builtin devices when we free ports
Fix #825
2016-12-12 19:17:06 +01:00
Julien Duponchelle
9872fc09b7
When a dynamips command failed display the full command to the user
Ref #825
2016-12-12 16:38:55 +01:00
Julien Duponchelle
35c2e2fcc4
Fix a wrong error message 2016-12-12 16:29:56 +01:00
Julien Duponchelle
922da7c90f
Raise error when we can't found VboxManage at GNS3 VM startup
Fix #824
2016-12-12 15:03:56 +01:00
Julien Duponchelle
508edf5cc5
Fix a rare crash when stopping qemu
Fix #821
2016-12-12 09:16:29 +01:00
Julien Duponchelle
c4327ec74c
Improve docker HTTP console
Fix #816
2016-12-09 16:41:15 +01:00
Julien Duponchelle
5ba5c62670
Add support for bios images
Ref https://github.com/GNS3/gns3-gui/issues/1700
2016-12-08 16:18:30 +01:00
Stephen C. Moore
d55c73bc8e Fix grammar (#808)
* Fixed small grammatical error

* Fixed small grammatical error
2016-12-05 17:30:09 +01:00
Julien Duponchelle
c53201b753
Fix when you switch console from VNC to telnet it's fail
Fix #805
2016-12-01 11:47:05 +01:00
Julien Duponchelle
e3b1eee85b
Improve autostart logging 2016-12-01 09:24:52 +01:00
Julien Duponchelle
433f620905
If a VMware command fail retry
Ref #1671
2016-11-28 20:00:20 +01:00
Julien Duponchelle
49315adf79
Do not recurse scan for images in standard image directory
Fix https://github.com/GNS3/gns3-gui/issues/1680
2016-11-28 19:49:50 +01:00
Julien Duponchelle
2b15da3d19
Catch error when qemuy can't connect to his console
Fix #803
2016-11-28 13:18:04 +01:00
Julien Duponchelle
60a145afbb
Improve vmware error message for easier copy paste 2016-11-28 09:59:38 +01:00
Julien Duponchelle
a776b36e98
Improve vmware vmrun error error message 2016-11-28 09:51:06 +01:00
Julien Duponchelle
9b6b989d1b
Qemu UDP listen on all ips 2016-11-25 15:21:35 +01:00
Julien Duponchelle
2215702ae8
Ask user to refresh is user session if he just installed ubridge
Ref https://github.com/GNS3/gns3-server/issues/796
2016-11-24 15:16:25 +01:00
grossmj
38d9555f72 Do not block traffic originating from an Ethernet interface in the cloud. Ref #771. 2016-11-23 22:06:44 +11:00
grossmj
7754d7f211 Revert "Make the Ethernet side the source in uBridge connection and UDP tunnel the destination. Ref #771."
This reverts commit 31c04cc95b.
2016-11-23 21:55:26 +11:00
grossmj
31c04cc95b Make the Ethernet side the source in uBridge connection and UDP tunnel the destination. Ref #771. 2016-11-22 21:57:55 +11:00
Julien Duponchelle
a853e87fa5
IOURC is a text box instead of a file path
Fix https://github.com/GNS3/gns3-gui/issues/1662
2016-11-21 18:16:50 +01:00
Julien Duponchelle
a872f0328d
Fix closing console of VBox on NIX systems 2016-11-18 11:27:50 +01:00
Julien Duponchelle
11f290482d
Remove debug 2016-11-18 10:44:57 +01:00
Julien Duponchelle
14fd8104b8
Fix opening a project whith the same non linked VM as current project
Fix https://github.com/GNS3/gns3-gui/issues/1646
2016-11-17 12:21:38 +01:00
Julien Duponchelle
75890c8f5a
Prevent double start of VirtualBox VM and VMware VM
Fix https://github.com/GNS3/gns3-gui/issues/1664
2016-11-17 10:38:29 +01:00
Julien Duponchelle
928d9f13f4
Do not log warning at qemu exit on windows if it's normal
Fix #777
2016-11-16 13:06:43 +01:00
grossmj
3c384a7bf0 Try to fix VPCS and loobpack adapters not working together. Ref #771. 2016-11-15 17:36:51 +11:00
grossmj
fdc9283e04 Generic code the bind an Ethernet interface with uBridge. Ref #771. 2016-11-13 20:28:14 +11:00
Julien Duponchelle
8dd4f63aca
Make sure IOU licence is dump in ~/
Fix #780
2016-11-11 16:18:39 +01:00
Julien Duponchelle
8db9b89318
Fix IOL bridge errors
Fix https://github.com/GNS3/gns3-gui/issues/1651
2016-11-11 15:16:46 +01:00
Julien Duponchelle
1bb760d3f0
Make logs for searching GNS3 VM vmware IP less noisy
Fix #765
2016-11-11 11:41:16 +01:00
Julien Duponchelle
65090c6f87
Catch errors when listing images
Fix #764
2016-11-11 11:24:41 +01:00
Julien Duponchelle
bddf9ec2ac
Qemu telnet support multiple client connected
Fix #770
2016-11-09 09:47:48 +01:00
Julien Duponchelle
69f154d9cc
Correctly initialize connection to VPCS console 2016-11-08 20:10:17 +01:00
Julien Duponchelle
db8296f548
Support multiple client connected to the same VPCS console
Ref #770
2016-11-08 19:44:12 +01:00
Julien Duponchelle
3754a49cc0
Drop IOUCON
Fix #747
2016-11-08 10:21:20 +01:00
Julien Duponchelle
553e137a13
Support for serial console for Virtual BOX and VMware using asyncio
Ref #747
2016-11-07 23:43:20 +01:00
Julien Duponchelle
a35eaa8e60
Ask for reboot if VBoxManage is not found 2016-11-07 15:49:25 +01:00
Julien Duponchelle
7931ee01b3
Fix a crash with VirtualBox linked clone 2016-11-07 14:10:44 +01:00
grossmj
183f602fc0 Replace iouyap by ubridge to handle IOU connections. Fixes #614. 2016-11-06 21:27:49 +11:00
Julien Duponchelle
0c87d8e1bd
Lock VMware by VM instead of globally
Ref https://github.com/GNS3/gns3-gui/issues/1632
2016-11-04 19:39:17 +01:00
Julien Duponchelle
7255754fef
Bridge support in cloud is more robust
Fix #761
2016-11-04 17:40:44 +01:00
Julien Duponchelle
cf723962af
Support bridge in cloud
Nat take advantage of that and the code is more simple.

Fix #761
2016-11-04 17:32:16 +01:00
Julien Duponchelle
1b3e47ce83
Add a test of cloud raw ethernet interface
Before touching it for the bridge support a test to prevent regressions.

Ref #761
2016-11-04 16:52:29 +01:00
Julien Duponchelle
ea94731418
Fix support of IOS images outside standard directories
Fix https://github.com/GNS3/gns3-gui/issues/1630
2016-11-04 15:26:13 +01:00
Julien Duponchelle
dc26be43c2
Fix random VirtualBox creation error when using linked clone
Fix #760
2016-11-04 11:07:43 +01:00