Commit af1d39b1 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

backend: Add support for import/export magic


Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent 1d3dfa29
......@@ -2696,6 +2696,9 @@ def StartImportExportDaemon(mode, opts, host, port, instance, ieio, ieioargs):
if opts.compress:
cmd.append("--compress=%s" % opts.compress)
if opts.magic:
cmd.append("--magic=%s" % opts.magic)
if exp_size is not None:
cmd.append("--expected-size=%s" % exp_size)
......
......@@ -208,6 +208,13 @@ class _DiskImportExportBase(object):
self._daemon.progress_percent,
self._daemon.progress_eta)
@property
def magic(self):
"""Returns the magic value for this import/export.
"""
return self._opts.magic
@property
def active(self):
"""Determines whether this transport is still active.
......
......@@ -1032,12 +1032,14 @@ class ImportExportOptions(ConfigObject):
@ivar key_name: X509 key name (None for cluster certificate)
@ivar ca_pem: Remote peer CA in PEM format (None for cluster certificate)
@ivar compress: Compression method (one of L{constants.IEC_ALL})
@ivar magic: Used to ensure the connection goes to the right disk
"""
__slots__ = [
"key_name",
"ca_pem",
"compress",
"magic",
]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment