From 8de607c88901b56f46272a19b54ae54658d6fe7b Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Mon, 25 Nov 2013 20:08:40 +0100
Subject: [PATCH] Bug #2172: Incorrect parameter deploy_info passed to network
 post script

---
 src/vmm_mad/exec/one_vmm_exec.rb            | 2 +-
 src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/vmm_mad/exec/one_vmm_exec.rb b/src/vmm_mad/exec/one_vmm_exec.rb
index 75b30dd389..7d0a1174b0 100755
--- a/src/vmm_mad/exec/one_vmm_exec.rb
+++ b/src/vmm_mad/exec/one_vmm_exec.rb
@@ -797,7 +797,7 @@ class ExecDriver < VirtualMachineDriver
             {
                 :driver       => :vnm,
                 :action       => :post,
-                :parameters   => [:deploy_info],
+                :parameters   => [:deploy_id],
                 :fail_actions => [
                     {
                         :driver     => :vmm,
diff --git a/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb b/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb
index a6534bc427..9cc03780e8 100644
--- a/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb
+++ b/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb
@@ -36,6 +36,12 @@ class OpenvSwitchVLAN < OpenNebulaNetwork
         process do |nic|
             @nic = nic
 
+            if @nic[:tap].nil?
+                STDERR.puts "No tap device found for nic #{@nic[:nic_id]}"
+                unlock
+                exit 1
+            end
+
             # Apply VLAN
             if @nic[:vlan] == "YES"
                 tag_vlan