diff --git a/gns3server/modules/dynamips/nodes/c1700.py b/gns3server/modules/dynamips/nodes/c1700.py index 241601a2..906abe3e 100644 --- a/gns3server/modules/dynamips/nodes/c1700.py +++ b/gns3server/modules/dynamips/nodes/c1700.py @@ -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 diff --git a/gns3server/modules/dynamips/nodes/c2600.py b/gns3server/modules/dynamips/nodes/c2600.py index 56866235..b5e46e89 100644 --- a/gns3server/modules/dynamips/nodes/c2600.py +++ b/gns3server/modules/dynamips/nodes/c2600.py @@ -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 diff --git a/gns3server/modules/dynamips/nodes/c2691.py b/gns3server/modules/dynamips/nodes/c2691.py index 339fada9..0dc0ef28 100644 --- a/gns3server/modules/dynamips/nodes/c2691.py +++ b/gns3server/modules/dynamips/nodes/c2691.py @@ -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 diff --git a/gns3server/modules/dynamips/nodes/c3600.py b/gns3server/modules/dynamips/nodes/c3600.py index b0117a16..32e2bbe7 100644 --- a/gns3server/modules/dynamips/nodes/c3600.py +++ b/gns3server/modules/dynamips/nodes/c3600.py @@ -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 diff --git a/gns3server/modules/dynamips/nodes/c3745.py b/gns3server/modules/dynamips/nodes/c3745.py index f8392cc3..8002909a 100644 --- a/gns3server/modules/dynamips/nodes/c3745.py +++ b/gns3server/modules/dynamips/nodes/c3745.py @@ -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 diff --git a/gns3server/modules/dynamips/nodes/c7200.py b/gns3server/modules/dynamips/nodes/c7200.py index a473f954..21ab4aa6 100644 --- a/gns3server/modules/dynamips/nodes/c7200.py +++ b/gns3server/modules/dynamips/nodes/c7200.py @@ -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 diff --git a/gns3server/modules/virtualbox/__init__.py b/gns3server/modules/virtualbox/__init__.py index 561c5131..9fc547d1 100644 --- a/gns3server/modules/virtualbox/__init__.py +++ b/gns3server/modules/virtualbox/__init__.py @@ -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") diff --git a/gns3server/modules/virtualbox/virtualbox_vm.py b/gns3server/modules/virtualbox/virtualbox_vm.py index deb34e1f..130afc9c 100644 --- a/gns3server/modules/virtualbox/virtualbox_vm.py +++ b/gns3server/modules/virtualbox/virtualbox_vm.py @@ -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.