Revision 6e8091f9 lib/ovf.py

b/lib/ovf.py
760 760
      SubElementText(nic, "gnt:MACAddress", network["mac"])
761 761
      SubElementText(nic, "gnt:IPAddress", network["ip"])
762 762
      SubElementText(nic, "gnt:Link", network["link"])
763
      SubElementText(nic, "gnt:Network", network["network"])
763
      SubElementText(nic, "gnt:Net", network["network"])
764 764

  
765 765
  def SaveVirtualSystemData(self, name, vcpus, memory):
766 766
    """Convert virtual system information to OVF sections.
......
1665 1665
    counter = 0
1666 1666
    while True:
1667 1667
      data_link = \
1668
        self.config_parser.get(constants.INISECT_INS, "nic%s_network" % counter)
1668
        self.config_parser.get(constants.INISECT_INS,
1669
                               "nic%s_link" % counter)
1669 1670
      if data_link is None:
1670 1671
        break
1671 1672
      results.append({
......
1675 1676
                                      "nic%s_mac" % counter),
1676 1677
        "ip": self.config_parser.get(constants.INISECT_INS,
1677 1678
                                     "nic%s_ip" % counter),
1678
        "link": self.config_parser.get(constants.INISECT_INS,
1679
                                       "nic%s_link" % counter),
1680
        "network": data_link,
1679
        "network": self.config_parser.get(constants.INISECT_INS,
1680
                                          "nic%s_network" % counter),
1681
        "link": data_link,
1681 1682
      })
1682 1683
      if results[counter]["mode"] not in constants.NIC_VALID_MODES:
1683 1684
        raise errors.OpPrereqError("Network mode %s not recognized"

Also available in: Unified diff