ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-23 14:42:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5,372 Commits 5 Branches 205 Tags 76 MiB
b3dfb87622
Commit Graph

229 Commits

Author SHA1 Message Date
grossmj
4f13c63a52 Do not use builtin name. 2017-10-13 17:51:19 +08:00
grossmj
02ad98664f Fix creation of an VMware VM failed with invalid JSON. Fixes #2282. 2017-10-13 17:50:23 +08:00
Julien Duponchelle
6996b7094f
Handle invalid appliances files 
Fix #1150
 2017-07-28 15:21:35 +02:00
Julien Duponchelle
c96694105c
Handle broken appliance files 
Fix #1135
 2017-07-20 16:10:56 +02: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
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
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
Julien Duponchelle
bb8097a052
Merge remote-tracking branch 'origin/master' into 2.1 2017-06-19 10:44:52 +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
e0b519eced Fix when config file doesn't have computes section (#1062) 2017-06-07 10:50:40 +02:00
Julien Duponchelle
cd17ef6b12
Merge branch '2.0' into 2.1 2017-05-15 15:46:50 +02:00
Julien Duponchelle
ae3e25b03b
Handle broken compute at server startup 
Fix #1001
 2017-05-03 17:40:58 +02:00
Julien Duponchelle
a6d085bf61
Fix server startup on windows 2017-04-28 11:06:39 +02:00
Julien Duponchelle
273a711459
Merge branch '2.0' into 2.1 2017-04-26 17:22:14 +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
ab2af5ceab
Catch error and log them when we can't write the config 
Fix #974
 2017-04-10 17:44:09 +02:00
Julien Duponchelle
ec6fdb7324
Catch GNS3 VM loading error at startup 2017-04-04 14:25:30 +02:00
Julien Duponchelle
4f1b738ef5
Merge branch '2.0' into 2.1 2017-03-30 10:16:16 +02:00
Julien Duponchelle
9fd5e4cbc9
Handle password configuration change on remote servers 
Fix https://github.com/GNS3/gns3-gui/issues/1942
 2017-03-22 18:29:08 +01:00
Julien Duponchelle
8712866489
Fix Can't connect to compute local on some computers 
Chicken and egg problem we try to connect to compute
before http was available. I rewrote the code to prevent
erase of settings and rollback the beta4 code for init.

Fix #946
 2017-03-21 18:06:45 +01:00
Julien Duponchelle
cc6f4c0510
Add a modification uuid to settings returned by the server 
Ref #1949
 2017-03-21 13:35:02 +01:00
Julien Duponchelle
6a015fffeb
Catch error when the server as trouble to access to itself 
Fix #940
 2017-03-16 10:50:08 +01:00
Julien Duponchelle
84a6ed7684
If your settings from 1.X are broken with skip them at import 
Fix #932
 2017-03-13 18:17:17 +01:00
Julien Duponchelle
99ee40df3d
Do not return broken appliances like ASA 8 2017-03-09 15:44:48 +01:00
Julien Duponchelle
5036079deb
Merge branch '2.0' into 2.1 2017-03-07 16:48:31 +01:00
Julien Duponchelle
7b642552dd
Fix GNS3VM settings are lost at startup 
Fix #926
 2017-03-07 15:36:35 +01:00
Julien Duponchelle
6017ebbd97
Merge branch '2.0' into 2.1 2017-03-07 11:16:05 +01:00
Julien Duponchelle
d89ea83746
When we receive settings from the client save them on disk 2017-03-07 11:12:51 +01:00
Julien Duponchelle
5a399b90fe
Merge branch '2.1' into embed_appliances 2017-02-28 14:55:33 +01:00
Julien Duponchelle
1ab9ca2333
Merge branch '2.0' into 2.1 2017-02-28 14:25:38 +01:00
Julien Duponchelle
39106ac36b
Do not prevent the creation of a local server on a machine named gns3vm 
Fix #920
 2017-02-28 13:11:03 +01:00
Julien Duponchelle
41d7570b24
Load local server before anything else 2017-02-28 12:08:47 +01:00
Julien Duponchelle
8aca3c7b99
Do not crash at startup if local server as the same name as remote server 
Fix #910
 2017-02-23 14:34:21 +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
Julien Duponchelle
5639cbe860
Fix a rare crash when closing a project 
Fix #900
 2017-02-13 15:24:22 +01:00
