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

247 Commits

Author SHA1 Message Date
Julien Duponchelle
f6fb0623be
Merge branch 'master' into 1.5 2016-02-08 13:14:30 +01:00
Julien Duponchelle
fd22cd8361
Send command line used to start the VM to client
Add a command_line attribute to the VM object with
the command line used to start the VM.

Now /start return the object in order to get
this new attribute. And the HTTP status code
is 200 instead of 204 because 204 disallow body.

Support:
* Qemu
* Dynamips
* IOU

Ref https://github.com/GNS3/gns3-gui/issues/513
2016-02-02 18:25:17 +01:00
Julien Duponchelle
c280fd5fb8 Merge branch 'master' into 1.5 2016-01-20 17:10:59 +01:00
Julien Duponchelle
e9c2a76f43 Fix error when setting Qemu VM boot to 'cd' (HDD or CD/DVD-ROM)
Fix #400
2016-01-20 13:19:33 +01:00
Julien Duponchelle
1f756c0d4f Merge branch '1.4' into 1.5 2016-01-06 14:35:48 +01:00
Vasil Rangelov
d00efbfb0f Adds a handler for getting the Qemu related capabilities of the server. Currently includes just a check for KVM architectures. 2016-01-03 19:38:16 +02:00
Jeremy Grossmann
8cf55166cb Merge pull request #379 from GNS3/docker_cleanup
Docker cleanup and improvements
2015-12-24 14:56:24 -08:00
Julien Duponchelle
8312a54615 Fix missing boot priority order 2015-12-21 10:17:22 +01:00
Julien Duponchelle
33edbefa3b Docker cleanup and improvements 2015-12-18 18:20:56 +01:00
Julien Duponchelle
42a4df5079 Support VM usage for qemu
Ref https://github.com/GNS3/gns3-gui/issues/829
2015-12-01 10:54:51 +01:00
Julien Duponchelle
7ee12edb5c Fix add existing IOS not working
Fix https://github.com/GNS3/gns3-gui/issues/775
2015-11-05 16:28:11 +01:00
Julien Duponchelle
12f027a882 Allow to return an empty project name because it's allowed in creation 2015-11-03 17:11:58 +01:00
grossmj
ce4727e51a Support for modifications to a base Qemu VM (not a linked clone). 2015-10-18 19:19:27 -06:00
Julien Duponchelle
034ac392b7 Support listing images in subdirectories
It's a part of the OVA support:
https://github.com/GNS3/gns3-gui/issues/700
2015-10-05 11:07:15 +02:00
grossmj
0ee31361c0 Support for packet capture on VMware VM links. 2015-09-13 09:40:09 -06:00
Goran Cetusic
0fa300cb99 Initial Docker support from Google Summer of Code 2015-09-08 10:57:28 +02:00
Goran Cetusic
9ee1d9d71a fixed the way docker containers are terminated 2015-09-08 10:54:27 +02:00
grossmj
0ab95ae043 basic docker container support 2015-09-08 10:54:27 +02:00
grossmj
0ddef78127 Merge branch 'qinq_ethertype' of https://github.com/Bevaz/gns3-server into Bevaz-qinq_ethertype 2015-09-08 02:27:21 -06:00
grossmj
4efec03448 Allows VMware VMs to use vmnet interfaces for connections without using uBridge. Fixes #295. 2015-09-05 14:38:11 -06:00
Anton Fedotov
1283f8bde8 EthernetSwitch: Allow to choose ethertype for QinQ outer tag. 2015-08-20 09:42:30 +03:00
grossmj
5121753232 Support for CPUs setting for Qemu VMs. 2015-08-05 17:17:55 -06:00
grossmj
0923ed5d85 Support for Qemu disk interfaces, cd/dvd-rom image and boot priority. Fixes #278. 2015-08-02 23:02:02 -06:00
Julien Duponchelle
1fd2332796 PEP8 2015-07-28 17:57:36 +02:00
Julien Duponchelle
78ef6e3032 Validation schema for qemu-img 2015-07-28 17:50:57 +02:00
Julien Duponchelle
d9f1a7c7d3 API for listing current projects
Fix #274
2015-07-24 10:09:16 +02:00
Jeremy
2655d426c2 Backport: option to drop nvram & disk files for IOS routers in order to save disk space. 2015-07-22 16:02:08 -06:00
Julien Duponchelle
a461cb71c6 Allow to send the iourc when starting the VM
Ref https://github.com/GNS3/gns3-server/issues/255
2015-07-09 16:06:52 +02:00
Julien Duponchelle
6e3ebb714d Return vm_directory for VirtualBox and VMware
Fix #246
2015-06-26 17:09:19 +02:00
Julien Duponchelle
ccd3224490 Add a vm_directory field to Dynamips / VPCS / IOU
Fix #246
2015-06-25 11:17:32 +02:00
Julien Duponchelle
2b36746d52 Return the working directory of a Qemu VM 2015-06-25 09:53:16 +02:00
grossmj
ed95bcee97 Moves KVM setting to Qemu server preferences. Fixes #244. 2015-06-24 22:47:30 -06:00
grossmj
f20ee06181 VNC console support for Qemu VMs. 2015-06-24 19:09:17 -06:00
Julien Duponchelle
8bd2453bf8 Allow null md5 in request schema 2015-06-19 16:38:22 +02:00
Julien Duponchelle
5c4a49a8c7 Do not raise a 404 if we send the checksum of the images 2015-06-19 16:18:43 +02:00
Jeremy
11e96e6521 ACPI shutdown support for VMware VMs. Fixes #436. 2015-06-18 15:02:31 -06:00
Julien Duponchelle
f041697311 Compute a md5sum of images for futur purpose
Fix #234
2015-06-17 17:11:25 +02:00
Julien Duponchelle
2da0b36ee7 Support a platform parameter for Qemu
I'm sure we will discover a distribution with a different
naming conventions...

