Revision 0f68f7fa

b/lib/backend.py
2743 2743
    config.set(constants.INISECT_INS, "nic%d_ip" % nic_count, "%s" % nic.ip)
2744 2744
    config.set(constants.INISECT_INS, "nic%d_network" % nic_count,
2745 2745
               "%s" % nic.network)
2746
    config.set(constants.INISECT_INS, "nic%d_name" % nic_count,
2747
               "%s" % nic.name)
2746 2748
    for param in constants.NICS_PARAMETER_TYPES:
2747 2749
      config.set(constants.INISECT_INS, "nic%d_%s" % (nic_count, param),
2748 2750
                 "%s" % nic.nicparams.get(param, None))
......
2759 2761
                 ("%s" % disk.physical_id[1]))
2760 2762
      config.set(constants.INISECT_INS, "disk%d_size" % disk_count,
2761 2763
                 ("%d" % disk.size))
2764
      config.set(constants.INISECT_INS, "disk%d_name" % disk_count,
2765
                 "%s" % disk.name)
2762 2766

  
2763 2767
  config.set(constants.INISECT_INS, "disk_count", "%d" % disk_total)
2764 2768

  
b/lib/cmdlib/instance.py
745 745
      for idx in range(constants.MAX_DISKS):
746 746
        if einfo.has_option(constants.INISECT_INS, "disk%d_size" % idx):
747 747
          disk_sz = einfo.getint(constants.INISECT_INS, "disk%d_size" % idx)
748
          disks.append({constants.IDISK_SIZE: disk_sz})
748
          disk_name = einfo.get(constants.INISECT_INS, "disk%d_name" % idx)
749
          disk = {
750
            constants.IDISK_SIZE: disk_sz,
751
            constants.IDISK_NAME: disk_name
752
            }
753
          disks.append(disk)
749 754
      self.op.disks = disks
750 755
      if not disks and self.op.disk_template != constants.DT_DISKLESS:
751 756
        raise errors.OpPrereqError("No disk info specified and the export"
......
757 762
      for idx in range(constants.MAX_NICS):
758 763
        if einfo.has_option(constants.INISECT_INS, "nic%d_mac" % idx):
759 764
          ndict = {}
760
          for name in [constants.INIC_IP, constants.INIC_MAC]:
765
          for name in [constants.INIC_IP,
766
                       constants.INIC_MAC, constants.INIC_NAME]:
761 767
            v = einfo.get(constants.INISECT_INS, "nic%d_%s" % (idx, name))
762 768
            ndict[name] = v
763 769
          network = einfo.get(constants.INISECT_INS,

Also available in: Unified diff