Revision 7e8f03e3 lib/hypervisor/hv_kvm.py

b/lib/hypervisor/hv_kvm.py
148 148
  return (ifname, tapfd)
149 149

  
150 150

  
151
def _BuildNetworkEnv(name, network, gateway, network6, gateway6,
152
                     mac_prefix, tags, env):
153
  """Build environment variables concerning a Network.
154

  
155
  """
156
  if name:
157
    env["NETWORK_NAME"] = name
158
  if network:
159
    env["NETWORK_SUBNET"] = network
160
  if gateway:
161
    env["NETWORK_GATEWAY"] = gateway
162
  if network6:
163
    env["NETWORK_SUBNET6"] = network6
164
  if gateway6:
165
    env["NETWORK_GATEWAY6"] = gateway6
166
  if mac_prefix:
167
    env["NETWORK_MAC_PREFIX"] = mac_prefix
168
  if tags:
169
    env["NETWORK_TAGS"] = " ".join(tags)
170

  
171
  return env
172

  
173

  
174 151
class QmpMessage:
175 152
  """QEMU Messaging Protocol (QMP) message.
176 153

  
......
854 831

  
855 832
    if nic.network:
856 833
      n = objects.Network.FromDict(nic.netinfo)
857
      _BuildNetworkEnv(nic.network, n.network, n.gateway,
858
                       n.network6, n.gateway6,
859
                       n.mac_prefix, n.tags, env)
834
      env.update(n.HooksDict())
860 835

  
861 836
    if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED:
862 837
      env["BRIDGE"] = nic.nicparams[constants.NIC_LINK]

Also available in: Unified diff