Fix #220
2015-06-10 15:49:24 +02:00
grossmj
d518ac45f5 Enable KVM acceleration option. 2015-06-08 14:51:06 -06:00
grossmj
ca331ae2a5 Import/Export support for IOU nvrams. 2015-06-06 15:15:03 -06:00
grossmj
e63b9ff0e6 Option to drop nvram & disk files for IOS routers in order to save disk space. 2015-06-05 14:54:22 -06:00
grossmj
37ddff9f07 Support for base MAC address for Qemu VMs. 2015-06-03 14:52:49 -06:00
grossmj
743f1392b5 ACPI shutdown support for Qemu VMs. 2015-06-02 22:33:38 -06:00
grossmj
933bc5a7b0 ACPI shutdown support for VirtualBox VMs. 2015-06-02 16:30:35 -06:00
grossmj
f169455ad4 Adds NAT NIO in device schema validation so they can return an error that it is not supported. 2015-05-26 10:04:22 +02:00
Julien Duponchelle
6f9f004ebb API for list & download files of a project 2015-05-26 09:49:12 +02:00
grossmj
3729a10783 VMware vmnets management almost complete. 2015-05-21 21:48:59 -06:00
grossmj
221a35baae Adds NAT NIO in device schema validation so they can return an error that it is not supported. 2015-05-14 20:54:38 -06:00
grossmj
a386c5382c Starting VMware VM networking support. 2015-05-14 20:11:57 -06:00
Jeremy Grossmann
61fb641215 Merge pull request #168 from GNS3/listen
A notification stream with process monitoring.
2015-05-09 17:15:58 -06:00
Julien Duponchelle
00fa1cc370 Merge branch 'master' into unstable 2015-05-08 14:45:07 +02:00
grossmj
fcff2d0813 NIO NAT support for QEMU VMs (user mode back-end is used). 2015-05-06 14:59:01 -06:00
Jeremy
71e2586e17 Refactors how startup-config and private-config are handled for IOS routers. 2015-05-04 18:42:32 -06:00
Julien Duponchelle
e9ec5c8a37 A notification stream with process monitoring 2015-05-01 13:20:30 +02:00
Jeremy
ab60d7929b Basic VMware support (start & stop a VM). 2015-04-30 19:05:37 -06:00
Julien Duponchelle
359abb0286 Revert "Merge branch 'unstable'"
This reverts commit 929c337e8b, reversing
changes made to b9bc73fd01.
2015-04-30 16:43:30 +02:00
Jeremy
929c337e8b Merge branch 'unstable'
Conflicts:
	gns3server/modules/virtualbox/__init__.py
	gns3server/version.py
	tests/modules/test_manager.py
