NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-11-17 09:14:52 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,501 Commits 6 Branches 202 Tags 85 MiB
a437760f5d
Commit Graph

2077 Commits

Author SHA1 Message Date
Julien Duponchelle
bc613e9fd8
Send SVG in shape update only when change 2016-06-22 17:46:00 +02:00
AJ NOURI
5daff17911 Update __init__.py 
Missing sys import.
Solves issue #585
 2016-06-22 15:27:23 +02:00
Jeremy Grossmann
8296621320 Merge pull request #584 from GNS3/kill_ghosts 
Kill ghosts process at startup (Dynamips, VPCS, Ubridge)
 2016-06-21 22:20:56 -06:00
Julien Duponchelle
03e9eac55b
Rotation support 2016-06-21 19:39:00 +02:00
Julien Duponchelle
4f78efa0c8
Return the svg field in shape API 
Ref #498
 2016-06-21 12:19:12 +02:00
Julien Duponchelle
32252e5193
Merge branch '1.5' into 2.0 2016-06-21 09:58:28 +02:00
Julien Duponchelle
42ff398f05
Raise an error if you try to use Docker on non Linux host 2016-06-21 09:57:47 +02:00
Julien Duponchelle
116135b9dc
Item => Shape 2016-06-21 09:49:16 +02:00
Julien Duponchelle
85ebac7eb3
API for rectangle & co 
Ref #498
 2016-06-20 18:45:31 +02:00
Julien Duponchelle
6949976d12
Merge branch '1.5' into 2.0 2016-06-20 12:45:56 +02:00
Julien Duponchelle
d1de665939
Fix a crash in Docker if daemon stop to respond 
Fix #580
 2016-06-20 11:46:10 +02:00
Julien Duponchelle
f151181409
Fix a crash if Dynamips router has no initial configuration 
Fix #572
 2016-06-20 11:41:39 +02:00
Julien Duponchelle
07395c9cf2
Kill ghosts process at startup (Dynamips, VPCS, Ubridge) 
This is done only if you lock by pid to avoid killing process
of another server.

Fix #581
 2016-06-20 09:55:59 +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
4783691c87
Drop /upload 
Fix #552
 2016-06-17 17:25:59 +02:00
Julien Duponchelle
49eb7d8ce7
Atomic save of the .gns3 
Fix #579
 2016-06-17 17:13:36 +02:00
Julien Duponchelle
627ebdb322
Fix issue with reloading a topologie with dynamips 2016-06-17 15:56:35 +02:00
grossmj
ba05ca029e Fixes conflicting argument vs config file option. 2016-06-16 12:03:48 -06:00
grossmj
a289c9c685 Change option from udp_discovery to server_discovery. 2016-06-16 11:27:10 -06:00
grossmj
da58a65075 Merge remote-tracking branch 'origin/2.0' into 2.0 
Conflicts:
	gns3server/web/web_server.py
 2016-06-16 11:19:03 -06:00
grossmj
32907ccac3 Use a classic thread for UDP server discovery. Closes #545. 2016-06-16 11:17:12 -06:00
Julien Duponchelle
c66ef9d218
Support filename for project in the controller 2016-06-16 16:57:54 +02:00
Julien Duponchelle
411ca56b94
Fix Exception when closing local server (started by GUI) 
Fix #578
 2016-06-16 15:00:32 +02:00
Julien Duponchelle
45d7e09cbd
Add a settings in command line and config file to enable discovery 2016-06-16 09:53:32 +02:00
Julien Duponchelle
f45901e861
Merge branch '2.0' of github.com:GNS3/gns3-server into 2.0 2016-06-16 09:19:48 +02:00
grossmj
56051b1142 UDP server discovery. Ref #545. 2016-06-15 17:37:43 -06:00
Julien Duponchelle
2a1c5cfd9c
Merge branch '1.5' into 2.0 2016-06-15 19:14:03 +02:00
Julien Duponchelle
38a41a1cfd
1.5.0dev6 2016-06-15 18:53:04 +02:00
Julien Duponchelle
8fbfae6a98
1.5.0rc2 2016-06-15 18:51:31 +02:00
Julien Duponchelle
aa5988788d
Strip user from compute in topology and return project filename 2016-06-15 18:22:11 +02:00
Julien Duponchelle
c4d619ce3c
API for loading a project from a .gns3 2016-06-15 16:43:03 +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
5ca9becdf9
Do not crash if we can not cleanup a temporay project 
Fix #576
 2016-06-15 11:08:31 +02:00
