arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 17:28:08 +00:00
Code Issues Releases Wiki Activity

Fix issue with "usage" variable for Dynamips VMs. Fixes #1495

Browse Source
This commit is contained in:
grossmj 2019-01-12 12:13:22 +07:00
parent b68c0cf176
commit f0ffb07165
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gns3server/compute/dynamips/__init__.py
View File

@ -492,6 +492,10 @@ class Dynamips(BaseManager):
if sparse_memory_support is False: if sparse_memory_support is False:
await vm.set_sparsemem(False) await vm.set_sparsemem(False)
usage = settings.get("usage")
if usage and usage != vm.usage:
vm.usage = usage
# update the configs if needed # update the configs if needed
await self.set_vm_configs(vm, settings) await self.set_vm_configs(vm, settings)

1
gns3server/compute/dynamips/nodes/router.py
View File

@ -188,7 +188,6 @@ class Router(BaseNode):
else: else:
router_info["wic" + str(wic_slot_number)] = None router_info["wic" + str(wic_slot_number)] = None
return router_info return router_info
def _memory_changed(self, path): def _memory_changed(self, path):

18
gns3server/handlers/api/compute/dynamips_vm_handler.py
View File

@ -70,15 +70,15 @@ class DynamipsVMHandler:
if platform in DEFAULT_CHASSIS: if platform in DEFAULT_CHASSIS:
default_chassis = DEFAULT_CHASSIS[platform] default_chassis = DEFAULT_CHASSIS[platform]
vm = await dynamips_manager.create_node(request.json.pop("name"), vm = await dynamips_manager.create_node(request.json.pop("name"),
request.match_info["project_id"], request.match_info["project_id"],
request.json.get("node_id"), request.json.get("node_id"),
dynamips_id=request.json.get("dynamips_id"), dynamips_id=request.json.get("dynamips_id"),
platform=platform, platform=platform,
console=request.json.get("console"), console=request.json.get("console"),
console_type=request.json.get("console_type", "telnet"), console_type=request.json.get("console_type", "telnet"),
aux=request.json.get("aux"), aux=request.json.get("aux"),
chassis=request.json.pop("chassis", default_chassis), chassis=request.json.pop("chassis", default_chassis),
node_type="dynamips") node_type="dynamips")
await dynamips_manager.update_vm_settings(vm, request.json) await dynamips_manager.update_vm_settings(vm, request.json)
response.set_status(201) response.set_status(201)
response.json(vm) response.json(vm)

5
gns3server/schemas/dynamips_template.py
View File

@ -30,6 +30,11 @@ DYNAMIPS_TEMPLATE_PROPERTIES = {
"type": "string", "type": "string",
"minLength": 1 "minLength": 1
}, },
"usage": {
"description": "How to use the Dynamips VM",
"type": "string",
"default": ""
},
"mmap": { "mmap": {
"description": "MMAP feature", "description": "MMAP feature",
"type": "boolean", "type": "boolean",