Commit Graph

259 Commits

Author SHA1 Message Date
Julien Duponchelle
9c23093510 Merge branch 'master' into unstable 2015-10-07 16:44:50 +02:00
Julien Duponchelle
98ac295e2e Escape other usage of glob
Fix #332
2015-10-07 16:42:34 +02:00
Julien Duponchelle
c50c735e86 Merge branch 'master' into unstable 2015-10-07 13:51:28 +02:00
Julien Duponchelle
acd5c992ba Fix Dynamips identifier is already used by another router
Fix #327
2015-10-07 13:50:40 +02:00
Julien Duponchelle
9b740e85d0 Fix Dynamips identifier is already used by another router
Fix #327
2015-10-07 11:34:27 +02: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
5e3ce48a52 Merge branch 'master' into unstable 2015-10-06 19:19:56 +02:00
grossmj
80d99ec395 Fixes some minor issues. 2015-09-29 14:15:01 -06:00
grossmj
09aa31fb43 Do not automatically delete Dynamips bootflash file because they are necessary to restore VLANs on the c3600 platform. 2015-09-23 13:42:37 +02:00
Julien Duponchelle
e7ea9e8047 Merge branch 'master' into unstable 2015-09-22 14:40:13 +02:00
Julien Duponchelle
bfe3b12342 Fix dynamips configuration lost when you delete a node
Fix #316
2015-09-22 14:39:21 +02:00
Julien Duponchelle
6a6beb752a Merge remote-tracking branch 'origin/master' into unstable 2015-09-22 11:03:41 +02:00
grossmj
958274e8f6 Do not automatically delete Dynamips bootflash file because they are necessary to restore VLANs on the c3600 platform. 2015-09-16 06:09:14 -06:00
grossmj
a9ac0d3380 This may fix "The semaphore timeout period has expired" error on Windows. #311. 2015-09-13 15:47:43 -06:00
grossmj
8031cf1030 Require Dynamips version 0.2.16 to change the default QinQ Ethernet type. 2015-09-08 03:03:11 -06: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
2c5b2a19f6 Check for valid FR or ATM switch mappings. Fixes #300. 2015-09-08 02:07:06 -06:00
grossmj
a779fa7462 Check for valid FR or ATM switch mappings. Fixes #300. 2015-09-08 02:00:39 -06:00
grossmj
fda33c56de Catch exception when a process cannot be killed. Fixes #296. 2015-09-03 16:18:27 -06:00
Julien Duponchelle
8085080e41 Merge branch 'master' into unstable 2015-08-26 14:36:55 +02:00
Anton Fedotov
1283f8bde8 EthernetSwitch: Allow to choose ethertype for QinQ outer tag. 2015-08-20 09:42:30 +03:00
grossmj
83a7e25389 Fixes Unicode error. Fixes #290. 2015-08-13 20:15:50 -06:00
grossmj
ab3700854c Don't delete Dynamips ROM files. They are used to restore the nvram. 2015-08-10 21:23:05 -06:00
grossmj
2ce01fafc0 Don't delete Dynamips ROM files. They are used to restore the nvram. 2015-08-10 21:22:21 -06:00
grossmj
06a6287dff Backport: removes code that deletes IOS router instance files. 2015-07-31 14:37:23 -06:00
grossmj
87ec90cdaf Removes code that deletes IOS router instance files. 2015-07-30 18:50:59 -06:00
Jeremy
eb5e019a26 Fixes IOS adapters and WICS cannot be removed. Fixes #282. 2015-07-26 15:52:43 -06:00
Jeremy
76fe0cb316 Fixes IOS adapters and WICS cannot be removed. Fixes #282. 2015-07-26 15:51:55 -06:00
Jeremy
382747a2f2 Catch GeneratorExit exception. Fixes #231. 2015-07-25 16:55:37 -06:00
Jeremy
7b001e4d36 Catch GeneratorExit exception. Fixes #231. 2015-07-25 16:46:23 -06: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
Jeremy
439e0df058 Bind host on 0.0.0.0 when checking for a free UDP port. 2015-07-20 19:27:14 -06:00
Jeremy
d5c0584d25 Bind host on 0.0.0.0 when checking for a free UDP port. Fixes #265. 2015-07-20 19:22:20 -06:00
grossmj
1f890b4cad Implements uBridge hypervisor. 2015-07-19 22:55:10 -06:00
Jeremy
83929119be Return stdout when a process crash for IOU, Dynamips, uBridge and VPCS. 2015-07-04 14:08:03 -06:00
grossmj
4171aebfdb List only valid existing IOS images (for IOS router wizard). 2015-06-30 17:37:46 -06:00
Jeremy
be85d95ff7 Checks if IOS image exist at startup and not during node creation. Fixes #240. 2015-06-29 16:30:57 -06: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
f041697311 Compute a md5sum of images for futur purpose
Fix #234
2015-06-17 17:11:25 +02:00
Julien Duponchelle
75267f9d53 Merge branch 'master' into unstable 2015-06-10 16:30:30 +02:00
grossmj
c7ea8517a1 Do not stop saving IOS router or IOU configs when there is an exception while a project is committed. 2015-06-08 11:32:00 -06:00
grossmj
5a32d8a779 Merge remote-tracking branch 'origin/master' 2015-06-08 11:28:58 -06:00
grossmj
9f1705a4f1 Do not stop saving IOS router configs when there is an exception while a project is committed. 2015-06-08 11:28:48 -06:00
grossmj
042472f02c Check interface is up before connecting a NIO (Linux only). Fixes #277. 2015-06-07 13:51:33 -06:00
grossmj
81d417a2b3 Fixes too many arguments to socket.getaddrinfo() 2015-06-07 09:25:54 -06:00
grossmj
81e56e035b IPv6 support. 2015-06-06 21:37:34 -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
Julien Duponchelle
02650fa490 Create a private config file if expected
Fix #217
2015-06-05 16:23:52 +02:00