Julien Duponchelle
bb0db7846f
Fix black screen with Qt app in Docker container 
Fix #556
 2016-06-15 11:01:03 +02:00
Julien Duponchelle
e82862c69f
Detect when command in the container exit 
Fix #571
 2016-06-15 10:32:38 +02:00
Julien Duponchelle
d98a7aac19
Docker when exit aux console restart it 
Ref #571
 2016-06-15 10:21:30 +02:00
Julien Duponchelle
43a3584a5c
Pass by default the environment variable container=docker 
Fix #573
 2016-06-15 10:12:32 +02:00
Julien Duponchelle
049c348709
Fix busybox binary location 
Fix #570
 2016-06-14 23:09:28 +02:00
Jeremy Grossmann
3aea16c527 Merge pull request #568 from GNS3/watch_dynamips_change 
Watch for dynamips rom & nvram change
 2016-06-14 11:58:42 -06: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
3255be0ae2
Drop the commit system 
Ref https://github.com/GNS3/gns3-gui/issues/1243
 2016-06-14 10:16:33 +02:00
Julien Duponchelle
52f852bc6d
Merge branch '1.5' into 2.0 2016-06-14 09:50:07 +02:00
grossmj
7beadd03a6 Merge remote-tracking branch 'origin/2.0' into 2.0 2016-06-13 15:07:40 -06:00
grossmj
31f4b52631 Add zeroconf. Ref #545. 2016-06-13 15:07:20 -06:00
Julien Duponchelle
343f2b574d
Avoid loosing console port for Docker 
Fix #569
 2016-06-13 21:20:29 +02:00
Julien Duponchelle
016c3e515b
Workaround a crash in x11vnc 
Fix? #569
 2016-06-13 20:12:42 +02:00
Julien Duponchelle
70431a5fa6
Send update of properties from controller only for controller stuffs 
Fix #566
 2016-06-13 18:46:30 +02:00
Julien Duponchelle
4f03c3011e
Delete volume when dropping the container 
Fix #567
 2016-06-13 17:39:04 +02:00
Julien Duponchelle
e183e7da27
Catch connection reset in ioucon 2016-06-13 16:28:26 +02:00
Julien Duponchelle
67c04a7855
Watch for dynamips rom & nvram change 
This monitor for change the file from dynamips by computing a
hash of the watched file.

The way dynamips work prevent the update of the modification time.

We can improve that by using native system for watching file but:
* it's require dependencies specific for each OS
* dependencies use C extensions
* this is only a backup if your router is cleanly shutdown we export
stuff
 2016-06-13 15:57:36 +02:00
grossmj
2bde02d459 Controller side unique node name allocation. Ref #541. 2016-06-11 17:31:30 -06:00
Jeremy Grossmann
6cd136b423 Merge pull request #565 from GNS3/watch_iou 
Monitor IOU NVRAM changes.
 2016-06-10 22:33:56 -06:00
grossmj
b079cf9546 Fixes typo. 2016-06-10 22:33:07 -06:00
grossmj
c3c5eb533f Detect Wifi adapters on OSX. Fixes #549. 2016-06-10 12:36:41 -06:00
Julien Duponchelle
69334665d2
Monitor IOU nvram for change 
With the save as you go we need to save the startup config
when a change appear instead of the old commit system.
 2016-06-10 18:26:01 +02:00
Julien Duponchelle
182a979e71
Generic class for watch file change 2016-06-10 17:51:19 +02:00
Julien Duponchelle
1c6de3ff39
Fix an error when updating IOU node 2016-06-10 16:39:54 +02:00
Julien Duponchelle
2a5cf18d20
When using pool raise again exception received 2016-06-10 14:42:46 +02:00
grossmj
e46171b826 Merge branch '1.5' into 2.0 
Conflicts:
	gns3server/handlers/api/compute/iou_handler.py
 2016-06-09 19:35:59 -06:00
grossmj
3c9e8507d1 Handle vmnet interfaces in the cloud on OSX. Fixes #554. 2016-06-09 19:00:33 -06:00
grossmj
a35f41e4dc Prevent users to connect the cloud to Wireless adapters on OSX. Fixes #549. 2016-06-09 18:42:14 -06:00
grossmj
313226786f Delete vlan.dat for L2IOL during config import. Fixes #1285. 2016-06-09 17:47:45 -06:00
Julien Duponchelle
dee9d423a3
Support for x,y,z,symbols,label in node object on controller 
https://github.com/GNS3/gns3-gui/issues/1297
 2016-06-09 16:47:58 +02:00
