mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-04 22:41:12 +02:00
Support script file
This commit is contained in:
1 parent
c30f7ce9a1
commit
fa57485f11
6 files changed
+40
-12
No files matched your search
@@ -87,7 +87,7 @@ class BaseManager:
|
||||
return self._vms[uuid]
|
||||
|
||||
@asyncio.coroutine
|
||||
def create_vm(self, name, project_identifier, uuid=None):
|
||||
def create_vm(self, name, project_identifier, uuid=None, **kwargs):
|
||||
"""
|
||||
Create a new VM
|
||||
|
||||
@@ -104,7 +104,7 @@ class BaseManager:
|
||||
if not uuid:
|
||||
uuid = str(uuid4())
|
||||
|
||||
vm = self._VM_CLASS(name, uuid, project, self)
|
||||
vm = self._VM_CLASS(name, uuid, project, self, **kwargs)
|
||||
future = vm.create()
|
||||
if isinstance(future, asyncio.Future):
|
||||
yield from future
|
||||
|
||||
@@ -52,9 +52,10 @@ class VPCSVM(BaseVM):
|
||||
:param project: Project instance
|
||||
:param manager: parent VM Manager
|
||||
:param console: TCP console port
|
||||
:param script_file: A VPCS startup script
|
||||
"""
|
||||
|
||||
def __init__(self, name, uuid, project, manager, console=None):
|
||||
def __init__(self, name, uuid, project, manager, console=None, script_file=None):
|
||||
|
||||
super().__init__(name, uuid, project, manager)
|
||||
|
||||
@@ -68,7 +69,7 @@ class VPCSVM(BaseVM):
|
||||
self._started = False
|
||||
|
||||
# VPCS settings
|
||||
self._script_file = ""
|
||||
self._script_file = script_file
|
||||
self._ethernet_adapter = EthernetAdapter() # one adapter with 1 Ethernet interface
|
||||
|
||||
try:
|
||||
@@ -103,6 +104,14 @@ class VPCSVM(BaseVM):
|
||||
|
||||
self._check_vpcs_version()
|
||||
|
||||
def __json__(self):
|
||||
|
||||
return {"name": self.name,
|
||||
"uuid": self.uuid,
|
||||
"console": self.console,
|
||||
"project_uuid": self.project.uuid,
|
||||
"script_file": self.script_file}
|
||||
|
||||
@property
|
||||
def console(self):
|
||||
"""
|
||||
|
||||
Reference in new issue
Block a user