Support for console type "none".

This commit is contained in:
grossmj committed 2018-03-24 18:11:21 +07:00
1 parent 54661c50b2
commit e52775fa3a
28 files changed
+213 -85

No files matched your search

@@ -75,6 +75,7 @@ class DynamipsVMHandler:
dynamips_id=request.json.get("dynamips_id"),
platform=platform,
console=request.json.get("console"),
console_type=request.json.get("console_type", "telnet"),
aux=request.json.get("aux"),
chassis=request.json.pop("chassis", default_chassis),
node_type="dynamips")
@@ -55,6 +55,8 @@ class EthernetSwitchHandler:
node = yield from dynamips_manager.create_node(request.json.pop("name"),
request.match_info["project_id"],
request.json.get("node_id"),
console=request.json.get("console"),
console_type=request.json.get("console_type"),
node_type="ethernet_switch",
ports=request.json.get("ports_mapping"))
@@ -134,6 +136,8 @@ class EthernetSwitchHandler:
if "ports_mapping" in request.json:
node.ports_mapping = request.json["ports_mapping"]
yield from node.update_port_settings()
if "console_type" in request.json:
node.console_type = request.json["console_type"]
# builtin_manager = Builtin.instance()
# node = builtin_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
@@ -61,7 +61,8 @@ class IOUHandler:
request.match_info["project_id"],
request.json.get("node_id"),
path=request.json.get("path"),
console=request.json.get("console"))
console=request.json.get("console"),
console_type=request.json.get("console_type", "telnet"))
for name, value in request.json.items():
if hasattr(vm, name) and getattr(vm, name) != value:
@@ -59,6 +59,7 @@ class VirtualBoxHandler:
request.json.pop("vmname"),
linked_clone=request.json.pop("linked_clone", False),
console=request.json.get("console", None),
console_type=request.json.get("console_type", "telnet"),
adapters=request.json.get("adapters", 0))
if "ram" in request.json:
@@ -57,7 +57,8 @@ class VMwareHandler:
request.json.get("node_id"),
request.json.pop("vmx_path"),
linked_clone=request.json.pop("linked_clone"),
console=request.json.get("console", None))
console=request.json.get("console", None),
console_type=request.json.get("console_type", "telnet"))
for name, value in request.json.items():
if name != "node_id":
@@ -54,6 +54,7 @@ class VPCSHandler:
request.match_info["project_id"],
request.json.get("node_id"),
console=request.json.get("console"),
console_type=request.json.get("console_type", "telnet"),
startup_script=request.json.get("startup_script"))
response.set_status(201)
response.json(vm)
@@ -98,6 +99,7 @@ class VPCSHandler:
vm = vpcs_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
vm.name = request.json.get("name", vm.name)
vm.console = request.json.get("console", vm.console)
vm.console_type = request.json.get("console_type", vm.console_type)
vm.updated()
response.json(vm)