Julien Duponchelle
2a840da462
Create an ApplianceTemplate class 2017-02-08 15:40:56 +01:00
Julien Duponchelle
fbe26d11cf
Fix a potential crash 2017-02-06 11:07:35 +01:00
Julien Duponchelle
d06af526b2
Fix the server don't start if a remote is unavailable 2017-02-06 10:49:09 +01:00
Julien Duponchelle
e892e5dfab
Manage base configuration on server 
Fix #786
 2017-02-03 13:19:14 +01:00
Julien Duponchelle
dc6756d5ae
Embed the appliances in the server. 
This add a /appliances call
 2017-02-01 11:30:14 +01:00
Julien Duponchelle
47c58bb400
Fix UnboundLocalError: local variable 'vmname' referenced before assignment 
Fix #868
 2017-01-18 09:39:27 +01:00
Julien Duponchelle
e53db1ed81
Replace JSONDecodeError by ValueError (Python 3.4 compatibility) 
Fix #847
 2016-12-21 09:45:24 +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
897a94f343
Do not block server startup if one project use non implemented conversion 
Ref #822
 2016-12-12 11:18:17 +01:00
Julien Duponchelle
063087f6fb
Fix an error when deleting a compute already deleted 
Fix #815
 2016-12-12 11:09:07 +01:00
Julien Duponchelle
4bb990bf0c
Fix JSONDecodeError 
Fix #814
 2016-12-12 10:03:40 +01:00
Julien Duponchelle
bd1560ae50
Fix error when controller config file is corrupted 
Fix #812
 2016-12-08 10:52:21 +01:00
Julien Duponchelle
52260cba53
Fix crash if at controller loading the remote server is not a GNS3 server 
Fix #810
 2016-12-07 11:01:26 +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
5166d894eb
Do not reload a project via /load if the project is already opened 
Fix #785
 2016-11-14 18:45:44 +01:00
Julien Duponchelle
477091207d
Better handle compute unavailable errors 
Fix #775
 2016-11-11 10:38:59 +01:00
Julien Duponchelle
eabe4eb97e
Improve remote server console host support when binding to 0.0.0.0 
Fix https://github.com/GNS3/gns3-gui/issues/1574
 2016-10-26 14:43:47 +02:00
Julien Duponchelle
597e1e618d
Fix a possible deadlock at exit 2016-10-24 18:02:50 +02:00
Julien Duponchelle
786159110e
Fix conflict issue between the GNS3VM and a remote server 2016-10-24 15:24:45 +02:00
Julien Duponchelle
b9e7ccc14f
Fix typo in error message about the GNS3 VM 2016-10-24 15:16:53 +02:00
Julien Duponchelle
bfb82a9618
The gns3_controller.conf is located in the same directory of gns3_server.conf 
Fix #701
 2016-09-30 17:34:28 +02:00
Julien Duponchelle
8f6d24ae5e
Prevent a dead lock when closing server 2016-09-29 14:40:39 +02:00
Julien Duponchelle
3a8ca1071e
Support 0.0.0.0 as host when creating local compute 2016-09-27 11:54:23 +02:00
Julien Duponchelle
1412462229
Suspend the GNS3 VM 
Fix #656
 2016-09-08 15:32:35 +02:00
Julien Duponchelle
436543d8b8
English fix profil => profile 2016-09-07 17:44:51 +02:00
Julien Duponchelle
f1fe7246e7
Remove --controller 
This add too much complexity and it can work
without it.

Fix https://github.com/GNS3/gns3-vm/issues/80, #645
 2016-09-07 10:04:28 +02:00
Julien Duponchelle
bc5b5969eb
Import GNS3VM settings from 1.5 
Fix #643
 2016-09-06 13:06:20 +02:00
Julien Duponchelle
0573c3f7d5
Port name format for 2.0 
Ref #667, https://github.com/GNS3/gns3-gui/issues/1400
 2016-09-06 11:30:08 +02:00
Julien Duponchelle
4624c7433c
Do not dump GNS3 VM config in the list of computes of config file 2016-09-01 11:28:35 +02:00
Julien Duponchelle
0a08ea05d6
Fix project loading 2016-08-31 10:42:45 +02:00
Julien Duponchelle
e0c5fdcf1c
Avoid too much ressources usage during tests 2016-08-30 09:58:37 +02:00
Julien Duponchelle
96f3cb0445
Reconnect to compute after compute update 2016-08-29 18:58:49 +02:00
Julien Duponchelle
bbc1505274
Return what is supported by a compute node 
Ref https://github.com/GNS3/gns3-gui/issues/1448
 2016-08-29 15:53:10 +02:00
