Revision 8c4771b1 lib/hypervisor/hv_kvm.py

b/lib/hypervisor/hv_kvm.py
773 773
    if nic.nicparams[constants.NIC_LINK]:
774 774
      env["LINK"] = nic.nicparams[constants.NIC_LINK]
775 775

  
776
    def _BuildNetworkEnv(name, network, gateway, network6, gateway6,
777
                         network_type, mac_prefix, tags, env):
778
      if name:
779
        env["NETWORK_NAME"] = name
780
      if network:
781
        env["NETWORK_SUBNET"] = network
782
      if gateway:
783
        env["NETWORK_GATEWAY"] = gateway
784
      if network6:
785
        env["NETWORK_SUBNET6"] = network6
786
      if gateway6:
787
        env["NETWORK_GATEWAY6"] = gateway6
788
      if mac_prefix:
789
        env["NETWORK_MAC_PREFIX"] = mac_prefix
790
      if network_type:
791
        env["NETWORK_TYPE"] = network_type
792
      if tags:
793
        env["NETWORK_TAGS"] = " ".join(tags)
794

  
795
      return env
796

  
797

  
776 798
    if nic.network:
777
      env["NETWORK"] = nic.network
799
      n = objects.Network.FromDict(nic.netinfo)
800
      _BuildNetworkEnv(nic.network, n.network, n.gateway,
801
                       n.network6, n.gateway6, n.network_type,
802
                       n.mac_prefix, n.tags, env)
778 803

  
779 804
    if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED:
780 805
      env["BRIDGE"] = nic.nicparams[constants.NIC_LINK]

Also available in: Unified diff