Compute a md5sum of images for futur purpose

Fix #234
This commit is contained in:
Julien Duponchelle committed 2015-06-17 17:11:25 +02:00
1 parent 0f15e4b56a
commit f041697311
15 files changed
+248 -16

No files matched your search

+4 -1
View File
@@ -37,6 +37,7 @@ from .nios.nio_udp import NIOUDP
from .nios.nio_tap import NIOTAP
from .nios.nio_nat import NIONAT
from .nios.nio_generic_ethernet import NIOGenericEthernet
from ..utils.images import md5sum, remove_checksum
class BaseManager:
@@ -444,7 +445,7 @@ class BaseManager:
files.sort()
images = []
for filename in files:
if filename[0] != ".":
if filename[0] != "." and not filename.endswith(".md5sum"):
images.append({"filename": filename})
return images
@@ -461,6 +462,7 @@ class BaseManager:
path = os.path.join(directory, os.path.basename(filename))
log.info("Writting image file %s", path)
try:
remove_checksum(path)
os.makedirs(directory, exist_ok=True)
with open(path, 'wb+') as f:
while True:
@@ -469,5 +471,6 @@ class BaseManager:
break
f.write(packet)
os.chmod(path, stat.S_IWRITE | stat.S_IREAD | stat.S_IEXEC)
md5sum(path)
except OSError as e:
raise aiohttp.web.HTTPConflict(text="Could not write image: {} to {}".format(filename, e))
@@ -37,6 +37,7 @@ from ..nios.nio_udp import NIOUDP
from gns3server.config import Config
from gns3server.utils.asyncio import wait_run_in_executor, monitor_process
from gns3server.utils.images import md5sum
class Router(BaseVM):
@@ -134,6 +135,7 @@ class Router(BaseVM):
"dynamips_id": self._dynamips_id,
"platform": self._platform,
"image": self._image,
"image_md5sum": md5sum(self._image),
"startup_config": self._startup_config,
"private_config": self._private_config,
"ram": self._ram,
+3 -1
View File
@@ -46,6 +46,7 @@ from .utils.iou_import import nvram_import
from .utils.iou_export import nvram_export
from .ioucon import start_ioucon
import gns3server.utils.asyncio
import gns3server.utils.images
import logging
@@ -208,6 +209,7 @@ class IOUVM(BaseVM):
"console": self._console,
"project_id": self.project.id,
"path": self.path,
"md5sum": gns3server.utils.images.md5sum(self.path),
"ethernet_adapters": len(self._ethernet_adapters),
"serial_adapters": len(self._serial_adapters),
"ram": self._ram,
@@ -789,7 +791,7 @@ class IOUVM(BaseVM):
# do not let IOU create the NVRAM anymore
#startup_config_file = self.startup_config_file
#if startup_config_file:
# if startup_config_file:
# command.extend(["-c", os.path.basename(startup_config_file)])
if self._l1_keepalives:
+12 -1
View File
@@ -38,6 +38,7 @@ from ..nios.nio_nat import NIONAT
from ..base_vm import BaseVM
from ...schemas.qemu import QEMU_OBJECT_SCHEMA, QEMU_PLATFORMS
from ...utils.asyncio import monitor_process
from ...utils.images import md5sum
import logging
log = logging.getLogger(__name__)
@@ -1217,13 +1218,23 @@ class QemuVM(BaseVM):
# Qemu has a long list of options. The JSON schema is the single source of information
for field in QEMU_OBJECT_SCHEMA["required"]:
if field not in answer:
answer[field] = getattr(self, field)
try:
answer[field] = getattr(self, field)
except AttributeError:
pass
answer["hda_disk_image"] = self.manager.get_relative_image_path(self._hda_disk_image)
answer["hda_disk_image_md5sum"] = md5sum(self._hda_disk_image)
answer["hdb_disk_image"] = self.manager.get_relative_image_path(self._hdb_disk_image)
answer["hdb_disk_image_md5sum"] = md5sum(self._hdb_disk_image)
answer["hdc_disk_image"] = self.manager.get_relative_image_path(self._hdc_disk_image)
answer["hdc_disk_image_md5sum"] = md5sum(self._hdc_disk_image)
answer["hdd_disk_image"] = self.manager.get_relative_image_path(self._hdd_disk_image)
answer["hdd_disk_image_md5sum"] = md5sum(self._hdd_disk_image)
answer["initrd"] = self.manager.get_relative_image_path(self._initrd)
answer["initrd_md5sum"] = md5sum(self._initrd)
answer["kernel_image"] = self.manager.get_relative_image_path(self._kernel_image)
answer["kernel_image_md5sum"] = md5sum(self._kernel_image)
return answer