From 01eaa79dc2aece107b0aa07507df242fe362f62f Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Sat, 31 Mar 2012 18:03:33 +0200
Subject: [PATCH 1/6] bug #1117: Format Templates preserving double qoutes. It
 checks for empty elements (e.g. <CLUSTER/>) to preserve syntax correctness
 (cherry picked from commit f7b7f0cc4a1983dd76203e8985374ac12784b0bc)

---
 src/oca/ruby/OpenNebula/XMLUtils.rb | 77 ++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 30 deletions(-)

diff --git a/src/oca/ruby/OpenNebula/XMLUtils.rb b/src/oca/ruby/OpenNebula/XMLUtils.rb
index 36f62606ca..41d689ad19 100644
--- a/src/oca/ruby/OpenNebula/XMLUtils.rb
+++ b/src/oca/ruby/OpenNebula/XMLUtils.rb
@@ -225,6 +225,8 @@ module OpenNebula
             end
         end
 
+        # Returns wheter there are elements for a given XPath
+        # xpath_str:: _String_ XPath expression to locate the element
         def has_elements?(xpath_str)
             if NOKOGIRI
                 element = @xml.xpath(xpath_str.to_s.upcase)
@@ -235,10 +237,13 @@ module OpenNebula
             end
         end
 
+        # Returns the <TEMPLATE> element in text form
+        # indent:: _Boolean_ indents the resulting string, default true
         def template_str(indent=true)
             template_like_str('TEMPLATE', indent)
         end
 
+        # Returns the <TEMPLATE> element in XML form
         def template_xml
             if NOKOGIRI
                 @xml.xpath('TEMPLATE').to_s
@@ -247,47 +252,54 @@ module OpenNebula
             end
         end
 
+        # Returns elements in text form
+        # root_element:: _String_ base element
+        # indent:: _Boolean_ indents the resulting string, default true
+        # xpath_exp:: _String_ filter elements with a XPath
         def template_like_str(root_element, indent=true, xpath_exp=nil)
             if NOKOGIRI
-                xml_template=@xml.xpath(root_element).to_s
-                rexml=REXML::Document.new(xml_template).root
+                xml_template = @xml.xpath(root_element).to_s
+                rexml        = REXML::Document.new(xml_template).root
             else
-                rexml=@xml.elements[root_element]
+                rexml = @xml.elements[root_element]
             end
 
             if indent
-                ind_enter="\n"
-                ind_tab='  '
+                ind_enter = "\n"
+                ind_tab   = '  '
             else
-                ind_enter=''
-                ind_tab=' '
+                ind_enter = ''
+                ind_tab   = ' '
             end
 
-            str=rexml.elements.collect(xpath_exp) {|n|
-                if n.class==REXML::Element
-                    str_line=""
-                    if n.has_elements?
-                        str_line << n.name << "=[" << ind_enter
+            str = rexml.elements.collect(xpath_exp) {|n|
+                next if n.class != REXML::Element
 
-                        str_line << n.collect {|n2|
-                            if n2 && n2.class==REXML::Element
-                                str = ""
-                                str << ind_tab << n2.name << '='
-                                str << attr_to_str(n2.text) if n2.text
-                                str
-                            end
-                        }.compact.join(','+ind_enter)
-                        str_line<<" ]"
-                    else
-                        str_line << n.name << '=' << attr_to_str(n.text.to_s)
-                    end
-                    str_line
+                str_line = ""
+
+                if n.has_elements?
+                    str_line << "#{n.name}=[#{ind_enter}" << n.collect { |n2|
+
+                        next if n2.class != REXML::Element or !n2.has_text?
+
+                        str = "#{ind_tab}#{n2.name}=#{attr_to_str(n2.text)}"
+
+                    }.compact.join(",#{ind_enter}") << " ]"
+                else
+                    next if !n.has_text?
+
+                    str_line << "#{n.name}=#{attr_to_str(n.text)}"
                 end
+
+                str_line
             }.compact.join("\n")
 
-            str
+            return str
         end
 
+        #
+        #
+        #
         def to_xml(pretty=false)
             if NOKOGIRI && pretty
                 str = @xml.to_xml
@@ -305,6 +317,9 @@ module OpenNebula
             return str
         end
 
+        #
+        #
+        #
         def to_hash(hash={}, element=nil)
             element ||= @xml.document.root
 
@@ -344,12 +359,14 @@ module OpenNebula
         end
 
     private
+    
+        #
+        #
+        #
         def attr_to_str(attr)
             attr.gsub!('"',"\\\"")
-
-            if attr.match(/[=,' ']/)
-                return '"' + attr + '"'
-            end
+            attr.prepend('"')
+            attr << '"'
 
             return attr
         end

From 00346f8dc2145bb1f4e01ae88f662f0624d8b1b8 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Sat, 31 Mar 2012 18:12:26 +0200
Subject: [PATCH 2/6] bug: Replace any existing VMID variable in VM template

---
 src/vm/VirtualMachine.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 87e6a19943..0dc42dda92 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -209,9 +209,7 @@ int VirtualMachine::insert(SqlDB * db, string& error_str)
     oss << oid;
     value = oss.str();
 
-    attr = new SingleAttribute("VMID",value);
-
-    obj_template->set(attr);
+    replace_template_attribute("VMID", value);
 
     get_template_attribute("NAME",name);
 

From c845b6c6afa7d0418e19c563979d8b79a1a54064 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Sat, 31 Mar 2012 18:13:41 +0200
Subject: [PATCH 3/6] Upload the right file

---
 src/vm/VirtualMachine.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 0dc42dda92..d60d8dcee3 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -198,7 +198,6 @@ int VirtualMachine::insert(SqlDB * db, string& error_str)
     int    rc;
     string name;
 
-    SingleAttribute *   attr;
     string              value;
     ostringstream       oss;
 

From 17dbd1717a41b10709ad74da1cb6e556d81c77e6 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Sat, 31 Mar 2012 22:20:27 +0200
Subject: [PATCH 4/6] bug #1178: Ownership of the VM is checked now before
 releasing the IP/MAC lease (cherry picked from commit
 aec7af2c75960c917e381571ca630eec779653bd)

---
 include/Leases.h         | 13 +++++++++++++
 include/VirtualNetwork.h | 13 ++++++++++++-
 src/vm/VirtualMachine.cc |  7 +++++--
 src/vnm/Leases.cc        | 22 ++++++++++++++++++++++
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/include/Leases.h b/include/Leases.h
index 24bf919346..d6adc8040e 100644
--- a/include/Leases.h
+++ b/include/Leases.h
@@ -299,8 +299,21 @@ protected:
      */
     bool check(const string& ip);
 
+    /**
+     * Check if the passed ip corresponds with a given lease
+     * @param ip of the lease to be checked
+     * @return true if the ip was already assigned
+     */
     bool check(unsigned int ip);
 
+    /**
+     * Check if a VM is the owner of the ip 
+     * @param ip of the lease to be checked
+     * @param vid the ID of the VM
+     * @return true if the ip was already assigned
+     */
+    bool is_owner(const string& ip, int vid);
+
     /**
      *  Reads the leases from the DB, and updates the lease hash table
      *    @param db pointer to the database.
diff --git a/include/VirtualNetwork.h b/include/VirtualNetwork.h
index 069a7449a6..a70063059c 100644
--- a/include/VirtualNetwork.h
+++ b/include/VirtualNetwork.h
@@ -136,7 +136,7 @@ public:
     };
 
     /**
-     *    Release previously given lease
+     *  Release previously given lease
      *    @param _ip IP identifying the lease
      *    @return 0 if success
      */
@@ -145,6 +145,17 @@ public:
         return leases->release(ip);
     };
 