Julien Duponchelle
70345abc2a
Try cleaner close of the compute node 
Ref #547
 2016-06-08 17:18:40 +02:00
Julien Duponchelle
fe98163bd0
Send controller images only for qemu, iou and dynamips 2016-06-08 15:59:54 +02:00
Julien Duponchelle
1b530bde3f
Fix Compute name is lost at save 
Fix #562
 2016-06-08 14:25:11 +02:00
Julien Duponchelle
add546158f
List images return images on compute and controller 
Fix #506
 2016-06-08 14:14:03 +02:00
Julien Duponchelle
08e482004f
Auto upload missing images 2016-06-07 19:38:01 +02:00
Julien Duponchelle
972cbd0594
Cleanly forward exception from compute to controller 2016-06-07 16:06:37 +02:00
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
Julien Duponchelle
98b32cd9e2
Merge branch '1.5' into 2.0 2016-05-02 16:59:56 +02:00
Julien Duponchelle
c17e00204f
Auto reconnect to docker if connection was closed 
Fix #507
 2016-05-02 16:55:05 +02:00
Julien Duponchelle
936faaba5a
gns3z => gns3project 2016-05-02 10:33:04 +02:00
grossmj
5c1522f24a Bump version to 1.5.0dev2 2016-04-28 23:47:17 -06:00
Julien Duponchelle
848120c354
1.4.7dev1 2016-04-28 18:38:11 +02:00
Julien Duponchelle
8a19afd618
1.4.6 2016-04-28 18:27:33 +02:00
Julien Duponchelle
815ef6066d
Merge branch 'master' into 1.5 2016-04-28 16:52:29 +02:00
Julien Duponchelle
85f571ee8b
Solve wintypes import 2016-04-28 16:35:58 +02:00
Julien Duponchelle
cf1b7ebe1f
Raise error if qemu can not create backing image 2016-04-27 15:12:15 +02:00
grossmj
4fc5364ab5 More robust save/restore for VirtualBox linked clone VM hard disks. 2016-04-26 15:44:11 -06:00
grossmj
4a91d8a6a5 Prevent non linked cloned hard disks to be detached when using VirtualBox linked cloned VMs. Fixes #1184. 2016-04-26 15:06:22 -06:00
Julien Duponchelle
f98f6bf3ed
Close doesn't exists when stopping the capture 2016-04-26 22:19:38 +02:00
grossmj
b408f29726 Stricter checks to match VMware version to the right vmrun (VIX library) version. 
Also checks the VIX library version when only using the GNS3 VM running in VMware.
 2016-04-26 13:12:42 -06:00
Julien Duponchelle
92d1594afd
Return link object when start capturing 2016-04-26 18:13:15 +02:00
Julien Duponchelle
76b2ca2bc0
Return the full path to the capture 2016-04-26 17:36:24 +02:00
Julien Duponchelle
264254e657
Captures written in the captures directory on the controller 2016-04-26 17:10:33 +02:00
Julien Duponchelle
9a1eeb57e9
Controll of the project directory in the controller 2016-04-26 14:34:49 +02:00
Julien Duponchelle
893b05d26b
Removed unused code 2016-04-26 11:52:35 +02:00
Julien Duponchelle
7390d833ba
Merge branch 'master' into 2.0 2016-04-26 11:50:16 +02:00
Julien Duponchelle
1d08d4a5fa
Merge branch 'master' into 1.5 2016-04-26 11:49:24 +02:00
Julien Duponchelle
8777e027b0
Merge branch '1.5' into 2.0 2016-04-26 11:48:43 +02:00
Julien Duponchelle
6d6e8196d2
Allow only .pcap to be downloaded from remote stream API 
Fix #500
 2016-04-26 09:52:18 +02:00
Julien Duponchelle
75196b8a55
Fix incrementation of qemu mac address 
Fix #501
 2016-04-25 16:36:20 +02:00
Julien Duponchelle
7ffdd0fab1
Fix broken connectivity between containers 
Fix #502
 2016-04-25 16:09:04 +02:00
