1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-30 18:50:58 +00:00
Commit Graph

732 Commits

Author SHA1 Message Date
Julien Duponchelle
fbd3a54877
Merge branch 'master' into 2.0 2016-10-19 09:13:28 +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
ec3660c979
Catch an error when docker is not running 2016-10-14 19:06:12 +02:00
Julien Duponchelle
fbdcf67d29
If docker container state failed to return we consider the container stopped 2016-10-14 19:00:25 +02:00
Julien Duponchelle
241c9b0c11
Fix Error when converting some dynamips topologies from 1.3 => 2.0
Fix #718
2016-10-07 12:33:46 +02:00
Julien Duponchelle
5a695d2651
Missing busybox for docker 2016-10-05 14:57:58 +02:00
Jeremy Grossmann
46e1fbda60 Merge pull request #712 from GNS3/set_qemu_uuid
Set Qemu uuid for csr1000v
2016-10-04 20:55:11 -06:00
Julien Duponchelle
5a7f5d2950
Check if GNS3 has access to all docker resssources
Ref #702
2016-10-04 21:14:19 +02:00
Julien Duponchelle
2b9c190bcf
Handle errors when startup config path is wrong
Fix #715
2016-10-04 17:16:52 +02:00
Julien Duponchelle
7baf584367
Merge branch 'master' into 2.0 2016-10-04 14:53:50 +02:00
Julien Duponchelle
48a73f9ab5
Fix a rare crash in vbox
Fix #710
2016-10-03 21:39:43 +02:00
Julien Duponchelle
780086cd5b
Remove a debug 2016-10-03 18:40:59 +02:00
Julien Duponchelle
f3d255756b
Set Qemu uuid for csr1000v
Fix #711
2016-10-03 15:54:20 +02:00
Julien Duponchelle
99bdf37ec3
Prevent connect a node to himself
Fix https://github.com/GNS3/gns3-gui/issues/1553
2016-10-03 12:31:01 +02:00
Julien Duponchelle
f6b34e2434
Bug fixes on Hub 2016-09-29 16:01:18 +02:00
Julien Duponchelle
2b1fab6742
Conversion issue for switch & hub from 1.5 to 2.0
Fix #694
2016-09-29 14:59:11 +02:00
Julien Duponchelle
fd3ac65eb5
Qemu fixes for windows 2016-09-27 18:01:50 +02:00
Julien Duponchelle
7df645f742
Fix a crash in NAT 2016-09-27 11:54:07 +02:00
Julien Duponchelle
3ea5df7462
Make better error when we have no netmask
Fix #1541
2016-09-27 11:47:18 +02:00
Julien Duponchelle
5555662b2c
Fix If I change the content of cloud the cloud no longer work
Fix #1540
2016-09-27 11:21:40 +02:00
Julien Duponchelle
f3596767c1
Merge branch 'master' into 2.0 2016-09-26 15:17:05 +02:00
Julien Duponchelle
79b4926cad
Fix the nat node
Ref #686
2016-09-26 15:08:55 +02:00
Julien Duponchelle
4c900ce639
Cleanup port when cloud failed to create 2016-09-23 10:52:08 +02:00
Julien Duponchelle
41f12457e7
Fix a crash in cloud 2016-09-22 18:29:46 +02:00
Julien Duponchelle
29563ed7bc
Fill cloud interface server side
Fix https://github.com/GNS3/gns3-gui/issues/1535
2016-09-22 17:46:32 +02:00
Julien Duponchelle
6837cc8e23
Fix for nat node
Ref #686
2016-09-22 15:58:31 +02:00
Julien Duponchelle
4bd9556767
Merge branch 'master' into 2.0 2016-09-21 19:27:44 +02:00
Julien Duponchelle
056ae41d56
Fix invalid content in the dynamips export
Fix #1527
2016-09-21 17:49:25 +02:00
Julien Duponchelle
d2b0321419
Improve ASA 8 warning 2016-09-21 12:37:25 +02:00
Julien Duponchelle
b7bd73e8c9
Fix AttributeError: 'Cloud' object has no attribute '_ports'
Fix #682
2016-09-18 22:16:14 +02:00
Julien Duponchelle
84a2f8b4a3
Return flag for special interface that you can use in the cloud
Fix https://github.com/GNS3/gns3-gui/issues/1509
2016-09-14 17:15:06 +02:00
Julien Duponchelle
2f0e2260ab
Move the generation of the list of ports to the server
Ref #676
2016-09-14 15:21:37 +02:00
Julien Duponchelle
f06c00fdb8
Fix Can't remove a slot from dynamips device
Fix https://github.com/GNS3/gns3-gui/issues/1510
2016-09-14 11:40:45 +02:00
Jeremy Grossmann
b8909c54cf Merge pull request #649 from GNS3/bind_qemu_all_host
Bind qemu UDP tunnels on all hosts
2016-09-12 11:04:08 -06:00
grossmj
de526482e3 Fixes unknown nvram format for IOU. Fixes #594. 2016-09-07 12:41:13 -06:00
Julien Duponchelle
67fc563d81
Merge branch 'master' into 2.0 2016-09-07 15:01:51 +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
d772b6fbd7
Nat node work on any linux thanks to libvirt
Fix #599
2016-09-05 18:40:49 +02:00
Julien Duponchelle
1d70a18b11
Nat node use port 0 2016-09-05 11:43:20 +02:00
Julien Duponchelle
7065988087
Raise an error if we use nat and eth1 doesn't exists
Fix #657
2016-08-30 18:27:04 +02:00
Julien Duponchelle
36d2e80d0a
Nat node is only on the GNS3 VM for the moment
Fix https://github.com/GNS3/gns3-gui/issues/1448
2016-08-29 18:31:33 +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
72fe5d3489
Merge branch 'master' into 2.0 2016-08-29 14:08:23 +02:00
Julien Duponchelle
7fd520c08b
Bind qemu UDP tunnels on all hosts
Qemu is the only platform where we limit the binding of UDP
tunnel to a specific host. It's probably much secure and cleaner
but we have scenario where we need one port bind to an IP and
another bind to a different IP (Link between qemu and and a VM on the
GNS3 VM)