+    /**
+     *  Check if a VM is the owner of the ip 
+     *    @param ip of the lease to be checked
+     *    @param vid the ID of the VM
+     *    @return true if the ip was already assigned
+     */
+    bool is_owner (const string& ip, int vid)
+    {
+        return leases->is_owner(ip, vid);
+    };
+
     /**
      *    Gets size of the network (used + free)
      *    @return number of hosts that can be fitted in this network
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index d60d8dcee3..f25160dcf0 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -1084,8 +1084,11 @@ void VirtualMachine::release_network_leases()
             continue;
         }
 
-        vn->release_lease(ip);
-        vnpool->update(vn);
+        if (vn->is_owner(ip,oid))
+        {
+            vn->release_lease(ip);
+            vnpool->update(vn);
+        }
 
         vn->unlock();
     }
diff --git a/src/vnm/Leases.cc b/src/vnm/Leases.cc
index 5d462a69f5..b46d08ee2d 100644
--- a/src/vnm/Leases.cc
+++ b/src/vnm/Leases.cc
@@ -415,6 +415,28 @@ bool Leases::check(unsigned int ip)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+bool Leases::is_owner(const string& ip, int vid)
+{
+    unsigned int _ip;
+    map<unsigned int,Lease *>::iterator it;
+
+    Leases::Lease::ip_to_number(ip,_ip);
+
+    it = leases.find(_ip);
+
+    if (it!=leases.end())
+    {
+        return (it->second->vid == vid);
+    }
+    else
+    {
+        return false;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 int Leases::hold_leases(vector<const Attribute*>&   vector_leases,
                         string&                     error_msg)
 {

From 8aa8552c2f2dc4abe22f626bd790be2c54f4fdcf Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Mon, 2 Apr 2012 18:45:24 +0200
Subject: [PATCH 5/6] Fix bug in iscsi drivers (cherry picked from commit
 d14b8e255463c8c65bac749e45803ebba14024ef)

---
 src/tm_mad/iscsi/mv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tm_mad/iscsi/mv b/src/tm_mad/iscsi/mv
index 1b2fa09f75..98298ab0e2 100755
--- a/src/tm_mad/iscsi/mv
+++ b/src/tm_mad/iscsi/mv
@@ -102,7 +102,7 @@ if is_iscsi "$DST_HOST"; then
         $SUDO $(iscsiadm_login "$IQN" "$TARGET_HOST")
         sleep 1
         DISK_BY_PATH=\$(ls /dev/disk/by-path/*$IQN-lun-1)
-        ln -s "\$DISK_BY_PATH" "$DST_PATH"
+        ln -sf "\$DISK_BY_PATH" "$DST_PATH"
 EOF
 )
 

From 5e52c263741781bfbc40731bd19c3cd8b8e68b3f Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Mon, 2 Apr 2012 19:19:53 +0200
Subject: [PATCH 6/6] bug #1117: Get rid of unsupported API calls in Ruby 1.8.7

---
 src/oca/ruby/OpenNebula/XMLUtils.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/oca/ruby/OpenNebula/XMLUtils.rb b/src/oca/ruby/OpenNebula/XMLUtils.rb
index 41d689ad19..44f1553a4b 100644
--- a/src/oca/ruby/OpenNebula/XMLUtils.rb
+++ b/src/oca/ruby/OpenNebula/XMLUtils.rb
@@ -365,9 +365,8 @@ module OpenNebula
         #
         def attr_to_str(attr)
             attr.gsub!('"',"\\\"")
-            attr.prepend('"')
-            attr << '"'
-
+            attr = "\"#{attr}\""
+            
             return attr
         end
     end