From c1786016237fcabd351bedc2a92d4be35aec4503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Fri, 4 May 2012 17:27:57 +0200
Subject: [PATCH 01/27] Feature #1099: Add new one.vmpool.accounting XMLRPC
 method

---
 include/History.h                      |   8 +-
 include/PoolSQL.h                      |  13 +++
 include/RequestManagerPoolInfoFilter.h |  42 ++++++++-
 include/VirtualMachine.h               |   9 +-
 include/VirtualMachinePool.h           |   2 +-
 src/pool/PoolSQL.cc                    |  27 ++++--
 src/rm/RequestManager.cc               |   2 +
 src/rm/RequestManagerPoolInfoFilter.cc | 116 +++++++++++++++++++++----
 src/vm/History.cc                      |  10 ++-
 9 files changed, 193 insertions(+), 36 deletions(-)

diff --git a/include/History.h b/include/History.h
index e124ec7a2e..689947bf62 100644
--- a/include/History.h
+++ b/include/History.h
@@ -62,6 +62,12 @@ public:
      */
     string& to_xml(string& xml) const;
 
+    // ----------------------------------------
+    // DataBase implementation variables
+    // ----------------------------------------
+
+    static const char * table;
+
 private:
     friend class VirtualMachine;
     friend class VirtualMachinePool;
@@ -70,8 +76,6 @@ private:
     // DataBase implementation variables
     // ----------------------------------------
 
-    static const char * table;
-
     static const char * db_names;
 
     static const char * db_bootstrap;
diff --git a/include/PoolSQL.h b/include/PoolSQL.h
index c127d075e6..d29903e678 100644
--- a/include/PoolSQL.h
+++ b/include/PoolSQL.h
@@ -154,6 +154,19 @@ public:
      */
     virtual int dump(ostringstream& oss, const string& where) = 0;
 
+    /**
+     *  Dumps the output of the custom sql query into an xml
+     *
+     *   @param oss The output stream to dump the xml contents
+     *   @param root_elem_name Name of the root xml element name
+     *   @param sql_query The SQL query to execute
+     *
+     *   @return 0 on success
+     */
+    int custom_dump(ostringstream&  oss,
+                    const string&   root_elem_name,
+                    ostringstream&  sql_query);
+
 protected:
 
     /**
diff --git a/include/RequestManagerPoolInfoFilter.h b/include/RequestManagerPoolInfoFilter.h
index 2270f7c471..d657138f15 100644
--- a/include/RequestManagerPoolInfoFilter.h
+++ b/include/RequestManagerPoolInfoFilter.h
@@ -56,11 +56,22 @@ protected:
 
     /* -------------------------------------------------------------------- */
 
-    void dump(RequestAttributes& att, 
+    void generate_where_string(
+            RequestAttributes& att,
+            int                filter_flag,
+            int                start_id,
+            int                end_id,
+            const string&      and_clause,
+            const string&      or_clause,
+            ostringstream&     where_string);
+
+    /* -------------------------------------------------------------------- */
+
+    void dump(RequestAttributes& att,
               int                filter_flag,
-              int                start_id, 
+              int                start_id,
               int                end_id,
-              const string&      and_clause, 
+              const string&      and_clause,
               const string&      or_clause);
 };
 
@@ -98,6 +109,31 @@ public:
 /* ------------------------------------------------------------------------- */
 /* ------------------------------------------------------------------------- */
 
+class VirtualMachinePoolAccounting : public RequestManagerPoolInfoFilter
+{
+public:
+
+    VirtualMachinePoolAccounting():
+        RequestManagerPoolInfoFilter("VirtualMachinePoolAccounting",
+                                     "Returns the virtual machine history records",
+                                     "A:siii")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_vmpool();
+        auth_object = PoolObjectSQL::VM;
+    };
+
+    ~VirtualMachinePoolAccounting(){};
+
+    /* -------------------------------------------------------------------- */
+
+    void request_execute(
+            xmlrpc_c::paramList const& paramList, RequestAttributes& att);
+};
+
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
 class TemplatePoolInfo : public RequestManagerPoolInfoFilter
 {
 public:
diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index be2ba87c0f..6f20419e33 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -704,6 +704,13 @@ public:
     static void set_auth_request(int uid, 
                                  AuthRequest& ar, 
                                  VirtualMachineTemplate *tmpl);
+
+    // ------------------------------------------------------------------------
+    // DataBase implementation (Public)
+    // ------------------------------------------------------------------------
+
+    static const char * table;
+
 private:
 
     // -------------------------------------------------------------------------
@@ -940,8 +947,6 @@ protected:
     // DataBase implementation
     // *************************************************************************
 
-    static const char * table;
-
     static const char * db_names;
 
     static const char * db_bootstrap;
diff --git a/include/VirtualMachinePool.h b/include/VirtualMachinePool.h
index 7e3ea7e6e2..d1fd09b9a3 100644
--- a/include/VirtualMachinePool.h
+++ b/include/VirtualMachinePool.h
@@ -143,7 +143,7 @@ public:
     int dump(ostringstream& oss, const string& where)
     {
         return PoolSQL::dump(oss, "VM_POOL", VirtualMachine::table, where);
-    }
+    };
 
 private:
     /**
diff --git a/src/pool/PoolSQL.cc b/src/pool/PoolSQL.cc
index 06d47051d8..d291f07c2a 100644
--- a/src/pool/PoolSQL.cc
+++ b/src/pool/PoolSQL.cc
@@ -479,14 +479,8 @@ int PoolSQL::dump(ostringstream& oss,
                   const char * table,
                   const string& where)
 {
-    int             rc;
     ostringstream   cmd;
 
-    oss << "<" << elem_name << ">";
-
-    set_callback(static_cast<Callbackable::Callback>(&PoolSQL::dump_cb),
-                  static_cast<void *>(&oss));
-
     cmd << "SELECT body FROM " << table;
 
     if ( !where.empty() )
@@ -496,9 +490,26 @@ int PoolSQL::dump(ostringstream& oss,
 
     cmd << " ORDER BY oid";
 
-    rc = db->exec(cmd, this);
+    return custom_dump(oss, elem_name, cmd);
+}
 
-    oss << "</" << elem_name << ">";
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int PoolSQL::custom_dump(ostringstream&  oss,
+                         const string&   root_elem_name,
+                         ostringstream&  sql_query)
+{
+    int rc;
+
+    oss << "<" << root_elem_name << ">";
+
+    set_callback(static_cast<Callbackable::Callback>(&PoolSQL::dump_cb),
+                  static_cast<void *>(&oss));
+
+    rc = db->exec(sql_query, this);
+
+    oss << "</" << root_elem_name << ">";
 
     unset_callback();
 
diff --git a/src/rm/RequestManager.cc b/src/rm/RequestManager.cc
index f18bad3504..e2413c867c 100644
--- a/src/rm/RequestManager.cc
+++ b/src/rm/RequestManager.cc
@@ -243,6 +243,7 @@ void RequestManager::register_xml_methods()
     xmlrpc_c::methodPtr vm_migrate(new VirtualMachineMigrate());
     xmlrpc_c::methodPtr vm_action(new VirtualMachineAction()); 
     xmlrpc_c::methodPtr vm_savedisk(new VirtualMachineSaveDisk());
+    xmlrpc_c::methodPtr vm_pool_acct(new VirtualMachinePoolAccounting());
 
     // VirtualNetwork Methods
     xmlrpc_c::methodPtr vn_addleases(new VirtualNetworkAddLeases());
@@ -348,6 +349,7 @@ void RequestManager::register_xml_methods()
     RequestManagerRegistry.addMethod("one.vm.chmod", vm_chmod);
 
     RequestManagerRegistry.addMethod("one.vmpool.info", vm_pool_info);
+    RequestManagerRegistry.addMethod("one.vmpool.accounting", vm_pool_acct);
 
     /* VM Template related methods*/
     RequestManagerRegistry.addMethod("one.template.update", template_update);
