NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-18 15:33:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

More checks on minimum RAM for IOS routers and updates default values to match the latest IOS image requirements.

Browse Source
This commit is contained in:
Jeremy 2014-12-24 15:46:59 -07:00
parent 7785c03eac
commit 747c0ee7a3
8 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/modules/dynamips/nodes/c1700.py
View File

@ -44,7 +44,7 @@ class C1700(Router):
Router.__init__(self, hypervisor, name, router_id, platform="c1700") Router.__init__(self, hypervisor, name, router_id, platform="c1700")
# Set default values for this platform # Set default values for this platform
self._ram = 64 self._ram = 128
self._nvram = 32 self._nvram = 32
self._disk0 = 0 self._disk0 = 0
self._disk1 = 0 self._disk1 = 0

2
gns3server/modules/dynamips/nodes/c2600.py
View File

@ -59,7 +59,7 @@ class C2600(Router):
Router.__init__(self, hypervisor, name, router_id, platform="c2600") Router.__init__(self, hypervisor, name, router_id, platform="c2600")
# Set default values for this platform # Set default values for this platform
self._ram = 64 self._ram = 128
self._nvram = 128 self._nvram = 128
self._disk0 = 0 self._disk0 = 0
self._disk1 = 0 self._disk1 = 0

2
gns3server/modules/dynamips/nodes/c2691.py
View File

@ -40,7 +40,7 @@ class C2691(Router):
Router.__init__(self, hypervisor, name, router_id, platform="c2691") Router.__init__(self, hypervisor, name, router_id, platform="c2691")
# Set default values for this platform # Set default values for this platform
self._ram = 128 self._ram = 192
self._nvram = 112 self._nvram = 112
self._disk0 = 16 self._disk0 = 16
self._disk1 = 0 self._disk1 = 0

2
gns3server/modules/dynamips/nodes/c3600.py
View File

@ -42,7 +42,7 @@ class C3600(Router):
Router.__init__(self, hypervisor, name, router_id, platform="c3600") Router.__init__(self, hypervisor, name, router_id, platform="c3600")
# Set default values for this platform # Set default values for this platform
self._ram = 128 self._ram = 192
self._nvram = 128 self._nvram = 128
self._disk0 = 0 self._disk0 = 0
self._disk1 = 0 self._disk1 = 0

2
gns3server/modules/dynamips/nodes/c3745.py
View File

@ -40,7 +40,7 @@ class C3745(Router):
Router.__init__(self, hypervisor, name, router_id, platform="c3745") Router.__init__(self, hypervisor, name, router_id, platform="c3745")
# Set default values for this platform # Set default values for this platform
self._ram = 128 self._ram = 256
self._nvram = 304 self._nvram = 304
self._disk0 = 16 self._disk0 = 16
self._disk1 = 0 self._disk1 = 0

2
gns3server/modules/dynamips/nodes/c7200.py
View File

@ -43,7 +43,7 @@ class C7200(Router):
Router.__init__(self, hypervisor, name, router_id, platform="c7200") Router.__init__(self, hypervisor, name, router_id, platform="c7200")
# Set default values for this platform # Set default values for this platform
self._ram = 256 self._ram = 512
self._nvram = 128 self._nvram = 128
self._disk0 = 64 self._disk0 = 64
self._disk1 = 0 self._disk1 = 0

2
gns3server/modules/virtualbox/__init__.py
View File

@ -721,7 +721,7 @@ class VirtualBox(IModule):
""" """
try: try:
result = subprocess.check_output(command, stderr=subprocess.STDOUT, timeout=30) result = subprocess.check_output(command, stderr=subprocess.STDOUT, timeout=60)
except (OSError, subprocess.SubprocessError) as e: except (OSError, subprocess.SubprocessError) as e:
raise VirtualBoxError("Could not execute VBoxManage {}".format(e)) raise VirtualBoxError("Could not execute VBoxManage {}".format(e))
return result.decode("utf-8", errors="ignore") return result.decode("utf-8", errors="ignore")

3
gns3server/modules/virtualbox/virtualbox_vm.py
View File

@ -25,7 +25,6 @@ import re
import os import os
import subprocess import subprocess
import tempfile import tempfile
import shutil
import json import json
import socket import socket
import time import time
@ -535,7 +534,7 @@ class VirtualBoxVM(object):
id=self._id, id=self._id,
adapter_type=adapter_type)) adapter_type=adapter_type))
def _execute(self, subcommand, args, timeout=30): def _execute(self, subcommand, args, timeout=60):
""" """
Executes a command with VBoxManage. Executes a command with VBoxManage.