1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-26 16:58:28 +00:00
Commit Graph

1805 Commits

Author SHA1 Message Date
Julien Duponchelle
d8bdd16e13
Raise an error if image is missing on compute 2016-06-07 15:34:04 +02:00
Julien Duponchelle
dcebaf61b8
Do not timeout forwarded calls 2016-06-07 11:21:47 +02:00
Julien Duponchelle
d30abeca21
Merge branch '1.5' into 2.0 2016-06-07 10:56:55 +02:00
Julien Duponchelle
df7d26e418
Fix for copy VOLUMES by @ehlers 2016-06-07 09:27:37 +02:00
Julien Duponchelle
c829a250a9
Revert "Integrate fixes from @ehlers"
This reverts commit 775ee4259e.
2016-06-07 09:26:27 +02:00
Julien Duponchelle
8909c4211c
Support upload images 2016-06-06 19:55:54 +02:00
Julien Duponchelle
582e3c72ff
Forward post with large content to compute 2016-06-06 19:51:35 +02:00
Julien Duponchelle
775ee4259e
Integrate fixes from @ehlers 2016-06-06 18:27:49 +02:00
Julien Duponchelle
d108fc6e94
Support all path for forward to compute 2016-06-06 18:26:13 +02:00
Julien Duponchelle
06b54d82dc
Support forwarding POST request to compute nodes 2016-06-06 15:45:32 +02:00
Julien Duponchelle
61ac8763f2
Merge branch '1.5' into 2.0 2016-06-06 14:28:21 +02:00
Julien Duponchelle
e335015520
Copy original ressources from VOLUMES
Fix #561
2016-06-06 12:39:29 +02:00
grossmj
65bfb4b907 Remove debug print. 2016-06-02 21:32:46 -06:00
Julien Duponchelle
8c760f3ccc
Fix some compute_id detection 2016-06-02 19:55:10 +02:00
Julien Duponchelle
eaf621cc57
Generic forward call to compute node (especially for qemu with require a
lot of call)
2016-06-02 19:38:16 +02:00
Julien Duponchelle
e05b0a396e
Disallow / in compute_id because it was a stupid idea 2016-06-02 18:38:47 +02:00
Julien Duponchelle
917c1c7f84
Expose /virtualbox/vms /vmwares/vms and /images via controller
Ref #1192, #537
2016-06-02 18:02:48 +02:00
Julien Duponchelle
fecd81655e
Support recursive image search
Fix #546
2016-06-02 16:44:38 +02:00
Julien Duponchelle
a702155230
Support multiple images location
Ref #546
2016-06-02 15:34:40 +02:00
Julien Duponchelle
cb7dbfb256
Merge branch '1.5' into 2.0 2016-06-02 13:47:40 +02:00
Julien Duponchelle
4afa5994e8
Fix stacktrace when exiting with Ctrl + C
Fix #547
2016-06-02 13:44:52 +02:00
grossmj
f47eb326c7 Revert move "/version" endpoint to "/server/version".
Move "/server/shutdown" endpoint to "/shutdown".
2016-06-01 18:21:07 -06:00
grossmj
cd07a99118 Some cleaning + move "/version" endpoint to "/server/version". 2016-06-01 17:50:31 -06:00
Julien Duponchelle
469187c584
1.5.0dev5 2016-06-01 20:32:23 +02:00
Julien Duponchelle
ad7ecb8850
1.5.0rc1 2016-06-01 20:24:48 +02:00
Julien Duponchelle
9b99a03cbf
Fix working dir when starting a docker container 2016-06-01 20:13:48 +02:00
Julien Duponchelle
3aed651062
Always use busybox for docker permission fix 2016-06-01 20:09:15 +02:00
Julien Duponchelle
435dc82873
Save an restore docker permission
Fix #550
2016-06-01 18:16:56 +02:00
Julien Duponchelle
87f15eafe0
Shutdown on controller
Ref https://github.com/GNS3/gns3-gui/issues/1191
2016-06-01 15:41:13 +02:00
Julien Duponchelle
ae687346f1
Export the list of volumes to a env variable accessible in the container
Ref #550
2016-06-01 11:39:42 +02:00
grossmj
f9d88d902a Remove NIOVMNET. 2016-05-31 19:16:55 -06:00
grossmj
f2eb2a4bdc Remove NAT NIO. 2016-05-31 19:06:48 -06:00
Julien Duponchelle
d3436756b2
Fix permissions and ownership when stopping container
Fix #550
2016-05-31 21:08:41 +02:00
Julien Duponchelle
6f7b06e66f
Fix a crash when docker start command is None
Ref #550
2016-05-31 16:32:12 +02:00
Julien Duponchelle
009ffcb4ef
Ubridge 0.9.4 is require
Ref #551
2016-05-31 15:46:07 +02:00
grossmj
f0e0988d6a Includes uBridge stdout in case of error. 2016-05-30 22:07:37 -06:00
grossmj
3f61fbeb0e Generate a MAC address using the project + node UUID. Ref #522. 2016-05-30 11:52:08 -06:00
Julien Duponchelle
e65648398b
Catch extra args in windows signal handler 2016-05-30 15:29:57 +02:00
Julien Duponchelle
6c1d7bad81
Catch extra args in windows signal handler 2016-05-30 15:29:17 +02:00
Julien Duponchelle
4c291f5051
Remove /config/reload
Fix #539, https://github.com/GNS3/gns3-gui/issues/1187
2016-05-30 15:24:38 +02:00
Julien Duponchelle
29127895b9
Fix the watch local server configuration file
Ref #539
2016-05-30 15:18:49 +02:00
grossmj
c1aad550fa Merge branch '1.5' into 2.0
Conflicts:
	gns3server/version.py
