Commit Graph

316 Commits

Author SHA1 Message Date
ziajka
e4436096c2 Fix tests 2018-05-07 15:18:19 +02:00
ziajka
e267f8a8b8 Project global variables 2018-05-04 14:34:44 +02:00
ziajka
80958e8a6d support based on init.sh, Ref: #2482 2018-04-27 14:33:07 +02:00
ziajka
43081152ef Add support of ExtraHosts for Docker, Ref. gns3-gui#2482 2018-04-25 16:03:01 +02:00
grossmj
669d2ec038 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/schemas/node.py
2018-03-30 12:14:09 +07:00
grossmj
297bbd91ec Fix traceng tests. 2018-03-30 12:10:57 +07:00
grossmj
d08c08617c Support for source and destination for traceNG. 2018-03-27 16:58:49 +07:00
grossmj
17bfed52f2 Fix Qemu VM tests. 2018-03-22 14:05:31 +07:00
grossmj
279b4d7b20 Fix link filters/suspend tests. 2018-03-19 18:25:56 +07:00
grossmj
88674455a3 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/version.py
#	tests/compute/docker/test_docker_vm.py
2018-03-14 18:40:37 +07:00
grossmj
397c1322b4 Base support for TraceNG. 2018-03-12 17:57:13 +07:00
grossmj
658aa4bae9 Merge 2.1 into 2.2 branch 2018-03-12 13:38:50 +07:00
ziajka
e79e27a73f Handle docker env with last empty line, Fixes: #2420 2018-02-27 16:33:55 +01:00
grossmj
3802a3d70b Fix more IOU tests. 2018-01-31 16:34:41 +07:00
grossmj
0ee87c9110 Fix IOU tests. 2018-01-31 16:12:55 +07:00
ziajka
bb26e8acdd Calculate MD5 on thread and before json response, Ref. gui#2239 2018-01-29 14:20:48 +01:00
ziajka
d9a0ec9ff3 Replace asyncio.async with ensure_future because of deprecation, Fixes: #1269 2018-01-24 11:11:53 +01:00
Dušan Dragić
5d86f06390 Rename ethernet switch arp command to mac, also rename in test 2018-01-14 17:50:21 +01:00
grossmj
a8177d7afa Fix tests more reliably. Ref #0df997d. 2017-12-18 12:08:14 +01:00
grossmj
0df997d232 Fix tests. 2017-12-17 23:06:19 +01:00
grossmj
efbf7728ea Fix Docker tests. 2017-11-23 11:27:17 +07:00
ziajka
bc782b6896 fix passing tests on Windows 2017-10-16 13:02:44 +02:00
ziajka
3d85bba9d4 Don't create directory structure during json dump. Fixes #2270 2017-10-02 10:41:57 +02:00
grossmj
6a8f220ff1 Fix NAT test. 2017-09-11 15:09:32 +07:00
ziajka
fd623a5ad2 Fix test_ubridge_apply_filters 2017-09-05 11:07:10 +02:00
ziajka
7523e9c4bc Fixes NAT node not working on Windows (#1163) 2017-08-21 10:17:56 +02:00
Julien Duponchelle
a93f3b0576
Fix permission on exited container
If a container is exited we quickly start it to fix
the permissions.

Fix https://github.com/GNS3/gns3-gui/issues/2181
2017-07-26 14:52:16 +02:00
Julien Duponchelle
0854c04687
API for duplication a Node
Support:
* VPCS
* Dynamips router
* Ethernet switch

Ref #1065
2017-07-24 10:08:22 +02:00
Julien Duponchelle
b33ba5f8ea
Don't allow user to overwrite GNS3 docker environment variables
Fix #1098
2017-07-20 15:37:56 +02:00
Julien Duponchelle
536c708c16
Filter implementation for cloud & Nat
Fix #1111
2017-07-17 17:27:07 +02:00
Julien Duponchelle
23c3d32e06
Filter support for Docker
Fix #1110
2017-07-12 19:44:15 +02:00
Julien Duponchelle
9e2759a3f2 Merge branch '2.1' into remove_use_ubrige 2017-07-12 12:46:10 +02:00
Julien Duponchelle
86f1201276
Support packet filtering for dynamips
Fix #1109
2017-07-12 12:08:02 +02:00
Jeremy Grossmann
2e592d3199 Merge pull request #1121 from GNS3/bfp_filter
BPF filter support
2017-07-12 16:22:01 +07:00
Julien Duponchelle
699ecb7c89
Merge branch 'master' into 2.1 2017-07-11 18:59:50 +02:00
Julien Duponchelle
8a8de1e2df
BPF filter support
Fix https://github.com/GNS3/gns3-gui/issues/765
2017-07-11 17:30:29 +02:00
Julien Duponchelle
d112da400e
Remove use_ubridge flag
Ref #1115
2017-07-11 13:58:59 +02:00
ziajka
e0f0adf3c8 Added preferred Docker API version. Fixes #2136 2017-07-06 11:24:55 +02:00
ziajka
8e8b8bc5a5 WebSocket binary mode support for docker 2017-07-06 10:13:00 +02:00
Julien Duponchelle
08423eff96
Support packet filtering for VPCS
https://github.com/GNS3/gns3-gui/issues/765
2017-07-04 15:12:26 +02:00
ziajka
c1a4bba101 Merge pull request #1091 from GNS3/bugfix-557
Bugfix 557
2017-06-27 11:17:12 +02:00
ziajka
6aa2afcf54 Fix #557 - mac addess collision when running IOU on multiple GNS3 servers 2017-06-27 10:09:21 +02:00
Julien Duponchelle
bcdac6c969
Fix test for ethernet switch show arp 2017-06-23 10:54:05 +02:00
ziajka
7447b3190d spice - added qxl vga support 2017-06-22 12:56:28 +02:00
Jeremy Grossmann
1b6cefd82b Merge pull request #1055 from GNS3/embed_shell
Fake console for simple Ethernet switch
2017-06-22 00:24:14 +02:00
ziajka
bc5ec98cd5
Spice support
* QEMU VNC options tests
* QEMU - SPICE support at build options and schemas
* SPICE console_type for nodes
2017-06-21 15:14:41 +02:00
Julien Duponchelle
a8e8eac0b4
Merge remote-tracking branch 'origin/master' into 2.1 2017-06-21 15:13:04 +02:00
Julien Duponchelle
5a1d313fca Merge pull request #1080 from GNS3/spice-feature
Spice feature
2017-06-21 10:37:04 +02:00
Julien Duponchelle
36dc264a6c Revert "Spice feature" 2017-06-21 10:32:28 +02:00
Julien Duponchelle
efd5d82c88 Merge pull request #1076 from GNS3/spice-feature
Spice feature
2017-06-21 10:28:43 +02:00
ziajka
2e6366a766 Fix tests on windows 2017-06-20 13:46:03 +02:00
Julien Duponchelle
e5bc7c7a66
Merge branch '2.1' into embed_shell 2017-06-19 11:10:24 +02:00
Julien Duponchelle
bb8097a052
Merge remote-tracking branch 'origin/master' into 2.1 2017-06-19 10:44:52 +02:00
ziajka
88c2353e2e QEMU - SPICE support at build options and schemas 2017-06-16 10:17:26 +02:00
ziajka
c91a001729 QEMU VNC options tests 2017-06-16 10:03:33 +02:00
ziajka
5c0d955156 Fix: #1066 - Catching parsing errors at linked vbox file 2017-06-09 10:41:34 +02:00
ziajka
7235a312ab Escaping VPCS name in regex #1067 2017-06-09 09:14:25 +02:00
Julien Duponchelle
ae328e5c50
Merge branch '2.1' into embed_shell 2017-06-07 18:21:41 +02:00
ziajka
eb6068c3d3 Fix Qemu disk creation with unicode characters not supported by local filesystem #1058 (#1063) 2017-06-07 12:35:41 +02:00
Julien Duponchelle
93adef91d8
Merge branch '2.0' into 2.1 2017-05-31 16:58:31 +02:00
Julien Duponchelle
5616ab0e9a
Fake console for simple Ethernet switch
Fix #454
2017-05-31 15:13:29 +02:00
Julien Duponchelle
1e598d1890
Test for support of docker commit images
Ref #1039
2017-05-23 10:23:12 +02:00
Julien Duponchelle
cd17ef6b12
Merge branch '2.0' into 2.1 2017-05-15 15:46:50 +02:00
Bernhard Ehlers
ecba758c58
Docker aux console is a VT100 terminal
Without that program like nano can't work.

Signed-off-by: Julien Duponchelle <julien@gns3.net>
2017-05-03 10:30:43 +02:00
Julien Duponchelle
b0f45035a9
NAT node can use the VMware NAT
On Windows and Mac OS this allow the NAT node to use the
VMware nat (it's always vmnet8). On Linux we still use the
libvirt NAT
2017-04-27 15:26:58 +02:00
Julien Duponchelle
273a711459
Merge branch '2.0' into 2.1 2017-04-26 17:22:14 +02:00
Julien Duponchelle
2da581139c
Lower docker requirements in tests also 2017-04-24 18:49:47 +02:00
Julien Duponchelle
effbe59414
Lock docker API to 1.27
Fix https://github.com/GNS3/gns3-gui/issues/1994
2017-04-24 17:51:55 +02:00
Julien Duponchelle
37e21f2a3d
Skip a test for qemu not supported on windows 2017-04-18 16:35:36 +02:00
Julien Duponchelle
54014ccd39
Fix one more windows test 2017-04-18 16:01:07 +02:00
Julien Duponchelle
691c2dfd8e
Drop a test about OVA no longer use 2017-04-18 14:27:44 +02:00
Julien Duponchelle
4f1b738ef5
Merge branch '2.0' into 2.1 2017-03-30 10:16:16 +02:00
Julien Duponchelle
132bc87081
Dissallow parallel pull of docker images
Fix #962
2017-03-27 20:46:25 +02:00
Julien Duponchelle
34f5a6f82c
Fix Session is closed when listing docker images
Fix #955
2017-03-20 23:50:31 +01:00
Julien Duponchelle
78c154e376
Cleanup docker source code 2017-03-20 20:30:59 +01:00
Julien Duponchelle
a571b1a2f8
Use aiohttp session for docker queries 2017-03-20 19:46:50 +01:00
Julien Duponchelle
a62b791c68
Fix TypeError: http_query() got an unexpected keyword argument 'timeout'
Fix #947
2017-03-20 17:06:00 +01:00
Julien Duponchelle
08bafc2dcc
Catch a timeout error in docker
Fix #936
2017-03-16 10:39:08 +01:00
Julien Duponchelle
6017ebbd97
Merge branch '2.0' into 2.1 2017-03-07 11:16:05 +01:00
Julien Duponchelle
8b7035b185
Enable show in file manager for cloud
Fix https://github.com/GNS3/gns3-gui/issues/1900
2017-03-06 14:25:53 +01:00
Julien Duponchelle
5e7f97b175
Fix when qemu exit by itself clean other processes
Fix https://github.com/GNS3/gns3-gui/issues/1898
2017-03-03 18:40:26 +01:00
Julien Duponchelle
1ab9ca2333
Merge branch '2.0' into 2.1 2017-02-28 14:25:38 +01:00
Julien Duponchelle
70e2b87ff0
Patch hostname in configuration file even if name is unsync
Ref https://github.com/GNS3/gns3-gui/issues/1889
2017-02-27 12:48:05 +01:00
Julien Duponchelle
7407ab88b3
Fix a failing test on Python 3.6 2017-02-20 10:56:48 +01:00
Julien Duponchelle
99f817392d
Raise an error if you use Qemu < 2.4 and try to use large number of adapters 2017-02-17 09:55:50 +01:00
Julien Duponchelle
b0567772f7
Allow up to 275 adapters for qemu
See #889 for more details
2017-02-07 17:04:29 +01:00
Julien Duponchelle
f0ff035c0b
Prevent corruption of VM in VirtualBox when using linked clone
Fix https://github.com/GNS3/gns3-gui/issues/1821
2017-01-31 18:58:43 +01:00
Julien Duponchelle
580693b1ec
Prevent renaming of a running VirtualBox linked VM
Fix https://github.com/GNS3/gns3-gui/issues/1816
2017-01-30 15:19:46 +01:00
Julien Duponchelle
e5dba5e66a
Fix bug with other directory of Qemu images
Fix https://github.com/GNS3/gns3-gui/issues/1790
2017-01-18 12:39:10 +01:00
Jeremy Grossmann
ec0181a5ad Merge pull request #856 from GNS3/dynamips_directory_layout
Change directory layout for dynamips.
2017-01-12 20:30:10 -08:00
Julien Duponchelle
82c99418b4
Fix If cloud interface is down the project doesn't open
Fix https://github.com/GNS3/gns3-gui/issues/1751
2017-01-11 17:23:36 +01:00
Julien Duponchelle
afd46ec010
Fix random error in the dynamips test suite after previous commit 2017-01-10 12:41:14 +01:00
Julien Duponchelle
6150929a5b
Support conversion to dynamips new directory layout on remote
Ref https://github.com/GNS3/gns3-gui/issues/1761
2017-01-10 12:15:31 +01:00
Julien Duponchelle
46b6e7c5ee
Fix hot link issues in Docker
Fix #817
2016-12-14 16:53:20 +01:00
Julien Duponchelle
d0f65aebff
Fix Can't delete link between docker VM after they were in use
Fix #818
2016-12-14 12:01:34 +01:00
Bernhard Ehlers
a3495304ad
Code cleanup for docker interface creation
Fix #819

Signed-off-by: Julien Duponchelle <julien@gns3.net>
2016-12-13 16:07:59 +01:00
Julien Duponchelle
5ba5c62670
Add support for bios images
Ref https://github.com/GNS3/gns3-gui/issues/1700
2016-12-08 16:18:30 +01:00
Julien Duponchelle
49315adf79
Do not recurse scan for images in standard image directory
Fix https://github.com/GNS3/gns3-gui/issues/1680
2016-11-28 19:49:50 +01:00
Julien Duponchelle
bddf9ec2ac
Qemu telnet support multiple client connected
Fix #770
2016-11-09 09:47:48 +01:00
Julien Duponchelle
db8296f548
Support multiple client connected to the same VPCS console
Ref #770
2016-11-08 19:44:12 +01:00
Julien Duponchelle
3754a49cc0
Drop IOUCON
Fix #747
2016-11-08 10:21:20 +01:00
Julien Duponchelle
4fe2b746d0
Fix IOU tests 2016-11-06 21:22:48 +01:00
Julien Duponchelle
7255754fef
Bridge support in cloud is more robust
Fix #761
2016-11-04 17:40:44 +01:00
Julien Duponchelle
cf723962af
Support bridge in cloud
Nat take advantage of that and the code is more simple.

Fix #761
2016-11-04 17:32:16 +01:00
Julien Duponchelle
1b3e47ce83
Add a test of cloud raw ethernet interface
Before touching it for the bridge support a test to prevent regressions.

Ref #761
2016-11-04 16:52:29 +01:00
Julien Duponchelle
74695efe90
Fix tests checking the local flag 2016-11-04 15:42:29 +01:00
Julien Duponchelle
6be5b6ffad
Fix uuid of VirtualBox VM after a save as
Fix #1185
2016-10-28 16:00:26 +02:00
Julien Duponchelle
eabe4eb97e
Improve remote server console host support when binding to 0.0.0.0
Fix https://github.com/GNS3/gns3-gui/issues/1574
2016-10-26 14:43:47 +02:00
Julien Duponchelle
ae1e027031
Raise error if using a non linked clone VM twice
Fix https://github.com/GNS3/gns3-gui/issues/1593
2016-10-24 21:39:35 +02:00
Julien Duponchelle
ac1eef256f
Use tap adapter instead of veth for docker (allow usage of vlan)
Ref #716
2016-10-24 12:35:50 +02:00
Julien Duponchelle
00fc2fa007
Avoid crash during tests if VNC server run on host PC 2016-10-24 12:21:57 +02:00
Julien Duponchelle
106915f419
Return md5sum and filesize in the list of images
Ref https://github.com/GNS3/gns3-gui/issues/1590
2016-10-20 17:24:05 +02:00
Julien Duponchelle
f3d255756b
Set Qemu uuid for csr1000v
Fix #711
2016-10-03 15:54:20 +02:00
Julien Duponchelle
fd3ac65eb5
Qemu fixes for windows 2016-09-27 18:01:50 +02:00
Julien Duponchelle
20772a310b
Change seperator for additonnal images directory otherwise bug on windows 2016-09-27 17:15:59 +02:00
Julien Duponchelle
be5d543f20
Fix some bugs on windows 2016-09-27 17:05:03 +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
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
4bd9556767
Merge branch 'master' into 2.0 2016-09-21 19:27:44 +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
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
ffe6448534
Bring back test for the qcow2 file format 2016-08-29 14:23:25 +02:00
Julien Duponchelle
a53a972135
Nat node for only the GNS3 VM 2016-08-21 21:46:49 +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
05df0a9bb6
Fix tests when run without local network
Fixed in the train :)
2016-07-08 11:03:52 +02:00
Julien Duponchelle
ca4d09ea40
Merge branch 'master' into 2.0 2016-07-05 15:41:53 +02:00
Julien Duponchelle
e830356e62
Fix tests for VPCS 2016-06-27 14:34:34 +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
Julien Duponchelle
4c3bfde97e
Fix test suite after VPCS changes for using ubridge 2016-06-23 12:10:18 +02:00
Julien Duponchelle
2a1c5cfd9c
Merge branch '1.5' into 2.0 2016-06-15 19:14:03 +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
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
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
f47eb326c7 Revert move "/version" endpoint to "/server/version".
Move "/server/shutdown" endpoint to "/shutdown".
2016-06-01 18:21:07 -06:00
Julien Duponchelle
7a80dd6cb3
Merge branch '1.5' into 2.0 2016-05-30 11:45:07 +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
00f80f54e8
Merge branch '1.5' into 2.0 2016-05-19 13:32:30 +02:00
Julien Duponchelle
d5895c3a47
Merge branch '1.5' into 2.0 2016-05-18 11:25:41 +02:00
Julien Duponchelle
f052299eb1
Return status in all cases 2016-05-17 19:51:06 +02:00
Julien Duponchelle
cb70cfecd7
Fix docker test 2016-05-16 19:37:47 +02:00
Julien Duponchelle
26c7aedba6
Fix docker test about vm suspended 2016-05-16 17:39:32 +02:00
Julien Duponchelle
ac24922300
Node deleted event
Fix #527
2016-05-16 14:31:00 +02:00
grossmj
51738e19c3 Some spring cleanup for Docker VM. 2016-05-13 19:28:53 -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
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
9dca7dfe4a
Merge branch '1.5' into 2.0 2016-05-10 17:51:40 +02:00
Julien Duponchelle
a3b243c501
Merge branch '1.5' into 2.0 2016-05-02 17:08:15 +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
48e71617d6
Store capture in a temporary directory on compute node 2016-04-21 17:27:49 +02:00
Julien Duponchelle
58d4a529d4
Rename hypervisor to compute
Fix #487
2016-04-15 17:59:59 +02:00