NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-11-18 01:34:50 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,711 Commits 6 Branches 202 Tags 85 MiB
c59fc375f2
Commit Graph

150 Commits

Author SHA1 Message Date
grossmj
33e8710495 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/controller/compute.py
#	gns3server/controller/gns3vm/__init__.py
#	gns3server/controller/link.py
#	gns3server/controller/project.py
#	gns3server/handlers/api/controller/project_handler.py
#	gns3server/handlers/api/controller/server_handler.py
#	gns3server/utils/asyncio/__init__.py
#	gns3server/utils/asyncio/telnet_server.py
#	gns3server/version.py
#	gns3server/web/web_server.py
#	tests/compute/qemu/test_qemu_vm.py
 2018-08-29 15:57:54 +07:00
grossmj
902de3dd47 Refactor asyncio locking system for Python 3.7 support. Ref https://github.com/GNS3/gns3-gui/issues/2566 Ref https://github.com/GNS3/gns3-gui/issues/2568 2018-08-25 14:10:47 +07:00
grossmj
3560cda06c Use asyncio.ensure_future() instead of asyncio.async() with conservative approach to support Python < 3.4.4. Fixes https://github.com/GNS3/gns3-gui/issues/2566 2018-08-24 18:57:18 +07:00
grossmj
033f005bde Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/version.py
 2018-08-07 21:06:42 +07:00
Andrew Caudwell
b2e0a1b291 Don't release NIO UDP ports when updating docker container. 
When a docker container was updated, the NIO UDP ports were being released
from port_manager, but they were still stored in self._ethernet_adapters.
When the container was restarted, the same NIO ports would be used. However,
if a new connection was then added, it could assign a port that was already
in use. The end result was that traffic would be bridged across the wrong
interface connection.
 2018-06-11 15:17:13 +12:00
grossmj
d1ccf3bc84 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/version.py
#	requirements.txt
 2018-06-04 22:46:52 +07:00
ziajka
c52342907a
Merge pull request #1332 from GNS3/global-vars 
Docker `ExtraHosts`, global variables for project and supplier support, Fixes: #2482
 2018-05-15 09:23:54 +02:00
ziajka
83445214be Support for nested global variables 2018-05-09 11:25:55 +02:00
ziajka
e267f8a8b8 Project global variables 2018-05-04 14:34:44 +02:00
grossmj
21a1800edc Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/controller/__init__.py
#	gns3server/controller/export_project.py
#	gns3server/controller/import_project.py
#	gns3server/controller/project.py
#	gns3server/version.py
 2018-04-28 19:41:12 +07:00
grossmj
305fe2e817 Handle asyncio timeouts. Ref #1307. 2018-04-28 17:42:02 +07:00
ziajka
80958e8a6d support based on init.sh, Ref: #2482 2018-04-27 14:33:07 +02:00
ziajka
43081152ef Add support of ExtraHosts for Docker, Ref. gns3-gui#2482 2018-04-25 16:03:01 +02:00
grossmj
2ea0aa5ded Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py
 2018-04-18 17:08:42 +08:00
grossmj
a12c5a95b0 Catch exceptions when using AsyncioTelnetServer. Fixes #1321. 2018-04-16 15:30:06 +08:00
grossmj
90ce6093d8 Some spring cleaning. 2018-03-15 14:17:39 +07:00
grossmj
658aa4bae9 Merge 2.1 into 2.2 branch 2018-03-12 13:38:50 +07:00
ziajka
e79e27a73f Handle docker env with last empty line, Fixes: #2420 2018-02-27 16:33:55 +01:00
grossmj
4ba523a0d7 Add an error message when Docker container is not ready to be started. Ref #1281. 2018-02-02 16:29:08 +08:00
grossmj
07d2d7b340 Update documentation. 2018-01-31 23:37:02 +07:00
ziajka
eeae07e783 Conservative approach to supported versions of Python 3.4 and asyncio.ensure_future, Ref. #1269 2018-01-29 12:13:20 +01:00
ziajka
d9a0ec9ff3 Replace asyncio.async with ensure_future because of deprecation, Fixes: #1269 2018-01-24 11:11:53 +01:00
grossmj
630afc5469 Do not overwrites persistent Docker volumes. Fixes #2358. 2017-12-17 22:35:26 +01:00
grossmj
dd89b09f84 Fix error when updating packet filter on stopped Docker link. Fixes #1229. 2017-11-23 10:04:32 +07:00
ziajka
3d85bba9d4 Don't create directory structure during json dump. Fixes #2270 2017-10-02 10:41:57 +02:00
grossmj
a567b394f3 Restore file permissions fails for volumes with soft links. Fixes #1180. 2017-09-21 22:45:17 +08:00
Julien Duponchelle
a93f3b0576
Fix permission on exited container 
If a container is exited we quickly start it to fix
the permissions.

Fix https://github.com/GNS3/gns3-gui/issues/2181
 2017-07-26 14:52:16 +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
b33ba5f8ea
Don't allow user to overwrite GNS3 docker environment variables 
Fix #1098
 2017-07-20 15:37:56 +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
Julien Duponchelle
699ecb7c89
Merge branch 'master' into 2.1 2017-07-11 18:59:50 +02: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
ziajka
c6f9ec3758 More information on Docker WebSocket error 2017-07-05 10:36:58 +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
93adef91d8
Merge branch '2.0' into 2.1 2017-05-31 16:58:31 +02:00
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
Julien Duponchelle
a4245fcf44
Aiohttp 2.0 
Ref #1000
 2017-05-17 18:42:17 +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
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
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
fdd1084714
Fix bridge 'bridge0' already exist when we have trouble with a container 
Fix #973
 2017-04-10 16:58:00 +02:00