2015-04-29 16:29:45 -06:00
Julien Duponchelle
5f6d1bfdd6 Merge branch 'master' into unstable
Conflicts:
	tests/modules/test_manager.py
2015-04-28 10:46:59 +02:00
Jeremy
b6a935aeb8 Return an explicit error when a NIO type is not supported by a VM. 2015-04-27 14:19:17 -06:00
Jeremy
40ce22222e Merge branch 'unstable' into api_list_images
Conflicts:
	gns3server/handlers/api/iou_handler.py
2015-04-23 17:19:37 -06:00
Julien Duponchelle
8b879c0614 Support wireshark remote capture 2015-04-20 19:27:07 +02:00
Julien Duponchelle
bca90bc563 API in order to get the list of IOU, Dynamips, Qemu images 2015-04-16 18:32:12 +02:00
grossmj
4136c29b0f Config paths are not used when updating Dynamips or IOU VM settings. 2015-04-15 19:50:40 -06:00
grossmj
aab4a7243b Merge remote-tracking branch 'origin/master' 2015-04-14 18:21:42 -06:00
grossmj
de5e8f852d Cleaner and generic way to set Qemu & IOU VM settings. 2015-04-12 15:09:37 -06:00
Julien Duponchelle
b2e53a94d4 Initial config file content can be empty 2015-04-09 10:53:18 +02:00
Julien Duponchelle
202032f334 Fix error messages in JSON schema 2015-04-09 10:24:11 +02:00
grossmj
980e63e667 Allocate a random port for Qemu monitor. Fixes issue with pre 1.3 projects. 2015-03-23 22:52:02 -06:00
Julien Duponchelle
4a9f578784 Support IOURC update 2015-03-17 19:00:14 +01:00
Julien Duponchelle
66cdf39ea2 Support uploading iourc 2015-03-17 16:31:45 +01:00
grossmj
21587fda5a Removes confreg setting for IOS routers. 2015-03-14 16:31:15 -06:00
grossmj
6d56da03e5 Fixes tests. 2015-03-14 13:16:27 -06:00
Jeremy
4ccca5dc99 Support RAM setting for VirtualBox VMs. 2015-03-13 17:13:36 -06:00
Jeremy
a81d2274cd Adds info either the server is started as a local server in VersionHandler response. 2015-03-13 15:15:27 -06:00
grossmj
1610067eee Support for HDC and HDD disk images in Qemu. 2015-03-10 11:50:30 -06:00
grossmj
95766fa30d Let the server know about the project name and convert old IOU projects on remote servers. 2015-03-08 19:13:01 -06:00
Julien Duponchelle
ed2e4e43f2 Support the options use_default_iou_values
Fix #92
2015-03-07 14:27:09 +01:00
Jeremy
7ace6fc7e9 Fixes old projects loading issue with Qemu. 2015-03-02 14:37:48 -07:00
grossmj
7223005acd Restore device IDs and fixes race condition when converting an old project. 2015-03-01 13:05:51 -07:00
grossmj
0f10d25c0b Optional AUX console port allocation for Dynamips VMs. 2015-02-28 16:20:27 -07:00
Julien Duponchelle
ebb865d973 Export vpcs config path 2015-02-27 13:38:57 +01:00
Julien Duponchelle
c9314ec509 autopep8 et upload files 2015-02-23 17:21:39 +01:00
Jeremy
210aa6f12a Bit of cleaning. 2015-02-22 19:56:52 -07:00
Julien Duponchelle
8aa5514890 Qemu binary list 2015-02-20 14:39:13 +01:00
Jeremy
8d02f464c5 Dynamips import/export configs. 2015-02-19 16:04:15 -07:00
Julien Duponchelle
48f5c7c8b3 All params for qemu 2015-02-19 20:22:30 +01:00
Julien Duponchelle
d0244824bf Get a working Qemu handler. Next step add all parameters 2015-02-19 19:43:45 +01:00
Julien Duponchelle
03b6563864 Initial config path for IOU 2015-02-17 18:12:43 +01:00
Julien Duponchelle
dd1833c4f0 iourc_path is set from server settings file 2015-02-17 16:40:45 +01:00
Julien Duponchelle
0e98497a99 Add an endpoint for exporting the initial config file 2015-02-17 14:52:51 +01:00
Jeremy
516b882122 Merge remote-tracking branch 'origin/asyncio' into asyncio 2015-02-16 16:53:56 -07:00
Jeremy
3e95bb9748 Adapter settings and configs for Dynamips VMs. 2015-02-16 16:53:50 -07:00
Julien Duponchelle
6c3a926ce3 Capture is OK on server side 2015-02-16 20:08:04 +01:00
grossmj
26f7195288 Dynamips devices packet capture. 2015-02-15 17:45:53 -07:00
grossmj
f99e834c37 Dynamips devices support (packet capture to complete). 2015-02-15 12:18:12 -07:00
Jeremy
4f38d96522 Dynamips devices. 2015-02-13 20:01:18 -07:00
Jeremy
094339304c Packet capture for Dynamips VMs. 2015-02-13 15:41:56 -07:00
Jeremy
6ac6c7d796 Merge remote-tracking branch 'origin/asyncio' into asyncio 2015-02-13 15:11:19 -07:00
Jeremy
a5ac7c5481 Dynamips NIO connections. 2015-02-13 15:11:14 -07:00
Julien Duponchelle
e082cd8b1a Update the remote IOU initial config 2015-02-13 22:16:43 +01:00
Julien Duponchelle
ee019caa37 Support l1_keepalives in IOU 2015-02-13 16:57:35 +01:00
Julien Duponchelle
f99d825346 Support network for IOU 2015-02-12 22:29:34 +01:00
Julien Duponchelle
8b61aa9ae7 Set ram, ethernet adapters, serial adapters 2015-02-12 22:29:33 +01:00
Julien Duponchelle
05df7001a3 Successfully create an iou device from the GUI via HTTP 2015-02-12 22:29:33 +01:00
Julien Duponchelle
ebc214d6fa Fix tests and rename path to iou_path 2015-02-12 22:29:33 +01:00
Julien Duponchelle
986c63f344 HTTP api start iou process
Now we need to start ioucon
2015-02-12 22:29:32 +01:00
Jeremy
79a57ca420 New Dynamips integration part 3 2015-02-11 19:21:34 -07:00
Jeremy
46cbcd6132 New Dynamips integration part 1 2015-02-09 18:24:13 -07:00
grossmj
0d7d0a05c3 Handle old projects. 2015-02-08 18:10:04 -07:00
grossmj
2a3b37a3bd VirtualBox packet capture. 2015-02-08 14:44:56 -07:00
grossmj
d499402491 VirtualBox implementation complete. 2015-02-06 17:31:13 -07:00
Julien Duponchelle
ab122d969e Allow empty project directory 2015-02-05 17:57:51 +01:00
Julien Duponchelle
5a0c224292 Allow user to change project path on local server 2015-02-05 17:52:37 +01:00
Julien Duponchelle
41a8872819 Refactor VPCS script file loading
This allow to support moving the project on disk
2015-02-05 14:20:01 +01:00
Jeremy
291fac7084 Add project_id in all VM calls. 2015-02-04 17:13:35 -07:00
Jeremy
b680138073 Merge remote-tracking branch 'origin/asyncio' into asyncio
Conflicts:
	gns3server/modules/project.py
	tests/modules/test_project.py