Julien Duponchelle
1ce576c020
Stream pcap from compute to controller to client 2016-04-22 16:22:03 +02:00
Julien Duponchelle
48e71617d6
Store capture in a temporary directory on compute node 2016-04-21 17:27:49 +02:00
Julien Duponchelle
30f05c6190
Merge branch '1.5' into 2.0 2016-04-21 17:02:28 +02:00
Julien Duponchelle
637a7326ec
Ignore captures during project export 2016-04-21 17:02:05 +02:00
Julien Duponchelle
4a99a172a3
Show on wich compute node a VM is running in the debug page 2016-04-21 16:18:15 +02:00
Julien Duponchelle
1a22fb9250
Expose the capture status in controller link API 2016-04-21 16:11:42 +02:00
Julien Duponchelle
549a6280c0
Data link type is on the capture not on the link 2016-04-21 13:49:29 +02:00
Julien Duponchelle
04a1b2df3b
Method for start / stop capture on a link 
Ref https://github.com/GNS3/gns3-gui/issues/1117
 2016-04-21 12:14:09 +02:00
Julien Duponchelle
78a9785819
Missing qemu for VM creation via controller 2016-04-20 16:32:32 +02:00
Julien Duponchelle
ee0f1eb5fb
Forward 503 error 2016-04-20 16:24:30 +02:00
Julien Duponchelle
f6593663b5
APi for listing VM in controller 2016-04-20 14:38:14 +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
6463007ef1
Remove debug 2016-04-19 15:17:02 +02:00
Julien Duponchelle
d8005f6d4f
Cleanup unused code 2016-04-19 11:51:02 +02:00
Julien Duponchelle
ce5461aee8
Raise error if we try to controll a non controller server 
Fix #451
 2016-04-19 10:47:53 +02:00
Julien Duponchelle
9349bdc916
Fix documentation 2016-04-18 20:55:22 +02:00
Julien Duponchelle
6b9e46950c
Update VPCS and delete VPCS via controller 2016-04-18 18:56:03 +02:00
Julien Duponchelle
d7ed37ce02
Update and delete VM on controller 2016-04-18 17:36:38 +02:00
Julien Duponchelle
6c11ad5fa6
Reload VM 2016-04-18 16:57:02 +02:00
Julien Duponchelle
58d4a529d4
Rename hypervisor to compute 
Fix #487
 2016-04-15 17:59:59 +02:00
Julien Duponchelle
3185baff0d
Start / Stop / Suspend marche 2016-04-14 12:22:10 +02:00
Julien Duponchelle
2841b5769e
Lock for controller or compute 2016-04-14 12:15:45 +02:00
Julien Duponchelle
7f77c66888
Support VMware VM in non standard location for fusion 2016-04-13 09:38:58 +02:00
Julien Duponchelle
2055cdea5e
/start /stop and /suspend API for VM via container 2016-04-12 18:02:36 +02:00
Julien Duponchelle
ad7ca86f32
Fix 1.5 merge 2016-04-12 16:21:35 +02:00
Julien Duponchelle
183d02ded5
Restore qcow2 module 2016-04-12 16:17:06 +02:00
Julien Duponchelle
6b61811f9d
Merge branch '1.5' into 2.0 2016-04-12 16:14:37 +02:00
Julien Duponchelle
b7a859fa30
Import / Export with images 
Ref https://github.com/GNS3/gns3-gui/issues/1173
 2016-04-12 10:11:45 +02:00
Julien Duponchelle
cd393491d5
At export use only relative image path 
Fix https://github.com/GNS3/gns3-gui/issues/1176
 2016-04-11 17:18:03 +02:00
Julien Duponchelle
9e8fcab65c
Merge branch '1.5' into 2.0 2016-04-08 17:40:27 +02:00
Julien Duponchelle
ae5468a2d3
When starting docker raise proper error if ubridge is not available 
Fix #484
 2016-04-08 16:13:42 +02:00
grossmj
ec6e5a6118 Do not send warnings back to the GUI when a console port not in range or is already taken. 2016-04-07 14:42:52 -06:00
Julien Duponchelle
f1737a6e43
Merge branch 'master' into 1.5 2016-04-07 14:44:56 +02:00
Julien Duponchelle
e3b95fe9ce
Just log debug if docker link we try to destroy is already closed 
Fix https://github.com/GNS3/gns3-gui/issues/1159
 2016-04-07 14:33:21 +02:00
Julien Duponchelle
dff74352f7
Allow multiple user connected to the same VNC for docker 2016-04-07 14:24:53 +02:00
Julien Duponchelle
977ccabf98
Server support for VNC console resolution 
Ref https://github.com/GNS3/gns3-gui/issues/1165
 2016-04-07 13:29:11 +02:00
Julien Duponchelle
ad6fb664a2
Fix detection of EOF in Docker telnet console 
Fix #476
 2016-04-07 10:58:37 +02:00
