grossmj
21a1800edc
Merge branch '2.1' into 2.2
...
# Conflicts:
# gns3server/controller/__init__.py
# gns3server/controller/export_project.py
# gns3server/controller/import_project.py
# gns3server/controller/project.py
# gns3server/version.py
2018-04-28 19:41:12 +07:00
grossmj
a56d5b453f
Fix project export tests.
2018-04-28 16:46:47 +07: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
2ea0aa5ded
Merge branch '2.1' into 2.2
...
# Conflicts:
# gns3server/compute/iou/iou_vm.py
# gns3server/compute/virtualbox/virtualbox_vm.py
# gns3server/compute/vmware/vmware_vm.py
2018-04-18 17:08:42 +08:00
grossmj
801547983a
Fix tests.
2018-04-13 17:04:19 +08:00
grossmj
adc2f69d5d
Fix tests.
2018-04-04 21:51:31 +07:00
grossmj
757c103c03
Possibility to customize port names and adapter types for Qemu, VirtualBox, VMware and Docker. Fixes #2361 .
...
MAC addresses can customized for Qemu as well.
2018-04-02 22:27:12 +07:00
grossmj
509b171b06
Allow to have projects with the same name in different locations.
2018-03-30 23:01:37 +07:00
grossmj
64949f5d04
Fix bug with 'none' console type for Ethernet switch.
...
Fix some tests related to traceng.
2018-03-30 13:00:52 +07: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
5d704aa478
Fix tests.
2018-03-24 18:25:09 +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
05b6be2e42
Compatybility with controller, default_symbol and hover_symbol, Fixes : #2444
2018-03-02 13:48:27 +01:00
ziajka
9be76d98a2
Filter snapshots directory during the snapshot, Fixes : #1297
2018-02-28 16:38:32 +01:00
ziajka
09c7d73ee9
Filter snapshots directory during the snapshot, Fixes : #1297
2018-02-28 16:33:20 +01:00
ziajka
e79e27a73f
Handle docker env with last empty line, Fixes : #2420
2018-02-27 16:33:55 +01:00
grossmj
17422bc461
Fix appliance loading test (missing category).
2018-02-06 16:55:40 +08:00
grossmj
935b8981ea
Fix appliance loading test.
2018-02-06 16:15:34 +08:00
grossmj
654aa18d09
Fix get_port test.
2018-02-02 22:14:50 +08: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
dc377165f2
Cancellable md5sum calculation on thread, Ref. gui#2239
2018-01-29 10:18:13 +01:00
ziajka
d9a0ec9ff3
Replace asyncio.async with ensure_future because of deprecation, Fixes : #1269
2018-01-24 11:11:53 +01:00
ziajka
05983f2838
Fix test_open_auto_start test
2018-01-24 10:54:56 +01:00
grossmj
28f8216590
Merge branch '2.1' into 2.2
...
# Conflicts:
# gns3server/version.py
# requirements.txt
2018-01-23 12:47:13 +07:00
grossmj
2e40fb8608
Fix client/server version test.
2018-01-18 16:04:31 +08:00
Dušan Dragić
5d86f06390
Rename ethernet switch arp command to mac, also rename in test
2018-01-14 17:50:21 +01:00
Bernhard Ehlers
8907b3d58a
GNS3-API: implement GET for specific drawing and link
...
Fixes #1249
2018-01-05 13:44:46 +01:00
ziajka
dadf11f69b
Fix tests
2017-12-21 09:37:48 +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
0a72e0db87
Fix more GNS3 VM related tests.
2017-12-05 20:38:48 -06:00
grossmj
e3b3427cc6
Fix GNS3 VM start test.
2017-12-05 20:30:28 -06:00
grossmj
dde2003168
Fix tests.
2017-12-05 16:56:50 -06:00
grossmj
6e2752648a
Implement #1153 into 2.2 branch.
2017-11-27 15:16:46 +07:00
grossmj
745532bf23
Fix auto idlepc test.
2017-11-23 23:46:22 +07:00
grossmj
851fcf5c71
Fix compute auto idlepc test.
2017-11-23 23:28:52 +07:00
grossmj
efbf7728ea
Fix Docker tests.
2017-11-23 11:27:17 +07:00
ziajka
fe59c937d5
Merge branch '2.1' into improved-export-project
2017-11-20 11:15:04 +01:00
ziajka
b48f5df53f
iExport files from remote server, Fixes: gui/#2271
2017-11-20 10:47:03 +01:00
grossmj
cf14deb2fa
Fix IOU tests.
2017-11-16 17:07:51 +07:00
Jeremy Grossmann
d2a7f724e3
Merge pull request #1198 from GNS3/vmware-config
...
Set vhv.enable before run for VMware. Fixes #1184
2017-10-18 17:42:56 +07:00
ziajka
44efab109e
Set vhv.enable before run for VMWare 14. Fixes #1184
2017-10-18 10:32:56 +02:00
ziajka
bc782b6896
fix passing tests on Windows
2017-10-16 13:02:44 +02:00
ziajka
b654d78ea6
Endpoint for obtaining direct action on compute
2017-10-13 11:03:56 +02:00
ziajka
0c7a92b710
Tests on TravisCI with docker compose
2017-10-12 10:40:49 +02:00
Dominik Ziajka
be35ad6874
Fixes path normalization during file upload on nodes ( Fixes : #2276 )
2017-10-03 18:13:19 +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
e5a7eb74ed
Fix project tests
2017-09-05 10:38:17 +02:00
ziajka
b0783eeccc
Load meta of the project on loading time ( Fixes #2225 )
2017-08-22 09:36:52 +02:00
ziajka
7523e9c4bc
Fixes NAT node not working on Windows ( #1163 )
2017-08-21 10:17:56 +02:00
ziajka
3fd86f5807
Return platform value on appliances list ( Fixes #2211 )
2017-08-08 13:58:43 +02:00
ziajka
3a1fd892ac
Fixes not known category in Appliances ( Fixes #1156 )
2017-08-07 10:00:46 +02:00
Jeremy Grossmann
8a028a6dce
Merge pull request #1147 from GNS3/fix_docker_permission
...
Fix permission on exited container
2017-08-01 00:30:56 +08:00
Julien Duponchelle
6996b7094f
Handle invalid appliances files
...
Fix #1150
2017-07-28 15:21:35 +02:00
Julien Duponchelle
283b08c2a1
Fix naming of node with a number in the name
...
Fix #1149
2017-07-27 16:06:52 +02:00
Julien Duponchelle
92c9e48f18
This fix the images always included in portable project
...
Also add test to avoid regressions on this.
Fix https://github.com/GNS3/gns3-gui/issues/2165
2017-07-26 16:46:29 +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
Jeremy Grossmann
bb90c0ba52
Merge pull request #1140 from GNS3/duplicate_docker
...
Support duplicate for Docker
2017-07-25 06:50:00 -07:00
Jeremy Grossmann
a805b3c7c3
Merge pull request #1142 from GNS3/duplicate_iou
...
Duplicate IOU
2017-07-25 06:46:44 -07:00
Julien Duponchelle
6d4529f445
Duplicate IOU
...
Ref https://github.com/GNS3/gns3-gui/issues/1065
2017-07-25 11:39:46 +02:00
Julien Duponchelle
16209a2b60
Support duplicate for Docker
...
Ref https://github.com/GNS3/gns3-gui/issues/1065
2017-07-25 11:32:09 +02:00
Julien Duponchelle
01be1b32c4
Duplicate support for qemu
...
Ref https://github.com/GNS3/gns3-gui/issues/1065
2017-07-25 10:02:40 +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
Jeremy Grossmann
27f733736e
Merge pull request #1133 from GNS3/appliances_dir
...
Add an appliance templates directory
2017-07-19 22:10:13 -07:00
Julien Duponchelle
5fd842e54d
Suspend link
2017-07-19 17:30:25 +02:00
Julien Duponchelle
bce9c61e41
Cleanup unused code in test_link
2017-07-19 16:02:14 +02:00
Julien Duponchelle
7d123f334f
Add an appliance templates directory
...
Fix https://github.com/GNS3/gns3-gui/issues/2133
2017-07-19 11:44:05 +02:00
Jeremy Grossmann
c2fbe4f313
Merge pull request #1130 from GNS3/vmware_filters
...
Filters support for VMware
2017-07-19 14:59:25 +07:00
Jeremy Grossmann
ac10ba370a
Merge pull request #1129 from GNS3/filters_virtualbox
...
Packet filters support for VirtualBox
2017-07-19 13:34:48 +07:00
Julien Duponchelle
fa211a82eb
Filters support for VMware
...
Fix #1108
2017-07-18 18:04:03 +02:00
Julien Duponchelle
d9b13fb0c5
Add test for the VMware compute API
2017-07-18 16:07:10 +02:00
Julien Duponchelle
54faaf5f6f
Packet filters support for VirtualBox
...
Fix #1107
2017-07-18 14:59:47 +02:00
Julien Duponchelle
08d4c1a000
Merge branch '2.1' into filters_iou
2017-07-17 17:51:17 +02:00
Julien Duponchelle
536c708c16
Filter implementation for cloud & Nat
...
Fix #1111
2017-07-17 17:27:07 +02:00
Julien Duponchelle
5b839c22e9
Filters support for IOU
...
Fix #1113
2017-07-17 11:21:54 +02:00
Julien Duponchelle
23c3d32e06
Filter support for Docker
...
Fix #1110
2017-07-12 19:44:15 +02:00
Julien Duponchelle
03f8c747cc
Qemu support for packet filtering
...
Fix #1112
2017-07-12 14:50:33 +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
Jeremy Grossmann
114b137b02
Merge pull request #1120 from GNS3/aiohttp_2.2
...
Upgrade to last aiohttp version
2017-07-12 15:20:02 +07:00
Julien Duponchelle
fd0770158c
Fix tests with Yarl 0.11
2017-07-12 09:34:40 +02: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
Julien Duponchelle
c6f28afb7c
Fix a broken test
2017-07-10 20:35:02 +02:00
Jeremy Grossmann
339ed8ab57
Merge pull request #1106 from GNS3/idlepc_apicall
...
Implement an api call for computing the IDLE PC
2017-07-10 11:33:16 +07:00
Jeremy Grossmann
5bdc239064
Merge pull request #1104 from GNS3/filters_api
...
Support packet filtering for VPCS
2017-07-08 18:50:00 +07:00
Julien Duponchelle
3eadbb9adb
Implement an api call for computing the IDLE PC
...
Fix https://github.com/GNS3/gns3-gui/pull/2153
2017-07-07 17:50:40 +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
dadbb0ab09
More options for drawing area
2017-07-03 10:01:22 +02:00
Jeremy Grossmann
799a2d376e
Merge pull request #1092 from GNS3/fix_vpcs_name
...
Fix the initial startup for VPCS is not used
2017-06-28 16:09:54 +08:00
Julien Duponchelle
0a6dc55645
Fix appliance properties lost when you create two node from template
2017-06-28 09:37:19 +02:00
Julien Duponchelle
617868402f
Fix the initial startup for VPCS is not used
...
The default VPCS template didn't provide the base
startup config setting. This prevent the replacement
of the hostname in the configuration file.
Fix https://github.com/GNS3/gns3-gui/issues/2123
2017-06-27 18:44:31 +02:00
ziajka
c1a4bba101
Merge pull request #1091 from GNS3/bugfix-557
...
Bugfix 557
2017-06-27 11:17:12 +02:00
ziajka
931018b877
Fix passing tests
2017-06-27 11:11:07 +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
ea9f0e52c8
Fixes #2108 (gns3-gui): getting project file with leading slashes issue ( #1078 )
2017-06-21 10:26:36 +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
e1c20e6a22
Fix merge 2.0 error
2017-06-19 10:50:45 +02:00
Julien Duponchelle
bb8097a052
Merge remote-tracking branch 'origin/master' into 2.1
2017-06-19 10:44:52 +02:00
Julien Duponchelle
8973cc6fee
Merge branch '2.1' into embed_shell
2017-06-19 09:11:08 +02:00
Julien Duponchelle
c8c991af78
Fix the error about appliance ID not found ( #1075 )
...
* Fix the error about appliance ID not found
* Copy appliance data before editing it
2017-06-19 08:47:50 +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
64a852f38f
Fixes #1068 - handle zipfile encoding issues at project duplication
2017-06-09 15:32:25 +02:00
ziajka
5c0d955156
Fix : #1066 - Catching parsing errors at linked vbox file
2017-06-09 10:41:34 +02:00
Julien Duponchelle
c1c3a9ed80
Drop debug
2017-06-09 09:31:18 +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
b9e2b7945a
Removed gc collection at testing
2017-06-07 14:39:47 +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
c538ec5937
Fix tests on case sensitive file system
2017-06-07 11:20:55 +02:00
ziajka
e0b519eced
Fix when config file doesn't have computes section ( #1062 )
2017-06-07 10:50:40 +02:00
Julien Duponchelle
cdcdba7411
Fix installation issue with Python 3.4 and aiohttp cors
2017-06-06 17:41:36 +02:00
Julien Duponchelle
2fe589b1a8
Fix invalid test for 1.3 topology conversion to GNS3 2.1
2017-06-06 16:07:27 +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
5a86277a9f
Test that import erase the auto_open and auto_start setting
...
Ref #1041
2017-05-23 16:08:30 +02:00
Julien Duponchelle
59488e8064
Fix tests on python 3.4 ( #1046 )
2017-05-23 12:15:04 +02:00
Julien Duponchelle
54e80d68f8
Fix test failed on Python 3.4
...
Fix #1045
2017-05-23 11:11:13 +02:00
Julien Duponchelle
1e598d1890
Test for support of docker commit images
...
Ref #1039
2017-05-23 10:23:12 +02:00
Julien Duponchelle
7d30da5d4e
Do not wait auto start to finish in order to complete project opening
...
Fix https://github.com/GNS3/gns3-gui/issues/2074
2017-05-22 20:18:07 +02:00
Julien Duponchelle
bdcadcc335
Fix support from some old topologies
...
Fix #1038
2017-05-19 17:49:39 +02:00
Julien Duponchelle
189ad994c8
Symbols are returned with a content length
2017-05-18 16:37:44 +02:00
Julien Duponchelle
a4245fcf44
Aiohttp 2.0
...
Ref #1000
2017-05-17 18:42:17 +02:00
Julien Duponchelle
e9fef928b0
Fix dynamips node creation error
2017-05-16 10:49:45 +02:00
