From 21587fda5a57a10a06c5129aea578b252221099e Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 14 Mar 2015 16:31:15 -0600 Subject: [PATCH] Removes confreg setting for IOS routers. --- gns3server/modules/dynamips/nodes/router.py | 29 --------------------- gns3server/schemas/dynamips_vm.py | 18 ------------- 2 files changed, 47 deletions(-) diff --git a/gns3server/modules/dynamips/nodes/router.py b/gns3server/modules/dynamips/nodes/router.py index 8cfa23a8..63acce4d 100644 --- a/gns3server/modules/dynamips/nodes/router.py +++ b/gns3server/modules/dynamips/nodes/router.py @@ -86,7 +86,6 @@ class Router(BaseVM): self._exec_area = 64 # 64 MB on other systems self._disk0 = 0 # Megabytes self._disk1 = 0 # Megabytes - self._confreg = "0x2102" self._aux = aux self._mac_addr = "" self._system_id = "FTX0945W0MY" # processor board ID in IOS @@ -145,7 +144,6 @@ class Router(BaseVM): "exec_area": self._exec_area, "disk0": self._disk0, "disk1": self._disk1, - "confreg": self._confreg, "console": self._console, "aux": self._aux, "mac_addr": self._mac_addr, @@ -863,33 +861,6 @@ class Router(BaseVM): new_disk1=disk1)) self._disk1 = disk1 - @property - def confreg(self): - """ - Returns the configuration register. - The default is 0x2102. - - :returns: configuration register value (string) - """ - - return self._confreg - - @asyncio.coroutine - def set_confreg(self, confreg): - """ - Sets the configuration register. - - :param confreg: configuration register value (string) - """ - - yield from self._hypervisor.send('vm set_conf_reg "{name}" {confreg}'.format(name=self._name, confreg=confreg)) - - log.info('Router "{name}" [{id}]: confreg updated from {old_confreg} to {new_confreg}'.format(name=self._name, - id=self._id, - old_confreg=self._confreg, - new_confreg=confreg)) - self._confreg = confreg - @asyncio.coroutine def set_console(self, console): """ diff --git a/gns3server/schemas/dynamips_vm.py b/gns3server/schemas/dynamips_vm.py index 32e9dad5..934646c8 100644 --- a/gns3server/schemas/dynamips_vm.py +++ b/gns3server/schemas/dynamips_vm.py @@ -120,12 +120,6 @@ VM_CREATE_SCHEMA = { "description": "disk1 size in MB", "type": "integer" }, - "confreg": { - "description": "configuration register", - "type": "string", - "minLength": 1, - "pattern": "^0x[0-9a-fA-F]{4}$" - }, "console": { "description": "console TCP port", "type": "integer", @@ -353,12 +347,6 @@ VM_UPDATE_SCHEMA = { "description": "disk1 size in MB", "type": "integer" }, - "confreg": { - "description": "configuration register", - "type": "string", - "minLength": 1, - "pattern": "^0x[0-9a-fA-F]{4}$" - }, "console": { "description": "console TCP port", "type": "integer", @@ -754,12 +742,6 @@ VM_OBJECT_SCHEMA = { "description": "disk1 size in MB", "type": "integer" }, - "confreg": { - "description": "configuration register", - "type": "string", - "minLength": 1, - "pattern": "^0x[0-9a-fA-F]{4}$" - }, "console": { "description": "console TCP port", "type": "integer",