arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Code Issues Releases Wiki Activity
2,336 Commits 5 Branches 203 Tags 151 MiB
8352ff02a1
Commit Graph

1934 Commits

Author SHA1 Message Date
Julien Duponchelle
b98d4cb042
Fix Virtualbox support 2016-07-12 16:22:55 +02:00
Julien Duponchelle
febf0f7839
Fix crash when winpcap is not installed 
Ref https://github.com/GNS3/gns3-gui/issues/1380
 2016-07-12 13:43:08 +02:00
Julien Duponchelle
9cd3231de3
Fix docker support in 2.0 2016-07-12 12:17:19 +02:00
grossmj
234f199558 Load/save GNS3 VM settings on controller side. 2016-07-11 21:43:01 -06:00
grossmj
13deecea4e Basic API for GNS3 VM. 2016-07-11 17:01:18 -06:00
Julien Duponchelle
91ec61b88d
Check topology schema when loading/saving it 
Fix #583
 2016-07-11 15:36:52 +02:00
Julien Duponchelle
9bf4c22a50
Fix HTTP errors not forwarded from compute to client 
Fix #615
 2016-07-11 09:33:55 +02:00
grossmj
50aa198ba7 Mark interface type upstream. 2016-07-10 14:54:31 -06:00
grossmj
d159cbcc6d Rename /interfaces entry point to /network/interfaces. Ref #615. 2016-07-10 11:22:08 -06:00
Julien Duponchelle
d99c050705
Fix schema error in qemu 2016-07-08 11:27:22 +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
26d49f19c1
1.5.2dev1 2016-07-07 18:58:23 +02:00
Julien Duponchelle
e1a7efad60
1.5.1 2016-07-07 18:58:23 +02:00
grossmj
08956e438c Add NIO TAP support for Docker and VMware. Fixes #603. 2016-07-06 22:00:39 -06:00
Julien Duponchelle
7a4c01e737
When you delete a node all link connected are destroyed 
Ref #608
 2016-07-05 16:07:05 +02:00
Julien Duponchelle
ca4d09ea40
Merge branch 'master' into 2.0 2016-07-05 15:41:53 +02:00
Julien Duponchelle
e175650fb0
Increase the number of interface for docker 
Fix #593
 2016-07-04 17:22:54 +02:00
Julien Duponchelle
5f88db93ff
Add the method in the bad request answer 2016-07-04 15:00:46 +02:00
Julien Duponchelle
e0a2553be4
Fix a rare crash in IOU 
Fix #604
 2016-07-04 14:46:06 +02:00
Julien Duponchelle
b905760635
Fix a crash when docker is used but not installed 
Fix #605
 2016-07-04 14:12:39 +02:00
Julien Duponchelle
f9bc745ddb
Backport Docker node hot linking 
Fix #596
 2016-07-04 11:18:03 +02:00
grossmj
ead8a6caa2
Allows hot-linking for Docker containers. Ref #267. 2016-07-04 10:58:00 +02:00
Julien Duponchelle
7fee90805b
Ensure we update all the label of a link with only one update notif 2016-07-01 21:56:42 +02:00
Julien Duponchelle
9d2f4168ff
Correctly restore label position for link 2016-07-01 21:33:39 +02:00
Julien Duponchelle
5bf6011429
Rotation for label of interfaces 2016-07-01 19:54:44 +02:00
Julien Duponchelle
fea1e3ba61
Support update link on controller 
Ref https://github.com/GNS3/gns3-gui/issues/1300
 2016-07-01 17:38:32 +02:00
Julien Duponchelle
71d4c0a13a
Store rotation for labels 2016-07-01 15:30:38 +02:00
Julien Duponchelle
818174824b
Breaking change for 2.X topologies! Store width and height for nodes & a 
style properties
 2016-07-01 14:38:42 +02:00
Julien Duponchelle
fe7bcae6a1
Send node.updated notif only if object changed 2016-06-30 18:29:17 +02:00
Julien Duponchelle
758a427a76
Add documentation about notifications 2016-06-30 11:08:01 +02:00
Julien Duponchelle
543b423e03
Send compute usage via in the compute.updated notification 
Ref https://github.com/GNS3/gns3-gui/issues/1261
 2016-06-30 09:55:59 +02:00
Julien Duponchelle
68b7f81601
Dissalow duplicate name for compute and project 
Fix #541
 2016-06-29 17:39:41 +02:00
Julien Duponchelle
22f9effede
Save to disk when config change 2016-06-29 15:15:22 +02:00
Julien Duponchelle
c4d7a0b8fc
A settings API 
Ref #589
 2016-06-29 14:16:29 +02:00
Julien Duponchelle
8ec11619cd
Full symbol support on server 
Fix #496
 2016-06-28 22:23:34 +02:00
Julien Duponchelle
e77445e860
API for uploading symbols 2016-06-28 21:15:22 +02:00
Julien Duponchelle
bf154049d2
Suppport ~/GNS3/symbols 2016-06-28 19:58:57 +02:00
Julien Duponchelle
5b4e668eb5
Move symbol static to /symbols 2016-06-28 18:17:48 +02:00
Julien Duponchelle
c5fa699b9e
New crash report key 2016-06-27 20:42:50 +02:00
Julien Duponchelle
5fab48ba75
1.5.1dev1 2016-06-27 20:35:08 +02:00
Julien Duponchelle
2739483751
1.5.0 2016-06-27 20:24:53 +02:00
Julien Duponchelle
b66f7daa28
Beginning of the symbols from controller 
Ref #496
 2016-06-27 18:37:20 +02:00
Julien Duponchelle
c0b09ae76a
Merge branch '1.5' into 2.0 2016-06-27 14:24:48 +02:00
Julien Duponchelle
1f0fe6d304
Fix import of project with no disk 
Ref #590
 2016-06-27 12:38:18 +02:00
Julien Duponchelle
fa769cd41d
Restore the veth- prefix for docker otherwise it's conflict with network 
manager

See #593, #440
 2016-06-27 12:09:46 +02:00
grossmj
379c216109 Allow for (a lot) more docker container ports. Fixes #593. 2016-06-26 21:50:08 -06:00
grossmj
d79fb231d3 Use uBridge for VirtualBox connections plus some cleaning. Ref #267. 2016-06-24 18:35:39 -06:00
grossmj
d28fad223f Allows hot-linking for Docker containers. Ref #267. 2016-06-24 17:26:40 -06:00
grossmj
ce3276d374 Option to deactivate using uBridge globally. 2016-06-24 15:04:58 -06:00
grossmj
abfb51baa8 Base for GNS3 VM controlled by the controller. 2016-06-23 21:56:42 -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
4eb03b5a99 Allows the creation of non-existent TAP interfaces when using the cloud. 2016-06-23 11:36:32 -06:00
Julien Duponchelle
5a410155f7
Create the controller config at first controller start 2016-06-23 12:17:44 +02:00
Julien Duponchelle
4c3bfde97e
Fix test suite after VPCS changes for using ubridge 2016-06-23 12:10:18 +02:00
Julien Duponchelle
852d8e411e
Shape => Drawing 2016-06-23 11:17:23 +02:00
grossmj
00da15e4af Use uBridge for VPCS connections. Ref #267. 2016-06-22 19:40:46 -06:00
Julien Duponchelle
b456a363ca
Sample curl with shapes 2016-06-22 18:14:14 +02:00
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