Revision 8df21834

b/lib/hypervisor/hv_kvm.py
136 136
  return (ifname, tapfd)
137 137

  
138 138

  
139
def _BuildNetworkEnv(name, network, gateway, network6, gateway6,
140
                     network_type, mac_prefix, tags, env):
141
  """Build environment variables concerning a Network.
142

  
143
  """
144
  if name:
145
    env["NETWORK_NAME"] = name
146
  if network:
147
    env["NETWORK_SUBNET"] = network
148
  if gateway:
149
    env["NETWORK_GATEWAY"] = gateway
150
  if network6:
151
    env["NETWORK_SUBNET6"] = network6
152
  if gateway6:
153
    env["NETWORK_GATEWAY6"] = gateway6
154
  if mac_prefix:
155
    env["NETWORK_MAC_PREFIX"] = mac_prefix
156
  if network_type:
157
    env["NETWORK_TYPE"] = network_type
158
  if tags:
159
    env["NETWORK_TAGS"] = " ".join(tags)
160

  
161
  return env
162

  
163

  
139 164
class QmpMessage:
140 165
  """QEMU Messaging Protocol (QMP) message.
141 166

  
......
775 800
    if nic.nicparams[constants.NIC_LINK]:
776 801
      env["LINK"] = nic.nicparams[constants.NIC_LINK]
777 802

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

  
797
      return env
798

  
799 803
    if nic.network:
800 804
      n = objects.Network.FromDict(nic.netinfo)
801 805
      _BuildNetworkEnv(nic.network, n.network, n.gateway,

Also available in: Unified diff