Julien Duponchelle
8352ff02a1
When you change settings of the GNS3 VM the VM is reloaded and project using it closed 
Fix #644
 2016-08-26 14:09:18 +02:00
Julien Duponchelle
5289c714f4
When you delete a compute all project using it are closed 
Ref #644
 2016-08-26 11:22:09 +02:00
Julien Duponchelle
9255dc07b7
Support auto stop for the GNS3 VM 
Ref https://github.com/GNS3/gns3-gui/issues/1254
 2016-08-25 14:26:01 +02:00
Julien Duponchelle
fc8b4c3216
Start GNS3 VM with the controller 
Ref https://github.com/GNS3/gns3-gui/issues/1254
 2016-08-25 11:49:06 +02:00
Julien Duponchelle
21b99ad9f9
Support for sendings settings for the GNS3VM from the GUI 
Ref https://github.com/GNS3/gns3-gui/issues/1441
 2016-08-25 09:32:06 +02:00
Julien Duponchelle
bfabf3ddc8
Fix tests about local compute node 2016-08-23 22:40:26 +02:00
Julien Duponchelle
ab38edf7ca
Merge branch 'profil_support' into 2.0 2016-08-23 10:06:40 +02:00
Julien Duponchelle
897455d5e9 Return computer name instead of local. It's more logic when using remote controller 2016-08-22 18:49:25 +02:00
Julien Duponchelle
46910a183e
Allow to use the local node even without --local 2016-08-22 18:37:32 +02:00
Julien Duponchelle
5bb1abb2a9
Support for profil settings 2016-08-22 17:21:03 +02:00
grossmj
faae248487 Cosmetic changes. 2016-08-20 11:10:34 -06:00
Julien Duponchelle
ac085126fc
Support for auto open projects 
Fix #1418
 2016-08-16 16:04:20 +02:00
Julien Duponchelle
0613efa297
Support for auto open project 2016-08-15 20:51:59 +02:00
Julien Duponchelle
68eca6c111
Replace snapshots by import / export 
Fix #1042
 2016-07-26 19:52:58 +02:00
Julien Duponchelle
e50acf811c
If we don't have a GNS3 VM on linux don't move file to it 2016-07-25 18:03:22 +02:00
Julien Duponchelle
9bdc0b78eb
Now import project on VM work 2016-07-22 18:02:11 +02:00
Julien Duponchelle
fec3694710
Import project on the GNS3VM should work 2016-07-22 16:05:22 +02:00
Julien Duponchelle
487e99bea5
Import with images 2016-07-21 17:55:37 +02:00
Julien Duponchelle
b5ab53bbe9
Early import project api 2016-07-21 14:48:13 +02:00
Julien Duponchelle
dd63ca6ef1
Temporary fix for remote GNS3 VM support 
Ref #623
 2016-07-19 13:38:15 +02:00
Julien Duponchelle
b745397a3a
Import server config from 1.X GUI 2016-07-14 15:15:28 +02:00
Julien Duponchelle
7e91a5cb11
Raise error if not started with --local 
If you try to use a local server but you don't have started
it with --local we raise an error.
 2016-07-08 11:17:17 +02:00
Julien Duponchelle
68b7f81601
Dissalow duplicate name for compute and project 
Fix #541
 2016-06-29 17:39:41 +02:00
Julien Duponchelle
c4d7a0b8fc
A settings API 
Ref #589
 2016-06-29 14:16:29 +02:00
Julien Duponchelle
b66f7daa28
Beginning of the symbols from controller 
Ref #496
 2016-06-27 18:37:20 +02:00
Julien Duponchelle
5a410155f7
Create the controller config at first controller start 2016-06-23 12:17:44 +02:00
Julien Duponchelle
3132d51694
Do not reload a project if project is already opened 
Ref https://github.com/GNS3/gns3-gui/issues/1251
 2016-06-17 17:50:06 +02:00