Jeremy Grossmann
6bc54b17c7 Merge pull request #481 from GNS3/import_linux 
Flatten the project at export and support import for Linux
 2016-04-06 11:55:46 -06:00
Jeremy Grossmann
bb63f51f80 Merge pull request #478 from GNS3/qcow2_rebase 
Qcow2 rebase
 2016-04-06 11:55:06 -06:00
Julien Duponchelle
b335daf857
Cleanup 2016-04-06 18:27:30 +02:00
Julien Duponchelle
b93c85c390
Allow to change the number of adapters for Docker (server side) 2016-04-06 16:01:34 +02:00
Julien Duponchelle
cb197627b4
Fix an issue with VNC port range 2016-04-06 15:58:29 +02:00
Julien Duponchelle
9b9eddb30c
Fix VNC broke after container update 
Fix https://github.com/GNS3/gns3-gui/issues/1163
 2016-04-06 14:57:52 +02:00
Julien Duponchelle
e564c84529
Flatten the project at export and support import for Linux 
The client will send a flag to say if the import should be done
on the VM or not

Ref https://github.com/GNS3/gns3-gui/issues/1151
 2016-04-06 12:08:00 +02:00
Julien Duponchelle
5531a576d1
Import create project if not exists (GNS3 VM just need an UUID) 2016-04-05 19:59:38 +02:00
Julien Duponchelle
9ed15e55af
Move more import code to the server 
https://github.com/GNS3/gns3-gui/issues/1156
 2016-04-05 18:32:48 +02:00
Julien Duponchelle
2651a48102
Fix the docker aux port is lost after an update 
Fix https://github.com/GNS3/gns3-gui/issues/1155
 2016-04-05 16:33:40 +02:00
Julien Duponchelle
57394dfebf
Rebase the qcow2 when starting the VM if needed 
Ref #466
 2016-04-05 12:41:26 +02:00
Julien Duponchelle
7422b31b2c
Refactor code for avoid duplicate in disk management for Qemu 2016-04-05 12:35:07 +02:00
Julien Duponchelle
06b9e46cd2
Create Qcow2 class for reading Qcow2 and rebase it 
Ref #466
 2016-04-05 12:20:37 +02:00
Julien Duponchelle
36dbcfa7f6
Do not block when ifup 
-R --timeout=1 --tryagain=1 -b

Fix #469
 2016-04-04 20:32:11 +02:00
grossmj
6eca621b19 Clear warnings about using linked clones with VMware Player. 2016-04-04 12:10:48 -06:00
Julien Duponchelle
34459f6a88
Fix log with recent aiohttp versions 2016-03-31 18:03:40 +02:00
Julien Duponchelle
e097a0e728
Fix Dynamips VM ignores changed console port 
Fix #468
 2016-03-31 10:06:38 +02:00
Julien Duponchelle
3b04f556b3
In the export rename the .gns3 to project.gns3 2016-03-30 17:56:55 +02:00
Julien Duponchelle
bd71f0cf4c
Import API 2016-03-30 17:42:00 +02:00
Julien Duponchelle
879591eaf5
Export API 2016-03-30 17:42:00 +02:00
Bernhard Ehlers
498d006225 Minor cleanup on docker-init 2016-03-30 08:29:10 +00:00
Julien Duponchelle
c1193c23c1
Merge branch 'master' into 1.5 2016-03-29 09:20:43 +02:00
grossmj
ba006f105f Alternative method to find the Documents folder on Windows. 2016-03-28 19:37:34 -06:00
grossmj
fa58b1f81c Check for NPF service on Windows. 2016-03-25 19:53:36 -06:00
grossmj
d243cb7d02 New console port range 5000 to 10000. 2016-03-25 10:32:04 -06:00
Julien Duponchelle
c563dbba8a
Change default port to 3080 
Fix #487
 2016-03-25 15:31:17 +01:00
Julien Duponchelle
5345fe8490
Minor code cleanup 2016-03-25 15:27:31 +01:00
Julien Duponchelle
2a20333877 Merge pull request #461 from GNS3/ehlers-docker-init 
Support /etc/network/interfaces
 2016-03-25 11:34:05 +01:00
Julien Duponchelle
2e455037e1
Fix crash when you start twice the same container 2016-03-24 18:35:15 +01:00
Julien Duponchelle
23c48f5e3d
Add to project an API to write a file 2016-03-24 17:34:41 +01:00
Julien Duponchelle
e6ddce86b3
Docker init supports /etc/network/interfaces 
* Generate an /etc/network/interfaces
* Use busybox also for aux console

