ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-19 15:53:47 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.5' into 2.0

Browse Source 
Conflicts:
	gns3server/handlers/api/compute/iou_handler.py
This commit is contained in:
grossmj
2016-06-09 19:35:59 -06:00
parent 3c9e8507d1 313226786f
commit e46171b826
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gns3server/handlers/api/compute/iou_handler.py
View File

@ -70,10 +70,6 @@ class IOUHandler:
if name == "private_config_content" and (vm.private_config_content and len(vm.private_config_content) > 0):
continue
setattr(vm, name, value)
if "startup_config_content" in request.json:
vm.startup_config = request.json.get("startup_config_content")
if "private_config_content" in request.json:
vm.private_config = request.json.get("private_config_content")
response.set_status(201)
response.json(vm)
@ -119,10 +115,6 @@ class IOUHandler:
for name, value in request.json.items():
if hasattr(vm, name) and getattr(vm, name) != value:
setattr(vm, name, value)
if "startup_config_content" in request.json:
vm.startup_config = request.json.get("startup_config_content")
if "private_config_content" in request.json:
vm.private_config = request.json.get("private_config_content")
vm.updated()
response.json(vm)