This allow the use of 134fed8fc5
2016-08-26 10:40:11 +02:00
Julien Duponchelle
9231b8e991
Fix Exception when opening project that contains an IOU node
Fix #636
2016-08-23 22:38:44 +02:00
Julien Duponchelle
a53a972135
Nat node for only the GNS3 VM 2016-08-21 21:46:49 +02:00
Julien Duponchelle
796ebf7210
Optimize project closing by avoiding closing unused modules
Fix #627
2016-08-16 19:41:59 +02:00
Julien Duponchelle
3ca4edef93
Update project API 2016-08-15 16:44:09 +02:00
Julien Duponchelle
88ffd43c97
Strip the old / import export project code controller will do everything 2016-07-21 18:23:31 +02:00
Julien Duponchelle
08c35f5558
Export non remote server work 2016-07-20 14:50:15 +02:00
Julien Duponchelle
73d5066392
Merge branch 'master' into 2.0 2016-07-19 16:41:12 +02:00
Julien Duponchelle
c0abe0edfd
Merge branch 'master' into 2.0 2016-07-13 17:48:18 +02:00
Julien Duponchelle
3d52e18fa5
Raise an error if uBridge is not installed 2016-07-12 17:38:13 +02:00
Julien Duponchelle
fd0e8f89db
Fix VMware support 2016-07-12 16:29:58 +02:00
Julien Duponchelle
b98d4cb042
Fix Virtualbox support 2016-07-12 16:22:55 +02:00
grossmj
50aa198ba7 Mark interface type upstream. 2016-07-10 14:54:31 -06:00
Julien Duponchelle
ca4d09ea40
Merge branch 'master' into 2.0 2016-07-05 15:41:53 +02:00
Julien Duponchelle
c0b09ae76a
Merge branch '1.5' into 2.0 2016-06-27 14:24:48 +02: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
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
4c3bfde97e
Fix test suite after VPCS changes for using ubridge 2016-06-23 12:10:18 +02:00
grossmj
00da15e4af Use uBridge for VPCS connections. Ref #267. 2016-06-22 19:40:46 -06:00
Julien Duponchelle
32252e5193
Merge branch '1.5' into 2.0 2016-06-21 09:58:28 +02:00
Julien Duponchelle
6949976d12
Merge branch '1.5' into 2.0 2016-06-20 12:45:56 +02:00
Julien Duponchelle
2a1c5cfd9c
Merge branch '1.5' into 2.0 2016-06-15 19:14:03 +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
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
31f4b52631 Add zeroconf. Ref #545. 2016-06-13 15:07:20 -06: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
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
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
Julien Duponchelle
08e482004f
Auto upload missing images 2016-06-07 19:38:01 +02:00
Julien Duponchelle
d8bdd16e13
Raise an error if image is missing on compute 2016-06-07 15:34:04 +02:00
Julien Duponchelle
d30abeca21
Merge branch '1.5' into 2.0 2016-06-07 10:56:55 +02:00
Julien Duponchelle
61ac8763f2
Merge branch '1.5' into 2.0 2016-06-06 14:28:21 +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
grossmj
cd07a99118 Some cleaning + move "/version" endpoint to "/server/version". 2016-06-01 17:50:31 -06: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
grossmj
f0e0988d6a Includes uBridge stdout in case of error. 2016-05-30 22:07:37 -06: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
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
da6cb13338
Merge branch '1.5' into 2.0 2016-05-24 10:13:53 +02:00
grossmj
7d055968e5 First step towards the cloud node re-factoring. 2016-05-22 19:24:14 -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
54747ee618
Support for link event, fix link not correctly deleted 2016-05-18 18:37:18 +02:00
Julien Duponchelle
d5895c3a47
Merge branch '1.5' into 2.0 2016-05-18 11:25:41 +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
b44c2ea713
Merge branch '1.5' into 2.0 2016-05-17 09:39:36 +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
ac24922300
Node deleted event
Fix #527
2016-05-16 14:31:00 +02: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
Julien Duponchelle
5280644327
Return command_line and node_directory via the controller 2016-05-12 10:39:50 +02: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
c2da568543
Protect controller and compute about path outside project directory
Fix #503
2016-05-11 15:59:32 +02:00
Julien Duponchelle
9dca7dfe4a
Merge branch '1.5' into 2.0 2016-05-10 17:51:40 +02:00
Julien Duponchelle
98b32cd9e2
Merge branch '1.5' into 2.0 2016-05-02 16:59:56 +02:00
Julien Duponchelle
9a1eeb57e9
Controll of the project directory in the controller 2016-04-26 14:34:49 +02:00
Julien Duponchelle
7390d833ba
Merge branch 'master' into 2.0 2016-04-26 11:50:16 +02:00
Julien Duponchelle
8777e027b0
Merge branch '1.5' into 2.0 2016-04-26 11:48:43 +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
58d4a529d4
Rename hypervisor to compute
Fix #487
2016-04-15 17:59:59 +02:00