Julien Duponchelle
c66ef9d218
Support filename for project in the controller 2016-06-16 16:57:54 +02:00
Julien Duponchelle
6d36429870
Reload a topology work 2016-06-15 16:26:16 +02:00
Julien Duponchelle
524f8991bc
Project status (opened / closed) 2016-06-15 16:26:16 +02:00
Julien Duponchelle
0569480953
Create link when loading topology on controller 2016-06-15 16:26:16 +02:00
Julien Duponchelle
742243e9df
Method for reloading a topology (not bind to an api handler) 
Ref https://github.com/GNS3/gns3-gui/issues/1243
 2016-06-15 16:26:16 +02:00
Julien Duponchelle
d815d25bdf
Write .gns3 on server 
Ref https://github.com/GNS3/gns3-gui/issues/1243
 2016-06-14 12:04:23 +02:00
Julien Duponchelle
1b530bde3f
Fix Compute name is lost at save 
Fix #562
 2016-06-08 14:25:11 +02:00
Julien Duponchelle
4afa5994e8
Fix stacktrace when exiting with Ctrl + C 
Fix #547
 2016-06-02 13:44:52 +02:00
Julien Duponchelle
314a7cd8fb
Generate an uuid for compute node if None is provided 2016-05-25 14:10:03 +02:00
Julien Duponchelle
dbda3fc8fc
Add method to delete and update computes 2016-05-25 11:28:13 +02:00
Julien Duponchelle
a797038aeb
Drop code for temporary projects 
Fix https://github.com/GNS3/gns3-gui/issues/982
 2016-05-24 17:57:04 +02:00
Julien Duponchelle
df73f80bf5
Auto create the local compute node 2016-05-24 15:45:06 +02:00
Julien Duponchelle
0aa81b5fa5
Send event when adding compute node or modify it (for server sumary) 2016-05-23 18:44:20 +02:00
Julien Duponchelle
54747ee618
Support for link event, fix link not correctly deleted 2016-05-18 18:37:18 +02:00
Julien Duponchelle
fa0af7f4a2
Correctly process node.updated event on controller 2016-05-18 16:12:57 +02:00
Julien Duponchelle
694e1a2e68
Extract the notification part of controller to a dedicated class 2016-05-18 14:56:23 +02:00
grossmj
c88c67e8ef Updates Ethernet hub schema. 2016-05-15 21:01:33 -06:00
grossmj
6cea6c9162 Some more (spring) cleaning. 2016-05-13 18:48:10 -06:00
grossmj
f81d35cc29 Handlers: cleanup and fixes. 2016-05-13 18:00:07 -06:00
grossmj
be1efe8327 Schemas review. 2016-05-12 19:07:25 -06:00
grossmj
ef7b4ef020 Fixes tests and some PEP8. 2016-05-11 15:19:00 -06:00
grossmj
483431438a Merge remote-tracking branch 'origin/2.0' into 2.0 
Conflicts:
	gns3server/controller/project.py
	tests/compute/test_project.py
	tests/controller/test_project.py
 2016-05-11 11:41:45 -06: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
a0344576ba
Show version for debug 2016-05-11 16:31:16 +02:00
Julien Duponchelle
390401000f
A client could not erase the local compute node config in the controller 
Fix #499
 2016-05-11 15:02:35 +02:00
Julien Duponchelle
c8c61f2ae8
Add endpoint to list the compute nodes 2016-04-19 16:53:41 +02:00
Julien Duponchelle
f5e5cf5059
Save the list of compute node 
Fix #494
 2016-04-19 15:35:50 +02:00
Julien Duponchelle
58d4a529d4
Rename hypervisor to compute 
Fix #487
 2016-04-15 17:59:59 +02:00
Julien Duponchelle
bc14d5d78e
Notif forwarded from hypervisor to controller 2016-03-18 16:56:23 +01:00
Julien Duponchelle
4326d412f9
API for creating a VM 2016-03-10 21:51:29 +01:00
Julien Duponchelle
58f1abff35
Close, commit and delete supported for projects in controller 2016-03-10 10:32:07 +01:00
Julien Duponchelle
6fa2491255
Rename /controller/servers to /controller/hypervisors 2016-03-08 16:04:12 +01:00
Julien Duponchelle
aad69e9650
Create a /server API for register servers 
This allow to push to the controller information about
the connection to a server.
 2016-03-03 16:05:09 +01:00
Julien Duponchelle
84eb8356e8
Create a container class and a flag for enable it from command line 
Ref #417
 2016-03-02 09:49:52 +01:00