Julien Duponchelle
2564740665
Fix limit of 20 docker containers 
Fix #963
 2017-03-28 11:54:16 +02:00
Julien Duponchelle
132bc87081
Dissallow parallel pull of docker images 
Fix #962
 2017-03-27 20:46:25 +02: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
08bafc2dcc
Catch a timeout error in docker 
Fix #936
 2017-03-16 10:39:08 +01:00
Julien Duponchelle
666461277d
Fix a crash with some docker images 
Fix #861
 2017-01-10 10:09:34 +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
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
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
c4327ec74c
Improve docker HTTP console 
Fix #816
 2016-12-09 16:41:15 +01:00
Julien Duponchelle
ac1eef256f
Use tap adapter instead of veth for docker (allow usage of vlan) 
Ref #716
 2016-10-24 12:35:50 +02:00
Julien Duponchelle
ec3660c979
Catch an error when docker is not running 2016-10-14 19:06:12 +02:00
Julien Duponchelle
fbdcf67d29
If docker container state failed to return we consider the container stopped 2016-10-14 19:00:25 +02:00
Julien Duponchelle
5a695d2651
Missing busybox for docker 2016-10-05 14:57:58 +02:00
Julien Duponchelle
5a7f5d2950
Check if GNS3 has access to all docker resssources 
Ref #702
 2016-10-04 21:14:19 +02:00
Julien Duponchelle
67fc563d81
Merge branch 'master' into 2.0 2016-09-07 15:01:51 +02:00
Julien Duponchelle
ca4d09ea40
Merge branch 'master' into 2.0 2016-07-05 15:41:53 +02:00
Julien Duponchelle
c0b09ae76a
Merge branch '1.5' into 2.0 2016-06-27 14:24:48 +02:00
grossmj
d28fad223f Allows hot-linking for Docker containers. Ref #267. 2016-06-24 17:26:40 -06:00
grossmj
04022677bd Use uBridge for Qemu connections. Ref #267. 
Handle packet captures for VPCS & Qemu nodes. Fixes #548.
 2016-06-23 16:56:06 -06:00
grossmj
00da15e4af Use uBridge for VPCS connections. Ref #267. 2016-06-22 19:40:46 -06:00
Julien Duponchelle
32252e5193
Merge branch '1.5' into 2.0 2016-06-21 09:58:28 +02:00
Julien Duponchelle
6949976d12
Merge branch '1.5' into 2.0 2016-06-20 12:45:56 +02:00
Julien Duponchelle
2a1c5cfd9c
Merge branch '1.5' into 2.0 2016-06-15 19:14:03 +02:00
Julien Duponchelle
52f852bc6d
Merge branch '1.5' into 2.0 2016-06-14 09:50:07 +02:00
Julien Duponchelle
d8bdd16e13
Raise an error if image is missing on compute 2016-06-07 15:34:04 +02:00
Julien Duponchelle
d30abeca21
Merge branch '1.5' into 2.0 2016-06-07 10:56:55 +02:00
Julien Duponchelle
61ac8763f2
Merge branch '1.5' into 2.0 2016-06-06 14:28:21 +02:00
Julien Duponchelle
cb7dbfb256
Merge branch '1.5' into 2.0 2016-06-02 13:47:40 +02:00
grossmj
f0e0988d6a Includes uBridge stdout in case of error. 2016-05-30 22:07:37 -06:00
Julien Duponchelle
da6cb13338
Merge branch '1.5' into 2.0 2016-05-24 10:13:53 +02:00
Julien Duponchelle
00f80f54e8
Merge branch '1.5' into 2.0 2016-05-19 13:32:30 +02:00
Julien Duponchelle
d5895c3a47
Merge branch '1.5' into 2.0 2016-05-18 11:25:41 +02:00
Julien Duponchelle
f052299eb1
Return status in all cases 2016-05-17 19:51:06 +02:00
Julien Duponchelle
1eb77a0b3f
Fix docker support on 2.0 
Fix #528
 2016-05-16 18:32:29 +02:00
grossmj
5b604da33a Make sure nodes send the right notification when started, stopped or suspended. 2016-05-13 20:41:58 -06:00
grossmj
51738e19c3 Some spring cleanup for Docker VM. 2016-05-13 19:28:53 -06:00
grossmj
f81d35cc29 Handlers: cleanup and fixes. 2016-05-13 18:00:07 -06:00
Julien Duponchelle
5280644327
Return command_line and node_directory via the controller 2016-05-12 10:39:50 +02:00
grossmj
5a76f81271 Refactoring to use a common node class for all VMs and other (future) objects. 2016-05-11 11:35:36 -06:00
Julien Duponchelle
9dca7dfe4a
Merge branch '1.5' into 2.0 2016-05-10 17:51:40 +02:00
Julien Duponchelle
98b32cd9e2
Merge branch '1.5' into 2.0 2016-05-02 16:59:56 +02:00
Julien Duponchelle
8777e027b0
Merge branch '1.5' into 2.0 2016-04-26 11:48:43 +02:00
Julien Duponchelle
58d4a529d4
Rename hypervisor to compute 
Fix #487
 2016-04-15 17:59:59 +02:00