Commit Graph

27 Commits

Author SHA1 Message Date
ac1eef256f Use tap adapter instead of veth for docker (allow usage of vlan)
Ref #716
2016-10-24 12:35:50 +02:00
ec3660c979 Catch an error when docker is not running 2016-10-14 19:06:12 +02:00
fbdcf67d29 If docker container state failed to return we consider the container stopped 2016-10-14 19:00:25 +02:00
5a7f5d2950 Check if GNS3 has access to all docker resssources
Ref #702
2016-10-04 21:14:19 +02:00
67fc563d81 Merge branch 'master' into 2.0 2016-09-07 15:01:51 +02:00
ca4d09ea40 Merge branch 'master' into 2.0 2016-07-05 15:41:53 +02:00
c0b09ae76a Merge branch '1.5' into 2.0 2016-06-27 14:24:48 +02:00
d28fad223f Allows hot-linking for Docker containers. Ref #267. 2016-06-24 17:26:40 -06:00
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
00da15e4af Use uBridge for VPCS connections. Ref #267. 2016-06-22 19:40:46 -06:00
2a1c5cfd9c Merge branch '1.5' into 2.0 2016-06-15 19:14:03 +02:00
52f852bc6d Merge branch '1.5' into 2.0 2016-06-14 09:50:07 +02:00
61ac8763f2 Merge branch '1.5' into 2.0 2016-06-06 14:28:21 +02:00
cb7dbfb256 Merge branch '1.5' into 2.0 2016-06-02 13:47:40 +02:00
f0e0988d6a Includes uBridge stdout in case of error. 2016-05-30 22:07:37 -06:00
da6cb13338 Merge branch '1.5' into 2.0 2016-05-24 10:13:53 +02:00
00f80f54e8 Merge branch '1.5' into 2.0 2016-05-19 13:32:30 +02:00
d5895c3a47 Merge branch '1.5' into 2.0 2016-05-18 11:25:41 +02:00
f052299eb1 Return status in all cases 2016-05-17 19:51:06 +02:00
1eb77a0b3f Fix docker support on 2.0
Fix #528
2016-05-16 18:32:29 +02:00
5b604da33a Make sure nodes send the right notification when started, stopped or suspended. 2016-05-13 20:41:58 -06:00
51738e19c3 Some spring cleanup for Docker VM. 2016-05-13 19:28:53 -06:00
5280644327 Return command_line and node_directory via the controller 2016-05-12 10:39:50 +02:00
5a76f81271 Refactoring to use a common node class for all VMs and other (future) objects. 2016-05-11 11:35:36 -06:00
9dca7dfe4a Merge branch '1.5' into 2.0 2016-05-10 17:51:40 +02:00
8777e027b0 Merge branch '1.5' into 2.0 2016-04-26 11:48:43 +02:00
58d4a529d4 Rename hypervisor to compute
Fix #487
2016-04-15 17:59:59 +02:00