From 9cf294daf3d2840037193d09398263fdfc9d9372 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Fri, 10 Jun 2011 15:47:39 +0200 Subject: [PATCH] feature #476: apply hm hook only for NICs with phydev attributes --- src/vnm_mad/OpenNebulaVLAN.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/vnm_mad/OpenNebulaVLAN.rb b/src/vnm_mad/OpenNebulaVLAN.rb index cabbf22299..090c8762b2 100644 --- a/src/vnm_mad/OpenNebulaVLAN.rb +++ b/src/vnm_mad/OpenNebulaVLAN.rb @@ -413,12 +413,14 @@ class OpenNebulaHM < OpenNebulaVLAN process do |nic| bridge = nic[:bridge] dev = nic[:phydev] - vlan = CONF[:start_vlan] + nic[:network_id].to_i + if dev + vlan = CONF[:start_vlan] + nic[:network_id].to_i - create_bridge bridge if !bridge_exists? bridge - create_dev_vlan(dev, vlan) if !device_exists?(dev, vlan) - if !attached_bridge_dev?(bridge, dev, vlan) - attach_brigde_dev(bridge, dev, vlan) + create_bridge bridge if !bridge_exists? bridge + create_dev_vlan(dev, vlan) if !device_exists?(dev, vlan) + if !attached_bridge_dev?(bridge, dev, vlan) + attach_brigde_dev(bridge, dev, vlan) + end end end end