2015-02-04 13:52:46 -07:00
Jeremy
1bea78194c Explicit ID names, remove {uuid} from URLs and add vms in URLs for VMs. 2015-02-04 13:48:29 -07:00
Julien Duponchelle
c5c219ffe1 Allow modification of path from the client 2015-02-04 21:17:00 +01:00
Jeremy
59c82e26df Use project_id instead of project_uuid for the API. 2015-02-03 18:40:13 -07:00
Jeremy
d2699f051d Change URL for projects: /project becomes /projects and project_id is used instead of uuid. 2015-02-03 18:23:11 -07:00
Julien Duponchelle
f572f3fc95 You can't modify startup script remotely 2015-02-03 20:29:28 +01:00
Julien Duponchelle
2c3fe2ad4b Repare debug log 2015-02-02 21:28:42 +01:00
Jeremy
0c90393b5b Send explicit error message when client is checking for the server version. 2015-02-01 16:55:08 -07:00
Jeremy
fa978b6a28 Send all VirtualBox settings when creating the VM. 2015-01-30 19:36:05 -07:00
Jeremy
365af02f37 Packet capture support for VirtualBox. 2015-01-23 18:33:49 -07:00
Jeremy
6460e94311 More VirtualBox implementation. 2015-01-23 16:38:46 -07:00
Julien Duponchelle
0e76527ce2 Update a project 2015-01-23 16:13:58 +01:00
Julien Duponchelle
abc885049f Temporary project 2015-01-23 16:02:26 +01:00
grossmj
e61e976368 Adapters support for VirtualBox. 2015-01-22 21:31:26 -07:00
Jeremy
05c0efe39b More VirtualBox work. 2015-01-22 19:07:09 -07:00
Jeremy
0b1b27db8f Add module name to base manager. 2015-01-21 15:21:15 -07:00
Julien Duponchelle
368d1ff70b Update VPCS instance 2015-01-21 21:46:16 +01:00
Julien Duponchelle
87a089457f Update script file 2015-01-21 16:43:34 +01:00
Jeremy
17f6223fb1 Try to fix VirtualBox create test. 2015-01-20 15:28:40 -07:00
Julien Duponchelle
649d4e5143 Allow user to set console port 2015-01-20 20:54:46 +01:00
Julien Duponchelle
fa57485f11 Support script file 2015-01-20 19:56:18 +01:00
Julien Duponchelle
68d0e5f42d PEP8 2015-01-20 13:04:20 +01:00
Julien Duponchelle
0695e75e77 Fix tests 2015-01-20 12:46:15 +01:00
Jeremy
7fff25a9a9 UUID support for VMs.
Basic VirtualBox support (create, start and stop).
Some refactoring for BaseVM class.
Updated CURL command in tests.
2015-01-19 18:30:57 -07:00
Julien Duponchelle
240d83411c Create a project entity 2015-01-19 16:23:41 +01:00
Jeremy
ae8e2f4199 Prepare VirtualBox module. 2015-01-18 16:26:56 -07:00
Jeremy
b6212fc885 Improve Port Manager to handle UDP ports. 2015-01-18 15:41:53 -07:00
Jeremy
1cfce6ac5e Merge remote-tracking branch 'origin/asyncio' into asyncio
Conflicts:
	gns3server/handlers/vpcs_handler.py
	tests/api/test_version.py
	tests/api/test_vpcs.py
2015-01-18 12:23:42 -07:00
Jeremy
d142a9a885 Rename vpcs_id to id. Must be an integer in the route definition. 2015-01-18 12:12:11 -07:00
Julien Duponchelle
bf6f62e629 Serialize NIO 2015-01-16 17:09:45 +01:00
Julien Duponchelle
0cdc1c3042 VCPS create NIO work and tested 2015-01-16 16:20:10 +01:00
Jeremy
61344a1669 New base server. 2015-01-13 17:05:26 -07:00