mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-03 05:51:15 +02:00
Support for "usage" for "Cloud" nodes. Fixes https://github.com/GNS3/gns3-gui/issues/2887
Allow "usage" for all builtin nodes (not exposed in Ui).
This commit is contained in:
1 parent
d11897c1ec
commit
dff035d957
26 files changed
+100
-35
No files matched your search
@@ -85,6 +85,7 @@ class Cloud(BaseNode):
|
||||
"special": interface["special"]})
|
||||
|
||||
return {"name": self.name,
|
||||
"usage": self.usage,
|
||||
"node_id": self.id,
|
||||
"project_id": self.project.id,
|
||||
"remote_console_host": self.remote_console_host,
|
||||
|
||||
@@ -41,6 +41,7 @@ class EthernetHub(BaseNode):
|
||||
def __json__(self):
|
||||
|
||||
return {"name": self.name,
|
||||
"usage": self.usage,
|
||||
"node_id": self.id,
|
||||
"project_id": self.project.id}
|
||||
|
||||
|
||||
@@ -41,6 +41,7 @@ class EthernetSwitch(BaseNode):
|
||||
def __json__(self):
|
||||
|
||||
return {"name": self.name,
|
||||
"usage": self.usage,
|
||||
"node_id": self.id,
|
||||
"project_id": self.project.id}
|
||||
|
||||
|
||||
@@ -75,6 +75,7 @@ class Nat(Cloud):
|
||||
def __json__(self):
|
||||
return {
|
||||
"name": self.name,
|
||||
"usage": self.usage,
|
||||
"node_id": self.id,
|
||||
"project_id": self.project.id,
|
||||
"status": "started",
|
||||
|
||||
@@ -59,6 +59,7 @@ class ATMSwitch(Device):
|
||||
mappings[source] = destination
|
||||
|
||||
return {"name": self.name,
|
||||
"usage": self.usage,
|
||||
"node_id": self.id,
|
||||
"project_id": self.project.id,
|
||||
"mappings": mappings,
|
||||
|
||||
@@ -31,6 +31,7 @@ class Device:
|
||||
def __init__(self, name, node_id, project, manager, hypervisor=None):
|
||||
|
||||
self._name = name
|
||||
self._usage = ""
|
||||
self._id = node_id
|
||||
self._project = project
|
||||
self._manager = manager
|
||||
@@ -76,6 +77,26 @@ class Device:
|
||||
|
||||
self._name = new_name
|
||||
|
||||
@property
|
||||
def usage(self):
|
||||
"""
|
||||
Returns the usage for this device.
|
||||
|
||||
:returns: usage
|
||||
"""
|
||||
|
||||
return self._usage
|
||||
|
||||
@usage.setter
|
||||
def usage(self, new_usage):
|
||||
"""
|
||||
Sets the usage of this device.
|
||||
|
||||
:param new_usage: usage
|
||||
"""
|
||||
|
||||
self._usage = new_usage
|
||||
|
||||
@property
|
||||
def id(self):
|
||||
"""
|
||||
|
||||
@@ -57,6 +57,7 @@ class EthernetHub(Bridge):
|
||||
def __json__(self):
|
||||
|
||||
return {"name": self.name,
|
||||
"usage": self.usage,
|
||||
"node_id": self.id,
|
||||
"project_id": self.project.id,
|
||||
"ports_mapping": self._ports,
|
||||
|
||||
@@ -109,6 +109,7 @@ class EthernetSwitch(Device):
|
||||
def __json__(self):
|
||||
|
||||
ethernet_switch_info = {"name": self.name,
|
||||
"usage": self.usage,
|
||||
"console": self.console,
|
||||
"console_type": self.console_type,
|
||||
"node_id": self.id,
|
||||
|
||||
@@ -58,6 +58,7 @@ class FrameRelaySwitch(Device):
|
||||
mappings[source] = destination
|
||||
|
||||
return {"name": self.name,
|
||||
"usage": self.usage,
|
||||
"node_id": self.id,
|
||||
"project_id": self.project.id,
|
||||
"mappings": mappings,
|
||||
|
||||
Reference in new issue
Block a user