From 9ed181151f58a9f91d1a0269956cee8169f4f11c Mon Sep 17 00:00:00 2001 From: grossmj Date: Sun, 30 Dec 2018 19:35:24 +0700 Subject: [PATCH] New node information dialog to display general, usage and command line information. Ref https://github.com/GNS3/gns3-gui/issues/2662 https://github.com/GNS3/gns3-gui/issues/2656 --- gns3server/compute/docker/docker_vm.py | 1 + gns3server/compute/dynamips/nodes/router.py | 1 + gns3server/compute/iou/iou_vm.py | 1 + gns3server/compute/virtualbox/virtualbox_vm.py | 1 + gns3server/compute/vmware/vmware_vm.py | 1 + gns3server/schemas/iou_template.py | 4 ++++ gns3server/schemas/qemu_template.py | 8 ++++---- gns3server/schemas/virtualbox_template.py | 5 +++++ gns3server/schemas/vmware_template.py | 5 +++++ 9 files changed, 23 insertions(+), 4 deletions(-) diff --git a/gns3server/compute/docker/docker_vm.py b/gns3server/compute/docker/docker_vm.py index 1c90392a..e73dc8b4 100644 --- a/gns3server/compute/docker/docker_vm.py +++ b/gns3server/compute/docker/docker_vm.py @@ -109,6 +109,7 @@ class DockerVM(BaseNode): def __json__(self): return { "name": self._name, + "usage": self.usage, "node_id": self._id, "container_id": self._cid, "project_id": self._project.id, diff --git a/gns3server/compute/dynamips/nodes/router.py b/gns3server/compute/dynamips/nodes/router.py index eb4be4dd..cc1b3443 100644 --- a/gns3server/compute/dynamips/nodes/router.py +++ b/gns3server/compute/dynamips/nodes/router.py @@ -143,6 +143,7 @@ class Router(BaseNode): def __json__(self): router_info = {"name": self.name, + "usage": self.usage, "node_id": self.id, "node_directory": os.path.join(self._working_directory), "project_id": self.project.id, diff --git a/gns3server/compute/iou/iou_vm.py b/gns3server/compute/iou/iou_vm.py index cdaa708c..814828c0 100644 --- a/gns3server/compute/iou/iou_vm.py +++ b/gns3server/compute/iou/iou_vm.py @@ -215,6 +215,7 @@ class IOUVM(BaseNode): def __json__(self): iou_vm_info = {"name": self.name, + "usage": self.usage, "node_id": self.id, "node_directory": self.working_path, "console": self._console, diff --git a/gns3server/compute/virtualbox/virtualbox_vm.py b/gns3server/compute/virtualbox/virtualbox_vm.py index 652bb919..4dbcf035 100644 --- a/gns3server/compute/virtualbox/virtualbox_vm.py +++ b/gns3server/compute/virtualbox/virtualbox_vm.py @@ -75,6 +75,7 @@ class VirtualBoxVM(BaseNode): def __json__(self): json = {"name": self.name, + "usage": self.usage, "node_id": self.id, "console": self.console, "console_type": self.console_type, diff --git a/gns3server/compute/vmware/vmware_vm.py b/gns3server/compute/vmware/vmware_vm.py index c656a6b8..0d74b510 100644 --- a/gns3server/compute/vmware/vmware_vm.py +++ b/gns3server/compute/vmware/vmware_vm.py @@ -74,6 +74,7 @@ class VMwareVM(BaseNode): def __json__(self): json = {"name": self.name, + "usage": self.usage, "node_id": self.id, "console": self.console, "console_type": self.console_type, diff --git a/gns3server/schemas/iou_template.py b/gns3server/schemas/iou_template.py index aadfaf97..f2dab0fb 100644 --- a/gns3server/schemas/iou_template.py +++ b/gns3server/schemas/iou_template.py @@ -25,6 +25,10 @@ IOU_TEMPLATE_PROPERTIES = { "type": "string", "minLength": 1 }, + "usage": { + "description": "How to use the IOU VM", + "type": "string", + }, "ethernet_adapters": { "description": "Number of ethernet adapters", "type": "integer", diff --git a/gns3server/schemas/qemu_template.py b/gns3server/schemas/qemu_template.py index b72e2afb..514056e9 100644 --- a/gns3server/schemas/qemu_template.py +++ b/gns3server/schemas/qemu_template.py @@ -22,13 +22,13 @@ from .qemu import QEMU_PLATFORMS QEMU_TEMPLATE_PROPERTIES = { - "usage": { - "description": "How to use the Qemu VM", + "qemu_path": { + "description": "Path to QEMU", "type": "string", "default": "" }, - "qemu_path": { - "description": "Path to QEMU", + "usage": { + "description": "How to use the Qemu VM", "type": "string", "default": "" }, diff --git a/gns3server/schemas/virtualbox_template.py b/gns3server/schemas/virtualbox_template.py index 36ff47c2..1160b056 100644 --- a/gns3server/schemas/virtualbox_template.py +++ b/gns3server/schemas/virtualbox_template.py @@ -26,6 +26,11 @@ VIRTUALBOX_TEMPLATE_PROPERTIES = { "type": "string", "minLength": 1, }, + "usage": { + "description": "How to use the VirtualBox VM", + "type": "string", + "default": "" + }, "ram": { "description": "Amount of RAM", "minimum": 0, diff --git a/gns3server/schemas/vmware_template.py b/gns3server/schemas/vmware_template.py index c4c6ac88..f9a65d30 100644 --- a/gns3server/schemas/vmware_template.py +++ b/gns3server/schemas/vmware_template.py @@ -26,6 +26,11 @@ VMWARE_TEMPLATE_PROPERTIES = { "type": "string", "minLength": 1, }, + "usage": { + "description": "How to use the VMware VM", + "type": "string", + "default": "" + }, "linked_clone": { "description": "Whether the VM is a linked clone or not", "type": "boolean",