arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Code Issues Releases Wiki Activity
5,750 Commits 5 Branches 203 Tags 151 MiB
0037f31553
Commit Graph

278 Commits

Author SHA1 Message Date
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
3560cda06c Use asyncio.ensure_future() instead of asyncio.async() with conservative approach to support Python < 3.4.4. Fixes https://github.com/GNS3/gns3-gui/issues/2566 2018-08-24 18:57:18 +07:00
grossmj
b7f9b865c8 Optimize appliance templates update from GitHub repository by only downloading when the repository 
has been updated. Ref https://github.com/GNS3/gns3-gui/issues/2490
 2018-08-21 16:26:07 +07: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
96d5e351f7 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/version.py
#	requirements.txt
 2018-06-10 21:19:55 +07:00
grossmj
fd5df0052a Fix issue with some SVG symbols that could not be used in GNS3. 
This was due to the height and width values being percentages.
 2018-06-06 16:32:51 +07:00
grossmj
f8bf749577 Remove unwanted trailing characters and other white spaces when reading .md5sum files. 2018-06-05 00:01:20 +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
grossmj
051eedb406 Change order to find vnetlib on Windows (PATH -> Registry -> Default directories). 2018-06-04 21:57:34 +07:00
grossmj
7622c10cc9 Returns the ports' adapter types and mac addresses when available. 2018-04-06 13:19:17 +07:00
grossmj
d419d3fa39 Check if the HAXM service is running when starting a Qemu VM with hardware acceleration. Ref #1242. 2018-03-24 22:15:20 +07:00
grossmj
08493871a5 Restrict the list of available Ethernet/TAP adapters. Fixes #352. 2018-03-15 16:33:23 +07:00
grossmj
90ce6093d8 Some spring cleaning. 2018-03-15 14:17:39 +07:00
grossmj
658aa4bae9 Merge 2.1 into 2.2 branch 2018-03-12 13:38:50 +07:00
Bernhard Ehlers
3a09bd43dc Implement a minimum interval between psutil calls. Fixes #2262 2018-02-13 11:31:04 +01:00
ziajka
1582ac3195 Merge branch '2.2' into async-md5-calcs 2018-01-29 13:01:45 +01:00
ziajka
eeae07e783 Conservative approach to supported versions of Python 3.4 and asyncio.ensure_future, Ref. #1269 2018-01-29 12:13:20 +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
860ca3b35d Remotely close telnet console. Ref #2330 2017-11-20 15:28:07 +01:00
ziajka
96a0b52cf8 EthernetSwitch closing connections, Ref: gui/#2330 2017-11-20 13:51:07 +01:00
grossmj
1524493c33 Fix IOU detection of layer 1 keepalive support. Fixes #1183. 2017-10-12 23:32:45 +08:00
ziajka
807bea40d4 Fixes running switch console inside PyCharm terminal (Ref. #1172) 2017-08-29 12:28:53 +02:00
ziajka
4e3eee33fc Windows console bugfix tests 2017-08-29 10:08:10 +02:00
Julien Duponchelle
2dc83d7894
Interface starting with gns3 are not display by default in the cloud 
Fix https://github.com/GNS3/gns3-gui/issues/2199
 2017-08-03 16:33:42 +02:00
ziajka
86bd7b6058 Added missing corutine flag, fixes #1145 2017-07-26 11:37:09 +02:00
ziajka
ac508435c3 History support for console and telnet application, Fixes: #1083 
Arrows UP/DOWN for telnet, Ref. #1083

Typo, Ref. #1083

Support async commands, Ref. #1083

Small refactor, Ref. #1083

Asyncio telnet server - connections support, Ref. #10831

Prompt-toolkit in dependencies, ref. #1083

Few comments, ref. #1083

Direct imports, ref. #1083

Windows size changed support in telnet server, ref. #1139

Fake termios

Fake termios - different approach

InputStream - copied source from prompt_toolkit
 2017-07-25 16:18:07 +02:00
Julien Duponchelle
e8a35ac41f
Interface ending with -nic are special ethernet interface 
It's libvirt internal stuff

Fix #1114
 2017-07-12 16:13:46 +02:00
Julien Duponchelle
e5bc7c7a66
Merge branch '2.1' into embed_shell 2017-06-19 11:10:24 +02:00
Julien Duponchelle
40cc5d76b3
Fix racecondition when listing interface 
Fix #1060
 2017-06-07 15:57:05 +02:00
Julien Duponchelle
ca3f8d0b43
Provide easy to test a shell by using stdin as an input 2017-06-02 14:50:34 +02:00
Julien Duponchelle
5616ab0e9a
Fake console for simple Ethernet switch 
Fix #454
 2017-05-31 15:13:29 +02:00
Julien Duponchelle
c9ceeee9de
Handle some invalid SVG images 
Fix #986
 2017-04-24 17:31:20 +02:00
Julien Duponchelle
36de30e25e
Fix various tests for windows 2017-04-18 14:23:29 +02:00
Julien Duponchelle
cfe13e1929
Support IOU image without .bin at the end 2017-03-29 16:08:13 +02:00
Julien Duponchelle
8d22f2930e
Fix a crash with missing size in the svg files 
Fix #960
 2017-03-27 10:41:28 +02:00
Julien Duponchelle
7c318d477d
Handle some invalid svg 
Fix #944
 2017-03-16 18:39:07 +01:00
Julien Duponchelle
961c209ab1
Fix an issue when getting size from some SVG file 
Fix https://github.com/GNS3/gns3-gui/issues/1866
 2017-02-20 17:25:26 +01:00
Julien Duponchelle
10b039074f
Avoid a crash in some conditions when reading the serial console 2017-02-15 19:31:38 +01:00
Julien Duponchelle
19b70accd5
Catch error when we can't access to a unix socket 2017-02-06 17:59:00 +01:00
Julien Duponchelle
bfbc6ff0be
Fix rare race condition when stopping ubridge 
Fix #887
 2017-01-31 13:43:05 +01:00
Julien Duponchelle
2da20177a2
Avoid crash when you broke your system permissions 
Fix #877
 2017-01-27 10:56:48 +01:00
Julien Duponchelle
df694ca9eb
Fix export of IOU configuration 
Fix https://github.com/GNS3/gns3-gui/issues/1745
 2017-01-10 15:50:35 +01:00
Julien Duponchelle
3259ec1220
Close project if one one the compute of the project is down 
Fix #836
 2016-12-15 21:57:59 +01:00
Julien Duponchelle
c4327ec74c
Improve docker HTTP console 
Fix #816
 2016-12-09 16:41:15 +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
9be293909e
Use vnetlib64.exe when possible 
Fix https://github.com/GNS3/gns3-gui/issues/1648
 2016-11-21 17:49:40 +01:00
Julien Duponchelle
a872f0328d
Fix closing console of VBox on NIX systems 2016-11-18 11:27:50 +01:00
Julien Duponchelle
dcff51eb75
Use wait_for for waiting a process with python 3.5 2016-11-17 18:09:46 +01:00
Julien Duponchelle
ecfa89cba8
Speed up interfaces listening on Windows 
Fix #788
 2016-11-16 12:28:02 +01:00
Julien Duponchelle
6e5e9e3df9
Fix filtering special interfaces on Windows 2016-11-16 12:21:43 +01:00
Julien Duponchelle
56c580dc44
On windows filter VMware and VirtualBox adapters by default 
Ref #788
 2016-11-16 12:16:46 +01:00
Julien Duponchelle
52577b55b2
Typo 2016-11-11 14:44:27 +01:00
Julien Duponchelle
3bb4f6f133
Display path of vnetlib during interface creations 
Ref https://github.com/GNS3/gns3-gui/issues/1648
 2016-11-11 14:26:09 +01:00
Julien Duponchelle
69f154d9cc
Correctly initialize connection to VPCS console 2016-11-08 20:10:17 +01:00
Julien Duponchelle
553e137a13
Support for serial console for Virtual BOX and VMware using asyncio 
Ref #747
 2016-11-07 23:43:20 +01:00
grossmj
c271ef8c6a Tool to add, configure and remove Windows loopback adapters. 
New dependency: wmi (not added to requirements.txt).

Usage (must be running with admin rights):
gns3loopback.exe --add MY_LOOPBACK 10.0.0.1 255.0.0.0
gns3loopback.exe --remove MY_LOOPBACK
 2016-11-05 15:10:05 +11: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
10e7b32409
Fix an error when importing old topology without color for label 
Fix #736
 2016-10-24 14:58:14 +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
a01b55f07b
Fix a crash if font information is missing 
Fix #700
 2016-09-30 10:30:24 +02:00
Julien Duponchelle
c38dd004b8
Extract netmask of interfaces on windows 2016-09-28 10:48:28 +02:00
Julien Duponchelle
fb2dac6ef1
All tests pass on windows 2016-09-28 10:27:30 +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
3ea5df7462
Make better error when we have no netmask 
Fix #1541
 2016-09-27 11:47:18 +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
84a2f8b4a3
Return flag for special interface that you can use in the cloud 
Fix https://github.com/GNS3/gns3-gui/issues/1509
 2016-09-14 17:15:06 +02:00
Julien Duponchelle
72fe5d3489
Merge branch 'master' into 2.0 2016-08-29 14:08:23 +02:00
Julien Duponchelle
0eafb6f06c
Fix a lock issue with some virtualbox vm 
Fix  https://github.com/GNS3/gns3-gui/issues/1444
 2016-08-29 10:51:50 +02:00
Julien Duponchelle
c01bb2436e
Return netmask with list of interfaces 2016-08-25 17:22:22 +02:00
Julien Duponchelle
0226bb663f
Fix start all node is broken 
Fix #633
 2016-08-19 11:32:11 +02:00
Julien Duponchelle
fa76b89731
Fix websocket error when closing the server 
Fix #634
 2016-08-19 11:20:56 +02:00
Julien Duponchelle
f0fad5289c
Correclty cleanup packet capture objects when closing server 
Fix #592
 2016-08-19 11:05:54 +02:00
Julien Duponchelle
3e3e7b93ae
Merge branch 'master' into 2.0 2016-08-18 21:34:52 +02:00
Julien Duponchelle
1c2a56ee8e
Filter images starting by . 2016-08-18 19:29:09 +02:00
Julien Duponchelle
7777407c4b
Filter md5sum files from the list of images 2016-08-18 19:26:17 +02:00
Julien Duponchelle
5de27a95f9
Center label when hostname change 
Fix #1404
 2016-08-17 17:12:23 +02:00
Julien Duponchelle
938696032c
Fix tests 2016-08-17 11:05:16 +02:00
Julien Duponchelle
4d8cf8460e
Function for computing size of symbols 2016-08-17 10:49:31 +02:00
Athmane Madjoudj
db95cb5c46 Move utils.vmnet to gns3 namespace 2016-07-29 17:53:48 +00:00
Julien Duponchelle
0c3a2c660a
Merge branch 'master' into 2.0 2016-07-28 15:05:21 +02:00
Julien Duponchelle
7d90a73ed2
Catch error when md5sum file is corrupted 
Fix #622
 2016-07-28 12:35:23 +02:00
Julien Duponchelle
c0abe0edfd
Merge branch 'master' into 2.0 2016-07-13 17:48:18 +02:00
Julien Duponchelle
8be1e77a2e
Optimize storage of drawing 
If the drawing contain an image we extract it

Fix #591
 2016-07-13 16:18:22 +02:00
Julien Duponchelle
febf0f7839
Fix crash when winpcap is not installed 
Ref https://github.com/GNS3/gns3-gui/issues/1380
 2016-07-12 13:43:08 +02:00
grossmj
50aa198ba7 Mark interface type upstream. 2016-07-10 14:54:31 -06:00
grossmj
56051b1142 UDP server discovery. Ref #545. 2016-06-15 17:37:43 -06:00
Jeremy Grossmann
3aea16c527 Merge pull request #568 from GNS3/watch_dynamips_change 
Watch for dynamips rom & nvram change
 2016-06-14 11:58:42 -06:00
grossmj
31f4b52631 Add zeroconf. Ref #545. 2016-06-13 15:07:20 -06:00
Julien Duponchelle
67c04a7855
Watch for dynamips rom & nvram change 
This monitor for change the file from dynamips by computing a
hash of the watched file.

The way dynamips work prevent the update of the modification time.

We can improve that by using native system for watching file but:
* it's require dependencies specific for each OS
* dependencies use C extensions
* this is only a backup if your router is cleanly shutdown we export
stuff
 2016-06-13 15:57:36 +02:00
Jeremy Grossmann
6cd136b423 Merge pull request #565 from GNS3/watch_iou 
Monitor IOU NVRAM changes.
 2016-06-10 22:33:56 -06:00
grossmj
c3c5eb533f Detect Wifi adapters on OSX. Fixes #549. 2016-06-10 12:36:41 -06:00
Julien Duponchelle
69334665d2
Monitor IOU nvram for change 
With the save as you go we need to save the startup config
when a change appear instead of the old commit system.
 2016-06-10 18:26:01 +02:00
Julien Duponchelle
182a979e71
Generic class for watch file change 2016-06-10 17:51:19 +02:00
Julien Duponchelle
2a5cf18d20
When using pool raise again exception received 2016-06-10 14:42:46 +02:00
Julien Duponchelle
add546158f
List images return images on compute and controller 
Fix #506
 2016-06-08 14:14:03 +02:00
Julien Duponchelle
08e482004f
Auto upload missing images 2016-06-07 19:38:01 +02:00
Julien Duponchelle
cb7dbfb256
Merge branch '1.5' into 2.0 2016-06-02 13:47:40 +02:00
Julien Duponchelle
d3436756b2
Fix permissions and ownership when stopping container 
Fix #550
 2016-05-31 21:08:41 +02:00
grossmj
c1aad550fa Merge branch '1.5' into 2.0 
Conflicts:
	gns3server/version.py
 2016-05-29 19:52:15 -06:00
grossmj
39a3f2fae2 Cloud schema and remove use_ubridge for VMware VM. 2016-05-28 21:46:48 -06:00
grossmj
914fe7e750 Randomize the 4th and 5th bytes when provided with a base mac address. Fixes #522. 2016-05-27 23:00:05 -06:00
Julien Duponchelle
b126c396c9
Start all, with a controlled concurrency 
Fix #536
 2016-05-24 11:21:49 +02:00
Julien Duponchelle
da6cb13338
Merge branch '1.5' into 2.0 2016-05-24 10:13:53 +02:00
grossmj
acdc1e5ebb Fixes check for NPF service and add check for NPCAP service on Windows. 2016-05-20 20:19:28 -06:00
Julien Duponchelle
d5895c3a47
Merge branch '1.5' into 2.0 2016-05-18 11:25:41 +02:00
Julien Duponchelle
871fea33e0
Cleanup unbreakable space 2016-05-18 11:23:45 +02: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
c2da568543
Protect controller and compute about path outside project directory 
Fix #503
 2016-05-11 15:59:32 +02:00
Julien Duponchelle
9dca7dfe4a
Merge branch '1.5' into 2.0 2016-05-10 17:51:40 +02:00
Julien Duponchelle
57cf57b408
Improve parse_version 
Ref #515
 2016-05-06 17:09:03 +02:00
Julien Duponchelle
56c153af79
Make HTTP support more reliable with home made HTTP server 2016-05-04 16:32:45 +02:00
Julien Duponchelle
f3095d94c1
Replace port in HTTP flow for docker 2016-05-03 18:01:23 +02:00
Julien Duponchelle
5fd385159c
HTTP support for docker 
Fix #509
 2016-05-03 16:49:33 +02:00
Julien Duponchelle
dcbaa62df8
Better aux console for docker 
Fix #472
 2016-05-03 11:33:43 +02:00
Julien Duponchelle
d952718f30
Fix RuntimeWarning: You have iterated over the result of 
pkg_resources.parse_version. This is a legacy behavior

Fix #504
 2016-05-02 17:14:15 +02:00
Julien Duponchelle
7390d833ba
Merge branch 'master' into 2.0 2016-04-26 11:50:16 +02:00
Julien Duponchelle
1d08d4a5fa
Merge branch 'master' into 1.5 2016-04-26 11:49:24 +02:00
Julien Duponchelle
75196b8a55
Fix incrementation of qemu mac address 
Fix #501
 2016-04-25 16:36:20 +02:00
Julien Duponchelle
ad6fb664a2
Fix detection of EOF in Docker telnet console 
Fix #476
 2016-04-07 10:58:37 +02:00
grossmj
fa58b1f81c Check for NPF service on Windows. 2016-03-25 19:53:36 -06:00
Julien Duponchelle
174e7cccea
Merge branch 'master' into 1.5 2016-03-16 16:35:03 +01:00
grossmj
a018c5b0f5 Get MAC addresses for host interfaces to use for filtering frames from vmnet interfaces. 2016-03-14 18:27:51 -06:00
Julien Duponchelle
dab1b26569
Aux console for Docker 
Fix https://github.com/GNS3/gns3-gui/issues/1039
 2016-03-01 14:53:43 +01:00
Julien Duponchelle
87eef545e1
Correctly close the telnet connection for docker 
Fix #427
 2016-02-23 16:54:12 +01:00
Julien Duponchelle
f35c742b07
Avoid consuming 100% of CPU when stopping docker container 
Fix #427
 2016-02-19 17:53:17 +01:00
Julien Duponchelle
c2b78400f2
Fix closing a docker console jump to 100% of CPU usage 
Fix #427
 2016-02-16 17:26:53 +01:00
Julien Duponchelle
33edbefa3b Docker cleanup and improvements 2015-12-18 18:20:56 +01:00
Julien Duponchelle
e626c0b55c Raise an error if psutil version is invalid 
Fix #361
 2015-12-01 09:42:36 +01:00
Julien Duponchelle
da240f21ba Apply pep8 fix 2015-11-09 12:28:00 +01:00
grossmj
c3e99bfc1d Drop netifaces (replaced by psutil). Fixes #344. 2015-11-08 13:34:27 -07:00
grossmj
82540e5366 Fixes wait for named pipe creation. 2015-11-01 20:52:07 -07:00
grossmj
32f9baf682 Fixes Windows named pipe issue. Fixes #340. 2015-11-01 18:51:12 -07:00
grossmj
ee6ef9f3d5 Wait for pipe file to be created before starting the remote console for VMware and VirtualBox VMs. Fixes #331. 2015-10-11 15:50:50 -06:00
Julien Duponchelle
da7f910482 glob.escape is available with Python 3.4 2015-10-07 10:27:42 +02:00
Julien Duponchelle
4c13f8e6ea Merge branch 'master' into unstable 2015-10-07 10:27:06 +02:00
Julien Duponchelle
4232ea8a00 Protect dynamips against bad glob 
Fix #332
 2015-10-07 10:26:37 +02:00
Julien Duponchelle
3d7d8682ee OVA file support 2015-10-06 17:50:54 +02:00
Jeremy
abd9c1dc48 Use the registry to find vmrun if the default VMware install path does not exist. 2015-07-21 15:59:29 -06:00
Julien Duponchelle
5125ddcde4 Fix gns3server.utils.images in md5sum NameError: name 'log' is not 
Fix #268
 2015-07-16 18:56:36 +02:00
Jeremy
870029123c Netifaces is not used on Windows. Fixes #257. 2015-07-08 14:51:21 -06:00
Julien Duponchelle
65953847f6 Fix an error in frozen ressources loading 2015-07-03 20:29:49 +02:00
Julien Duponchelle
472faa97c5 Due to the migration to cx_freeze darwin and windows share 
the same path for resources
 2015-07-01 17:25:53 +02:00
Julien Duponchelle
a8e69d9a0b Do not use the md5 from cache for a missing image 2015-06-19 16:36:25 +02:00
Julien Duponchelle
f041697311 Compute a md5sum of images for futur purpose 
Fix #234
 2015-06-17 17:11:25 +02:00
Julien Duponchelle
94fbd3fac9 Ignore invalid characters when reading the output of a process 
It should happend only when user try to use another binary and
the code of VPCS, dynamips... Will detect it's not the
correct binary.

For example we detect this error after an user used SupperPutty
instead of VPCS.

Fix #235
 2015-06-16 15:48:59 +02:00