NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-06 15:21:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Explicit ID names, remove {uuid} from URLs and add vms in URLs for VMs.

Browse Source
This commit is contained in:
Jeremy committed 2015-02-04 13:48:29 -07:00
1 parent 568e203580
commit 1bea78194c
22 files changed
+336 -344
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/modules/vpcs/__init__.py
+12 -12
View File
@@ -38,28 +38,28 @@ class VPCS(BaseManager):
def create_vm(self, *args, **kwargs):
vm = yield from super().create_vm(*args, **kwargs)
self._free_mac_ids.setdefault(vm.project.uuid, list(range(0, 255)))
self._free_mac_ids.setdefault(vm.project.id, list(range(0, 255)))
try:
self._used_mac_ids[vm.uuid] = self._free_mac_ids[vm.project.uuid].pop(0)
self._used_mac_ids[vm.id] = self._free_mac_ids[vm.project.id].pop(0)
except IndexError:
raise VPCSError("No mac address available")
return vm
@asyncio.coroutine
def delete_vm(self, uuid, *args, **kwargs):
def delete_vm(self, vm_id, *args, **kwargs):
vm = self.get_vm(uuid)
i = self._used_mac_ids[uuid]
self._free_mac_ids[vm.project.uuid].insert(0, i)
del self._used_mac_ids[uuid]
yield from super().delete_vm(uuid, *args, **kwargs)
vm = self.get_vm(vm_id)
i = self._used_mac_ids[vm_id]
self._free_mac_ids[vm.project.id].insert(0, i)
del self._used_mac_ids[vm_id]
yield from super().delete_vm(vm_id, *args, **kwargs)
def get_mac_id(self, vm_uuid):
def get_mac_id(self, vm_id):
"""
Get an unique VPCS mac id
:param vm_uuid: UUID of the VPCS vm
:returns: VPCS Mac id
:param vm_id: ID of the VPCS VM
:returns: VPCS MAC id
"""
return self._used_mac_ids.get(vm_uuid, 1)
return self._used_mac_ids.get(vm_id, 1)
gns3server/modules/vpcs/vpcs_vm.py
+14 -14
View File
@@ -45,7 +45,7 @@ class VPCSVM(BaseVM):
VPCS vm implementation.
:param name: name of this VPCS vm
:param uuid: VPCS instance UUID
:param vm_id: VPCS instance identifier
:param project: Project instance
:param manager: parent VM Manager
:param console: TCP console port
@@ -53,9 +53,9 @@ class VPCSVM(BaseVM):
:param startup_script: Content of vpcs startup script file
"""
def __init__(self, name, uuid, project, manager, console=None, script_file=None, startup_script=None):
def __init__(self, name, vm_id, project, manager, console=None, script_file=None, startup_script=None):
super().__init__(name, uuid, project, manager)
super().__init__(name, vm_id, project, manager)
self._path = manager.config.get_section_config("VPCS").get("vpcs_path", "vpcs")
self._console = console
@@ -105,9 +105,9 @@ class VPCSVM(BaseVM):
def __json__(self):
return {"name": self.name,
"uuid": self.uuid,
"vm_id": self.id,
"console": self._console,
"project_id": self.project.uuid,
"project_id": self.project.id,
"script_file": self.script_file,
"startup_script": self.startup_script}
@@ -329,10 +329,10 @@ class VPCSVM(BaseVM):
port_number=port_number))
self._ethernet_adapter.add_nio(port_number, nio)
log.info("VPCS {name} {uuid}]: {nio} added to port {port_number}".format(name=self._name,
uuid=self.uuid,
nio=nio,
port_number=port_number))
log.info("VPCS {name} {id}]: {nio} added to port {port_number}".format(name=self._name,
id=self.id,
nio=nio,
port_number=port_number))
return nio
def port_remove_nio_binding(self, port_number):
@@ -353,10 +353,10 @@ class VPCSVM(BaseVM):
self.manager.port_manager.release_udp_port(nio.lport)
self._ethernet_adapter.remove_nio(port_number)
log.info("VPCS {name} [{uuid}]: {nio} removed from port {port_number}".format(name=self._name,
uuid=self.uuid,
nio=nio,
port_number=port_number))
log.info("VPCS {name} [{id}]: {nio} removed from port {port_number}".format(name=self._name,
id=self.id,
nio=nio,
port_number=port_number))
return nio
def _build_command(self):
@@ -411,7 +411,7 @@ class VPCSVM(BaseVM):
command.extend(["-e"])
command.extend(["-d", nio.tap_vm])
command.extend(["-m", str(self._manager.get_mac_id(self._uuid))]) # the unique ID is used to set the MAC address offset
command.extend(["-m", str(self._manager.get_mac_id(self.id))]) # the unique ID is used to set the MAC address offset
command.extend(["-i", "1"]) # option to start only one VPC instance
command.extend(["-F"]) # option to avoid the daemonization of VPCS
if self._script_file: