NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-11-18 01:34:50 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,580 Commits 6 Branches 202 Tags 85 MiB
4e34ab8e4f
Commit Graph

1199 Commits

Author SHA1 Message Date
grossmj
1184f29b90 Add appliance API tests. Ref #1427. 2018-11-15 21:34:36 +07:00
grossmj
98f04365b7 Remove generic controller settings API endpoint. 2018-11-14 16:24:30 +08:00
grossmj
cebb56387a Fix tests. 2018-11-13 15:40:18 +08:00
grossmj
e7b8309a80 Fix Docker VNC tests. Ref #1438 2018-11-11 23:25:23 +08:00
grossmj
d45d52f15c Support Xtigervnc restart. 2018-11-11 23:23:30 +08:00
grossmj
2764828f38 Refactor how clients access PCAP capture files. Fixes https://github.com/GNS3/gns3-gui/issues/2438. 
* The PCAP file is directly accessed if controller and client are on the same host.
* The PCAP file is streamed from the compute server to the client with the controller as a proxy when the controller is remote for the client.
 2018-10-27 14:47:17 +07:00
grossmj
df36d8377d Fix more tests. 2018-10-17 17:40:25 +07:00
grossmj
ab8dc52ece Fix tests to work with new version of aiohttp (>= 3.0) 2018-10-17 17:32:10 +07:00
grossmj
76af98404a Drop Python 3.4 and switch to async / await syntax for asyncio. Fixes #1425 2018-10-15 17:05:49 +07:00
grossmj
33e8710495 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/controller/compute.py
#	gns3server/controller/gns3vm/__init__.py
#	gns3server/controller/link.py
#	gns3server/controller/project.py
#	gns3server/handlers/api/controller/project_handler.py
#	gns3server/handlers/api/controller/server_handler.py
#	gns3server/utils/asyncio/__init__.py
#	gns3server/utils/asyncio/telnet_server.py
#	gns3server/version.py
#	gns3server/web/web_server.py
#	tests/compute/qemu/test_qemu_vm.py
 2018-08-29 15:57:54 +07:00
grossmj
f5dc635baa Fix test to support Python 3.7 Ref https://github.com/GNS3/gns3-gui/issues/2566 2018-08-25 15:50:08 +07:00
grossmj
902de3dd47 Refactor asyncio locking system for Python 3.7 support. Ref https://github.com/GNS3/gns3-gui/issues/2566 Ref https://github.com/GNS3/gns3-gui/issues/2568 2018-08-25 14:10:47 +07:00
grossmj
a3d1e865a8 Replace asyncio.async() by asyncio.ensure_future() in tests. Ref #2566. 2018-08-24 18:52:15 +07:00
grossmj
089d25c79d Forbid controller and compute servers to be different versions. 
Report last compute server error to clients and display in the server summary.
 2018-08-22 16:54:43 +07:00
grossmj
651d8280a7 Fix appliance template tests. 2018-08-19 19:35:45 +07:00
grossmj
7f72b90b0e The server has now 2 notification streams 
* A new one for controller related events (compute, appliance templates etc.)
* The existing one for project related events (links, nodes etc.)
 2018-08-16 21:31:57 +07:00
grossmj
dac3ba19b7 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/controller/ports/port_factory.py
 2018-08-13 22:06:44 +07:00
grossmj
23e83b730b Fix some more problems with interface short names. Fixes https://github.com/GNS3/gns3-gui/issues/2562 2018-08-13 15:45:24 +07:00
grossmj
652d5788c3 Fix tests. 2018-08-09 18:14:38 +07:00
grossmj
033f005bde Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/version.py
 2018-08-07 21:06:42 +07:00
ziajka
dd845eb096 Fix tests on Windows 2018-06-28 09:16:51 +02:00
ziajka
41026c74c1 Use mocked dir for web-ui redirection test 2018-06-26 13:13:19 +02:00
ziajka
7d75b6248d Use mocked dir of web-ui for tests 2018-06-26 12:53:39 +02:00
ziajka
0e1f2e26d0 Serve WebUI handlers and update-bundled-web-ui script, Ref: #1362 2018-06-26 12:09:08 +02:00
ziajka
867e997b74 Support /static/ files serving, Ref: #1362 2018-06-22 15:29:47 +02:00
grossmj
893e9c4749 'caplog.text()' syntax is deprecated, use 'caplog.text' property instead. 2018-06-14 17:15:24 +08:00
grossmj
0f496907a0 Fix API status code for start/stop/suspend/reload a node. Fixes #1353. 
Fix issues with test.
Update documentation.
 2018-06-14 16:39:32 +08:00
ziajka
f3b4cc0160 Fix tests 2018-06-13 19:16:43 +02:00
ziajka
ac73c72727 Don't send variables to computes where are empty, Ref: #1340 2018-06-13 18:55:47 +02:00
grossmj
96d5e351f7 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/version.py
#	requirements.txt
 2018-06-10 21:19:55 +07:00
grossmj
45edc40948 Timeout for stream file. 2018-06-10 21:18:16 +07:00
grossmj
1550c7bee7 Fix cloud tests. 2018-06-10 17:56:56 +07:00
grossmj
6caf38206c Fix tests. 2018-06-07 22:37:29 +07:00
grossmj
62f87de23a Add API endpoint to return all links attached to a node. 2018-06-06 20:46:44 +07:00
grossmj
d1ccf3bc84 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/version.py
#	requirements.txt
 2018-06-04 22:46:52 +07:00
ziajka
c52342907a
Merge pull request #1332 from GNS3/global-vars 
Docker `ExtraHosts`, global variables for project and supplier support, Fixes: #2482
 2018-05-15 09:23:54 +02:00
ziajka
7b3d5ae5e3 Create/update project on compute when variables changes 2018-05-09 15:29:35 +02:00
ziajka
83445214be Support for nested global variables 2018-05-09 11:25:55 +02:00
ziajka
0bcc657bf1 Don't clean logo images when applied to the project 2018-05-08 16:22:35 +02:00
ziajka
f2700ed445 Support of supplier and variables in topology 2018-05-08 10:07:42 +02:00
ziajka
e4436096c2 Fix tests 2018-05-07 15:18:19 +02:00
ziajka
132c7c8f5b Fix tests 2018-05-07 12:55:32 +02:00
ziajka
e267f8a8b8 Project global variables 2018-05-04 14:34:44 +02:00
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