Ref #460
 2016-03-24 17:10:53 +01:00
Julien Duponchelle
268c61ce80
Merge branch 'docker-init' of https://github.com/ehlers/gns3-server into ehlers-docker-init 2016-03-24 16:11:20 +01:00
Julien Duponchelle
2fcada49d4
2.0.0dev1 2016-03-24 10:38:57 +01:00
Julien Duponchelle
40f496c7e9
Merge branch '1.5' into 2.0 2016-03-24 10:11:58 +01:00
Julien Duponchelle
d2c32bb570
Merge branch 'master' into 1.5 2016-03-24 09:17:52 +01:00
Julien Duponchelle
3fe8016938
1.4.6 dev1 2016-03-23 18:14:04 +01:00
Julien Duponchelle
01dbaea2e4
1.4.5 2016-03-23 18:11:48 +01:00
grossmj
427cb05c2a Stop the VMware VM if there is an error while setting up the network connections or console. 2016-03-23 10:54:45 -06:00
Bernhard Ehlers
d36a9f3403 docker-init: add DHCP support 2016-03-23 09:13:07 +00:00
grossmj
fa22e19321 Bump version to 1.4.5dev2 2016-03-22 14:43:47 -06:00
Bernhard Ehlers
d472f47829 docker-init: static busybox, support for /etc/network/interfaces 2016-03-22 15:28:56 +00:00
grossmj
975e1c8fa7 Fixes dev syntax bug. 2016-03-20 11:32:40 -06:00
grossmj
19b46a4014 Include VMware VMs paths found preferences.ini 2016-03-19 15:41:26 -06:00
grossmj
7cdf23f497 Allow to stop a VMware VM from GNS3 even if halted within the VM. Fixes #1118. 2016-03-19 12:08:44 -06:00
grossmj
06da40cdcd Keep Dynamips stdout log file in the project directory. 2016-03-19 11:32:15 -06:00
Julien Duponchelle
bc14d5d78e
Notif forwarded from hypervisor to controller 2016-03-18 16:56:23 +01:00
Julien Duponchelle
de61ed316c
The controller has a streaming API 
Now we need to link the hypervisor to the controller.
 2016-03-17 17:32:37 +01:00
Julien Duponchelle
76a0120d3e
PEP8 2016-03-17 15:16:09 +01:00
Julien Duponchelle
b55969d381
Notification feed for the hypervisor 2016-03-17 15:15:30 +01:00
Julien Duponchelle
d81fc25b27
Fix a merge error 2016-03-16 16:40:12 +01:00
Julien Duponchelle
dd2fdcc574
Merge branch '1.5' into networkv2 2016-03-16 16:35:23 +01:00
Julien Duponchelle
174e7cccea
Merge branch 'master' into 1.5 2016-03-16 16:35:03 +01:00
Julien Duponchelle
aa6c44a470
Fix crash when a n hypervisor return no body 2016-03-16 16:10:06 +01:00
Julien Duponchelle
757ee34dac
Support auth for network V2 hypervisors 2016-03-16 15:55:07 +01:00
Julien Duponchelle
c0e452133d
Web interface for debbuging controller 2016-03-15 11:32:10 +01:00
Julien Duponchelle
7a095478fe
Success to add a dynamips with apiv2 2016-03-15 10:45:05 +01:00
grossmj
a018c5b0f5 Get MAC addresses for host interfaces to use for filtering frames from vmnet interfaces. 2016-03-14 18:27:51 -06:00
Julien Duponchelle
8fed1d9b9f
API for deleting a link 2016-03-14 20:54:05 +01:00
Julien Duponchelle
ed291da566
Rebuild doc 2016-03-14 20:37:07 +01:00
Julien Duponchelle
9062490be3
API for deleting a list 2016-03-14 17:40:27 +01:00
Julien Duponchelle
9771b33b68
Create link using UDP work 2016-03-14 16:51:47 +01:00
grossmj
93e2d4096d Dynamips uuid hypervisor command is no longer supported. 2016-03-12 22:15:36 -07:00
Julien Duponchelle
8cb5a6ec75
Typo 2016-03-11 20:34:01 +01:00
Julien Duponchelle
17c5d3048c
Cleanup 2016-03-11 20:15:02 +01:00
Julien Duponchelle
65099b9364
Link API should work now need to implement the client 2016-03-11 20:13:52 +01:00
Julien Duponchelle
8c1560332e
Remove /controller from the api endpoint 2016-03-11 17:16:09 +01:00