Commit Graph

243 Commits

Author SHA1 Message Date
Jerry Seutter
03fb75437b Add cert and auth support to gns3server. 2014-09-29 18:19:35 -06:00
Jerry Seutter
3833803244 Copy deadman switch code from old repository into gns3server. 2014-09-29 18:14:07 -06:00
Jerry Seutter
7c446796fe gns3server now controls the deadman switch. 2014-09-29 18:09:16 -06:00
grossmj
46495b9265 Merge remote-tracking branch 'origin/master' 2014-09-28 18:23:51 -06:00
grossmj
a8193fa063 Split the PATH environment variable using os.pathsep 2014-09-28 18:23:27 -06:00
Jeremy Grossmann
e3eecb6584 Merge pull request #33 from dlintott/fix_broken_test
Fix test for dynamips c7200 NPE (Default is now NPE-400)
2014-09-27 15:07:20 -06:00
Jeremy Grossmann
35f3434b2f Merge pull request #32 from noplay/osx_installation
Instruction for development on MacOS X
2014-09-27 13:56:28 -06:00
Daniel Lintott
20dc779fd8 Fix test for dynamips c7200 NPE (Default is now NPE-400) 2014-09-27 19:27:26 +01:00
Julien Duponchelle
04f670cb50 Instruction for development on MacOS X 2014-09-27 19:59:58 +02:00
grossmj
6dce005594 Bump to version 1.0-beta1.dev1. 2014-09-24 11:14:28 -06:00
grossmj
a49f107af2 Bump to version 1.0-beta3. 2014-09-24 11:01:33 -06:00
grossmj
e7141685cc Tweaks to support Qemu on Windows. 2014-09-23 21:38:51 -06:00
grossmj
aca9e0de56 Qemu integration stage 2, support for ASA and IDS. 2014-09-22 21:24:55 -06:00
grossmj
d1715baae1 Base QEMU support. 2014-09-18 15:47:43 -06:00
Michael
6f9e0f6d2e Moved certs to .config 2014-09-03 22:19:59 -06:00
Michael
b84dda3c8e HTTP auth added to file_upload and jsonrpc 2014-09-03 22:12:34 -06:00
Jerry Seutter
e2f3d2aca8 Pull from dev 2014-09-03 20:39:02 +00:00
Michael
382e693fc8 Added authentication handler for basic auth check 2014-09-03 00:05:06 -06:00
Michael
a95cc678e9 Added server.py ssl mode dependant on cert existence 2014-09-02 22:33:45 -06:00
Michael
bcf0aae531 Added HOME support and cert dir to create_cert script 2014-09-02 22:17:06 -06:00
grossmj
b483f87c2f Bump version to 1.0-beta3.dev1. 2014-09-02 15:49:39 -06:00
grossmj
9d2e18328b Bump version to 1.0-beta2. 2014-09-02 13:06:26 -06:00
Michael
174013da80 Merge pull request #2 from planctechnologies/deadman
GNS-42 - Move deadman switch into gns3server codebase
2014-08-31 23:50:41 -06:00
Michael
99a8f5f21a Added create_cert.sh and ssl_options to enable SSL 2014-08-30 01:32:48 -06:00
Jerry Seutter
5e72fcbe14 GNS-42 - Move deadman switch into gns3server codebase 2014-08-29 18:05:56 +00:00
Michael
e688d96c36 Add start, stop, restart and heartbeat handling to DeadMan module 2014-08-28 23:06:28 -06:00
Michael
3845cab84b Adding initial module 2014-08-28 22:09:38 -06:00
Michael
98e3a2e088 Updated requirements.txt 2014-08-28 22:01:23 -06:00
grossmj
76b357c1ce Do not activate sparse memory by default for c1700 and c2600 platforms.
https://github.com/GNS3/dynamips/issues/54
2014-08-26 17:07:48 -06:00
grossmj
80ab81190c Add "enable console" option to VirtualBox VMs (True by default).
Add "start at" option to VirtualBox VMs (adapter start index, 0 by default).
2014-08-26 15:27:43 -06:00
grossmj
934404cc90 Change default port ranges. 2014-08-25 15:40:04 -06:00
grossmj
6e39630b9b Required VirtualBox wrapper is >= 9.1 2014-08-22 17:39:57 -06:00
grossmj
569a68a486 VirtualBox support refactoring. 2014-08-22 17:36:12 -06:00
grossmj
77c583ca39 Check if the VirtualBox COM service is installed on Windows. 2014-08-21 18:13:41 -06:00
grossmj
ea05744e1c Force to rebuild the COM cache on Windows (for VirtualBox support). 2014-08-17 15:15:07 -06:00
grossmj
e0f0c98ffd Do not look for vboxwrapper on non Windows platforms. 2014-08-13 12:11:41 -06:00
grossmj
a8d740ef21 Fix version from 1.0beta2-dev1 to 1.0beta2.dev1 2014-08-11 22:13:21 -06:00
Jeremy Grossmann
90c8c4312c Merge pull request #27 from dlintott/master
Override check_origin and fix test suite
2014-08-10 15:27:49 -06:00
Daniel Lintott
e5642546f1 Remove commented line, not needed anymore 2014-08-09 12:26:24 +01:00
Daniel Lintott
4a33b2021c Further optimise the Travis testing and improve running tests for a user
+ Convert setup.py test to run py.test instead of tox
  + Tox should now run setup.py test
  + TravisCI will create a job for each TOX_ENV and then execute
    tox to run the tests for that TOX_ENV
2014-08-09 12:05:31 +01:00
Daniel Lintott
a4bc96af28 revert not installing requirements outside of tox 2014-08-08 19:20:20 +01:00
Daniel Lintott
d8f622d438 Streamline TravisCI build
+ As we use Tox there's no need to run seperate builds for
   python3.3 and python3.4
 + There's no need to install the requirements in main
   environment as all dependencies are handled in the Tox
   virtualenv's
2014-08-08 19:15:26 +01:00
Daniel Lintott
ad287d3434 Remove un-needed imports 2014-08-08 19:14:36 +01:00
Daniel Lintott
4a4a57e1a3 Further test fixes
+ tests/dynamips/test_hypervisor.py: Increase sleep time to prevent
   random test failures
 + tests/iou/test_iou_device.py: Rework test skipping based on presence
   of IOU image rather than environment variable
2014-08-08 17:54:30 +01:00
Daniel Lintott
9b010d6388 Update test_hypervisor.py
+ test_stdout: use system dynamips
 + test_stdout: correct host address to start dynamips on
2014-08-08 15:00:44 +01:00
Daniel Lintott
8fc4667d2c Modify the TRAVIS environment check 2014-08-08 14:49:10 +01:00
Daniel Lintott
7cbce0f81b Fix test suite
+ Install VPCS and dynamips from GNS3 PPA
 + Drop netifaces-py3 from requirements.txt
 + Fix/update tests to use installed VPCS and dynamips
2014-08-08 14:32:32 +01:00
Daniel Lintott
578bb5741d Override check_origin from tornado.websocket 2014-08-06 22:43:37 +01:00
grossmj
0cfb446146 Bump version to beta1. 2014-07-18 22:50:22 -06:00
grossmj
ae0feb8c9c Fixes packet capture when spaces are in the capture file path. 2014-07-18 22:43:01 -06:00