2016-05-29 19:52:15 -06:00
grossmj
59f22cd346 Functional cloud. Fixes #402. 2016-05-29 16:35:07 -06:00
grossmj
39a3f2fae2 Cloud schema and remove use_ubridge for VMware VM. 2016-05-28 21:46:48 -06:00
grossmj
ea7754f1c8 Allow to block network traffic originating from the host OS for vmnet interfaces (Windows only). 2016-05-28 13:39:21 -06:00
grossmj
914fe7e750 Randomize the 4th and 5th bytes when provided with a base mac address. Fixes #522. 2016-05-27 23:00:05 -06:00
Julien Duponchelle
8e3e3c08f8
Fix an import error when you have no GNS3 VM 2016-05-27 16:09:41 +02:00
Julien Duponchelle
e497e98ca1 Warn if you can not export a file due to permission issue
Fix #543
2016-05-27 14:45:02 +02:00
Julien Duponchelle
df654b40ff
Add a test 2016-05-26 13:43:35 +02:00
Julien Duponchelle
fbc04e083b
Allow empty password 2016-05-26 13:32:52 +02:00
Julien Duponchelle
84b12fd953
Support null in compute user and password 2016-05-26 10:11:11 +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
6162d7e431
Generated compute name include the username when it's exists 2016-05-25 13:58:29 +02:00
Julien Duponchelle
d469a2060d
Update a computes require only changed arguments 2016-05-25 11:48:09 +02:00
Julien Duponchelle
0063fb4615
Add 127.0.0.1:8080 in allowed CORS 2016-05-25 11:36:39 +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
b126c396c9
Start all, with a controlled concurrency
Fix #536
2016-05-24 11:21:49 +02:00
Julien Duponchelle
da6cb13338
Merge branch '1.5' into 2.0 2016-05-24 10:13:53 +02:00
grossmj
3fd0a6d638 Do not delete adapters when stopping a VMware VM. Ref #1066.
Allocate a new vmnet interface if vmnet 0 1 or 8 is set to a custom adapter.
Set adapter type to all adapters regardless if already configured or added by GNS3.
2016-05-23 15:53:03 -06:00
grossmj
851ba074e7 Set default VMware VM adapter type to e1000. 2016-05-23 14:14:42 -06: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
cdd54b951a
1.5.0 dev 4 2016-05-23 15:13:19 +02:00
Julien Duponchelle
1ddb16eca0
1.5.0b1 2016-05-23 15:08:23 +02:00
Julien Duponchelle
f6a3899603
Return a compute name it could be different of compute id 2016-05-23 11:27:47 +02:00
grossmj
7d055968e5 First step towards the cloud node re-factoring. 2016-05-22 19:24:14 -06:00
grossmj
7bc0570735 Allow an IOS router to stop even the Dynamips hypervisor command fail to be sent. Ref #488. 2016-05-21 19:13:36 -06:00
grossmj
1ae17b74df Extract private-config only when necessary (content is different than the default). Fixes #520. 2016-05-21 18:58:28 -06:00
grossmj
cb6df28f59 Fixes disabling the VPCS relay feature. Fixes #521. 2016-05-21 17:42:34 -06:00
grossmj
3e89543ab9 Fixes wrong exception in Docker VM implementation. 2016-05-21 15:19:32 -06:00
grossmj
a2ebbaa322 Force Npcap DLL to be used first for Dynamips and uBridge (instead of the one from Winpcap if installed). 2016-05-21 14:43:10 -06:00
grossmj
67e346ba92 Fixed startup-config is lost if you change any IOS router settings. Fixes #1233. 2016-05-21 13:20:18 -06:00
grossmj
acdc1e5ebb Fixes check for NPF service and add check for NPCAP service on Windows. 2016-05-20 20:19:28 -06:00
grossmj
6d5085910c Frame Relay and ATM switches migrated to the new API. 2016-05-20 17:59:59 -06:00
grossmj
57fd72c35c Ethernet hub and Ethernet switch almost fully migrated to the new API. 2016-05-19 22:45:04 -06:00
Julien Duponchelle
672a617102
Compute IDLE PC via controller
Fix #1234
2016-05-19 16:22:15 +02:00
Julien Duponchelle
00f80f54e8
Merge branch '1.5' into 2.0 2016-05-19 13:32:30 +02:00
Julien Duponchelle
2bb062c61e
Fix ProcessLookupError X11VNC
Fix #534
2016-05-19 13:23:53 +02:00
Julien Duponchelle
a741662636
Force tag latest for docker image if no tag is specified
Fix #533
2016-05-19 13:09:07 +02:00
Julien Duponchelle
b00a09efaa
Test link.updated event 2016-05-18 21:28:37 +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
Julien Duponchelle
d86cefaaeb
Support node without console
Fix #532
2016-05-18 11:59:25 +02:00
Julien Duponchelle
d5895c3a47
Merge branch '1.5' into 2.0 2016-05-18 11:25:41 +02:00
Julien Duponchelle
871fea33e0
Cleanup unbreakable space 2016-05-18 11:23:45 +02:00
Julien Duponchelle
82f82f8cf9
Send updated event when you update the node 2016-05-18 11:03:13 +02:00
grossmj
7ebbdcd47c Functional Ethernet hub with new API. Uses Dynamips backend by default for now. 2016-05-17 21:22:18 -06:00
Julien Duponchelle
f052299eb1
Return status in all cases 2016-05-17 19:51:06 +02:00
Julien Duponchelle
c4ebdc0e37
Allow cors from Github pages demo site 2016-05-17 17:51:22 +02:00
Julien Duponchelle
b07dcf552c
Add an endpoint for listing the links of a project 2016-05-17 16:10:47 +02:00
Julien Duponchelle
ce0d715895
Fix Deleted node are still return by the API
Fix #529
2016-05-17 13:11:43 +02:00
Julien Duponchelle
342bcdb5b6
CORS support
Fix #530
2016-05-17 12:39:23 +02:00
Julien Duponchelle
b44c2ea713
Merge branch '1.5' into 2.0 2016-05-17 09:39:36 +02:00
Julien Duponchelle
8cb5cedb5d
Do not raise error if vmrun.exe is named vmrun.EXE 2016-05-17 09:28:05 +02:00
Julien Duponchelle
da81b49fdc
Delete the project on all node where the project is created 2016-05-16 21:59:40 +02:00
Julien Duponchelle
a496aaab9e
Send node.updated event and tests are green
Fix #524
2016-05-16 21:12:32 +02:00
Julien Duponchelle
5c8b3f3f4c
Avoid crash at capture startup with dynamips 2016-05-16 18:45:03 +02:00
Julien Duponchelle
1eb77a0b3f
Fix docker support on 2.0
Fix #528
2016-05-16 18:32:29 +02:00
Julien Duponchelle
a9b95eb242
If the compute node is remote do not send project path 2016-05-16 18:17:24 +02:00
Julien Duponchelle
d97325b113
Fix you can not update Dynamips and IOU node
Fix https://github.com/GNS3/gns3-gui/issues/1239
2016-05-16 17:53:40 +02:00
Julien Duponchelle
f76f417e52
Merge branch '1.5' into 2.0 2016-05-16 16:48:53 +02:00
Julien Duponchelle
bc33683e47
Load docker api only for Linux
Fix #525
2016-05-16 16:47:27 +02:00
Julien Duponchelle
ac24922300
Node deleted event
Fix #527
2016-05-16 14:31:00 +02:00
grossmj
c88c67e8ef Updates Ethernet hub schema. 2016-05-15 21:01:33 -06:00
grossmj
7a523990a6 Base for generic switch nodes. Ref #492. 2016-05-15 11:23:14 -06: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
f1bc2f22c3 Start, stop, suspend and reload endpoints for all nodes belonging to a project. Fixes #1212. 2016-05-13 19:26:50 -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
Julien Duponchelle
885d93be02
Delete a node work 2016-05-13 17:50:07 +02:00
grossmj
be1efe8327 Schemas review. 2016-05-12 19:07:25 -06:00
Julien Duponchelle
2857d9a070
Send a field status in the node object 2016-05-12 19:15:46 +02:00
Julien Duponchelle
d43e78a1d7
Support all characters for compute ID 2016-05-12 16:41:05 +02:00
Julien Duponchelle
b46a0ff4ae
Endpoint for getting information about a compute node 2016-05-12 16:35:14 +02:00
Julien Duponchelle
5280644327
Return command_line and node_directory via the controller 2016-05-12 10:39:50 +02:00
grossmj
801b94a964 Fixes VirtualBox VMs list images. 2016-05-11 16:45:17 -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
9ccb55206d
Cleanup code for getting the default project directory 2016-05-11 18:42:55 +02:00
Julien Duponchelle
a0344576ba
Show version for debug 2016-05-11 16:31:16 +02:00
Julien Duponchelle
95d2bd0065
Merge branch '1.5' into 2.0 2016-05-11 16:16:29 +02:00
Julien Duponchelle
fa140e991c
Merge branch 'master' into 1.5 2016-05-11 16:16:11 +02:00
Julien Duponchelle
f4b79af45f
Move tools for creating self signed certificate to clean repo 2016-05-11 16:13:32 +02:00
Julien Duponchelle
c2da568543
Protect controller and compute about path outside project directory
Fix #503
2016-05-11 15:59:32 +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
cd836f146e
Create the project on compute only when needed 2016-05-11 10:56:43 +02:00
Julien Duponchelle
f414ce459a
1.5.0dev3 2016-05-11 10:03:03 +02:00
Julien Duponchelle
366e9620dc
Prepare 1.5.0 alpha 2 2016-05-10 19:14:50 +02:00
Julien Duponchelle
e108a9e136
Prepare alpha 1 2016-05-10 17:58:11 +02:00
Julien Duponchelle
9dca7dfe4a
Merge branch '1.5' into 2.0 2016-05-10 17:51:40 +02:00
Julien Duponchelle
9e2043bfa8
Ensure that the connection to docker is closed when leaving server
Fix https://github.com/GNS3/gns3-gui/issues/1227
2016-05-10 12:14:48 +02:00
Julien Duponchelle
28f7c2a1cd
Ensure in all cases the docker console is closed before restart
Fix https://github.com/GNS3/gns3-gui/issues/1226
2016-05-10 11:39:59 +02:00
Jeremy Grossmann
c7d58eb3b3 Merge pull request #518 from GNS3/detect_eth
Wait for all interfaces available in container
2016-05-09 10:54:37 -06:00
Jeremy Grossmann
41f02dad54 Merge pull request #516 from GNS3/improve_parse_version
Improve parse_version
2016-05-07 11:02:58 -06:00
grossmj
76cc1d2750 Fixes call to export project. 2016-05-07 10:39:32 -06:00
Julien Duponchelle
2cdfd6c0d7
Wait for all interfaces available in container
Fix #511
2016-05-06 19:07:18 +02:00
Julien Duponchelle
57cf57b408
Improve parse_version
Ref #515
2016-05-06 17:09:03 +02:00
grossmj
16b5bb8810 Workaround for exception when using gns3server.utils.parse_version. Fixes #513. 2016-05-05 10:15:51 -06:00
Julien Duponchelle
56c153af79
Make HTTP support more reliable with home made HTTP server 2016-05-04 16:32:45 +02:00
Julien Duponchelle
9beca700a5
PEP8 2016-05-04 16:32:37 +02:00
Julien Duponchelle
8e429ee4c1
Ban port dissalowed by chrome and firefox 2016-05-03 21:07:01 +02:00
Julien Duponchelle
f3095d94c1
Replace port in HTTP flow for docker 2016-05-03 18:01:23 +02:00
Julien Duponchelle
5fd385159c
HTTP support for docker
Fix #509
2016-05-03 16:49:33 +02:00
Julien Duponchelle
dcbaa62df8
Better aux console for docker
Fix #472
2016-05-03 11:33:43 +02:00
Julien Duponchelle
e9fb7f4981
Make sure an image is not partially uploaded
Fix #505
2016-05-02 17:25:46 +02:00
Julien Duponchelle
d952718f30
Fix RuntimeWarning: You have iterated over the result of
pkg_resources.parse_version. This is a legacy behavior

Fix #504
2016-05-02 17:14:15 +02:00