from ganeti import constants
from ganeti import errors
from ganeti import utils
+from ganeti import pathutils
# Schemas used in OVF format
except OSError, err:
if err.errno == errno.EEXIST:
new_path = utils.PathJoin(directory,
- "%s_%s%s" % (prefix, counter, suffix))
+ "%s_%s%s" % (prefix, counter, suffix))
counter += 1
else:
raise errors.OpPrereqError("Error moving the file %s to %s location:"
sha1_sum = match.group(2)
manifest_files[file_name] = sha1_sum
files_with_paths = [utils.PathJoin(self.input_dir, file_name)
- for file_name in self.files_list]
+ for file_name in self.files_list]
sha1_sums = utils.FingerprintFiles(files_with_paths)
for file_name, value in manifest_files.iteritems():
if sha1_sums.get(utils.PathJoin(self.input_dir, file_name)) != value:
return {"hypervisor_name": constants.VALUE_AUTO}
results = {
"hypervisor_name": hypervisor_data.findtext("{%s}Name" % GANETI_SCHEMA,
- default=constants.VALUE_AUTO),
+ default=constants.VALUE_AUTO),
}
parameters = hypervisor_data.find("{%s}Parameters" % GANETI_SCHEMA)
results.update(self._GetDictParameters(parameters, GANETI_SCHEMA))
vcpus = self._GetElementMatchingText(find_vcpus, match_vcpus)
if vcpus:
vcpus_count = vcpus.findtext("{%s}VirtualQuantity" % RASD_SCHEMA,
- default=constants.VALUE_AUTO)
+ default=constants.VALUE_AUTO)
else:
vcpus_count = constants.VALUE_AUTO
results["vcpus"] = str(vcpus_count)
memory_raw = None
if memory:
alloc_units = memory.findtext("{%s}AllocationUnits" % RASD_SCHEMA)
- matching_units = [units for units, variants in
- ALLOCATION_UNITS.iteritems() if alloc_units.lower() in variants]
+ matching_units = [units for units, variants in ALLOCATION_UNITS.items()
+ if alloc_units.lower() in variants]
if matching_units == []:
raise errors.OpPrereqError("Unit %s for RAM memory unknown" %
alloc_units, errors.ECODE_INVAL)
units = matching_units[0]
memory_raw = int(memory.findtext("{%s}VirtualQuantity" % RASD_SCHEMA,
- default=constants.VALUE_AUTO))
+ default=constants.VALUE_AUTO))
memory_count = CONVERT_UNITS_TO_MB[units](memory_raw)
else:
memory_count = constants.VALUE_AUTO
results["memory"] = str(memory_count)
find_balance = ("{%s}GanetiSection/{%s}AutoBalance" %
- (GANETI_SCHEMA, GANETI_SCHEMA))
+ (GANETI_SCHEMA, GANETI_SCHEMA))
balance = self.tree.findtext(find_balance, default=constants.VALUE_AUTO)
results["auto_balance"] = balance
networks_search = ("{%s}NetworkSection/{%s}Network" %
(OVF_SCHEMA, OVF_SCHEMA))
network_names = self._GetAttributes(networks_search,
- "{%s}name" % OVF_SCHEMA)
- required = ["ip", "mac", "link", "mode"]
+ "{%s}name" % OVF_SCHEMA)
+ required = ["ip", "mac", "link", "mode", "network"]
for (counter, network_name) in enumerate(network_names):
network_search = ("{%s}VirtualSystem/{%s}VirtualHardwareSection/{%s}Item"
% (OVF_SCHEMA, OVF_SCHEMA, OVF_SCHEMA))
ganeti_match = ("{%s}name" % OVF_SCHEMA, network_name)
network_data = self._GetElementMatchingText(network_search, network_match)
network_ganeti_data = self._GetElementMatchingAttr(ganeti_search,
- ganeti_match)
+ ganeti_match)
ganeti_data = {}
if network_ganeti_data:
GANETI_SCHEMA)
ganeti_data["link"] = network_ganeti_data.findtext("{%s}Link" %
GANETI_SCHEMA)
+ ganeti_data["network"] = network_ganeti_data.findtext("{%s}Net" %
+ GANETI_SCHEMA)
mac_data = None
if network_data:
mac_data = network_data.findtext("{%s}Address" % RASD_SCHEMA)
SubElementText(network_item, "rasd:ElementName", network_name)
SubElementText(network_item, "rasd:InstanceID", self.next_instance_id)
SubElementText(network_item, "rasd:ResourceType",
- RASD_TYPE["ethernet-adapter"])
+ RASD_TYPE["ethernet-adapter"])
self.hardware_list.append(network_item)
self.next_instance_id += 1
SubElementText(ganeti_section, "gnt:Version", ganeti.get("version"))
SubElementText(ganeti_section, "gnt:DiskTemplate",
- ganeti.get("disk_template"))
+ ganeti.get("disk_template"))
SubElementText(ganeti_section, "gnt:AutoBalance",
- ganeti.get("auto_balance"))
+ ganeti.get("auto_balance"))
SubElementText(ganeti_section, "gnt:Tags", ganeti.get("tags"))
osys = ET.SubElement(ganeti_section, "gnt:OperatingSystem")
SubElementText(nic, "gnt:MACAddress", network["mac"])
SubElementText(nic, "gnt:IPAddress", network["ip"])
SubElementText(nic, "gnt:Link", network["link"])
+ SubElementText(nic, "gnt:Net", network["network"])
def SaveVirtualSystemData(self, name, vcpus, memory):
"""Convert virtual system information to OVF sections.
name_section.text = name
os_attrib = {"ovf:id": "0"}
os_section = ET.SubElement(virtual_system, "OperatingSystemSection",
- attrib=os_attrib)
+ attrib=os_attrib)
SubElementText(os_section, "Info", "Installed guest operating system")
hardware_section = ET.SubElement(virtual_system, "VirtualHardwareSection")
SubElementText(hardware_section, "Info", "Virtual hardware requirements")
# Item for vcpus
vcpus_item = ET.SubElement(hardware_section, "Item")
SubElementText(vcpus_item, "rasd:ElementName",
- "%s virtual CPU(s)" % vcpus)
+ "%s virtual CPU(s)" % vcpus)
SubElementText(vcpus_item, "rasd:InstanceID", INSTANCE_ID["vcpus"])
SubElementText(vcpus_item, "rasd:ResourceType", RASD_TYPE["vcpus"])
SubElementText(vcpus_item, "rasd:VirtualQuantity", vcpus)
elif action == COMPRESS:
prefix = disk_file
new_path = utils.GetClosedTempfile(suffix=COMPRESSION_EXT, prefix=prefix,
- dir=self.output_dir)
+ dir=self.output_dir)
self.temp_file_manager.Add(new_path)
args = ["gzip", "-c", disk_path]
run_result = utils.RunCmd(args, output=new_path)
logging.warning("Conversion of disk image to %s format, this may take"
" a while", disk_format)
- new_disk_path = utils.GetClosedTempfile(suffix=".%s" % disk_format,
- prefix=disk_name, dir=self.output_dir)
+ new_disk_path = utils.GetClosedTempfile(
+ suffix=".%s" % disk_format, prefix=disk_name, dir=self.output_dir)
self.temp_file_manager.Add(new_disk_path)
args = [
constants.QEMUIMG_PATH,
if self.options.output_dir:
self.output_dir = os.path.abspath(self.options.output_dir)
- if (os.path.commonprefix([constants.EXPORT_DIR, self.output_dir]) !=
- constants.EXPORT_DIR):
+ if (os.path.commonprefix([pathutils.EXPORT_DIR, self.output_dir]) !=
+ pathutils.EXPORT_DIR):
logging.warning("Export path is not under %s directory, import to"
" Ganeti using gnt-backup may fail",
- constants.EXPORT_DIR)
+ pathutils.EXPORT_DIR)
else:
- self.output_dir = constants.EXPORT_DIR
+ self.output_dir = pathutils.EXPORT_DIR
self.ovf_reader = OVFReader(self.input_path)
self.ovf_reader.VerifyManifest()
raise errors.OpPrereqError("No %s file in %s package found" %
(OVF_EXT, OVA_EXT), errors.ECODE_ENVIRON)
logging.warning("Unpacking the %s archive, this may take a while",
- input_path)
+ input_path)
self.input_dir = temp_dir
self.input_path = utils.PathJoin(self.temp_dir, input_name)
try:
"""
self.results_name = self._GetInfo("instance name", self.options.name,
- self._ParseNameOptions, self.ovf_reader.GetInstanceName)
+ self._ParseNameOptions,
+ self.ovf_reader.GetInstanceName)
if not self.results_name:
raise errors.OpPrereqError("Name of instance not provided",
errors.ECODE_INVAL)
raise errors.OpPrereqError("Failed to create directory %s: %s" %
(self.output_dir, err), errors.ECODE_ENVIRON)
- self.results_template = self._GetInfo("disk template",
- self.options.disk_template, self._ParseTemplateOptions,
+ self.results_template = self._GetInfo(
+ "disk template", self.options.disk_template, self._ParseTemplateOptions,
self.ovf_reader.GetDiskTemplate)
if not self.results_template:
logging.info("Disk template not given")
- self.results_hypervisor = self._GetInfo("hypervisor",
- self.options.hypervisor, self._ParseHypervisorOptions,
+ self.results_hypervisor = self._GetInfo(
+ "hypervisor", self.options.hypervisor, self._ParseHypervisorOptions,
self.ovf_reader.GetHypervisorData)
assert self.results_hypervisor["hypervisor_name"]
if self.results_hypervisor["hypervisor_name"] == constants.VALUE_AUTO:
logging.debug("Default hypervisor settings from the cluster will be used")
- self.results_os = self._GetInfo("OS", self.options.os,
- self._ParseOSOptions, self.ovf_reader.GetOSData)
+ self.results_os = self._GetInfo(
+ "OS", self.options.os, self._ParseOSOptions, self.ovf_reader.GetOSData)
if not self.results_os.get("os_name"):
raise errors.OpPrereqError("OS name must be provided",
errors.ECODE_INVAL)
- self.results_backend = self._GetInfo("backend", self.options.beparams,
+ self.results_backend = self._GetInfo(
+ "backend", self.options.beparams,
self._ParseBackendOptions, self.ovf_reader.GetBackendData)
assert self.results_backend.get("vcpus")
assert self.results_backend.get("memory")
assert self.results_backend.get("auto_balance") is not None
- self.results_tags = self._GetInfo("tags", self.options.tags,
- self._ParseTags, self.ovf_reader.GetTagsData)
+ self.results_tags = self._GetInfo(
+ "tags", self.options.tags, self._ParseTags, self.ovf_reader.GetTagsData)
ovf_version = self.ovf_reader.GetVersionData()
if ovf_version:
else:
self.results_version = constants.EXPORT_VERSION
- self.results_network = self._GetInfo("network", self.options.nics,
- self._ParseNicOptions, self.ovf_reader.GetNetworkData,
- ignore_test=self.options.no_nics)
+ self.results_network = self._GetInfo(
+ "network", self.options.nics, self._ParseNicOptions,
+ self.ovf_reader.GetNetworkData, ignore_test=self.options.no_nics)
- self.results_disk = self._GetInfo("disk", self.options.disks,
- self._ParseDiskOptions, self._GetDiskInfo,
+ self.results_disk = self._GetInfo(
+ "disk", self.options.disks, self._ParseDiskOptions, self._GetDiskInfo,
ignore_test=self.results_template == constants.DT_DISKLESS)
if not self.results_disk and not self.results_network:
@staticmethod
def _GetInfo(name, cmd_arg, cmd_function, nocmd_function,
- ignore_test=False):
+ ignore_test=False):
"""Get information about some section - e.g. disk, network, hypervisor.
@type name: string
results = cmd_function()
else:
logging.info("Information for %s will be parsed from %s file",
- name, OVF_EXT)
+ name, OVF_EXT)
results = nocmd_function()
logging.info("Options for %s were succesfully read", name)
return results
results["nic%s_mac" % nic_id] = nic_desc.get("mac", constants.VALUE_AUTO)
results["nic%s_link" % nic_id] = \
nic_desc.get("link", constants.VALUE_AUTO)
+ results["nic%s_network" % nic_id] = \
+ nic_desc.get("network", constants.VALUE_AUTO)
if nic_desc.get("mode") == "bridged":
results["nic%s_ip" % nic_id] = constants.VALUE_NONE
else:
disk_path = utils.PathJoin(self.input_dir, disk_name)
if disk_compression not in NO_COMPRESSION:
_, disk_path = self._CompressDisk(disk_path, disk_compression,
- DECOMPRESS)
+ DECOMPRESS)
disk, _ = os.path.splitext(disk)
if self._GetDiskQemuInfo(disk_path, "file format: (\S+)") != "raw":
logging.info("Conversion to raw format is required")
ext, new_disk_path = self._ConvertDisk("raw", disk_path)
final_disk_path = LinkFile(new_disk_path, prefix=disk, suffix=ext,
- directory=self.output_dir)
+ directory=self.output_dir)
final_name = os.path.basename(final_disk_path)
disk_size = os.path.getsize(final_disk_path) / (1024 * 1024)
results["disk%s_dump" % counter] = final_name
results[constants.INISECT_HYP].update(self.results_hypervisor)
output_file_name = utils.PathJoin(self.output_dir,
- constants.EXPORT_CONF_FILE)
+ constants.EXPORT_CONF_FILE)
output = []
for section, options in results.iteritems():
"""
def get(self, section, options, raw=None, vars=None): # pylint: disable=W0622
try:
- result = ConfigParser.SafeConfigParser.get(self, section, options, \
- raw=raw, vars=vars)
+ result = ConfigParser.SafeConfigParser.get(self, section, options,
+ raw=raw, vars=vars)
except ConfigParser.NoOptionError:
result = None
return result
counter = 0
while True:
data_link = \
- self.config_parser.get(constants.INISECT_INS, "nic%s_link" % counter)
+ self.config_parser.get(constants.INISECT_INS,
+ "nic%s_link" % counter)
if data_link is None:
break
results.append({
"mode": self.config_parser.get(constants.INISECT_INS,
- "nic%s_mode" % counter),
+ "nic%s_mode" % counter),
"mac": self.config_parser.get(constants.INISECT_INS,
- "nic%s_mac" % counter),
+ "nic%s_mac" % counter),
"ip": self.config_parser.get(constants.INISECT_INS,
- "nic%s_ip" % counter),
+ "nic%s_ip" % counter),
+ "network": self.config_parser.get(constants.INISECT_INS,
+ "nic%s_network" % counter),
"link": data_link,
})
if results[counter]["mode"] not in constants.NIC_VALID_MODES:
disk_name, _ = os.path.splitext(disk_file)
ext, new_disk_path = self._ConvertDisk(self.options.disk_format, disk_path)
results["format"] = self.options.disk_format
- results["virt-size"] = self._GetDiskQemuInfo(new_disk_path,
- "virtual size: \S+ \((\d+) bytes\)")
+ results["virt-size"] = self._GetDiskQemuInfo(
+ new_disk_path, "virtual size: \S+ \((\d+) bytes\)")
if compression:
ext2, new_disk_path = self._CompressDisk(new_disk_path, "gzip",
- COMPRESS)
+ COMPRESS)
disk_name, _ = os.path.splitext(disk_name)
results["compression"] = "gzip"
ext += ext2
final_disk_path = LinkFile(new_disk_path, prefix=disk_name, suffix=ext,
- directory=self.output_dir)
+ directory=self.output_dir)
final_disk_name = os.path.basename(final_disk_path)
results["real-size"] = os.path.getsize(final_disk_path)
results["path"] = final_disk_name
self.ovf_writer.SaveGanetiData(self.results_ganeti, self.results_network)
self.ovf_writer.SaveVirtualSystemData(self.results_name, self.results_vcpus,
- self.results_memory)
+ self.results_memory)
data = self.ovf_writer.PrettyXmlDump()
utils.WriteFile(self.output_path, data=data)
projects / ganeti-local / blobdiff