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
5,524 Commits 6 Branches 202 Tags 85 MiB
6bd855b3c5
Commit Graph

216 Commits

Author SHA1 Message Date
grossmj
76af98404a Drop Python 3.4 and switch to async / await syntax for asyncio. Fixes #1425 2018-10-15 17:05:49 +07:00
grossmj
9de13c570c Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/compute/builtin/nodes/cloud.py
#	gns3server/compute/docker/docker_vm.py
#	gns3server/compute/dynamips/nodes/ethernet_switch.py
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py
#	gns3server/controller/__init__.py
#	gns3server/version.py
#	gns3server/web/web_server.py
 2018-10-04 15:44:13 +02:00
grossmj
e4a6db8ebc Fix some typos. 2018-10-04 15:22:42 +02:00
grossmj
17d657c919 Fix small errors like unhandled exceptions etc. 2018-09-11 15:06:01 +02:00
grossmj
4021a13651 Catch exceptions in various locations to fix small issues reported by Sentry. 2018-09-06 09:49:12 +02:00
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
7f72b90b0e The server has now 2 notification streams 
* A new one for controller related events (compute, appliance templates etc.)
* The existing one for project related events (links, nodes etc.)
 2018-08-16 21:31:57 +07:00
grossmj
89f7169589 Add appliance UUID added to the node data. Fixes #1334. 2018-08-09 17:45:33 +07:00
grossmj
a54359d243 Clean GNS3 close if one remote server is down. Fixes #1357. 2018-08-09 16:59:10 +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
grossmj
d0ed6931d8 Catch exception: ZIP does not support timestamps before 1980. Ref #1360. 2018-07-26 13:34:23 -05:00
ziajka
ac73c72727 Don't send variables to computes where are empty, Ref: #1340 2018-06-13 18:55:47 +02: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
7b3d5ae5e3 Create/update project on compute when variables changes 2018-05-09 15:29:35 +02:00
ziajka
0bcc657bf1 Don't clean logo images when applied to the project 2018-05-08 16:22:35 +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
50a922f83e Offload slow file operations to threads for snapshots and project "save as". Ref #1187 #1307. 2018-04-28 16:01:43 +07: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
025441f027 Add default destination setting for traceng + some checks. 2018-04-16 15:03:22 +08:00
grossmj
2de182eff4 Grid size support for projects. 2018-04-13 16:54:57 +08:00
grossmj
669d2ec038 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/schemas/node.py
 2018-03-30 12:14:09 +07:00
grossmj
297bbd91ec Fix traceng tests. 2018-03-30 12:10:57 +07:00
grossmj
898f180310 Fix issue with start all. 2018-03-29 13:32:56 +07:00
grossmj
b7780ba7cc Check for valid IP address and prevent to run on non-Windows platforms. 2018-03-29 13:26:43 +07:00
grossmj
d08c08617c Support for source and destination for traceNG. 2018-03-27 16:58:49 +07:00
grossmj
fb3bcf3b8f Basic project stats. 2018-03-15 15:21:29 +07:00
grossmj
658aa4bae9 Merge 2.1 into 2.2 branch 2018-03-12 13:38:50 +07:00
grossmj
c93d0d8d12 Make sure we don't try to read when opening a file in binary more. Fixes #1301. 2018-03-07 16:39:04 +07:00
grossmj
519df3ab35 Let a project be opened when a port cannot be found (can happens if a project is corrupted). 2018-02-02 22:05:51 +08:00
grossmj
e5c76750b1 Fix issue when running multiple project containing IOU nodes on the same server. Ref #1239. 2018-01-31 15:51:29 +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
28f8216590 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/version.py
#	requirements.txt
 2018-01-23 12:47:13 +07:00
grossmj
7ded71142f Fix same MAC address for duplicated Qemu nodes. 2018-01-17 14:13:06 +08:00
grossmj
c281f55fb2 Fix same base MAC for duplicated IOS routers. Fixes #1264. 2018-01-17 14:01:44 +08:00
grossmj
e5e2b7a8ac Fix "Creating multiple IOU nodes at once assigns the same application id". Fixes #1239. 2018-01-15 18:09:05 +07:00
grossmj
ab6fe6da1d Compatibility for old node templates (those with default_symbol and hover_symbol properties). 2018-01-12 17:34:37 +07:00
grossmj
6e2752648a Implement #1153 into 2.2 branch. 2017-11-27 15:16:46 +07:00
grossmj
061af38b5a Make sure connected links are removed when a node is deleted. 2017-11-23 11:19:41 +07:00
grossmj
e1c8df170a Allow projects to be opened even when a node port is already used. 2017-09-14 17:57:58 +07:00
grossmj
4a2dfb0037 Do not prevent a project to be deleted. Fixes #2237. 2017-09-06 18:12:22 +07:00
ziajka
b0783eeccc Load meta of the project on loading time (Fixes #2225) 2017-08-22 09:36:52 +02:00
ziajka
e15d1cd350 Fixes loading project when link_id is not set (#1159) 2017-08-10 10:02:18 +02:00
Julien Duponchelle
283b08c2a1
Fix naming of node with a number in the name 
Fix #1149
 2017-07-27 16:06:52 +02:00
Julien Duponchelle
cc89099ea5
Fix ServerDisconnectedError for stop_all 
Fix #1089
 2017-07-27 11:33:27 +02:00
grossmj
47e8392ceb Use uuid4() for temporary node name while duplicating a node. 2017-07-24 15:52:14 +07:00
Julien Duponchelle
0854c04687
API for duplication a Node 
Support:
* VPCS
* Dynamips router
* Ethernet switch

Ref #1065
 2017-07-24 10:08:22 +02:00
Julien Duponchelle
fa211a82eb
Filters support for VMware 
Fix #1108
 2017-07-18 18:04:03 +02:00
Julien Duponchelle
699ecb7c89
Merge branch 'master' into 2.1 2017-07-11 18:59:50 +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
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
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
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
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
ziajka
1d09f423e5 Disable checking if IOU is on the same server 2017-06-23 12:20:49 +02:00
Julien Duponchelle
bb8097a052
Merge remote-tracking branch 'origin/master' into 2.1 2017-06-19 10:44:52 +02:00
ziajka
64a852f38f Fixes #1068 - handle zipfile encoding issues at project duplication 2017-06-09 15:32:25 +02:00
Julien Duponchelle
93adef91d8
Merge branch '2.0' into 2.1 2017-05-31 16:58:31 +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
273a711459
Merge branch '2.0' into 2.1 2017-04-26 17:22:14 +02:00
Julien Duponchelle
2962649dc8
Fix a race condition when handling error at project opening 
Fix #983
 2017-04-19 09:17:32 +02:00
Julien Duponchelle
9dc6f0f486 Embed the appliances in the server. (#927) 
This add a /appliances call
 2017-04-12 14:35:49 +02:00
Julien Duponchelle
bc0e4c1174
Generate a node uuid if the uuid is missing in the .gns3 
Fix #950
 2017-03-20 16:21:09 +01:00
Julien Duponchelle
0997998064
Ensure to dump project before exporting it 
Fix #951
 2017-03-20 14:57:20 +01:00
Julien Duponchelle
31ed2a4c96
Fix ComputeError: Can't connect to Main server 
Fix #942
 2017-03-16 12:05:30 +01:00
Julien Duponchelle
e828c9068a
Fix an issue with some node name format 
Fix #922
 2017-02-28 18:03:10 +01:00
Julien Duponchelle
8e9c480d8d
Catch some invalid node name formatting 
Fix #917
 2017-02-27 11:24:06 +01:00
Julien Duponchelle
defcf82610
Fix a rare error when closing a project 
Fix #897
 2017-02-13 15:18:00 +01:00
Julien Duponchelle
6ded234681
Fix an error with Python 3.4 2017-02-06 17:19:02 +01:00
Julien Duponchelle
bcc71b5455
Fix a crash with Python 3.4 
Fix https://github.com/GNS3/gns3-server/issues/876
 2017-02-06 16:52:13 +01:00
Julien Duponchelle
9c7d2e9915
Raise an error if you put an invalid key in node name 
Fix https://github.com/GNS3/gns3-gui/issues/1833
 2017-02-06 15:05:29 +01:00
Julien Duponchelle
0d7157c295
Improve a lot project loading speed 
Fix #893
 2017-02-06 11:57:56 +01:00
Julien Duponchelle
fbe26d11cf
Fix a potential crash 2017-02-06 11:07:35 +01:00
Julien Duponchelle
959c08449e
Do not crash if you pass {name} in name 2017-02-03 14:56:55 +01:00
Julien Duponchelle
267a5ae3a8
Do not crash when you broke permission on your file system during 
execution

Fix #878
 2017-01-27 10:52:17 +01:00
Julien Duponchelle
d74769c824
Fix duplicate node names 
Fix https://github.com/GNS3/gns3-gui/issues/1796
 2017-01-18 18:28:50 +01:00
Julien Duponchelle
e0071f5b59
Catch error when a file is deleted during the compression of project 
Fix #860
 2017-01-10 10:16:45 +01:00
Julien Duponchelle
3259ec1220
Close project if one one the compute of the project is down 
Fix #836
 2016-12-15 21:57:59 +01:00
Julien Duponchelle
89537204df
Fix delete project on remote compute server 
Fix https://github.com/GNS3/gns3-gui/issues/1714
 2016-12-12 22:41:43 +01:00
Julien Duponchelle
40af2a35e0
Wait for the end of project loading before making new change 
Fix #790
 2016-11-18 17:35:28 +01:00
Julien Duponchelle
5ab85e5c9e
Avoid crash due to persmission error on the .backup file 2016-11-18 17:17:14 +01:00
Julien Duponchelle
477091207d
Better handle compute unavailable errors 
Fix #775
 2016-11-11 10:38:59 +01:00
Julien Duponchelle
2a4b68d3b7
/duplicate support non opened projects 
Ref https://github.com/GNS3/gns3-gui/issues/1585
 2016-10-18 16:50:41 +02:00
Julien Duponchelle
19be2d85b7
Fix Snapshot restore does not work with IOS routers 
Fix https://github.com/GNS3/gns3-gui/issues/1583
 2016-10-18 16:19:14 +02:00
Julien Duponchelle
dd849f7945
Strip space from all nodes names 
Fix #727
 2016-10-18 11:11:45 +02:00
Julien Duponchelle
6fa8c52482
Fix a bug when selecting a topology and deleting multiple linked device 
Fix https://github.com/GNS3/gns3-gui/issues/1554
 2016-10-03 16:36:16 +02:00
Julien Duponchelle
4d6d0e96c6
Fix crash if you manually delete the project directory and use the delete button in interface 
Fix #697
 2016-09-30 10:47:37 +02:00
Julien Duponchelle
36175f7c26
Catch timeout error when closing project 
Fix #698
 2016-09-30 10:40:10 +02:00
Julien Duponchelle
74dd212def
One less exit deadlock 2016-09-29 15:07:17 +02:00
Julien Duponchelle
8f6d24ae5e
Prevent a dead lock when closing server 2016-09-29 14:40:39 +02:00
Julien Duponchelle
c91999c532
Disallow running IOU on multiple server 
Fix #690
 2016-09-26 15:35:58 +02:00