mirror of
https://github.com/GNS3/gns3-server
synced 2024-11-28 03:08:14 +00:00
More checks on minimum RAM for IOS routers and updates default values to match the latest IOS image requirements.
This commit is contained in:
parent
7785c03eac
commit
747c0ee7a3
@ -44,7 +44,7 @@ class C1700(Router):
|
||||
Router.__init__(self, hypervisor, name, router_id, platform="c1700")
|
||||
|
||||
# Set default values for this platform
|
||||
self._ram = 64
|
||||
self._ram = 128
|
||||
self._nvram = 32
|
||||
self._disk0 = 0
|
||||
self._disk1 = 0
|
||||
|
@ -59,7 +59,7 @@ class C2600(Router):
|
||||
Router.__init__(self, hypervisor, name, router_id, platform="c2600")
|
||||
|
||||
# Set default values for this platform
|
||||
self._ram = 64
|
||||
self._ram = 128
|
||||
self._nvram = 128
|
||||
self._disk0 = 0
|
||||
self._disk1 = 0
|
||||
|
@ -40,7 +40,7 @@ class C2691(Router):
|
||||
Router.__init__(self, hypervisor, name, router_id, platform="c2691")
|
||||
|
||||
# Set default values for this platform
|
||||
self._ram = 128
|
||||
self._ram = 192
|
||||
self._nvram = 112
|
||||
self._disk0 = 16
|
||||
self._disk1 = 0
|
||||
|
@ -42,7 +42,7 @@ class C3600(Router):
|
||||
Router.__init__(self, hypervisor, name, router_id, platform="c3600")
|
||||
|
||||
# Set default values for this platform
|
||||
self._ram = 128
|
||||
self._ram = 192
|
||||
self._nvram = 128
|
||||
self._disk0 = 0
|
||||
self._disk1 = 0
|
||||
|
@ -40,7 +40,7 @@ class C3745(Router):
|
||||
Router.__init__(self, hypervisor, name, router_id, platform="c3745")
|
||||
|
||||
# Set default values for this platform
|
||||
self._ram = 128
|
||||
self._ram = 256
|
||||
self._nvram = 304
|
||||
self._disk0 = 16
|
||||
self._disk1 = 0
|
||||
|
@ -43,7 +43,7 @@ class C7200(Router):
|
||||
Router.__init__(self, hypervisor, name, router_id, platform="c7200")
|
||||
|
||||
# Set default values for this platform
|
||||
self._ram = 256
|
||||
self._ram = 512
|
||||
self._nvram = 128
|
||||
self._disk0 = 64
|
||||
self._disk1 = 0
|
||||
|
@ -721,7 +721,7 @@ class VirtualBox(IModule):
|
||||
"""
|
||||
|
||||
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:
|
||||
raise VirtualBoxError("Could not execute VBoxManage {}".format(e))
|
||||
return result.decode("utf-8", errors="ignore")
|
||||
|
@ -25,7 +25,6 @@ import re
|
||||
import os
|
||||
import subprocess
|
||||
import tempfile
|
||||
import shutil
|
||||
import json
|
||||
import socket
|
||||
import time
|
||||
@ -535,7 +534,7 @@ class VirtualBoxVM(object):
|
||||
id=self._id,
|
||||
adapter_type=adapter_type))
|
||||
|
||||
def _execute(self, subcommand, args, timeout=30):
|
||||
def _execute(self, subcommand, args, timeout=60):
|
||||
"""
|
||||
Executes a command with VBoxManage.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user