diff --git a/src/rm/RequestManagerPoolInfoFilter.cc b/src/rm/RequestManagerPoolInfoFilter.cc
index e40db5da8d..57ecc505d5 100644
--- a/src/rm/RequestManagerPoolInfoFilter.cc
+++ b/src/rm/RequestManagerPoolInfoFilter.cc
@@ -91,6 +91,74 @@ void VirtualMachinePoolInfo::request_execute(
 /* ------------------------------------------------------------------------- */
 /* ------------------------------------------------------------------------- */
 
+void VirtualMachinePoolAccounting::request_execute(
+        xmlrpc_c::paramList const& paramList,
+        RequestAttributes& att)
+{
+    int filter_flag = xmlrpc_c::value_int(paramList.getInt(1));
+    int time_start  = xmlrpc_c::value_int(paramList.getInt(2));
+    int time_end    = xmlrpc_c::value_int(paramList.getInt(3));
+
+    ostringstream oss;
+    ostringstream cmd;
+    ostringstream vmpool_where;
+    int           rc;
+
+    if ( filter_flag < MINE )
+    {
+        failure_response(XML_RPC_API,
+                request_error("Incorrect filter_flag",""),
+                att);
+        return;
+    }
+
+    cmd << "SELECT " << History::table << ".body FROM " << History::table
+        << " INNER JOIN " << VirtualMachine::table
+        << " WHERE vid=oid";
+
+    generate_where_string(att, filter_flag, -1, -1,
+            "", "", vmpool_where);
+
+    if ( !vmpool_where.str().empty() )  //TODO: better empty check?
+    {
+        cmd << " AND " << vmpool_where;
+    }
+
+    if ( time_start != -1 || time_end != -1 )
+    {
+        if ( time_start != -1 )
+        {
+            cmd << " AND (etime > " << time_start << " OR  etime = 0)";
+        }
+
+        if ( time_end != -1 )
+        {
+            cmd << " AND stime < " << time_end;
+        }
+    }
+
+    cmd << " GROUP BY vid,seq";
+
+    // ------------------------------------------
+    //           Dump the history records
+    // ------------------------------------------
+
+    rc = pool->custom_dump(oss, "HISTORY_RECORDS", cmd);
+
+    if ( rc != 0 )
+    {
+        failure_response(INTERNAL,request_error("Internal Error",""), att);
+        return;
+    }
+
+    success_response(oss.str(), att);
+
+    return;
+}
+
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
 void HostPoolInfo::request_execute(
         xmlrpc_c::paramList const& paramList,
         RequestAttributes& att)
@@ -141,19 +209,16 @@ void ClusterPoolInfo::request_execute(
 /* ------------------------------------------------------------------------- */
 /* ------------------------------------------------------------------------- */
 
-void RequestManagerPoolInfoFilter::dump(
+void RequestManagerPoolInfoFilter::generate_where_string(
         RequestAttributes& att,
         int                filter_flag,
         int                start_id,
         int                end_id,
         const string&      and_clause,
-        const string&      or_clause)
+        const string&      or_clause,
+        ostringstream&     where_string)
 {
-    set<int>::iterator it;
-
-    ostringstream oss;
     bool          empty = true;
-    ostringstream where_string;
 
     ostringstream uid_filter;
     ostringstream id_filter;
@@ -162,16 +227,6 @@ void RequestManagerPoolInfoFilter::dump(
     string acl_str;
     string id_str;
 
-    int rc;
-
-    if ( filter_flag < MINE )
-    {
-        failure_response(XML_RPC_API,
-                request_error("Incorrect filter_flag",""),
-                att);
-        return;
-    }
-
     Nebula&     nd   = Nebula::instance();
     AclManager* aclm = nd.get_aclm();
     bool        all;
@@ -308,12 +363,39 @@ void RequestManagerPoolInfoFilter::dump(
 
         where_string << "(" << or_clause << ")";
     }
+}
+
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+void RequestManagerPoolInfoFilter::dump(
+        RequestAttributes& att,
+        int                filter_flag,
+        int                start_id,
+        int                end_id,
+        const string&      and_clause,
+        const string&      or_clause)
+{
+    ostringstream oss;
+    ostringstream where_string;
+    int           rc;
+
+    if ( filter_flag < MINE )
+    {
+        failure_response(XML_RPC_API,
+                request_error("Incorrect filter_flag",""),
+                att);
+        return;
+    }
+
+    generate_where_string(att, filter_flag, start_id, end_id,
+            and_clause, or_clause, where_string);
 
     // ------------------------------------------ 
     //           Get the pool
     // ------------------------------------------ 
     
-    rc = pool->dump(oss,where_string.str());
+    rc = pool->dump(oss, where_string.str());
 
     if ( rc != 0 )
     {
diff --git a/src/vm/History.cc b/src/vm/History.cc
index 7d581a1937..4fae85a24c 100644
--- a/src/vm/History.cc
+++ b/src/vm/History.cc
@@ -25,10 +25,11 @@
 
 const char * History::table = "history";
 
-const char * History::db_names = "vid, seq, body";
+const char * History::db_names = "vid, seq, body, stime, etime";
 
 const char * History::db_bootstrap = "CREATE TABLE IF NOT EXISTS "
-    "history (vid INTEGER, seq INTEGER, body TEXT, PRIMARY KEY(vid,seq))";
+    "history (vid INTEGER, seq INTEGER, body TEXT, "
+    "stime INTEGER, etime INTEGER,PRIMARY KEY(vid,seq))";
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
@@ -168,7 +169,9 @@ int History::insert_replace(SqlDB *db, bool replace)
     oss << " INTO " << table << " ("<< db_names <<") VALUES ("
         <<          oid             << ","
         <<          seq             << ","
-        << "'" <<   sql_xml         << "')";
+        << "'" <<   sql_xml         << "',"
+        <<          stime           << ","
+        <<          etime           << ")";
 
     rc = db->exec(oss);
 
@@ -264,6 +267,7 @@ string& History::to_xml(string& xml) const
 
     oss <<
         "<HISTORY>" <<
+          "<OID>"               << oid               << "</OID>"   <<
           "<SEQ>"               << seq               << "</SEQ>"   <<
           "<HOSTNAME>"          << hostname          << "</HOSTNAME>"<<
           "<HID>"               << hid               << "</HID>"   <<

From 70d5c75d042d4eacecc4a55e803650ddb05c9797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Fri, 4 May 2012 17:29:36 +0200
Subject: [PATCH 02/27] Feature #1099: Add VM template information to the
 History records once they are "closed"

---
 include/History.h        | 21 ++++++++++++++++++++-
 include/VirtualMachine.h |  8 +++++++-
 src/vm/History.cc        | 31 +++++++++++++++++++++++++++----
 3 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/include/History.h b/include/History.h
index 689947bf62..772d3fb2b0 100644
--- a/include/History.h
+++ b/include/History.h
@@ -63,7 +63,7 @@ public:
     string& to_xml(string& xml) const;
 
     // ----------------------------------------
-    // DataBase implementation variables
+    // DataBase implementation
     // ----------------------------------------
 
     static const char * table;
@@ -108,6 +108,8 @@ private:
 
     MigrationReason reason;
 
+    string  vm_info;
+
     // -------------------------------------------------------------------------
     // Non-persistent history fields
     // -------------------------------------------------------------------------
@@ -173,6 +175,23 @@ private:
      */
     int select_cb(void *nil, int num, char **values, char **names);
 
+    /**
+     * Function to print the History object into a string in
+     * XML format, to be stored in the DB. It includes the VM template info
+     *  @param xml the resulting XML string
+     *  @return a reference to the generated string
+     */
+    string& to_db_xml(string& xml) const;
+
+    /**
+     * Function to print the History object into a string in
+     * XML format. The VM info can be optionally included
+     *  @param xml the resulting XML string
+     *  @param database If it is true, the TEMPLATE element will be included
+     *  @return a reference to the generated string
+     */
+    string& to_xml(string& xml, bool database) const;
+
     /**
      *  Rebuilds the object from an xml node
      *    @param node The xml node pointer
diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index 6f20419e33..8d7b2f68fe 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -199,7 +199,7 @@ public:
 
     /**
      *  Sets the VM exit time
-     *    @param _et VM exit time (when it arraived DONE/FAILED states)
+     *    @param _et VM exit time (when it arrived DONE/FAILED states)
      */
     void set_exit_time(time_t et)
     {
@@ -434,6 +434,9 @@ public:
      */
     void set_etime(time_t _etime)
     {
+        string xml;
+        history->vm_info = obj_template->to_xml(xml);
+
         history->etime=_etime;
     };
 
@@ -443,6 +446,9 @@ public:
      */
     void set_previous_etime(time_t _etime)
     {
+        string xml;
+        previous_history->vm_info = obj_template->to_xml(xml);
+
         previous_history->etime=_etime;
     };
 
diff --git a/src/vm/History.cc b/src/vm/History.cc
index 4fae85a24c..e1199d83e6 100644
--- a/src/vm/History.cc
+++ b/src/vm/History.cc
@@ -52,7 +52,8 @@ History::History(
         running_etime(0),
         epilog_stime(0),
         epilog_etime(0),
-        reason(NONE){};
+        reason(NONE),
+        vm_info("<TEMPLATE/>"){};
 
 /* -------------------------------------------------------------------------- */
 
@@ -77,7 +78,8 @@ History::History(
         running_etime(0),
         epilog_stime(0),
         epilog_etime(0),
-        reason(NONE)
+        reason(NONE),
+        vm_info("<TEMPLATE/>")
 {
     non_persistent_data();
 };
@@ -150,7 +152,7 @@ int History::insert_replace(SqlDB *db, bool replace)
         return 0;
     }
 
-    sql_xml = db->escape_str(to_xml(xml_body).c_str());
+    sql_xml = db->escape_str(to_db_xml(xml_body).c_str());
 
     if ( sql_xml == 0 )
     {
@@ -262,6 +264,20 @@ ostream& operator<<(ostream& os, const History& history)
 /* -------------------------------------------------------------------------- */
 
 string& History::to_xml(string& xml) const
+{
+    return to_xml(xml, false);
+}
+
+/* -------------------------------------------------------------------------- */
+
+string& History::to_db_xml(string& xml) const
+{
+    return to_xml(xml, true);
+}
+
+/* -------------------------------------------------------------------------- */
+
+string& History::to_xml(string& xml, bool database) const
 {
     ostringstream oss;
 
@@ -281,7 +297,14 @@ string& History::to_xml(string& xml) const
           "<RETIME>"            << running_etime     << "</RETIME>"<<
           "<ESTIME>"            << epilog_stime      << "</ESTIME>"<<
           "<EETIME>"            << epilog_etime      << "</EETIME>"<<
-          "<REASON>"            << reason            << "</REASON>"<<
+          "<REASON>"            << reason            << "</REASON>";
+
+    if ( database )
+    {
+        oss << vm_info;
+    }
+
+    oss <<
         "</HISTORY>";
 
    xml = oss.str();

From 7ad3ce1965f3ab1f0f739f61fe2479ea74d0b660 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Sat, 5 May 2012 03:18:25 +0200
Subject: [PATCH 03/27] feature #1099: Moved SQL filters to the corresponding
 pools

---
 include/History.h                      |   9 +-
 include/PoolSQL.h                      |  71 +++++++--
 include/RequestManagerPoolInfoFilter.h |  36 +++--
 include/VirtualMachine.h               |   9 +-
 include/VirtualMachinePool.h           |  12 ++
 src/pool/PoolSQL.cc                    | 128 +++++++++++++++-
 src/rm/RequestManagerPoolInfoFilter.cc | 200 ++++++-------------------
 src/vm/VirtualMachinePool.cc           |  34 +++++
 8 files changed, 290 insertions(+), 209 deletions(-)

diff --git a/include/History.h b/include/History.h
index 772d3fb2b0..8161f4649f 100644
--- a/include/History.h
+++ b/include/History.h
@@ -62,12 +62,6 @@ public:
      */
     string& to_xml(string& xml) const;
 
-    // ----------------------------------------
-    // DataBase implementation
-    // ----------------------------------------
-
-    static const char * table;
-
 private:
     friend class VirtualMachine;
     friend class VirtualMachinePool;
@@ -75,7 +69,8 @@ private:
     // ----------------------------------------
     // DataBase implementation variables
     // ----------------------------------------
-
+    static const char * table;
+    
     static const char * db_names;
 
     static const char * db_bootstrap;
diff --git a/include/PoolSQL.h b/include/PoolSQL.h
index d29903e678..c6a4a262df 100644
--- a/include/PoolSQL.h
+++ b/include/PoolSQL.h
@@ -154,19 +154,47 @@ public:
      */
     virtual int dump(ostringstream& oss, const string& where) = 0;
 
-    /**
-     *  Dumps the output of the custom sql query into an xml
-     *
-     *   @param oss The output stream to dump the xml contents
-     *   @param root_elem_name Name of the root xml element name
-     *   @param sql_query The SQL query to execute
-     *
-     *   @return 0 on success
-     */
-    int custom_dump(ostringstream&  oss,
-                    const string&   root_elem_name,
-                    ostringstream&  sql_query);
+    // -------------------------------------------------------------------------
+    // Function to generate dump filters
+    // -------------------------------------------------------------------------
 
+    /**
+     *  Creates a filter for those objects (oids) or objects owned by a given 
+     *  group that an user can access based on the ACL rules
+     *    @param uid the user id
+     *    @param gid the group id
+     *    @param auth_object object type
+     *    @param all returns if the user can access all objects
+     *    @param filter the resulting filter string
+     */
+    static void acl_filter(int                       uid, 
+                           int                       gid, 
+                           PoolObjectSQL::ObjectType auth_object,
+                           bool&                     all,
+                           string&                   filter);
+    /**
+     *  Creates a filter for the objects owned by a given user/group
+     *    @param uid the user id
+     *    @param gid the group id
+     *    @param filter_flag query type (ALL, MINE, GROUP)
+     *    @param all user can access all objects
+     *    @param filter the resulting filter string
+     */
+    static void usr_filter(int           uid, 
+                           int           gid, 
+                           int           filter_flag,
+                           bool          all,
+                           const string& acl_str,
+                           string&       filter);
+    /**
+     *  Creates a filter for a given set of objects based on their id
+     *    @param start_id first id
+     *    @param end_id last id
+     *    @param filter the resulting filter string
+     */
+    static void oid_filter(int     start_id,
+                           int     end_id,
+                           string& filter);
 protected:
 
     /**
@@ -195,8 +223,23 @@ protected:
      *
      *  @return 0 on success
      */
-    int dump(ostringstream& oss, const string& elem_name,
-             const char * table, const string& where);
+    int dump(ostringstream& oss, 
+             const string&  elem_name,
+             const char *   table, 
+             const string&  where);
+
+    /**
+     *  Dumps the output of the custom sql query into an xml
+     *
+     *   @param oss The output stream to dump the xml contents
+     *   @param root_elem_name Name of the root xml element name
+     *   @param sql_query The SQL query to execute
+     *
+     *   @return 0 on success
+     */
+    int dump(ostringstream&  oss,
+             const string&   root_elem_name,
+             ostringstream&  sql_query);    
 
     /* ---------------------------------------------------------------------- */
     /* Interface to access the lastOID assigned by the pool                   */
diff --git a/include/RequestManagerPoolInfoFilter.h b/include/RequestManagerPoolInfoFilter.h
index d657138f15..08d3459f2c 100644
--- a/include/RequestManagerPoolInfoFilter.h
+++ b/include/RequestManagerPoolInfoFilter.h
@@ -29,6 +29,16 @@ using namespace std;
 
 class RequestManagerPoolInfoFilter: public Request
 {
+public:
+    /** Specify all objects the user has right to USE (-2) */
+    static const int ALL;
+
+    /** Specify user's objects in the pool (-3) */
+    static const int MINE;
+
+    /** Specify user's + group objects (-1)     */
+    static const int MINE_GROUP;
+
 protected:
     RequestManagerPoolInfoFilter(const string& method_name,
                                  const string& help,
@@ -40,30 +50,18 @@ protected:
 
     /* -------------------------------------------------------------------- */
 
-    /** Specify all objects the user has right to USE (-2) */
-    static const int ALL;
-
-    /** Specify user's objects in the pool (-3) */
-    static const int MINE;
-
-    /** Specify user's + group objects (-1)     */
-    static const int MINE_GROUP;
-
-    /* -------------------------------------------------------------------- */
-
     virtual void request_execute(
             xmlrpc_c::paramList const& paramList, RequestAttributes& att);
 
     /* -------------------------------------------------------------------- */
 
-    void generate_where_string(
-            RequestAttributes& att,
-            int                filter_flag,
-            int                start_id,
-            int                end_id,
-            const string&      and_clause,
-            const string&      or_clause,
-            ostringstream&     where_string);
+    void where_filter(RequestAttributes& att,
+                      int                filter_flag,
+                      int                start_id,
+                      int                end_id,
+                      const string&      and_clause,
+                      const string&      or_clause,
+                      string&            where_string);
 
     /* -------------------------------------------------------------------- */
 
diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index 8d7b2f68fe..1332198578 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -710,13 +710,6 @@ public:
     static void set_auth_request(int uid, 
                                  AuthRequest& ar, 
                                  VirtualMachineTemplate *tmpl);
-
-    // ------------------------------------------------------------------------
-    // DataBase implementation (Public)
-    // ------------------------------------------------------------------------
-
-    static const char * table;
-
 private:
 
     // -------------------------------------------------------------------------
@@ -952,6 +945,8 @@ protected:
     // *************************************************************************
     // DataBase implementation
     // *************************************************************************
+    
+    static const char * table;
 
     static const char * db_names;
 
diff --git a/include/VirtualMachinePool.h b/include/VirtualMachinePool.h
index d1fd09b9a3..664da7fdb6 100644
--- a/include/VirtualMachinePool.h
+++ b/include/VirtualMachinePool.h
@@ -145,6 +145,18 @@ public:
         return PoolSQL::dump(oss, "VM_POOL", VirtualMachine::table, where);
     };
 
+    /**
+     *  Dumps the VM accounting information in XML format. A filter can be also 
+     *  added to the query as well as a time frame.
+     *  @param oss the output stream to dump the pool contents
+     *  @param where filter for the objects, defaults to all
+     *
+     *  @return 0 on success
+     */
+    int dump_acct(ostringstream& oss, 
+                  const string&  where, 
+                  int            time_start, 
+                  int            time_end);
 private:
     /**
      *  Factory method to produce VM objects
diff --git a/src/pool/PoolSQL.cc b/src/pool/PoolSQL.cc
index d291f07c2a..1afb6775cb 100644
--- a/src/pool/PoolSQL.cc
+++ b/src/pool/PoolSQL.cc
@@ -21,6 +21,7 @@
 #include <algorithm>
 
 #include "PoolSQL.h"
+#include "RequestManagerPoolInfoFilter.h"
 
 #include <errno.h>
 
@@ -490,22 +491,22 @@ int PoolSQL::dump(ostringstream& oss,
 
     cmd << " ORDER BY oid";
 
-    return custom_dump(oss, elem_name, cmd);
+    return dump(oss, elem_name, cmd);
 }
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int PoolSQL::custom_dump(ostringstream&  oss,
-                         const string&   root_elem_name,
-                         ostringstream&  sql_query)
+int PoolSQL::dump(ostringstream&  oss,
+                  const string&   root_elem_name,
+                  ostringstream&  sql_query)
 {
     int rc;
 
     oss << "<" << root_elem_name << ">";
 
     set_callback(static_cast<Callbackable::Callback>(&PoolSQL::dump_cb),
-                  static_cast<void *>(&oss));
+                 static_cast<void *>(&oss));
 
     rc = db->exec(sql_query, this);
 
@@ -557,3 +558,120 @@ int PoolSQL::search(
     return rc;
 }
 
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+void PoolSQL::acl_filter(int                       uid, 
+                         int                       gid, 
+                         PoolObjectSQL::ObjectType auth_object,
+                         bool&                     all,
+                         string&                   filter)
+{
+    filter.clear();
+
+    if ( uid == 0 || gid == 0 )
+    {
+        all = true;
+        return;
+    }
+
+    Nebula&     nd   = Nebula::instance();
+    AclManager* aclm = nd.get_aclm();
+
+    ostringstream         acl_filter;
+    vector<int>::iterator it;
+
+    vector<int> oids;
+    vector<int> gids;
+
+    aclm->reverse_search(uid, 
+                         gid, 
+                         auth_object,
+                         AuthRequest::USE, 
+                         all, 
+                         oids, 
+                         gids);
+
+    for ( it = oids.begin(); it < oids.end(); it++ )
+    {
+        acl_filter << " OR oid = " << *it;
+    }
+
+    for ( it = gids.begin(); it < gids.end(); it++ )
+    {
+        acl_filter << " OR gid = " << *it;
+    }
+
+    filter = acl_filter.str();
+}
+
+/* -------------------------------------------------------------------------- */
+
+void PoolSQL::usr_filter(int           uid, 
+                         int           gid, 
+                         int           filter_flag,
+                         bool          all,
+                         const string& acl_str,
+                         string&       filter)
+{
+    ostringstream uid_filter;
+
+    if ( filter_flag == RequestManagerPoolInfoFilter::MINE )
+    {
+        uid_filter << "uid = " << uid;
+    }
+    else if ( filter_flag == RequestManagerPoolInfoFilter::MINE_GROUP )
+    {
+        uid_filter << " uid = " << uid 
+                   << " OR ( gid = " << gid << " AND group_u = 1 )";        
+    }
+    else if ( filter_flag == RequestManagerPoolInfoFilter::ALL )
+    {
+        if (!all)
+        {
+            uid_filter << " uid = " << uid 
+                       << " OR ( gid = " << gid << " AND group_u = 1 )"
+                       << " OR other_u = 1"
+                       << acl_str;
+        }
+    }
+    else
+    {
+        uid_filter << "uid = " << filter_flag;
+
+        if ( filter_flag != uid && !all )
+        {
+            uid_filter << " AND ("
+                       << " ( gid = " << gid << " AND group_u = 1)"
+                       << " OR other_u = 1"
+                       << acl_str
+                       << ")";
+        }
+    }
+
+    filter = uid_filter.str();
+}
+
+/* -------------------------------------------------------------------------- */
+
+void PoolSQL::oid_filter(int     start_id,
+                         int     end_id,
+                         string& filter)
+{
+    ostringstream idfilter;
+
+    if ( start_id != -1 )
+    {
+        idfilter << "oid >= " << start_id;
+
+        if ( end_id != -1 )
+        {
+            idfilter << " AND oid <= " << end_id;
+        }
+    }
+
+    filter = idfilter.str();
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
diff --git a/src/rm/RequestManagerPoolInfoFilter.cc b/src/rm/RequestManagerPoolInfoFilter.cc
index 57ecc505d5..e48e23d237 100644
--- a/src/rm/RequestManagerPoolInfoFilter.cc
+++ b/src/rm/RequestManagerPoolInfoFilter.cc
@@ -100,8 +100,7 @@ void VirtualMachinePoolAccounting::request_execute(
     int time_end    = xmlrpc_c::value_int(paramList.getInt(3));
 
     ostringstream oss;
-    ostringstream cmd;
-    ostringstream vmpool_where;
+    string        where;
     int           rc;
 
     if ( filter_flag < MINE )
@@ -112,39 +111,12 @@ void VirtualMachinePoolAccounting::request_execute(
         return;
     }
 
-    cmd << "SELECT " << History::table << ".body FROM " << History::table
-        << " INNER JOIN " << VirtualMachine::table
-        << " WHERE vid=oid";
-
-    generate_where_string(att, filter_flag, -1, -1,
-            "", "", vmpool_where);
-
-    if ( !vmpool_where.str().empty() )  //TODO: better empty check?
-    {
-        cmd << " AND " << vmpool_where;
-    }
-
-    if ( time_start != -1 || time_end != -1 )
-    {
-        if ( time_start != -1 )
-        {
-            cmd << " AND (etime > " << time_start << " OR  etime = 0)";
-        }
-
-        if ( time_end != -1 )
-        {
-            cmd << " AND stime < " << time_end;
-        }
-    }
-
-    cmd << " GROUP BY vid,seq";
-
-    // ------------------------------------------
-    //           Dump the history records
-    // ------------------------------------------
-
-    rc = pool->custom_dump(oss, "HISTORY_RECORDS", cmd);
+    where_filter(att, filter_flag, -1, -1, "", "", where);
 
+    rc = (static_cast<VirtualMachinePool *>(pool))->dump_acct(oss,
+                                                              where, 
+                                                              time_start, 
+                                                              time_end);
     if ( rc != 0 )
     {
         failure_response(INTERNAL,request_error("Internal Error",""), att);
@@ -209,126 +181,38 @@ void ClusterPoolInfo::request_execute(
 /* ------------------------------------------------------------------------- */
 /* ------------------------------------------------------------------------- */
 
-void RequestManagerPoolInfoFilter::generate_where_string(
+void RequestManagerPoolInfoFilter::where_filter(
         RequestAttributes& att,
         int                filter_flag,
         int                start_id,
         int                end_id,
         const string&      and_clause,
         const string&      or_clause,
-        ostringstream&     where_string)
+        string&            filter_str)
 {
-    bool          empty = true;
+    bool empty = true;
+    bool all;
 
-    ostringstream uid_filter;
-    ostringstream id_filter;
-
-    string uid_str;
     string acl_str;
-    string id_str;
+    string uid_str;
+    string oid_str;
 
-    Nebula&     nd   = Nebula::instance();
-    AclManager* aclm = nd.get_aclm();
-    bool        all;
-    vector<int> oids;
-    vector<int> gids;
+    ostringstream filter;
+
+    PoolSQL::acl_filter(att.uid, att.gid, auth_object, all, acl_str);
+
+    PoolSQL::usr_filter(att.uid, att.gid, filter_flag, all, acl_str, uid_str);
+
+    PoolSQL::oid_filter(start_id, end_id, oid_str);
 
-    // -------------------------------------------------------------------------
-    //                             User ID filter              
     // ------------------------------------------------------------------------- 
+    //                          Compound WHERE clause 
+    //   WHERE ( id_str ) AND ( uid_str ) AND ( and_clause ) OR ( or_clause )
+    // -------------------------------------------------------------------------
 
-    if ( att.uid == 0 || att.gid == 0 )
+    if (!oid_str.empty())
     {
-        all = true;
-    }
-    else
-    {
-        ostringstream         acl_filter;
-        vector<int>::iterator it;   
-
-        aclm->reverse_search(att.uid, 
-                             att.gid, 
-                             auth_object,
-                             AuthRequest::USE, 
-                             all, 
-                             oids, 
-                             gids);
-
-        for ( it = oids.begin(); it < oids.end(); it++ )
-        {
-            acl_filter << " OR oid = " << *it;
-        }
-
-        for ( it = gids.begin(); it < gids.end(); it++ )
-        {
-            acl_filter << " OR gid = " << *it;
-        }
-
-        acl_str = acl_filter.str();
-    }
-
-    switch ( filter_flag )
-    {
-        case MINE:
-            uid_filter << "uid = " << att.uid;
-            break;
-
-        case MINE_GROUP:
-            uid_filter << " uid = " << att.uid 
-                       << " OR ( gid = " << att.gid << " AND group_u = 1 )";
-            break;
-
-        case ALL:
-            if (!all)
-            {
-                uid_filter << " uid = " << att.uid 
-                           << " OR ( gid = " << att.gid << " AND group_u = 1 )"
-                           << " OR other_u = 1"
-                           << acl_str;
-            }
-            break;
-
-        default:
-            uid_filter << "uid = " << filter_flag;
-
-            if ( filter_flag != att.uid && !all )
-            {
-                uid_filter << " AND ("
-                           << " ( gid = " << att.gid << " AND group_u = 1)"
-                           << " OR other_u = 1"
-                           << acl_str
-                           << ")";
-            }
-            break;
-    }
-
-    uid_str = uid_filter.str();
-
-    // ------------------------------------------ 
-    //              Resource ID filter 
-    // ------------------------------------------ 
-
-    if ( start_id != -1 )
-    {
-        id_filter << "oid >= " << start_id;
-
-        if ( end_id != -1 )
-        {
-            id_filter << " AND oid <= " << end_id;
-        }
-    }
-
-    id_str = id_filter.str();
-
-    // ------------------------------------------ 
-    //           Compound WHERE clause 
-    // ------------------------------------------ 
-
-    // WHERE ( id_str ) AND ( uid_str ) AND ( and_clause ) OR ( or_clause )
-
-    if (!id_str.empty())
-    {
-        where_string << "(" << id_str << ")" ;
+        filter << "(" << oid_str << ")" ;
         empty = false;
     }
 
@@ -336,10 +220,10 @@ void RequestManagerPoolInfoFilter::generate_where_string(
     {
         if (!empty)
         {
-            where_string << " AND ";
+            filter << " AND ";
         }
 
-        where_string << "(" << uid_str << ")";
+        filter << "(" << uid_str << ")";
         empty = false;
     }
 
@@ -347,10 +231,10 @@ void RequestManagerPoolInfoFilter::generate_where_string(
     {
         if (!empty)
         {
-            where_string << " AND ";
+            filter << " AND ";
         }
 
-        where_string << "(" << and_clause << ")";
+        filter << "(" << and_clause << ")";
         empty = false;
     }
 
@@ -358,15 +242,17 @@ void RequestManagerPoolInfoFilter::generate_where_string(
     {
         if (!empty)
         {
-            where_string << " OR ";
+            filter << " OR ";
         }
 
-        where_string << "(" << or_clause << ")";
+        filter << "(" << or_clause << ")";
     }
+
+    filter_str = filter.str();
 }
 
-/* ------------------------------------------------------------------------- */
-/* ------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
 
 void RequestManagerPoolInfoFilter::dump(
         RequestAttributes& att,
@@ -377,7 +263,7 @@ void RequestManagerPoolInfoFilter::dump(
         const string&      or_clause)
 {
     ostringstream oss;
-    ostringstream where_string;
+    string        where_string;
     int           rc;
 
     if ( filter_flag < MINE )
@@ -388,14 +274,15 @@ void RequestManagerPoolInfoFilter::dump(
         return;
     }
 
-    generate_where_string(att, filter_flag, start_id, end_id,
-            and_clause, or_clause, where_string);
+    where_filter(att,
+                 filter_flag,
+                 start_id,
+                 end_id,
+                 and_clause,
+                 or_clause,
+                 where_string);
 
-    // ------------------------------------------ 
-    //           Get the pool
-    // ------------------------------------------ 
-    
-    rc = pool->dump(oss, where_string.str());
+    rc = pool->dump(oss, where_string);
 
     if ( rc != 0 )
     {
@@ -407,4 +294,3 @@ void RequestManagerPoolInfoFilter::dump(
 
     return;
 }
-
diff --git a/src/vm/VirtualMachinePool.cc b/src/vm/VirtualMachinePool.cc
index f4e8fd6d02..7f7fa7d207 100644
--- a/src/vm/VirtualMachinePool.cc
+++ b/src/vm/VirtualMachinePool.cc
@@ -266,3 +266,37 @@ int VirtualMachinePool::get_pending(
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
+
+int VirtualMachinePool::dump_acct(ostringstream& oss, 
+                                  const string&  where, 
+                                  int            time_start, 
+                                  int            time_end)
+{
+    ostringstream cmd;
+
+    cmd << "SELECT " << History::table << ".body FROM " << History::table
+        << " INNER JOIN " << VirtualMachine::table
+        << " WHERE vid=oid";
+
+    if ( !where.empty() )
+    {
+        cmd << " AND " << where;
+    }
+
+    if ( time_start != -1 || time_end != -1 )
+    {
+        if ( time_start != -1 )
+        {
+            cmd << " AND (etime > " << time_start << " OR  etime = 0)";
+        }
+
+        if ( time_end != -1 )
+        {
+            cmd << " AND stime < " << time_end;
+        }
+    }
+
+    cmd << " GROUP BY vid,seq";
+
+    return PoolSQL::dump(oss, "HISTORY_RECORDS", cmd);
+};

From de3cd97468bc44b38455345199a504b3e17f6415 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Sat, 5 May 2012 20:57:17 +0200
Subject: [PATCH 04/27] feature #1099: VM info is set in history records in a
 separate function

---
 include/VirtualMachine.h    | 22 ++++++++++++++++------
 src/lcm/LifeCycleActions.cc |  3 +++
 src/lcm/LifeCycleStates.cc  | 20 ++++++++++++++++++++
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index 1332198578..1319711f81 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -428,15 +428,28 @@ public:
         history->stime=_stime;
     };
 
+    /**
+     *  Sets VM info (with monitoring info) in the history record 
+     */
+     void set_vm_info()
+     {
+        obj_template->to_xml(history->vm_info);
+     };
+
+    /**
+     *  Sets VM info (with monitoring info) in the previous history record 
+     */
+     void set_previous_vm_info()
+     {
+        obj_template->to_xml(previous_history->vm_info);
+     };
+
     /**
      *  Sets end time of a VM.
      *    @param _etime time when the VM finished
      */
     void set_etime(time_t _etime)
     {
-        string xml;
-        history->vm_info = obj_template->to_xml(xml);
-
         history->etime=_etime;
     };
 
@@ -446,9 +459,6 @@ public:
      */
     void set_previous_etime(time_t _etime)
     {
-        string xml;
-        previous_history->vm_info = obj_template->to_xml(xml);
-
         previous_history->etime=_etime;
     };
 
diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc
index 234e686a58..3e6d0c2b9a 100644
--- a/src/lcm/LifeCycleActions.cc
+++ b/src/lcm/LifeCycleActions.cc
@@ -615,6 +615,7 @@ void  LifeCycleManager::clean_up_vm(VirtualMachine * vm)
     vmpool->update(vm);
 
     vm->set_etime(the_time);
+    vm->set_vm_info();
     vm->set_reason(History::USER);
 
     vm->get_requirements(cpu,mem,disk);
@@ -650,6 +651,7 @@ void  LifeCycleManager::clean_up_vm(VirtualMachine * vm)
             vmpool->update_history(vm);
 
             vm->set_previous_etime(the_time);
+            vm->set_previous_vm_info();
             vm->set_previous_running_etime(the_time);
             vm->set_previous_reason(History::USER);
             vmpool->update_previous_history(vm);
@@ -680,6 +682,7 @@ void  LifeCycleManager::clean_up_vm(VirtualMachine * vm)
             vmpool->update_history(vm);
 
             vm->set_previous_etime(the_time);
+            vm->set_previous_vm_info();
             vm->set_previous_running_etime(the_time);
             vm->set_previous_reason(History::USER);
             vmpool->update_previous_history(vm);
diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc
index 11cf2bd7be..0165d3ec8d 100644
--- a/src/lcm/LifeCycleStates.cc
+++ b/src/lcm/LifeCycleStates.cc
@@ -49,6 +49,8 @@ void  LifeCycleManager::save_success_action(int vid)
 
         vm->set_previous_etime(the_time);
 
+        vm->set_previous_vm_info();
+
         vm->set_previous_running_etime(the_time);
 
         vm->set_previous_reason(History::USER);
@@ -84,6 +86,8 @@ void  LifeCycleManager::save_success_action(int vid)
 
         vm->set_etime(the_time);
 
+        vm->set_vm_info();
+
         vm->set_reason(History::STOP_RESUME);
 
         vmpool->update_history(vm);
@@ -162,6 +166,8 @@ void  LifeCycleManager::save_failure_action(int vid)
 
         vm->set_etime(the_time);
 
+        vm->set_vm_info();
+
         vm->set_reason(History::ERROR);
 
         vmpool->update_history(vm);
@@ -172,6 +178,8 @@ void  LifeCycleManager::save_failure_action(int vid)
 
         vm->set_previous_etime(the_time);
 
+        vm->set_previous_vm_info();
+
         vm->set_previous_running_etime(the_time);
 
         vm->set_previous_reason(History::USER);
@@ -251,6 +259,8 @@ void  LifeCycleManager::deploy_success_action(int vid)
 
         vm->set_previous_etime(the_time);
 
+        vm->set_previous_vm_info();
+
         vm->set_previous_running_etime(the_time);
 
         vm->set_previous_reason(History::USER);
@@ -304,10 +314,14 @@ void  LifeCycleManager::deploy_failure_action(int vid)
 
         vm->set_etime(the_time);
 
+        vm->set_vm_info();
+
         vm->set_reason(History::ERROR);
 
         vm->set_previous_etime(the_time);
 
+        vm->set_previous_vm_info();
+
         vm->set_previous_running_etime(the_time);
 
         vm->set_previous_reason(History::USER);
@@ -554,6 +568,8 @@ void  LifeCycleManager::epilog_success_action(int vid)
 
     vm->set_etime(the_time);
 
+    vm->set_vm_info();
+
     vmpool->update_history(vm);
 
     vm->get_requirements(cpu,mem,disk);
@@ -727,6 +743,8 @@ void  LifeCycleManager::monitor_suspend_action(int vid)
 
     vm->set_etime(the_time);
 
+    vm->set_vm_info();
+
     vm->set_reason(History::STOP_RESUME);
 
     vmpool->update_history(vm);
@@ -799,6 +817,8 @@ void  LifeCycleManager::failure_action(VirtualMachine * vm)
 
     vm->set_etime(the_time);
 
+    vm->set_vm_info();
+
     vm->set_reason(History::ERROR);
 
     vmpool->update_history(vm);

From a42752027227c475c7c8a3ac3c12133aafc8f1a2 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Tue, 8 May 2012 12:06:51 +0200
Subject: [PATCH 05/27] feature #1048: Remove exec_and_log_ec2 default params

---
 src/vmm_mad/ec2/one_vmm_ec2.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vmm_mad/ec2/one_vmm_ec2.rb b/src/vmm_mad/ec2/one_vmm_ec2.rb
index 05afb2aeb4..467b9e86f8 100755
--- a/src/vmm_mad/ec2/one_vmm_ec2.rb
+++ b/src/vmm_mad/ec2/one_vmm_ec2.rb
@@ -193,7 +193,7 @@ class EC2Driver < VirtualMachineDriver
             return
         end
 
-        deploy_exe = exec_and_log_ec2(:run, ec2_info, id)
+        deploy_exe = exec_and_log_ec2(:run, ec2_info, "", id)
         if deploy_exe.code != 0
             msg = deploy_exe.stderr
             send_message(ACTION[:deploy], RESULT[:failure], id, msg)
@@ -360,7 +360,7 @@ private
     # +action+: Symbol, one of the keys of the EC2 hash constant (i.e :run)
     # +xml+: REXML Document, containing EC2 information
     # +extra_params+: String, extra information to be added to the command
-    def exec_and_log_ec2(action, xml, extra_params="", id)
+    def exec_and_log_ec2(action, xml, extra_params, id)
         cmd = EC2[action][:cmd].clone
         cmd << ' ' << extra_params << ' ' if extra_params
 

From 2c88fe83c8d06747e914ebde9fa16811ba017f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Tue, 8 May 2012 15:42:24 +0200
Subject: [PATCH 06/27] Feature #1099: Add complete VM info to all history
 records, even the active ones

---
 include/History.h        |  3 ++-
 include/VirtualMachine.h | 23 +++++++++++++----------
 src/vm/History.cc        |  7 ++++---
 src/vm/VirtualMachine.cc | 28 ++++++++++++++++++++--------
 4 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/include/History.h b/include/History.h
index 8161f4649f..952320e62c 100644
--- a/include/History.h
+++ b/include/History.h
@@ -45,7 +45,8 @@ public:
         int hid,
         const string& hostname,
         const string& vmm,
-        const string& vnm);
+        const string& vnm,
+        const string& vm_info);
 
     ~History(){};
 
diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index 1319711f81..a3c48ab9f3 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -431,18 +431,18 @@ public:
     /**
      *  Sets VM info (with monitoring info) in the history record 
      */
-     void set_vm_info()
-     {
-        obj_template->to_xml(history->vm_info);
-     };
+    void set_vm_info()
+    {
+        to_xml_extended(history->vm_info, 0);
+    };
 
     /**
      *  Sets VM info (with monitoring info) in the previous history record 
      */
-     void set_previous_vm_info()
-     {
-        obj_template->to_xml(previous_history->vm_info);
-     };
+    void set_previous_vm_info()
+    {
+        to_xml_extended(previous_history->vm_info, 0);
+    };
 
     /**
      *  Sets end time of a VM.
@@ -932,10 +932,13 @@ private:
      *  Function that renders the VM in XML format optinally including
      *  extended information (all history records)
      *  @param xml the resulting XML string
-     *  @param extended include additional info if true
+     *  @param n_history Number of history records to include:
+     *      0: none
+     *      1: the last one
+     *      2: all
      *  @return a reference to the generated string
      */
-    string& to_xml_extended(string& xml, bool extended) const;
+    string& to_xml_extended(string& xml, int n_history) const;
 
 protected:
 
diff --git a/src/vm/History.cc b/src/vm/History.cc
index e1199d83e6..4d7580aba9 100644
--- a/src/vm/History.cc
+++ b/src/vm/History.cc
@@ -53,7 +53,7 @@ History::History(
         epilog_stime(0),
         epilog_etime(0),
         reason(NONE),
-        vm_info("<TEMPLATE/>"){};
+        vm_info("<VM/>"){};
 
 /* -------------------------------------------------------------------------- */
 
@@ -63,7 +63,8 @@ History::History(
     int	_hid,
     const string& _hostname,
     const string& _vmm,
-    const string& _vnm):
+    const string& _vnm,
+    const string& _vm_info):
         oid(_oid),
         seq(_seq),
         hostname(_hostname),
@@ -79,7 +80,7 @@ History::History(
         epilog_stime(0),
         epilog_etime(0),
         reason(NONE),
-        vm_info("<TEMPLATE/>")
+        vm_info(_vm_info)
 {
     non_persistent_data();
 };
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index e078231ee4..848ae81d22 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -735,6 +735,7 @@ void VirtualMachine::add_history(
 {
     ostringstream os;
     int           seq;
+    string        vm_xml;
 
     if (history == 0)
     {
@@ -747,12 +748,15 @@ void VirtualMachine::add_history(
         previous_history = history;
     }
 
+    to_xml_extended(vm_xml, 0);
+
     history = new History(oid,
                           seq,
                           hid,
                           hostname,
                           vmm_mad,
-                          vnm_mad);
+                          vnm_mad,
+                          vm_xml);
 
     history_records.push_back(history);
 };
@@ -763,18 +767,22 @@ void VirtualMachine::add_history(
 void VirtualMachine::cp_history()
 {
     History * htmp;
+    string    vm_xml;
 
     if (history == 0)
     {
         return;
     }
 
+    to_xml_extended(vm_xml, 0);
+
     htmp = new History(oid,
                        history->seq + 1,
                        history->hid,
                        history->hostname,
                        history->vmm_mad_name,
-                       history->vnm_mad_name);
+                       history->vnm_mad_name,
+                       vm_xml);
 
     previous_history = history;
     history          = htmp;
@@ -788,18 +796,22 @@ void VirtualMachine::cp_history()
 void VirtualMachine::cp_previous_history()
 {
     History * htmp;
+    string    vm_xml;
 
     if ( previous_history == 0 || history == 0)
     {
         return;
     }
 
+    to_xml_extended(vm_xml, 0);
+
     htmp = new History(oid,
                        history->seq + 1,
                        previous_history->hid,
                        previous_history->hostname,
                        previous_history->vmm_mad_name,
-                       previous_history->vnm_mad_name);
+                       previous_history->vnm_mad_name,
+                       vm_xml);
 
     previous_history = history;
     history          = htmp;
@@ -1475,7 +1487,7 @@ error_yy:
 
 string& VirtualMachine::to_xml(string& xml) const
 {
-    return to_xml_extended(xml,false);
+    return to_xml_extended(xml, 1);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -1483,13 +1495,13 @@ string& VirtualMachine::to_xml(string& xml) const
 
 string& VirtualMachine::to_xml_extended(string& xml) const
 {
-    return to_xml_extended(xml,true);
+    return to_xml_extended(xml, 2);
 }
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-string& VirtualMachine::to_xml_extended(string& xml, bool extended) const
+string& VirtualMachine::to_xml_extended(string& xml, int n_history) const
 {
     string template_xml;
     string history_xml;
@@ -1517,11 +1529,11 @@ string& VirtualMachine::to_xml_extended(string& xml, bool extended) const
         << "<NET_RX>"    << net_rx    << "</NET_RX>"
         << obj_template->to_xml(template_xml);
 
-    if ( hasHistory() )
+    if ( hasHistory() && n_history > 0 )
     {
         oss << "<HISTORY_RECORDS>";
 
-        if ( extended )
+        if ( n_history == 2 )
         {
             for (unsigned int i=0; i < history_records.size(); i++)
             {

From 986bb82819e925d9a9d07ea561414c05097b3cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Tue, 8 May 2012 16:01:34 +0200
Subject: [PATCH 07/27] Feature #1099: Update oneacct command to show new
 accounting info from the core

---
 src/cli/oneacct | 310 +++++++++++++++++++++++++++---------------------
 1 file changed, 174 insertions(+), 136 deletions(-)

diff --git a/src/cli/oneacct b/src/cli/oneacct
index a9a3e52fe6..feebf1f769 100755
--- a/src/cli/oneacct
+++ b/src/cli/oneacct
@@ -1,25 +1,20 @@
 #!/usr/bin/env ruby
 
-# --------------------------------------------------------------------------
-# Copyright 2010-2012, C12G Labs S.L.
-#
-# This file is part of OpenNebula addons.
-#
-# OpenNebula addons are free software: you can redistribute it
-# and/or modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or the hope That it will be useful, but (at your
-# option) any later version.
-#
-# OpenNebula addons are distributed in WITHOUT ANY WARRANTY;
-# without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenNebula addons. If not, see
-# <http://www.gnu.org/licenses/>
-# --------------------------------------------------------------------------
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+#                                                                            #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License. You may obtain    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
 
 
 ONE_LOCATION=ENV["ONE_LOCATION"]
@@ -35,7 +30,6 @@ $: << RUBY_LIB_LOCATION+"/cli"
 
 require 'rubygems'
 
-require 'acct/oneacct'
 require 'cli/one_helper'
 require 'cli/command_parser'
 require 'json'
@@ -43,164 +37,167 @@ require 'json'
 require 'optparse'
 require 'optparse/time'
 
-REG_DATE=/((\d{4})\/)?(\d\d?)(\/(\d\d?))?/
-REG_TIME=/(\d\d?):(\d\d?)(:(\d\d?))?/
-
 class AcctHelper
 
-    def format_vm(options=nil)
-        table = CLIHelper::ShowTable.new(nil, nil) do
-            column :VMID, "VM ID", :size=>4 do |d|
-                d[:vmid]
+    def initialize(client)
+        @client = client
+    end
+
+=begin
+    List of <HISTORY> child elements
+
+    OID
+    SEQ
+    HOSTNAME
+    HID
+    STIME
+    ETIME
+    VMMMAD
+    VNMMAD
+    PSTIME
+    PETIME
+    RSTIME
+    RETIME
+    ESTIME
+    EETIME
+    REASON
+=end
+
+    def list_history(data)
+        table = CLIHelper::ShowTable.new(nil, self) do
+            column :VID, "Virtual Machine ", :size=>4 do |d|
+                d["OID"]
             end
 
-            column :MEMORY, "Consumed memory", :right, :size=>8 do |d|
-                OpenNebulaHelper.unit_to_str(
-                    d[:slices].first[:mem]*1024,
-                    {})
+            column :SEQ, "Sequence number", :size=>3 do |d|
+                d["SEQ"]
             end
 
-            column :CPU, "Group of the User", :right, :size=>8 do |d|
-                d[:slices].first[:cpu]
+            column :HOSTNAME, "Host name", :size=>15 do |d|
+                d["HOSTNAME"]
             end
 
-            column :NETRX, "Group of the User", :right, :size=>10 do |d|
-                OpenNebulaHelper.unit_to_str(
-                    d[:network][:net_rx].to_i/1024.0,
-                    {})
+            column :REASON, "VM state change reason", :size=>6 do |d|
+                VirtualMachine.get_reason d["REASON"]
             end
 
-            column :NETTX, "Group of the User", :right, :size=>10 do |d|
-                OpenNebulaHelper.unit_to_str(
-                    d[:network][:net_tx].to_i/1024.0,
-                    {})
+            column :STIME, "Start time", :size=>15 do |d|
+                OpenNebulaHelper.time_to_str(d['STIME'])
             end
 
-            column :TIME, "Group of the User", :right, :size=>15 do |d|
-                OpenNebulaHelper.period_to_str(d[:time])
+            column :ETIME, "End time", :size=>15 do |d|
+                OpenNebulaHelper.time_to_str(d['ETIME'])
             end
 
-            default :VMID, :MEMORY, :CPU, :NETRX, :NETTX, :TIME
+            column :MEMORY, "Assigned memory", :right, :size=>8 do |d|
+                OpenNebulaHelper.unit_to_str(d["VM/TEMPLATE/MEMORY"].to_i, {})
+            end
+
+            column :CPU, "Number of CPUs", :right, :size=>3 do |d|
+                d["VM/TEMPLATE/CPU"]
+            end
+
+            column :NETRX, "Data received from the network", :right, :size=>8 do |d|
+                OpenNebulaHelper.unit_to_str(d["VM/NET_RX"].to_i, {})
+            end
+
+            column :NETTX, "Data sent to the network", :right, :size=>8 do |d|
+                OpenNebulaHelper.unit_to_str(d["VM/NET_TX"].to_i, {})
+            end
+
+            default :VID, :HOSTNAME, :REASON, :STIME, :ETIME, :MEMORY, :CPU, :NETRX, :NETTX
         end
 
-        table
+        table.show(data)
     end
 
-    def list_vms(data)
-        format_vm().show(data)
-    end
+public
+    def list_users(xml_info, options=nil)
 
-    def list_users(filters)
-        a=gen_accounting(filters)
+        xmldoc = XMLElement.new
+        xmldoc.initialize_xml(xml_info, 'HISTORY_RECORDS')
 
-        a.each do |user, data|
+        uids = xmldoc.retrieve_elements('HISTORY/VM/UID')
 
+        if uids.nil?
+            puts "No records found."
+            exit 0
+        end
+
+        uids.uniq!
+
+        history_elems = []
+
+        uids.each do |uid|
             CLIHelper.scr_bold
             CLIHelper.scr_underline
-            puts "# User #{user}"
+            # TODO: username?
+            puts "# User #{uid}                        "
             CLIHelper.scr_restore
             puts
 
-            vms=data[:vms].map do |k, v|
-                v
-            end
+            vm_ids = xmldoc.retrieve_elements("HISTORY/VM[UID=#{uid}]/ID")
+            vm_ids.uniq!
 
-            self.list_vms(vms)
+            vm_ids.each do |vid|
 
-            puts
-            puts
-
-        end
-    end
-
-    def gen_accounting(filters)
-        acct=AcctClient.new(filters)
-        acct.account()
-    end
-
-    def gen_json(filters)
-        begin
-            require 'json'
-        rescue LoadError
-            STDERR.puts "JSON gem is needed to give the result in this format"
-            exit(-1)
-        end
-
-        acct=gen_accounting(filters)
-        acct.to_json
-    end
-
-    def xml_tag(tag, value)
-        "<#{tag}>#{value}</#{tag}>\n"
-    end
-
-    def gen_xml(filters)
-        acct=gen_accounting(filters)
-
-        xml=""
-
-        acct.each do |user, data|
-            xml<<"<user id=\"#{user}\">\n"
-
-            data[:vms].each do |vmid, vm|
-                xml<<"  <vm id=\"#{vmid}\">\n"
-
-                xml<<"    "<<xml_tag(:name, vm[:name])
-                xml<<"    "<<xml_tag(:time, vm[:time])
-                xml<<"    "<<xml_tag(:cpu, vm[:slices].first[:cpu])
-                xml<<"    "<<xml_tag(:mem, vm[:slices].first[:mem])
-                xml<<"    "<<xml_tag(:net_rx, vm[:network][:net_rx])
-                xml<<"    "<<xml_tag(:net_tx, vm[:network][:net_tx])
-
-                vm[:slices].each do |slice|
-                    xml<<"    <slice seq=\"#{slice[:seq]}\">\n"
-
-                    slice.each do |key, value|
-                        xml<<"      "<<xml_tag(key, value)
-                    end
-
-                    xml<<"    </slice>\n"
+                if ( options[:split] )
+                    history_elems.clear
                 end
 
-                xml<<"  </vm>\n"
+                xmldoc.each("HISTORY[OID=#{vid}]") do |history|
+                    history_elems << history
+                end
+
+                if ( options[:split] )
+                    list_history(history_elems)
+                    puts
+                end
             end
 
-            xml<<"</user>\n"
+            if ( !options[:split] )
+                list_history(history_elems)
+                puts
+            end
         end
-
-        xml
     end
 end
 
 
-@options=Hash.new
+options = Hash.new
 
-@options[:format]=:table
+options[:format] = :table
 
-opts=OptionParser.new do |opts|
+opts = OptionParser.new do |opts|
     opts.on('-s', '--start TIME', Time,
         'Start date and time to take into account') do |ext|
-            @options[:start]=ext
+            options[:start]=ext
     end
 
     opts.on("-e", "--end TIME", Time,
         "End date and time" ) do |ext|
-            @options[:end]=ext
+            options[:end]=ext
     end
 
+    # TODO: Allow username
     opts.on("-u", "--user user", Integer,
         "User id to make accounting" ) do |ext|
-            @options[:user]=ext.to_i
+            options[:user]=ext.to_i
     end
 
     opts.on("-j", "--json",
         "Output in json format" ) do |ext|
-            @options[:format]=:json
+            options[:format]=:json
     end
 
     opts.on("-x", "--xml",
         "Output in xml format" ) do |ext|
-            @options[:format]=:xml
+            options[:format]=:xml
+    end
+
+    opts.on("--split",
+        "Split the output in a table for each VM" ) do |ext|
+            options[:split]=ext
     end
 
     opts.on()
@@ -215,27 +212,68 @@ rescue OptionParser::ParseError => e
 end
 
 
-acct_helper=AcctHelper.new
+client = OpenNebula::Client.new
+
+acct_helper = AcctHelper.new(client)
+
+time_start  = -1
+time_end    = -1
+filter_flag = VirtualMachinePool::INFO_ALL
+
+time_start  = options[:start].to_i if options[:start]
+time_end    = options[:end].to_i   if options[:end]
+filter_flag = options[:user].to_i  if options[:user]
 
 
-filters=Hash.new
+ret = client.call("vmpool.accounting",
+            filter_flag,
+            time_start,
+            time_end)
 
-filters[:start]=@options[:start].to_i if @options[:start]
-filters[:end]=@options[:end].to_i if @options[:end]
-filters[:user]=@options[:user].to_i if @options[:user]
-
-
-case @options[:format]
-when :table
-    acct_helper.list_users(filters)
-when :json
-    puts acct_helper.gen_json(filters)
-when :xml
-    puts acct_helper.gen_xml(filters)
+if OpenNebula.is_error?(ret)
+    puts ret.message
+    exit -1
 end
 
 
+case options[:format]
+when :table
+    if ( time_start != -1 or time_end != -1 )
+        print "Showing active history records from "
 
+        CLIHelper.scr_bold
 
+        if ( time_start != -1 )
+            print Time.at(time_start).to_s
+        else
+            print "-"
+        end
 
+        CLIHelper.scr_restore
 
+        print " to "
+
+        CLIHelper.scr_bold
+
+        if ( time_end != -1 )
+            print Time.at(time_end).to_s
+        else
+            print "-"
+        end
+
+        CLIHelper.scr_restore
+        puts
+        puts
+    end
+
+    acct_helper.list_users(ret, options)
+
+when :xml
+    puts ret
+
+when :json
+    xmldoc = XMLElement.new
+    xmldoc.initialize_xml(ret, 'HISTORY_RECORDS')
+    puts xmldoc.to_hash.to_json
+
+end

From 31684f5798a85a4ea9e300495dd73cfc82989d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Tue, 8 May 2012 16:18:24 +0200
Subject: [PATCH 08/27] Feature #1099: Update VM usage attributes comments to
 reflect correct measure units

---
 include/VirtualMachine.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index a3c48ab9f3..a3ba487bca 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -156,7 +156,7 @@ public:
 
     /**
      *  Updates VM dynamic information (usage counters).
-     *   @param _memory used by the VM (total)
+     *   @param _memory Kilobytes used by the VM (total)
      *   @param _cpu used by the VM (rate)
      *   @param _net_tx transmitted bytes (total)
      *   @param _net_tx received bytes (total)
@@ -773,7 +773,7 @@ private:
     string      deploy_id;
 
     /**
-     *  Memory in Megabytes used by the VM
+     *  Memory in Kilobytes used by the VM
      */
     int         memory;
 
@@ -783,12 +783,12 @@ private:
     int         cpu;
 
     /**
-     *  Network usage, transmitted Kilobytes
+     *  Network usage, transmitted bytes
      */
     int         net_tx;
 
     /**
-     *  Network usage, received Kilobytes
+     *  Network usage, received bytes
      */
     int         net_rx;
 

From feb1b603c9fcb3379ee552664d964eb3cf7f46e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Tue, 8 May 2012 18:43:14 +0200
Subject: [PATCH 09/27] Feature #1099: Fix bug, VM ids were not cleared for
 each user

---
 src/cli/oneacct | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/cli/oneacct b/src/cli/oneacct
index feebf1f769..964fd9e857 100755
--- a/src/cli/oneacct
+++ b/src/cli/oneacct
@@ -136,6 +136,8 @@ public
             CLIHelper.scr_restore
             puts
 
+            history_elems.clear
+
             vm_ids = xmldoc.retrieve_elements("HISTORY/VM[UID=#{uid}]/ID")
             vm_ids.uniq!
 

From 4c8f892d03676bb7dbe15f20ca1022e871b6242e Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 9 May 2012 16:02:16 +0200
Subject: [PATCH 10/27] Add tmpdir configuration parameter to servers

---
 src/cloud/ec2/bin/econe-server        | 4 ++--
 src/cloud/ec2/etc/econe.conf          | 3 +++
 src/cloud/occi/bin/occi-server        | 6 +++---
 src/cloud/occi/etc/occi-server.conf   | 3 +++
 src/sunstone/bin/sunstone-server      | 3 +++
 src/sunstone/etc/sunstone-server.conf | 3 +++
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/cloud/ec2/bin/econe-server b/src/cloud/ec2/bin/econe-server
index 1327de4ed1..e8f35d4dbd 100755
--- a/src/cloud/ec2/bin/econe-server
+++ b/src/cloud/ec2/bin/econe-server
@@ -34,8 +34,8 @@ fi
 
 setup()
 {
-    eval `grep ^IMAGE_DIR= $ECONE_ETC`
-    export TMPDIR=$IMAGE_DIR/tmp
+    TMPDIR=$(grep ^:tmpdir: $ECONE_ETC|awk '{print $2}')
+    test -n $TMDIR && export TMPDIR
     mkdir -p $TMPDIR
 
 	if [ -f $ECONE_LOCK_FILE ]; then
diff --git a/src/cloud/ec2/etc/econe.conf b/src/cloud/ec2/etc/econe.conf
index 35de897481..59001e6c6e 100644
--- a/src/cloud/ec2/etc/econe.conf
+++ b/src/cloud/ec2/etc/econe.conf
@@ -18,6 +18,9 @@
 # Server Configuration
 #############################################################
 
+# Directory to store temp files when uploading images
+:tmpdir: /var/tmp/one
+
 # OpenNebula sever contact information
 :one_xmlrpc: http://localhost:2633/RPC2
 
diff --git a/src/cloud/occi/bin/occi-server b/src/cloud/occi/bin/occi-server
index 72625a1d61..9115b3d4bb 100755
--- a/src/cloud/occi/bin/occi-server
+++ b/src/cloud/occi/bin/occi-server
@@ -34,9 +34,9 @@ fi
 
 setup()
 {
-    eval `grep ^IMAGE_DIR= $OCCI_ETC `
-    export TMPDIR=$IMAGE_DIR/tmp
-    mkdir -p $TMPDIR
+  TMPDIR=$(grep ^:tmpdir: $OCCI_ETC|awk '{print $2}')
+  test -n $TMDIR && export TMPDIR
+  mkdir -p $TMPDIR
 
   if [ -f $OCCI_LOCK_FILE ]; then
     if [ -f  $OCCI_PID ]; then
diff --git a/src/cloud/occi/etc/occi-server.conf b/src/cloud/occi/etc/occi-server.conf
index f041e6d83e..09a6c446d8 100644
--- a/src/cloud/occi/etc/occi-server.conf
+++ b/src/cloud/occi/etc/occi-server.conf
@@ -18,6 +18,9 @@
 # Server configuration
 #############################################################
 
+# Directory to store temp files when uploading images
+:tmpdir: /var/tmp/one
+
 # OpenNebula sever contact information
 :one_xmlrpc: http://localhost:2633/RPC2
 
diff --git a/src/sunstone/bin/sunstone-server b/src/sunstone/bin/sunstone-server
index e9b3b0e1ad..fb0a435fed 100755
--- a/src/sunstone/bin/sunstone-server
+++ b/src/sunstone/bin/sunstone-server
@@ -35,6 +35,9 @@ fi
 
 setup()
 {
+  TMPDIR=$(grep ^:tmpdir: $SUNSTONE_CONF|awk '{print $2}')
+  test -n $TMDIR && export TMPDIR
+  mkdir -p $TMPDIR
 
   if [ -f $SUNSTONE_LOCK_FILE ]; then
     if [ -f  $SUNSTONE_PID ]; then
diff --git a/src/sunstone/etc/sunstone-server.conf b/src/sunstone/etc/sunstone-server.conf
index 64915b50c0..54b4becb33 100644
--- a/src/sunstone/etc/sunstone-server.conf
+++ b/src/sunstone/etc/sunstone-server.conf
@@ -18,6 +18,9 @@
 # Server Configuration
 #############################################################
 
+# Directory to store temp files when uploading images
+:tmpdir: /var/tmp/one
+
 # OpenNebula sever contact information
 :one_xmlrpc: http://localhost:2633/RPC2
 

From 0d5d5e2e3a0bd2a55a25161a286134d4a9e0b5e1 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 9 May 2012 16:33:52 +0200
Subject: [PATCH 11/27] Check if TMPDIR is defined

---
 src/cloud/ec2/bin/econe-server   | 2 +-
 src/cloud/occi/bin/occi-server   | 2 +-
 src/sunstone/bin/sunstone-server | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cloud/ec2/bin/econe-server b/src/cloud/ec2/bin/econe-server
index e8f35d4dbd..5d045107e9 100755
--- a/src/cloud/ec2/bin/econe-server
+++ b/src/cloud/ec2/bin/econe-server
@@ -35,7 +35,7 @@ fi
 setup()
 {
     TMPDIR=$(grep ^:tmpdir: $ECONE_ETC|awk '{print $2}')
-    test -n $TMDIR && export TMPDIR
+    test -n "$TMPDIR" && export TMPDIR
     mkdir -p $TMPDIR
 
 	if [ -f $ECONE_LOCK_FILE ]; then
diff --git a/src/cloud/occi/bin/occi-server b/src/cloud/occi/bin/occi-server
index 9115b3d4bb..b13b45fdbd 100755
--- a/src/cloud/occi/bin/occi-server
+++ b/src/cloud/occi/bin/occi-server
@@ -35,7 +35,7 @@ fi
 setup()
 {
   TMPDIR=$(grep ^:tmpdir: $OCCI_ETC|awk '{print $2}')
-  test -n $TMDIR && export TMPDIR
+  test -n "$TMPDIR" && export TMPDIR
   mkdir -p $TMPDIR
 
   if [ -f $OCCI_LOCK_FILE ]; then
diff --git a/src/sunstone/bin/sunstone-server b/src/sunstone/bin/sunstone-server
index fb0a435fed..8911b8c4c9 100755
--- a/src/sunstone/bin/sunstone-server
+++ b/src/sunstone/bin/sunstone-server
@@ -36,7 +36,7 @@ fi
 setup()
 {
   TMPDIR=$(grep ^:tmpdir: $SUNSTONE_CONF|awk '{print $2}')
-  test -n $TMDIR && export TMPDIR
+  test -n "$TMPDIR" && export TMPDIR
   mkdir -p $TMPDIR
 
   if [ -f $SUNSTONE_LOCK_FILE ]; then

From bf6862b4c291d4109152f161541e712527a5fa91 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 9 May 2012 17:32:21 +0200
Subject: [PATCH 12/27] Do not create TMPDIR if it is not defined

---
 src/cloud/ec2/bin/econe-server   | 7 +++++--
 src/cloud/occi/bin/occi-server   | 7 +++++--
 src/sunstone/bin/sunstone-server | 7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/cloud/ec2/bin/econe-server b/src/cloud/ec2/bin/econe-server
index 5d045107e9..976175ee79 100755
--- a/src/cloud/ec2/bin/econe-server
+++ b/src/cloud/ec2/bin/econe-server
@@ -35,8 +35,11 @@ fi
 setup()
 {
     TMPDIR=$(grep ^:tmpdir: $ECONE_ETC|awk '{print $2}')
-    test -n "$TMPDIR" && export TMPDIR
-    mkdir -p $TMPDIR
+
+    if [ -n "$TMPDIR" ]; then
+        export TMPDIR
+        mkdir -p $TMPDIR
+    fi
 
 	if [ -f $ECONE_LOCK_FILE ]; then
 		if [ -f  $ECONE_PID ]; then
diff --git a/src/cloud/occi/bin/occi-server b/src/cloud/occi/bin/occi-server
index b13b45fdbd..812407b162 100755
--- a/src/cloud/occi/bin/occi-server
+++ b/src/cloud/occi/bin/occi-server
@@ -35,8 +35,11 @@ fi
 setup()
 {
   TMPDIR=$(grep ^:tmpdir: $OCCI_ETC|awk '{print $2}')
-  test -n "$TMPDIR" && export TMPDIR
-  mkdir -p $TMPDIR
+
+  if [ -n "$TMPDIR" ]; then
+    export TMPDIR
+    mkdir -p $TMPDIR
+  fi
 
   if [ -f $OCCI_LOCK_FILE ]; then
     if [ -f  $OCCI_PID ]; then
diff --git a/src/sunstone/bin/sunstone-server b/src/sunstone/bin/sunstone-server
index 8911b8c4c9..e4a4847ad4 100755
--- a/src/sunstone/bin/sunstone-server
+++ b/src/sunstone/bin/sunstone-server
@@ -36,8 +36,11 @@ fi
 setup()
 {
   TMPDIR=$(grep ^:tmpdir: $SUNSTONE_CONF|awk '{print $2}')
-  test -n "$TMPDIR" && export TMPDIR
-  mkdir -p $TMPDIR
+
+  if [ -n "$TMPDIR" ]; then
+    export TMPDIR
+    mkdir -p $TMPDIR
+  fi
 
   if [ -f $SUNSTONE_LOCK_FILE ]; then
     if [ -f  $SUNSTONE_PID ]; then

From 8d2a2130506cad76c03610c76b1656b30d349899 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Wed, 25 Apr 2012 17:50:11 +0200
Subject: [PATCH 13/27] Add onedb migrator to 3.4.1 (cherry picked from commit
 aafdfc0c3093fb91a4bd59323f88739f8a3bce94)

---
 src/onedb/3.4.0_to_3.4.1.rb | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 src/onedb/3.4.0_to_3.4.1.rb

diff --git a/src/onedb/3.4.0_to_3.4.1.rb b/src/onedb/3.4.0_to_3.4.1.rb
new file mode 100644
index 0000000000..b11206ad1d
--- /dev/null
+++ b/src/onedb/3.4.0_to_3.4.1.rb
@@ -0,0 +1,29 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+#                                                                            #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License. You may obtain    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+module Migrator
+    def db_version
+        "3.4.1"
+    end
+
+    def one_version
+        "OpenNebula 3.4.1"
+    end
+
+    def up
+        return true
+    end
+end

From 231afa668a95131a2acc03641bfc52dcf9d1e7c2 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Fri, 4 May 2012 15:25:48 +0200
Subject: [PATCH 14/27] Update install.sh to install the migrator (cherry
 picked from commit 8c8b8e531e9e9c8f2bcfe00e2975569a204ac341)

---
 install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install.sh b/install.sh
index c668e02297..910a523122 100755
--- a/install.sh
+++ b/install.sh
@@ -883,6 +883,7 @@ ONEDB_MIGRATOR_FILES="src/onedb/2.0_to_2.9.80.rb \
                       src/onedb/3.2.1_to_3.3.0.rb \
                       src/onedb/3.3.0_to_3.3.80.rb \
                       src/onedb/3.3.80_to_3.4.0.rb \
+                      src/onedb/3.4.0_to_3.4.1.rb \
                       src/onedb/onedb.rb \
                       src/onedb/onedb_backend.rb"
 

From a3d7888c32666cc80c70db43efd321ce7270236d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Wed, 9 May 2012 17:34:14 +0200
Subject: [PATCH 15/27] New onedb migrator 3.4.1_to_3.5.80

---
 install.sh                   |   1 +
 src/onedb/3.4.1_to_3.5.80.rb | 150 +++++++++++++++++++++++++++++++++++
 2 files changed, 151 insertions(+)
 create mode 100644 src/onedb/3.4.1_to_3.5.80.rb

diff --git a/install.sh b/install.sh
index 910a523122..083c65d0fd 100755
--- a/install.sh
+++ b/install.sh
@@ -884,6 +884,7 @@ ONEDB_MIGRATOR_FILES="src/onedb/2.0_to_2.9.80.rb \
                       src/onedb/3.3.0_to_3.3.80.rb \
                       src/onedb/3.3.80_to_3.4.0.rb \
                       src/onedb/3.4.0_to_3.4.1.rb \
+                      src/onedb/3.4.1_to_3.5.80.rb \
                       src/onedb/onedb.rb \
                       src/onedb/onedb_backend.rb"
 
diff --git a/src/onedb/3.4.1_to_3.5.80.rb b/src/onedb/3.4.1_to_3.5.80.rb
new file mode 100644
index 0000000000..42ebf9e3e6
--- /dev/null
+++ b/src/onedb/3.4.1_to_3.5.80.rb
@@ -0,0 +1,150 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+#                                                                            #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License. You may obtain    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+require "rexml/document"
+include REXML
+
+module Migrator
+    def db_version
+        "3.5.80"
+    end
+
+    def one_version
+        "OpenNebula 3.5.80"
+    end
+
+    def up
+
+        @db.run "ALTER TABLE datastore_pool RENAME TO old_datastore_pool;"
+        @db.run "CREATE TABLE datastore_pool (oid INTEGER PRIMARY KEY, name VARCHAR(128), body TEXT, uid INTEGER, gid INTEGER, owner_u INTEGER, group_u INTEGER, other_u INTEGER, UNIQUE(name));"
+
+        @db.fetch("SELECT * FROM old_datastore_pool") do |row|
+            doc = Document.new(row[:body])
+
+            doc.root.add_element("DISK_TYPE").text = "0"
+
+            @db[:datastore_pool].insert(
+                :oid        => row[:oid],
+                :name       => row[:name],
+                :body       => doc.root.to_s,
+                :uid        => row[:uid],
+                :gid        => row[:gid],
+                :owner_u    => row[:owner_u],
+                :group_u    => row[:group_u],
+                :other_u    => row[:other_u])
+        end
+
+        @db.run "DROP TABLE old_datastore_pool;"
+
+
+        @db.run "ALTER TABLE image_pool RENAME TO old_image_pool;"
+        @db.run "CREATE TABLE image_pool (oid INTEGER PRIMARY KEY, name VARCHAR(128), body TEXT, uid INTEGER, gid INTEGER, owner_u INTEGER, group_u INTEGER, other_u INTEGER, UNIQUE(name,uid) );"
+
+        @db.fetch("SELECT * FROM old_image_pool") do |row|
+            doc = Document.new(row[:body])
+
+            ds_id = ""
+            doc.root.each_element("DATASTORE_ID") { |e|
+                ds_id = e.text
+            }
+
+            doc.root.add_element("DISK_TYPE").text = "0"
+
+            @db[:image_pool].insert(
+                :oid        => row[:oid],
+                :name       => row[:name],
+                :body       => doc.root.to_s,
+                :uid        => row[:uid],
+                :gid        => row[:gid],
+                :owner_u    => row[:owner_u],
+                :group_u    => row[:group_u],
+                :other_u    => row[:other_u])
+        end
+
+        @db.run "DROP TABLE old_image_pool;"
+
+
+        @db.run "ALTER TABLE vm_pool RENAME TO old_vm_pool;"
+        @db.run "CREATE TABLE vm_pool (oid INTEGER PRIMARY KEY, name VARCHAR(128), body TEXT, uid INTEGER, gid INTEGER, last_poll INTEGER, state INTEGER, lcm_state INTEGER, owner_u INTEGER, group_u INTEGER, other_u INTEGER);"
+
+        @db.fetch("SELECT * FROM old_vm_pool") do |row|
+            doc = Document.new(row[:body])
+
+            doc.root.add_element("RESCHED").text = "0"
+
+            @db[:vm_pool].insert(
+                :oid        => row[:oid],
+                :name       => row[:name],
+                :body       => doc.root.to_s,
+                :uid        => row[:uid],
+                :gid        => row[:gid],
+                :last_poll  => row[:last_poll],
+                :state      => row[:state],
+                :lcm_state  => row[:lcm_state],
+                :owner_u    => row[:owner_u],
+                :group_u    => row[:group_u],
+                :other_u    => row[:other_u])
+        end
+
+        @db.run "DROP TABLE old_vm_pool;"
+
+
+        @db.run "ALTER TABLE history RENAME TO old_history;"
+        @db.run "CREATE TABLE history (vid INTEGER, seq INTEGER, body TEXT, stime INTEGER, etime INTEGER, PRIMARY KEY(vid,seq));"
+
+        @db.fetch("SELECT * FROM old_history") do |row|
+            doc = Document.new(row[:body])
+
+            doc.root.add_element("OID").text = row[:vid].to_s
+
+            stime = "0"
+            doc.root.each_element("STIME") { |e|
+                stime = e.text
+            }
+
+            etime = "0"
+            doc.root.each_element("ETIME") { |e|
+                etime = e.text
+            }
+
+            @db.fetch("SELECT body FROM vm_pool WHERE oid = #{row[:vid]}") do |vm_row|
+                vm_doc = Document.new(vm_row[:body])
+
+                vm_doc.root.delete_element( '/VM/HISTORY_RECORDS/HISTORY' )
+
+                ["MEMORY", "CPU", "NET_TX", "NET_RX"].each { |elem_name|
+                    vm_doc.root.each_element(elem_name) { |e|
+                        e.text = "0"
+                    }
+                }
+
+                doc.root.add_element( vm_doc )
+            end
+
+            @db[:history].insert(
+                :vid        => row[:vid],
+                :seq        => row[:seq],
+                :body       => doc.root.to_s,
+                :stime      => stime,
+                :etime      => etime)
+        end
+
+        @db.run "DROP TABLE old_history;"
+
+
+        return true
+    end
+end

From d3b624d4a630198603788650dda0ea47a9e7e542 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Thu, 10 May 2012 14:49:34 +0200
Subject: [PATCH 16/27] feature #1265: Warning when using server instead of
 host in econe

---
 src/cloud/ec2/etc/econe.conf      |  2 +-
 src/cloud/ec2/lib/econe-server.rb | 11 +++++++++--
 src/cloud/occi/lib/occi-server.rb | 21 +++++++++------------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/cloud/ec2/etc/econe.conf b/src/cloud/ec2/etc/econe.conf
index 59001e6c6e..d8329b9f52 100644
--- a/src/cloud/ec2/etc/econe.conf
+++ b/src/cloud/ec2/etc/econe.conf
@@ -25,7 +25,7 @@
 :one_xmlrpc: http://localhost:2633/RPC2
 
 # Host and port where econe server will run
-:server: localhost
+:host: localhost
 :port: 4567
 
 # SSL proxy that serves the API (set if is being used)
diff --git a/src/cloud/ec2/lib/econe-server.rb b/src/cloud/ec2/lib/econe-server.rb
index 24601cefc9..8ac16321ef 100644
--- a/src/cloud/ec2/lib/econe-server.rb
+++ b/src/cloud/ec2/lib/econe-server.rb
@@ -79,7 +79,14 @@ set :config, conf
 include CloudLogger
 enable_logging EC2_LOG, settings.config[:debug_level].to_i
 
-if CloudServer.is_port_open?(settings.config[:server],
+if settings.config[:server]
+    settings.config[:host] ||= settings.config[:server]
+    warning = "Warning: :server: configuration parameter has been deprecated."
+    warning << " Use :host: instead."
+    settings.logger.warn warning
+end
+
+if CloudServer.is_port_open?(settings.config[:host],
                              settings.config[:port])
     settings.logger.error {
         "Port #{settings.config[:port]} busy, please shutdown " <<
@@ -88,7 +95,7 @@ if CloudServer.is_port_open?(settings.config[:server],
     exit -1
 end
 
-set :bind, settings.config[:server]
+set :bind, settings.config[:host]
 set :port, settings.config[:port]
 
 begin
diff --git a/src/cloud/occi/lib/occi-server.rb b/src/cloud/occi/lib/occi-server.rb
index 183ef31c88..9225496094 100644
--- a/src/cloud/occi/lib/occi-server.rb
+++ b/src/cloud/occi/lib/occi-server.rb
@@ -92,7 +92,14 @@ use Rack::Session::Pool, :key => 'occi'
 set :public_folder, Proc.new { File.join(root, "ui/public") }
 set :views, settings.root + '/ui/views'
 
-if CloudServer.is_port_open?(settings.config[:server],
+if settings.config[:server]
+    settings.config[:host] ||= settings.config[:server]
+    warning = "Warning: :server: configuration parameter has been deprecated."
+    warning << " Use :host: instead."
+    settings.logger.warn warning
+end
+
+if CloudServer.is_port_open?(settings.config[:host],
                              settings.config[:port])
     settings.logger.error {
         "Port #{settings.config[:port]} busy, please shutdown " <<
@@ -101,20 +108,10 @@ if CloudServer.is_port_open?(settings.config[:server],
     exit -1
 end
 
-host = settings.config[:host] || settings.config[:server]
-set :bind, host
-
-if settings.config[:server]
-    warning = "Warning: :server: configuration parameter has been deprecated."
-    warning << " Use :host: instead."
-    settings.logger.error warning
-end
-
+set :bind, settings.config[:host]
 set :port, settings.config[:port]
 
 
-
-
 # Create CloudAuth
 begin
     ENV["ONE_CIPHER_AUTH"] = OCCI_AUTH

From 6e7744f7bfc6feb7d16f34df5a5a207ea8f0aacc Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Thu, 10 May 2012 15:00:20 +0200
Subject: [PATCH 17/27] feature #1265: Use host instead of server to build the
 signature in econe

---
 src/cloud/ec2/lib/econe-server.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cloud/ec2/lib/econe-server.rb b/src/cloud/ec2/lib/econe-server.rb
index 8ac16321ef..953a11ffa0 100644
--- a/src/cloud/ec2/lib/econe-server.rb
+++ b/src/cloud/ec2/lib/econe-server.rb
@@ -115,8 +115,8 @@ if conf[:ssl_server]
     econe_port = uri.port
     econe_path = uri.path
 else
-    econe_host = conf[:server]
-    econe_port = conf[:port]
+    econe_host = settings.config[:host]
+    econe_port = settings.config[:port]
     econe_path = '/'
 end
 

From a1e50125ed9db16cf8d09525b265fe9f84dc08f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Thu, 10 May 2012 18:39:02 +0200
Subject: [PATCH 18/27] Feature #872: one.template.clone method added to Java
 OCA

---
 .../opennebula/client/template/Template.java  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/oca/java/src/org/opennebula/client/template/Template.java b/src/oca/java/src/org/opennebula/client/template/Template.java
index dff2fc1a2c..dd48c96254 100644
--- a/src/oca/java/src/org/opennebula/client/template/Template.java
+++ b/src/oca/java/src/org/opennebula/client/template/Template.java
@@ -35,6 +35,7 @@ public class Template extends PoolElement
     private static final String CHOWN    = METHOD_PREFIX + "chown";
     private static final String CHMOD    = METHOD_PREFIX + "chmod";
     private static final String INSTANTIATE = METHOD_PREFIX + "instantiate";
+    private static final String CLONE    = METHOD_PREFIX + "clone";
 
     /**
      * Creates a new Template representation.
@@ -205,6 +206,19 @@ public class Template extends PoolElement
         return client.call(INSTANTIATE, id, name);
     }
 
+    /**
+     * Clones this template into a new one
+     *
+     * @param client XML-RPC Client.
+     * @param id The template id of the target template.
+     * @param name Name for the new template.
+     * @return If successful the message contains the new template ID.
+     */
+    public static OneResponse clone(Client client, int id, String name)
+    {
+        return client.call(CLONE, id, name);
+    }
+
     // =================================
     // Instanced object XML-RPC methods
     // =================================
@@ -375,6 +389,17 @@ public class Template extends PoolElement
         return instantiate(client, id, "");
     }
 
+    /**
+     * Clones this template into a new one
+     *
+     * @param name Name for the new template.
+     * @return If successful the message contains the new template ID.
+     */
+    public OneResponse clone(String name)
+    {
+        return clone(client, id, name);
+    }
+
     // =================================
     // Helpers
     // =================================

From 662f79c470006de83f7cdb4c7cf6b2d74f88d852 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Thu, 10 May 2012 18:47:34 +0200
Subject: [PATCH 19/27] Feature #1240: Enable lvm as a datastore driver in
 oned.conf

---
 share/etc/oned.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/etc/oned.conf b/share/etc/oned.conf
index 0bf1cd0492..2f4c5d807a 100644
--- a/share/etc/oned.conf
+++ b/share/etc/oned.conf
@@ -298,7 +298,7 @@ TM_MAD = [
 
 DATASTORE_MAD = [
     executable = "one_datastore",
-    arguments  = "-t 15 -d fs,vmware,iscsi"
+    arguments  = "-t 15 -d fs,vmware,iscsi,lvm"
 ]
 
 #*******************************************************************************

From 11ba24e6d2f25a1c4e4ca75fbb39ddaf37239611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Fri, 11 May 2012 15:01:11 +0200
Subject: [PATCH 20/27] Feature #1099: Output format adjustments for oneacct

---
 src/cli/oneacct | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/cli/oneacct b/src/cli/oneacct
index 964fd9e857..bdf144ed3d 100755
--- a/src/cli/oneacct
+++ b/src/cli/oneacct
@@ -65,11 +65,11 @@ class AcctHelper
 
     def list_history(data)
         table = CLIHelper::ShowTable.new(nil, self) do
-            column :VID, "Virtual Machine ", :size=>4 do |d|
+            column :VID, "Virtual Machine ID", :size=>4 do |d|
                 d["OID"]
             end
 
-            column :SEQ, "Sequence number", :size=>3 do |d|
+            column :SEQ, "History record sequence number", :size=>3 do |d|
                 d["SEQ"]
             end
 
@@ -77,19 +77,19 @@ class AcctHelper
                 d["HOSTNAME"]
             end
 
-            column :REASON, "VM state change reason", :size=>6 do |d|
+            column :REASON, "VM state change reason", :size=>4 do |d|
                 VirtualMachine.get_reason d["REASON"]
             end
 
-            column :STIME, "Start time", :size=>15 do |d|
+            column :START_TIME, "Start time", :size=>14 do |d|
                 OpenNebulaHelper.time_to_str(d['STIME'])
             end
 
-            column :ETIME, "End time", :size=>15 do |d|
+            column :END_TIME, "End time", :size=>14 do |d|
                 OpenNebulaHelper.time_to_str(d['ETIME'])
             end
 
-            column :MEMORY, "Assigned memory", :right, :size=>8 do |d|
+            column :MEMORY, "Assigned memory", :right, :size=>6 do |d|
                 OpenNebulaHelper.unit_to_str(d["VM/TEMPLATE/MEMORY"].to_i, {})
             end
 
@@ -97,15 +97,15 @@ class AcctHelper
                 d["VM/TEMPLATE/CPU"]
             end
 
-            column :NETRX, "Data received from the network", :right, :size=>8 do |d|
+            column :NET_RX, "Data received from the network", :right, :size=>6 do |d|
                 OpenNebulaHelper.unit_to_str(d["VM/NET_RX"].to_i, {})
             end
 
-            column :NETTX, "Data sent to the network", :right, :size=>8 do |d|
+            column :NET_TX, "Data sent to the network", :right, :size=>6 do |d|
                 OpenNebulaHelper.unit_to_str(d["VM/NET_TX"].to_i, {})
             end
 
-            default :VID, :HOSTNAME, :REASON, :STIME, :ETIME, :MEMORY, :CPU, :NETRX, :NETTX
+            default :VID, :HOSTNAME, :REASON, :START_TIME, :END_TIME, :MEMORY, :CPU, :NET_RX, :NET_TX
         end
 
         table.show(data)

From efba395aef417bee375db86ca8a1968c358b9778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Fri, 11 May 2012 15:02:49 +0200
Subject: [PATCH 21/27] Feature #1099: Update vm information with each poll
 action for active history records

---
 src/vmm/VirtualMachineManagerDriver.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/vmm/VirtualMachineManagerDriver.cc b/src/vmm/VirtualMachineManagerDriver.cc
index eb285860f7..06d636e697 100644
--- a/src/vmm/VirtualMachineManagerDriver.cc
+++ b/src/vmm/VirtualMachineManagerDriver.cc
@@ -546,8 +546,10 @@ void VirtualMachineManagerDriver::protocol(
             }
 
             vm->update_info(memory,cpu,net_tx,net_rx);
+            vm->set_vm_info();
 
             vmpool->update(vm);
+            vmpool->update_history(vm);
 
             if (state != '-' &&
                 (vm->get_lcm_state() == VirtualMachine::RUNNING ||

From fe67d12209c096140845d3230d218d13c721b20f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Fri, 11 May 2012 15:30:53 +0200
Subject: [PATCH 22/27] Feature #1099: Fix oneacct column measure units

---
 src/cli/oneacct | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/cli/oneacct b/src/cli/oneacct
index bdf144ed3d..a9101f5bc1 100755
--- a/src/cli/oneacct
+++ b/src/cli/oneacct
@@ -90,7 +90,7 @@ class AcctHelper
             end
 
             column :MEMORY, "Assigned memory", :right, :size=>6 do |d|
-                OpenNebulaHelper.unit_to_str(d["VM/TEMPLATE/MEMORY"].to_i, {})
+                OpenNebulaHelper.unit_to_str(d["VM/TEMPLATE/MEMORY"].to_i, {}, 'M')
             end
 
             column :CPU, "Number of CPUs", :right, :size=>3 do |d|
@@ -98,11 +98,13 @@ class AcctHelper
             end
 
             column :NET_RX, "Data received from the network", :right, :size=>6 do |d|
-                OpenNebulaHelper.unit_to_str(d["VM/NET_RX"].to_i, {})
+                # NET is measured in bytes, unit_to_str expects KBytes
+                OpenNebulaHelper.unit_to_str(d["VM/NET_RX"].to_i / 1024.0, {})
             end
 
             column :NET_TX, "Data sent to the network", :right, :size=>6 do |d|
-                OpenNebulaHelper.unit_to_str(d["VM/NET_TX"].to_i, {})
+                # NET is measured in bytes, unit_to_str expects KBytes
+                OpenNebulaHelper.unit_to_str(d["VM/NET_TX"].to_i / 1024.0, {})
             end
 
             default :VID, :HOSTNAME, :REASON, :START_TIME, :END_TIME, :MEMORY, :CPU, :NET_RX, :NET_TX

From 0f042568105d6f1a7c63e66d664dd54d36ca56d3 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Fri, 11 May 2012 15:40:28 +0200
Subject: [PATCH 23/27] Feature #1240: minor typo in lvm/mvds

---
 src/tm_mad/lvm/mvds | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tm_mad/lvm/mvds b/src/tm_mad/lvm/mvds
index 0bf61fe5ae..341d94130c 100755
--- a/src/tm_mad/lvm/mvds
+++ b/src/tm_mad/lvm/mvds
@@ -25,7 +25,7 @@
 SRC=$1
 DST=$2
 VM_ID=$3
-DS_ID=$3
+DS_ID=$4
 
 if [ -z "${ONE_LOCATION}" ]; then
     TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh

From 6cdc30df70fe1ecac5b29463d64408af156ec691 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Fri, 11 May 2012 17:51:55 +0200
Subject: [PATCH 24/27] Bug #1204: VMware datastore should handle falt vmdks

---
 src/datastore_mad/remotes/vmware/cp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/datastore_mad/remotes/vmware/cp b/src/datastore_mad/remotes/vmware/cp
index bb4995a5ef..a0e892d153 100755
--- a/src/datastore_mad/remotes/vmware/cp
+++ b/src/datastore_mad/remotes/vmware/cp
@@ -76,8 +76,10 @@ case $SRC in
 
     exec_and_log "cp -rf $SRC $DST" "Error copying $SRC to $DST"
 
+
     if [ ! -f $DST/disk.vmdk ]; then
-        BASE_DISK_FILE=`ls $DST | grep -v '.*-s[0-9]*\.vmdk'`
+        BASE_DISK_FILE=`ls $DST | grep -v '\-\(flat\|delta\|s[0-9]*\)\.vmdk$'`
+
 
         exec_and_log "mv -f $DST/$BASE_DISK_FILE $DST/disk.vmdk" \
             "Error renaming disk file $BASE_DISK_FILE to disk.vmdk"

From 8ff65a3b7cc975d576e0689b34a999a67aef5028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Fri, 11 May 2012 18:19:13 +0200
Subject: [PATCH 25/27] Feature #1099: Update XSD files

---
 share/doc/xsd/acct.xsd      | 127 ++++++++++++++++++++++++++++++++++++
 share/doc/xsd/datastore.xsd |   1 +
 share/doc/xsd/image.xsd     |   1 +
 share/doc/xsd/vm.xsd        |  55 +++++++++++++++-
 4 files changed, 182 insertions(+), 2 deletions(-)
 create mode 100644 share/doc/xsd/acct.xsd

diff --git a/share/doc/xsd/acct.xsd b/share/doc/xsd/acct.xsd
new file mode 100644
index 0000000000..fe210dc829
--- /dev/null
+++ b/share/doc/xsd/acct.xsd
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+  targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
+
+  <xs:element name="HISTORY_RECORDS">
+    <xs:complexType>
+      <xs:sequence maxOccurs="1" minOccurs="1">
+        <xs:element ref="HISTORY" maxOccurs="unbounded" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="HISTORY">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="OID" type="xs:integer"/>
+        <xs:element name="SEQ" type="xs:integer"/>
+        <xs:element name="HOSTNAME" type="xs:string"/>
+        <xs:element name="HID" type="xs:integer"/>
+        <xs:element name="STIME" type="xs:integer"/>
+        <xs:element name="ETIME" type="xs:integer"/>
+        <xs:element name="VMMMAD" type="xs:string"/>
+        <xs:element name="VNMMAD" type="xs:string"/>
+        <xs:element name="PSTIME" type="xs:integer"/>
+        <xs:element name="PETIME" type="xs:integer"/>
+        <xs:element name="RSTIME" type="xs:integer"/>
+        <xs:element name="RETIME" type="xs:integer"/>
+        <xs:element name="ESTIME" type="xs:integer"/>
+        <xs:element name="EETIME" type="xs:integer"/>
+
+        <!-- REASON values:
+          NONE        = 0  Normal termination
+          ERROR       = 1  The VM ended in error
+          STOP_RESUME = 2  Stop/resume request
+          USER        = 3  Migration request
+          CANCEL      = 4  Cancel request
+        -->
+        <xs:element name="REASON" type="xs:integer"/>
+
+        <xs:element name="VM">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="ID" type="xs:integer"/>
+              <xs:element name="UID" type="xs:integer"/>
+              <xs:element name="GID" type="xs:integer"/>
+              <xs:element name="UNAME" type="xs:string"/>
+              <xs:element name="GNAME" type="xs:string"/>
+              <xs:element name="NAME" type="xs:string"/>
+              <xs:element name="PERMISSIONS" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="OWNER_U" type="xs:integer"/>
+                    <xs:element name="OWNER_M" type="xs:integer"/>
+                    <xs:element name="OWNER_A" type="xs:integer"/>
+                    <xs:element name="GROUP_U" type="xs:integer"/>
+                    <xs:element name="GROUP_M" type="xs:integer"/>
+                    <xs:element name="GROUP_A" type="xs:integer"/>
+                    <xs:element name="OTHER_U" type="xs:integer"/>
+                    <xs:element name="OTHER_M" type="xs:integer"/>
+                    <xs:element name="OTHER_A" type="xs:integer"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="LAST_POLL" type="xs:integer"/>
+
+              <!-- STATE values,
+              see http://opennebula.org/_media/documentation:rel3.2:states-complete.png
+
+                INIT      = 0
+                PENDING   = 1
+                HOLD      = 2
+                ACTIVE    = 3 In this state, the Life Cycle Manager state is relevant
+                STOPPED   = 4
+                SUSPENDED = 5
+                DONE      = 6
+                FAILED    = 7
+              -->
+              <xs:element name="STATE" type="xs:integer"/>
+
+              <!-- LCM_STATE values, this sub-state is relevant only when STATE is
+                   ACTIVE (4)
+
+                LCM_INIT       = 0
+                PROLOG         = 1
+                BOOT           = 2
+                RUNNING        = 3
+                MIGRATE        = 4
+                SAVE_STOP      = 5
+                SAVE_SUSPEND   = 6
+                SAVE_MIGRATE   = 7
+                PROLOG_MIGRATE = 8
+                PROLOG_RESUME  = 9
+                EPILOG_STOP    = 10
+                EPILOG         = 11
+                SHUTDOWN       = 12
+                CANCEL         = 13
+                FAILURE        = 14
+                CLEANUP        = 15
+                UNKNOWN        = 16
+              -->
+              <xs:element name="LCM_STATE" type="xs:integer"/>
+              <xs:element name="RESCHED" type="xs:integer"/>
+              <xs:element name="STIME" type="xs:integer"/>
+              <xs:element name="ETIME" type="xs:integer"/>
+              <xs:element name="DEPLOY_ID" type="xs:string"/>
+
+              <!-- MEMORY consumption in kilobytes -->
+              <xs:element name="MEMORY" type="xs:integer"/>
+
+              <!-- Percentage of 1 CPU consumed (two fully consumed cpu is 200) -->
+              <xs:element name="CPU" type="xs:integer"/>
+
+              <!-- NET_TX: Sent bytes to the network -->
+              <xs:element name="NET_TX" type="xs:integer"/>
+
+              <!-- NET_RX: Received bytes from the network -->
+              <xs:element name="NET_RX" type="xs:integer"/>
+              <xs:element name="TEMPLATE" type="xs:anyType"/>
+              <xs:element name="HISTORY_RECORDS">
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
diff --git a/share/doc/xsd/datastore.xsd b/share/doc/xsd/datastore.xsd
index 0573cf31e2..c1f5dfac98 100644
--- a/share/doc/xsd/datastore.xsd
+++ b/share/doc/xsd/datastore.xsd
@@ -28,6 +28,7 @@
         <xs:element name="DS_MAD" type="xs:string"/>
         <xs:element name="TM_MAD" type="xs:string"/>
         <xs:element name="BASE_PATH" type="xs:string"/>
+        <xs:element name="DISK_TYPE" type="xs:integer"/>
         <xs:element name="CLUSTER_ID" type="xs:integer"/>
         <xs:element name="CLUSTER" type="xs:string"/>
         <xs:element name="IMAGES">
diff --git a/share/doc/xsd/image.xsd b/share/doc/xsd/image.xsd
index e5f1881b22..8f664824bc 100644
--- a/share/doc/xsd/image.xsd
+++ b/share/doc/xsd/image.xsd
@@ -25,6 +25,7 @@
           </xs:complexType>
         </xs:element>
         <xs:element name="TYPE" type="xs:integer"/>
+        <xs:element name="DISK_TYPE" type="xs:integer"/>
         <xs:element name="PERSISTENT" type="xs:integer"/>
         <xs:element name="REGTIME" type="xs:integer"/>
         <xs:element name="SOURCE" type="xs:string"/>
diff --git a/share/doc/xsd/vm.xsd b/share/doc/xsd/vm.xsd
index 039f4a3d75..576790c2a4 100644
--- a/share/doc/xsd/vm.xsd
+++ b/share/doc/xsd/vm.xsd
@@ -26,14 +26,58 @@
           </xs:complexType>
         </xs:element>
         <xs:element name="LAST_POLL" type="xs:integer"/>
+
+        <!-- STATE values,
+        see http://opennebula.org/_media/documentation:rel3.2:states-complete.png
+
+          INIT      = 0
+          PENDING   = 1
+          HOLD      = 2
+          ACTIVE    = 3 In this state, the Life Cycle Manager state is relevant
+          STOPPED   = 4
+          SUSPENDED = 5
+          DONE      = 6
+          FAILED    = 7
+        -->
         <xs:element name="STATE" type="xs:integer"/>
+
+        <!-- LCM_STATE values, this sub-state is relevant only when STATE is
+             ACTIVE (4)
+
+          LCM_INIT       = 0
+          PROLOG         = 1
+          BOOT           = 2
+          RUNNING        = 3
+          MIGRATE        = 4
+          SAVE_STOP      = 5
+          SAVE_SUSPEND   = 6
+          SAVE_MIGRATE   = 7
+          PROLOG_MIGRATE = 8
+          PROLOG_RESUME  = 9
+          EPILOG_STOP    = 10
+          EPILOG         = 11
+          SHUTDOWN       = 12
+          CANCEL         = 13
+          FAILURE        = 14
+          CLEANUP        = 15
+          UNKNOWN        = 16
+        -->
         <xs:element name="LCM_STATE" type="xs:integer"/>
+        <xs:element name="RESCHED" type="xs:integer"/>
         <xs:element name="STIME" type="xs:integer"/>
         <xs:element name="ETIME" type="xs:integer"/>
         <xs:element name="DEPLOY_ID" type="xs:string"/>
+
+        <!-- MEMORY consumption in kilobytes -->
         <xs:element name="MEMORY" type="xs:integer"/>
+
+        <!-- Percentage of 1 CPU consumed (two fully consumed cpu is 200) -->
         <xs:element name="CPU" type="xs:integer"/>
+
+        <!-- NET_TX: Sent bytes to the network -->
         <xs:element name="NET_TX" type="xs:integer"/>
+
+        <!-- NET_RX: Received bytes from the network -->
         <xs:element name="NET_RX" type="xs:integer"/>
         <xs:element name="TEMPLATE" type="xs:anyType"/>
         <xs:element name="HISTORY_RECORDS">
@@ -42,21 +86,28 @@
               <xs:element name="HISTORY" maxOccurs="unbounded" minOccurs="0">
                 <xs:complexType>
                   <xs:sequence>
+                    <xs:element name="OID" type="xs:integer"/>
                     <xs:element name="SEQ" type="xs:integer"/>
                     <xs:element name="HOSTNAME" type="xs:string"/>
-                    <xs:element name="VM_DIR" type="xs:string"/>
                     <xs:element name="HID" type="xs:integer"/>
                     <xs:element name="STIME" type="xs:integer"/>
                     <xs:element name="ETIME" type="xs:integer"/>
                     <xs:element name="VMMMAD" type="xs:string"/>
                     <xs:element name="VNMMAD" type="xs:string"/>
-                    <xs:element name="TMMAD" type="xs:string"/>
                     <xs:element name="PSTIME" type="xs:integer"/>
                     <xs:element name="PETIME" type="xs:integer"/>
                     <xs:element name="RSTIME" type="xs:integer"/>
                     <xs:element name="RETIME" type="xs:integer"/>
                     <xs:element name="ESTIME" type="xs:integer"/>
                     <xs:element name="EETIME" type="xs:integer"/>
+
+                    <!-- REASON values:
+                      NONE        = 0  Normal termination
+                      ERROR       = 1  The VM ended in error
+                      STOP_RESUME = 2  Stop/resume request
+                      USER        = 3  Migration request
+                      CANCEL      = 4  Cancel request
+                    -->
                     <xs:element name="REASON" type="xs:integer"/>
                   </xs:sequence>
                 </xs:complexType>

From cbfc06f420cf3f81f7f6482fbd1d9bff3b8a5a7e Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Fri, 11 May 2012 18:48:11 +0200
Subject: [PATCH 26/27] Bug #1273: qcow2 TM driver persistent images get
 corrupted on shutdown

---
 src/tm_mad/qcow2/ln   | 84 +------------------------------------------
 src/tm_mad/qcow2/mvds |  2 +-
 2 files changed, 2 insertions(+), 84 deletions(-)
 mode change 100755 => 120000 src/tm_mad/qcow2/ln

diff --git a/src/tm_mad/qcow2/ln b/src/tm_mad/qcow2/ln
deleted file mode 100755
index 2a9395d484..0000000000
--- a/src/tm_mad/qcow2/ln
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-
-# -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
-#                                                                            #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
-# not use this file except in compliance with the License. You may obtain    #
-# a copy of the License at                                                   #
-#                                                                            #
-# http://www.apache.org/licenses/LICENSE-2.0                                 #
-#                                                                            #
-# Unless required by applicable law or agreed to in writing, software        #
-# distributed under the License is distributed on an "AS IS" BASIS,          #
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-# See the License for the specific language governing permissions and        #
-# limitations under the License.                                             #
-#--------------------------------------------------------------------------- #
-
-# ln fe:SOURCE host:remote_system_ds/disk.i
-#   - fe is the front-end hostname
-#   - SOURCE is the path of the disk image in the form DS_BASE_PATH/disk
-#   - host is the target host to deploy the VM
-#   - remote_system_ds is the path for the system datastore in the host
-
-SRC=$1
-DST=$2
-
-if [ -z "${ONE_LOCATION}" ]; then
-    TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
-else
-    TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
-fi
-
-. $TMCOMMON
-
-#-------------------------------------------------------------------------------
-# Set dst path and dir
-#-------------------------------------------------------------------------------
-SRC_PATH=`arg_path $SRC`
-SRC_PATH="../../${SRC_PATH##"$DS_DIR/"}"
-
-DST_PATH=`arg_path $DST`
-DST_HOST=`arg_host $DST`
-DST_DIR=`dirname $DST_PATH`
-
-#-------------------------------------------------------------------------------
-# Link (ln) SRC into DST
-#-------------------------------------------------------------------------------
-
-# Is it a file or a folder (VMware)?
-if [ -d `arg_path $SRC`  ]; then
-	ssh_make_path $DST_HOST $DST_PATH
-
-	# It's a folder, make links for all elements
-    SRC_FOLDER_NAME=`basename $SRC_PATH`
-    SRC_WITH_NO_FOLDER=`dirname $SRC_PATH`
-    SRC_DS_NAME=`basename $SRC_WITH_NO_FOLDER`
-	REL_SRC_PATH="../../../$SRC_DS_NAME/$SRC_FOLDER_NAME"
-
-	log "Link all files in $SRC_PATH to $DST_PATH"
-
-LINK_SCRIPT=$(cat <<EOF
-for file in \$(cd $DST_DIR  ; find $SRC_PATH -type f); do
-	FNAME=\$(basename \$file)
-	(cd $DST_PATH ;  ln -sf $REL_SRC_PATH/\$FNAME $DST_PATH/$FNAME)
-done
-EOF
-)
-	ssh_exec_and_log $DST_HOST "$LINK_SCRIPT" "Could not link dir files from source DS to system DS"
-else
-	ssh_make_path $DST_HOST $DST_DIR
-
-	# Just link a file
-	log "Linking $SRC_PATH in $DST"
-
-	ssh_exec_and_log $DST_HOST \
-				     "cd $DST_DIR; ln -s $SRC_PATH $DST_PATH" \
-	             	 "Error linking $SRC to $DST"
-fi
-
-
-exit 0
-
diff --git a/src/tm_mad/qcow2/ln b/src/tm_mad/qcow2/ln
new file mode 120000
index 0000000000..2926cd697b
--- /dev/null
+++ b/src/tm_mad/qcow2/ln
@@ -0,0 +1 @@
+../shared/ln
\ No newline at end of file
diff --git a/src/tm_mad/qcow2/mvds b/src/tm_mad/qcow2/mvds
index 6b5bd356d8..dabec292c9 100755
--- a/src/tm_mad/qcow2/mvds
+++ b/src/tm_mad/qcow2/mvds
@@ -58,7 +58,7 @@ umask 0007
 SRC_READLN=\$($READLINK -f $SRC_PATH)
 DST_READLN=\$($READLINK -f $DST_PATH)
 
-if [ \( -L $SRC \) -a \( "\$SRC_READLN" = "\$DST_READLN" \) ] ; then
+if [ \( -L $SRC_PATH \) -a \( "\$SRC_READLN" = "\$DST_READLN" \) ] ; then
 	echo "Not moving files to image repo, they are the same"
 else
     qemu-img convert $SRC_PATH -O qcow2 $DST_PATH

From f2c6e63e12c20d9c4e56767d61706dac22d4259f Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Fri, 11 May 2012 19:15:25 +0200
Subject: [PATCH 27/27] feature #1099: Inline hint for to_xml and
 to_xml_extended

---
 include/VirtualMachine.h | 10 ++++++++--
 src/vm/VirtualMachine.cc | 15 ---------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index a3ba487bca..494b2a342a 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -122,7 +122,10 @@ public:
      *  @param xml the resulting XML string
      *  @return a reference to the generated string
      */
-    string& to_xml(string& xml) const;
+    string& to_xml(string& xml) const
+    {
+        return to_xml_extended(xml, 1);
+    }
 
     /**
      * Function to print the VirtualMachine object into a string in
@@ -130,7 +133,10 @@ public:
      *  @param xml the resulting XML string
      *  @return a reference to the generated string
      */
-    string& to_xml_extended(string& xml) const;
+    string& to_xml_extended(string& xml) const
+    {
+        return to_xml_extended(xml, 2);
+    }
 
     /**
      *  Rebuilds the object from an xml formatted string
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 848ae81d22..f3db0feb78 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -1482,21 +1482,6 @@ error_yy:
     pthread_mutex_unlock(&lex_mutex);
     return -1;
 }
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-string& VirtualMachine::to_xml(string& xml) const
-{
-    return to_xml_extended(xml, 1);
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-string& VirtualMachine::to_xml_extended(string& xml) const
-{
-    return to_xml_extended(xml, 2);
-}
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */